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