Mercurial > emacs
annotate src/gtkutil.c @ 87054:25de6f4a58d8
Merge remember-diary.el into remember.el
author | Michael Olson <mwolson@gnu.org> |
---|---|
date | Wed, 05 Dec 2007 01:16:38 +0000 |
parents | f0601f6fb8b0 |
children | 107ccd98fa12 53108e6cea98 |
rev | line source |
---|---|
49323 | 1 /* Functions for creating and updating GTK widgets. |
75348 | 2 Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. |
49323 | 3 |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software; you can redistribute it and/or modify | |
7 it under the terms of the GNU General Public License as published by | |
78260
922696f363b0
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
77511
diff
changeset
|
8 the Free Software Foundation; either version 3, or (at your option) |
49323 | 9 any later version. |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs; see the file COPYING. If not, write to | |
64084 | 18 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
19 Boston, MA 02110-1301, USA. */ | |
49323 | 20 |
21 #include "config.h" | |
22 | |
23 #ifdef USE_GTK | |
49359
14cf50ecf91a
gtkutil.c: Must include stdio.h before termhooks.h
Jan Djärv <jan.h.d@swipnet.se>
parents:
49325
diff
changeset
|
24 #include <string.h> |
58818
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
25 #include <signal.h> |
49359
14cf50ecf91a
gtkutil.c: Must include stdio.h before termhooks.h
Jan Djärv <jan.h.d@swipnet.se>
parents:
49325
diff
changeset
|
26 #include <stdio.h> |
49323 | 27 #include "lisp.h" |
28 #include "xterm.h" | |
29 #include "blockinput.h" | |
58818
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
30 #include "syssignal.h" |
49323 | 31 #include "window.h" |
32 #include "atimer.h" | |
33 #include "gtkutil.h" | |
34 #include "termhooks.h" | |
51408
8f1bed1dee3c
Include keyboard.h, charset.h, coding.h.
Dave Love <fx@gnu.org>
parents:
51211
diff
changeset
|
35 #include "keyboard.h" |
8f1bed1dee3c
Include keyboard.h, charset.h, coding.h.
Dave Love <fx@gnu.org>
parents:
51211
diff
changeset
|
36 #include "charset.h" |
8f1bed1dee3c
Include keyboard.h, charset.h, coding.h.
Dave Love <fx@gnu.org>
parents:
51211
diff
changeset
|
37 #include "coding.h" |
49323 | 38 #include <gdk/gdkkeysyms.h> |
39 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
40 |
49323 | 41 #define FRAME_TOTAL_PIXEL_HEIGHT(f) \ |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
42 (FRAME_PIXEL_HEIGHT (f) + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f)) |
50129
d0142038feaa
Reduce flicker in GTK scrollbars.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50112
diff
changeset
|
43 |
67528
c5c00342184b
* gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
65628
diff
changeset
|
44 /* Avoid "differ in sign" warnings */ |
c5c00342184b
* gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
65628
diff
changeset
|
45 #define SSDATA(x) ((char *) SDATA (x)) |
c5c00342184b
* gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
65628
diff
changeset
|
46 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
47 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
48 /*********************************************************************** |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
49 Display handling functions |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
50 ***********************************************************************/ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
51 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
52 #ifdef HAVE_GTK_MULTIDISPLAY |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
53 |
84621 | 54 /* Gtk does not work well without any display open. Emacs may close |
55 all its displays. In that case, keep a display around just for | |
56 the purpose of having one. */ | |
57 | |
58 static GdkDisplay *gdpy_def; | |
59 | |
60 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
61 /* Return the GdkDisplay that corresponds to the X display DPY. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
62 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
63 static GdkDisplay * |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
64 xg_get_gdk_display (dpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
65 Display *dpy; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
66 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
67 return gdk_x11_lookup_xdisplay (dpy); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
68 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
69 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
70 /* When the GTK widget W is to be created on a display for F that |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
71 is not the default display, set the display for W. |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
72 W can be a GtkMenu or a GtkWindow widget. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
73 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
74 static void |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
75 xg_set_screen (w, f) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
76 GtkWidget *w; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
77 FRAME_PTR f; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
78 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
79 if (FRAME_X_DISPLAY (f) != GDK_DISPLAY ()) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
80 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
81 GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f)); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
82 GdkScreen *gscreen = gdk_display_get_default_screen (gdpy); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
83 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
84 if (GTK_IS_MENU (w)) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
85 gtk_menu_set_screen (GTK_MENU (w), gscreen); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
86 else |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
87 gtk_window_set_screen (GTK_WINDOW (w), gscreen); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
88 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
89 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
90 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
91 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
92 #else /* not HAVE_GTK_MULTIDISPLAY */ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
93 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
94 /* Make some defines so we can use the GTK 2.2 functions when |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
95 compiling with GTK 2.0. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
96 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
97 #define xg_set_screen(w, f) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
98 #define gdk_xid_table_lookup_for_display(dpy, w) gdk_xid_table_lookup (w) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
99 #define gdk_pixmap_foreign_new_for_display(dpy, p) gdk_pixmap_foreign_new (p) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
100 #define gdk_cursor_new_for_display(dpy, c) gdk_cursor_new (c) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
101 #define gdk_x11_lookup_xdisplay(dpy) 0 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
102 #define GdkDisplay void |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
103 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
104 #endif /* not HAVE_GTK_MULTIDISPLAY */ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
105 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
106 /* Open a display named by DISPLAY_NAME. The display is returned in *DPY. |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
107 *DPY is set to NULL if the display can't be opened. |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
108 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
109 Returns non-zero if display could be opened, zero if display could not |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
110 be opened, and less than zero if the GTK version doesn't support |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
111 multipe displays. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
112 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
113 int |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
114 xg_display_open (display_name, dpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
115 char *display_name; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
116 Display **dpy; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
117 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
118 #ifdef HAVE_GTK_MULTIDISPLAY |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
119 GdkDisplay *gdpy; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
120 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
121 gdpy = gdk_display_open (display_name); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
122 *dpy = gdpy ? GDK_DISPLAY_XDISPLAY (gdpy) : NULL; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
123 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
124 return gdpy != NULL; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
125 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
126 #else /* not HAVE_GTK_MULTIDISPLAY */ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
127 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
128 return -1; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
129 #endif /* not HAVE_GTK_MULTIDISPLAY */ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
130 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
131 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
132 |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
133 /* Close display DPY. */ |
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
134 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
135 void |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
136 xg_display_close (Display *dpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
137 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
138 #ifdef HAVE_GTK_MULTIDISPLAY |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
139 GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (dpy); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
140 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
141 /* If this is the default display, we must change it before calling |
72778
ab6be05ddfb1
* gtkutil.c (xg_display_close): Always change default display if needed,
Jan Djärv <jan.h.d@swipnet.se>
parents:
72637
diff
changeset
|
142 dispose, otherwise it will crash on some Gtk+ versions. */ |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
143 if (gdk_display_get_default () == gdpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
144 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
145 struct x_display_info *dpyinfo; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
146 Display *new_dpy = 0; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
147 GdkDisplay *gdpy_new; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
148 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
149 /* Find another display. */ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
150 for (dpyinfo = x_display_list; dpyinfo; dpyinfo = dpyinfo->next) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
151 if (dpyinfo->display != dpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
152 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
153 new_dpy = dpyinfo->display; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
154 break; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
155 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
156 |
84621 | 157 if (new_dpy) |
158 gdpy_new = gdk_x11_lookup_xdisplay (new_dpy); | |
159 else | |
160 { | |
161 if (!gdpy_def) | |
162 gdpy_def = gdk_display_open (gdk_display_get_name (gdpy)); | |
163 gdpy_new = gdpy_def; | |
164 } | |
165 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
166 gdk_display_manager_set_default_display (gdk_display_manager_get (), |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
167 gdpy_new); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
168 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
169 |
72778
ab6be05ddfb1
* gtkutil.c (xg_display_close): Always change default display if needed,
Jan Djärv <jan.h.d@swipnet.se>
parents:
72637
diff
changeset
|
170 /* GTK 2.2-2.8 has a bug that makes gdk_display_close crash (bug |
ab6be05ddfb1
* gtkutil.c (xg_display_close): Always change default display if needed,
Jan Djärv <jan.h.d@swipnet.se>
parents:
72637
diff
changeset
|
171 http://bugzilla.gnome.org/show_bug.cgi?id=85715). This way |
ab6be05ddfb1
* gtkutil.c (xg_display_close): Always change default display if needed,
Jan Djärv <jan.h.d@swipnet.se>
parents:
72637
diff
changeset
|
172 we can continue running, but there will be memory leaks. */ |
ab6be05ddfb1
* gtkutil.c (xg_display_close): Always change default display if needed,
Jan Djärv <jan.h.d@swipnet.se>
parents:
72637
diff
changeset
|
173 |
ab6be05ddfb1
* gtkutil.c (xg_display_close): Always change default display if needed,
Jan Djärv <jan.h.d@swipnet.se>
parents:
72637
diff
changeset
|
174 #if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 10 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
175 g_object_run_dispose (G_OBJECT (gdpy)); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
176 #else |
72778
ab6be05ddfb1
* gtkutil.c (xg_display_close): Always change default display if needed,
Jan Djärv <jan.h.d@swipnet.se>
parents:
72637
diff
changeset
|
177 /* This seems to be fixed in GTK 2.10. */ |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
178 gdk_display_close (gdpy); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
179 #endif |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
180 #endif /* HAVE_GTK_MULTIDISPLAY */ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
181 } |
50129
d0142038feaa
Reduce flicker in GTK scrollbars.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50112
diff
changeset
|
182 |
49323 | 183 |
184 /*********************************************************************** | |
185 Utility functions | |
186 ***********************************************************************/ | |
187 /* The timer for scroll bar repetition and menu bar timeouts. | |
188 NULL if no timer is started. */ | |
189 static struct atimer *xg_timer; | |
190 | |
191 | |
192 /* The next two variables and functions are taken from lwlib. */ | |
193 static widget_value *widget_value_free_list; | |
194 static int malloc_cpt; | |
195 | |
196 /* Allocate a widget_value structure, either by taking one from the | |
197 widget_value_free_list or by malloc:ing a new one. | |
198 | |
199 Return a pointer to the allocated structure. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
200 |
49323 | 201 widget_value * |
202 malloc_widget_value () | |
203 { | |
204 widget_value *wv; | |
205 if (widget_value_free_list) | |
206 { | |
207 wv = widget_value_free_list; | |
208 widget_value_free_list = wv->free_list; | |
209 wv->free_list = 0; | |
210 } | |
211 else | |
212 { | |
69025
5d9232b72d14
(malloc_widget_value): Use xmalloc.
Richard M. Stallman <rms@gnu.org>
parents:
68922
diff
changeset
|
213 wv = (widget_value *) xmalloc (sizeof (widget_value)); |
49323 | 214 malloc_cpt++; |
215 } | |
216 memset (wv, 0, sizeof (widget_value)); | |
217 return wv; | |
218 } | |
219 | |
220 /* This is analogous to free. It frees only what was allocated | |
221 by malloc_widget_value, and no substructures. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
222 |
49323 | 223 void |
224 free_widget_value (wv) | |
225 widget_value *wv; | |
226 { | |
227 if (wv->free_list) | |
228 abort (); | |
229 | |
230 if (malloc_cpt > 25) | |
231 { | |
232 /* When the number of already allocated cells is too big, | |
233 We free it. */ | |
234 free (wv); | |
235 malloc_cpt--; | |
236 } | |
237 else | |
238 { | |
239 wv->free_list = widget_value_free_list; | |
240 widget_value_free_list = wv; | |
241 } | |
242 } | |
243 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
244 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
245 /* Create and return the cursor to be used for popup menus and |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
246 scroll bars on display DPY. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
247 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
248 GdkCursor * |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
249 xg_create_default_cursor (dpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
250 Display *dpy; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
251 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
252 GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (dpy); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
253 return gdk_cursor_new_for_display (gdpy, GDK_LEFT_PTR); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
254 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
255 |
64936
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
256 /* Apply GMASK to GPIX and return a GdkPixbuf with an alpha channel. */ |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
257 |
65006
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
258 static GdkPixbuf * |
64936
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
259 xg_get_pixbuf_from_pix_and_mask (gpix, gmask, cmap) |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
260 GdkPixmap *gpix; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
261 GdkPixmap *gmask; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
262 GdkColormap *cmap; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
263 { |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
264 int x, y, width, height, rowstride, mask_rowstride; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
265 GdkPixbuf *icon_buf, *tmp_buf; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
266 guchar *pixels; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
267 guchar *mask_pixels; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
268 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
269 gdk_drawable_get_size (gpix, &width, &height); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
270 tmp_buf = gdk_pixbuf_get_from_drawable (NULL, gpix, cmap, |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
271 0, 0, 0, 0, width, height); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
272 icon_buf = gdk_pixbuf_add_alpha (tmp_buf, FALSE, 0, 0, 0); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
273 g_object_unref (G_OBJECT (tmp_buf)); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
274 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
275 if (gmask) |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
276 { |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
277 GdkPixbuf *mask_buf = gdk_pixbuf_get_from_drawable (NULL, |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
278 gmask, |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
279 NULL, |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
280 0, 0, 0, 0, |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
281 width, height); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
282 guchar *pixels = gdk_pixbuf_get_pixels (icon_buf); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
283 guchar *mask_pixels = gdk_pixbuf_get_pixels (mask_buf); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
284 int rowstride = gdk_pixbuf_get_rowstride (icon_buf); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
285 int mask_rowstride = gdk_pixbuf_get_rowstride (mask_buf); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
286 int y; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
287 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
288 for (y = 0; y < height; ++y) |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
289 { |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
290 guchar *iconptr, *maskptr; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
291 int x; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
292 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
293 iconptr = pixels + y * rowstride; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
294 maskptr = mask_pixels + y * mask_rowstride; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
295 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
296 for (x = 0; x < width; ++x) |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
297 { |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
298 /* In a bitmap, RGB is either 255/255/255 or 0/0/0. Checking |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
299 just R is sufficient. */ |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
300 if (maskptr[0] == 0) |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
301 iconptr[3] = 0; /* 0, 1, 2 is R, G, B. 3 is alpha. */ |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
302 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
303 iconptr += rowstride/width; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
304 maskptr += mask_rowstride/width; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
305 } |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
306 } |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
307 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
308 g_object_unref (G_OBJECT (mask_buf)); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
309 } |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
310 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
311 return icon_buf; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
312 } |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
313 |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
314 static Lisp_Object |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
315 file_for_image(image) |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
316 Lisp_Object image; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
317 { |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
318 Lisp_Object specified_file = Qnil; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
319 Lisp_Object tail; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
320 extern Lisp_Object QCfile; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
321 |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
322 for (tail = XCDR (image); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
323 NILP (specified_file) && CONSP (tail) && CONSP (XCDR (tail)); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
324 tail = XCDR (XCDR (tail))) |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
325 if (EQ (XCAR (tail), QCfile)) |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
326 specified_file = XCAR (XCDR (tail)); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
327 |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
328 return specified_file; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
329 } |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
330 |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
331 /* For the image defined in IMG, make and return a GtkImage. For displays with |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
332 8 planes or less we must make a GdkPixbuf and apply the mask manually. |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
333 Otherwise the highlightning and dimming the tool bar code in GTK does |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
334 will look bad. For display with more than 8 planes we just use the |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
335 pixmap and mask directly. For monochrome displays, GTK doesn't seem |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
336 able to use external pixmaps, it looks bad whatever we do. |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
337 The image is defined on the display where frame F is. |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
338 WIDGET is used to find the GdkColormap to use for the GdkPixbuf. |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
339 If OLD_WIDGET is NULL, a new widget is constructed and returned. |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
340 If OLD_WIDGET is not NULL, that widget is modified. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
341 |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
342 static GtkWidget * |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
343 xg_get_image_for_pixmap (f, img, widget, old_widget) |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
344 FRAME_PTR f; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
345 struct image *img; |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
346 GtkWidget *widget; |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
347 GtkImage *old_widget; |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
348 { |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
349 GdkPixmap *gpix; |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
350 GdkPixmap *gmask; |
56269
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
351 GdkDisplay *gdpy; |
84604
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
352 GdkColormap *cmap; |
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
353 GdkPixbuf *icon_buf; |
56269
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
354 |
68027
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
355 /* If we have a file, let GTK do all the image handling. |
56269
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
356 This seems to be the only way to make insensitive and activated icons |
68027
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
357 look good in all cases. */ |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
358 Lisp_Object specified_file = file_for_image (img->spec); |
69141
6b335e9ea577
* gtkutil.c (xg_get_image_for_pixmap): If x_find_image_file returns
Jan Djärv <jan.h.d@swipnet.se>
parents:
69025
diff
changeset
|
359 Lisp_Object file; |
68027
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
360 |
69141
6b335e9ea577
* gtkutil.c (xg_get_image_for_pixmap): If x_find_image_file returns
Jan Djärv <jan.h.d@swipnet.se>
parents:
69025
diff
changeset
|
361 /* We already loaded the image once before calling this |
6b335e9ea577
* gtkutil.c (xg_get_image_for_pixmap): If x_find_image_file returns
Jan Djärv <jan.h.d@swipnet.se>
parents:
69025
diff
changeset
|
362 function, so this only fails if the image file has been removed. |
6b335e9ea577
* gtkutil.c (xg_get_image_for_pixmap): If x_find_image_file returns
Jan Djärv <jan.h.d@swipnet.se>
parents:
69025
diff
changeset
|
363 In that case, use the pixmap already loaded. */ |
6b335e9ea577
* gtkutil.c (xg_get_image_for_pixmap): If x_find_image_file returns
Jan Djärv <jan.h.d@swipnet.se>
parents:
69025
diff
changeset
|
364 |
6b335e9ea577
* gtkutil.c (xg_get_image_for_pixmap): If x_find_image_file returns
Jan Djärv <jan.h.d@swipnet.se>
parents:
69025
diff
changeset
|
365 if (STRINGP (specified_file) |
6b335e9ea577
* gtkutil.c (xg_get_image_for_pixmap): If x_find_image_file returns
Jan Djärv <jan.h.d@swipnet.se>
parents:
69025
diff
changeset
|
366 && STRINGP (file = x_find_image_file (specified_file))) |
56269
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
367 { |
68027
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
368 if (! old_widget) |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
369 old_widget = GTK_IMAGE (gtk_image_new_from_file (SSDATA (file))); |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
370 else |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
371 gtk_image_set_from_file (old_widget, SSDATA (file)); |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
372 |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
373 return GTK_WIDGET (old_widget); |
56269
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
374 } |
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
375 |
68027
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
376 /* No file, do the image handling ourselves. This will look very bad |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
377 on a monochrome display, and sometimes bad on all displays with |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
378 certain themes. */ |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
379 |
56269
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
380 gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f)); |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
381 gpix = gdk_pixmap_foreign_new_for_display (gdpy, img->pixmap); |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
382 gmask = img->mask ? gdk_pixmap_foreign_new_for_display (gdpy, img->mask) : 0; |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
383 |
84604
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
384 /* This is a workaround to make icons look good on pseudo color |
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
385 displays. Apparently GTK expects the images to have an alpha |
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
386 channel. If they don't, insensitive and activated icons will |
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
387 look bad. This workaround does not work on monochrome displays, |
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
388 and is strictly not needed on true color/static color displays (i.e. |
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
389 16 bits and higher). But we do it anyway so we get a pixbuf that is |
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
390 not associated with the img->pixmap. The img->pixmap may be removed |
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
391 by clearing the image cache and then the tool bar redraw fails, since |
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
392 Gtk+ assumes the pixmap is always there. */ |
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
393 cmap = gtk_widget_get_colormap (widget); |
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
394 icon_buf = xg_get_pixbuf_from_pix_and_mask (gpix, gmask, cmap); |
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
395 |
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
396 if (! old_widget) |
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
397 old_widget = GTK_IMAGE (gtk_image_new_from_pixbuf (icon_buf)); |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
398 else |
84604
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
399 gtk_image_set_from_pixbuf (old_widget, icon_buf); |
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
400 |
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
401 g_object_unref (G_OBJECT (icon_buf)); |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
402 |
56268
9853134cd610
* gtkutil.c (xg_get_image_for_pixmap): Call g_object_unref on
Jan Djärv <jan.h.d@swipnet.se>
parents:
56112
diff
changeset
|
403 g_object_unref (G_OBJECT (gpix)); |
9853134cd610
* gtkutil.c (xg_get_image_for_pixmap): Call g_object_unref on
Jan Djärv <jan.h.d@swipnet.se>
parents:
56112
diff
changeset
|
404 if (gmask) g_object_unref (G_OBJECT (gmask)); |
9853134cd610
* gtkutil.c (xg_get_image_for_pixmap): Call g_object_unref on
Jan Djärv <jan.h.d@swipnet.se>
parents:
56112
diff
changeset
|
405 |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
406 return GTK_WIDGET (old_widget); |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
407 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
408 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
409 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
410 /* Set CURSOR on W and all widgets W contain. We must do like this |
49323 | 411 for scroll bars and menu because they create widgets internally, |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
412 and it is those widgets that are visible. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
413 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
414 static void |
49323 | 415 xg_set_cursor (w, cursor) |
416 GtkWidget *w; | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
417 GdkCursor *cursor; |
49323 | 418 { |
419 GList *children = gdk_window_peek_children (w->window); | |
420 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
421 gdk_window_set_cursor (w->window, cursor); |
49323 | 422 |
423 /* The scroll bar widget has more than one GDK window (had to look at | |
424 the source to figure this out), and there is no way to set cursor | |
425 on widgets in GTK. So we must set the cursor for all GDK windows. | |
426 Ditto for menus. */ | |
427 | |
428 for ( ; children; children = g_list_next (children)) | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
429 gdk_window_set_cursor (GDK_WINDOW (children->data), cursor); |
49323 | 430 } |
431 | |
432 /* Timer function called when a timeout occurs for xg_timer. | |
433 This function processes all GTK events in a recursive event loop. | |
434 This is done because GTK timer events are not seen by Emacs event | |
435 detection, Emacs only looks for X events. When a scroll bar has the | |
436 pointer (detected by button press/release events below) an Emacs | |
437 timer is started, and this function can then check if the GTK timer | |
438 has expired by calling the GTK event loop. | |
439 Also, when a menu is active, it has a small timeout before it | |
440 pops down the sub menu under it. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
441 |
49323 | 442 static void |
443 xg_process_timeouts (timer) | |
444 struct atimer *timer; | |
445 { | |
446 BLOCK_INPUT; | |
447 /* Ideally we would like to just handle timer events, like the Xt version | |
448 of this does in xterm.c, but there is no such feature in GTK. */ | |
449 while (gtk_events_pending ()) | |
450 gtk_main_iteration (); | |
451 UNBLOCK_INPUT; | |
452 } | |
453 | |
454 /* Start the xg_timer with an interval of 0.1 seconds, if not already started. | |
455 xg_process_timeouts is called when the timer expires. The timer | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
456 started is continuous, i.e. runs until xg_stop_timer is called. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
457 |
49323 | 458 static void |
459 xg_start_timer () | |
460 { | |
461 if (! xg_timer) | |
462 { | |
463 EMACS_TIME interval; | |
464 EMACS_SET_SECS_USECS (interval, 0, 100000); | |
465 xg_timer = start_atimer (ATIMER_CONTINUOUS, | |
466 interval, | |
467 xg_process_timeouts, | |
468 0); | |
469 } | |
470 } | |
471 | |
472 /* Stop the xg_timer if started. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
473 |
49323 | 474 static void |
475 xg_stop_timer () | |
476 { | |
477 if (xg_timer) | |
478 { | |
479 cancel_atimer (xg_timer); | |
480 xg_timer = 0; | |
481 } | |
482 } | |
483 | |
484 /* Insert NODE into linked LIST. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
485 |
49323 | 486 static void |
487 xg_list_insert (xg_list_node *list, xg_list_node *node) | |
488 { | |
489 xg_list_node *list_start = list->next; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
490 |
49323 | 491 if (list_start) list_start->prev = node; |
492 node->next = list_start; | |
493 node->prev = 0; | |
494 list->next = node; | |
495 } | |
496 | |
497 /* Remove NODE from linked LIST. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
498 |
49323 | 499 static void |
500 xg_list_remove (xg_list_node *list, xg_list_node *node) | |
501 { | |
502 xg_list_node *list_start = list->next; | |
503 if (node == list_start) | |
504 { | |
505 list->next = node->next; | |
506 if (list->next) list->next->prev = 0; | |
507 } | |
508 else | |
509 { | |
510 node->prev->next = node->next; | |
511 if (node->next) node->next->prev = node->prev; | |
512 } | |
513 } | |
514 | |
515 /* Allocate and return a utf8 version of STR. If STR is already | |
516 utf8 or NULL, just return STR. | |
517 If not, a new string is allocated and the caller must free the result | |
518 with g_free. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
519 |
49323 | 520 static char * |
521 get_utf8_string (str) | |
522 char *str; | |
523 { | |
524 char *utf8_str = str; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
525 |
72928
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
526 if (!str) return NULL; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
527 |
49323 | 528 /* If not UTF-8, try current locale. */ |
72928
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
529 if (!g_utf8_validate (str, -1, NULL)) |
49323 | 530 utf8_str = g_locale_to_utf8 (str, -1, 0, 0, 0); |
531 | |
72928
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
532 if (!utf8_str) |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
533 { |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
534 /* Probably some control characters in str. Escape them. */ |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
535 size_t nr_bad = 0; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
536 gsize bytes_read; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
537 gsize bytes_written; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
538 unsigned char *p = (unsigned char *)str; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
539 char *cp, *up; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
540 GError *error = NULL; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
541 |
73389
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
542 while (! (cp = g_locale_to_utf8 ((char *)p, -1, &bytes_read, |
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
543 &bytes_written, &error)) |
72928
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
544 && error->code == G_CONVERT_ERROR_ILLEGAL_SEQUENCE) |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
545 { |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
546 ++nr_bad; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
547 p += bytes_written+1; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
548 g_error_free (error); |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
549 error = NULL; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
550 } |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
551 |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
552 if (error) |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
553 { |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
554 g_error_free (error); |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
555 error = NULL; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
556 } |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
557 if (cp) g_free (cp); |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
558 |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
559 up = utf8_str = xmalloc (strlen (str) + nr_bad * 4 + 1); |
73389
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
560 p = (unsigned char *)str; |
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
561 |
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
562 while (! (cp = g_locale_to_utf8 ((char *)p, -1, &bytes_read, |
72928
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
563 &bytes_written, &error)) |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
564 && error->code == G_CONVERT_ERROR_ILLEGAL_SEQUENCE) |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
565 { |
73389
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
566 strncpy (up, (char *)p, bytes_written); |
72928
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
567 sprintf (up + bytes_written, "\\%03o", p[bytes_written]); |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
568 up[bytes_written+4] = '\0'; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
569 up += bytes_written+4; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
570 p += bytes_written+1; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
571 g_error_free (error); |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
572 error = NULL; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
573 } |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
574 |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
575 if (cp) |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
576 { |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
577 strcat (utf8_str, cp); |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
578 g_free (cp); |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
579 } |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
580 if (error) |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
581 { |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
582 g_error_free (error); |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
583 error = NULL; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
584 } |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
585 } |
49323 | 586 return utf8_str; |
587 } | |
588 | |
589 | |
590 | |
591 /*********************************************************************** | |
592 General functions for creating widgets, resizing, events, e.t.c. | |
593 ***********************************************************************/ | |
594 | |
595 /* Make a geometry string and pass that to GTK. It seems this is the | |
596 only way to get geometry position right if the user explicitly | |
597 asked for a position when starting Emacs. | |
598 F is the frame we shall set geometry for. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
599 |
49323 | 600 static void |
601 xg_set_geometry (f) | |
602 FRAME_PTR f; | |
603 { | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
604 if (f->size_hint_flags & USPosition) |
49323 | 605 { |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
606 int left = f->left_pos; |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
607 int xneg = f->size_hint_flags & XNegative; |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
608 int top = f->top_pos; |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
609 int yneg = f->size_hint_flags & YNegative; |
49323 | 610 char geom_str[32]; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
611 |
49323 | 612 if (xneg) |
613 left = -left; | |
614 if (yneg) | |
615 top = -top; | |
616 | |
617 sprintf (geom_str, "=%dx%d%c%d%c%d", | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
618 FRAME_PIXEL_WIDTH (f), |
49323 | 619 FRAME_TOTAL_PIXEL_HEIGHT (f), |
620 (xneg ? '-' : '+'), left, | |
621 (yneg ? '-' : '+'), top); | |
622 | |
623 if (!gtk_window_parse_geometry (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), | |
624 geom_str)) | |
625 fprintf (stderr, "Failed to parse: '%s'\n", geom_str); | |
65628
a998f173b21a
* gtkutil.c (xg_set_geometry): Do a gtk_window_move if program
Jan Djärv <jan.h.d@swipnet.se>
parents:
65006
diff
changeset
|
626 } else if (f->size_hint_flags & PPosition) { |
a998f173b21a
* gtkutil.c (xg_set_geometry): Do a gtk_window_move if program
Jan Djärv <jan.h.d@swipnet.se>
parents:
65006
diff
changeset
|
627 gtk_window_move (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), |
a998f173b21a
* gtkutil.c (xg_set_geometry): Do a gtk_window_move if program
Jan Djärv <jan.h.d@swipnet.se>
parents:
65006
diff
changeset
|
628 f->left_pos, f->top_pos); |
49323 | 629 } |
630 } | |
631 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
632 |
49323 | 633 /* Resize the outer window of frame F after chainging the height. |
634 This happend when the menu bar or the tool bar is added or removed. | |
635 COLUMNS/ROWS is the size the edit area shall have after the resize. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
636 |
49323 | 637 static void |
638 xg_resize_outer_widget (f, columns, rows) | |
639 FRAME_PTR f; | |
640 int columns; | |
641 int rows; | |
642 { | |
643 /* If we are not mapped yet, set geometry once again, as window | |
644 height now have changed. */ | |
645 if (! GTK_WIDGET_MAPPED (FRAME_GTK_OUTER_WIDGET (f))) | |
646 xg_set_geometry (f); | |
647 | |
648 xg_frame_set_char_size (f, columns, rows); | |
649 gdk_window_process_all_updates (); | |
650 } | |
651 | |
652 /* Function to handle resize of our widgets. Since Emacs has some layouts | |
653 that does not fit well with GTK standard containers, we do most layout | |
654 manually. | |
655 F is the frame to resize. | |
656 PIXELWIDTH, PIXELHEIGHT is the new size in pixels. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
657 |
49323 | 658 void |
659 xg_resize_widgets (f, pixelwidth, pixelheight) | |
660 FRAME_PTR f; | |
661 int pixelwidth, pixelheight; | |
662 { | |
663 int mbheight = FRAME_MENUBAR_HEIGHT (f); | |
664 int tbheight = FRAME_TOOLBAR_HEIGHT (f); | |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
665 int rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, (pixelheight |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
666 - mbheight - tbheight)); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
667 int columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixelwidth); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
668 |
49323 | 669 if (FRAME_GTK_WIDGET (f) |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
670 && (columns != FRAME_COLS (f) |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
671 || rows != FRAME_LINES (f) |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
672 || pixelwidth != FRAME_PIXEL_WIDTH (f) |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
673 || pixelheight != FRAME_PIXEL_HEIGHT (f))) |
49323 | 674 { |
675 struct x_output *x = f->output_data.x; | |
676 GtkAllocation all; | |
677 | |
678 all.y = mbheight + tbheight; | |
679 all.x = 0; | |
680 | |
681 all.width = pixelwidth; | |
682 all.height = pixelheight - mbheight - tbheight; | |
683 | |
684 gtk_widget_size_allocate (x->edit_widget, &all); | |
50129
d0142038feaa
Reduce flicker in GTK scrollbars.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50112
diff
changeset
|
685 |
49323 | 686 change_frame_size (f, rows, columns, 0, 1, 0); |
687 SET_FRAME_GARBAGED (f); | |
688 cancel_mouse_face (f); | |
689 } | |
690 } | |
691 | |
692 | |
693 /* Update our widget size to be COLS/ROWS characters for frame F. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
694 |
49323 | 695 void |
696 xg_frame_set_char_size (f, cols, rows) | |
697 FRAME_PTR f; | |
698 int cols; | |
699 int rows; | |
700 { | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
701 int pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows) |
49323 | 702 + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); |
50318
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
703 int pixelwidth; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
704 |
49323 | 705 /* Take into account the size of the scroll bar. Always use the |
706 number of columns occupied by the scroll bar here otherwise we | |
707 might end up with a frame width that is not a multiple of the | |
708 frame's character width which is bad for vertically split | |
709 windows. */ | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
710 f->scroll_bar_actual_width |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
711 = FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f); |
49323 | 712 |
50099
a62497b91c74
Use generic compute_fringe_widths.
Kim F. Storm <storm@cua.dk>
parents:
50063
diff
changeset
|
713 compute_fringe_widths (f, 0); |
49323 | 714 |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
715 /* FRAME_TEXT_COLS_TO_PIXEL_WIDTH uses scroll_bar_actual_width, so call it |
50318
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
716 after calculating that value. */ |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
717 pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols); |
50318
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
718 |
49323 | 719 /* Must resize our top level widget. Font size may have changed, |
720 but not rows/cols. */ | |
721 gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), | |
722 pixelwidth, pixelheight); | |
723 xg_resize_widgets (f, pixelwidth, pixelheight); | |
53275
a07a0bae1990
* gtkutil.c (xg_frame_set_char_size): Call x_wm_set_size_hint.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53069
diff
changeset
|
724 x_wm_set_size_hint (f, 0, 0); |
50318
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
725 SET_FRAME_GARBAGED (f); |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
726 cancel_mouse_face (f); |
49323 | 727 } |
728 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
729 /* Convert an X Window WSESC on display DPY to its corresponding GtkWidget. |
49323 | 730 Must be done like this, because GtkWidget:s can have "hidden" |
731 X Window that aren't accessible. | |
732 | |
733 Return 0 if no widget match WDESC. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
734 |
49323 | 735 GtkWidget * |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
736 xg_win_to_widget (dpy, wdesc) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
737 Display *dpy; |
49323 | 738 Window wdesc; |
739 { | |
740 gpointer gdkwin; | |
741 GtkWidget *gwdesc = 0; | |
742 | |
743 BLOCK_INPUT; | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
744 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
745 gdkwin = gdk_xid_table_lookup_for_display (gdk_x11_lookup_xdisplay (dpy), |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
746 wdesc); |
49323 | 747 if (gdkwin) |
748 { | |
749 GdkEvent event; | |
750 event.any.window = gdkwin; | |
751 gwdesc = gtk_get_event_widget (&event); | |
752 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
753 |
49323 | 754 UNBLOCK_INPUT; |
755 return gwdesc; | |
756 } | |
757 | |
758 /* Fill in the GdkColor C so that it represents PIXEL. | |
759 W is the widget that color will be used for. Used to find colormap. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
760 |
49323 | 761 static void |
762 xg_pix_to_gcolor (w, pixel, c) | |
763 GtkWidget *w; | |
764 unsigned long pixel; | |
765 GdkColor *c; | |
766 { | |
767 GdkColormap *map = gtk_widget_get_colormap (w); | |
768 gdk_colormap_query_color (map, pixel, c); | |
769 } | |
770 | |
771 /* Create and set up the GTK widgets for frame F. | |
772 Return 0 if creation failed, non-zero otherwise. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
773 |
49323 | 774 int |
775 xg_create_frame_widgets (f) | |
776 FRAME_PTR f; | |
777 { | |
778 GtkWidget *wtop; | |
779 GtkWidget *wvbox; | |
780 GtkWidget *wfixed; | |
781 GdkColor bg; | |
782 GtkRcStyle *style; | |
783 int i; | |
784 char *title = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
785 |
49323 | 786 BLOCK_INPUT; |
787 | |
788 wtop = gtk_window_new (GTK_WINDOW_TOPLEVEL); | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
789 xg_set_screen (wtop, f); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
790 |
49323 | 791 wvbox = gtk_vbox_new (FALSE, 0); |
792 wfixed = gtk_fixed_new (); /* Must have this to place scroll bars */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
793 |
49323 | 794 if (! wtop || ! wvbox || ! wfixed) |
795 { | |
796 if (wtop) gtk_widget_destroy (wtop); | |
797 if (wvbox) gtk_widget_destroy (wvbox); | |
798 if (wfixed) gtk_widget_destroy (wfixed); | |
799 | |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
800 UNBLOCK_INPUT; |
49323 | 801 return 0; |
802 } | |
803 | |
804 /* Use same names as the Xt port does. I.e. Emacs.pane.emacs by default */ | |
805 gtk_widget_set_name (wtop, EMACS_CLASS); | |
806 gtk_widget_set_name (wvbox, "pane"); | |
67528
c5c00342184b
* gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
65628
diff
changeset
|
807 gtk_widget_set_name (wfixed, SSDATA (Vx_resource_name)); |
49323 | 808 |
809 /* If this frame has a title or name, set it in the title bar. */ | |
67528
c5c00342184b
* gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
65628
diff
changeset
|
810 if (! NILP (f->title)) title = SSDATA (ENCODE_UTF_8 (f->title)); |
c5c00342184b
* gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
65628
diff
changeset
|
811 else if (! NILP (f->name)) title = SSDATA (ENCODE_UTF_8 (f->name)); |
49323 | 812 |
813 if (title) gtk_window_set_title (GTK_WINDOW (wtop), title); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
814 |
49323 | 815 FRAME_GTK_OUTER_WIDGET (f) = wtop; |
816 FRAME_GTK_WIDGET (f) = wfixed; | |
817 f->output_data.x->vbox_widget = wvbox; | |
818 | |
819 gtk_fixed_set_has_window (GTK_FIXED (wfixed), TRUE); | |
820 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
821 gtk_widget_set_size_request (wfixed, FRAME_PIXEL_WIDTH (f), |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
822 FRAME_PIXEL_HEIGHT (f)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
823 |
49323 | 824 gtk_container_add (GTK_CONTAINER (wtop), wvbox); |
825 gtk_box_pack_end (GTK_BOX (wvbox), wfixed, TRUE, TRUE, 0); | |
826 | |
827 if (FRAME_EXTERNAL_TOOL_BAR (f)) | |
828 update_frame_tool_bar (f); | |
829 | |
830 /* The tool bar is created but first there are no items in it. | |
831 This causes it to be zero height. Later items are added, but then | |
832 the frame is already mapped, so there is a "jumping" resize. | |
833 This makes geometry handling difficult, for example -0-0 will end | |
834 up in the wrong place as tool bar height has not been taken into account. | |
835 So we cheat a bit by setting a height that is what it will have | |
836 later on when tool bar items are added. */ | |
56804
3f2598db97ac
* gtkutil.c (xg_create_frame_widgets): Compensate for tool bar when
Jan Djärv <jan.h.d@swipnet.se>
parents:
56269
diff
changeset
|
837 if (FRAME_EXTERNAL_TOOL_BAR (f) && f->n_tool_bar_items == 0) |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
838 FRAME_TOOLBAR_HEIGHT (f) = 38; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
839 |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
840 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
841 /* We don't want this widget double buffered, because we draw on it |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
842 with regular X drawing primitives, so from a GTK/GDK point of |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
843 view, the widget is totally blank. When an expose comes, this |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
844 will make the widget blank, and then Emacs redraws it. This flickers |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
845 a lot, so we turn off double buffering. */ |
49323 | 846 gtk_widget_set_double_buffered (wfixed, FALSE); |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
847 |
49323 | 848 /* GTK documents says use gtk_window_set_resizable. But then a user |
849 can't shrink the window from its starting size. */ | |
850 gtk_window_set_policy (GTK_WINDOW (wtop), TRUE, TRUE, TRUE); | |
851 gtk_window_set_wmclass (GTK_WINDOW (wtop), | |
67528
c5c00342184b
* gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
65628
diff
changeset
|
852 SSDATA (Vx_resource_name), |
c5c00342184b
* gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
65628
diff
changeset
|
853 SSDATA (Vx_resource_class)); |
49323 | 854 |
855 /* Add callback to do nothing on WM_DELETE_WINDOW. The default in | |
856 GTK is to destroy the widget. We want Emacs to do that instead. */ | |
857 g_signal_connect (G_OBJECT (wtop), "delete-event", | |
858 G_CALLBACK (gtk_true), 0); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
859 |
49323 | 860 /* Convert our geometry parameters into a geometry string |
861 and specify it. | |
862 GTK will itself handle calculating the real position this way. */ | |
863 xg_set_geometry (f); | |
864 | |
865 gtk_widget_add_events (wfixed, | |
866 GDK_POINTER_MOTION_MASK | |
867 | GDK_EXPOSURE_MASK | |
868 | GDK_BUTTON_PRESS_MASK | |
869 | GDK_BUTTON_RELEASE_MASK | |
870 | GDK_KEY_PRESS_MASK | |
871 | GDK_ENTER_NOTIFY_MASK | |
872 | GDK_LEAVE_NOTIFY_MASK | |
873 | GDK_FOCUS_CHANGE_MASK | |
874 | GDK_STRUCTURE_MASK | |
875 | GDK_VISIBILITY_NOTIFY_MASK); | |
876 | |
877 /* Must realize the windows so the X window gets created. It is used | |
878 by callers of this function. */ | |
879 gtk_widget_realize (wfixed); | |
880 FRAME_X_WINDOW (f) = GTK_WIDGET_TO_X_WIN (wfixed); | |
881 | |
882 /* Since GTK clears its window by filling with the background color, | |
883 we must keep X and GTK background in sync. */ | |
83505 | 884 xg_pix_to_gcolor (wfixed, FRAME_BACKGROUND_PIXEL (f), &bg); |
49323 | 885 gtk_widget_modify_bg (wfixed, GTK_STATE_NORMAL, &bg); |
886 | |
887 /* Also, do not let any background pixmap to be set, this looks very | |
888 bad as Emacs overwrites the background pixmap with its own idea | |
889 of background color. */ | |
890 style = gtk_widget_get_modifier_style (wfixed); | |
891 | |
892 /* Must use g_strdup because gtk_widget_modify_style does g_free. */ | |
893 style->bg_pixmap_name[GTK_STATE_NORMAL] = g_strdup ("<none>"); | |
894 gtk_widget_modify_style (wfixed, style); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
895 |
49323 | 896 /* GTK does not set any border, and they look bad with GTK. */ |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
897 f->border_width = 0; |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
898 f->internal_border_width = 0; |
49323 | 899 |
900 UNBLOCK_INPUT; | |
901 | |
902 return 1; | |
903 } | |
904 | |
905 /* Set the normal size hints for the window manager, for frame F. | |
906 FLAGS is the flags word to use--or 0 meaning preserve the flags | |
907 that the window now has. | |
908 If USER_POSITION is nonzero, we set the User Position | |
909 flag (this is useful when FLAGS is 0). */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
910 |
49323 | 911 void |
912 x_wm_set_size_hint (f, flags, user_position) | |
913 FRAME_PTR f; | |
914 long flags; | |
915 int user_position; | |
916 { | |
917 if (FRAME_GTK_OUTER_WIDGET (f)) | |
918 { | |
919 /* Must use GTK routines here, otherwise GTK resets the size hints | |
920 to its own defaults. */ | |
921 GdkGeometry size_hints; | |
922 gint hint_flags = 0; | |
923 int base_width, base_height; | |
924 int min_rows = 0, min_cols = 0; | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
925 int win_gravity = f->win_gravity; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
926 |
49323 | 927 if (flags) |
928 { | |
929 memset (&size_hints, 0, sizeof (size_hints)); | |
930 f->output_data.x->size_hints = size_hints; | |
931 f->output_data.x->hint_flags = hint_flags; | |
932 } | |
933 else | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
934 flags = f->size_hint_flags; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
935 |
49323 | 936 size_hints = f->output_data.x->size_hints; |
937 hint_flags = f->output_data.x->hint_flags; | |
938 | |
939 hint_flags |= GDK_HINT_RESIZE_INC | GDK_HINT_MIN_SIZE; | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
940 size_hints.width_inc = FRAME_COLUMN_WIDTH (f); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
941 size_hints.height_inc = FRAME_LINE_HEIGHT (f); |
49323 | 942 |
943 hint_flags |= GDK_HINT_BASE_SIZE; | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
944 base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
945 base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0) |
49323 | 946 + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); |
947 | |
948 check_frame_size (f, &min_rows, &min_cols); | |
949 | |
950 size_hints.base_width = base_width; | |
951 size_hints.base_height = base_height; | |
952 size_hints.min_width = base_width + min_cols * size_hints.width_inc; | |
953 size_hints.min_height = base_height + min_rows * size_hints.height_inc; | |
954 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
955 |
49323 | 956 /* These currently have a one to one mapping with the X values, but I |
957 don't think we should rely on that. */ | |
958 hint_flags |= GDK_HINT_WIN_GRAVITY; | |
959 size_hints.win_gravity = 0; | |
960 if (win_gravity == NorthWestGravity) | |
961 size_hints.win_gravity = GDK_GRAVITY_NORTH_WEST; | |
962 else if (win_gravity == NorthGravity) | |
963 size_hints.win_gravity = GDK_GRAVITY_NORTH; | |
964 else if (win_gravity == NorthEastGravity) | |
965 size_hints.win_gravity = GDK_GRAVITY_NORTH_EAST; | |
966 else if (win_gravity == WestGravity) | |
967 size_hints.win_gravity = GDK_GRAVITY_WEST; | |
968 else if (win_gravity == CenterGravity) | |
969 size_hints.win_gravity = GDK_GRAVITY_CENTER; | |
970 else if (win_gravity == EastGravity) | |
971 size_hints.win_gravity = GDK_GRAVITY_EAST; | |
972 else if (win_gravity == SouthWestGravity) | |
973 size_hints.win_gravity = GDK_GRAVITY_SOUTH_WEST; | |
974 else if (win_gravity == SouthGravity) | |
975 size_hints.win_gravity = GDK_GRAVITY_SOUTH; | |
976 else if (win_gravity == SouthEastGravity) | |
977 size_hints.win_gravity = GDK_GRAVITY_SOUTH_EAST; | |
978 else if (win_gravity == StaticGravity) | |
979 size_hints.win_gravity = GDK_GRAVITY_STATIC; | |
980 | |
981 if (flags & PPosition) hint_flags |= GDK_HINT_POS; | |
982 if (flags & USPosition) hint_flags |= GDK_HINT_USER_POS; | |
983 if (flags & USSize) hint_flags |= GDK_HINT_USER_SIZE; | |
984 | |
985 if (user_position) | |
986 { | |
987 hint_flags &= ~GDK_HINT_POS; | |
988 hint_flags |= GDK_HINT_USER_POS; | |
989 } | |
990 | |
991 BLOCK_INPUT; | |
992 | |
993 gtk_window_set_geometry_hints (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), | |
994 FRAME_GTK_OUTER_WIDGET (f), | |
995 &size_hints, | |
996 hint_flags); | |
997 | |
998 f->output_data.x->size_hints = size_hints; | |
999 f->output_data.x->hint_flags = hint_flags; | |
1000 UNBLOCK_INPUT; | |
1001 } | |
1002 } | |
1003 | |
1004 /* Change background color of a frame. | |
1005 Since GTK uses the background colour to clear the window, we must | |
1006 keep the GTK and X colors in sync. | |
1007 F is the frame to change, | |
1008 BG is the pixel value to change to. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1009 |
49323 | 1010 void |
1011 xg_set_background_color (f, bg) | |
1012 FRAME_PTR f; | |
1013 unsigned long bg; | |
1014 { | |
1015 if (FRAME_GTK_WIDGET (f)) | |
1016 { | |
1017 GdkColor gdk_bg; | |
1018 | |
1019 BLOCK_INPUT; | |
1020 xg_pix_to_gcolor (FRAME_GTK_WIDGET (f), bg, &gdk_bg); | |
1021 gtk_widget_modify_bg (FRAME_GTK_WIDGET (f), GTK_STATE_NORMAL, &gdk_bg); | |
1022 UNBLOCK_INPUT; | |
1023 } | |
1024 } | |
1025 | |
1026 | |
65006
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1027 /* Set the frame icon to ICON_PIXMAP/MASK. This must be done with GTK |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1028 functions so GTK does not overwrite the icon. */ |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1029 |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1030 void |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1031 xg_set_frame_icon (f, icon_pixmap, icon_mask) |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1032 FRAME_PTR f; |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1033 Pixmap icon_pixmap; |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1034 Pixmap icon_mask; |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1035 { |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1036 GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f)); |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1037 GdkPixmap *gpix = gdk_pixmap_foreign_new_for_display (gdpy, icon_pixmap); |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1038 GdkPixmap *gmask = gdk_pixmap_foreign_new_for_display (gdpy, icon_mask); |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1039 GdkPixbuf *gp = xg_get_pixbuf_from_pix_and_mask (gpix, gmask, NULL); |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1040 |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1041 gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), gp); |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1042 } |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1043 |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1044 |
49323 | 1045 |
1046 /*********************************************************************** | |
1047 Dialog functions | |
1048 ***********************************************************************/ | |
1049 /* Return the dialog title to use for a dialog of type KEY. | |
1050 This is the encoding used by lwlib. We use the same for GTK. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1051 |
49323 | 1052 static char * |
1053 get_dialog_title (char key) | |
1054 { | |
1055 char *title = ""; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1056 |
49323 | 1057 switch (key) { |
1058 case 'E': case 'e': | |
1059 title = "Error"; | |
1060 break; | |
1061 | |
1062 case 'I': case 'i': | |
1063 title = "Information"; | |
1064 break; | |
1065 | |
1066 case 'L': case 'l': | |
1067 title = "Prompt"; | |
1068 break; | |
1069 | |
1070 case 'P': case 'p': | |
1071 title = "Prompt"; | |
1072 break; | |
1073 | |
1074 case 'Q': case 'q': | |
1075 title = "Question"; | |
1076 break; | |
1077 } | |
1078 | |
1079 return title; | |
1080 } | |
1081 | |
1082 /* Callback for dialogs that get WM_DELETE_WINDOW. We pop down | |
1083 the dialog, but return TRUE so the event does not propagate further | |
1084 in GTK. This prevents GTK from destroying the dialog widget automatically | |
1085 and we can always destrou the widget manually, regardles of how | |
1086 it was popped down (button press or WM_DELETE_WINDOW). | |
1087 W is the dialog widget. | |
1088 EVENT is the GdkEvent that represents WM_DELETE_WINDOW (not used). | |
1089 user_data is NULL (not used). | |
1090 | |
1091 Returns TRUE to end propagation of event. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1092 |
49323 | 1093 static gboolean |
1094 dialog_delete_callback (w, event, user_data) | |
1095 GtkWidget *w; | |
1096 GdkEvent *event; | |
1097 gpointer user_data; | |
1098 { | |
1099 gtk_widget_unmap (w); | |
1100 return TRUE; | |
1101 } | |
1102 | |
1103 /* Create a popup dialog window. See also xg_create_widget below. | |
1104 WV is a widget_value describing the dialog. | |
1105 SELECT_CB is the callback to use when a button has been pressed. | |
1106 DEACTIVATE_CB is the callback to use when the dialog pops down. | |
1107 | |
1108 Returns the GTK dialog widget. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1109 |
49323 | 1110 static GtkWidget * |
1111 create_dialog (wv, select_cb, deactivate_cb) | |
1112 widget_value *wv; | |
1113 GCallback select_cb; | |
1114 GCallback deactivate_cb; | |
1115 { | |
1116 char *title = get_dialog_title (wv->name[0]); | |
1117 int total_buttons = wv->name[1] - '0'; | |
1118 int right_buttons = wv->name[4] - '0'; | |
1119 int left_buttons; | |
1120 int button_nr = 0; | |
1121 int button_spacing = 10; | |
1122 GtkWidget *wdialog = gtk_dialog_new (); | |
1123 widget_value *item; | |
1124 GtkBox *cur_box; | |
1125 GtkWidget *wvbox; | |
1126 GtkWidget *whbox_up; | |
1127 GtkWidget *whbox_down; | |
1128 | |
1129 /* If the number of buttons is greater than 4, make two rows of buttons | |
1130 instead. This looks better. */ | |
1131 int make_two_rows = total_buttons > 4; | |
1132 | |
1133 if (right_buttons == 0) right_buttons = total_buttons/2; | |
1134 left_buttons = total_buttons - right_buttons; | |
1135 | |
1136 gtk_window_set_title (GTK_WINDOW (wdialog), title); | |
1137 gtk_widget_set_name (wdialog, "emacs-dialog"); | |
1138 | |
1139 cur_box = GTK_BOX (GTK_DIALOG (wdialog)->action_area); | |
1140 | |
1141 if (make_two_rows) | |
1142 { | |
1143 wvbox = gtk_vbox_new (TRUE, button_spacing); | |
1144 whbox_up = gtk_hbox_new (FALSE, 0); | |
1145 whbox_down = gtk_hbox_new (FALSE, 0); | |
1146 | |
1147 gtk_box_pack_start (cur_box, wvbox, FALSE, FALSE, 0); | |
1148 gtk_box_pack_start (GTK_BOX (wvbox), whbox_up, FALSE, FALSE, 0); | |
1149 gtk_box_pack_start (GTK_BOX (wvbox), whbox_down, FALSE, FALSE, 0); | |
1150 | |
1151 cur_box = GTK_BOX (whbox_up); | |
1152 } | |
1153 | |
1154 g_signal_connect (G_OBJECT (wdialog), "delete-event", | |
1155 G_CALLBACK (dialog_delete_callback), 0); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1156 |
49323 | 1157 if (deactivate_cb) |
1158 { | |
1159 g_signal_connect (G_OBJECT (wdialog), "close", deactivate_cb, 0); | |
1160 g_signal_connect (G_OBJECT (wdialog), "response", deactivate_cb, 0); | |
1161 } | |
1162 | |
1163 for (item = wv->contents; item; item = item->next) | |
1164 { | |
1165 char *utf8_label = get_utf8_string (item->value); | |
1166 GtkWidget *w; | |
1167 GtkRequisition req; | |
1168 | |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
1169 if (item->name && strcmp (item->name, "message") == 0) |
49323 | 1170 { |
1171 /* This is the text part of the dialog. */ | |
1172 w = gtk_label_new (utf8_label); | |
1173 gtk_box_pack_start (GTK_BOX (GTK_DIALOG (wdialog)->vbox), | |
1174 gtk_label_new (""), | |
1175 FALSE, FALSE, 0); | |
1176 gtk_box_pack_start (GTK_BOX (GTK_DIALOG (wdialog)->vbox), w, | |
1177 TRUE, TRUE, 0); | |
1178 gtk_misc_set_alignment (GTK_MISC (w), 0.1, 0.5); | |
1179 | |
1180 /* Try to make dialog look better. Must realize first so | |
1181 the widget can calculate the size it needs. */ | |
1182 gtk_widget_realize (w); | |
1183 gtk_widget_size_request (w, &req); | |
1184 gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (wdialog)->vbox), | |
1185 req.height); | |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
1186 if (item->value && strlen (item->value) > 0) |
49323 | 1187 button_spacing = 2*req.width/strlen (item->value); |
1188 } | |
1189 else | |
1190 { | |
1191 /* This is one button to add to the dialog. */ | |
50778
f30e6f029d65
* gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents:
50521
diff
changeset
|
1192 w = gtk_button_new_with_label (utf8_label); |
49323 | 1193 if (! item->enabled) |
1194 gtk_widget_set_sensitive (w, FALSE); | |
1195 if (select_cb) | |
1196 g_signal_connect (G_OBJECT (w), "clicked", | |
1197 select_cb, item->call_data); | |
1198 | |
1199 gtk_box_pack_start (cur_box, w, TRUE, TRUE, button_spacing); | |
1200 if (++button_nr == left_buttons) | |
1201 { | |
1202 if (make_two_rows) | |
1203 cur_box = GTK_BOX (whbox_down); | |
1204 else | |
1205 gtk_box_pack_start (cur_box, | |
1206 gtk_label_new (""), | |
1207 TRUE, TRUE, | |
1208 button_spacing); | |
1209 } | |
1210 } | |
1211 | |
1212 if (utf8_label && utf8_label != item->value) | |
1213 g_free (utf8_label); | |
1214 } | |
1215 | |
1216 return wdialog; | |
1217 } | |
1218 | |
1219 | |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1220 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1221 /*********************************************************************** |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1222 File dialog functions |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1223 ***********************************************************************/ |
67761
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1224 /* Return non-zero if the old file selection dialog is being used. |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1225 Return zero if not. */ |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1226 |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1227 int |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1228 xg_uses_old_file_dialog () |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1229 { |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1230 #ifdef HAVE_GTK_FILE_BOTH |
72963
e5e5fcf4397e
* gtkutil.c (xg_uses_old_file_dialog): Rename x-use-old-gtk-file-dialog
Jan Djärv <jan.h.d@swipnet.se>
parents:
72931
diff
changeset
|
1231 extern int x_gtk_use_old_file_dialog; |
e5e5fcf4397e
* gtkutil.c (xg_uses_old_file_dialog): Rename x-use-old-gtk-file-dialog
Jan Djärv <jan.h.d@swipnet.se>
parents:
72931
diff
changeset
|
1232 return x_gtk_use_old_file_dialog; |
67761
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1233 #else /* ! HAVE_GTK_FILE_BOTH */ |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1234 |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1235 #ifdef HAVE_GTK_FILE_SELECTION_NEW |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1236 return 1; |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1237 #else |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1238 return 0; |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1239 #endif |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1240 |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1241 #endif /* ! HAVE_GTK_FILE_BOTH */ |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1242 } |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1243 |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1244 |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1245 /* Function that is called when the file dialog pops down. |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1246 W is the dialog widget, RESPONSE is the response code. |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1247 USER_DATA is what we passed in to g_signal_connect (pointer to int). */ |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1248 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1249 static void |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1250 xg_file_response_cb (w, |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1251 response, |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1252 user_data) |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1253 GtkDialog *w; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1254 gint response; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1255 gpointer user_data; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1256 { |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1257 int *ptr = (int *) user_data; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1258 *ptr = response; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1259 } |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1260 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1261 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1262 /* Destroy the dialog. This makes it pop down. */ |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1263 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1264 static Lisp_Object |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1265 pop_down_file_dialog (arg) |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1266 Lisp_Object arg; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1267 { |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1268 struct Lisp_Save_Value *p = XSAVE_VALUE (arg); |
58201
d433adb0e42c
Add BLOCK_INPUT in pop_down_file_dialog.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58200
diff
changeset
|
1269 BLOCK_INPUT; |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1270 gtk_widget_destroy (GTK_WIDGET (p->pointer)); |
58201
d433adb0e42c
Add BLOCK_INPUT in pop_down_file_dialog.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58200
diff
changeset
|
1271 UNBLOCK_INPUT; |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1272 return Qnil; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1273 } |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1274 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1275 typedef char * (*xg_get_file_func) P_ ((GtkWidget *)); |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1276 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1277 #ifdef HAVE_GTK_FILE_CHOOSER_DIALOG_NEW |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1278 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1279 /* Return the selected file for file chooser dialog W. |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1280 The returned string must be free:d. */ |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1281 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1282 static char * |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1283 xg_get_file_name_from_chooser (w) |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1284 GtkWidget *w; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1285 { |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1286 return gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (w)); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1287 } |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1288 |
68100
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1289 /* Callback called when the "Show hidden files" toggle is pressed. |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1290 WIDGET is the toggle widget, DATA is the file chooser dialog. */ |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1291 |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1292 static void |
67849 | 1293 xg_toggle_visibility_cb (widget, data) |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1294 GtkWidget *widget; |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1295 gpointer data; |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1296 { |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1297 GtkFileChooser *dialog = GTK_FILE_CHOOSER (data); |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1298 gboolean visible; |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1299 g_object_get (G_OBJECT (dialog), "show-hidden", &visible, NULL); |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1300 g_object_set (G_OBJECT (dialog), "show-hidden", !visible, NULL); |
68100
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1301 } |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1302 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1303 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1304 /* Callback called when a property changes in a file chooser. |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1305 GOBJECT is the file chooser dialog, ARG1 describes the property. |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1306 USER_DATA is the toggle widget in the file chooser dialog. |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1307 We use this to update the "Show hidden files" toggle when the user |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1308 changes that property by right clicking in the file list. */ |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1309 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1310 static void |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1311 xg_toggle_notify_cb (gobject, arg1, user_data) |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1312 GObject *gobject; |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1313 GParamSpec *arg1; |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1314 gpointer user_data; |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1315 { |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1316 extern int x_gtk_show_hidden_files; |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1317 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1318 if (strcmp (arg1->name, "show-hidden") == 0) |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1319 { |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1320 GtkFileChooser *dialog = GTK_FILE_CHOOSER (gobject); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1321 GtkWidget *wtoggle = GTK_WIDGET (user_data); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1322 gboolean visible, toggle_on; |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1323 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1324 g_object_get (G_OBJECT (gobject), "show-hidden", &visible, NULL); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1325 toggle_on = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (wtoggle)); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1326 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1327 if (!!visible != !!toggle_on) |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1328 { |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1329 g_signal_handlers_block_by_func (G_OBJECT (wtoggle), |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1330 G_CALLBACK (xg_toggle_visibility_cb), |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1331 gobject); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1332 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (wtoggle), visible); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1333 g_signal_handlers_unblock_by_func |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1334 (G_OBJECT (wtoggle), |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1335 G_CALLBACK (xg_toggle_visibility_cb), |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1336 gobject); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1337 } |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1338 x_gtk_show_hidden_files = visible; |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1339 } |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1340 } |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1341 |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1342 /* Read a file name from the user using a file chooser dialog. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1343 F is the current frame. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1344 PROMPT is a prompt to show to the user. May not be NULL. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1345 DEFAULT_FILENAME is a default selection to be displayed. May be NULL. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1346 If MUSTMATCH_P is non-zero, the returned file name must be an existing |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1347 file. *FUNC is set to a function that can be used to retrieve the |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1348 selected file name from the returned widget. |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1349 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1350 Returns the created widget. */ |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1351 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1352 static GtkWidget * |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1353 xg_get_file_with_chooser (f, prompt, default_filename, |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1354 mustmatch_p, only_dir_p, func) |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1355 FRAME_PTR f; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1356 char *prompt; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1357 char *default_filename; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1358 int mustmatch_p, only_dir_p; |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1359 xg_get_file_func *func; |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1360 { |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1361 char message[1024]; |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1362 |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1363 GtkWidget *filewin, *wtoggle, *wbox, *wmessage; |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1364 GtkWindow *gwin = GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)); |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1365 GtkFileChooserAction action = (mustmatch_p ? |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1366 GTK_FILE_CHOOSER_ACTION_OPEN : |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1367 GTK_FILE_CHOOSER_ACTION_SAVE); |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1368 extern int x_gtk_show_hidden_files; |
72968
13a9a628ff21
* gtkutil.c (xg_get_file_with_chooser): Rename x_gtk_show_chooser_help_text to
Jan Djärv <jan.h.d@swipnet.se>
parents:
72963
diff
changeset
|
1369 extern int x_gtk_file_dialog_help_text; |
72931
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1370 |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1371 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1372 if (only_dir_p) |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1373 action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1374 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1375 filewin = gtk_file_chooser_dialog_new (prompt, gwin, action, |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1376 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1377 (mustmatch_p || only_dir_p ? |
57900
a76858072e78
* gtkutil.c (xg_get_file_with_chooser): Use GTK_STOCK_OK instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
57868
diff
changeset
|
1378 GTK_STOCK_OPEN : GTK_STOCK_OK), |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1379 GTK_RESPONSE_OK, |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1380 NULL); |
58817
65f1b18b7f66
* gtkutil.c (xg_get_file_with_chooser): Handle local files only.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58463
diff
changeset
|
1381 gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (filewin), TRUE); |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1382 |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1383 wbox = gtk_vbox_new (FALSE, 0); |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1384 gtk_widget_show (wbox); |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1385 wtoggle = gtk_check_button_new_with_label ("Show hidden files."); |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1386 |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1387 if (x_gtk_show_hidden_files) |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1388 { |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1389 g_object_set (G_OBJECT (filewin), "show-hidden", TRUE, NULL); |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1390 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (wtoggle), TRUE); |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1391 } |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1392 gtk_widget_show (wtoggle); |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1393 g_signal_connect (G_OBJECT (wtoggle), "clicked", |
68100
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1394 G_CALLBACK (xg_toggle_visibility_cb), filewin); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1395 g_signal_connect (G_OBJECT (filewin), "notify", |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1396 G_CALLBACK (xg_toggle_notify_cb), wtoggle); |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1397 |
72968
13a9a628ff21
* gtkutil.c (xg_get_file_with_chooser): Rename x_gtk_show_chooser_help_text to
Jan Djärv <jan.h.d@swipnet.se>
parents:
72963
diff
changeset
|
1398 if (x_gtk_file_dialog_help_text) |
72931
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1399 { |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1400 message[0] = '\0'; |
73048
4a83c4a89b5e
* gtkutil.c (xg_get_file_with_chooser): Only chow C-l help for
Jan Djärv <jan.h.d@swipnet.se>
parents:
72968
diff
changeset
|
1401 /* Gtk+ 2.10 has the file name text entry box integrated in the dialog. |
4a83c4a89b5e
* gtkutil.c (xg_get_file_with_chooser): Only chow C-l help for
Jan Djärv <jan.h.d@swipnet.se>
parents:
72968
diff
changeset
|
1402 Show the C-l help text only for versions < 2.10. */ |
73066 | 1403 if (gtk_check_version (2, 10, 0) && action != GTK_FILE_CHOOSER_ACTION_SAVE) |
72931
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1404 strcat (message, "\nType C-l to display a file name text entry box.\n"); |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1405 strcat (message, "\nIf you don't like this file selector, use the " |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1406 "corresponding\nkey binding or customize " |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1407 "use-file-dialog to turn it off."); |
72614
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1408 |
72931
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1409 wmessage = gtk_label_new (message); |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1410 gtk_widget_show (wmessage); |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1411 } |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1412 |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1413 gtk_box_pack_start (GTK_BOX (wbox), wtoggle, FALSE, FALSE, 0); |
72968
13a9a628ff21
* gtkutil.c (xg_get_file_with_chooser): Rename x_gtk_show_chooser_help_text to
Jan Djärv <jan.h.d@swipnet.se>
parents:
72963
diff
changeset
|
1414 if (x_gtk_file_dialog_help_text) |
72931
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1415 gtk_box_pack_start (GTK_BOX (wbox), wmessage, FALSE, FALSE, 0); |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1416 gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (filewin), wbox); |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1417 |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1418 if (default_filename) |
57940
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1419 { |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1420 Lisp_Object file; |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1421 struct gcpro gcpro1; |
84604
6aa198cbc91e
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
84560
diff
changeset
|
1422 char *utf8_filename; |
57940
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1423 GCPRO1 (file); |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1424 |
58817
65f1b18b7f66
* gtkutil.c (xg_get_file_with_chooser): Handle local files only.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58463
diff
changeset
|
1425 file = build_string (default_filename); |
65f1b18b7f66
* gtkutil.c (xg_get_file_with_chooser): Handle local files only.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58463
diff
changeset
|
1426 |
57940
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1427 /* File chooser does not understand ~/... in the file name. It must be |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1428 an absolute name starting with /. */ |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1429 if (default_filename[0] != '/') |
58817
65f1b18b7f66
* gtkutil.c (xg_get_file_with_chooser): Handle local files only.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58463
diff
changeset
|
1430 file = Fexpand_file_name (file, Qnil); |
72614
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1431 |
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1432 utf8_filename = SSDATA (ENCODE_UTF_8 (file)); |
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1433 if (! NILP (Ffile_directory_p (file))) |
58817
65f1b18b7f66
* gtkutil.c (xg_get_file_with_chooser): Handle local files only.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58463
diff
changeset
|
1434 gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (filewin), |
72614
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1435 utf8_filename); |
58817
65f1b18b7f66
* gtkutil.c (xg_get_file_with_chooser): Handle local files only.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58463
diff
changeset
|
1436 else |
72614
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1437 { |
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1438 gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filewin), |
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1439 utf8_filename); |
72637
9db8c9a68f0f
* gtkutil.c (xg_get_file_with_chooser): Don't mention specific keys in
Jan Djärv <jan.h.d@swipnet.se>
parents:
72614
diff
changeset
|
1440 if (action == GTK_FILE_CHOOSER_ACTION_SAVE) |
9db8c9a68f0f
* gtkutil.c (xg_get_file_with_chooser): Don't mention specific keys in
Jan Djärv <jan.h.d@swipnet.se>
parents:
72614
diff
changeset
|
1441 { |
9db8c9a68f0f
* gtkutil.c (xg_get_file_with_chooser): Don't mention specific keys in
Jan Djärv <jan.h.d@swipnet.se>
parents:
72614
diff
changeset
|
1442 char *cp = strrchr (utf8_filename, '/'); |
9db8c9a68f0f
* gtkutil.c (xg_get_file_with_chooser): Don't mention specific keys in
Jan Djärv <jan.h.d@swipnet.se>
parents:
72614
diff
changeset
|
1443 if (cp) ++cp; |
9db8c9a68f0f
* gtkutil.c (xg_get_file_with_chooser): Don't mention specific keys in
Jan Djärv <jan.h.d@swipnet.se>
parents:
72614
diff
changeset
|
1444 else cp = utf8_filename; |
9db8c9a68f0f
* gtkutil.c (xg_get_file_with_chooser): Don't mention specific keys in
Jan Djärv <jan.h.d@swipnet.se>
parents:
72614
diff
changeset
|
1445 gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (filewin), cp); |
9db8c9a68f0f
* gtkutil.c (xg_get_file_with_chooser): Don't mention specific keys in
Jan Djärv <jan.h.d@swipnet.se>
parents:
72614
diff
changeset
|
1446 } |
72614
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1447 } |
57940
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1448 |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1449 UNGCPRO; |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1450 } |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1451 |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1452 *func = xg_get_file_name_from_chooser; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1453 return filewin; |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1454 } |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1455 #endif /* HAVE_GTK_FILE_CHOOSER_DIALOG_NEW */ |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1456 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1457 #ifdef HAVE_GTK_FILE_SELECTION_NEW |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1458 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1459 /* Return the selected file for file selector dialog W. |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1460 The returned string must be free:d. */ |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1461 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1462 static char * |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1463 xg_get_file_name_from_selector (w) |
49323 | 1464 GtkWidget *w; |
1465 { | |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1466 GtkFileSelection *filesel = GTK_FILE_SELECTION (w); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1467 return xstrdup ((char*) gtk_file_selection_get_filename (filesel)); |
49323 | 1468 } |
1469 | |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1470 /* Create a file selection dialog. |
49323 | 1471 F is the current frame. |
1472 PROMPT is a prompt to show to the user. May not be NULL. | |
1473 DEFAULT_FILENAME is a default selection to be displayed. May be NULL. | |
1474 If MUSTMATCH_P is non-zero, the returned file name must be an existing | |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1475 file. *FUNC is set to a function that can be used to retrieve the |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1476 selected file name from the returned widget. |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1477 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1478 Returns the created widget. */ |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1479 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1480 static GtkWidget * |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1481 xg_get_file_with_selection (f, prompt, default_filename, |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1482 mustmatch_p, only_dir_p, func) |
49323 | 1483 FRAME_PTR f; |
1484 char *prompt; | |
1485 char *default_filename; | |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1486 int mustmatch_p, only_dir_p; |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1487 xg_get_file_func *func; |
49323 | 1488 { |
1489 GtkWidget *filewin; | |
1490 GtkFileSelection *filesel; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1491 |
49323 | 1492 filewin = gtk_file_selection_new (prompt); |
1493 filesel = GTK_FILE_SELECTION (filewin); | |
1494 | |
1495 if (default_filename) | |
1496 gtk_file_selection_set_filename (filesel, default_filename); | |
1497 | |
1498 if (mustmatch_p) | |
1499 { | |
1500 /* The selection_entry part of filesel is not documented. */ | |
1501 gtk_widget_set_sensitive (filesel->selection_entry, FALSE); | |
1502 gtk_file_selection_hide_fileop_buttons (filesel); | |
1503 } | |
1504 | |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1505 *func = xg_get_file_name_from_selector; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1506 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1507 return filewin; |
49323 | 1508 } |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1509 #endif /* HAVE_GTK_FILE_SELECTION_NEW */ |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1510 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1511 /* Read a file name from the user using a file dialog, either the old |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1512 file selection dialog, or the new file chooser dialog. Which to use |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1513 depends on what the GTK version used has, and what the value of |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1514 gtk-use-old-file-dialog. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1515 F is the current frame. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1516 PROMPT is a prompt to show to the user. May not be NULL. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1517 DEFAULT_FILENAME is a default selection to be displayed. May be NULL. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1518 If MUSTMATCH_P is non-zero, the returned file name must be an existing |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1519 file. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1520 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1521 Returns a file name or NULL if no file was selected. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1522 The returned string must be freed by the caller. */ |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1523 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1524 char * |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1525 xg_get_file_name (f, prompt, default_filename, mustmatch_p, only_dir_p) |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1526 FRAME_PTR f; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1527 char *prompt; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1528 char *default_filename; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1529 int mustmatch_p, only_dir_p; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1530 { |
58284
10efc827e15c
* gtkutil.c (xg_get_file_name): Fix typo in
Jan Djärv <jan.h.d@swipnet.se>
parents:
58201
diff
changeset
|
1531 GtkWidget *w = 0; |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1532 int count = SPECPDL_INDEX (); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1533 char *fn = 0; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1534 int filesel_done = 0; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1535 xg_get_file_func func; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1536 |
58818
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1537 #if defined (HAVE_GTK_AND_PTHREAD) && defined (__SIGRTMIN) |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1538 /* I really don't know why this is needed, but without this the GLIBC add on |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1539 library linuxthreads hangs when the Gnome file chooser backend creates |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1540 threads. */ |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1541 sigblock (sigmask (__SIGRTMIN)); |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1542 #endif /* HAVE_GTK_AND_PTHREAD */ |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1543 |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1544 #ifdef HAVE_GTK_FILE_BOTH |
58463
86fddd350b35
* gtkutil.c (xg_get_file_name): Rename use-old-gtk-file-dialog to
Jan Djärv <jan.h.d@swipnet.se>
parents:
58284
diff
changeset
|
1545 |
67761
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1546 if (xg_uses_old_file_dialog ()) |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1547 w = xg_get_file_with_selection (f, prompt, default_filename, |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1548 mustmatch_p, only_dir_p, &func); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1549 else |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1550 w = xg_get_file_with_chooser (f, prompt, default_filename, |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1551 mustmatch_p, only_dir_p, &func); |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1552 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1553 #else /* not HAVE_GTK_FILE_BOTH */ |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1554 |
58284
10efc827e15c
* gtkutil.c (xg_get_file_name): Fix typo in
Jan Djärv <jan.h.d@swipnet.se>
parents:
58201
diff
changeset
|
1555 #ifdef HAVE_GTK_FILE_SELECTION_NEW |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1556 w = xg_get_file_with_selection (f, prompt, default_filename, |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1557 mustmatch_p, only_dir_p, &func); |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1558 #endif |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1559 #ifdef HAVE_GTK_FILE_CHOOSER_DIALOG_NEW |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1560 w = xg_get_file_with_chooser (f, prompt, default_filename, |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1561 mustmatch_p, only_dir_p, &func); |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1562 #endif |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1563 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1564 #endif /* HAVE_GTK_FILE_BOTH */ |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1565 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1566 xg_set_screen (w, f); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1567 gtk_widget_set_name (w, "emacs-filedialog"); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1568 gtk_window_set_transient_for (GTK_WINDOW (w), |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1569 GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1570 gtk_window_set_destroy_with_parent (GTK_WINDOW (w), TRUE); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1571 gtk_window_set_modal (GTK_WINDOW (w), TRUE); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1572 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1573 g_signal_connect (G_OBJECT (w), |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1574 "response", |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1575 G_CALLBACK (xg_file_response_cb), |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1576 &filesel_done); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1577 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1578 /* Don't destroy the widget if closed by the window manager close button. */ |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1579 g_signal_connect (G_OBJECT (w), "delete-event", G_CALLBACK (gtk_true), NULL); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1580 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1581 gtk_widget_show (w); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1582 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1583 record_unwind_protect (pop_down_file_dialog, make_save_value (w, 0)); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1584 while (! filesel_done) |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1585 { |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1586 x_menu_wait_for_event (0); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1587 gtk_main_iteration (); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1588 } |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1589 |
58818
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1590 #if defined (HAVE_GTK_AND_PTHREAD) && defined (__SIGRTMIN) |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1591 sigunblock (sigmask (__SIGRTMIN)); |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1592 #endif |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1593 |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1594 if (filesel_done == GTK_RESPONSE_OK) |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1595 fn = (*func) (w); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1596 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1597 unbind_to (count, Qnil); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1598 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1599 return fn; |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1600 } |
49323 | 1601 |
1602 | |
1603 /*********************************************************************** | |
1604 Menu functions. | |
1605 ***********************************************************************/ | |
1606 | |
1607 /* The name of menu items that can be used for citomization. Since GTK | |
1608 RC files are very crude and primitive, we have to set this on all | |
1609 menu item names so a user can easily cutomize menu items. */ | |
1610 | |
1611 #define MENU_ITEM_NAME "emacs-menuitem" | |
1612 | |
1613 | |
1614 /* Linked list of all allocated struct xg_menu_cb_data. Used for marking | |
1615 during GC. The next member points to the items. */ | |
1616 static xg_list_node xg_menu_cb_list; | |
1617 | |
1618 /* Linked list of all allocated struct xg_menu_item_cb_data. Used for marking | |
1619 during GC. The next member points to the items. */ | |
1620 static xg_list_node xg_menu_item_cb_list; | |
1621 | |
1622 /* Allocate and initialize CL_DATA if NULL, otherwise increase ref_count. | |
1623 F is the frame CL_DATA will be initialized for. | |
1624 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
1625 | |
1626 The menu bar and all sub menus under the menu bar in a frame | |
1627 share the same structure, hence the reference count. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1628 |
49323 | 1629 Returns CL_DATA if CL_DATA is not NULL, or a pointer to a newly |
1630 allocated xg_menu_cb_data if CL_DATA is NULL. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1631 |
49323 | 1632 static xg_menu_cb_data * |
1633 make_cl_data (cl_data, f, highlight_cb) | |
1634 xg_menu_cb_data *cl_data; | |
1635 FRAME_PTR f; | |
1636 GCallback highlight_cb; | |
1637 { | |
1638 if (! cl_data) | |
1639 { | |
1640 cl_data = (xg_menu_cb_data*) xmalloc (sizeof (*cl_data)); | |
1641 cl_data->f = f; | |
1642 cl_data->menu_bar_vector = f->menu_bar_vector; | |
1643 cl_data->menu_bar_items_used = f->menu_bar_items_used; | |
1644 cl_data->highlight_cb = highlight_cb; | |
1645 cl_data->ref_count = 0; | |
1646 | |
1647 xg_list_insert (&xg_menu_cb_list, &cl_data->ptrs); | |
1648 } | |
1649 | |
1650 cl_data->ref_count++; | |
1651 | |
1652 return cl_data; | |
1653 } | |
1654 | |
1655 /* Update CL_DATA with values from frame F and with HIGHLIGHT_CB. | |
1656 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
1657 | |
1658 When the menu bar is updated, menu items may have been added and/or | |
1659 removed, so menu_bar_vector and menu_bar_items_used change. We must | |
1660 then update CL_DATA since it is used to determine which menu | |
1661 item that is invoked in the menu. | |
1662 HIGHLIGHT_CB could change, there is no check that the same | |
1663 function is given when modifying a menu bar as was given when | |
1664 creating the menu bar. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1665 |
49323 | 1666 static void |
1667 update_cl_data (cl_data, f, highlight_cb) | |
1668 xg_menu_cb_data *cl_data; | |
1669 FRAME_PTR f; | |
1670 GCallback highlight_cb; | |
1671 { | |
1672 if (cl_data) | |
1673 { | |
1674 cl_data->f = f; | |
1675 cl_data->menu_bar_vector = f->menu_bar_vector; | |
1676 cl_data->menu_bar_items_used = f->menu_bar_items_used; | |
1677 cl_data->highlight_cb = highlight_cb; | |
1678 } | |
1679 } | |
1680 | |
1681 /* Decrease reference count for CL_DATA. | |
1682 If reference count is zero, free CL_DATA. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1683 |
49323 | 1684 static void |
1685 unref_cl_data (cl_data) | |
1686 xg_menu_cb_data *cl_data; | |
1687 { | |
1688 if (cl_data && cl_data->ref_count > 0) | |
1689 { | |
1690 cl_data->ref_count--; | |
1691 if (cl_data->ref_count == 0) | |
1692 { | |
1693 xg_list_remove (&xg_menu_cb_list, &cl_data->ptrs); | |
1694 xfree (cl_data); | |
1695 } | |
1696 } | |
1697 } | |
1698 | |
1699 /* Function that marks all lisp data during GC. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1700 |
49323 | 1701 void |
1702 xg_mark_data () | |
1703 { | |
1704 xg_list_node *iter; | |
1705 | |
1706 for (iter = xg_menu_cb_list.next; iter; iter = iter->next) | |
52080
c150d4a7aa36
gtkutil.c (xg_mark_data): Update calls to mark_object.
Jan Djärv <jan.h.d@swipnet.se>
parents:
51569
diff
changeset
|
1707 mark_object (((xg_menu_cb_data *) iter)->menu_bar_vector); |
49323 | 1708 |
1709 for (iter = xg_menu_item_cb_list.next; iter; iter = iter->next) | |
1710 { | |
1711 xg_menu_item_cb_data *cb_data = (xg_menu_item_cb_data *) iter; | |
1712 | |
1713 if (! NILP (cb_data->help)) | |
52080
c150d4a7aa36
gtkutil.c (xg_mark_data): Update calls to mark_object.
Jan Djärv <jan.h.d@swipnet.se>
parents:
51569
diff
changeset
|
1714 mark_object (cb_data->help); |
49323 | 1715 } |
1716 } | |
1717 | |
1718 | |
1719 /* Callback called when a menu item is destroyed. Used to free data. | |
1720 W is the widget that is being destroyed (not used). | |
1721 CLIENT_DATA points to the xg_menu_item_cb_data associated with the W. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1722 |
49323 | 1723 static void |
1724 menuitem_destroy_callback (w, client_data) | |
1725 GtkWidget *w; | |
1726 gpointer client_data; | |
1727 { | |
1728 if (client_data) | |
1729 { | |
1730 xg_menu_item_cb_data *data = (xg_menu_item_cb_data*) client_data; | |
1731 xg_list_remove (&xg_menu_item_cb_list, &data->ptrs); | |
1732 xfree (data); | |
1733 } | |
1734 } | |
1735 | |
1736 /* Callback called when the pointer enters/leaves a menu item. | |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1737 W is the parent of the menu item. |
49323 | 1738 EVENT is either an enter event or leave event. |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1739 CLIENT_DATA is not used. |
49323 | 1740 |
1741 Returns FALSE to tell GTK to keep processing this event. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1742 |
49323 | 1743 static gboolean |
1744 menuitem_highlight_callback (w, event, client_data) | |
1745 GtkWidget *w; | |
1746 GdkEventCrossing *event; | |
1747 gpointer client_data; | |
1748 { | |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1749 GdkEvent ev; |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1750 GtkWidget *subwidget; |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1751 xg_menu_item_cb_data *data; |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1752 |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1753 ev.crossing = *event; |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1754 subwidget = gtk_get_event_widget (&ev); |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1755 data = (xg_menu_item_cb_data *) g_object_get_data (G_OBJECT (subwidget), |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1756 XG_ITEM_DATA); |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1757 if (data) |
49323 | 1758 { |
1759 if (! NILP (data->help) && data->cl_data->highlight_cb) | |
1760 { | |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1761 gpointer call_data = event->type == GDK_LEAVE_NOTIFY ? 0 : data; |
49323 | 1762 GtkCallback func = (GtkCallback) data->cl_data->highlight_cb; |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1763 (*func) (subwidget, call_data); |
49323 | 1764 } |
1765 } | |
1766 | |
1767 return FALSE; | |
1768 } | |
1769 | |
1770 /* Callback called when a menu is destroyed. Used to free data. | |
1771 W is the widget that is being destroyed (not used). | |
1772 CLIENT_DATA points to the xg_menu_cb_data associated with W. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1773 |
49323 | 1774 static void |
1775 menu_destroy_callback (w, client_data) | |
1776 GtkWidget *w; | |
1777 gpointer client_data; | |
1778 { | |
1779 unref_cl_data ((xg_menu_cb_data*) client_data); | |
1780 } | |
1781 | |
1782 /* Callback called when a menu does a grab or ungrab. That means the | |
1783 menu has been activated or deactivated. | |
1784 Used to start a timer so the small timeout the menus in GTK uses before | |
1785 popping down a menu is seen by Emacs (see xg_process_timeouts above). | |
1786 W is the widget that does the grab (not used). | |
1787 UNGRAB_P is TRUE if this is an ungrab, FALSE if it is a grab. | |
1788 CLIENT_DATA is NULL (not used). */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1789 |
84342
d514db1d656b
(menu_grab_callback) <cnt>: Move static variable to file scope.
Glenn Morris <rgm@gnu.org>
parents:
83849
diff
changeset
|
1790 /* Keep track of total number of grabs. */ |
84491
d72079d7688e
(cnt): Rename to menu_grab_callback_cnt for clarity.
Glenn Morris <rgm@gnu.org>
parents:
84342
diff
changeset
|
1791 static int menu_grab_callback_cnt; |
84342
d514db1d656b
(menu_grab_callback) <cnt>: Move static variable to file scope.
Glenn Morris <rgm@gnu.org>
parents:
83849
diff
changeset
|
1792 |
49323 | 1793 static void |
1794 menu_grab_callback (GtkWidget *widget, | |
1795 gboolean ungrab_p, | |
1796 gpointer client_data) | |
1797 { | |
84491
d72079d7688e
(cnt): Rename to menu_grab_callback_cnt for clarity.
Glenn Morris <rgm@gnu.org>
parents:
84342
diff
changeset
|
1798 if (ungrab_p) menu_grab_callback_cnt--; |
d72079d7688e
(cnt): Rename to menu_grab_callback_cnt for clarity.
Glenn Morris <rgm@gnu.org>
parents:
84342
diff
changeset
|
1799 else menu_grab_callback_cnt++; |
d72079d7688e
(cnt): Rename to menu_grab_callback_cnt for clarity.
Glenn Morris <rgm@gnu.org>
parents:
84342
diff
changeset
|
1800 |
d72079d7688e
(cnt): Rename to menu_grab_callback_cnt for clarity.
Glenn Morris <rgm@gnu.org>
parents:
84342
diff
changeset
|
1801 if (menu_grab_callback_cnt > 0 && ! xg_timer) xg_start_timer (); |
d72079d7688e
(cnt): Rename to menu_grab_callback_cnt for clarity.
Glenn Morris <rgm@gnu.org>
parents:
84342
diff
changeset
|
1802 else if (menu_grab_callback_cnt == 0 && xg_timer) xg_stop_timer (); |
49323 | 1803 } |
1804 | |
1805 /* Make a GTK widget that contains both UTF8_LABEL and UTF8_KEY (both | |
1806 must be non-NULL) and can be inserted into a menu item. | |
1807 | |
1808 Returns the GtkHBox. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1809 |
49323 | 1810 static GtkWidget * |
1811 make_widget_for_menu_item (utf8_label, utf8_key) | |
1812 char *utf8_label; | |
1813 char *utf8_key; | |
1814 { | |
1815 GtkWidget *wlbl; | |
1816 GtkWidget *wkey; | |
1817 GtkWidget *wbox; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1818 |
49323 | 1819 wbox = gtk_hbox_new (FALSE, 0); |
50778
f30e6f029d65
* gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents:
50521
diff
changeset
|
1820 wlbl = gtk_label_new (utf8_label); |
49323 | 1821 wkey = gtk_label_new (utf8_key); |
1822 | |
1823 gtk_misc_set_alignment (GTK_MISC (wlbl), 0.0, 0.5); | |
1824 gtk_misc_set_alignment (GTK_MISC (wkey), 0.0, 0.5); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1825 |
49323 | 1826 gtk_box_pack_start (GTK_BOX (wbox), wlbl, TRUE, TRUE, 0); |
1827 gtk_box_pack_start (GTK_BOX (wbox), wkey, FALSE, FALSE, 0); | |
1828 | |
1829 gtk_widget_set_name (wlbl, MENU_ITEM_NAME); | |
1830 gtk_widget_set_name (wkey, MENU_ITEM_NAME); | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
1831 gtk_widget_set_name (wbox, MENU_ITEM_NAME); |
49323 | 1832 |
1833 return wbox; | |
1834 } | |
1835 | |
1836 /* Make and return a menu item widget with the key to the right. | |
1837 UTF8_LABEL is the text for the menu item (GTK uses UTF8 internally). | |
1838 UTF8_KEY is the text representing the key binding. | |
1839 ITEM is the widget_value describing the menu item. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1840 |
49323 | 1841 GROUP is an in/out parameter. If the menu item to be created is not |
1842 part of any radio menu group, *GROUP contains NULL on entry and exit. | |
1843 If the menu item to be created is part of a radio menu group, on entry | |
1844 *GROUP contains the group to use, or NULL if this is the first item | |
1845 in the group. On exit, *GROUP contains the radio item group. | |
1846 | |
1847 Unfortunately, keys don't line up as nicely as in Motif, | |
1848 but the MacOS X version doesn't either, so I guess that is OK. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1849 |
49323 | 1850 static GtkWidget * |
1851 make_menu_item (utf8_label, utf8_key, item, group) | |
1852 char *utf8_label; | |
1853 char *utf8_key; | |
1854 widget_value *item; | |
1855 GSList **group; | |
1856 { | |
1857 GtkWidget *w; | |
1858 GtkWidget *wtoadd = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1859 |
51432
6db55492aca9
* gtkutil.c (make_menu_item): Make sure we don't crash on a NULL
Jan Djärv <jan.h.d@swipnet.se>
parents:
51408
diff
changeset
|
1860 /* It has been observed that some menu items have a NULL name field. |
6db55492aca9
* gtkutil.c (make_menu_item): Make sure we don't crash on a NULL
Jan Djärv <jan.h.d@swipnet.se>
parents:
51408
diff
changeset
|
1861 This will lead to this function being called with a NULL utf8_label. |
6db55492aca9
* gtkutil.c (make_menu_item): Make sure we don't crash on a NULL
Jan Djärv <jan.h.d@swipnet.se>
parents:
51408
diff
changeset
|
1862 GTK crashes on that so we set a blank label. Why there is a NULL |
6db55492aca9
* gtkutil.c (make_menu_item): Make sure we don't crash on a NULL
Jan Djärv <jan.h.d@swipnet.se>
parents:
51408
diff
changeset
|
1863 name remains to be investigated. */ |
6db55492aca9
* gtkutil.c (make_menu_item): Make sure we don't crash on a NULL
Jan Djärv <jan.h.d@swipnet.se>
parents:
51408
diff
changeset
|
1864 if (! utf8_label) utf8_label = " "; |
6db55492aca9
* gtkutil.c (make_menu_item): Make sure we don't crash on a NULL
Jan Djärv <jan.h.d@swipnet.se>
parents:
51408
diff
changeset
|
1865 |
49323 | 1866 if (utf8_key) |
1867 wtoadd = make_widget_for_menu_item (utf8_label, utf8_key); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1868 |
49323 | 1869 if (item->button_type == BUTTON_TYPE_TOGGLE) |
1870 { | |
1871 *group = NULL; | |
1872 if (utf8_key) w = gtk_check_menu_item_new (); | |
50778
f30e6f029d65
* gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents:
50521
diff
changeset
|
1873 else w = gtk_check_menu_item_new_with_label (utf8_label); |
49323 | 1874 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), item->selected); |
1875 } | |
1876 else if (item->button_type == BUTTON_TYPE_RADIO) | |
1877 { | |
1878 if (utf8_key) w = gtk_radio_menu_item_new (*group); | |
50778
f30e6f029d65
* gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents:
50521
diff
changeset
|
1879 else w = gtk_radio_menu_item_new_with_label (*group, utf8_label); |
49323 | 1880 *group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (w)); |
1881 if (item->selected) | |
1882 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), TRUE); | |
1883 } | |
1884 else | |
1885 { | |
1886 *group = NULL; | |
1887 if (utf8_key) w = gtk_menu_item_new (); | |
50778
f30e6f029d65
* gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents:
50521
diff
changeset
|
1888 else w = gtk_menu_item_new_with_label (utf8_label); |
49323 | 1889 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1890 |
49323 | 1891 if (wtoadd) gtk_container_add (GTK_CONTAINER (w), wtoadd); |
1892 if (! item->enabled) gtk_widget_set_sensitive (w, FALSE); | |
1893 | |
1894 return w; | |
1895 } | |
1896 | |
50318
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1897 /* Return non-zero if LABEL specifies a separator (GTK only has one |
49323 | 1898 separator type) */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1899 |
84560
c390b9af2601
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84491
diff
changeset
|
1900 static char* separator_names[] = { |
c390b9af2601
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84491
diff
changeset
|
1901 "space", |
c390b9af2601
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84491
diff
changeset
|
1902 "no-line", |
c390b9af2601
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84491
diff
changeset
|
1903 "single-line", |
c390b9af2601
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84491
diff
changeset
|
1904 "double-line", |
c390b9af2601
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84491
diff
changeset
|
1905 "single-dashed-line", |
c390b9af2601
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84491
diff
changeset
|
1906 "double-dashed-line", |
c390b9af2601
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84491
diff
changeset
|
1907 "shadow-etched-in", |
c390b9af2601
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84491
diff
changeset
|
1908 "shadow-etched-out", |
c390b9af2601
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84491
diff
changeset
|
1909 "shadow-etched-in-dash", |
c390b9af2601
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84491
diff
changeset
|
1910 "shadow-etched-out-dash", |
c390b9af2601
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84491
diff
changeset
|
1911 "shadow-double-etched-in", |
c390b9af2601
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84491
diff
changeset
|
1912 "shadow-double-etched-out", |
c390b9af2601
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84491
diff
changeset
|
1913 "shadow-double-etched-in-dash", |
c390b9af2601
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84491
diff
changeset
|
1914 "shadow-double-etched-out-dash", |
c390b9af2601
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84491
diff
changeset
|
1915 0, |
c390b9af2601
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84491
diff
changeset
|
1916 }; |
c390b9af2601
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84491
diff
changeset
|
1917 |
49323 | 1918 static int |
50318
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1919 xg_separator_p (char *label) |
49323 | 1920 { |
50318
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1921 if (! label) return 0; |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1922 else if (strlen (label) > 3 |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1923 && strncmp (label, "--", 2) == 0 |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1924 && label[2] != '-') |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1925 { |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1926 int i; |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1927 |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1928 label += 2; |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1929 for (i = 0; separator_names[i]; ++i) |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1930 if (strcmp (label, separator_names[i]) == 0) |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1931 return 1; |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1932 } |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1933 else |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1934 { |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1935 /* Old-style separator, maybe. It's a separator if it contains |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1936 only dashes. */ |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1937 while (*label == '-') |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1938 ++label; |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1939 if (*label == 0) return 1; |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1940 } |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1941 |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1942 return 0; |
49323 | 1943 } |
1944 | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1945 static int xg_detached_menus; |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1946 |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1947 /* Returns non-zero if there are detached menus. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1948 |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1949 int |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1950 xg_have_tear_offs () |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1951 { |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1952 return xg_detached_menus > 0; |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1953 } |
49323 | 1954 |
1955 /* Callback invoked when a detached menu window is removed. Here we | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1956 decrease the xg_detached_menus count. |
49323 | 1957 WIDGET is the top level window that is removed (the parent of the menu). |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1958 CLIENT_DATA is not used. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1959 |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1960 static void |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1961 tearoff_remove (widget, client_data) |
49323 | 1962 GtkWidget *widget; |
1963 gpointer client_data; | |
1964 { | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1965 if (xg_detached_menus > 0) --xg_detached_menus; |
49323 | 1966 } |
1967 | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1968 /* Callback invoked when a menu is detached. It increases the |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1969 xg_detached_menus count. |
49323 | 1970 WIDGET is the GtkTearoffMenuItem. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1971 CLIENT_DATA is not used. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1972 |
49323 | 1973 static void |
1974 tearoff_activate (widget, client_data) | |
1975 GtkWidget *widget; | |
1976 gpointer client_data; | |
1977 { | |
1978 GtkWidget *menu = gtk_widget_get_parent (widget); | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1979 if (gtk_menu_get_tearoff_state (GTK_MENU (menu))) |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1980 { |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1981 ++xg_detached_menus; |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1982 g_signal_connect (G_OBJECT (gtk_widget_get_toplevel (widget)), |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1983 "destroy", |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1984 G_CALLBACK (tearoff_remove), 0); |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1985 } |
49323 | 1986 } |
1987 | |
1988 | |
1989 /* Create a menu item widget, and connect the callbacks. | |
1990 ITEM decribes the menu item. | |
1991 F is the frame the created menu belongs to. | |
1992 SELECT_CB is the callback to use when a menu item is selected. | |
1993 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
1994 CL_DATA points to the callback data to be used for this menu. | |
1995 GROUP is an in/out parameter. If the menu item to be created is not | |
1996 part of any radio menu group, *GROUP contains NULL on entry and exit. | |
1997 If the menu item to be created is part of a radio menu group, on entry | |
1998 *GROUP contains the group to use, or NULL if this is the first item | |
1999 in the group. On exit, *GROUP contains the radio item group. | |
2000 | |
2001 Returns the created GtkWidget. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2002 |
49323 | 2003 static GtkWidget * |
2004 xg_create_one_menuitem (item, f, select_cb, highlight_cb, cl_data, group) | |
2005 widget_value *item; | |
2006 FRAME_PTR f; | |
2007 GCallback select_cb; | |
2008 GCallback highlight_cb; | |
2009 xg_menu_cb_data *cl_data; | |
2010 GSList **group; | |
2011 { | |
2012 char *utf8_label; | |
2013 char *utf8_key; | |
2014 GtkWidget *w; | |
2015 xg_menu_item_cb_data *cb_data; | |
2016 | |
2017 utf8_label = get_utf8_string (item->name); | |
2018 utf8_key = get_utf8_string (item->key); | |
2019 | |
2020 w = make_menu_item (utf8_label, utf8_key, item, group); | |
2021 | |
2022 if (utf8_label && utf8_label != item->name) g_free (utf8_label); | |
2023 if (utf8_key && utf8_key != item->key) g_free (utf8_key); | |
2024 | |
2025 cb_data = xmalloc (sizeof (xg_menu_item_cb_data)); | |
2026 | |
2027 xg_list_insert (&xg_menu_item_cb_list, &cb_data->ptrs); | |
2028 | |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2029 cb_data->select_id = 0; |
49323 | 2030 cb_data->help = item->help; |
2031 cb_data->cl_data = cl_data; | |
2032 cb_data->call_data = item->call_data; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2033 |
49323 | 2034 g_signal_connect (G_OBJECT (w), |
2035 "destroy", | |
2036 G_CALLBACK (menuitem_destroy_callback), | |
2037 cb_data); | |
2038 | |
2039 /* Put cb_data in widget, so we can get at it when modifying menubar */ | |
2040 g_object_set_data (G_OBJECT (w), XG_ITEM_DATA, cb_data); | |
2041 | |
2042 /* final item, not a submenu */ | |
2043 if (item->call_data && ! item->contents) | |
2044 { | |
2045 if (select_cb) | |
2046 cb_data->select_id | |
2047 = g_signal_connect (G_OBJECT (w), "activate", select_cb, cb_data); | |
2048 } | |
2049 | |
2050 return w; | |
2051 } | |
2052 | |
83537
c19f348befac
Fix F10 behaviour. (Reported by Bernard Adrian.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83530
diff
changeset
|
2053 /* Callback called when keyboard traversal (started by x-menu-bar-open) ends. |
71056
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2054 WMENU is the menu for which traversal has been done. DATA points to the |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2055 frame for WMENU. We must release grabs, some bad interaction between GTK |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2056 and Emacs makes the menus keep the grabs. */ |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2057 |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2058 static void |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2059 menu_nav_ended (wmenu, data) |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2060 GtkMenuShell *wmenu; |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2061 gpointer data; |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2062 { |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2063 FRAME_PTR f = (FRAME_PTR) data; |
71160
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2064 |
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2065 if (FRAME_X_OUTPUT (f)->menubar_widget) |
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2066 { |
71056
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2067 GtkMenuShell *w = GTK_MENU_SHELL (FRAME_X_OUTPUT (f)->menubar_widget); |
71160
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2068 Display *dpy = FRAME_X_DISPLAY (f); |
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2069 |
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2070 BLOCK_INPUT; |
71056
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2071 gtk_menu_shell_deactivate (w); |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2072 gtk_menu_shell_deselect (w); |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2073 |
71160
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2074 XUngrabKeyboard (dpy, CurrentTime); |
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2075 XUngrabPointer (dpy, CurrentTime); |
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2076 UNBLOCK_INPUT; |
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2077 } |
71056
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2078 } |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2079 |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2080 |
50112
50df9e41f1a3
Add prototype for create_menus.
Andreas Schwab <schwab@suse.de>
parents:
50108
diff
changeset
|
2081 static GtkWidget *create_menus P_ ((widget_value *, FRAME_PTR, GCallback, |
50df9e41f1a3
Add prototype for create_menus.
Andreas Schwab <schwab@suse.de>
parents:
50108
diff
changeset
|
2082 GCallback, GCallback, int, int, int, |
50df9e41f1a3
Add prototype for create_menus.
Andreas Schwab <schwab@suse.de>
parents:
50108
diff
changeset
|
2083 GtkWidget *, xg_menu_cb_data *, char *)); |
50df9e41f1a3
Add prototype for create_menus.
Andreas Schwab <schwab@suse.de>
parents:
50108
diff
changeset
|
2084 |
49323 | 2085 /* Create a full menu tree specified by DATA. |
2086 F is the frame the created menu belongs to. | |
2087 SELECT_CB is the callback to use when a menu item is selected. | |
2088 DEACTIVATE_CB is the callback to use when a sub menu is not shown anymore. | |
2089 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2090 POP_UP_P is non-zero if we shall create a popup menu. | |
2091 MENU_BAR_P is non-zero if we shall create a menu bar. | |
2092 ADD_TEAROFF_P is non-zero if we shall add a teroff menu item. Ignored | |
2093 if MENU_BAR_P is non-zero. | |
2094 TOPMENU is the topmost GtkWidget that others shall be placed under. | |
2095 It may be NULL, in that case we create the appropriate widget | |
2096 (menu bar or menu item depending on POP_UP_P and MENU_BAR_P) | |
2097 CL_DATA is the callback data we shall use for this menu, or NULL | |
2098 if we haven't set the first callback yet. | |
2099 NAME is the name to give to the top level menu if this function | |
2100 creates it. May be NULL to not set any name. | |
2101 | |
2102 Returns the top level GtkWidget. This is TOPLEVEL if TOPLEVEL is | |
2103 not NULL. | |
2104 | |
2105 This function calls itself to create submenus. */ | |
2106 | |
2107 static GtkWidget * | |
2108 create_menus (data, f, select_cb, deactivate_cb, highlight_cb, | |
2109 pop_up_p, menu_bar_p, add_tearoff_p, topmenu, cl_data, name) | |
2110 widget_value *data; | |
2111 FRAME_PTR f; | |
2112 GCallback select_cb; | |
2113 GCallback deactivate_cb; | |
2114 GCallback highlight_cb; | |
2115 int pop_up_p; | |
2116 int menu_bar_p; | |
2117 int add_tearoff_p; | |
2118 GtkWidget *topmenu; | |
2119 xg_menu_cb_data *cl_data; | |
2120 char *name; | |
2121 { | |
2122 widget_value *item; | |
2123 GtkWidget *wmenu = topmenu; | |
2124 GSList *group = NULL; | |
2125 | |
2126 if (! topmenu) | |
2127 { | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2128 if (! menu_bar_p) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2129 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2130 wmenu = gtk_menu_new (); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2131 xg_set_screen (wmenu, f); |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2132 /* Connect this to the menu instead of items so we get enter/leave for |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2133 disabled items also. TODO: Still does not get enter/leave for |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2134 disabled items in detached menus. */ |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2135 g_signal_connect (G_OBJECT (wmenu), |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2136 "enter-notify-event", |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2137 G_CALLBACK (menuitem_highlight_callback), |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2138 NULL); |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2139 g_signal_connect (G_OBJECT (wmenu), |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2140 "leave-notify-event", |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2141 G_CALLBACK (menuitem_highlight_callback), |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2142 NULL); |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2143 } |
49323 | 2144 else wmenu = gtk_menu_bar_new (); |
2145 | |
71056
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2146 /* Fix up grabs after keyboard traversal ends. */ |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2147 g_signal_connect (G_OBJECT (wmenu), |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2148 "selection-done", |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2149 G_CALLBACK (menu_nav_ended), |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2150 f); |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2151 |
49323 | 2152 /* Put cl_data on the top menu for easier access. */ |
2153 cl_data = make_cl_data (cl_data, f, highlight_cb); | |
2154 g_object_set_data (G_OBJECT (wmenu), XG_FRAME_DATA, (gpointer)cl_data); | |
2155 g_signal_connect (G_OBJECT (wmenu), "destroy", | |
2156 G_CALLBACK (menu_destroy_callback), cl_data); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2157 |
49323 | 2158 if (name) |
2159 gtk_widget_set_name (wmenu, name); | |
2160 | |
2161 if (deactivate_cb) | |
2162 g_signal_connect (G_OBJECT (wmenu), | |
59913
b3664fca53d1
* gtkutil.c (create_menus): Connect selection-done event instead of
Jan Djärv <jan.h.d@swipnet.se>
parents:
59666
diff
changeset
|
2163 "selection-done", deactivate_cb, 0); |
49323 | 2164 |
2165 g_signal_connect (G_OBJECT (wmenu), | |
2166 "grab-notify", G_CALLBACK (menu_grab_callback), 0); | |
2167 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2168 |
49323 | 2169 if (! menu_bar_p && add_tearoff_p) |
2170 { | |
2171 GtkWidget *tearoff = gtk_tearoff_menu_item_new (); | |
2172 gtk_menu_shell_append (GTK_MENU_SHELL (wmenu), tearoff); | |
2173 | |
2174 g_signal_connect (G_OBJECT (tearoff), "activate", | |
2175 G_CALLBACK (tearoff_activate), 0); | |
2176 } | |
2177 | |
2178 for (item = data; item; item = item->next) | |
2179 { | |
2180 GtkWidget *w; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2181 |
49323 | 2182 if (pop_up_p && !item->contents && !item->call_data |
2183 && !xg_separator_p (item->name)) | |
2184 { | |
2185 char *utf8_label; | |
2186 /* A title for a popup. We do the same as GTK does when | |
2187 creating titles, but it does not look good. */ | |
2188 group = NULL; | |
2189 utf8_label = get_utf8_string (item->name); | |
2190 | |
2191 gtk_menu_set_title (GTK_MENU (wmenu), utf8_label); | |
50778
f30e6f029d65
* gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents:
50521
diff
changeset
|
2192 w = gtk_menu_item_new_with_label (utf8_label); |
49323 | 2193 gtk_widget_set_sensitive (w, FALSE); |
2194 if (utf8_label && utf8_label != item->name) g_free (utf8_label); | |
2195 } | |
2196 else if (xg_separator_p (item->name)) | |
2197 { | |
2198 group = NULL; | |
2199 /* GTK only have one separator type. */ | |
2200 w = gtk_separator_menu_item_new (); | |
2201 } | |
2202 else | |
2203 { | |
2204 w = xg_create_one_menuitem (item, | |
2205 f, | |
2206 item->contents ? 0 : select_cb, | |
2207 highlight_cb, | |
2208 cl_data, | |
2209 &group); | |
2210 | |
77511
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2211 /* Create a possibly empty submenu for menu bar items, since some |
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2212 themes don't highlight items correctly without it. */ |
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2213 if (item->contents || menu_bar_p) |
49323 | 2214 { |
2215 GtkWidget *submenu = create_menus (item->contents, | |
2216 f, | |
2217 select_cb, | |
2218 deactivate_cb, | |
2219 highlight_cb, | |
2220 0, | |
2221 0, | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2222 add_tearoff_p, |
49323 | 2223 0, |
2224 cl_data, | |
2225 0); | |
2226 gtk_menu_item_set_submenu (GTK_MENU_ITEM (w), submenu); | |
2227 } | |
2228 } | |
2229 | |
2230 gtk_menu_shell_append (GTK_MENU_SHELL (wmenu), w); | |
2231 gtk_widget_set_name (w, MENU_ITEM_NAME); | |
2232 } | |
2233 | |
2234 return wmenu; | |
2235 } | |
2236 | |
2237 /* Create a menubar, popup menu or dialog, depending on the TYPE argument. | |
2238 TYPE can be "menubar", "popup" for popup menu, or "dialog" for a dialog | |
2239 with some text and buttons. | |
2240 F is the frame the created item belongs to. | |
2241 NAME is the name to use for the top widget. | |
2242 VAL is a widget_value structure describing items to be created. | |
2243 SELECT_CB is the callback to use when a menu item is selected or | |
2244 a dialog button is pressed. | |
2245 DEACTIVATE_CB is the callback to use when an item is deactivated. | |
2246 For a menu, when a sub menu is not shown anymore, for a dialog it is | |
2247 called when the dialog is popped down. | |
2248 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2249 | |
2250 Returns the widget created. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2251 |
49323 | 2252 GtkWidget * |
2253 xg_create_widget (type, name, f, val, | |
2254 select_cb, deactivate_cb, highlight_cb) | |
2255 char *type; | |
2256 char *name; | |
2257 FRAME_PTR f; | |
2258 widget_value *val; | |
2259 GCallback select_cb; | |
2260 GCallback deactivate_cb; | |
2261 GCallback highlight_cb; | |
2262 { | |
2263 GtkWidget *w = 0; | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2264 int menu_bar_p = strcmp (type, "menubar") == 0; |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2265 int pop_up_p = strcmp (type, "popup") == 0; |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2266 |
49323 | 2267 if (strcmp (type, "dialog") == 0) |
2268 { | |
2269 w = create_dialog (val, select_cb, deactivate_cb); | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2270 xg_set_screen (w, f); |
49323 | 2271 gtk_window_set_transient_for (GTK_WINDOW (w), |
2272 GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); | |
2273 gtk_window_set_destroy_with_parent (GTK_WINDOW (w), TRUE); | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2274 gtk_widget_set_name (w, "emacs-dialog"); |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
2275 gtk_window_set_modal (GTK_WINDOW (w), TRUE); |
49323 | 2276 } |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2277 else if (menu_bar_p || pop_up_p) |
49323 | 2278 { |
2279 w = create_menus (val->contents, | |
2280 f, | |
2281 select_cb, | |
2282 deactivate_cb, | |
2283 highlight_cb, | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2284 pop_up_p, |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2285 menu_bar_p, |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2286 menu_bar_p, |
49323 | 2287 0, |
2288 0, | |
2289 name); | |
2290 | |
2291 /* Set the cursor to an arrow for popup menus when they are mapped. | |
2292 This is done by default for menu bar menus. */ | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2293 if (pop_up_p) |
49323 | 2294 { |
2295 /* Must realize so the GdkWindow inside the widget is created. */ | |
2296 gtk_widget_realize (w); | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2297 xg_set_cursor (w, FRAME_X_DISPLAY_INFO (f)->xg_cursor); |
49323 | 2298 } |
2299 } | |
2300 else | |
2301 { | |
2302 fprintf (stderr, "bad type in xg_create_widget: %s, doing nothing\n", | |
2303 type); | |
2304 } | |
2305 | |
2306 return w; | |
2307 } | |
2308 | |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2309 /* Return the label for menu item WITEM. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2310 |
49323 | 2311 static const char * |
2312 xg_get_menu_item_label (witem) | |
2313 GtkMenuItem *witem; | |
2314 { | |
2315 GtkLabel *wlabel = GTK_LABEL (gtk_bin_get_child (GTK_BIN (witem))); | |
2316 return gtk_label_get_label (wlabel); | |
2317 } | |
2318 | |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2319 /* Return non-zero if the menu item WITEM has the text LABEL. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2320 |
49323 | 2321 static int |
2322 xg_item_label_same_p (witem, label) | |
2323 GtkMenuItem *witem; | |
2324 char *label; | |
2325 { | |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2326 int is_same = 0; |
49323 | 2327 char *utf8_label = get_utf8_string (label); |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2328 const char *old_label = witem ? xg_get_menu_item_label (witem) : 0; |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2329 |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2330 if (! old_label && ! utf8_label) |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2331 is_same = 1; |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2332 else if (old_label && utf8_label) |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2333 is_same = strcmp (utf8_label, old_label) == 0; |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2334 |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2335 if (utf8_label && utf8_label != label) g_free (utf8_label); |
49323 | 2336 |
2337 return is_same; | |
2338 } | |
2339 | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2340 /* Destroy widgets in LIST. */ |
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2341 |
49323 | 2342 static void |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2343 xg_destroy_widgets (list) |
49323 | 2344 GList *list; |
2345 { | |
2346 GList *iter; | |
2347 | |
49572 | 2348 for (iter = list; iter; iter = g_list_next (iter)) |
49323 | 2349 { |
2350 GtkWidget *w = GTK_WIDGET (iter->data); | |
2351 | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2352 /* Destroying the widget will remove it from the container it is in. */ |
49323 | 2353 gtk_widget_destroy (w); |
2354 } | |
2355 } | |
2356 | |
2357 /* Update the top level names in MENUBAR (i.e. not submenus). | |
2358 F is the frame the menu bar belongs to. | |
49572 | 2359 *LIST is a list with the current menu bar names (menu item widgets). |
2360 ITER is the item within *LIST that shall be updated. | |
2361 POS is the numerical position, starting at 0, of ITER in *LIST. | |
49323 | 2362 VAL describes what the menu bar shall look like after the update. |
2363 SELECT_CB is the callback to use when a menu item is selected. | |
2364 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
49572 | 2365 CL_DATA points to the callback data to be used for this menu bar. |
49323 | 2366 |
2367 This function calls itself to walk through the menu bar names. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2368 |
49323 | 2369 static void |
49572 | 2370 xg_update_menubar (menubar, f, list, iter, pos, val, |
2371 select_cb, highlight_cb, cl_data) | |
49323 | 2372 GtkWidget *menubar; |
2373 FRAME_PTR f; | |
49572 | 2374 GList **list; |
2375 GList *iter; | |
2376 int pos; | |
49323 | 2377 widget_value *val; |
2378 GCallback select_cb; | |
2379 GCallback highlight_cb; | |
2380 xg_menu_cb_data *cl_data; | |
2381 { | |
49572 | 2382 if (! iter && ! val) |
49323 | 2383 return; |
49572 | 2384 else if (iter && ! val) |
49323 | 2385 { |
49572 | 2386 /* Item(s) have been removed. Remove all remaining items. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2387 xg_destroy_widgets (iter); |
49323 | 2388 |
2389 /* All updated. */ | |
2390 val = 0; | |
49572 | 2391 iter = 0; |
49323 | 2392 } |
49572 | 2393 else if (! iter && val) |
49323 | 2394 { |
2395 /* Item(s) added. Add all new items in one call. */ | |
2396 create_menus (val, f, select_cb, 0, highlight_cb, | |
2397 0, 1, 0, menubar, cl_data, 0); | |
2398 | |
2399 /* All updated. */ | |
2400 val = 0; | |
49572 | 2401 iter = 0; |
49323 | 2402 } |
49572 | 2403 /* Below this neither iter or val is NULL */ |
2404 else if (xg_item_label_same_p (GTK_MENU_ITEM (iter->data), val->name)) | |
49323 | 2405 { |
2406 /* This item is still the same, check next item. */ | |
2407 val = val->next; | |
49572 | 2408 iter = g_list_next (iter); |
2409 ++pos; | |
49323 | 2410 } |
2411 else /* This item is changed. */ | |
2412 { | |
49572 | 2413 GtkMenuItem *witem = GTK_MENU_ITEM (iter->data); |
49323 | 2414 GtkMenuItem *witem2 = 0; |
2415 int val_in_menubar = 0; | |
49572 | 2416 int iter_in_new_menubar = 0; |
2417 GList *iter2; | |
49323 | 2418 widget_value *cur; |
2419 | |
2420 /* See if the changed entry (val) is present later in the menu bar */ | |
49572 | 2421 for (iter2 = iter; |
2422 iter2 && ! val_in_menubar; | |
2423 iter2 = g_list_next (iter2)) | |
49323 | 2424 { |
49572 | 2425 witem2 = GTK_MENU_ITEM (iter2->data); |
49323 | 2426 val_in_menubar = xg_item_label_same_p (witem2, val->name); |
2427 } | |
2428 | |
49572 | 2429 /* See if the current entry (iter) is present later in the |
49323 | 2430 specification for the new menu bar. */ |
49572 | 2431 for (cur = val; cur && ! iter_in_new_menubar; cur = cur->next) |
2432 iter_in_new_menubar = xg_item_label_same_p (witem, cur->name); | |
2433 | |
2434 if (val_in_menubar && ! iter_in_new_menubar) | |
49323 | 2435 { |
49572 | 2436 int nr = pos; |
2437 | |
49323 | 2438 /* This corresponds to: |
2439 Current: A B C | |
2440 New: A C | |
2441 Remove B. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2442 |
49323 | 2443 gtk_widget_ref (GTK_WIDGET (witem)); |
2444 gtk_container_remove (GTK_CONTAINER (menubar), GTK_WIDGET (witem)); | |
2445 gtk_widget_destroy (GTK_WIDGET (witem)); | |
2446 | |
2447 /* Must get new list since the old changed. */ | |
49572 | 2448 g_list_free (*list); |
2449 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2450 while (nr-- > 0) iter = g_list_next (iter); | |
49323 | 2451 } |
49572 | 2452 else if (! val_in_menubar && ! iter_in_new_menubar) |
49323 | 2453 { |
2454 /* This corresponds to: | |
2455 Current: A B C | |
2456 New: A X C | |
2457 Rename B to X. This might seem to be a strange thing to do, | |
2458 since if there is a menu under B it will be totally wrong for X. | |
2459 But consider editing a C file. Then there is a C-mode menu | |
2460 (corresponds to B above). | |
2461 If then doing C-x C-f the minibuf menu (X above) replaces the | |
2462 C-mode menu. When returning from the minibuffer, we get | |
2463 back the C-mode menu. Thus we do: | |
2464 Rename B to X (C-mode to minibuf menu) | |
2465 Rename X to B (minibuf to C-mode menu). | |
2466 If the X menu hasn't been invoked, the menu under B | |
2467 is up to date when leaving the minibuffer. */ | |
2468 GtkLabel *wlabel = GTK_LABEL (gtk_bin_get_child (GTK_BIN (witem))); | |
2469 char *utf8_label = get_utf8_string (val->name); | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2470 GtkWidget *submenu = gtk_menu_item_get_submenu (witem); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2471 |
50778
f30e6f029d65
* gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents:
50521
diff
changeset
|
2472 gtk_label_set_text (wlabel, utf8_label); |
49323 | 2473 |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2474 /* If this item has a submenu that has been detached, change |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2475 the title in the WM decorations also. */ |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2476 if (submenu && gtk_menu_get_tearoff_state (GTK_MENU (submenu))) |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2477 /* Set the title of the detached window. */ |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2478 gtk_menu_set_title (GTK_MENU (submenu), utf8_label); |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2479 |
49572 | 2480 iter = g_list_next (iter); |
49323 | 2481 val = val->next; |
49572 | 2482 ++pos; |
49323 | 2483 } |
49572 | 2484 else if (! val_in_menubar && iter_in_new_menubar) |
49323 | 2485 { |
2486 /* This corresponds to: | |
2487 Current: A B C | |
2488 New: A X B C | |
2489 Insert X. */ | |
2490 | |
49572 | 2491 int nr = pos; |
49323 | 2492 GList *group = 0; |
2493 GtkWidget *w = xg_create_one_menuitem (val, | |
2494 f, | |
2495 select_cb, | |
2496 highlight_cb, | |
2497 cl_data, | |
2498 &group); | |
2499 | |
77511
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2500 /* Create a possibly empty submenu for menu bar items, since some |
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2501 themes don't highlight items correctly without it. */ |
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2502 GtkWidget *submenu = create_menus (NULL, f, |
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2503 select_cb, NULL, highlight_cb, |
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2504 0, 0, 0, 0, cl_data, 0); |
49323 | 2505 gtk_widget_set_name (w, MENU_ITEM_NAME); |
2506 gtk_menu_shell_insert (GTK_MENU_SHELL (menubar), w, pos); | |
77511
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2507 gtk_menu_item_set_submenu (GTK_MENU_ITEM (w), submenu); |
49323 | 2508 |
49572 | 2509 g_list_free (*list); |
2510 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2511 while (nr-- > 0) iter = g_list_next (iter); | |
2512 iter = g_list_next (iter); | |
49323 | 2513 val = val->next; |
49572 | 2514 ++pos; |
49323 | 2515 } |
49572 | 2516 else /* if (val_in_menubar && iter_in_new_menubar) */ |
49323 | 2517 { |
49572 | 2518 int nr = pos; |
49323 | 2519 /* This corresponds to: |
2520 Current: A B C | |
2521 New: A C B | |
2522 Move C before B */ | |
2523 | |
2524 gtk_widget_ref (GTK_WIDGET (witem2)); | |
2525 gtk_container_remove (GTK_CONTAINER (menubar), GTK_WIDGET (witem2)); | |
2526 gtk_menu_shell_insert (GTK_MENU_SHELL (menubar), | |
2527 GTK_WIDGET (witem2), pos); | |
2528 gtk_widget_unref (GTK_WIDGET (witem2)); | |
2529 | |
49572 | 2530 g_list_free (*list); |
2531 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2532 while (nr-- > 0) iter = g_list_next (iter); | |
76906
bb6e75c27940
(xg_update_menubar): Call g_list_next after moving
Jan Djärv <jan.h.d@swipnet.se>
parents:
75576
diff
changeset
|
2533 if (iter) iter = g_list_next (iter); |
49323 | 2534 val = val->next; |
49572 | 2535 ++pos; |
49323 | 2536 } |
2537 } | |
2538 | |
2539 /* Update the rest of the menu bar. */ | |
49572 | 2540 xg_update_menubar (menubar, f, list, iter, pos, val, |
2541 select_cb, highlight_cb, cl_data); | |
49323 | 2542 } |
2543 | |
2544 /* Update the menu item W so it corresponds to VAL. | |
2545 SELECT_CB is the callback to use when a menu item is selected. | |
2546 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2547 CL_DATA is the data to set in the widget for menu invokation. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2548 |
49323 | 2549 static void |
2550 xg_update_menu_item (val, w, select_cb, highlight_cb, cl_data) | |
2551 widget_value *val; | |
2552 GtkWidget *w; | |
2553 GCallback select_cb; | |
2554 GCallback highlight_cb; | |
2555 xg_menu_cb_data *cl_data; | |
2556 { | |
2557 GtkWidget *wchild; | |
2558 GtkLabel *wlbl = 0; | |
2559 GtkLabel *wkey = 0; | |
2560 char *utf8_label; | |
2561 char *utf8_key; | |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2562 const char *old_label = 0; |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2563 const char *old_key = 0; |
49323 | 2564 xg_menu_item_cb_data *cb_data; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2565 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2566 wchild = gtk_bin_get_child (GTK_BIN (w)); |
49323 | 2567 utf8_label = get_utf8_string (val->name); |
2568 utf8_key = get_utf8_string (val->key); | |
2569 | |
2570 /* See if W is a menu item with a key. See make_menu_item above. */ | |
2571 if (GTK_IS_HBOX (wchild)) | |
2572 { | |
2573 GList *list = gtk_container_get_children (GTK_CONTAINER (wchild)); | |
2574 | |
2575 wlbl = GTK_LABEL (list->data); | |
2576 wkey = GTK_LABEL (list->next->data); | |
49572 | 2577 g_list_free (list); |
2578 | |
49323 | 2579 if (! utf8_key) |
2580 { | |
2581 /* Remove the key and keep just the label. */ | |
2582 gtk_widget_ref (GTK_WIDGET (wlbl)); | |
2583 gtk_container_remove (GTK_CONTAINER (w), wchild); | |
2584 gtk_container_add (GTK_CONTAINER (w), GTK_WIDGET (wlbl)); | |
2585 wkey = 0; | |
2586 } | |
49572 | 2587 |
49323 | 2588 } |
2589 else /* Just a label. */ | |
2590 { | |
2591 wlbl = GTK_LABEL (wchild); | |
2592 | |
2593 /* Check if there is now a key. */ | |
2594 if (utf8_key) | |
2595 { | |
2596 GtkWidget *wtoadd = make_widget_for_menu_item (utf8_label, utf8_key); | |
2597 GList *list = gtk_container_get_children (GTK_CONTAINER (wtoadd)); | |
49572 | 2598 |
49323 | 2599 wlbl = GTK_LABEL (list->data); |
2600 wkey = GTK_LABEL (list->next->data); | |
49572 | 2601 g_list_free (list); |
49323 | 2602 |
2603 gtk_container_remove (GTK_CONTAINER (w), wchild); | |
2604 gtk_container_add (GTK_CONTAINER (w), wtoadd); | |
2605 } | |
2606 } | |
2607 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2608 |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2609 if (wkey) old_key = gtk_label_get_label (wkey); |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2610 if (wlbl) old_label = gtk_label_get_label (wlbl); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2611 |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2612 if (wkey && utf8_key && (! old_key || strcmp (utf8_key, old_key) != 0)) |
49323 | 2613 gtk_label_set_text (wkey, utf8_key); |
2614 | |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2615 if (! old_label || strcmp (utf8_label, old_label) != 0) |
50778
f30e6f029d65
* gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents:
50521
diff
changeset
|
2616 gtk_label_set_text (wlbl, utf8_label); |
49323 | 2617 |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2618 if (utf8_key && utf8_key != val->key) g_free (utf8_key); |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2619 if (utf8_label && utf8_label != val->name) g_free (utf8_label); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2620 |
49323 | 2621 if (! val->enabled && GTK_WIDGET_SENSITIVE (w)) |
2622 gtk_widget_set_sensitive (w, FALSE); | |
2623 else if (val->enabled && ! GTK_WIDGET_SENSITIVE (w)) | |
2624 gtk_widget_set_sensitive (w, TRUE); | |
2625 | |
2626 cb_data = (xg_menu_item_cb_data*) g_object_get_data (G_OBJECT (w), | |
2627 XG_ITEM_DATA); | |
2628 if (cb_data) | |
2629 { | |
2630 cb_data->call_data = val->call_data; | |
2631 cb_data->help = val->help; | |
2632 cb_data->cl_data = cl_data; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2633 |
49323 | 2634 /* We assume the callback functions don't change. */ |
2635 if (val->call_data && ! val->contents) | |
2636 { | |
2637 /* This item shall have a select callback. */ | |
2638 if (! cb_data->select_id) | |
2639 cb_data->select_id | |
2640 = g_signal_connect (G_OBJECT (w), "activate", | |
2641 select_cb, cb_data); | |
2642 } | |
2643 else if (cb_data->select_id) | |
2644 { | |
2645 g_signal_handler_disconnect (w, cb_data->select_id); | |
2646 cb_data->select_id = 0; | |
2647 } | |
2648 } | |
2649 } | |
2650 | |
2651 /* Update the toggle menu item W so it corresponds to VAL. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2652 |
49323 | 2653 static void |
2654 xg_update_toggle_item (val, w) | |
2655 widget_value *val; | |
2656 GtkWidget *w; | |
2657 { | |
2658 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), val->selected); | |
2659 } | |
2660 | |
2661 /* Update the radio menu item W so it corresponds to VAL. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2662 |
49323 | 2663 static void |
2664 xg_update_radio_item (val, w) | |
2665 widget_value *val; | |
2666 GtkWidget *w; | |
2667 { | |
2668 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), val->selected); | |
2669 } | |
2670 | |
2671 /* Update the sub menu SUBMENU and all its children so it corresponds to VAL. | |
2672 SUBMENU may be NULL, in that case a new menu is created. | |
2673 F is the frame the menu bar belongs to. | |
2674 VAL describes the contents of the menu bar. | |
2675 SELECT_CB is the callback to use when a menu item is selected. | |
2676 DEACTIVATE_CB is the callback to use when a sub menu is not shown anymore. | |
2677 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2678 CL_DATA is the call back data to use for any newly created items. | |
2679 | |
2680 Returns the updated submenu widget, that is SUBMENU unless SUBMENU | |
2681 was NULL. */ | |
2682 | |
2683 static GtkWidget * | |
2684 xg_update_submenu (submenu, f, val, | |
2685 select_cb, deactivate_cb, highlight_cb, cl_data) | |
2686 GtkWidget *submenu; | |
2687 FRAME_PTR f; | |
2688 widget_value *val; | |
2689 GCallback select_cb; | |
2690 GCallback deactivate_cb; | |
2691 GCallback highlight_cb; | |
2692 xg_menu_cb_data *cl_data; | |
2693 { | |
2694 GtkWidget *newsub = submenu; | |
2695 GList *list = 0; | |
2696 GList *iter; | |
2697 widget_value *cur; | |
2698 int has_tearoff_p = 0; | |
2699 GList *first_radio = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2700 |
49323 | 2701 if (submenu) |
2702 list = gtk_container_get_children (GTK_CONTAINER (submenu)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2703 |
49323 | 2704 for (cur = val, iter = list; |
2705 cur && iter; | |
2706 iter = g_list_next (iter), cur = cur->next) | |
2707 { | |
2708 GtkWidget *w = GTK_WIDGET (iter->data); | |
2709 | |
2710 /* Skip tearoff items, they have no counterpart in val. */ | |
2711 if (GTK_IS_TEAROFF_MENU_ITEM (w)) | |
2712 { | |
2713 has_tearoff_p = 1; | |
2714 iter = g_list_next (iter); | |
2715 if (iter) w = GTK_WIDGET (iter->data); | |
2716 else break; | |
2717 } | |
2718 | |
2719 /* Remember first radio button in a group. If we get a mismatch in | |
2720 a radio group we must rebuild the whole group so that the connections | |
2721 in GTK becomes correct. */ | |
2722 if (cur->button_type == BUTTON_TYPE_RADIO && ! first_radio) | |
2723 first_radio = iter; | |
2724 else if (cur->button_type != BUTTON_TYPE_RADIO | |
2725 && ! GTK_IS_RADIO_MENU_ITEM (w)) | |
2726 first_radio = 0; | |
2727 | |
2728 if (GTK_IS_SEPARATOR_MENU_ITEM (w)) | |
2729 { | |
2730 if (! xg_separator_p (cur->name)) | |
2731 break; | |
2732 } | |
2733 else if (GTK_IS_CHECK_MENU_ITEM (w)) | |
2734 { | |
2735 if (cur->button_type != BUTTON_TYPE_TOGGLE) | |
2736 break; | |
2737 xg_update_toggle_item (cur, w); | |
2738 xg_update_menu_item (cur, w, select_cb, highlight_cb, cl_data); | |
2739 } | |
2740 else if (GTK_IS_RADIO_MENU_ITEM (w)) | |
2741 { | |
2742 if (cur->button_type != BUTTON_TYPE_RADIO) | |
2743 break; | |
2744 xg_update_radio_item (cur, w); | |
2745 xg_update_menu_item (cur, w, select_cb, highlight_cb, cl_data); | |
2746 } | |
2747 else if (GTK_IS_MENU_ITEM (w)) | |
2748 { | |
2749 GtkMenuItem *witem = GTK_MENU_ITEM (w); | |
2750 GtkWidget *sub; | |
2751 | |
2752 if (cur->button_type != BUTTON_TYPE_NONE || | |
2753 xg_separator_p (cur->name)) | |
2754 break; | |
2755 | |
2756 xg_update_menu_item (cur, w, select_cb, highlight_cb, cl_data); | |
2757 | |
2758 sub = gtk_menu_item_get_submenu (witem); | |
2759 if (sub && ! cur->contents) | |
2760 { | |
2761 /* Not a submenu anymore. */ | |
2762 gtk_widget_ref (sub); | |
2763 gtk_menu_item_remove_submenu (witem); | |
2764 gtk_widget_destroy (sub); | |
2765 } | |
2766 else if (cur->contents) | |
2767 { | |
2768 GtkWidget *nsub; | |
2769 | |
2770 nsub = xg_update_submenu (sub, f, cur->contents, | |
2771 select_cb, deactivate_cb, | |
2772 highlight_cb, cl_data); | |
2773 | |
2774 /* If this item just became a submenu, we must set it. */ | |
2775 if (nsub != sub) | |
2776 gtk_menu_item_set_submenu (witem, nsub); | |
2777 } | |
2778 } | |
2779 else | |
2780 { | |
2781 /* Structural difference. Remove everything from here and down | |
2782 in SUBMENU. */ | |
2783 break; | |
2784 } | |
2785 } | |
2786 | |
2787 /* Remove widgets from first structual change. */ | |
2788 if (iter) | |
2789 { | |
2790 /* If we are adding new menu items below, we must remove from | |
2791 first radio button so that radio groups become correct. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2792 if (cur && first_radio) xg_destroy_widgets (first_radio); |
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2793 else xg_destroy_widgets (iter); |
49323 | 2794 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2795 |
49323 | 2796 if (cur) |
2797 { | |
2798 /* More items added. Create them. */ | |
2799 newsub = create_menus (cur, | |
2800 f, | |
2801 select_cb, | |
2802 deactivate_cb, | |
2803 highlight_cb, | |
2804 0, | |
2805 0, | |
2806 ! has_tearoff_p, | |
2807 submenu, | |
2808 cl_data, | |
2809 0); | |
2810 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2811 |
49572 | 2812 if (list) g_list_free (list); |
2813 | |
49323 | 2814 return newsub; |
2815 } | |
2816 | |
2817 /* Update the MENUBAR. | |
2818 F is the frame the menu bar belongs to. | |
2819 VAL describes the contents of the menu bar. | |
2820 If DEEP_P is non-zero, rebuild all but the top level menu names in | |
2821 the MENUBAR. If DEEP_P is zero, just rebuild the names in the menubar. | |
2822 SELECT_CB is the callback to use when a menu item is selected. | |
2823 DEACTIVATE_CB is the callback to use when a sub menu is not shown anymore. | |
2824 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2825 |
49323 | 2826 void |
2827 xg_modify_menubar_widgets (menubar, f, val, deep_p, | |
2828 select_cb, deactivate_cb, highlight_cb) | |
2829 GtkWidget *menubar; | |
2830 FRAME_PTR f; | |
2831 widget_value *val; | |
2832 int deep_p; | |
2833 GCallback select_cb; | |
2834 GCallback deactivate_cb; | |
2835 GCallback highlight_cb; | |
2836 { | |
2837 xg_menu_cb_data *cl_data; | |
2838 GList *list = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2839 | |
2840 if (! list) return; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2841 |
49323 | 2842 cl_data = (xg_menu_cb_data*) g_object_get_data (G_OBJECT (menubar), |
2843 XG_FRAME_DATA); | |
2844 | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2845 xg_update_menubar (menubar, f, &list, list, 0, val->contents, |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2846 select_cb, highlight_cb, cl_data); |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2847 |
64783
0975467abc17
* gtkutil.c (xg_modify_menubar_widgets): Remove semicolon that
Jan Djärv <jan.h.d@swipnet.se>
parents:
64770
diff
changeset
|
2848 if (deep_p) |
49323 | 2849 { |
2850 widget_value *cur; | |
2851 | |
2852 /* Update all sub menus. | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2853 We must keep the submenus (GTK menu item widgets) since the |
49323 | 2854 X Window in the XEvent that activates the menu are those widgets. */ |
2855 | |
2856 /* Update cl_data, menu_item things in F may have changed. */ | |
2857 update_cl_data (cl_data, f, highlight_cb); | |
2858 | |
2859 for (cur = val->contents; cur; cur = cur->next) | |
2860 { | |
49572 | 2861 GList *iter; |
49323 | 2862 GtkWidget *sub = 0; |
2863 GtkWidget *newsub; | |
2864 GtkMenuItem *witem; | |
2865 | |
2866 /* Find sub menu that corresponds to val and update it. */ | |
2867 for (iter = list ; iter; iter = g_list_next (iter)) | |
2868 { | |
2869 witem = GTK_MENU_ITEM (iter->data); | |
2870 if (xg_item_label_same_p (witem, cur->name)) | |
2871 { | |
2872 sub = gtk_menu_item_get_submenu (witem); | |
2873 break; | |
2874 } | |
2875 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2876 |
49323 | 2877 newsub = xg_update_submenu (sub, |
2878 f, | |
2879 cur->contents, | |
2880 select_cb, | |
2881 deactivate_cb, | |
2882 highlight_cb, | |
2883 cl_data); | |
2884 /* sub may still be NULL. If we just updated non deep and added | |
2885 a new menu bar item, it has no sub menu yet. So we set the | |
2886 newly created sub menu under witem. */ | |
2887 if (newsub != sub) | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2888 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2889 xg_set_screen (newsub, f); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2890 gtk_menu_item_set_submenu (witem, newsub); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2891 } |
49323 | 2892 } |
2893 } | |
2894 | |
49572 | 2895 g_list_free (list); |
49323 | 2896 gtk_widget_show_all (menubar); |
2897 } | |
2898 | |
2899 /* Recompute all the widgets of frame F, when the menu bar has been | |
2900 changed. Value is non-zero if widgets were updated. */ | |
2901 | |
2902 int | |
2903 xg_update_frame_menubar (f) | |
2904 FRAME_PTR f; | |
2905 { | |
2906 struct x_output *x = f->output_data.x; | |
2907 GtkRequisition req; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2908 |
49323 | 2909 if (!x->menubar_widget || GTK_WIDGET_MAPPED (x->menubar_widget)) |
2910 return 0; | |
2911 | |
2912 BLOCK_INPUT; | |
2913 | |
2914 gtk_box_pack_start (GTK_BOX (x->vbox_widget), x->menubar_widget, | |
2915 FALSE, FALSE, 0); | |
2916 gtk_box_reorder_child (GTK_BOX (x->vbox_widget), x->menubar_widget, 0); | |
2917 | |
2918 gtk_widget_show_all (x->menubar_widget); | |
2919 gtk_widget_size_request (x->menubar_widget, &req); | |
2920 | |
2921 FRAME_MENUBAR_HEIGHT (f) = req.height; | |
2922 | |
2923 /* The height has changed, resize outer widget and set columns | |
2924 rows to what we had before adding the menu bar. */ | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
2925 xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2926 |
49323 | 2927 SET_FRAME_GARBAGED (f); |
2928 UNBLOCK_INPUT; | |
50106
5675d6a0080c
(xg_update_frame_menubar): Add missing return value.
Andreas Schwab <schwab@suse.de>
parents:
50099
diff
changeset
|
2929 |
5675d6a0080c
(xg_update_frame_menubar): Add missing return value.
Andreas Schwab <schwab@suse.de>
parents:
50099
diff
changeset
|
2930 return 1; |
49323 | 2931 } |
2932 | |
2933 /* Get rid of the menu bar of frame F, and free its storage. | |
2934 This is used when deleting a frame, and when turning off the menu bar. */ | |
2935 | |
2936 void | |
2937 free_frame_menubar (f) | |
2938 FRAME_PTR f; | |
2939 { | |
2940 struct x_output *x = f->output_data.x; | |
2941 | |
2942 if (x->menubar_widget) | |
2943 { | |
2944 BLOCK_INPUT; | |
2945 | |
2946 gtk_container_remove (GTK_CONTAINER (x->vbox_widget), x->menubar_widget); | |
2947 /* The menubar and its children shall be deleted when removed from | |
2948 the container. */ | |
2949 x->menubar_widget = 0; | |
2950 FRAME_MENUBAR_HEIGHT (f) = 0; | |
2951 | |
2952 /* The height has changed, resize outer widget and set columns | |
2953 rows to what we had before removing the menu bar. */ | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
2954 xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f)); |
49323 | 2955 |
2956 SET_FRAME_GARBAGED (f); | |
2957 UNBLOCK_INPUT; | |
2958 } | |
2959 } | |
2960 | |
2961 | |
2962 | |
2963 /*********************************************************************** | |
2964 Scroll bar functions | |
2965 ***********************************************************************/ | |
2966 | |
2967 | |
2968 /* Setting scroll bar values invokes the callback. Use this variable | |
2969 to indicate that callback should do nothing. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2970 |
49323 | 2971 int xg_ignore_gtk_scrollbar; |
2972 | |
86161
3408ab8b4152
* xterm.h (struct scroll_bar): Only use Lisp_Object for lisp data.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85938
diff
changeset
|
2973 /* Xlib's `Window' fits in 32 bits. But we want to store pointers, and they |
3408ab8b4152
* xterm.h (struct scroll_bar): Only use Lisp_Object for lisp data.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85938
diff
changeset
|
2974 may be larger than 32 bits. Keep a mapping from integer index to widget |
3408ab8b4152
* xterm.h (struct scroll_bar): Only use Lisp_Object for lisp data.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85938
diff
changeset
|
2975 pointers to get around the 32 bit limitation. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2976 |
49323 | 2977 static struct |
2978 { | |
2979 GtkWidget **widgets; | |
2980 int max_size; | |
2981 int used; | |
49419
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
2982 } id_to_widget; |
49323 | 2983 |
2984 /* Grow this much every time we need to allocate more */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2985 |
49323 | 2986 #define ID_TO_WIDGET_INCR 32 |
2987 | |
2988 /* Store the widget pointer W in id_to_widget and return the integer index. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2989 |
49323 | 2990 static int |
2991 xg_store_widget_in_map (w) | |
2992 GtkWidget *w; | |
2993 { | |
2994 int i; | |
2995 | |
2996 if (id_to_widget.max_size == id_to_widget.used) | |
2997 { | |
2998 int new_size = id_to_widget.max_size + ID_TO_WIDGET_INCR; | |
2999 | |
3000 id_to_widget.widgets = xrealloc (id_to_widget.widgets, | |
3001 sizeof (GtkWidget *)*new_size); | |
3002 | |
3003 for (i = id_to_widget.max_size; i < new_size; ++i) | |
3004 id_to_widget.widgets[i] = 0; | |
3005 id_to_widget.max_size = new_size; | |
3006 } | |
3007 | |
3008 /* Just loop over the array and find a free place. After all, | |
3009 how many scroll bars are we creating? Should be a small number. | |
3010 The check above guarantees we will find a free place. */ | |
3011 for (i = 0; i < id_to_widget.max_size; ++i) | |
3012 { | |
3013 if (! id_to_widget.widgets[i]) | |
3014 { | |
3015 id_to_widget.widgets[i] = w; | |
3016 ++id_to_widget.used; | |
3017 | |
3018 return i; | |
3019 } | |
3020 } | |
3021 | |
3022 /* Should never end up here */ | |
3023 abort (); | |
3024 } | |
3025 | |
3026 /* Remove pointer at IDX from id_to_widget. | |
3027 Called when scroll bar is destroyed. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3028 |
49323 | 3029 static void |
3030 xg_remove_widget_from_map (idx) | |
3031 int idx; | |
3032 { | |
3033 if (idx < id_to_widget.max_size && id_to_widget.widgets[idx] != 0) | |
3034 { | |
3035 id_to_widget.widgets[idx] = 0; | |
3036 --id_to_widget.used; | |
3037 } | |
3038 } | |
3039 | |
3040 /* Get the widget pointer at IDX from id_to_widget. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3041 |
49323 | 3042 static GtkWidget * |
3043 xg_get_widget_from_map (idx) | |
3044 int idx; | |
3045 { | |
3046 if (idx < id_to_widget.max_size && id_to_widget.widgets[idx] != 0) | |
3047 return id_to_widget.widgets[idx]; | |
3048 | |
3049 return 0; | |
3050 } | |
3051 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3052 /* Return the scrollbar id for X Window WID on display DPY. |
50063 | 3053 Return -1 if WID not in id_to_widget. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3054 |
50063 | 3055 int |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3056 xg_get_scroll_id_for_window (dpy, wid) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3057 Display *dpy; |
50063 | 3058 Window wid; |
3059 { | |
3060 int idx; | |
3061 GtkWidget *w; | |
3062 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3063 w = xg_win_to_widget (dpy, wid); |
50063 | 3064 |
3065 if (w) | |
3066 { | |
3067 for (idx = 0; idx < id_to_widget.max_size; ++idx) | |
3068 if (id_to_widget.widgets[idx] == w) | |
3069 return idx; | |
3070 } | |
3071 | |
3072 return -1; | |
3073 } | |
3074 | |
49323 | 3075 /* Callback invoked when scroll bar WIDGET is destroyed. |
3076 DATA is the index into id_to_widget for WIDGET. | |
50129
d0142038feaa
Reduce flicker in GTK scrollbars.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50112
diff
changeset
|
3077 We free pointer to last scroll bar values here and remove the index. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3078 |
49323 | 3079 static void |
3080 xg_gtk_scroll_destroy (widget, data) | |
3081 GtkWidget *widget; | |
3082 gpointer data; | |
3083 { | |
3084 gpointer p; | |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3085 int id = (int) (EMACS_INT) data; /* The EMACS_INT cast avoids a warning. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3086 |
49323 | 3087 p = g_object_get_data (G_OBJECT (widget), XG_LAST_SB_DATA); |
3088 if (p) xfree (p); | |
3089 xg_remove_widget_from_map (id); | |
3090 } | |
3091 | |
3092 /* Callback for button press/release events. Used to start timer so that | |
3093 the scroll bar repetition timer in GTK gets handeled. | |
50177
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3094 Also, sets bar->dragging to Qnil when dragging (button release) is done. |
49323 | 3095 WIDGET is the scroll bar widget the event is for (not used). |
3096 EVENT contains the event. | |
50177
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3097 USER_DATA points to the struct scrollbar structure. |
49323 | 3098 |
3099 Returns FALSE to tell GTK that it shall continue propagate the event | |
3100 to widgets. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3101 |
49323 | 3102 static gboolean |
3103 scroll_bar_button_cb (widget, event, user_data) | |
3104 GtkWidget *widget; | |
3105 GdkEventButton *event; | |
3106 gpointer user_data; | |
3107 { | |
3108 if (event->type == GDK_BUTTON_PRESS && ! xg_timer) | |
3109 xg_start_timer (); | |
50177
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3110 else if (event->type == GDK_BUTTON_RELEASE) |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3111 { |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3112 struct scroll_bar *bar = (struct scroll_bar *) user_data; |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3113 if (xg_timer) xg_stop_timer (); |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3114 bar->dragging = Qnil; |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3115 } |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
3116 |
49323 | 3117 return FALSE; |
3118 } | |
3119 | |
3120 /* Create a scroll bar widget for frame F. Store the scroll bar | |
3121 in BAR. | |
3122 SCROLL_CALLBACK is the callback to invoke when the value of the | |
3123 bar changes. | |
3124 SCROLL_BAR_NAME is the name we use for the scroll bar. Can be used | |
3125 to set resources for the widget. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3126 |
49323 | 3127 void |
3128 xg_create_scroll_bar (f, bar, scroll_callback, scroll_bar_name) | |
3129 FRAME_PTR f; | |
3130 struct scroll_bar *bar; | |
3131 GCallback scroll_callback; | |
3132 char *scroll_bar_name; | |
3133 { | |
3134 GtkWidget *wscroll; | |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3135 GtkWidget *webox; |
49323 | 3136 GtkObject *vadj; |
3137 int scroll_id; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3138 |
49323 | 3139 /* Page, step increment values are not so important here, they |
3140 will be corrected in x_set_toolkit_scroll_bar_thumb. */ | |
3141 vadj = gtk_adjustment_new (XG_SB_MIN, XG_SB_MIN, XG_SB_MAX, | |
3142 0.1, 0.1, 0.1); | |
3143 | |
3144 wscroll = gtk_vscrollbar_new (GTK_ADJUSTMENT (vadj)); | |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3145 webox = gtk_event_box_new (); |
49323 | 3146 gtk_widget_set_name (wscroll, scroll_bar_name); |
3147 gtk_range_set_update_policy (GTK_RANGE (wscroll), GTK_UPDATE_CONTINUOUS); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3148 |
49323 | 3149 scroll_id = xg_store_widget_in_map (wscroll); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3150 |
50521
3b4cda88d7ef
* xterm.c (xg_scroll_callback): Call gtk_range_get_adjustment to
Jan Djärv <jan.h.d@swipnet.se>
parents:
50333
diff
changeset
|
3151 g_signal_connect (G_OBJECT (wscroll), |
49323 | 3152 "value-changed", |
3153 scroll_callback, | |
50521
3b4cda88d7ef
* xterm.c (xg_scroll_callback): Call gtk_range_get_adjustment to
Jan Djärv <jan.h.d@swipnet.se>
parents:
50333
diff
changeset
|
3154 (gpointer) bar); |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3155 /* The EMACS_INT cast avoids a warning. */ |
49323 | 3156 g_signal_connect (G_OBJECT (wscroll), |
3157 "destroy", | |
3158 G_CALLBACK (xg_gtk_scroll_destroy), | |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3159 (gpointer) (EMACS_INT) scroll_id); |
49323 | 3160 |
3161 /* Connect to button press and button release to detect if any scroll bar | |
3162 has the pointer. */ | |
3163 g_signal_connect (G_OBJECT (wscroll), | |
3164 "button-press-event", | |
3165 G_CALLBACK (scroll_bar_button_cb), | |
50521
3b4cda88d7ef
* xterm.c (xg_scroll_callback): Call gtk_range_get_adjustment to
Jan Djärv <jan.h.d@swipnet.se>
parents:
50333
diff
changeset
|
3166 (gpointer) bar); |
49323 | 3167 g_signal_connect (G_OBJECT (wscroll), |
3168 "button-release-event", | |
3169 G_CALLBACK (scroll_bar_button_cb), | |
50521
3b4cda88d7ef
* xterm.c (xg_scroll_callback): Call gtk_range_get_adjustment to
Jan Djärv <jan.h.d@swipnet.se>
parents:
50333
diff
changeset
|
3170 (gpointer) bar); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3171 |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3172 /* The scroll bar widget does not draw on a window of its own. Instead |
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3173 it draws on the parent window, in this case the edit widget. So |
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3174 whenever the edit widget is cleared, the scroll bar needs to redraw |
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3175 also, which causes flicker. Put an event box between the edit widget |
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3176 and the scroll bar, so the scroll bar instead draws itself on the |
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3177 event box window. */ |
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3178 gtk_fixed_put (GTK_FIXED (f->output_data.x->edit_widget), webox, -1, -1); |
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3179 gtk_container_add (GTK_CONTAINER (webox), wscroll); |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
3180 |
49323 | 3181 |
3182 /* Set the cursor to an arrow. */ | |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3183 xg_set_cursor (webox, FRAME_X_DISPLAY_INFO (f)->xg_cursor); |
49323 | 3184 |
86161
3408ab8b4152
* xterm.h (struct scroll_bar): Only use Lisp_Object for lisp data.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85938
diff
changeset
|
3185 bar->x_window = scroll_id; |
49323 | 3186 } |
3187 | |
3188 /* Make the scroll bar represented by SCROLLBAR_ID visible. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3189 |
49323 | 3190 void |
3191 xg_show_scroll_bar (scrollbar_id) | |
3192 int scrollbar_id; | |
3193 { | |
3194 GtkWidget *w = xg_get_widget_from_map (scrollbar_id); | |
3195 if (w) | |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3196 gtk_widget_show_all (gtk_widget_get_parent (w)); |
49323 | 3197 } |
3198 | |
3199 /* Remove the scroll bar represented by SCROLLBAR_ID from the frame F. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3200 |
49323 | 3201 void |
3202 xg_remove_scroll_bar (f, scrollbar_id) | |
3203 FRAME_PTR f; | |
3204 int scrollbar_id; | |
3205 { | |
3206 GtkWidget *w = xg_get_widget_from_map (scrollbar_id); | |
3207 if (w) | |
3208 { | |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3209 GtkWidget *wparent = gtk_widget_get_parent (w); |
49323 | 3210 gtk_widget_destroy (w); |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3211 gtk_widget_destroy (wparent); |
49323 | 3212 SET_FRAME_GARBAGED (f); |
3213 } | |
3214 } | |
3215 | |
3216 /* Update the position of the vertical scroll bar represented by SCROLLBAR_ID | |
3217 in frame F. | |
3218 TOP/LEFT are the new pixel positions where the bar shall appear. | |
3219 WIDTH, HEIGHT is the size in pixels the bar shall have. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3220 |
49323 | 3221 void |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3222 xg_update_scrollbar_pos (f, scrollbar_id, top, left, width, height) |
49323 | 3223 FRAME_PTR f; |
3224 int scrollbar_id; | |
3225 int top; | |
3226 int left; | |
3227 int width; | |
3228 int height; | |
3229 { | |
49572 | 3230 |
3231 GtkWidget *wscroll = xg_get_widget_from_map (scrollbar_id); | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3232 |
49572 | 3233 if (wscroll) |
3234 { | |
50177
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3235 GtkWidget *wfixed = f->output_data.x->edit_widget; |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3236 GtkWidget *wparent = gtk_widget_get_parent (wscroll); |
55342
44d086f5e08a
* gtkutil.c (xg_update_scrollbar_pos): Call XClearWindow to clear
Jan Djärv <jan.h.d@swipnet.se>
parents:
53275
diff
changeset
|
3237 |
44d086f5e08a
* gtkutil.c (xg_update_scrollbar_pos): Call XClearWindow to clear
Jan Djärv <jan.h.d@swipnet.se>
parents:
53275
diff
changeset
|
3238 /* Move and resize to new values. */ |
60553
5ace6337c8fa
* gtkutil.c (xg_update_scrollbar_pos): Call x_sync so that the
Jan Djärv <jan.h.d@swipnet.se>
parents:
60291
diff
changeset
|
3239 gtk_fixed_move (GTK_FIXED (wfixed), wparent, left, top); |
55342
44d086f5e08a
* gtkutil.c (xg_update_scrollbar_pos): Call XClearWindow to clear
Jan Djärv <jan.h.d@swipnet.se>
parents:
53275
diff
changeset
|
3240 gtk_widget_set_size_request (wscroll, width, height); |
60553
5ace6337c8fa
* gtkutil.c (xg_update_scrollbar_pos): Call x_sync so that the
Jan Djärv <jan.h.d@swipnet.se>
parents:
60291
diff
changeset
|
3241 gtk_widget_queue_draw (wparent); |
5ace6337c8fa
* gtkutil.c (xg_update_scrollbar_pos): Call x_sync so that the
Jan Djärv <jan.h.d@swipnet.se>
parents:
60291
diff
changeset
|
3242 gdk_window_process_all_updates (); |
5ace6337c8fa
* gtkutil.c (xg_update_scrollbar_pos): Call x_sync so that the
Jan Djärv <jan.h.d@swipnet.se>
parents:
60291
diff
changeset
|
3243 /* GTK does not redraw until the main loop is entered again, but |
5ace6337c8fa
* gtkutil.c (xg_update_scrollbar_pos): Call x_sync so that the
Jan Djärv <jan.h.d@swipnet.se>
parents:
60291
diff
changeset
|
3244 if there are no X events pending we will not enter it. So we sync |
5ace6337c8fa
* gtkutil.c (xg_update_scrollbar_pos): Call x_sync so that the
Jan Djärv <jan.h.d@swipnet.se>
parents:
60291
diff
changeset
|
3245 here to get some events. */ |
5ace6337c8fa
* gtkutil.c (xg_update_scrollbar_pos): Call x_sync so that the
Jan Djärv <jan.h.d@swipnet.se>
parents:
60291
diff
changeset
|
3246 x_sync (f); |
49572 | 3247 SET_FRAME_GARBAGED (f); |
3248 cancel_mouse_face (f); | |
3249 } | |
49323 | 3250 } |
3251 | |
3252 /* Set the thumb size and position of scroll bar BAR. We are currently | |
3253 displaying PORTION out of a whole WHOLE, and our position POSITION. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3254 |
49323 | 3255 void |
3256 xg_set_toolkit_scroll_bar_thumb (bar, portion, position, whole) | |
3257 struct scroll_bar *bar; | |
3258 int portion, position, whole; | |
3259 { | |
86161
3408ab8b4152
* xterm.h (struct scroll_bar): Only use Lisp_Object for lisp data.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85938
diff
changeset
|
3260 GtkWidget *wscroll = xg_get_widget_from_map (bar->x_window); |
49323 | 3261 |
3262 FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window))); | |
3263 | |
50177
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3264 if (wscroll && NILP (bar->dragging)) |
49323 | 3265 { |
3266 GtkAdjustment *adj; | |
3267 gdouble shown; | |
3268 gdouble top; | |
3269 int size, value; | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3270 int new_step; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3271 int changed = 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3272 |
49323 | 3273 adj = gtk_range_get_adjustment (GTK_RANGE (wscroll)); |
3274 | |
50177
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3275 /* We do the same as for MOTIF in xterm.c, assume 30 chars per line |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3276 rather than the real portion value. This makes the thumb less likely |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3277 to resize and that looks better. */ |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
3278 portion = WINDOW_TOTAL_LINES (XWINDOW (bar->window)) * 30; |
50177
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3279 /* When the thumb is at the bottom, position == whole. |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3280 So we need to increase `whole' to make space for the thumb. */ |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3281 whole += portion; |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3282 |
49323 | 3283 if (whole <= 0) |
3284 top = 0, shown = 1; | |
3285 else | |
3286 { | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3287 top = (gdouble) position / whole; |
49323 | 3288 shown = (gdouble) portion / whole; |
3289 } | |
3290 | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3291 size = shown * XG_SB_RANGE; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3292 size = min (size, XG_SB_RANGE); |
49323 | 3293 size = max (size, 1); |
3294 | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3295 value = top * XG_SB_RANGE; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3296 value = min (value, XG_SB_MAX - size); |
49323 | 3297 value = max (value, XG_SB_MIN); |
3298 | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3299 /* Assume all lines are of equal size. */ |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
3300 new_step = size / max (1, FRAME_LINES (f)); |
50178
61194aef8668
* gtkutil.c (xg_set_toolkit_scroll_bar_thumb): Check if new values
Jan Djärv <jan.h.d@swipnet.se>
parents:
50177
diff
changeset
|
3301 |
61194aef8668
* gtkutil.c (xg_set_toolkit_scroll_bar_thumb): Check if new values
Jan Djärv <jan.h.d@swipnet.se>
parents:
50177
diff
changeset
|
3302 if ((int) adj->page_size != size |
61194aef8668
* gtkutil.c (xg_set_toolkit_scroll_bar_thumb): Check if new values
Jan Djärv <jan.h.d@swipnet.se>
parents:
50177
diff
changeset
|
3303 || (int) adj->step_increment != new_step) |
61194aef8668
* gtkutil.c (xg_set_toolkit_scroll_bar_thumb): Check if new values
Jan Djärv <jan.h.d@swipnet.se>
parents:
50177
diff
changeset
|
3304 { |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3305 adj->page_size = size; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3306 adj->step_increment = new_step; |
50178
61194aef8668
* gtkutil.c (xg_set_toolkit_scroll_bar_thumb): Check if new values
Jan Djärv <jan.h.d@swipnet.se>
parents:
50177
diff
changeset
|
3307 /* Assume a page increment is about 95% of the page size */ |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3308 adj->page_increment = (int) (0.95*adj->page_size); |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3309 changed = 1; |
50178
61194aef8668
* gtkutil.c (xg_set_toolkit_scroll_bar_thumb): Check if new values
Jan Djärv <jan.h.d@swipnet.se>
parents:
50177
diff
changeset
|
3310 } |
61194aef8668
* gtkutil.c (xg_set_toolkit_scroll_bar_thumb): Check if new values
Jan Djärv <jan.h.d@swipnet.se>
parents:
50177
diff
changeset
|
3311 |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3312 if (changed || (int) gtk_range_get_value (GTK_RANGE (wscroll)) != value) |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3313 { |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3314 GtkWidget *wfixed = f->output_data.x->edit_widget; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3315 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3316 BLOCK_INPUT; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3317 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3318 /* gtk_range_set_value invokes the callback. Set |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3319 ignore_gtk_scrollbar to make the callback do nothing */ |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3320 xg_ignore_gtk_scrollbar = 1; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3321 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3322 if ((int) gtk_range_get_value (GTK_RANGE (wscroll)) != value) |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3323 gtk_range_set_value (GTK_RANGE (wscroll), (gdouble)value); |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3324 else if (changed) |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3325 gtk_adjustment_changed (adj); |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3326 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3327 xg_ignore_gtk_scrollbar = 0; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3328 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3329 UNBLOCK_INPUT; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3330 } |
49323 | 3331 } |
3332 } | |
3333 | |
3334 | |
3335 /*********************************************************************** | |
3336 Tool bar functions | |
3337 ***********************************************************************/ | |
3338 /* The key for the data we put in the GtkImage widgets. The data is | |
3339 the image used by Emacs. We use this to see if we need to update | |
3340 the GtkImage with a new image. */ | |
3341 #define XG_TOOL_BAR_IMAGE_DATA "emacs-tool-bar-image" | |
3342 | |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3343 /* The key for storing the latest modifiers so the activate callback can |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3344 get them. */ |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3345 #define XG_TOOL_BAR_LAST_MODIFIER "emacs-tool-bar-modifier" |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3346 |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3347 /* The key for storing the button widget in its proxy menu item. */ |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3348 #define XG_TOOL_BAR_PROXY_BUTTON "emacs-tool-bar-proxy-button" |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3349 |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3350 /* The key for the data we put in the GtkImage widgets. The data is |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3351 the stock name used by Emacs. We use this to see if we need to update |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3352 the GtkImage with a new image. */ |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3353 #define XG_TOOL_BAR_STOCK_NAME "emacs-tool-bar-stock-name" |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3354 |
83849
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3355 /* As above, but this is used for named theme widgets, as opposed to |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3356 stock items. */ |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3357 #define XG_TOOL_BAR_ICON_NAME "emacs-tool-bar-icon-name" |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3358 |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3359 /* Callback function invoked when a tool bar item is pressed. |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3360 W is the button widget in the tool bar that got pressed, |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3361 CLIENT_DATA is an integer that is the index of the button in the |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3362 tool bar. 0 is the first button. */ |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3363 |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3364 static gboolean |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3365 xg_tool_bar_button_cb (widget, event, user_data) |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3366 GtkWidget *widget; |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3367 GdkEventButton *event; |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3368 gpointer user_data; |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3369 { |
73389
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
3370 /* Casts to avoid warnings when gpointer is 64 bits and int is 32 bits */ |
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
3371 gpointer ptr = (gpointer) (EMACS_INT) event->state; |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3372 g_object_set_data (G_OBJECT (widget), XG_TOOL_BAR_LAST_MODIFIER, ptr); |
68922 | 3373 return FALSE; |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3374 } |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3375 |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3376 |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3377 /* Callback function invoked when a tool bar item is pressed. |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3378 W is the button widget in the tool bar that got pressed, |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3379 CLIENT_DATA is an integer that is the index of the button in the |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3380 tool bar. 0 is the first button. */ |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3381 |
49323 | 3382 static void |
3383 xg_tool_bar_callback (w, client_data) | |
3384 GtkWidget *w; | |
3385 gpointer client_data; | |
3386 { | |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3387 /* The EMACS_INT cast avoids a warning. */ |
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3388 int idx = (int) (EMACS_INT) client_data; |
73389
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
3389 int mod = (int) (EMACS_INT) g_object_get_data (G_OBJECT (w), |
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
3390 XG_TOOL_BAR_LAST_MODIFIER); |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3391 |
49323 | 3392 FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA); |
3393 Lisp_Object key, frame; | |
3394 struct input_event event; | |
51569
e7bd8581e306
(xg_tool_bar_callback): Don't pass uninitialized
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51432
diff
changeset
|
3395 EVENT_INIT (event); |
49323 | 3396 |
3397 if (! f || ! f->n_tool_bar_items || NILP (f->tool_bar_items)) | |
3398 return; | |
3399 | |
3400 idx *= TOOL_BAR_ITEM_NSLOTS; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3401 |
49323 | 3402 key = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_KEY); |
3403 XSETFRAME (frame, f); | |
82269
52d28c9f374b
(xg_tool_bar_callback): Generate two TOOL_BAR_EVENT:s,
Jan Djärv <jan.h.d@swipnet.se>
parents:
82223
diff
changeset
|
3404 |
52d28c9f374b
(xg_tool_bar_callback): Generate two TOOL_BAR_EVENT:s,
Jan Djärv <jan.h.d@swipnet.se>
parents:
82223
diff
changeset
|
3405 /* We generate two events here. The first one is to set the prefix |
52d28c9f374b
(xg_tool_bar_callback): Generate two TOOL_BAR_EVENT:s,
Jan Djärv <jan.h.d@swipnet.se>
parents:
82223
diff
changeset
|
3406 to `(tool_bar)', see keyboard.c. */ |
49323 | 3407 event.kind = TOOL_BAR_EVENT; |
3408 event.frame_or_window = frame; | |
82269
52d28c9f374b
(xg_tool_bar_callback): Generate two TOOL_BAR_EVENT:s,
Jan Djärv <jan.h.d@swipnet.se>
parents:
82223
diff
changeset
|
3409 event.arg = frame; |
52d28c9f374b
(xg_tool_bar_callback): Generate two TOOL_BAR_EVENT:s,
Jan Djärv <jan.h.d@swipnet.se>
parents:
82223
diff
changeset
|
3410 kbd_buffer_store_event (&event); |
52d28c9f374b
(xg_tool_bar_callback): Generate two TOOL_BAR_EVENT:s,
Jan Djärv <jan.h.d@swipnet.se>
parents:
82223
diff
changeset
|
3411 |
52d28c9f374b
(xg_tool_bar_callback): Generate two TOOL_BAR_EVENT:s,
Jan Djärv <jan.h.d@swipnet.se>
parents:
82223
diff
changeset
|
3412 event.kind = TOOL_BAR_EVENT; |
52d28c9f374b
(xg_tool_bar_callback): Generate two TOOL_BAR_EVENT:s,
Jan Djärv <jan.h.d@swipnet.se>
parents:
82223
diff
changeset
|
3413 event.frame_or_window = frame; |
49323 | 3414 event.arg = key; |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3415 /* Convert between the modifier bits GDK uses and the modifier bits |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3416 Emacs uses. This assumes GDK an X masks are the same, which they are when |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3417 this is written. */ |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3418 event.modifiers = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f), mod); |
49323 | 3419 kbd_buffer_store_event (&event); |
3420 } | |
3421 | |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3422 /* Callback function invoked when a tool bar item is pressed in a detached |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3423 tool bar or the overflow drop down menu. |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3424 We just call xg_tool_bar_callback. |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3425 W is the menu item widget that got pressed, |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3426 CLIENT_DATA is an integer that is the index of the button in the |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3427 tool bar. 0 is the first button. */ |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3428 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3429 static void |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3430 xg_tool_bar_proxy_callback (w, client_data) |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3431 GtkWidget *w; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3432 gpointer client_data; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3433 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3434 GtkWidget *wbutton = GTK_WIDGET (g_object_get_data (G_OBJECT (w), |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3435 XG_TOOL_BAR_PROXY_BUTTON)); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3436 xg_tool_bar_callback (wbutton, client_data); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3437 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3438 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3439 /* This callback is called when a tool item should create a proxy item, |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3440 such as for the overflow menu. Also called when the tool bar is detached. |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3441 If we don't create a proxy menu item, the detached tool bar will be |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3442 blank. */ |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3443 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3444 static gboolean |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3445 xg_tool_bar_menu_proxy (toolitem, user_data) |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3446 GtkToolItem *toolitem; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3447 gpointer user_data; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3448 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3449 GtkWidget *weventbox = gtk_bin_get_child (GTK_BIN (toolitem)); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3450 GtkButton *wbutton = GTK_BUTTON (gtk_bin_get_child (GTK_BIN (weventbox))); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3451 GtkWidget *wmenuitem = gtk_image_menu_item_new (); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3452 GtkWidget *wmenuimage; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3453 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3454 if (gtk_button_get_use_stock (wbutton)) |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3455 wmenuimage = gtk_image_new_from_stock (gtk_button_get_label (wbutton), |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3456 GTK_ICON_SIZE_MENU); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3457 else |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3458 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3459 GtkImage *wimage = GTK_IMAGE (gtk_bin_get_child (GTK_BIN (wbutton))); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3460 GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (wbutton)); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3461 GtkImageType store_type = gtk_image_get_storage_type (wimage); |
85938
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3462 |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3463 if (store_type == GTK_IMAGE_STOCK) |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3464 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3465 gchar *stock_id; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3466 gtk_image_get_stock (wimage, &stock_id, NULL); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3467 wmenuimage = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3468 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3469 else if (store_type == GTK_IMAGE_ICON_SET) |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3470 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3471 GtkIconSet *icon_set; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3472 gtk_image_get_icon_set (wimage, &icon_set, NULL); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3473 wmenuimage = gtk_image_new_from_icon_set (icon_set, |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3474 GTK_ICON_SIZE_MENU); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3475 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3476 else if (store_type == GTK_IMAGE_PIXBUF) |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3477 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3478 gint width, height; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3479 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3480 if (settings && |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3481 gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3482 &width, &height)) |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3483 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3484 GdkPixbuf *src_pixbuf, *dest_pixbuf; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3485 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3486 src_pixbuf = gtk_image_get_pixbuf (wimage); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3487 dest_pixbuf = gdk_pixbuf_scale_simple (src_pixbuf, width, height, |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3488 GDK_INTERP_BILINEAR); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3489 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3490 wmenuimage = gtk_image_new_from_pixbuf (dest_pixbuf); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3491 } |
85938
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3492 else |
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3493 { |
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3494 fprintf (stderr, "internal error: GTK_IMAGE_PIXBUF failed\n"); |
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3495 abort (); |
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3496 } |
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3497 } |
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3498 else if (store_type == GTK_IMAGE_ICON_NAME) |
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3499 { |
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3500 const gchar *icon_name; |
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3501 GtkIconSize icon_size; |
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3502 |
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3503 gtk_image_get_icon_name (wimage, &icon_name, &icon_size); |
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3504 wmenuimage = gtk_image_new_from_icon_name (icon_name, |
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3505 GTK_ICON_SIZE_MENU); |
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3506 } |
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3507 else |
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3508 { |
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3509 fprintf (stderr, "internal error: store_type is %d\n", store_type); |
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3510 abort (); |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3511 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3512 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3513 if (wmenuimage) |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3514 gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (wmenuitem), wmenuimage); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3515 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3516 g_signal_connect (G_OBJECT (wmenuitem), |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3517 "activate", |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3518 GTK_SIGNAL_FUNC (xg_tool_bar_proxy_callback), |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3519 user_data); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3520 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3521 g_object_set_data (G_OBJECT (wmenuitem), XG_TOOL_BAR_PROXY_BUTTON, |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3522 (gpointer) wbutton); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3523 gtk_tool_item_set_proxy_menu_item (toolitem, "Emacs toolbar item", wmenuitem); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3524 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3525 return TRUE; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3526 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3527 |
49323 | 3528 /* This callback is called when a tool bar is detached. We must set |
3529 the height of the tool bar to zero when this happens so frame sizes | |
3530 are correctly calculated. | |
3531 WBOX is the handle box widget that enables detach/attach of the tool bar. | |
3532 W is the tool bar widget. | |
3533 CLIENT_DATA is a pointer to the frame the tool bar belongs to. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3534 |
49323 | 3535 static void |
3536 xg_tool_bar_detach_callback (wbox, w, client_data) | |
3537 GtkHandleBox *wbox; | |
3538 GtkWidget *w; | |
3539 gpointer client_data; | |
3540 { | |
3541 FRAME_PTR f = (FRAME_PTR) client_data; | |
68879
3249a3dd3284
* gtkutil.c (xg_tool_bar_detach_callback): Set show-arrow to the
Jan Djärv <jan.h.d@swipnet.se>
parents:
68874
diff
changeset
|
3542 extern int x_gtk_whole_detached_tool_bar; |
3249a3dd3284
* gtkutil.c (xg_tool_bar_detach_callback): Set show-arrow to the
Jan Djärv <jan.h.d@swipnet.se>
parents:
68874
diff
changeset
|
3543 |
3249a3dd3284
* gtkutil.c (xg_tool_bar_detach_callback): Set show-arrow to the
Jan Djärv <jan.h.d@swipnet.se>
parents:
68874
diff
changeset
|
3544 g_object_set (G_OBJECT (w), "show-arrow", !x_gtk_whole_detached_tool_bar, |
3249a3dd3284
* gtkutil.c (xg_tool_bar_detach_callback): Set show-arrow to the
Jan Djärv <jan.h.d@swipnet.se>
parents:
68874
diff
changeset
|
3545 NULL); |
49323 | 3546 |
3547 if (f) | |
3548 { | |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3549 FRAME_X_OUTPUT (f)->toolbar_detached = 1; |
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3550 |
49323 | 3551 /* When detaching a tool bar, not everything dissapear. There are |
3552 a few pixels left that are used to drop the tool bar back into | |
3553 place. */ | |
3554 FRAME_TOOLBAR_HEIGHT (f) = 2; | |
3555 | |
3556 /* The height has changed, resize outer widget and set columns | |
3557 rows to what we had before detaching the tool bar. */ | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
3558 xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f)); |
49323 | 3559 } |
3560 } | |
3561 | |
3562 /* This callback is called when a tool bar is reattached. We must set | |
3563 the height of the tool bar when this happens so frame sizes | |
3564 are correctly calculated. | |
3565 WBOX is the handle box widget that enables detach/attach of the tool bar. | |
3566 W is the tool bar widget. | |
3567 CLIENT_DATA is a pointer to the frame the tool bar belongs to. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3568 |
49323 | 3569 static void |
3570 xg_tool_bar_attach_callback (wbox, w, client_data) | |
3571 GtkHandleBox *wbox; | |
3572 GtkWidget *w; | |
3573 gpointer client_data; | |
3574 { | |
3575 FRAME_PTR f = (FRAME_PTR) client_data; | |
68879
3249a3dd3284
* gtkutil.c (xg_tool_bar_detach_callback): Set show-arrow to the
Jan Djärv <jan.h.d@swipnet.se>
parents:
68874
diff
changeset
|
3576 g_object_set (G_OBJECT (w), "show-arrow", TRUE, NULL); |
49323 | 3577 |
3578 if (f) | |
3579 { | |
3580 GtkRequisition req; | |
3581 | |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3582 FRAME_X_OUTPUT (f)->toolbar_detached = 0; |
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3583 |
49323 | 3584 gtk_widget_size_request (w, &req); |
3585 FRAME_TOOLBAR_HEIGHT (f) = req.height; | |
3586 | |
3587 /* The height has changed, resize outer widget and set columns | |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3588 rows to what we had before attaching the tool bar. */ |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
3589 xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f)); |
49323 | 3590 } |
3591 } | |
3592 | |
3593 /* This callback is called when the mouse enters or leaves a tool bar item. | |
3594 It is used for displaying and hiding the help text. | |
3595 W is the tool bar item, a button. | |
3596 EVENT is either an enter event or leave event. | |
3597 CLIENT_DATA is an integer that is the index of the button in the | |
3598 tool bar. 0 is the first button. | |
3599 | |
3600 Returns FALSE to tell GTK to keep processing this event. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3601 |
49323 | 3602 static gboolean |
3603 xg_tool_bar_help_callback (w, event, client_data) | |
3604 GtkWidget *w; | |
3605 GdkEventCrossing *event; | |
3606 gpointer client_data; | |
3607 { | |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3608 /* The EMACS_INT cast avoids a warning. */ |
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3609 int idx = (int) (EMACS_INT) client_data; |
49323 | 3610 FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA); |
3611 Lisp_Object help, frame; | |
3612 | |
3613 if (! f || ! f->n_tool_bar_items || NILP (f->tool_bar_items)) | |
50108
a9ff586d3d09
(xg_tool_bar_help_callback): Add missing return value.
Andreas Schwab <schwab@suse.de>
parents:
50106
diff
changeset
|
3614 return FALSE; |
49323 | 3615 |
3616 if (event->type == GDK_ENTER_NOTIFY) | |
3617 { | |
3618 idx *= TOOL_BAR_ITEM_NSLOTS; | |
3619 help = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_HELP); | |
3620 | |
3621 if (NILP (help)) | |
3622 help = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_CAPTION); | |
3623 } | |
3624 else | |
3625 help = Qnil; | |
3626 | |
3627 XSETFRAME (frame, f); | |
3628 kbd_buffer_store_help_event (frame, help); | |
3629 | |
3630 return FALSE; | |
3631 } | |
3632 | |
3633 | |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3634 /* This callback is called when a tool bar item shall be redrawn. |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3635 It modifies the expose event so that the GtkImage widget redraws the |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3636 whole image. This to overcome a bug that makes GtkImage draw the image |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3637 in the wrong place when it tries to redraw just a part of the image. |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3638 W is the GtkImage to be redrawn. |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3639 EVENT is the expose event for W. |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3640 CLIENT_DATA is unused. |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3641 |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3642 Returns FALSE to tell GTK to keep processing this event. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3643 |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3644 static gboolean |
50063 | 3645 xg_tool_bar_item_expose_callback (w, event, client_data) |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3646 GtkWidget *w; |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3647 GdkEventExpose *event; |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3648 gpointer client_data; |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3649 { |
50333
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3650 gint width, height; |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3651 |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3652 gdk_drawable_get_size (event->window, &width, &height); |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3653 |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3654 event->area.x -= width > event->area.width ? width-event->area.width : 0; |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3655 event->area.y -= height > event->area.height ? height-event->area.height : 0; |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3656 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3657 event->area.x = max (0, event->area.x); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3658 event->area.y = max (0, event->area.y); |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
3659 |
50333
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3660 event->area.width = max (width, event->area.width); |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3661 event->area.height = max (height, event->area.height); |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
3662 |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3663 return FALSE; |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3664 } |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3665 |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3666 #define PROP(IDX) AREF (f->tool_bar_items, i * TOOL_BAR_ITEM_NSLOTS + (IDX)) |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3667 |
50063 | 3668 |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3669 /* Create a tool bar for frame F. */ |
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3670 |
49323 | 3671 static void |
3672 xg_create_tool_bar (f) | |
3673 FRAME_PTR f; | |
3674 { | |
3675 struct x_output *x = f->output_data.x; | |
3676 GtkRequisition req; | |
3677 int vbox_pos = x->menubar_widget ? 1 : 0; | |
3678 | |
3679 x->toolbar_widget = gtk_toolbar_new (); | |
3680 x->handlebox_widget = gtk_handle_box_new (); | |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3681 x->toolbar_detached = 0; |
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3682 |
49323 | 3683 gtk_container_add (GTK_CONTAINER (x->handlebox_widget), |
3684 x->toolbar_widget); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3685 |
49323 | 3686 gtk_box_pack_start (GTK_BOX (x->vbox_widget), x->handlebox_widget, |
3687 FALSE, FALSE, 0); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3688 |
49323 | 3689 gtk_box_reorder_child (GTK_BOX (x->vbox_widget), x->handlebox_widget, |
3690 vbox_pos); | |
3691 | |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3692 gtk_widget_set_name (x->toolbar_widget, "emacs-toolbar"); |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3693 |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3694 /* We only have icons, so override any user setting. We could |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3695 use the caption property of the toolbar item (see update_frame_tool_bar |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3696 below), but some of those strings are long, making the toolbar so |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3697 long it does not fit on the screen. The GtkToolbar widget makes every |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3698 item equal size, so the longest caption determine the size of every |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3699 tool bar item. I think the creators of the GtkToolbar widget |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3700 counted on 4 or 5 character long strings. */ |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3701 gtk_toolbar_set_style (GTK_TOOLBAR (x->toolbar_widget), GTK_TOOLBAR_ICONS); |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3702 gtk_toolbar_set_orientation (GTK_TOOLBAR (x->toolbar_widget), |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3703 GTK_ORIENTATION_HORIZONTAL); |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3704 |
49323 | 3705 g_signal_connect (G_OBJECT (x->handlebox_widget), "child-detached", |
3706 G_CALLBACK (xg_tool_bar_detach_callback), f); | |
3707 g_signal_connect (G_OBJECT (x->handlebox_widget), "child-attached", | |
3708 G_CALLBACK (xg_tool_bar_attach_callback), f); | |
3709 | |
3710 gtk_widget_show_all (x->handlebox_widget); | |
3711 | |
3712 gtk_widget_size_request (x->toolbar_widget, &req); | |
3713 FRAME_TOOLBAR_HEIGHT (f) = req.height; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3714 |
49323 | 3715 /* The height has changed, resize outer widget and set columns |
3716 rows to what we had before adding the tool bar. */ | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
3717 xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3718 |
49323 | 3719 SET_FRAME_GARBAGED (f); |
3720 } | |
3721 | |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3722 /* Find the right-to-left image named by RTL in the tool bar images for F. |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3723 Returns IMAGE if RTL is not found. */ |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3724 |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3725 static Lisp_Object |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3726 find_rtl_image (f, image, rtl) |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3727 FRAME_PTR f; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3728 Lisp_Object image; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3729 Lisp_Object rtl; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3730 { |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3731 int i; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3732 Lisp_Object file, rtl_name; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3733 struct gcpro gcpro1, gcpro2; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3734 GCPRO2 (file, rtl_name); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3735 |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3736 rtl_name = Ffile_name_nondirectory (rtl); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3737 |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3738 for (i = 0; i < f->n_tool_bar_items; ++i) |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3739 { |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3740 Lisp_Object rtl_image = PROP (TOOL_BAR_ITEM_IMAGES); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3741 if (!NILP (file = file_for_image (rtl_image))) |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3742 { |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3743 file = call1 (intern ("file-name-sans-extension"), |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3744 Ffile_name_nondirectory (file)); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3745 if (EQ (Fequal (file, rtl_name), Qt)) |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3746 { |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3747 image = rtl_image; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3748 break; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3749 } |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3750 } |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3751 } |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3752 |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3753 return image; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3754 } |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3755 |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3756 /* Update the tool bar for frame F. Add new buttons and remove old. */ |
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3757 |
49323 | 3758 void |
3759 update_frame_tool_bar (f) | |
3760 FRAME_PTR f; | |
3761 { | |
3762 int i; | |
3763 GtkRequisition old_req, new_req; | |
3764 struct x_output *x = f->output_data.x; | |
75576
e852dba095f9
(update_frame_tool_bar): Initialize h/vmargin to 0.
Jan Djärv <jan.h.d@swipnet.se>
parents:
75417
diff
changeset
|
3765 int hmargin = 0, vmargin = 0; |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3766 GtkToolbar *wtoolbar; |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3767 GtkToolItem *ti; |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3768 GtkTextDirection dir; |
49323 | 3769 |
3770 if (! FRAME_GTK_WIDGET (f)) | |
3771 return; | |
3772 | |
3773 BLOCK_INPUT; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3774 |
59084
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3775 if (INTEGERP (Vtool_bar_button_margin) |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3776 && XINT (Vtool_bar_button_margin) > 0) |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3777 { |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3778 hmargin = XFASTINT (Vtool_bar_button_margin); |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3779 vmargin = XFASTINT (Vtool_bar_button_margin); |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3780 } |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3781 else if (CONSP (Vtool_bar_button_margin)) |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3782 { |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3783 if (INTEGERP (XCAR (Vtool_bar_button_margin)) |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3784 && XINT (XCAR (Vtool_bar_button_margin)) > 0) |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3785 hmargin = XFASTINT (XCAR (Vtool_bar_button_margin)); |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3786 |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3787 if (INTEGERP (XCDR (Vtool_bar_button_margin)) |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3788 && XINT (XCDR (Vtool_bar_button_margin)) > 0) |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3789 vmargin = XFASTINT (XCDR (Vtool_bar_button_margin)); |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3790 } |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3791 |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3792 /* The natural size (i.e. when GTK uses 0 as margin) looks best, |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3793 so take DEFAULT_TOOL_BAR_BUTTON_MARGIN to mean "default for GTK", |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3794 i.e. zero. This means that margins less than |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3795 DEFAULT_TOOL_BAR_BUTTON_MARGIN has no effect. */ |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3796 hmargin = max (0, hmargin - DEFAULT_TOOL_BAR_BUTTON_MARGIN); |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3797 vmargin = max (0, vmargin - DEFAULT_TOOL_BAR_BUTTON_MARGIN); |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
3798 |
49323 | 3799 if (! x->toolbar_widget) |
3800 xg_create_tool_bar (f); | |
3801 | |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3802 wtoolbar = GTK_TOOLBAR (x->toolbar_widget); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3803 gtk_widget_size_request (GTK_WIDGET (wtoolbar), &old_req); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3804 dir = gtk_widget_get_direction (x->toolbar_widget); |
49323 | 3805 |
3806 for (i = 0; i < f->n_tool_bar_items; ++i) | |
3807 { | |
3808 | |
3809 int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P)); | |
3810 int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P)); | |
3811 int idx; | |
3812 int img_id; | |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3813 int icon_size = 0; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3814 struct image *img = NULL; |
49323 | 3815 Lisp_Object image; |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3816 Lisp_Object stock; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3817 GtkStockItem stock_item; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3818 char *stock_name = NULL; |
83849
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3819 char *icon_name = NULL; |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3820 Lisp_Object rtl; |
83815
33f2ff3dc08b
(update_frame_tool_bar): Initialize wbutton to NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
83716
diff
changeset
|
3821 GtkWidget *wbutton = NULL; |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3822 GtkWidget *weventbox; |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3823 Lisp_Object func = intern ("x-gtk-map-stock"); |
86310
f0601f6fb8b0
(update_frame_tool_bar): Don't call x-gtk-map-stock if
Jan Djärv <jan.h.d@swipnet.se>
parents:
86161
diff
changeset
|
3824 Lisp_Object specified_file; |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3825 |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3826 ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (x->toolbar_widget), i); |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3827 |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3828 if (ti) |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3829 { |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3830 weventbox = gtk_bin_get_child (GTK_BIN (ti)); |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3831 wbutton = gtk_bin_get_child (GTK_BIN (weventbox)); |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3832 } |
49323 | 3833 |
3834 image = PROP (TOOL_BAR_ITEM_IMAGES); | |
3835 | |
3836 /* Ignore invalid image specifications. */ | |
3837 if (!valid_image_p (image)) | |
3838 { | |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3839 if (wbutton) gtk_widget_hide (wbutton); |
49323 | 3840 continue; |
3841 } | |
3842 | |
86310
f0601f6fb8b0
(update_frame_tool_bar): Don't call x-gtk-map-stock if
Jan Djärv <jan.h.d@swipnet.se>
parents:
86161
diff
changeset
|
3843 specified_file = file_for_image (image); |
f0601f6fb8b0
(update_frame_tool_bar): Don't call x-gtk-map-stock if
Jan Djärv <jan.h.d@swipnet.se>
parents:
86161
diff
changeset
|
3844 if (!NILP (specified_file) && EQ (Qt, Ffboundp (func))) |
f0601f6fb8b0
(update_frame_tool_bar): Don't call x-gtk-map-stock if
Jan Djärv <jan.h.d@swipnet.se>
parents:
86161
diff
changeset
|
3845 stock = call1 (func, specified_file); |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3846 |
83849
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3847 if (! NILP (stock) && STRINGP (stock)) |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3848 { |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3849 stock_name = SSDATA (stock); |
83849
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3850 if (stock_name[0] == 'n' && stock_name[1] == ':') |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3851 { |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3852 GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (wtoolbar)); |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3853 GtkIconTheme *icon_theme = gtk_icon_theme_get_for_screen (screen); |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3854 |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3855 icon_name = stock_name + 2; |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3856 stock_name = NULL; |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3857 stock = Qnil; |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3858 |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3859 if (! gtk_icon_theme_has_icon (icon_theme, icon_name)) |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3860 icon_name = NULL; |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3861 else |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3862 icon_size = gtk_toolbar_get_icon_size (wtoolbar); |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3863 } |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3864 else if (gtk_stock_lookup (SSDATA (stock), &stock_item)) |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3865 icon_size = gtk_toolbar_get_icon_size (wtoolbar); |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3866 else |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3867 { |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3868 stock = Qnil; |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3869 stock_name = NULL; |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3870 } |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3871 } |
83849
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3872 |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3873 if (stock_name == NULL && icon_name == NULL) |
49468
f2be5cd8262f
gtkutil.c (update_frame_tool_bar): Call prepare_image_for_display
Jan Djärv <jan.h.d@swipnet.se>
parents:
49434
diff
changeset
|
3874 { |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3875 /* No stock image, or stock item not known. Try regular image. */ |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3876 |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3877 /* If image is a vector, choose the image according to the |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3878 button state. */ |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3879 if (dir == GTK_TEXT_DIR_RTL |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3880 && !NILP (rtl = PROP (TOOL_BAR_ITEM_RTL_IMAGE)) |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3881 && STRINGP (rtl)) |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3882 { |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3883 image = find_rtl_image (f, image, rtl); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3884 } |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3885 |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3886 if (VECTORP (image)) |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3887 { |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3888 if (enabled_p) |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3889 idx = (selected_p |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3890 ? TOOL_BAR_IMAGE_ENABLED_SELECTED |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3891 : TOOL_BAR_IMAGE_ENABLED_DESELECTED); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3892 else |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3893 idx = (selected_p |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3894 ? TOOL_BAR_IMAGE_DISABLED_SELECTED |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3895 : TOOL_BAR_IMAGE_DISABLED_DESELECTED); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3896 |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3897 xassert (ASIZE (image) >= idx); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3898 image = AREF (image, idx); |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3899 } |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3900 else |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3901 idx = -1; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3902 |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3903 img_id = lookup_image (f, image); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3904 img = IMAGE_FROM_ID (f, img_id); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3905 prepare_image_for_display (f, img); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3906 |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3907 if (img->load_failed_p || img->pixmap == None) |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3908 { |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3909 if (ti) |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3910 gtk_widget_hide_all (GTK_WIDGET (ti)); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3911 else |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3912 { |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3913 /* Insert an empty (non-image) button */ |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3914 weventbox = gtk_event_box_new (); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3915 wbutton = gtk_button_new (); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3916 gtk_button_set_focus_on_click (GTK_BUTTON (wbutton), FALSE); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3917 gtk_button_set_relief (GTK_BUTTON (wbutton), |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3918 GTK_RELIEF_NONE); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3919 gtk_container_add (GTK_CONTAINER (weventbox), wbutton); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3920 ti = gtk_tool_item_new (); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3921 gtk_container_add (GTK_CONTAINER (ti), weventbox); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3922 gtk_toolbar_insert (GTK_TOOLBAR (x->toolbar_widget), ti, -1); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3923 } |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3924 continue; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3925 } |
49468
f2be5cd8262f
gtkutil.c (update_frame_tool_bar): Call prepare_image_for_display
Jan Djärv <jan.h.d@swipnet.se>
parents:
49434
diff
changeset
|
3926 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3927 |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3928 if (ti == NULL) |
49323 | 3929 { |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3930 GtkWidget *w; |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3931 if (stock_name) |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3932 { |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3933 w = gtk_image_new_from_stock (stock_name, icon_size); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3934 g_object_set_data_full (G_OBJECT (w), XG_TOOL_BAR_STOCK_NAME, |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3935 (gpointer) xstrdup (stock_name), |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3936 (GDestroyNotify) xfree); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3937 } |
83849
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3938 else if (icon_name) |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3939 { |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3940 w = gtk_image_new_from_icon_name (icon_name, icon_size); |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3941 g_object_set_data_full (G_OBJECT (w), XG_TOOL_BAR_ICON_NAME, |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3942 (gpointer) xstrdup (icon_name), |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3943 (GDestroyNotify) xfree); |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
3944 } |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3945 else |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3946 { |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3947 w = xg_get_image_for_pixmap (f, img, x->widget, NULL); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3948 /* Save the image so we can see if an update is needed when |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3949 this function is called again. */ |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3950 g_object_set_data (G_OBJECT (w), XG_TOOL_BAR_IMAGE_DATA, |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3951 (gpointer)img->pixmap); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3952 } |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
3953 |
59084
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3954 gtk_misc_set_padding (GTK_MISC (w), hmargin, vmargin); |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3955 wbutton = gtk_button_new (); |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3956 gtk_button_set_focus_on_click (GTK_BUTTON (wbutton), FALSE); |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3957 gtk_button_set_relief (GTK_BUTTON (wbutton), GTK_RELIEF_NONE); |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3958 gtk_container_add (GTK_CONTAINER (wbutton), w); |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3959 weventbox = gtk_event_box_new (); |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3960 gtk_container_add (GTK_CONTAINER (weventbox), wbutton); |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3961 ti = gtk_tool_item_new (); |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3962 gtk_container_add (GTK_CONTAINER (ti), weventbox); |
82359
25c5bc8d8b8e
(update_frame_tool_bar): Use -1 as index
Jan Djärv <jan.h.d@swipnet.se>
parents:
82269
diff
changeset
|
3963 gtk_toolbar_insert (GTK_TOOLBAR (x->toolbar_widget), ti, -1); |
74376
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3964 |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3965 |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3966 /* The EMACS_INT cast avoids a warning. */ |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3967 g_signal_connect (G_OBJECT (ti), "create-menu-proxy", |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3968 GTK_SIGNAL_FUNC (xg_tool_bar_menu_proxy), |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3969 (gpointer) (EMACS_INT) i); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3970 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3971 g_signal_connect (G_OBJECT (wbutton), "clicked", |
68500
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3972 GTK_SIGNAL_FUNC (xg_tool_bar_callback), |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3973 (gpointer) (EMACS_INT) i); |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3974 |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3975 gtk_widget_show_all (GTK_WIDGET (ti)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3976 |
49323 | 3977 |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3978 g_object_set_data (G_OBJECT (weventbox), XG_FRAME_DATA, (gpointer)f); |
68500
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3979 |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3980 /* Catch expose events to overcome an annoying redraw bug, see |
50063 | 3981 comment for xg_tool_bar_item_expose_callback. */ |
68500
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3982 g_signal_connect (G_OBJECT (ti), |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3983 "expose-event", |
50063 | 3984 G_CALLBACK (xg_tool_bar_item_expose_callback), |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3985 0); |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3986 |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3987 gtk_widget_set_sensitive (wbutton, enabled_p); |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3988 gtk_tool_item_set_homogeneous (ti, FALSE); |
68500
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3989 |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3990 /* Callback to save modifyer mask (Shift/Control, etc). GTK makes |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3991 no distinction based on modifiers in the activate callback, |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3992 so we have to do it ourselves. */ |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3993 g_signal_connect (wbutton, "button-release-event", |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3994 GTK_SIGNAL_FUNC (xg_tool_bar_button_cb), |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3995 NULL); |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3996 |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3997 g_object_set_data (G_OBJECT (wbutton), XG_FRAME_DATA, (gpointer)f); |
68500
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3998 |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3999 /* Use enter/leave notify to show help. We use the events |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
4000 rather than the GtkButton specific signals "enter" and |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
4001 "leave", so we can have only one callback. The event |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
4002 will tell us what kind of event it is. */ |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
4003 /* The EMACS_INT cast avoids a warning. */ |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4004 g_signal_connect (G_OBJECT (weventbox), |
68500
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
4005 "enter-notify-event", |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
4006 G_CALLBACK (xg_tool_bar_help_callback), |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
4007 (gpointer) (EMACS_INT) i); |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4008 g_signal_connect (G_OBJECT (weventbox), |
68500
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
4009 "leave-notify-event", |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
4010 G_CALLBACK (xg_tool_bar_help_callback), |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
4011 (gpointer) (EMACS_INT) i); |
49323 | 4012 } |
4013 else | |
4014 { | |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4015 GtkWidget *wimage = gtk_bin_get_child (GTK_BIN (wbutton)); |
50059
ffb4a4dbe4c0
* gtkutil.c (update_frame_tool_bar): Compare pixmap ID instead of
Jan Djärv <jan.h.d@swipnet.se>
parents:
49826
diff
changeset
|
4016 Pixmap old_img = (Pixmap)g_object_get_data (G_OBJECT (wimage), |
ffb4a4dbe4c0
* gtkutil.c (update_frame_tool_bar): Compare pixmap ID instead of
Jan Djärv <jan.h.d@swipnet.se>
parents:
49826
diff
changeset
|
4017 XG_TOOL_BAR_IMAGE_DATA); |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4018 gpointer old_stock_name = g_object_get_data (G_OBJECT (wimage), |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4019 XG_TOOL_BAR_STOCK_NAME); |
83849
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
4020 gpointer old_icon_name = g_object_get_data (G_OBJECT (wimage), |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
4021 XG_TOOL_BAR_ICON_NAME); |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4022 if (stock_name && |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4023 (! old_stock_name || strcmp (old_stock_name, stock_name) != 0)) |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4024 { |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4025 gtk_image_set_from_stock (GTK_IMAGE (wimage), |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4026 stock_name, icon_size); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4027 g_object_set_data_full (G_OBJECT (wimage), XG_TOOL_BAR_STOCK_NAME, |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4028 (gpointer) xstrdup (stock_name), |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4029 (GDestroyNotify) xfree); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4030 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA, |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4031 NULL); |
83849
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
4032 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_ICON_NAME, NULL); |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
4033 } |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
4034 else if (icon_name && |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
4035 (! old_icon_name || strcmp (old_icon_name, icon_name) != 0)) |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
4036 { |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
4037 gtk_image_set_from_icon_name (GTK_IMAGE (wimage), |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
4038 icon_name, icon_size); |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
4039 g_object_set_data_full (G_OBJECT (wimage), XG_TOOL_BAR_ICON_NAME, |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
4040 (gpointer) xstrdup (icon_name), |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
4041 (GDestroyNotify) xfree); |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
4042 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA, |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
4043 NULL); |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
4044 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_STOCK_NAME, |
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
4045 NULL); |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4046 } |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4047 else if (img && old_img != img->pixmap) |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4048 { |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4049 (void) xg_get_image_for_pixmap (f, img, x->widget, wimage); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4050 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA, |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4051 (gpointer)img->pixmap); |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4052 |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4053 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_STOCK_NAME, |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4054 NULL); |
83849
b1cecfd7014f
(update_frame_tool_bar): Handle stock name as a named icon
Jan Djärv <jan.h.d@swipnet.se>
parents:
83815
diff
changeset
|
4055 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_ICON_NAME, NULL); |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4056 } |
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4057 |
59084
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4058 gtk_misc_set_padding (GTK_MISC (wimage), hmargin, vmargin); |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4059 |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4060 gtk_widget_set_sensitive (wbutton, enabled_p); |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4061 gtk_widget_show_all (GTK_WIDGET (ti)); |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4062 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
4063 |
49323 | 4064 #undef PROP |
4065 } | |
4066 | |
4067 /* Remove buttons not longer needed. We just hide them so they | |
4068 can be reused later on. */ | |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4069 do |
49323 | 4070 { |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4071 ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (x->toolbar_widget), i++); |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4072 if (ti) gtk_widget_hide_all (GTK_WIDGET (ti)); |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4073 } while (ti != NULL); |
49323 | 4074 |
82931
3a5f0fb127ce
(xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
Jan Djärv <jan.h.d@swipnet.se>
parents:
82359
diff
changeset
|
4075 gtk_widget_size_request (GTK_WIDGET (wtoolbar), &new_req); |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
4076 if (old_req.height != new_req.height |
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
4077 && ! FRAME_X_OUTPUT (f)->toolbar_detached) |
49323 | 4078 { |
4079 FRAME_TOOLBAR_HEIGHT (f) = new_req.height; | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
4080 xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f)); |
49323 | 4081 } |
4082 | |
4083 UNBLOCK_INPUT; | |
4084 } | |
4085 | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
4086 /* Deallocate all resources for the tool bar on frame F. |
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
4087 Remove the tool bar. */ |
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
4088 |
49323 | 4089 void |
4090 free_frame_tool_bar (f) | |
4091 FRAME_PTR f; | |
4092 { | |
4093 struct x_output *x = f->output_data.x; | |
4094 | |
4095 if (x->toolbar_widget) | |
4096 { | |
4097 BLOCK_INPUT; | |
4098 gtk_container_remove (GTK_CONTAINER (x->vbox_widget), | |
4099 x->handlebox_widget); | |
4100 x->toolbar_widget = 0; | |
4101 x->handlebox_widget = 0; | |
4102 FRAME_TOOLBAR_HEIGHT (f) = 0; | |
4103 | |
4104 /* The height has changed, resize outer widget and set columns | |
4105 rows to what we had before removing the tool bar. */ | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
4106 xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f)); |
49323 | 4107 |
4108 SET_FRAME_GARBAGED (f); | |
4109 UNBLOCK_INPUT; | |
4110 } | |
4111 } | |
4112 | |
4113 | |
4114 | |
4115 /*********************************************************************** | |
4116 Initializing | |
4117 ***********************************************************************/ | |
4118 void | |
4119 xg_initialize () | |
4120 { | |
59102
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4121 GtkBindingSet *binding_set; |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4122 |
75417
c21d47d727f3
(xg_initialize): Call XftInit if HAVE_XFT.
Jan Djärv <jan.h.d@swipnet.se>
parents:
75348
diff
changeset
|
4123 #if HAVE_XFT |
c21d47d727f3
(xg_initialize): Call XftInit if HAVE_XFT.
Jan Djärv <jan.h.d@swipnet.se>
parents:
75348
diff
changeset
|
4124 /* Work around a bug with corrupted data if libXft gets unloaded. This way |
c21d47d727f3
(xg_initialize): Call XftInit if HAVE_XFT.
Jan Djärv <jan.h.d@swipnet.se>
parents:
75348
diff
changeset
|
4125 we keep it permanently linked in. */ |
c21d47d727f3
(xg_initialize): Call XftInit if HAVE_XFT.
Jan Djärv <jan.h.d@swipnet.se>
parents:
75348
diff
changeset
|
4126 XftInit (0); |
c21d47d727f3
(xg_initialize): Call XftInit if HAVE_XFT.
Jan Djärv <jan.h.d@swipnet.se>
parents:
75348
diff
changeset
|
4127 #endif |
84621 | 4128 |
4129 gdpy_def = NULL; | |
49323 | 4130 xg_ignore_gtk_scrollbar = 0; |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
4131 xg_detached_menus = 0; |
49323 | 4132 xg_menu_cb_list.prev = xg_menu_cb_list.next = |
4133 xg_menu_item_cb_list.prev = xg_menu_item_cb_list.next = 0; | |
4134 | |
49419
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
4135 id_to_widget.max_size = id_to_widget.used = 0; |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
4136 id_to_widget.widgets = 0; |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
4137 |
49323 | 4138 /* Remove F10 as a menu accelerator, it does not mix well with Emacs key |
4139 bindings. It doesn't seem to be any way to remove properties, | |
4140 so we set it to VoidSymbol which in X means "no key". */ | |
4141 gtk_settings_set_string_property (gtk_settings_get_default (), | |
4142 "gtk-menu-bar-accel", | |
4143 "VoidSymbol", | |
4144 EMACS_CLASS); | |
49419
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
4145 |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
4146 /* Make GTK text input widgets use Emacs style keybindings. This is |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
4147 Emacs after all. */ |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
4148 gtk_settings_set_string_property (gtk_settings_get_default (), |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
4149 "gtk-key-theme-name", |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
4150 "Emacs", |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
4151 EMACS_CLASS); |
59102
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4152 |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4153 /* Make dialogs close on C-g. Since file dialog inherits from |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4154 dialog, this works for them also. */ |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4155 binding_set = gtk_binding_set_by_class (gtk_type_class (GTK_TYPE_DIALOG)); |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4156 gtk_binding_entry_add_signal (binding_set, GDK_g, GDK_CONTROL_MASK, |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4157 "close", 0); |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4158 |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4159 /* Make menus close on C-g. */ |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4160 binding_set = gtk_binding_set_by_class (gtk_type_class (GTK_TYPE_MENU_SHELL)); |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4161 gtk_binding_entry_add_signal (binding_set, GDK_g, GDK_CONTROL_MASK, |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4162 "cancel", 0); |
49323 | 4163 } |
4164 | |
4165 #endif /* USE_GTK */ | |
52401 | 4166 |
4167 /* arch-tag: fe7104da-bc1e-4aba-9bd1-f349c528f7e3 | |
4168 (do not change this comment) */ |