Commit: 8868947f3117db5ff17d21b6f655e5c25b818488 - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• Revision: 8868947f3117db5ff17d21b6f655e5c25b818488 (tree)
• Zeit: 2002-11-04 12:42:42
• Autor: John Harper <jsh@src....>
• Commiter: John Harper

Log Message

merged changes

Ändern Zusammenfassung

• modified: src/ChangeLog
• modified: src/fonts.c
• modified: src/frames.c
• modified: src/functions.c
• modified: src/images.c
• modified: src/sawmill.h
• modified: src/sawmill_subrs.h

Diff

--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
[phone]  John Harper  <[e-mail]>
+
+	* merged color changes from HEAD:
+
+	* sawmill.h (Lisp_Color): now contains alpha value
+
+	* colors.c (Fget_color_rgb, Fget_color): both now take an extra
+	ALPHA parameter
+	(Fcolor_rgb, Fcolor_rgb_8): both now return an extra element in
+	the list, the alpha value
+
+	* fonts.c (xft_draw): use alpha field in color, instead of
+	defaulting to fully opaque
+
+	* images.c, functions.c, frames.c, cursors.c: updated callers
+
 2002-11-02  John Harper  <[e-mail]>
 
 	* merged font changes from HEAD:

--- a/src/fonts.c
+++ b/src/fonts.c
@@ -370,7 +370,7 @@ xft_draw (Lisp_Font *f, u_char *string, size_t length,
     xft_color.color.red = fg->red;
     xft_color.color.green = fg->green;
     xft_color.color.blue = fg->blue;
-    xft_color.color.alpha = 65535;	/* FIXME: */
+    xft_color.color.alpha = fg->alpha;
 
     XftDrawString8 (draw, &xft_color, f->font,
 		    x, y, string, length);

--- a/src/frames.c
+++ b/src/frames.c
@@ -1109,6 +1109,12 @@ get_pattern_prop (struct frame_part *fp, repv *data, repv (*conv)(repv data),
     return TRUE;
 }
 
+static repv
+get_color (repv name)
+{
+    return Fget_color (name, Qnil);
+}
+
 static bool
 build_frame_part (struct frame_part *fp)
 {
@@ -1226,14 +1232,14 @@ build_frame_part (struct frame_part *fp)
 	fp->renderer = Qnil;
 
     /* get background images or colors */
-    if (!get_pattern_prop (fp, fp->bg, Fget_color,
+    if (!get_pattern_prop (fp, fp->bg, get_color,
 			   Qbackground, class_elt, ov_class_elt))
     {
 	goto next_part;
     }
 
     /* get foreground colors or images */
-    if (!get_pattern_prop (fp, fp->fg, Fget_color,
+    if (!get_pattern_prop (fp, fp->fg, get_color,
 			   Qforeground, class_elt, ov_class_elt))
     {
 	goto next_part;

--- a/src/functions.c
+++ b/src/functions.c
@@ -1150,13 +1150,13 @@ DEFUN("display-message", Fdisplay_message, Sdisplay_message,
 	    message.fg = rep_CDR(tem);
 	    if (!COLORP(message.fg))
 	    {
-		message.fg = Fget_color (message.fg);
+		message.fg = Fget_color (message.fg, Qnil);
 		if (!message.fg)
 		    return rep_NULL;
 	    }
 	}
 	if (!COLORP(message.fg))
-	    message.fg = Fget_color (rep_VAL(&black));
+	    message.fg = Fget_color (rep_VAL(&black), Qnil);
 	if (!COLORP(message.fg))
 	    return rep_signal_arg_error (Qforeground, 1);
 
@@ -1166,13 +1166,13 @@ DEFUN("display-message", Fdisplay_message, Sdisplay_message,
 	    message.bg = rep_CDR(tem);
 	    if (!COLORP(message.bg))
 	    {
-		message.bg = Fget_color (message.bg);
+		message.bg = Fget_color (message.bg, Qnil);
 		if (!message.bg)
 		    return rep_NULL;
 	    }
 	}
 	if (!COLORP(message.bg))
-	    message.bg = Fget_color (rep_VAL(&white));
+	    message.bg = Fget_color (rep_VAL(&white), Qnil);
 	if (!COLORP(message.bg))
 	    return rep_signal_arg_error (Qbackground, 1);
 

--- a/src/images.c
+++ b/src/images.c
@@ -592,7 +592,8 @@ image-shape-color IMAGE
     else
 	return Fget_color_rgb (rep_MAKE_INT(shape.r * 256),
 			       rep_MAKE_INT(shape.g * 256),
-			       rep_MAKE_INT(shape.b * 256));
+			       rep_MAKE_INT(shape.b * 256),
+			       Qnil);
 #elif defined HAVE_GDK_PIXBUF
     fprintf (stderr, "shape colors are unimplemented for gdk-pixbuf\n");
     return Qnil;

--- a/src/sawmill.h
+++ b/src/sawmill.h
@@ -189,7 +189,7 @@ typedef struct lisp_font {
 typedef struct lisp_color {
     repv car;
     struct lisp_color *next;
-    int red, green, blue;		/* each 16 bits */
+    int red, green, blue, alpha;	/* each 16 bits */
     int pixel;				/* somewhere in the screen's cmap */
 } Lisp_Color;
 

--- a/src/sawmill_subrs.h
+++ b/src/sawmill_subrs.h
@@ -25,8 +25,8 @@
 /* from colors.c */
 extern int color_type;
 extern repv Qdefault_foreground;
-extern repv Fget_color_rgb (repv red, repv green, repv blue);
-extern repv Fget_color (repv name);
+extern repv Fget_color_rgb (repv red, repv green, repv blue, repv alpha);
+extern repv Fget_color (repv name, repv alpha);
 extern repv Fcolor_name (repv color);
 extern repv Fcolor_rgb (repv color);
 extern repv Fcolorp (repv arg);