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