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