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