aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2007-08-28 10:14:02 +0000
committerJan Djärv2007-08-28 10:14:02 +0000
commitcf0590c4514d90669f65437a72819f442db47dbb (patch)
tree7ef93ef60865cdee978d2e99196eb44186bdcdad /src
parentfface67742861c83f2e01e1d1847ba674fd31035 (diff)
downloademacs-cf0590c4514d90669f65437a72819f442db47dbb.tar.gz
emacs-cf0590c4514d90669f65437a72819f442db47dbb.zip
Qrtl is new.
(parse_tool_bar_item): Handle :rtl keyword. (syms_of_keyboard): Intern :rtl keyword.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog15
-rw-r--r--src/keyboard.c9
2 files changed, 23 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b402b1c7646..231f18dd312 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
12007-08-28 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * keyboard.c: Qrtl is new.
4 (parse_tool_bar_item): Handle :rtl keyword.
5 (syms_of_keyboard): Intern :rtl keyword.
6
7 * dispextern.h (enum tool_bar_item_idx): Add TOOL_BAR_ITEM_RTL_IMAGE.
8
9 * gtkutil.c (xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
10 so no Lisp code is executed.
11 (file_for_image, find_rtl_image): New functions.
12 (xg_get_image_for_pixmap): Use file_for_image
13 (update_frame_tool_bar): If direction is RTL, use RTL image if
14 defined. Use Gtk stock images if defined.
15
12007-08-27 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 162007-08-27 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 17
3 * macterm.c (x_draw_composite_glyph_string_foreground): Draw rectangle 18 * macterm.c (x_draw_composite_glyph_string_foreground): Draw rectangle
diff --git a/src/keyboard.c b/src/keyboard.c
index c542d291b46..adbbbcf85dd 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7907,10 +7907,11 @@ static Lisp_Object tool_bar_item_properties;
7907 7907
7908static int ntool_bar_items; 7908static int ntool_bar_items;
7909 7909
7910/* The symbols `tool-bar', and `:image'. */ 7910/* The symbols `tool-bar', `:image' and `:rtl'. */
7911 7911
7912extern Lisp_Object Qtool_bar; 7912extern Lisp_Object Qtool_bar;
7913Lisp_Object QCimage; 7913Lisp_Object QCimage;
7914Lisp_Object Qrtl;
7914 7915
7915/* Function prototypes. */ 7916/* Function prototypes. */
7916 7917
@@ -8196,6 +8197,9 @@ parse_tool_bar_item (key, item)
8196 /* Value is either a single image specification or a vector 8197 /* Value is either a single image specification or a vector
8197 of 4 such specifications for the different button states. */ 8198 of 4 such specifications for the different button states. */
8198 PROP (TOOL_BAR_ITEM_IMAGES) = value; 8199 PROP (TOOL_BAR_ITEM_IMAGES) = value;
8200 else if (EQ (key, Qrtl))
8201 /* ':rtl STRING' */
8202 PROP (TOOL_BAR_ITEM_RTL_IMAGE) = value;
8199 } 8203 }
8200 8204
8201 /* If got a filter apply it on binding. */ 8205 /* If got a filter apply it on binding. */
@@ -11223,6 +11227,9 @@ syms_of_keyboard ()
11223 staticpro (&Qhelp_echo); 11227 staticpro (&Qhelp_echo);
11224 Qhelp_echo = intern ("help-echo"); 11228 Qhelp_echo = intern ("help-echo");
11225 11229
11230 staticpro (&Qrtl);
11231 Qrtl = intern (":rtl");
11232
11226 staticpro (&item_properties); 11233 staticpro (&item_properties);
11227 item_properties = Qnil; 11234 item_properties = Qnil;
11228 11235