Mercurial > emacs
annotate src/gtkutil.c @ 112429:6e50030da731
Some copyright.el updates.
* lisp/emacs-lisp/copyright.el (copyright-find-copyright): New function,
split out from copyright-update-year.
(copyright-update): Don't mess with the GPL version if we don't own the
copyright. Update license regexp, and remove no longer needed
Esperanto stuff.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Sat, 22 Jan 2011 14:09:09 -0800 |
parents | 3215a5cff4dd |
children | 9de5a68b57e1 |
rev | line source |
---|---|
49323 | 1 /* Functions for creating and updating GTK widgets. |
112218
376148b31b5e
Add 2011 to FSF/AIST copyright years.
Glenn Morris <rgm@gnu.org>
parents:
111746
diff
changeset
|
2 Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
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 | |
58818
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
23 #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
|
24 #include <stdio.h> |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105522
diff
changeset
|
25 #include <setjmp.h> |
49323 | 26 #include "lisp.h" |
27 #include "xterm.h" | |
28 #include "blockinput.h" | |
58818
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
29 #include "syssignal.h" |
49323 | 30 #include "window.h" |
31 #include "gtkutil.h" | |
32 #include "termhooks.h" | |
51408
8f1bed1dee3c
Include keyboard.h, charset.h, coding.h.
Dave Love <fx@gnu.org>
parents:
51211
diff
changeset
|
33 #include "keyboard.h" |
8f1bed1dee3c
Include keyboard.h, charset.h, coding.h.
Dave Love <fx@gnu.org>
parents:
51211
diff
changeset
|
34 #include "charset.h" |
8f1bed1dee3c
Include keyboard.h, charset.h, coding.h.
Dave Love <fx@gnu.org>
parents:
51211
diff
changeset
|
35 #include "coding.h" |
49323 | 36 #include <gdk/gdkkeysyms.h> |
108082
38a6893c8b9e
* gtkutil.c: Include xsettings.h for Ftool_bar_get_system_style.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108024
diff
changeset
|
37 #include "xsettings.h" |
49323 | 38 |
97059
984f2ac5a637
* lisp.h (init_weak_hash_tables, syms_of_font)
Andreas Schwab <schwab@suse.de>
parents:
97056
diff
changeset
|
39 #ifdef HAVE_XFT |
984f2ac5a637
* lisp.h (init_weak_hash_tables, syms_of_font)
Andreas Schwab <schwab@suse.de>
parents:
97056
diff
changeset
|
40 #include <X11/Xft/Xft.h> |
984f2ac5a637
* lisp.h (init_weak_hash_tables, syms_of_font)
Andreas Schwab <schwab@suse.de>
parents:
97056
diff
changeset
|
41 #endif |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
42 |
49323 | 43 #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
|
44 (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
|
45 |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
46 #define FRAME_TOTAL_PIXEL_WIDTH(f) \ |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
47 (FRAME_PIXEL_WIDTH (f) + FRAME_TOOLBAR_WIDTH (f)) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
48 |
67528
c5c00342184b
* gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
65628
diff
changeset
|
49 /* 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
|
50 #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
|
51 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
52 #ifndef HAVE_GTK_WIDGET_SET_HAS_WINDOW |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
53 #define gtk_widget_set_has_window(w, b) \ |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
54 (gtk_fixed_set_has_window (GTK_FIXED (w), b)) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
55 #endif |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
56 #ifndef HAVE_GTK_DIALOG_GET_ACTION_AREA |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
57 #define gtk_dialog_get_action_area(w) ((w)->action_area) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
58 #define gtk_dialog_get_content_area(w) ((w)->vbox) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
59 #endif |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
60 #ifndef HAVE_GTK_WIDGET_GET_SENSITIVE |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
61 #define gtk_widget_get_sensitive(w) (GTK_WIDGET_SENSITIVE (w)) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
62 #endif |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
63 #ifndef HAVE_GTK_ADJUSTMENT_GET_PAGE_SIZE |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
64 #define gtk_adjustment_set_page_size(w, s) ((w)->page_size = (s)) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
65 #define gtk_adjustment_set_page_increment(w, s) ((w)->page_increment = (s)) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
66 #define gtk_adjustment_get_step_increment(w) ((w)->step_increment) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
67 #define gtk_adjustment_set_step_increment(w, s) ((w)->step_increment = (s)) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
68 #endif |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
69 #if GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION > 11 |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
70 #define remove_submenu(w) gtk_menu_item_set_submenu ((w), NULL) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
71 #else |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
72 #define remove_submenu(w) gtk_menu_item_remove_submenu ((w)) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
73 #endif |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
74 |
111991
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
75 #define XG_BIN_CHILD(x) gtk_bin_get_child (GTK_BIN (x)) |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
76 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
77 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
78 /*********************************************************************** |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
79 Display handling functions |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
80 ***********************************************************************/ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
81 |
98555
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
82 /* 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
|
83 may close all its displays. */ |
84621 | 84 |
85 static GdkDisplay *gdpy_def; | |
86 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
87 /* 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
|
88 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
|
89 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
|
90 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
91 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
92 xg_set_screen (GtkWidget *w, FRAME_PTR f) |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
93 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
94 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
|
95 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
96 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
|
97 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
|
98 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
99 if (GTK_IS_MENU (w)) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
100 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
|
101 else |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
102 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
|
103 } |
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 |
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 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
114 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
115 xg_display_open (char *display_name, Display **dpy) |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
116 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
117 GdkDisplay *gdpy; |
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 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
|
120 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
|
121 { |
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
|
122 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
|
123 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
|
124 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
|
125 } |
98555
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
126 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
127 *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
|
128 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
129 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
130 |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
131 /* 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
|
132 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
133 void |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
134 xg_display_close (Display *dpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
135 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
136 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
|
137 |
98555
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
138 /* 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
|
139 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
|
140 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
|
141 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
|
142 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
143 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
|
144 GdkDisplay *gdpy_new = NULL; |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
145 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
146 /* Find another display. */ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
147 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
|
148 if (dpyinfo->display != dpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
149 { |
98555
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
150 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
|
151 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
|
152 gdpy_new); |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
153 break; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
154 } |
98555
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
155 gdpy_def = gdpy_new; |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
156 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
157 |
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
|
158 #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
|
159 /* 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
|
160 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
|
161 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
|
162 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
|
163 #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
|
164 /* 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
|
165 gdk_display_close (gdpy); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
166 #endif |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
167 } |
50129
d0142038feaa
Reduce flicker in GTK scrollbars.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50112
diff
changeset
|
168 |
49323 | 169 |
170 /*********************************************************************** | |
171 Utility functions | |
172 ***********************************************************************/ | |
173 /* The next two variables and functions are taken from lwlib. */ | |
174 static widget_value *widget_value_free_list; | |
175 static int malloc_cpt; | |
176 | |
177 /* Allocate a widget_value structure, either by taking one from the | |
178 widget_value_free_list or by malloc:ing a new one. | |
179 | |
180 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
|
181 |
49323 | 182 widget_value * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
183 malloc_widget_value (void) |
49323 | 184 { |
185 widget_value *wv; | |
186 if (widget_value_free_list) | |
187 { | |
188 wv = widget_value_free_list; | |
189 widget_value_free_list = wv->free_list; | |
190 wv->free_list = 0; | |
191 } | |
192 else | |
193 { | |
69025
5d9232b72d14
(malloc_widget_value): Use xmalloc.
Richard M. Stallman <rms@gnu.org>
parents:
68922
diff
changeset
|
194 wv = (widget_value *) xmalloc (sizeof (widget_value)); |
49323 | 195 malloc_cpt++; |
196 } | |
197 memset (wv, 0, sizeof (widget_value)); | |
198 return wv; | |
199 } | |
200 | |
201 /* This is analogous to free. It frees only what was allocated | |
202 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
|
203 |
49323 | 204 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
205 free_widget_value (widget_value *wv) |
49323 | 206 { |
207 if (wv->free_list) | |
208 abort (); | |
209 | |
210 if (malloc_cpt > 25) | |
211 { | |
212 /* When the number of already allocated cells is too big, | |
213 We free it. */ | |
100633
5395c014feb8
* buffer.c (init_buffer): Use realloc instead of xrealloc.
Andreas Schwab <schwab@suse.de>
parents:
100501
diff
changeset
|
214 xfree (wv); |
49323 | 215 malloc_cpt--; |
216 } | |
217 else | |
218 { | |
219 wv->free_list = widget_value_free_list; | |
220 widget_value_free_list = wv; | |
221 } | |
222 } | |
223 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
224 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
225 /* 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
|
226 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
|
227 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
228 GdkCursor * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
229 xg_create_default_cursor (Display *dpy) |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
230 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
231 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
|
232 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
|
233 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
234 |
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
|
235 /* 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
|
236 |
65006
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
237 static GdkPixbuf * |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
238 xg_get_pixbuf_from_pix_and_mask (GdkPixmap *gpix, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
239 GdkPixmap *gmask, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
240 GdkColormap *cmap) |
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
|
241 { |
107219
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
242 int width, height; |
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
|
243 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
|
244 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
245 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
|
246 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
|
247 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
|
248 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
|
249 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
|
250 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
251 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
|
252 { |
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 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
|
254 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
|
255 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
|
256 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
|
257 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
|
258 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
|
259 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
|
260 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
|
261 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
|
262 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
|
263 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
264 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
|
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 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
|
267 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
|
268 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
269 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
|
270 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
|
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 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
|
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 /* 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
|
275 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
|
276 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
|
277 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
|
278 |
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 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
|
280 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
|
281 } |
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 } |
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 |
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 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
|
285 } |
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 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
|
288 } |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
289 |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
290 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
291 file_for_image (Lisp_Object image) |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
292 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
293 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
|
294 Lisp_Object tail; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
295 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
296 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
|
297 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
|
298 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
|
299 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
|
300 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
|
301 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
302 return specified_file; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
303 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
304 |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
305 /* 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
|
306 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
|
307 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
|
308 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
|
309 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
|
310 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
|
311 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
|
312 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
|
313 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
|
314 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
|
315 |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
316 static GtkWidget * |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
317 xg_get_image_for_pixmap (FRAME_PTR f, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
318 struct image *img, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
319 GtkWidget *widget, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
320 GtkImage *old_widget) |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
321 { |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
322 GdkPixmap *gpix; |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
323 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
|
324 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
|
325 GdkColormap *cmap; |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
326 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
|
327 |
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
|
328 /* 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
|
329 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
|
330 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
|
331 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
|
332 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
|
333 |
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
|
334 /* 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
|
335 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
|
336 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
|
337 |
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
|
338 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
|
339 && 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
|
340 { |
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
|
341 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
|
342 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
|
343 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
|
344 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
|
345 |
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
|
346 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
|
347 } |
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
348 |
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
|
349 /* 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
|
350 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
|
351 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
|
352 |
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 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
|
354 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
|
355 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
|
356 |
78809
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
357 /* 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
|
358 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
|
359 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
|
360 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
|
361 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
|
362 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
|
363 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
|
364 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
|
365 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
|
366 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
|
367 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
|
368 |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
369 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
|
370 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
|
371 else |
78809
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
372 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
|
373 |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
374 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
|
375 |
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
|
376 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
|
377 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
|
378 |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
379 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
|
380 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
381 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
382 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
383 /* Set CURSOR on W and all widgets W contain. We must do like this |
49323 | 384 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
|
385 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
|
386 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
387 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
388 xg_set_cursor (GtkWidget *w, GdkCursor *cursor) |
49323 | 389 { |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
390 GdkWindow *window = gtk_widget_get_window(w); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
391 GList *children = gdk_window_peek_children (window); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
392 |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
393 gdk_window_set_cursor (window, cursor); |
49323 | 394 |
395 /* The scroll bar widget has more than one GDK window (had to look at | |
396 the source to figure this out), and there is no way to set cursor | |
397 on widgets in GTK. So we must set the cursor for all GDK windows. | |
398 Ditto for menus. */ | |
399 | |
400 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
|
401 gdk_window_set_cursor (GDK_WINDOW (children->data), cursor); |
49323 | 402 } |
403 | |
404 /* 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
|
405 |
49323 | 406 static void |
407 xg_list_insert (xg_list_node *list, xg_list_node *node) | |
408 { | |
409 xg_list_node *list_start = list->next; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
410 |
49323 | 411 if (list_start) list_start->prev = node; |
412 node->next = list_start; | |
413 node->prev = 0; | |
414 list->next = node; | |
415 } | |
416 | |
417 /* 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
|
418 |
49323 | 419 static void |
420 xg_list_remove (xg_list_node *list, xg_list_node *node) | |
421 { | |
422 xg_list_node *list_start = list->next; | |
423 if (node == list_start) | |
424 { | |
425 list->next = node->next; | |
426 if (list->next) list->next->prev = 0; | |
427 } | |
428 else | |
429 { | |
430 node->prev->next = node->next; | |
431 if (node->next) node->next->prev = node->prev; | |
432 } | |
433 } | |
434 | |
435 /* Allocate and return a utf8 version of STR. If STR is already | |
109748
e2f8226efb99
Fix -Wwrite_strings in general and for Gtk+ specific code.
Jan D <jan.h.d@swipnet.se>
parents:
109726
diff
changeset
|
436 utf8 or NULL, just return a copy of STR. |
e2f8226efb99
Fix -Wwrite_strings in general and for Gtk+ specific code.
Jan D <jan.h.d@swipnet.se>
parents:
109726
diff
changeset
|
437 A new string is allocated and the caller must free the result |
49323 | 438 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
|
439 |
49323 | 440 static char * |
109748
e2f8226efb99
Fix -Wwrite_strings in general and for Gtk+ specific code.
Jan D <jan.h.d@swipnet.se>
parents:
109726
diff
changeset
|
441 get_utf8_string (const char *str) |
49323 | 442 { |
109748
e2f8226efb99
Fix -Wwrite_strings in general and for Gtk+ specific code.
Jan D <jan.h.d@swipnet.se>
parents:
109726
diff
changeset
|
443 char *utf8_str; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
444 |
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
|
445 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
|
446 |
49323 | 447 /* 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
|
448 if (!g_utf8_validate (str, -1, NULL)) |
49323 | 449 utf8_str = g_locale_to_utf8 (str, -1, 0, 0, 0); |
109748
e2f8226efb99
Fix -Wwrite_strings in general and for Gtk+ specific code.
Jan D <jan.h.d@swipnet.se>
parents:
109726
diff
changeset
|
450 else |
e2f8226efb99
Fix -Wwrite_strings in general and for Gtk+ specific code.
Jan D <jan.h.d@swipnet.se>
parents:
109726
diff
changeset
|
451 return g_strdup (str); |
49323 | 452 |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
453 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
|
454 { |
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
|
455 /* 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
|
456 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
|
457 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
|
458 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
|
459 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
|
460 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
|
461 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
|
462 |
73389
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
463 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
|
464 &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
|
465 && 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
|
466 { |
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
|
467 ++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
|
468 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
|
469 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
|
470 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
|
471 } |
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
|
472 |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
473 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
|
474 { |
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
|
475 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
|
476 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
|
477 } |
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
|
478 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
|
479 |
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
|
480 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
|
481 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
|
482 |
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
483 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
|
484 &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
|
485 && 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
|
486 { |
73389
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
487 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
|
488 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
|
489 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
|
490 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
|
491 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
|
492 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
|
493 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
|
494 } |
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
|
495 |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
496 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
|
497 { |
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
|
498 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
|
499 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
|
500 } |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
501 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
|
502 { |
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
|
503 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
|
504 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
|
505 } |
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
|
506 } |
49323 | 507 return utf8_str; |
508 } | |
509 | |
109749
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
510 /* Check for special colors used in face spec for region face. |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
511 The colors are fetched from the Gtk+ theme. |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
512 Return 1 if color was found, 0 if not. */ |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
513 |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
514 int |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
515 xg_check_special_colors (struct frame *f, |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
516 const char *color_name, |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
517 XColor *color) |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
518 { |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
519 int success_p = 0; |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
520 if (FRAME_GTK_WIDGET (f)) |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
521 { |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
522 if (strcmp ("gtk_selection_bg_color", color_name) == 0) |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
523 { |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
524 GtkStyle *gsty = gtk_widget_get_style (FRAME_GTK_WIDGET (f)); |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
525 color->red = gsty->bg[GTK_STATE_SELECTED].red; |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
526 color->green = gsty->bg[GTK_STATE_SELECTED].green; |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
527 color->blue = gsty->bg[GTK_STATE_SELECTED].blue; |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
528 color->pixel = gsty->bg[GTK_STATE_SELECTED].pixel; |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
529 success_p = 1; |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
530 } |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
531 else if (strcmp ("gtk_selection_fg_color", color_name) == 0) |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
532 { |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
533 GtkStyle *gsty = gtk_widget_get_style (FRAME_GTK_WIDGET (f)); |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
534 color->red = gsty->fg[GTK_STATE_SELECTED].red; |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
535 color->green = gsty->fg[GTK_STATE_SELECTED].green; |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
536 color->blue = gsty->fg[GTK_STATE_SELECTED].blue; |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
537 color->pixel = gsty->fg[GTK_STATE_SELECTED].pixel; |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
538 success_p = 1; |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
539 } |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
540 } |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
541 |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
542 return success_p; |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
543 } |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
544 |
49323 | 545 |
546 | |
547 /*********************************************************************** | |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
548 Tooltips |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
549 ***********************************************************************/ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
550 /* Gtk+ calls this callback when the parent of our tooltip dummy changes. |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
551 We use that to pop down the tooltip. This happens if Gtk+ for some |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
552 reason wants to change or hide the tooltip. */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
553 |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
554 #ifdef USE_GTK_TOOLTIP |
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
555 |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
556 static void |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
557 hierarchy_ch_cb (GtkWidget *widget, |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
558 GtkWidget *previous_toplevel, |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
559 gpointer user_data) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
560 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
561 FRAME_PTR f = (FRAME_PTR) user_data; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
562 struct x_output *x = f->output_data.x; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
563 GtkWidget *top = gtk_widget_get_toplevel (x->ttip_lbl); |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
564 |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
565 if (! top || ! GTK_IS_WINDOW (top)) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
566 gtk_widget_hide (previous_toplevel); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
567 } |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
568 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
569 /* Callback called when Gtk+ thinks a tooltip should be displayed. |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
570 We use it to get the tooltip window and the tooltip widget so |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
571 we can manipulate the ourselves. |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
572 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
573 Return FALSE ensures that the tooltip is not shown. */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
574 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
575 static gboolean |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
576 qttip_cb (GtkWidget *widget, |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
577 gint xpos, |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
578 gint ypos, |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
579 gboolean keyboard_mode, |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
580 GtkTooltip *tooltip, |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
581 gpointer user_data) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
582 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
583 FRAME_PTR f = (FRAME_PTR) user_data; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
584 struct x_output *x = f->output_data.x; |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
585 if (x->ttip_widget == NULL) |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
586 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
587 g_object_set (G_OBJECT (widget), "has-tooltip", FALSE, NULL); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
588 x->ttip_widget = tooltip; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
589 g_object_ref (G_OBJECT (tooltip)); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
590 x->ttip_lbl = gtk_label_new (""); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
591 g_object_ref (G_OBJECT (x->ttip_lbl)); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
592 gtk_tooltip_set_custom (tooltip, x->ttip_lbl); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
593 x->ttip_window = GTK_WINDOW (gtk_widget_get_toplevel (x->ttip_lbl)); |
111186
801b9f880236
* gtkutil.c (qttip_cb): Set title to empty for ATK (Bug#7278).
Jan D <jan.h.d@swipnet.se>
parents:
110683
diff
changeset
|
594 /* ATK needs an empty title for some reason. */ |
801b9f880236
* gtkutil.c (qttip_cb): Set title to empty for ATK (Bug#7278).
Jan D <jan.h.d@swipnet.se>
parents:
110683
diff
changeset
|
595 gtk_window_set_title (x->ttip_window, ""); |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
596 /* Realize so we can safely get screen later on. */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
597 gtk_widget_realize (GTK_WIDGET (x->ttip_window)); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
598 gtk_widget_realize (x->ttip_lbl); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
599 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
600 g_signal_connect (x->ttip_lbl, "hierarchy-changed", |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
601 G_CALLBACK (hierarchy_ch_cb), f); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
602 } |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
603 return FALSE; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
604 } |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
605 |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
606 #endif /* USE_GTK_TOOLTIP */ |
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
607 |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
608 /* Prepare a tooltip to be shown, i.e. calculate WIDTH and HEIGHT. |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
609 Return zero if no system tooltip available, non-zero otherwise. */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
610 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
611 int |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
612 xg_prepare_tooltip (FRAME_PTR f, |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
613 Lisp_Object string, |
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
614 int *width, |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
615 int *height) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
616 { |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
617 #ifndef USE_GTK_TOOLTIP |
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
618 return 0; |
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
619 #else |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
620 struct x_output *x = f->output_data.x; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
621 GtkWidget *widget; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
622 GdkWindow *gwin; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
623 GdkScreen *screen; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
624 GtkSettings *settings; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
625 gboolean tt_enabled = TRUE; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
626 GtkRequisition req; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
627 Lisp_Object encoded_string; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
628 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
629 if (!x->ttip_lbl) return 0; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
630 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
631 BLOCK_INPUT; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
632 encoded_string = ENCODE_UTF_8 (string); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
633 widget = GTK_WIDGET (x->ttip_lbl); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
634 gwin = gtk_widget_get_window (GTK_WIDGET (x->ttip_window)); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
635 screen = gdk_drawable_get_screen (gwin); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
636 settings = gtk_settings_get_for_screen (screen); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
637 g_object_get (settings, "gtk-enable-tooltips", &tt_enabled, NULL); |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
638 if (tt_enabled) |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
639 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
640 g_object_set (settings, "gtk-enable-tooltips", FALSE, NULL); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
641 /* Record that we disabled it so it can be enabled again. */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
642 g_object_set_data (G_OBJECT (x->ttip_window), "restore-tt", |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
643 (gpointer)f); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
644 } |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
645 |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
646 /* Prevent Gtk+ from hiding tooltip on mouse move and such. */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
647 g_object_set_data (G_OBJECT |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
648 (gtk_widget_get_display (GTK_WIDGET (x->ttip_window))), |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
649 "gdk-display-current-tooltip", NULL); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
650 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
651 /* Put out dummy widget in so we can get callbacks for unrealize and |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
652 hierarchy-changed. */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
653 gtk_tooltip_set_custom (x->ttip_widget, widget); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
654 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
655 gtk_tooltip_set_text (x->ttip_widget, SDATA (encoded_string)); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
656 gtk_widget_size_request (GTK_WIDGET (x->ttip_window), &req); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
657 if (width) *width = req.width; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
658 if (height) *height = req.height; |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
659 |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
660 UNBLOCK_INPUT; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
661 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
662 return 1; |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
663 #endif /* USE_GTK_TOOLTIP */ |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
664 } |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
665 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
666 /* Show the tooltip at ROOT_X and ROOT_Y. |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
667 xg_prepare_tooltip must have been called before this function. */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
668 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
669 void |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
670 xg_show_tooltip (FRAME_PTR f, int root_x, int root_y) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
671 { |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
672 #ifdef USE_GTK_TOOLTIP |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
673 struct x_output *x = f->output_data.x; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
674 if (x->ttip_window) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
675 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
676 BLOCK_INPUT; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
677 gtk_window_move (x->ttip_window, root_x, root_y); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
678 gtk_widget_show_all (GTK_WIDGET (x->ttip_window)); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
679 UNBLOCK_INPUT; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
680 } |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
681 #endif |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
682 } |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
683 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
684 /* Hide tooltip if shown. Do nothing if not shown. |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
685 Return non-zero if tip was hidden, non-ero if not (i.e. not using |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
686 system tooltips). */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
687 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
688 int |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
689 xg_hide_tooltip (FRAME_PTR f) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
690 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
691 int ret = 0; |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
692 #ifdef USE_GTK_TOOLTIP |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
693 if (f->output_data.x->ttip_window) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
694 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
695 GtkWindow *win = f->output_data.x->ttip_window; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
696 BLOCK_INPUT; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
697 gtk_widget_hide (GTK_WIDGET (win)); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
698 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
699 if (g_object_get_data (G_OBJECT (win), "restore-tt")) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
700 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
701 GdkWindow *gwin = gtk_widget_get_window (GTK_WIDGET (win)); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
702 GdkScreen *screen = gdk_drawable_get_screen (gwin); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
703 GtkSettings *settings = gtk_settings_get_for_screen (screen); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
704 g_object_set (settings, "gtk-enable-tooltips", TRUE, NULL); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
705 } |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
706 UNBLOCK_INPUT; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
707 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
708 ret = 1; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
709 } |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
710 #endif |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
711 return ret; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
712 } |
49323 | 713 |
714 | |
715 /*********************************************************************** | |
716 General functions for creating widgets, resizing, events, e.t.c. | |
717 ***********************************************************************/ | |
718 | |
719 /* Make a geometry string and pass that to GTK. It seems this is the | |
720 only way to get geometry position right if the user explicitly | |
721 asked for a position when starting Emacs. | |
722 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
|
723 |
49323 | 724 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
725 xg_set_geometry (FRAME_PTR f) |
49323 | 726 { |
107851
2a74858bccc0
Fix so top -10 and left -10 in frame parameters work.
Jan D. <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
727 if (f->size_hint_flags & (USPosition | PPosition)) |
93427
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
728 { |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
729 int left = f->left_pos; |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
730 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
|
731 int top = f->top_pos; |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
732 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
|
733 char geom_str[32]; |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
734 |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
735 if (xneg) |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
736 left = -left; |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
737 if (yneg) |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
738 top = -top; |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
739 |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
740 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
|
741 FRAME_PIXEL_WIDTH (f), |
107891
bf5fce1e8e34
Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents:
107851
diff
changeset
|
742 FRAME_PIXEL_HEIGHT (f), |
93427
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
743 (xneg ? '-' : '+'), left, |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
744 (yneg ? '-' : '+'), top); |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
745 |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
746 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
|
747 geom_str)) |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
748 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
|
749 } |
49323 | 750 } |
751 | |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
752 /* Clear under internal border if any. As we use a mix of Gtk+ and X calls |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
753 and use a GtkFixed widget, this doesn't happen automatically. */ |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
754 |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
755 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
756 xg_clear_under_internal_border (FRAME_PTR f) |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
757 { |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
758 if (FRAME_INTERNAL_BORDER_WIDTH (f) > 0) |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
759 { |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
760 GtkWidget *wfixed = f->output_data.x->edit_widget; |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
761 gtk_widget_queue_draw (wfixed); |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
762 gdk_window_process_all_updates (); |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
763 x_clear_area (FRAME_X_DISPLAY (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
764 FRAME_X_WINDOW (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
765 0, 0, |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
766 FRAME_PIXEL_WIDTH (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
767 FRAME_INTERNAL_BORDER_WIDTH (f), 0); |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
768 x_clear_area (FRAME_X_DISPLAY (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
769 FRAME_X_WINDOW (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
770 0, 0, |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
771 FRAME_INTERNAL_BORDER_WIDTH (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
772 FRAME_PIXEL_HEIGHT (f), 0); |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
773 x_clear_area (FRAME_X_DISPLAY (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
774 FRAME_X_WINDOW (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
775 0, FRAME_PIXEL_HEIGHT (f) - FRAME_INTERNAL_BORDER_WIDTH (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
776 FRAME_PIXEL_WIDTH (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
777 FRAME_INTERNAL_BORDER_WIDTH (f), 0); |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
778 x_clear_area (FRAME_X_DISPLAY (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
779 FRAME_X_WINDOW (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
780 FRAME_PIXEL_WIDTH (f) - FRAME_INTERNAL_BORDER_WIDTH (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
781 0, |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
782 FRAME_INTERNAL_BORDER_WIDTH (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
783 FRAME_PIXEL_HEIGHT (f), 0); |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
784 } |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
785 } |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
786 |
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
|
787 /* 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
|
788 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
|
789 frame only. We let Gtk+ deal with the Gtk+ parts. |
49323 | 790 F is the frame to resize. |
791 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
|
792 |
49323 | 793 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
794 xg_frame_resized (FRAME_PTR f, int pixelwidth, int pixelheight) |
49323 | 795 { |
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
|
796 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
|
797 |
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
|
798 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
|
799 { |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
800 if (FRAME_GTK_WIDGET (f) && gtk_widget_get_mapped (FRAME_GTK_WIDGET (f))) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
801 gdk_window_get_geometry (gtk_widget_get_window (FRAME_GTK_WIDGET (f)), |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
802 0, 0, |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
803 &pixelwidth, &pixelheight, 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
|
804 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
|
805 } |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
806 |
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
|
807 |
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
|
808 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
|
809 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
|
810 |
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
|
811 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
|
812 || 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
|
813 || 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
|
814 || pixelheight != FRAME_PIXEL_HEIGHT (f)) |
49323 | 815 { |
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
|
816 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
|
817 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
|
818 |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
819 xg_clear_under_internal_border (f); |
100498
b5964e7e169b
(xg_frame_resized): Remove check if rows/columns have
Jan Djärv <jan.h.d@swipnet.se>
parents:
100100
diff
changeset
|
820 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
|
821 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
|
822 cancel_mouse_face (f); |
49323 | 823 } |
824 } | |
825 | |
93427
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
826 /* 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
|
827 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
|
828 |
49323 | 829 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
830 xg_frame_set_char_size (FRAME_PTR f, int cols, int rows) |
49323 | 831 { |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
832 int pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows) |
49323 | 833 + 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
|
834 int pixelwidth; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
835 |
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
|
836 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
|
837 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
|
838 |
49323 | 839 /* Take into account the size of the scroll bar. Always use the |
840 number of columns occupied by the scroll bar here otherwise we | |
841 might end up with a frame width that is not a multiple of the | |
842 frame's character width which is bad for vertically split | |
843 windows. */ | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
844 f->scroll_bar_actual_width |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
845 = FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f); |
49323 | 846 |
50099
a62497b91c74
Use generic compute_fringe_widths.
Kim F. Storm <storm@cua.dk>
parents:
50063
diff
changeset
|
847 compute_fringe_widths (f, 0); |
49323 | 848 |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
849 /* 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
|
850 after calculating that value. */ |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
851 pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
852 + FRAME_TOOLBAR_WIDTH (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
|
853 |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
854 |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
855 /* Do this before resize, as we don't know yet if we will be resized. */ |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
856 xg_clear_under_internal_border (f); |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
857 |
49323 | 858 /* 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
|
859 but not rows/cols. */ |
49323 | 860 gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), |
861 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
|
862 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
|
863 |
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
|
864 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
|
865 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
|
866 |
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
|
867 /* 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
|
868 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
|
869 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
|
870 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
|
871 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
|
872 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
|
873 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
|
874 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
|
875 { |
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
|
876 /* 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
|
877 (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
|
878 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
|
879 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
|
880 } |
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
|
881 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
|
882 { |
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
|
883 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
|
884 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
|
885 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
|
886 } |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
887 } |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
888 |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
889 /* Handle height/width changes (i.e. add/remove/move menu/toolbar). |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
890 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
|
891 |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
892 static void |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
893 xg_height_or_width_changed (FRAME_PTR f) |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
894 { |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
895 gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
896 FRAME_TOTAL_PIXEL_WIDTH (f), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
897 FRAME_TOTAL_PIXEL_HEIGHT (f)); |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
898 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
|
899 x_wm_set_size_hint (f, 0, 0); |
49323 | 900 } |
901 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
902 /* Convert an X Window WSESC on display DPY to its corresponding GtkWidget. |
49323 | 903 Must be done like this, because GtkWidget:s can have "hidden" |
904 X Window that aren't accessible. | |
905 | |
906 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
|
907 |
49323 | 908 GtkWidget * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
909 xg_win_to_widget (Display *dpy, Window wdesc) |
49323 | 910 { |
911 gpointer gdkwin; | |
912 GtkWidget *gwdesc = 0; | |
913 | |
914 BLOCK_INPUT; | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
915 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
916 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
|
917 wdesc); |
49323 | 918 if (gdkwin) |
919 { | |
920 GdkEvent event; | |
921 event.any.window = gdkwin; | |
922 gwdesc = gtk_get_event_widget (&event); | |
923 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
924 |
49323 | 925 UNBLOCK_INPUT; |
926 return gwdesc; | |
927 } | |
928 | |
929 /* Fill in the GdkColor C so that it represents PIXEL. | |
930 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
|
931 |
49323 | 932 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
933 xg_pix_to_gcolor (GtkWidget *w, long unsigned int pixel, GdkColor *c) |
49323 | 934 { |
935 GdkColormap *map = gtk_widget_get_colormap (w); | |
936 gdk_colormap_query_color (map, pixel, c); | |
937 } | |
938 | |
109749
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
939 /* Callback called when the gtk theme changes. |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
940 We notify lisp code so it can fix faces used for region for example. */ |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
941 |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
942 static void |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
943 style_changed_cb (GObject *go, |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
944 GParamSpec *spec, |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
945 gpointer user_data) |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
946 { |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
947 struct input_event event; |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
948 GdkDisplay *gdpy = (GdkDisplay *) user_data; |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
949 const char *display_name = gdk_display_get_name (gdpy); |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
950 |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
951 EVENT_INIT (event); |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
952 event.kind = CONFIG_CHANGED_EVENT; |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
953 event.frame_or_window = make_string (display_name, strlen (display_name)); |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
954 /* Theme doesn't change often, so intern is called seldom. */ |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
955 event.arg = intern ("theme-name"); |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
956 kbd_buffer_store_event (&event); |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
957 } |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
958 |
49323 | 959 /* Create and set up the GTK widgets for frame F. |
960 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
|
961 |
49323 | 962 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
963 xg_create_frame_widgets (FRAME_PTR f) |
49323 | 964 { |
965 GtkWidget *wtop; | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
966 GtkWidget *wvbox, *whbox; |
49323 | 967 GtkWidget *wfixed; |
968 GdkColor bg; | |
969 GtkRcStyle *style; | |
970 char *title = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
971 |
49323 | 972 BLOCK_INPUT; |
973 | |
91632
370f67c176eb
(xg_create_frame_widgets): If frame is embedded, call
Jan Djärv <jan.h.d@swipnet.se>
parents:
87649
diff
changeset
|
974 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
|
975 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
|
976 else |
370f67c176eb
(xg_create_frame_widgets): If frame is embedded, call
Jan Djärv <jan.h.d@swipnet.se>
parents:
87649
diff
changeset
|
977 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
|
978 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
979 xg_set_screen (wtop, f); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
980 |
49323 | 981 wvbox = gtk_vbox_new (FALSE, 0); |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
982 whbox = gtk_hbox_new (FALSE, 0); |
49323 | 983 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
|
984 |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
985 if (! wtop || ! wvbox || ! whbox || ! wfixed) |
49323 | 986 { |
987 if (wtop) gtk_widget_destroy (wtop); | |
988 if (wvbox) gtk_widget_destroy (wvbox); | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
989 if (whbox) gtk_widget_destroy (whbox); |
49323 | 990 if (wfixed) gtk_widget_destroy (wfixed); |
991 | |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
992 UNBLOCK_INPUT; |
49323 | 993 return 0; |
994 } | |
995 | |
996 /* Use same names as the Xt port does. I.e. Emacs.pane.emacs by default */ | |
997 gtk_widget_set_name (wtop, EMACS_CLASS); | |
998 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
|
999 gtk_widget_set_name (wfixed, SSDATA (Vx_resource_name)); |
49323 | 1000 |
1001 /* 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
|
1002 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
|
1003 else if (! NILP (f->name)) title = SSDATA (ENCODE_UTF_8 (f->name)); |
49323 | 1004 |
1005 if (title) gtk_window_set_title (GTK_WINDOW (wtop), title); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1006 |
49323 | 1007 FRAME_GTK_OUTER_WIDGET (f) = wtop; |
1008 FRAME_GTK_WIDGET (f) = wfixed; | |
1009 f->output_data.x->vbox_widget = wvbox; | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
1010 f->output_data.x->hbox_widget = whbox; |
49323 | 1011 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1012 gtk_widget_set_has_window (wfixed, TRUE); |
49323 | 1013 |
1014 gtk_container_add (GTK_CONTAINER (wtop), wvbox); | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
1015 gtk_box_pack_start (GTK_BOX (wvbox), whbox, TRUE, TRUE, 0); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
1016 gtk_box_pack_start (GTK_BOX (whbox), wfixed, TRUE, TRUE, 0); |
49323 | 1017 |
1018 if (FRAME_EXTERNAL_TOOL_BAR (f)) | |
1019 update_frame_tool_bar (f); | |
1020 | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
1021 /* 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
|
1022 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
|
1023 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
|
1024 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
|
1025 a lot, so we turn off double buffering. */ |
49323 | 1026 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
|
1027 |
49323 | 1028 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
|
1029 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
|
1030 SSDATA (Vx_resource_class)); |
49323 | 1031 |
1032 /* Add callback to do nothing on WM_DELETE_WINDOW. The default in | |
1033 GTK is to destroy the widget. We want Emacs to do that instead. */ | |
1034 g_signal_connect (G_OBJECT (wtop), "delete-event", | |
1035 G_CALLBACK (gtk_true), 0); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1036 |
49323 | 1037 /* Convert our geometry parameters into a geometry string |
1038 and specify it. | |
1039 GTK will itself handle calculating the real position this way. */ | |
1040 xg_set_geometry (f); | |
107219
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1041 f->win_gravity |
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1042 = gtk_window_get_gravity (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); |
49323 | 1043 |
1044 gtk_widget_add_events (wfixed, | |
1045 GDK_POINTER_MOTION_MASK | |
1046 | GDK_EXPOSURE_MASK | |
1047 | GDK_BUTTON_PRESS_MASK | |
1048 | GDK_BUTTON_RELEASE_MASK | |
1049 | GDK_KEY_PRESS_MASK | |
1050 | GDK_ENTER_NOTIFY_MASK | |
1051 | GDK_LEAVE_NOTIFY_MASK | |
1052 | GDK_FOCUS_CHANGE_MASK | |
1053 | GDK_STRUCTURE_MASK | |
1054 | GDK_VISIBILITY_NOTIFY_MASK); | |
1055 | |
1056 /* Must realize the windows so the X window gets created. It is used | |
1057 by callers of this function. */ | |
1058 gtk_widget_realize (wfixed); | |
1059 FRAME_X_WINDOW (f) = GTK_WIDGET_TO_X_WIN (wfixed); | |
1060 | |
1061 /* Since GTK clears its window by filling with the background color, | |
1062 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
|
1063 xg_pix_to_gcolor (wfixed, FRAME_BACKGROUND_PIXEL (f), &bg); |
49323 | 1064 gtk_widget_modify_bg (wfixed, GTK_STATE_NORMAL, &bg); |
1065 | |
1066 /* Also, do not let any background pixmap to be set, this looks very | |
1067 bad as Emacs overwrites the background pixmap with its own idea | |
1068 of background color. */ | |
1069 style = gtk_widget_get_modifier_style (wfixed); | |
1070 | |
1071 /* Must use g_strdup because gtk_widget_modify_style does g_free. */ | |
1072 style->bg_pixmap_name[GTK_STATE_NORMAL] = g_strdup ("<none>"); | |
1073 gtk_widget_modify_style (wfixed, style); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1074 |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
1075 #ifdef USE_GTK_TOOLTIP |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1076 /* Steal a tool tip window we can move ourselves. */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1077 f->output_data.x->ttip_widget = 0; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1078 f->output_data.x->ttip_lbl = 0; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1079 f->output_data.x->ttip_window = 0; |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
1080 gtk_widget_set_tooltip_text (wtop, "Dummy text"); |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1081 g_signal_connect (wtop, "query-tooltip", G_CALLBACK (qttip_cb), f); |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
1082 #endif |
49323 | 1083 |
109749
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
1084 { |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
1085 GdkScreen *screen = gtk_widget_get_screen (wtop); |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
1086 GtkSettings *gs = gtk_settings_get_for_screen (screen); |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
1087 /* Only connect this signal once per screen. */ |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
1088 if (! g_signal_handler_find (G_OBJECT (gs), |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
1089 G_SIGNAL_MATCH_FUNC, |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
1090 0, 0, 0, |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
1091 G_CALLBACK (style_changed_cb), |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
1092 0)) |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
1093 { |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
1094 g_signal_connect (G_OBJECT (gs), "notify::gtk-theme-name", |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
1095 G_CALLBACK (style_changed_cb), |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
1096 gdk_screen_get_display (screen)); |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
1097 } |
be18c3b67d66
Take colors for region face (selected text) from the Gtk+ theme.
Jan D <jan.h.d@swipnet.se>
parents:
109748
diff
changeset
|
1098 } |
49323 | 1099 |
1100 UNBLOCK_INPUT; | |
1101 | |
1102 return 1; | |
1103 } | |
1104 | |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1105 void |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1106 xg_free_frame_widgets (FRAME_PTR f) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1107 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1108 if (FRAME_GTK_OUTER_WIDGET (f)) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1109 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1110 struct x_output *x = f->output_data.x; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1111 gtk_widget_destroy (FRAME_GTK_OUTER_WIDGET (f)); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1112 FRAME_X_WINDOW (f) = 0; /* Set to avoid XDestroyWindow in xterm.c */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1113 FRAME_GTK_OUTER_WIDGET (f) = 0; |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
1114 #ifdef USE_GTK_TOOLTIP |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1115 if (x->ttip_lbl) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1116 gtk_widget_destroy (x->ttip_lbl); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1117 if (x->ttip_widget) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1118 g_object_unref (G_OBJECT (x->ttip_widget)); |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
1119 #endif |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1120 } |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1121 } |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1122 |
49323 | 1123 /* Set the normal size hints for the window manager, for frame F. |
1124 FLAGS is the flags word to use--or 0 meaning preserve the flags | |
1125 that the window now has. | |
1126 If USER_POSITION is nonzero, we set the User Position | |
1127 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
|
1128 |
49323 | 1129 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1130 x_wm_set_size_hint (FRAME_PTR f, long int flags, int user_position) |
49323 | 1131 { |
98545
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1132 /* 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
|
1133 to its own defaults. */ |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1134 GdkGeometry size_hints; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1135 gint hint_flags = 0; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1136 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
|
1137 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
|
1138 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
|
1139 |
107219
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1140 /* Don't set size hints during initialization; that apparently leads |
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1141 to a race condition. See the thread at |
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1142 http://lists.gnu.org/archive/html/emacs-devel/2008-10/msg00033.html */ |
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1143 if (NILP (Vafter_init_time) || !FRAME_GTK_OUTER_WIDGET (f)) |
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1144 return; |
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1145 |
98545
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1146 if (flags) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1147 { |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1148 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
|
1149 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
|
1150 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
|
1151 } |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1152 else |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1153 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
|
1154 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1155 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
|
1156 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
|
1157 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1158 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
|
1159 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
|
1160 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
|
1161 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1162 hint_flags |= GDK_HINT_BASE_SIZE; |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
1163 base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0) + FRAME_TOOLBAR_WIDTH (f); |
98545
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1164 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
|
1165 + 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
|
1166 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1167 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
|
1168 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1169 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
|
1170 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
|
1171 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
|
1172 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
|
1173 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1174 /* 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
|
1175 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
|
1176 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
|
1177 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
|
1178 if (win_gravity == NorthWestGravity) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1179 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
|
1180 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
|
1181 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
|
1182 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
|
1183 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
|
1184 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
|
1185 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
|
1186 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
|
1187 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
|
1188 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
|
1189 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
|
1190 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
|
1191 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
|
1192 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
|
1193 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
|
1194 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
|
1195 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
|
1196 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
|
1197 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
|
1198 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1199 if (user_position) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1200 { |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1201 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
|
1202 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
|
1203 } |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1204 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1205 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
|
1206 || memcmp (&size_hints, |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1207 &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
|
1208 sizeof (size_hints)) != 0) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1209 { |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1210 BLOCK_INPUT; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1211 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
|
1212 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
|
1213 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
|
1214 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
|
1215 UNBLOCK_INPUT; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1216 } |
49323 | 1217 } |
1218 | |
1219 /* Change background color of a frame. | |
96363
f9d35151b907
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
95954
diff
changeset
|
1220 Since GTK uses the background color to clear the window, we must |
49323 | 1221 keep the GTK and X colors in sync. |
1222 F is the frame to change, | |
1223 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
|
1224 |
49323 | 1225 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1226 xg_set_background_color (FRAME_PTR f, long unsigned int bg) |
49323 | 1227 { |
1228 if (FRAME_GTK_WIDGET (f)) | |
1229 { | |
1230 GdkColor gdk_bg; | |
1231 | |
1232 BLOCK_INPUT; | |
1233 xg_pix_to_gcolor (FRAME_GTK_WIDGET (f), bg, &gdk_bg); | |
1234 gtk_widget_modify_bg (FRAME_GTK_WIDGET (f), GTK_STATE_NORMAL, &gdk_bg); | |
1235 UNBLOCK_INPUT; | |
1236 } | |
1237 } | |
1238 | |
1239 | |
65006
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1240 /* 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
|
1241 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
|
1242 |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1243 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1244 xg_set_frame_icon (FRAME_PTR f, Pixmap icon_pixmap, Pixmap icon_mask) |
65006
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1245 { |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1246 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
|
1247 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
|
1248 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
|
1249 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
|
1250 |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1251 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
|
1252 } |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1253 |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1254 |
49323 | 1255 |
1256 /*********************************************************************** | |
1257 Dialog functions | |
1258 ***********************************************************************/ | |
1259 /* Return the dialog title to use for a dialog of type KEY. | |
1260 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
|
1261 |
109726
64732fa6188a
Use const char* instead of char*.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109717
diff
changeset
|
1262 static const char * |
49323 | 1263 get_dialog_title (char key) |
1264 { | |
109726
64732fa6188a
Use const char* instead of char*.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109717
diff
changeset
|
1265 const char *title = ""; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1266 |
49323 | 1267 switch (key) { |
1268 case 'E': case 'e': | |
1269 title = "Error"; | |
1270 break; | |
1271 | |
1272 case 'I': case 'i': | |
1273 title = "Information"; | |
1274 break; | |
1275 | |
1276 case 'L': case 'l': | |
1277 title = "Prompt"; | |
1278 break; | |
1279 | |
1280 case 'P': case 'p': | |
1281 title = "Prompt"; | |
1282 break; | |
1283 | |
1284 case 'Q': case 'q': | |
1285 title = "Question"; | |
1286 break; | |
1287 } | |
1288 | |
1289 return title; | |
1290 } | |
1291 | |
1292 /* Callback for dialogs that get WM_DELETE_WINDOW. We pop down | |
1293 the dialog, but return TRUE so the event does not propagate further | |
1294 in GTK. This prevents GTK from destroying the dialog widget automatically | |
1295 and we can always destrou the widget manually, regardles of how | |
1296 it was popped down (button press or WM_DELETE_WINDOW). | |
1297 W is the dialog widget. | |
1298 EVENT is the GdkEvent that represents WM_DELETE_WINDOW (not used). | |
1299 user_data is NULL (not used). | |
1300 | |
1301 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
|
1302 |
49323 | 1303 static gboolean |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1304 dialog_delete_callback (GtkWidget *w, GdkEvent *event, gpointer user_data) |
49323 | 1305 { |
1306 gtk_widget_unmap (w); | |
1307 return TRUE; | |
1308 } | |
1309 | |
1310 /* Create a popup dialog window. See also xg_create_widget below. | |
1311 WV is a widget_value describing the dialog. | |
1312 SELECT_CB is the callback to use when a button has been pressed. | |
1313 DEACTIVATE_CB is the callback to use when the dialog pops down. | |
1314 | |
1315 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
|
1316 |
49323 | 1317 static GtkWidget * |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1318 create_dialog (widget_value *wv, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1319 GCallback select_cb, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1320 GCallback deactivate_cb) |
49323 | 1321 { |
109726
64732fa6188a
Use const char* instead of char*.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109717
diff
changeset
|
1322 const char *title = get_dialog_title (wv->name[0]); |
49323 | 1323 int total_buttons = wv->name[1] - '0'; |
1324 int right_buttons = wv->name[4] - '0'; | |
1325 int left_buttons; | |
1326 int button_nr = 0; | |
1327 int button_spacing = 10; | |
1328 GtkWidget *wdialog = gtk_dialog_new (); | |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1329 GtkDialog *wd = GTK_DIALOG (wdialog); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1330 GtkBox *cur_box = GTK_BOX (gtk_dialog_get_action_area (wd)); |
49323 | 1331 widget_value *item; |
1332 GtkWidget *wvbox; | |
1333 GtkWidget *whbox_up; | |
1334 GtkWidget *whbox_down; | |
1335 | |
1336 /* If the number of buttons is greater than 4, make two rows of buttons | |
1337 instead. This looks better. */ | |
1338 int make_two_rows = total_buttons > 4; | |
1339 | |
1340 if (right_buttons == 0) right_buttons = total_buttons/2; | |
1341 left_buttons = total_buttons - right_buttons; | |
1342 | |
1343 gtk_window_set_title (GTK_WINDOW (wdialog), title); | |
1344 gtk_widget_set_name (wdialog, "emacs-dialog"); | |
1345 | |
1346 | |
1347 if (make_two_rows) | |
1348 { | |
1349 wvbox = gtk_vbox_new (TRUE, button_spacing); | |
1350 whbox_up = gtk_hbox_new (FALSE, 0); | |
1351 whbox_down = gtk_hbox_new (FALSE, 0); | |
1352 | |
1353 gtk_box_pack_start (cur_box, wvbox, FALSE, FALSE, 0); | |
1354 gtk_box_pack_start (GTK_BOX (wvbox), whbox_up, FALSE, FALSE, 0); | |
1355 gtk_box_pack_start (GTK_BOX (wvbox), whbox_down, FALSE, FALSE, 0); | |
1356 | |
1357 cur_box = GTK_BOX (whbox_up); | |
1358 } | |
1359 | |
1360 g_signal_connect (G_OBJECT (wdialog), "delete-event", | |
1361 G_CALLBACK (dialog_delete_callback), 0); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1362 |
49323 | 1363 if (deactivate_cb) |
1364 { | |
1365 g_signal_connect (G_OBJECT (wdialog), "close", deactivate_cb, 0); | |
1366 g_signal_connect (G_OBJECT (wdialog), "response", deactivate_cb, 0); | |
1367 } | |
1368 | |
1369 for (item = wv->contents; item; item = item->next) | |
1370 { | |
1371 char *utf8_label = get_utf8_string (item->value); | |
1372 GtkWidget *w; | |
1373 GtkRequisition req; | |
1374 | |
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
|
1375 if (item->name && strcmp (item->name, "message") == 0) |
49323 | 1376 { |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1377 GtkBox *wvbox = GTK_BOX (gtk_dialog_get_content_area (wd)); |
49323 | 1378 /* This is the text part of the dialog. */ |
1379 w = gtk_label_new (utf8_label); | |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1380 gtk_box_pack_start (wvbox, gtk_label_new (""), FALSE, FALSE, 0); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1381 gtk_box_pack_start (wvbox, w, TRUE, TRUE, 0); |
49323 | 1382 gtk_misc_set_alignment (GTK_MISC (w), 0.1, 0.5); |
1383 | |
1384 /* Try to make dialog look better. Must realize first so | |
1385 the widget can calculate the size it needs. */ | |
1386 gtk_widget_realize (w); | |
1387 gtk_widget_size_request (w, &req); | |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1388 gtk_box_set_spacing (wvbox, 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
|
1389 if (item->value && strlen (item->value) > 0) |
49323 | 1390 button_spacing = 2*req.width/strlen (item->value); |
1391 } | |
1392 else | |
1393 { | |
1394 /* 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
|
1395 w = gtk_button_new_with_label (utf8_label); |
49323 | 1396 if (! item->enabled) |
1397 gtk_widget_set_sensitive (w, FALSE); | |
1398 if (select_cb) | |
1399 g_signal_connect (G_OBJECT (w), "clicked", | |
1400 select_cb, item->call_data); | |
1401 | |
1402 gtk_box_pack_start (cur_box, w, TRUE, TRUE, button_spacing); | |
1403 if (++button_nr == left_buttons) | |
1404 { | |
1405 if (make_two_rows) | |
1406 cur_box = GTK_BOX (whbox_down); | |
1407 else | |
1408 gtk_box_pack_start (cur_box, | |
1409 gtk_label_new (""), | |
1410 TRUE, TRUE, | |
1411 button_spacing); | |
1412 } | |
1413 } | |
1414 | |
109748
e2f8226efb99
Fix -Wwrite_strings in general and for Gtk+ specific code.
Jan D <jan.h.d@swipnet.se>
parents:
109726
diff
changeset
|
1415 if (utf8_label) |
49323 | 1416 g_free (utf8_label); |
1417 } | |
1418 | |
1419 return wdialog; | |
1420 } | |
1421 | |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1422 struct xg_dialog_data |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1423 { |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1424 GMainLoop *loop; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1425 int response; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1426 GtkWidget *w; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1427 guint timerid; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1428 }; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1429 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1430 /* Function that is called when the file or font dialogs pop down. |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1431 W is the dialog widget, RESPONSE is the response code. |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1432 USER_DATA is what we passed in to g_signal_connect. */ |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1433 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1434 static void |
109139
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1435 xg_dialog_response_cb (GtkDialog *w, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1436 gint response, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1437 gpointer user_data) |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1438 { |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1439 struct xg_dialog_data *dd = (struct xg_dialog_data *)user_data; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1440 dd->response = response; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1441 g_main_loop_quit (dd->loop); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1442 } |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1443 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1444 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1445 /* Destroy the dialog. This makes it pop down. */ |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1446 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1447 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1448 pop_down_dialog (Lisp_Object arg) |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1449 { |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1450 struct Lisp_Save_Value *p = XSAVE_VALUE (arg); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1451 struct xg_dialog_data *dd = (struct xg_dialog_data *) p->pointer; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1452 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1453 BLOCK_INPUT; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1454 if (dd->w) gtk_widget_destroy (dd->w); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1455 if (dd->timerid != 0) g_source_remove (dd->timerid); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1456 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1457 g_main_loop_quit (dd->loop); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1458 g_main_loop_unref (dd->loop); |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
1459 |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1460 UNBLOCK_INPUT; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1461 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1462 return Qnil; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1463 } |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1464 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1465 /* If there are any emacs timers pending, add a timeout to main loop in DATA. |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1466 We pass in DATA as gpointer* so we can use this as a callback. */ |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1467 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1468 static gboolean |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1469 xg_maybe_add_timer (gpointer data) |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1470 { |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1471 struct xg_dialog_data *dd = (struct xg_dialog_data *) data; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1472 EMACS_TIME next_time = timer_check (1); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1473 long secs = EMACS_SECS (next_time); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1474 long usecs = EMACS_USECS (next_time); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1475 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1476 dd->timerid = 0; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1477 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1478 if (secs >= 0 && usecs >= 0 && secs < ((guint)-1)/1000) |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1479 { |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1480 dd->timerid = g_timeout_add (secs * 1000 + usecs/1000, |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1481 xg_maybe_add_timer, |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1482 dd); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1483 } |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1484 return FALSE; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1485 } |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1486 |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
1487 |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1488 /* Pops up a modal dialog W and waits for response. |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1489 We don't use gtk_dialog_run because we want to process emacs timers. |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1490 The dialog W is not destroyed when this function returns. */ |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1491 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1492 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1493 xg_dialog_run (FRAME_PTR f, GtkWidget *w) |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1494 { |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1495 int count = SPECPDL_INDEX (); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1496 struct xg_dialog_data dd; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1497 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1498 xg_set_screen (w, f); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1499 gtk_window_set_transient_for (GTK_WINDOW (w), |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1500 GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1501 gtk_window_set_destroy_with_parent (GTK_WINDOW (w), TRUE); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1502 gtk_window_set_modal (GTK_WINDOW (w), TRUE); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1503 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1504 dd.loop = g_main_loop_new (NULL, FALSE); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1505 dd.response = GTK_RESPONSE_CANCEL; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1506 dd.w = w; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1507 dd.timerid = 0; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1508 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1509 g_signal_connect (G_OBJECT (w), |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1510 "response", |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1511 G_CALLBACK (xg_dialog_response_cb), |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1512 &dd); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1513 /* Don't destroy the widget if closed by the window manager close button. */ |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1514 g_signal_connect (G_OBJECT (w), "delete-event", G_CALLBACK (gtk_true), NULL); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1515 gtk_widget_show (w); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1516 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1517 record_unwind_protect (pop_down_dialog, make_save_value (&dd, 0)); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1518 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1519 (void) xg_maybe_add_timer (&dd); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1520 g_main_loop_run (dd.loop); |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
1521 |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1522 dd.w = 0; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1523 unbind_to (count, Qnil); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1524 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1525 return dd.response; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1526 } |
49323 | 1527 |
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
|
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 /*********************************************************************** |
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 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
|
1531 ***********************************************************************/ |
67761
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1532 /* 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
|
1533 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
|
1534 |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1535 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1536 xg_uses_old_file_dialog (void) |
67761
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1537 { |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1538 #ifdef HAVE_GTK_FILE_SELECTION_NEW |
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
|
1539 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
|
1540 #else |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1541 return 0; |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1542 #endif |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1543 } |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1544 |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1545 |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109067
diff
changeset
|
1546 typedef char * (*xg_get_file_func) (GtkWidget *); |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1547 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1548 /* 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
|
1549 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
|
1550 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1551 static char * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1552 xg_get_file_name_from_chooser (GtkWidget *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
|
1553 { |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1554 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
|
1555 } |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1556 |
68100
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1557 /* 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
|
1558 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
|
1559 |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1560 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1561 xg_toggle_visibility_cb (GtkWidget *widget, gpointer data) |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1562 { |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1563 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
|
1564 gboolean visible; |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1565 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
|
1566 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
|
1567 } |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1568 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1569 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1570 /* 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
|
1571 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
|
1572 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
|
1573 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
|
1574 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
|
1575 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1576 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1577 xg_toggle_notify_cb (GObject *gobject, GParamSpec *arg1, gpointer user_data) |
68100
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1578 { |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1579 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
|
1580 { |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1581 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
|
1582 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
|
1583 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1584 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
|
1585 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
|
1586 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1587 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
|
1588 { |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1589 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
|
1590 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
|
1591 gobject); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1592 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
|
1593 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
|
1594 (G_OBJECT (wtoggle), |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1595 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
|
1596 gobject); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1597 } |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1598 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
|
1599 } |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1600 } |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1601 |
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
|
1602 /* 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
|
1603 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
|
1604 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
|
1605 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
|
1606 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
|
1607 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
|
1608 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
|
1609 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1610 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
|
1611 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1612 static GtkWidget * |
109139
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1613 xg_get_file_with_chooser (FRAME_PTR f, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1614 char *prompt, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1615 char *default_filename, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1616 int mustmatch_p, int only_dir_p, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1617 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
|
1618 { |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1619 char message[1024]; |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1620 |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1621 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
|
1622 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
|
1623 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
|
1624 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
|
1625 GTK_FILE_CHOOSER_ACTION_SAVE); |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1626 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1627 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
|
1628 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
|
1629 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1630 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
|
1631 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
|
1632 (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
|
1633 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
|
1634 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
|
1635 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
|
1636 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
|
1637 |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1638 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
|
1639 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
|
1640 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
|
1641 |
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1642 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
|
1643 { |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1644 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
|
1645 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
|
1646 } |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1647 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
|
1648 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
|
1649 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
|
1650 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
|
1651 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
|
1652 |
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
|
1653 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
|
1654 { |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1655 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
|
1656 /* 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
|
1657 Show the C-l help text only for versions < 2.10. */ |
73066 | 1658 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
|
1659 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
|
1660 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
|
1661 "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
|
1662 "use-file-dialog to turn it off."); |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1663 |
72931
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1664 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
|
1665 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
|
1666 } |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1667 |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1668 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
|
1669 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
|
1670 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
|
1671 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
|
1672 |
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
|
1673 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
|
1674 { |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1675 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
|
1676 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
|
1677 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
|
1678 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
|
1679 |
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
|
1680 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
|
1681 |
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
|
1682 /* 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
|
1683 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
|
1684 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
|
1685 file = Fexpand_file_name (file, Qnil); |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1686 |
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
|
1687 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
|
1688 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
|
1689 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
|
1690 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
|
1691 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
|
1692 { |
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1693 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
|
1694 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
|
1695 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
|
1696 { |
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
|
1697 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
|
1698 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
|
1699 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
|
1700 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
|
1701 } |
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
|
1702 } |
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
|
1703 |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1704 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
|
1705 } |
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
|
1706 |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1707 *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
|
1708 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
|
1709 } |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1710 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1711 #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
|
1712 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1713 /* 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
|
1714 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
|
1715 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1716 static char * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1717 xg_get_file_name_from_selector (GtkWidget *w) |
49323 | 1718 { |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1719 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
|
1720 return xstrdup ((char*) gtk_file_selection_get_filename (filesel)); |
49323 | 1721 } |
1722 | |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1723 /* Create a file selection dialog. |
49323 | 1724 F is the current frame. |
1725 PROMPT is a prompt to show to the user. May not be NULL. | |
1726 DEFAULT_FILENAME is a default selection to be displayed. May be NULL. | |
1727 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
|
1728 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
|
1729 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
|
1730 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1731 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
|
1732 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1733 static GtkWidget * |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1734 xg_get_file_with_selection (FRAME_PTR f, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1735 char *prompt, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1736 char *default_filename, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1737 int mustmatch_p, int only_dir_p, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1738 xg_get_file_func *func) |
49323 | 1739 { |
1740 GtkWidget *filewin; | |
1741 GtkFileSelection *filesel; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1742 |
49323 | 1743 filewin = gtk_file_selection_new (prompt); |
1744 filesel = GTK_FILE_SELECTION (filewin); | |
1745 | |
1746 if (default_filename) | |
1747 gtk_file_selection_set_filename (filesel, default_filename); | |
1748 | |
1749 if (mustmatch_p) | |
1750 { | |
1751 /* The selection_entry part of filesel is not documented. */ | |
1752 gtk_widget_set_sensitive (filesel->selection_entry, FALSE); | |
1753 gtk_file_selection_hide_fileop_buttons (filesel); | |
1754 } | |
1755 | |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1756 *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
|
1757 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1758 return filewin; |
49323 | 1759 } |
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
|
1760 #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
|
1761 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1762 /* 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
|
1763 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
|
1764 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
|
1765 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
|
1766 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
|
1767 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
|
1768 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
|
1769 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
|
1770 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
|
1771 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1772 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
|
1773 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
|
1774 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1775 char * |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1776 xg_get_file_name (FRAME_PTR f, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1777 char *prompt, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1778 char *default_filename, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1779 int mustmatch_p, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1780 int only_dir_p) |
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
|
1781 { |
58284
10efc827e15c
* gtkutil.c (xg_get_file_name): Fix typo in
Jan Djärv <jan.h.d@swipnet.se>
parents:
58201
diff
changeset
|
1782 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
|
1783 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
|
1784 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
|
1785 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
|
1786 |
58818
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1787 #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
|
1788 /* 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
|
1789 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
|
1790 threads. */ |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1791 sigblock (sigmask (__SIGRTMIN)); |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1792 #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
|
1793 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1794 #ifdef HAVE_GTK_FILE_SELECTION_NEW |
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
|
1795 |
67761
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1796 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
|
1797 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
|
1798 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
|
1799 else |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1800 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
|
1801 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
|
1802 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1803 #else /* not 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
|
1804 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
|
1805 mustmatch_p, only_dir_p, &func); |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1806 #endif /* not 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
|
1807 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1808 gtk_widget_set_name (w, "emacs-filedialog"); |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1809 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1810 filesel_done = xg_dialog_run (f, 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
|
1811 |
58818
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1812 #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
|
1813 sigunblock (sigmask (__SIGRTMIN)); |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1814 #endif |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1815 |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1816 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
|
1817 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
|
1818 |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1819 gtk_widget_destroy (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
|
1820 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
|
1821 } |
49323 | 1822 |
95794
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1823 #ifdef HAVE_FREETYPE |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1824 /* 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
|
1825 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
|
1826 format: |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1827 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1828 `FAMILY [VALUE1 VALUE2] SIZE' |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1829 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1830 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
|
1831 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
|
1832 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1833 char * |
109726
64732fa6188a
Use const char* instead of char*.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109717
diff
changeset
|
1834 xg_get_font_name (FRAME_PTR f, const char *default_name) |
95794
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1835 { |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1836 GtkWidget *w; |
95794
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1837 char *fontname = NULL; |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1838 int done = 0; |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1839 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1840 #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
|
1841 sigblock (sigmask (__SIGRTMIN)); |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1842 #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
|
1843 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1844 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
|
1845 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
|
1846 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
|
1847 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
|
1848 default_name); |
95794
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1849 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1850 gtk_widget_set_name (w, "emacs-fontdialog"); |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1851 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1852 done = xg_dialog_run (f, w); |
95794
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1853 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1854 #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
|
1855 sigunblock (sigmask (__SIGRTMIN)); |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1856 #endif |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1857 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1858 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
|
1859 fontname = gtk_font_selection_dialog_get_font_name |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1860 (GTK_FONT_SELECTION_DIALOG (w)); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1861 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1862 gtk_widget_destroy (w); |
95794
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1863 return fontname; |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1864 } |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1865 #endif /* HAVE_FREETYPE */ |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1866 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1867 |
49323 | 1868 |
1869 /*********************************************************************** | |
1870 Menu functions. | |
1871 ***********************************************************************/ | |
1872 | |
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
|
1873 /* The name of menu items that can be used for customization. Since GTK |
49323 | 1874 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
|
1875 menu item names so a user can easily customize menu items. */ |
49323 | 1876 |
1877 #define MENU_ITEM_NAME "emacs-menuitem" | |
1878 | |
1879 | |
1880 /* Linked list of all allocated struct xg_menu_cb_data. Used for marking | |
1881 during GC. The next member points to the items. */ | |
1882 static xg_list_node xg_menu_cb_list; | |
1883 | |
1884 /* Linked list of all allocated struct xg_menu_item_cb_data. Used for marking | |
1885 during GC. The next member points to the items. */ | |
1886 static xg_list_node xg_menu_item_cb_list; | |
1887 | |
1888 /* Allocate and initialize CL_DATA if NULL, otherwise increase ref_count. | |
1889 F is the frame CL_DATA will be initialized for. | |
1890 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
1891 | |
1892 The menu bar and all sub menus under the menu bar in a frame | |
1893 share the same structure, hence the reference count. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1894 |
49323 | 1895 Returns CL_DATA if CL_DATA is not NULL, or a pointer to a newly |
1896 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
|
1897 |
49323 | 1898 static xg_menu_cb_data * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1899 make_cl_data (xg_menu_cb_data *cl_data, FRAME_PTR f, GCallback highlight_cb) |
49323 | 1900 { |
1901 if (! cl_data) | |
1902 { | |
1903 cl_data = (xg_menu_cb_data*) xmalloc (sizeof (*cl_data)); | |
1904 cl_data->f = f; | |
1905 cl_data->menu_bar_vector = f->menu_bar_vector; | |
1906 cl_data->menu_bar_items_used = f->menu_bar_items_used; | |
1907 cl_data->highlight_cb = highlight_cb; | |
1908 cl_data->ref_count = 0; | |
1909 | |
1910 xg_list_insert (&xg_menu_cb_list, &cl_data->ptrs); | |
1911 } | |
1912 | |
1913 cl_data->ref_count++; | |
1914 | |
1915 return cl_data; | |
1916 } | |
1917 | |
1918 /* Update CL_DATA with values from frame F and with HIGHLIGHT_CB. | |
1919 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
1920 | |
1921 When the menu bar is updated, menu items may have been added and/or | |
1922 removed, so menu_bar_vector and menu_bar_items_used change. We must | |
1923 then update CL_DATA since it is used to determine which menu | |
1924 item that is invoked in the menu. | |
1925 HIGHLIGHT_CB could change, there is no check that the same | |
1926 function is given when modifying a menu bar as was given when | |
1927 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
|
1928 |
49323 | 1929 static void |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1930 update_cl_data (xg_menu_cb_data *cl_data, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1931 FRAME_PTR f, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1932 GCallback highlight_cb) |
49323 | 1933 { |
1934 if (cl_data) | |
1935 { | |
1936 cl_data->f = f; | |
1937 cl_data->menu_bar_vector = f->menu_bar_vector; | |
1938 cl_data->menu_bar_items_used = f->menu_bar_items_used; | |
1939 cl_data->highlight_cb = highlight_cb; | |
1940 } | |
1941 } | |
1942 | |
1943 /* Decrease reference count for CL_DATA. | |
1944 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
|
1945 |
49323 | 1946 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1947 unref_cl_data (xg_menu_cb_data *cl_data) |
49323 | 1948 { |
1949 if (cl_data && cl_data->ref_count > 0) | |
1950 { | |
1951 cl_data->ref_count--; | |
1952 if (cl_data->ref_count == 0) | |
1953 { | |
1954 xg_list_remove (&xg_menu_cb_list, &cl_data->ptrs); | |
1955 xfree (cl_data); | |
1956 } | |
1957 } | |
1958 } | |
1959 | |
1960 /* 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
|
1961 |
49323 | 1962 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1963 xg_mark_data (void) |
49323 | 1964 { |
1965 xg_list_node *iter; | |
1966 | |
1967 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
|
1968 mark_object (((xg_menu_cb_data *) iter)->menu_bar_vector); |
49323 | 1969 |
1970 for (iter = xg_menu_item_cb_list.next; iter; iter = iter->next) | |
1971 { | |
1972 xg_menu_item_cb_data *cb_data = (xg_menu_item_cb_data *) iter; | |
1973 | |
1974 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
|
1975 mark_object (cb_data->help); |
49323 | 1976 } |
1977 } | |
1978 | |
1979 | |
1980 /* Callback called when a menu item is destroyed. Used to free data. | |
1981 W is the widget that is being destroyed (not used). | |
1982 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
|
1983 |
49323 | 1984 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1985 menuitem_destroy_callback (GtkWidget *w, gpointer client_data) |
49323 | 1986 { |
1987 if (client_data) | |
1988 { | |
1989 xg_menu_item_cb_data *data = (xg_menu_item_cb_data*) client_data; | |
1990 xg_list_remove (&xg_menu_item_cb_list, &data->ptrs); | |
1991 xfree (data); | |
1992 } | |
1993 } | |
1994 | |
1995 /* 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
|
1996 W is the parent of the menu item. |
49323 | 1997 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
|
1998 CLIENT_DATA is not used. |
49323 | 1999 |
2000 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
|
2001 |
49323 | 2002 static gboolean |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2003 menuitem_highlight_callback (GtkWidget *w, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2004 GdkEventCrossing *event, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2005 gpointer client_data) |
49323 | 2006 { |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2007 GdkEvent ev; |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2008 GtkWidget *subwidget; |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2009 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
|
2010 |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2011 ev.crossing = *event; |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2012 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
|
2013 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
|
2014 XG_ITEM_DATA); |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2015 if (data) |
49323 | 2016 { |
2017 if (! NILP (data->help) && data->cl_data->highlight_cb) | |
2018 { | |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2019 gpointer call_data = event->type == GDK_LEAVE_NOTIFY ? 0 : data; |
49323 | 2020 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
|
2021 (*func) (subwidget, call_data); |
49323 | 2022 } |
2023 } | |
2024 | |
2025 return FALSE; | |
2026 } | |
2027 | |
2028 /* Callback called when a menu is destroyed. Used to free data. | |
2029 W is the widget that is being destroyed (not used). | |
2030 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
|
2031 |
49323 | 2032 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2033 menu_destroy_callback (GtkWidget *w, gpointer client_data) |
49323 | 2034 { |
2035 unref_cl_data ((xg_menu_cb_data*) client_data); | |
2036 } | |
2037 | |
2038 /* Make a GTK widget that contains both UTF8_LABEL and UTF8_KEY (both | |
2039 must be non-NULL) and can be inserted into a menu item. | |
2040 | |
2041 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
|
2042 |
49323 | 2043 static GtkWidget * |
109726
64732fa6188a
Use const char* instead of char*.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109717
diff
changeset
|
2044 make_widget_for_menu_item (const char *utf8_label, const char *utf8_key) |
49323 | 2045 { |
2046 GtkWidget *wlbl; | |
2047 GtkWidget *wkey; | |
2048 GtkWidget *wbox; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2049 |
49323 | 2050 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
|
2051 wlbl = gtk_label_new (utf8_label); |
49323 | 2052 wkey = gtk_label_new (utf8_key); |
2053 | |
2054 gtk_misc_set_alignment (GTK_MISC (wlbl), 0.0, 0.5); | |
2055 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
|
2056 |
49323 | 2057 gtk_box_pack_start (GTK_BOX (wbox), wlbl, TRUE, TRUE, 0); |
2058 gtk_box_pack_start (GTK_BOX (wbox), wkey, FALSE, FALSE, 0); | |
2059 | |
2060 gtk_widget_set_name (wlbl, MENU_ITEM_NAME); | |
2061 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
|
2062 gtk_widget_set_name (wbox, MENU_ITEM_NAME); |
49323 | 2063 |
2064 return wbox; | |
2065 } | |
2066 | |
2067 /* Make and return a menu item widget with the key to the right. | |
2068 UTF8_LABEL is the text for the menu item (GTK uses UTF8 internally). | |
2069 UTF8_KEY is the text representing the key binding. | |
2070 ITEM is the widget_value describing the menu item. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2071 |
49323 | 2072 GROUP is an in/out parameter. If the menu item to be created is not |
2073 part of any radio menu group, *GROUP contains NULL on entry and exit. | |
2074 If the menu item to be created is part of a radio menu group, on entry | |
2075 *GROUP contains the group to use, or NULL if this is the first item | |
2076 in the group. On exit, *GROUP contains the radio item group. | |
2077 | |
2078 Unfortunately, keys don't line up as nicely as in Motif, | |
2079 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
|
2080 |
49323 | 2081 static GtkWidget * |
109726
64732fa6188a
Use const char* instead of char*.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109717
diff
changeset
|
2082 make_menu_item (const char *utf8_label, |
64732fa6188a
Use const char* instead of char*.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109717
diff
changeset
|
2083 const char *utf8_key, |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2084 widget_value *item, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2085 GSList **group) |
49323 | 2086 { |
2087 GtkWidget *w; | |
2088 GtkWidget *wtoadd = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2089 |
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
|
2090 /* 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
|
2091 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
|
2092 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
|
2093 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
|
2094 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
|
2095 |
49323 | 2096 if (utf8_key) |
2097 wtoadd = make_widget_for_menu_item (utf8_label, utf8_key); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2098 |
49323 | 2099 if (item->button_type == BUTTON_TYPE_TOGGLE) |
2100 { | |
2101 *group = NULL; | |
2102 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
|
2103 else w = gtk_check_menu_item_new_with_label (utf8_label); |
49323 | 2104 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), item->selected); |
2105 } | |
2106 else if (item->button_type == BUTTON_TYPE_RADIO) | |
2107 { | |
2108 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
|
2109 else w = gtk_radio_menu_item_new_with_label (*group, utf8_label); |
49323 | 2110 *group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (w)); |
2111 if (item->selected) | |
2112 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), TRUE); | |
2113 } | |
2114 else | |
2115 { | |
2116 *group = NULL; | |
2117 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
|
2118 else w = gtk_menu_item_new_with_label (utf8_label); |
49323 | 2119 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2120 |
49323 | 2121 if (wtoadd) gtk_container_add (GTK_CONTAINER (w), wtoadd); |
2122 if (! item->enabled) gtk_widget_set_sensitive (w, FALSE); | |
2123 | |
2124 return w; | |
2125 } | |
2126 | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2127 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
|
2128 |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2129 /* 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
|
2130 |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2131 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2132 xg_have_tear_offs (void) |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2133 { |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2134 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
|
2135 } |
49323 | 2136 |
2137 /* 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
|
2138 decrease the xg_detached_menus count. |
49323 | 2139 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
|
2140 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
|
2141 |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2142 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2143 tearoff_remove (GtkWidget *widget, gpointer client_data) |
49323 | 2144 { |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2145 if (xg_detached_menus > 0) --xg_detached_menus; |
49323 | 2146 } |
2147 | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2148 /* 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
|
2149 xg_detached_menus count. |
49323 | 2150 WIDGET is the GtkTearoffMenuItem. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2151 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
|
2152 |
49323 | 2153 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2154 tearoff_activate (GtkWidget *widget, gpointer client_data) |
49323 | 2155 { |
2156 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
|
2157 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
|
2158 { |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2159 ++xg_detached_menus; |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2160 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
|
2161 "destroy", |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2162 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
|
2163 } |
49323 | 2164 } |
2165 | |
2166 | |
2167 /* Create a menu item widget, and connect the callbacks. | |
2168 ITEM decribes the menu item. | |
2169 F is the frame the created menu belongs to. | |
2170 SELECT_CB is the callback to use when a menu item is selected. | |
2171 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2172 CL_DATA points to the callback data to be used for this menu. | |
2173 GROUP is an in/out parameter. If the menu item to be created is not | |
2174 part of any radio menu group, *GROUP contains NULL on entry and exit. | |
2175 If the menu item to be created is part of a radio menu group, on entry | |
2176 *GROUP contains the group to use, or NULL if this is the first item | |
2177 in the group. On exit, *GROUP contains the radio item group. | |
2178 | |
2179 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
|
2180 |
49323 | 2181 static GtkWidget * |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2182 xg_create_one_menuitem (widget_value *item, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2183 FRAME_PTR f, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2184 GCallback select_cb, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2185 GCallback highlight_cb, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2186 xg_menu_cb_data *cl_data, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2187 GSList **group) |
49323 | 2188 { |
2189 char *utf8_label; | |
2190 char *utf8_key; | |
2191 GtkWidget *w; | |
2192 xg_menu_item_cb_data *cb_data; | |
2193 | |
2194 utf8_label = get_utf8_string (item->name); | |
2195 utf8_key = get_utf8_string (item->key); | |
2196 | |
2197 w = make_menu_item (utf8_label, utf8_key, item, group); | |
2198 | |
109748
e2f8226efb99
Fix -Wwrite_strings in general and for Gtk+ specific code.
Jan D <jan.h.d@swipnet.se>
parents:
109726
diff
changeset
|
2199 if (utf8_label) g_free (utf8_label); |
e2f8226efb99
Fix -Wwrite_strings in general and for Gtk+ specific code.
Jan D <jan.h.d@swipnet.se>
parents:
109726
diff
changeset
|
2200 if (utf8_key) g_free (utf8_key); |
49323 | 2201 |
2202 cb_data = xmalloc (sizeof (xg_menu_item_cb_data)); | |
2203 | |
2204 xg_list_insert (&xg_menu_item_cb_list, &cb_data->ptrs); | |
2205 | |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2206 cb_data->select_id = 0; |
49323 | 2207 cb_data->help = item->help; |
2208 cb_data->cl_data = cl_data; | |
2209 cb_data->call_data = item->call_data; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2210 |
49323 | 2211 g_signal_connect (G_OBJECT (w), |
2212 "destroy", | |
2213 G_CALLBACK (menuitem_destroy_callback), | |
2214 cb_data); | |
2215 | |
2216 /* Put cb_data in widget, so we can get at it when modifying menubar */ | |
2217 g_object_set_data (G_OBJECT (w), XG_ITEM_DATA, cb_data); | |
2218 | |
2219 /* final item, not a submenu */ | |
2220 if (item->call_data && ! item->contents) | |
2221 { | |
2222 if (select_cb) | |
2223 cb_data->select_id | |
2224 = g_signal_connect (G_OBJECT (w), "activate", select_cb, cb_data); | |
2225 } | |
2226 | |
2227 return w; | |
2228 } | |
2229 | |
2230 /* Create a full menu tree specified by DATA. | |
2231 F is the frame the created menu belongs to. | |
2232 SELECT_CB is the callback to use when a menu item is selected. | |
2233 DEACTIVATE_CB is the callback to use when a sub menu is not shown anymore. | |
2234 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2235 POP_UP_P is non-zero if we shall create a popup menu. | |
2236 MENU_BAR_P is non-zero if we shall create a menu bar. | |
2237 ADD_TEAROFF_P is non-zero if we shall add a teroff menu item. Ignored | |
2238 if MENU_BAR_P is non-zero. | |
2239 TOPMENU is the topmost GtkWidget that others shall be placed under. | |
2240 It may be NULL, in that case we create the appropriate widget | |
2241 (menu bar or menu item depending on POP_UP_P and MENU_BAR_P) | |
2242 CL_DATA is the callback data we shall use for this menu, or NULL | |
2243 if we haven't set the first callback yet. | |
2244 NAME is the name to give to the top level menu if this function | |
2245 creates it. May be NULL to not set any name. | |
2246 | |
2247 Returns the top level GtkWidget. This is TOPLEVEL if TOPLEVEL is | |
2248 not NULL. | |
2249 | |
2250 This function calls itself to create submenus. */ | |
2251 | |
2252 static GtkWidget * | |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2253 create_menus (widget_value *data, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2254 FRAME_PTR f, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2255 GCallback select_cb, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2256 GCallback deactivate_cb, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2257 GCallback highlight_cb, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2258 int pop_up_p, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2259 int menu_bar_p, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2260 int add_tearoff_p, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2261 GtkWidget *topmenu, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2262 xg_menu_cb_data *cl_data, |
109726
64732fa6188a
Use const char* instead of char*.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109717
diff
changeset
|
2263 const char *name) |
49323 | 2264 { |
2265 widget_value *item; | |
2266 GtkWidget *wmenu = topmenu; | |
2267 GSList *group = NULL; | |
2268 | |
2269 if (! topmenu) | |
2270 { | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2271 if (! menu_bar_p) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2272 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2273 wmenu = gtk_menu_new (); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2274 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
|
2275 /* 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
|
2276 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
|
2277 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
|
2278 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
|
2279 "enter-notify-event", |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2280 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
|
2281 NULL); |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2282 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
|
2283 "leave-notify-event", |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2284 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
|
2285 NULL); |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2286 } |
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
|
2287 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
|
2288 { |
695dbf5b3bb9
gtkutil.c (create_menus): Call gtk_widget_set_size_request for
Jan Djärv <jan.h.d@swipnet.se>
parents:
103916
diff
changeset
|
2289 wmenu = gtk_menu_bar_new (); |
106186
9b6f45dd8386
Use a select wrapper around the GLib event loop, thus taking into account GLib
Jan Djärv <jan.h.d@swipnet.se>
parents:
106161
diff
changeset
|
2290 /* Set width of menu bar to a small value so it doesn't enlarge |
9b6f45dd8386
Use a select wrapper around the GLib event loop, thus taking into account GLib
Jan Djärv <jan.h.d@swipnet.se>
parents:
106161
diff
changeset
|
2291 a small initial frame size. The width will be set to the |
9b6f45dd8386
Use a select wrapper around the GLib event loop, thus taking into account GLib
Jan Djärv <jan.h.d@swipnet.se>
parents:
106161
diff
changeset
|
2292 width of the frame later on when it is added to a container. |
9b6f45dd8386
Use a select wrapper around the GLib event loop, thus taking into account GLib
Jan Djärv <jan.h.d@swipnet.se>
parents:
106161
diff
changeset
|
2293 height -1: Natural height. */ |
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
|
2294 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
|
2295 } |
49323 | 2296 |
2297 /* Put cl_data on the top menu for easier access. */ | |
2298 cl_data = make_cl_data (cl_data, f, highlight_cb); | |
2299 g_object_set_data (G_OBJECT (wmenu), XG_FRAME_DATA, (gpointer)cl_data); | |
2300 g_signal_connect (G_OBJECT (wmenu), "destroy", | |
2301 G_CALLBACK (menu_destroy_callback), cl_data); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2302 |
49323 | 2303 if (name) |
2304 gtk_widget_set_name (wmenu, name); | |
2305 | |
2306 if (deactivate_cb) | |
2307 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
|
2308 "selection-done", deactivate_cb, 0); |
49323 | 2309 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2310 |
49323 | 2311 if (! menu_bar_p && add_tearoff_p) |
2312 { | |
2313 GtkWidget *tearoff = gtk_tearoff_menu_item_new (); | |
2314 gtk_menu_shell_append (GTK_MENU_SHELL (wmenu), tearoff); | |
2315 | |
2316 g_signal_connect (G_OBJECT (tearoff), "activate", | |
2317 G_CALLBACK (tearoff_activate), 0); | |
2318 } | |
2319 | |
2320 for (item = data; item; item = item->next) | |
2321 { | |
2322 GtkWidget *w; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2323 |
49323 | 2324 if (pop_up_p && !item->contents && !item->call_data |
111991
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
2325 && !menu_separator_name_p (item->name)) |
49323 | 2326 { |
2327 char *utf8_label; | |
2328 /* A title for a popup. We do the same as GTK does when | |
2329 creating titles, but it does not look good. */ | |
2330 group = NULL; | |
2331 utf8_label = get_utf8_string (item->name); | |
2332 | |
2333 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
|
2334 w = gtk_menu_item_new_with_label (utf8_label); |
49323 | 2335 gtk_widget_set_sensitive (w, FALSE); |
109748
e2f8226efb99
Fix -Wwrite_strings in general and for Gtk+ specific code.
Jan D <jan.h.d@swipnet.se>
parents:
109726
diff
changeset
|
2336 if (utf8_label) g_free (utf8_label); |
49323 | 2337 } |
111991
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
2338 else if (menu_separator_name_p (item->name)) |
49323 | 2339 { |
2340 group = NULL; | |
2341 /* GTK only have one separator type. */ | |
2342 w = gtk_separator_menu_item_new (); | |
2343 } | |
2344 else | |
2345 { | |
2346 w = xg_create_one_menuitem (item, | |
2347 f, | |
2348 item->contents ? 0 : select_cb, | |
2349 highlight_cb, | |
2350 cl_data, | |
2351 &group); | |
2352 | |
77511
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2353 /* 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
|
2354 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
|
2355 if (item->contents || menu_bar_p) |
49323 | 2356 { |
2357 GtkWidget *submenu = create_menus (item->contents, | |
2358 f, | |
2359 select_cb, | |
2360 deactivate_cb, | |
2361 highlight_cb, | |
2362 0, | |
2363 0, | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2364 add_tearoff_p, |
49323 | 2365 0, |
2366 cl_data, | |
2367 0); | |
2368 gtk_menu_item_set_submenu (GTK_MENU_ITEM (w), submenu); | |
2369 } | |
2370 } | |
2371 | |
2372 gtk_menu_shell_append (GTK_MENU_SHELL (wmenu), w); | |
2373 gtk_widget_set_name (w, MENU_ITEM_NAME); | |
2374 } | |
2375 | |
2376 return wmenu; | |
2377 } | |
2378 | |
2379 /* Create a menubar, popup menu or dialog, depending on the TYPE argument. | |
2380 TYPE can be "menubar", "popup" for popup menu, or "dialog" for a dialog | |
2381 with some text and buttons. | |
2382 F is the frame the created item belongs to. | |
2383 NAME is the name to use for the top widget. | |
2384 VAL is a widget_value structure describing items to be created. | |
2385 SELECT_CB is the callback to use when a menu item is selected or | |
2386 a dialog button is pressed. | |
2387 DEACTIVATE_CB is the callback to use when an item is deactivated. | |
2388 For a menu, when a sub menu is not shown anymore, for a dialog it is | |
2389 called when the dialog is popped down. | |
2390 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2391 | |
2392 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
|
2393 |
49323 | 2394 GtkWidget * |
109717
8949aad5e992
Use const char* instead of char*.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109668
diff
changeset
|
2395 xg_create_widget (const char *type, const char *name, FRAME_PTR f, widget_value *val, |
109364
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109141
diff
changeset
|
2396 GCallback select_cb, GCallback deactivate_cb, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109141
diff
changeset
|
2397 GCallback highlight_cb) |
49323 | 2398 { |
2399 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
|
2400 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
|
2401 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
|
2402 |
49323 | 2403 if (strcmp (type, "dialog") == 0) |
2404 { | |
2405 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
|
2406 xg_set_screen (w, f); |
49323 | 2407 gtk_window_set_transient_for (GTK_WINDOW (w), |
2408 GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); | |
2409 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
|
2410 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
|
2411 gtk_window_set_modal (GTK_WINDOW (w), TRUE); |
49323 | 2412 } |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2413 else if (menu_bar_p || pop_up_p) |
49323 | 2414 { |
2415 w = create_menus (val->contents, | |
2416 f, | |
2417 select_cb, | |
2418 deactivate_cb, | |
2419 highlight_cb, | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2420 pop_up_p, |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2421 menu_bar_p, |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2422 menu_bar_p, |
49323 | 2423 0, |
2424 0, | |
2425 name); | |
2426 | |
2427 /* Set the cursor to an arrow for popup menus when they are mapped. | |
2428 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
|
2429 if (pop_up_p) |
49323 | 2430 { |
2431 /* Must realize so the GdkWindow inside the widget is created. */ | |
2432 gtk_widget_realize (w); | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2433 xg_set_cursor (w, FRAME_X_DISPLAY_INFO (f)->xg_cursor); |
49323 | 2434 } |
2435 } | |
2436 else | |
2437 { | |
2438 fprintf (stderr, "bad type in xg_create_widget: %s, doing nothing\n", | |
2439 type); | |
2440 } | |
2441 | |
2442 return w; | |
2443 } | |
2444 | |
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
|
2445 /* 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
|
2446 |
49323 | 2447 static const char * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2448 xg_get_menu_item_label (GtkMenuItem *witem) |
49323 | 2449 { |
111991
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
2450 GtkLabel *wlabel = GTK_LABEL (XG_BIN_CHILD (witem)); |
49323 | 2451 return gtk_label_get_label (wlabel); |
2452 } | |
2453 | |
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
|
2454 /* 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
|
2455 |
49323 | 2456 static int |
109748
e2f8226efb99
Fix -Wwrite_strings in general and for Gtk+ specific code.
Jan D <jan.h.d@swipnet.se>
parents:
109726
diff
changeset
|
2457 xg_item_label_same_p (GtkMenuItem *witem, const char *label) |
49323 | 2458 { |
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
|
2459 int is_same = 0; |
49323 | 2460 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
|
2461 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
|
2462 |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2463 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
|
2464 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
|
2465 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
|
2466 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
|
2467 |
109748
e2f8226efb99
Fix -Wwrite_strings in general and for Gtk+ specific code.
Jan D <jan.h.d@swipnet.se>
parents:
109726
diff
changeset
|
2468 if (utf8_label) g_free (utf8_label); |
49323 | 2469 |
2470 return is_same; | |
2471 } | |
2472 | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2473 /* 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
|
2474 |
49323 | 2475 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2476 xg_destroy_widgets (GList *list) |
49323 | 2477 { |
2478 GList *iter; | |
2479 | |
49572 | 2480 for (iter = list; iter; iter = g_list_next (iter)) |
49323 | 2481 { |
2482 GtkWidget *w = GTK_WIDGET (iter->data); | |
2483 | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2484 /* Destroying the widget will remove it from the container it is in. */ |
49323 | 2485 gtk_widget_destroy (w); |
2486 } | |
2487 } | |
2488 | |
2489 /* Update the top level names in MENUBAR (i.e. not submenus). | |
2490 F is the frame the menu bar belongs to. | |
49572 | 2491 *LIST is a list with the current menu bar names (menu item widgets). |
2492 ITER is the item within *LIST that shall be updated. | |
2493 POS is the numerical position, starting at 0, of ITER in *LIST. | |
49323 | 2494 VAL describes what the menu bar shall look like after the update. |
2495 SELECT_CB is the callback to use when a menu item is selected. | |
2496 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
49572 | 2497 CL_DATA points to the callback data to be used for this menu bar. |
49323 | 2498 |
2499 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
|
2500 |
49323 | 2501 static void |
109139
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2502 xg_update_menubar (GtkWidget *menubar, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2503 FRAME_PTR f, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2504 GList **list, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2505 GList *iter, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2506 int pos, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2507 widget_value *val, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2508 GCallback select_cb, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2509 GCallback deactivate_cb, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2510 GCallback highlight_cb, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2511 xg_menu_cb_data *cl_data) |
49323 | 2512 { |
49572 | 2513 if (! iter && ! val) |
49323 | 2514 return; |
49572 | 2515 else if (iter && ! val) |
49323 | 2516 { |
49572 | 2517 /* 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
|
2518 xg_destroy_widgets (iter); |
49323 | 2519 |
106161
0ea716305b13
gtkutil.c (xg_modify_menubar_widgets): If menubar is totally empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
106012
diff
changeset
|
2520 /* Add a blank entry so the menubar doesn't collapse to nothing. */ |
0ea716305b13
gtkutil.c (xg_modify_menubar_widgets): If menubar is totally empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
106012
diff
changeset
|
2521 gtk_menu_shell_insert (GTK_MENU_SHELL (menubar), |
0ea716305b13
gtkutil.c (xg_modify_menubar_widgets): If menubar is totally empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
106012
diff
changeset
|
2522 gtk_menu_item_new_with_label (""), |
0ea716305b13
gtkutil.c (xg_modify_menubar_widgets): If menubar is totally empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
106012
diff
changeset
|
2523 0); |
49323 | 2524 /* All updated. */ |
2525 val = 0; | |
49572 | 2526 iter = 0; |
49323 | 2527 } |
49572 | 2528 else if (! iter && val) |
49323 | 2529 { |
2530 /* 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
|
2531 create_menus (val, f, select_cb, deactivate_cb, highlight_cb, |
49323 | 2532 0, 1, 0, menubar, cl_data, 0); |
2533 | |
2534 /* All updated. */ | |
2535 val = 0; | |
49572 | 2536 iter = 0; |
49323 | 2537 } |
49572 | 2538 /* Below this neither iter or val is NULL */ |
2539 else if (xg_item_label_same_p (GTK_MENU_ITEM (iter->data), val->name)) | |
49323 | 2540 { |
2541 /* This item is still the same, check next item. */ | |
2542 val = val->next; | |
49572 | 2543 iter = g_list_next (iter); |
2544 ++pos; | |
49323 | 2545 } |
2546 else /* This item is changed. */ | |
2547 { | |
49572 | 2548 GtkMenuItem *witem = GTK_MENU_ITEM (iter->data); |
49323 | 2549 GtkMenuItem *witem2 = 0; |
2550 int val_in_menubar = 0; | |
49572 | 2551 int iter_in_new_menubar = 0; |
2552 GList *iter2; | |
49323 | 2553 widget_value *cur; |
2554 | |
2555 /* See if the changed entry (val) is present later in the menu bar */ | |
49572 | 2556 for (iter2 = iter; |
2557 iter2 && ! val_in_menubar; | |
2558 iter2 = g_list_next (iter2)) | |
49323 | 2559 { |
49572 | 2560 witem2 = GTK_MENU_ITEM (iter2->data); |
49323 | 2561 val_in_menubar = xg_item_label_same_p (witem2, val->name); |
2562 } | |
2563 | |
49572 | 2564 /* See if the current entry (iter) is present later in the |
49323 | 2565 specification for the new menu bar. */ |
49572 | 2566 for (cur = val; cur && ! iter_in_new_menubar; cur = cur->next) |
2567 iter_in_new_menubar = xg_item_label_same_p (witem, cur->name); | |
2568 | |
2569 if (val_in_menubar && ! iter_in_new_menubar) | |
49323 | 2570 { |
49572 | 2571 int nr = pos; |
2572 | |
49323 | 2573 /* This corresponds to: |
2574 Current: A B C | |
2575 New: A C | |
2576 Remove B. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2577 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
2578 g_object_ref (G_OBJECT (witem)); |
49323 | 2579 gtk_container_remove (GTK_CONTAINER (menubar), GTK_WIDGET (witem)); |
2580 gtk_widget_destroy (GTK_WIDGET (witem)); | |
2581 | |
2582 /* Must get new list since the old changed. */ | |
49572 | 2583 g_list_free (*list); |
2584 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2585 while (nr-- > 0) iter = g_list_next (iter); | |
49323 | 2586 } |
49572 | 2587 else if (! val_in_menubar && ! iter_in_new_menubar) |
49323 | 2588 { |
2589 /* This corresponds to: | |
2590 Current: A B C | |
2591 New: A X C | |
2592 Rename B to X. This might seem to be a strange thing to do, | |
2593 since if there is a menu under B it will be totally wrong for X. | |
2594 But consider editing a C file. Then there is a C-mode menu | |
2595 (corresponds to B above). | |
2596 If then doing C-x C-f the minibuf menu (X above) replaces the | |
2597 C-mode menu. When returning from the minibuffer, we get | |
2598 back the C-mode menu. Thus we do: | |
2599 Rename B to X (C-mode to minibuf menu) | |
2600 Rename X to B (minibuf to C-mode menu). | |
2601 If the X menu hasn't been invoked, the menu under B | |
2602 is up to date when leaving the minibuffer. */ | |
111991
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
2603 GtkLabel *wlabel = GTK_LABEL (XG_BIN_CHILD (witem)); |
49323 | 2604 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
|
2605 GtkWidget *submenu = gtk_menu_item_get_submenu (witem); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2606 |
50778
f30e6f029d65
* gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents:
50521
diff
changeset
|
2607 gtk_label_set_text (wlabel, utf8_label); |
49323 | 2608 |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2609 /* 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
|
2610 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
|
2611 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
|
2612 /* 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
|
2613 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
|
2614 |
109748
e2f8226efb99
Fix -Wwrite_strings in general and for Gtk+ specific code.
Jan D <jan.h.d@swipnet.se>
parents:
109726
diff
changeset
|
2615 if (utf8_label) g_free (utf8_label); |
49572 | 2616 iter = g_list_next (iter); |
49323 | 2617 val = val->next; |
49572 | 2618 ++pos; |
49323 | 2619 } |
49572 | 2620 else if (! val_in_menubar && iter_in_new_menubar) |
49323 | 2621 { |
2622 /* This corresponds to: | |
2623 Current: A B C | |
2624 New: A X B C | |
2625 Insert X. */ | |
2626 | |
49572 | 2627 int nr = pos; |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2628 GSList *group = 0; |
49323 | 2629 GtkWidget *w = xg_create_one_menuitem (val, |
2630 f, | |
2631 select_cb, | |
2632 highlight_cb, | |
2633 cl_data, | |
2634 &group); | |
2635 | |
77511
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2636 /* 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
|
2637 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
|
2638 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
|
2639 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
|
2640 highlight_cb, |
77511
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2641 0, 0, 0, 0, cl_data, 0); |
49323 | 2642 gtk_widget_set_name (w, MENU_ITEM_NAME); |
2643 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
|
2644 gtk_menu_item_set_submenu (GTK_MENU_ITEM (w), submenu); |
49323 | 2645 |
49572 | 2646 g_list_free (*list); |
2647 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2648 while (nr-- > 0) iter = g_list_next (iter); | |
2649 iter = g_list_next (iter); | |
49323 | 2650 val = val->next; |
49572 | 2651 ++pos; |
49323 | 2652 } |
49572 | 2653 else /* if (val_in_menubar && iter_in_new_menubar) */ |
49323 | 2654 { |
49572 | 2655 int nr = pos; |
49323 | 2656 /* This corresponds to: |
2657 Current: A B C | |
2658 New: A C B | |
2659 Move C before B */ | |
2660 | |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
2661 g_object_ref (G_OBJECT (witem2)); |
49323 | 2662 gtk_container_remove (GTK_CONTAINER (menubar), GTK_WIDGET (witem2)); |
2663 gtk_menu_shell_insert (GTK_MENU_SHELL (menubar), | |
2664 GTK_WIDGET (witem2), pos); | |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
2665 g_object_unref (G_OBJECT (witem2)); |
49323 | 2666 |
49572 | 2667 g_list_free (*list); |
2668 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2669 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
|
2670 if (iter) iter = g_list_next (iter); |
49323 | 2671 val = val->next; |
49572 | 2672 ++pos; |
49323 | 2673 } |
2674 } | |
2675 | |
2676 /* Update the rest of the menu bar. */ | |
49572 | 2677 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
|
2678 select_cb, deactivate_cb, highlight_cb, cl_data); |
49323 | 2679 } |
2680 | |
2681 /* Update the menu item W so it corresponds to VAL. | |
2682 SELECT_CB is the callback to use when a menu item is selected. | |
2683 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
102358 | 2684 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
|
2685 |
49323 | 2686 static void |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2687 xg_update_menu_item (widget_value *val, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2688 GtkWidget *w, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2689 GCallback select_cb, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2690 GCallback highlight_cb, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2691 xg_menu_cb_data *cl_data) |
49323 | 2692 { |
2693 GtkWidget *wchild; | |
2694 GtkLabel *wlbl = 0; | |
2695 GtkLabel *wkey = 0; | |
2696 char *utf8_label; | |
2697 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
|
2698 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
|
2699 const char *old_key = 0; |
49323 | 2700 xg_menu_item_cb_data *cb_data; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2701 |
111991
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
2702 wchild = XG_BIN_CHILD (w); |
49323 | 2703 utf8_label = get_utf8_string (val->name); |
2704 utf8_key = get_utf8_string (val->key); | |
2705 | |
2706 /* See if W is a menu item with a key. See make_menu_item above. */ | |
2707 if (GTK_IS_HBOX (wchild)) | |
2708 { | |
2709 GList *list = gtk_container_get_children (GTK_CONTAINER (wchild)); | |
2710 | |
2711 wlbl = GTK_LABEL (list->data); | |
2712 wkey = GTK_LABEL (list->next->data); | |
49572 | 2713 g_list_free (list); |
2714 | |
49323 | 2715 if (! utf8_key) |
2716 { | |
2717 /* Remove the key and keep just the label. */ | |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
2718 g_object_ref (G_OBJECT (wlbl)); |
49323 | 2719 gtk_container_remove (GTK_CONTAINER (w), wchild); |
2720 gtk_container_add (GTK_CONTAINER (w), GTK_WIDGET (wlbl)); | |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
2721 g_object_unref (G_OBJECT (wlbl)); |
49323 | 2722 wkey = 0; |
2723 } | |
49572 | 2724 |
49323 | 2725 } |
2726 else /* Just a label. */ | |
2727 { | |
2728 wlbl = GTK_LABEL (wchild); | |
2729 | |
2730 /* Check if there is now a key. */ | |
2731 if (utf8_key) | |
2732 { | |
2733 GtkWidget *wtoadd = make_widget_for_menu_item (utf8_label, utf8_key); | |
2734 GList *list = gtk_container_get_children (GTK_CONTAINER (wtoadd)); | |
49572 | 2735 |
49323 | 2736 wlbl = GTK_LABEL (list->data); |
2737 wkey = GTK_LABEL (list->next->data); | |
49572 | 2738 g_list_free (list); |
49323 | 2739 |
2740 gtk_container_remove (GTK_CONTAINER (w), wchild); | |
2741 gtk_container_add (GTK_CONTAINER (w), wtoadd); | |
2742 } | |
2743 } | |
2744 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2745 |
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
|
2746 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
|
2747 if (wlbl) old_label = gtk_label_get_label (wlbl); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2748 |
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
|
2749 if (wkey && utf8_key && (! old_key || strcmp (utf8_key, old_key) != 0)) |
49323 | 2750 gtk_label_set_text (wkey, utf8_key); |
2751 | |
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
|
2752 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
|
2753 gtk_label_set_text (wlbl, utf8_label); |
49323 | 2754 |
109748
e2f8226efb99
Fix -Wwrite_strings in general and for Gtk+ specific code.
Jan D <jan.h.d@swipnet.se>
parents:
109726
diff
changeset
|
2755 if (utf8_key) g_free (utf8_key); |
e2f8226efb99
Fix -Wwrite_strings in general and for Gtk+ specific code.
Jan D <jan.h.d@swipnet.se>
parents:
109726
diff
changeset
|
2756 if (utf8_label) g_free (utf8_label); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2757 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
2758 if (! val->enabled && gtk_widget_get_sensitive (w)) |
49323 | 2759 gtk_widget_set_sensitive (w, FALSE); |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
2760 else if (val->enabled && ! gtk_widget_get_sensitive (w)) |
49323 | 2761 gtk_widget_set_sensitive (w, TRUE); |
2762 | |
2763 cb_data = (xg_menu_item_cb_data*) g_object_get_data (G_OBJECT (w), | |
2764 XG_ITEM_DATA); | |
2765 if (cb_data) | |
2766 { | |
2767 cb_data->call_data = val->call_data; | |
2768 cb_data->help = val->help; | |
2769 cb_data->cl_data = cl_data; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2770 |
49323 | 2771 /* We assume the callback functions don't change. */ |
2772 if (val->call_data && ! val->contents) | |
2773 { | |
2774 /* This item shall have a select callback. */ | |
2775 if (! cb_data->select_id) | |
2776 cb_data->select_id | |
2777 = g_signal_connect (G_OBJECT (w), "activate", | |
2778 select_cb, cb_data); | |
2779 } | |
2780 else if (cb_data->select_id) | |
2781 { | |
2782 g_signal_handler_disconnect (w, cb_data->select_id); | |
2783 cb_data->select_id = 0; | |
2784 } | |
2785 } | |
2786 } | |
2787 | |
2788 /* 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
|
2789 |
49323 | 2790 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2791 xg_update_toggle_item (widget_value *val, GtkWidget *w) |
49323 | 2792 { |
2793 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), val->selected); | |
2794 } | |
2795 | |
2796 /* 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
|
2797 |
49323 | 2798 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2799 xg_update_radio_item (widget_value *val, GtkWidget *w) |
49323 | 2800 { |
2801 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), val->selected); | |
2802 } | |
2803 | |
2804 /* Update the sub menu SUBMENU and all its children so it corresponds to VAL. | |
2805 SUBMENU may be NULL, in that case a new menu is created. | |
2806 F is the frame the menu bar belongs to. | |
2807 VAL describes the contents of the menu bar. | |
2808 SELECT_CB is the callback to use when a menu item is selected. | |
2809 DEACTIVATE_CB is the callback to use when a sub menu is not shown anymore. | |
2810 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2811 CL_DATA is the call back data to use for any newly created items. | |
2812 | |
2813 Returns the updated submenu widget, that is SUBMENU unless SUBMENU | |
2814 was NULL. */ | |
2815 | |
2816 static GtkWidget * | |
109139
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2817 xg_update_submenu (GtkWidget *submenu, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2818 FRAME_PTR f, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2819 widget_value *val, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2820 GCallback select_cb, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2821 GCallback deactivate_cb, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2822 GCallback highlight_cb, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2823 xg_menu_cb_data *cl_data) |
49323 | 2824 { |
2825 GtkWidget *newsub = submenu; | |
2826 GList *list = 0; | |
2827 GList *iter; | |
2828 widget_value *cur; | |
2829 int has_tearoff_p = 0; | |
2830 GList *first_radio = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2831 |
49323 | 2832 if (submenu) |
2833 list = gtk_container_get_children (GTK_CONTAINER (submenu)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2834 |
49323 | 2835 for (cur = val, iter = list; |
2836 cur && iter; | |
2837 iter = g_list_next (iter), cur = cur->next) | |
2838 { | |
2839 GtkWidget *w = GTK_WIDGET (iter->data); | |
2840 | |
2841 /* Skip tearoff items, they have no counterpart in val. */ | |
2842 if (GTK_IS_TEAROFF_MENU_ITEM (w)) | |
2843 { | |
2844 has_tearoff_p = 1; | |
2845 iter = g_list_next (iter); | |
2846 if (iter) w = GTK_WIDGET (iter->data); | |
2847 else break; | |
2848 } | |
2849 | |
2850 /* Remember first radio button in a group. If we get a mismatch in | |
2851 a radio group we must rebuild the whole group so that the connections | |
2852 in GTK becomes correct. */ | |
2853 if (cur->button_type == BUTTON_TYPE_RADIO && ! first_radio) | |
2854 first_radio = iter; | |
2855 else if (cur->button_type != BUTTON_TYPE_RADIO | |
2856 && ! GTK_IS_RADIO_MENU_ITEM (w)) | |
2857 first_radio = 0; | |
2858 | |
2859 if (GTK_IS_SEPARATOR_MENU_ITEM (w)) | |
2860 { | |
111991
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
2861 if (! menu_separator_name_p (cur->name)) |
49323 | 2862 break; |
2863 } | |
2864 else if (GTK_IS_CHECK_MENU_ITEM (w)) | |
2865 { | |
2866 if (cur->button_type != BUTTON_TYPE_TOGGLE) | |
2867 break; | |
2868 xg_update_toggle_item (cur, w); | |
2869 xg_update_menu_item (cur, w, select_cb, highlight_cb, cl_data); | |
2870 } | |
2871 else if (GTK_IS_RADIO_MENU_ITEM (w)) | |
2872 { | |
2873 if (cur->button_type != BUTTON_TYPE_RADIO) | |
2874 break; | |
2875 xg_update_radio_item (cur, w); | |
2876 xg_update_menu_item (cur, w, select_cb, highlight_cb, cl_data); | |
2877 } | |
2878 else if (GTK_IS_MENU_ITEM (w)) | |
2879 { | |
2880 GtkMenuItem *witem = GTK_MENU_ITEM (w); | |
2881 GtkWidget *sub; | |
2882 | |
2883 if (cur->button_type != BUTTON_TYPE_NONE || | |
111991
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
2884 menu_separator_name_p (cur->name)) |
49323 | 2885 break; |
2886 | |
2887 xg_update_menu_item (cur, w, select_cb, highlight_cb, cl_data); | |
2888 | |
2889 sub = gtk_menu_item_get_submenu (witem); | |
2890 if (sub && ! cur->contents) | |
2891 { | |
2892 /* Not a submenu anymore. */ | |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
2893 g_object_ref (G_OBJECT (sub)); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
2894 remove_submenu (witem); |
49323 | 2895 gtk_widget_destroy (sub); |
2896 } | |
2897 else if (cur->contents) | |
2898 { | |
2899 GtkWidget *nsub; | |
2900 | |
2901 nsub = xg_update_submenu (sub, f, cur->contents, | |
2902 select_cb, deactivate_cb, | |
2903 highlight_cb, cl_data); | |
2904 | |
2905 /* If this item just became a submenu, we must set it. */ | |
2906 if (nsub != sub) | |
2907 gtk_menu_item_set_submenu (witem, nsub); | |
2908 } | |
2909 } | |
2910 else | |
2911 { | |
2912 /* Structural difference. Remove everything from here and down | |
2913 in SUBMENU. */ | |
2914 break; | |
2915 } | |
2916 } | |
2917 | |
2918 /* Remove widgets from first structual change. */ | |
2919 if (iter) | |
2920 { | |
2921 /* If we are adding new menu items below, we must remove from | |
2922 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
|
2923 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
|
2924 else xg_destroy_widgets (iter); |
49323 | 2925 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2926 |
49323 | 2927 if (cur) |
2928 { | |
2929 /* More items added. Create them. */ | |
2930 newsub = create_menus (cur, | |
2931 f, | |
2932 select_cb, | |
2933 deactivate_cb, | |
2934 highlight_cb, | |
2935 0, | |
2936 0, | |
2937 ! has_tearoff_p, | |
2938 submenu, | |
2939 cl_data, | |
2940 0); | |
2941 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2942 |
49572 | 2943 if (list) g_list_free (list); |
2944 | |
49323 | 2945 return newsub; |
2946 } | |
2947 | |
2948 /* Update the MENUBAR. | |
2949 F is the frame the menu bar belongs to. | |
2950 VAL describes the contents of the menu bar. | |
2951 If DEEP_P is non-zero, rebuild all but the top level menu names in | |
2952 the MENUBAR. If DEEP_P is zero, just rebuild the names in the menubar. | |
2953 SELECT_CB is the callback to use when a menu item is selected. | |
2954 DEACTIVATE_CB is the callback to use when a sub menu is not shown anymore. | |
2955 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
|
2956 |
49323 | 2957 void |
109364
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109141
diff
changeset
|
2958 xg_modify_menubar_widgets (GtkWidget *menubar, FRAME_PTR f, widget_value *val, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109141
diff
changeset
|
2959 int deep_p, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109141
diff
changeset
|
2960 GCallback select_cb, GCallback deactivate_cb, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109141
diff
changeset
|
2961 GCallback highlight_cb) |
49323 | 2962 { |
2963 xg_menu_cb_data *cl_data; | |
2964 GList *list = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2965 | |
2966 if (! list) return; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2967 |
49323 | 2968 cl_data = (xg_menu_cb_data*) g_object_get_data (G_OBJECT (menubar), |
2969 XG_FRAME_DATA); | |
2970 | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2971 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
|
2972 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
|
2973 |
64783
0975467abc17
* gtkutil.c (xg_modify_menubar_widgets): Remove semicolon that
Jan Djärv <jan.h.d@swipnet.se>
parents:
64770
diff
changeset
|
2974 if (deep_p) |
49323 | 2975 { |
2976 widget_value *cur; | |
2977 | |
2978 /* 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
|
2979 We must keep the submenus (GTK menu item widgets) since the |
49323 | 2980 X Window in the XEvent that activates the menu are those widgets. */ |
2981 | |
2982 /* Update cl_data, menu_item things in F may have changed. */ | |
2983 update_cl_data (cl_data, f, highlight_cb); | |
2984 | |
2985 for (cur = val->contents; cur; cur = cur->next) | |
2986 { | |
49572 | 2987 GList *iter; |
49323 | 2988 GtkWidget *sub = 0; |
2989 GtkWidget *newsub; | |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2990 GtkMenuItem *witem = 0; |
49323 | 2991 |
2992 /* Find sub menu that corresponds to val and update it. */ | |
2993 for (iter = list ; iter; iter = g_list_next (iter)) | |
2994 { | |
2995 witem = GTK_MENU_ITEM (iter->data); | |
2996 if (xg_item_label_same_p (witem, cur->name)) | |
2997 { | |
2998 sub = gtk_menu_item_get_submenu (witem); | |
2999 break; | |
3000 } | |
3001 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3002 |
49323 | 3003 newsub = xg_update_submenu (sub, |
3004 f, | |
3005 cur->contents, | |
3006 select_cb, | |
3007 deactivate_cb, | |
3008 highlight_cb, | |
3009 cl_data); | |
3010 /* sub may still be NULL. If we just updated non deep and added | |
3011 a new menu bar item, it has no sub menu yet. So we set the | |
3012 newly created sub menu under witem. */ | |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3013 if (newsub != sub && witem != 0) |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3014 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3015 xg_set_screen (newsub, f); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3016 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
|
3017 } |
49323 | 3018 } |
3019 } | |
3020 | |
49572 | 3021 g_list_free (list); |
49323 | 3022 gtk_widget_show_all (menubar); |
3023 } | |
3024 | |
111746 | 3025 /* Callback called when the menu bar W is mapped. |
3026 Used to find the height of the menu bar if we didn't get it | |
3027 after showing the widget. */ | |
3028 | |
3029 static void | |
3030 menubar_map_cb (GtkWidget *w, gpointer user_data) | |
3031 { | |
3032 GtkRequisition req; | |
3033 FRAME_PTR f = (FRAME_PTR) user_data; | |
3034 gtk_widget_size_request (w, &req); | |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
3035 if (FRAME_MENUBAR_HEIGHT (f) != req.height) |
111746 | 3036 { |
3037 FRAME_MENUBAR_HEIGHT (f) = req.height; | |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
3038 xg_height_or_width_changed (f); |
111746 | 3039 } |
3040 } | |
3041 | |
49323 | 3042 /* Recompute all the widgets of frame F, when the menu bar has been |
3043 changed. Value is non-zero if widgets were updated. */ | |
3044 | |
3045 int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3046 xg_update_frame_menubar (FRAME_PTR f) |
49323 | 3047 { |
3048 struct x_output *x = f->output_data.x; | |
3049 GtkRequisition req; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3050 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3051 if (!x->menubar_widget || gtk_widget_get_mapped (x->menubar_widget)) |
49323 | 3052 return 0; |
3053 | |
106012
fae53e3bfda0
gtkutil.c (xg_update_frame_menubar): Do nothing if menubar already has a parent.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105959
diff
changeset
|
3054 if (x->menubar_widget && gtk_widget_get_parent (x->menubar_widget)) |
fae53e3bfda0
gtkutil.c (xg_update_frame_menubar): Do nothing if menubar already has a parent.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105959
diff
changeset
|
3055 return 0; /* Already done this, happens for frames created invisible. */ |
fae53e3bfda0
gtkutil.c (xg_update_frame_menubar): Do nothing if menubar already has a parent.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105959
diff
changeset
|
3056 |
49323 | 3057 BLOCK_INPUT; |
3058 | |
3059 gtk_box_pack_start (GTK_BOX (x->vbox_widget), x->menubar_widget, | |
3060 FALSE, FALSE, 0); | |
3061 gtk_box_reorder_child (GTK_BOX (x->vbox_widget), x->menubar_widget, 0); | |
3062 | |
111746 | 3063 g_signal_connect (x->menubar_widget, "map", G_CALLBACK (menubar_map_cb), f); |
49323 | 3064 gtk_widget_show_all (x->menubar_widget); |
3065 gtk_widget_size_request (x->menubar_widget, &req); | |
111779 | 3066 |
111746 | 3067 /* If menu bar doesn't know its height yet, cheat a little so the frame |
3068 doesn't jump so much when resized later in menubar_map_cb. */ | |
3069 if (req.height == 0) | |
3070 req.height = 23; | |
3071 | |
3072 if (FRAME_MENUBAR_HEIGHT (f) != req.height) | |
3073 { | |
3074 FRAME_MENUBAR_HEIGHT (f) = req.height; | |
111779 | 3075 xg_height_or_width_changed (f); |
111746 | 3076 } |
49323 | 3077 UNBLOCK_INPUT; |
50106
5675d6a0080c
(xg_update_frame_menubar): Add missing return value.
Andreas Schwab <schwab@suse.de>
parents:
50099
diff
changeset
|
3078 |
5675d6a0080c
(xg_update_frame_menubar): Add missing return value.
Andreas Schwab <schwab@suse.de>
parents:
50099
diff
changeset
|
3079 return 1; |
49323 | 3080 } |
3081 | |
3082 /* Get rid of the menu bar of frame F, and free its storage. | |
3083 This is used when deleting a frame, and when turning off the menu bar. */ | |
3084 | |
3085 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3086 free_frame_menubar (FRAME_PTR f) |
49323 | 3087 { |
3088 struct x_output *x = f->output_data.x; | |
3089 | |
3090 if (x->menubar_widget) | |
3091 { | |
3092 BLOCK_INPUT; | |
3093 | |
3094 gtk_container_remove (GTK_CONTAINER (x->vbox_widget), x->menubar_widget); | |
3095 /* The menubar and its children shall be deleted when removed from | |
3096 the container. */ | |
3097 x->menubar_widget = 0; | |
3098 FRAME_MENUBAR_HEIGHT (f) = 0; | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3099 xg_height_or_width_changed (f); |
49323 | 3100 UNBLOCK_INPUT; |
3101 } | |
3102 } | |
3103 | |
109327
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3104 int |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3105 xg_event_is_for_menubar (FRAME_PTR f, XEvent *event) |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3106 { |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3107 struct x_output *x = f->output_data.x; |
109332
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3108 GList *iter; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3109 GdkRectangle rec; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3110 GList *list; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3111 GdkDisplay *gdpy; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3112 GdkWindow *gw; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3113 GdkEvent gevent; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3114 GtkWidget *gwdesc; |
109327
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3115 |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3116 if (! x->menubar_widget) return 0; |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3117 |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3118 if (! (event->xbutton.x >= 0 |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3119 && event->xbutton.x < FRAME_PIXEL_WIDTH (f) |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3120 && event->xbutton.y >= 0 |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3121 && event->xbutton.y < f->output_data.x->menubar_height |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3122 && event->xbutton.same_screen)) |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3123 return 0; |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3124 |
109332
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3125 gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f)); |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3126 gw = gdk_xid_table_lookup_for_display (gdpy, event->xbutton.window); |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3127 if (! gw) return 0; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3128 gevent.any.window = gw; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3129 gwdesc = gtk_get_event_widget (&gevent); |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3130 if (! gwdesc) return 0; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3131 if (! GTK_IS_MENU_BAR (gwdesc) |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3132 && ! GTK_IS_MENU_ITEM (gwdesc) |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3133 && ! gtk_widget_is_ancestor (x->menubar_widget, gwdesc)) |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3134 return 0; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3135 |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3136 list = gtk_container_get_children (GTK_CONTAINER (x->menubar_widget)); |
109327
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3137 if (! list) return 0; |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3138 rec.x = event->xbutton.x; |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3139 rec.y = event->xbutton.y; |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3140 rec.width = 1; |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3141 rec.height = 1; |
109332
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3142 |
109327
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3143 for (iter = list ; iter; iter = g_list_next (iter)) |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3144 { |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3145 GtkWidget *w = GTK_WIDGET (iter->data); |
109454
514fed5c0ded
* gtkutil.c (xg_frame_resized): GTK_IS_MAPPED => gtk_widget_get_mapped, for Gtk 3.0
Jan D <jan.h.d@swipnet.se>
parents:
109452
diff
changeset
|
3146 if (gtk_widget_get_mapped (w) && gtk_widget_intersect (w, &rec, NULL)) |
109327
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3147 break; |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3148 } |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3149 g_list_free (list); |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3150 return iter == 0 ? 0 : 1; |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3151 } |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3152 |
49323 | 3153 |
3154 | |
3155 /*********************************************************************** | |
3156 Scroll bar functions | |
3157 ***********************************************************************/ | |
3158 | |
3159 | |
3160 /* Setting scroll bar values invokes the callback. Use this variable | |
3161 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
|
3162 |
49323 | 3163 int xg_ignore_gtk_scrollbar; |
3164 | |
86161
3408ab8b4152
* xterm.h (struct scroll_bar): Only use Lisp_Object for lisp data.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85938
diff
changeset
|
3165 /* 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
|
3166 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
|
3167 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
|
3168 |
49323 | 3169 static struct |
3170 { | |
3171 GtkWidget **widgets; | |
3172 int max_size; | |
3173 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
|
3174 } id_to_widget; |
49323 | 3175 |
3176 /* 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
|
3177 |
49323 | 3178 #define ID_TO_WIDGET_INCR 32 |
3179 | |
3180 /* 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
|
3181 |
49323 | 3182 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3183 xg_store_widget_in_map (GtkWidget *w) |
49323 | 3184 { |
3185 int i; | |
3186 | |
3187 if (id_to_widget.max_size == id_to_widget.used) | |
3188 { | |
3189 int new_size = id_to_widget.max_size + ID_TO_WIDGET_INCR; | |
3190 | |
3191 id_to_widget.widgets = xrealloc (id_to_widget.widgets, | |
3192 sizeof (GtkWidget *)*new_size); | |
3193 | |
3194 for (i = id_to_widget.max_size; i < new_size; ++i) | |
3195 id_to_widget.widgets[i] = 0; | |
3196 id_to_widget.max_size = new_size; | |
3197 } | |
3198 | |
3199 /* Just loop over the array and find a free place. After all, | |
3200 how many scroll bars are we creating? Should be a small number. | |
3201 The check above guarantees we will find a free place. */ | |
3202 for (i = 0; i < id_to_widget.max_size; ++i) | |
3203 { | |
3204 if (! id_to_widget.widgets[i]) | |
3205 { | |
3206 id_to_widget.widgets[i] = w; | |
3207 ++id_to_widget.used; | |
3208 | |
3209 return i; | |
3210 } | |
3211 } | |
3212 | |
3213 /* Should never end up here */ | |
3214 abort (); | |
3215 } | |
3216 | |
3217 /* Remove pointer at IDX from id_to_widget. | |
3218 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
|
3219 |
49323 | 3220 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3221 xg_remove_widget_from_map (int idx) |
49323 | 3222 { |
3223 if (idx < id_to_widget.max_size && id_to_widget.widgets[idx] != 0) | |
3224 { | |
3225 id_to_widget.widgets[idx] = 0; | |
3226 --id_to_widget.used; | |
3227 } | |
3228 } | |
3229 | |
3230 /* 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
|
3231 |
49323 | 3232 static GtkWidget * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3233 xg_get_widget_from_map (int idx) |
49323 | 3234 { |
3235 if (idx < id_to_widget.max_size && id_to_widget.widgets[idx] != 0) | |
3236 return id_to_widget.widgets[idx]; | |
3237 | |
3238 return 0; | |
3239 } | |
3240 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3241 /* Return the scrollbar id for X Window WID on display DPY. |
50063 | 3242 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
|
3243 |
50063 | 3244 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3245 xg_get_scroll_id_for_window (Display *dpy, Window wid) |
50063 | 3246 { |
3247 int idx; | |
3248 GtkWidget *w; | |
3249 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3250 w = xg_win_to_widget (dpy, wid); |
50063 | 3251 |
3252 if (w) | |
3253 { | |
3254 for (idx = 0; idx < id_to_widget.max_size; ++idx) | |
3255 if (id_to_widget.widgets[idx] == w) | |
3256 return idx; | |
3257 } | |
3258 | |
3259 return -1; | |
3260 } | |
3261 | |
49323 | 3262 /* Callback invoked when scroll bar WIDGET is destroyed. |
3263 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
|
3264 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
|
3265 |
49323 | 3266 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3267 xg_gtk_scroll_destroy (GtkWidget *widget, gpointer data) |
49323 | 3268 { |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3269 int id = (int) (EMACS_INT) data; /* The EMACS_INT cast avoids a warning. */ |
49323 | 3270 xg_remove_widget_from_map (id); |
3271 } | |
3272 | |
3273 /* Create a scroll bar widget for frame F. Store the scroll bar | |
3274 in BAR. | |
3275 SCROLL_CALLBACK is the callback to invoke when the value of the | |
3276 bar changes. | |
106559
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3277 END_CALLBACK is the callback to invoke when scrolling ends. |
49323 | 3278 SCROLL_BAR_NAME is the name we use for the scroll bar. Can be used |
3279 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
|
3280 |
49323 | 3281 void |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3282 xg_create_scroll_bar (FRAME_PTR f, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3283 struct scroll_bar *bar, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3284 GCallback scroll_callback, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3285 GCallback end_callback, |
109717
8949aad5e992
Use const char* instead of char*.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109668
diff
changeset
|
3286 const char *scroll_bar_name) |
49323 | 3287 { |
3288 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
|
3289 GtkWidget *webox; |
49323 | 3290 GtkObject *vadj; |
3291 int scroll_id; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3292 |
49323 | 3293 /* Page, step increment values are not so important here, they |
3294 will be corrected in x_set_toolkit_scroll_bar_thumb. */ | |
3295 vadj = gtk_adjustment_new (XG_SB_MIN, XG_SB_MIN, XG_SB_MAX, | |
3296 0.1, 0.1, 0.1); | |
3297 | |
3298 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
|
3299 webox = gtk_event_box_new (); |
49323 | 3300 gtk_widget_set_name (wscroll, scroll_bar_name); |
3301 gtk_range_set_update_policy (GTK_RANGE (wscroll), GTK_UPDATE_CONTINUOUS); | |
106559
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3302 g_object_set_data (G_OBJECT (wscroll), XG_FRAME_DATA, (gpointer)f); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3303 |
49323 | 3304 scroll_id = xg_store_widget_in_map (wscroll); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3305 |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3306 /* The EMACS_INT cast avoids a warning. */ |
49323 | 3307 g_signal_connect (G_OBJECT (wscroll), |
3308 "destroy", | |
3309 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
|
3310 (gpointer) (EMACS_INT) scroll_id); |
106559
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3311 g_signal_connect (G_OBJECT (wscroll), |
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3312 "change-value", |
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3313 scroll_callback, |
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3314 (gpointer) bar); |
106549
3acd32c3e0ac
gtkutil.c: Scroll bar thumb not updated properly (bug #5177).
Jan Djärv <jan.h.d@swipnet.se>
parents:
106512
diff
changeset
|
3315 g_signal_connect (G_OBJECT (wscroll), |
3acd32c3e0ac
gtkutil.c: Scroll bar thumb not updated properly (bug #5177).
Jan Djärv <jan.h.d@swipnet.se>
parents:
106512
diff
changeset
|
3316 "button-release-event", |
106559
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3317 end_callback, |
106549
3acd32c3e0ac
gtkutil.c: Scroll bar thumb not updated properly (bug #5177).
Jan Djärv <jan.h.d@swipnet.se>
parents:
106512
diff
changeset
|
3318 (gpointer) bar); |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
3319 |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3320 /* 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
|
3321 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
|
3322 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
|
3323 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
|
3324 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
|
3325 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
|
3326 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
|
3327 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
|
3328 |
49323 | 3329 |
3330 /* 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
|
3331 xg_set_cursor (webox, FRAME_X_DISPLAY_INFO (f)->xg_cursor); |
49323 | 3332 |
86161
3408ab8b4152
* xterm.h (struct scroll_bar): Only use Lisp_Object for lisp data.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85938
diff
changeset
|
3333 bar->x_window = scroll_id; |
49323 | 3334 } |
3335 | |
3336 /* 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
|
3337 |
49323 | 3338 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3339 xg_remove_scroll_bar (FRAME_PTR f, int scrollbar_id) |
49323 | 3340 { |
3341 GtkWidget *w = xg_get_widget_from_map (scrollbar_id); | |
3342 if (w) | |
3343 { | |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3344 GtkWidget *wparent = gtk_widget_get_parent (w); |
49323 | 3345 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
|
3346 gtk_widget_destroy (wparent); |
49323 | 3347 SET_FRAME_GARBAGED (f); |
3348 } | |
3349 } | |
3350 | |
3351 /* Update the position of the vertical scroll bar represented by SCROLLBAR_ID | |
3352 in frame F. | |
3353 TOP/LEFT are the new pixel positions where the bar shall appear. | |
3354 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
|
3355 |
49323 | 3356 void |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3357 xg_update_scrollbar_pos (FRAME_PTR f, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3358 int scrollbar_id, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3359 int top, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3360 int left, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3361 int width, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3362 int height) |
49323 | 3363 { |
49572 | 3364 |
3365 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
|
3366 |
49572 | 3367 if (wscroll) |
3368 { | |
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
|
3369 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
|
3370 GtkWidget *wparent = gtk_widget_get_parent (wscroll); |
109040
98796fa1a7f8
src/gtkutil.c (xg_update_scrollbar_pos): Avoid C99 mid-block variable declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
109037
diff
changeset
|
3371 gint msl; |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3372 |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3373 /* Clear out old position. */ |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3374 int oldx = -1, oldy = -1, oldw, oldh; |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3375 if (gtk_widget_get_parent (wparent) == wfixed) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3376 { |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3377 gtk_container_child_get (GTK_CONTAINER (wfixed), wparent, |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3378 "x", &oldx, "y", &oldy, NULL); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3379 gtk_widget_get_size_request (wscroll, &oldw, &oldh); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3380 } |
55342
44d086f5e08a
* gtkutil.c (xg_update_scrollbar_pos): Call XClearWindow to clear
Jan Djärv <jan.h.d@swipnet.se>
parents:
53275
diff
changeset
|
3381 |
44d086f5e08a
* gtkutil.c (xg_update_scrollbar_pos): Call XClearWindow to clear
Jan Djärv <jan.h.d@swipnet.se>
parents:
53275
diff
changeset
|
3382 /* 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
|
3383 gtk_fixed_move (GTK_FIXED (wfixed), wparent, left, top); |
109037
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3384 gtk_widget_style_get (wscroll, "min-slider-length", &msl, NULL); |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3385 if (msl > height) |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3386 { |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3387 /* No room. Hide scroll bar as some themes output a warning if |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3388 the height is less than the min size. */ |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3389 gtk_widget_hide (wparent); |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3390 gtk_widget_hide (wscroll); |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3391 } |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3392 else |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3393 { |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3394 gtk_widget_show_all (wparent); |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3395 gtk_widget_set_size_request (wscroll, width, height); |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3396 } |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3397 gtk_widget_queue_draw (wfixed); |
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
|
3398 gdk_window_process_all_updates (); |
109037
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3399 if (oldx != -1 && oldw > 0 && oldh > 0) |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3400 { |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3401 /* Clear under old scroll bar position. This must be done after |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3402 the gtk_widget_queue_draw and gdk_window_process_all_updates |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3403 above. */ |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3404 x_clear_area (FRAME_X_DISPLAY (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3405 FRAME_X_WINDOW (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3406 oldx, oldy, oldw, oldh, 0); |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3407 } |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
3408 |
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
|
3409 /* 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
|
3410 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
|
3411 here to get some events. */ |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
3412 |
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
|
3413 x_sync (f); |
49572 | 3414 SET_FRAME_GARBAGED (f); |
3415 cancel_mouse_face (f); | |
3416 } | |
49323 | 3417 } |
3418 | |
3419 /* Set the thumb size and position of scroll bar BAR. We are currently | |
3420 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
|
3421 |
49323 | 3422 void |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3423 xg_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3424 int portion, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3425 int position, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3426 int whole) |
49323 | 3427 { |
86161
3408ab8b4152
* xterm.h (struct scroll_bar): Only use Lisp_Object for lisp data.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85938
diff
changeset
|
3428 GtkWidget *wscroll = xg_get_widget_from_map (bar->x_window); |
49323 | 3429 |
3430 FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window))); | |
3431 | |
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
|
3432 if (wscroll && NILP (bar->dragging)) |
49323 | 3433 { |
3434 GtkAdjustment *adj; | |
3435 gdouble shown; | |
3436 gdouble top; | |
3437 int size, value; | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3438 int new_step; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3439 int changed = 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3440 |
49323 | 3441 adj = gtk_range_get_adjustment (GTK_RANGE (wscroll)); |
3442 | |
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
|
3443 /* 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
|
3444 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
|
3445 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
|
3446 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
|
3447 /* 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
|
3448 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
|
3449 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
|
3450 |
49323 | 3451 if (whole <= 0) |
3452 top = 0, shown = 1; | |
3453 else | |
3454 { | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3455 top = (gdouble) position / whole; |
49323 | 3456 shown = (gdouble) portion / whole; |
3457 } | |
3458 | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3459 size = shown * XG_SB_RANGE; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3460 size = min (size, XG_SB_RANGE); |
49323 | 3461 size = max (size, 1); |
3462 | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3463 value = top * XG_SB_RANGE; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3464 value = min (value, XG_SB_MAX - size); |
49323 | 3465 value = max (value, XG_SB_MIN); |
3466 | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3467 /* 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
|
3468 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
|
3469 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3470 if ((int) gtk_adjustment_get_page_size (adj) != size |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3471 || (int) gtk_adjustment_get_step_increment (adj) != 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
|
3472 { |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3473 gtk_adjustment_set_page_size (adj, size); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3474 gtk_adjustment_set_step_increment (adj, 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
|
3475 /* Assume a page increment is about 95% of the page size */ |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3476 gtk_adjustment_set_page_increment (adj,(int) (0.95*size)); |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3477 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
|
3478 } |
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
|
3479 |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3480 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
|
3481 { |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3482 BLOCK_INPUT; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3483 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3484 /* 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
|
3485 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
|
3486 xg_ignore_gtk_scrollbar = 1; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3487 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3488 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
|
3489 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
|
3490 else if (changed) |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3491 gtk_adjustment_changed (adj); |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3492 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3493 xg_ignore_gtk_scrollbar = 0; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3494 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3495 UNBLOCK_INPUT; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3496 } |
49323 | 3497 } |
3498 } | |
3499 | |
105880
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3500 /* Return non-zero if EVENT is for a scroll bar in frame F. |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3501 When the same X window is used for several Gtk+ widgets, we cannot |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3502 say for sure based on the X window alone if an event is for the |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3503 frame. This function does additional checks. |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3504 |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3505 Return non-zero if the event is for a scroll bar, zero otherwise. */ |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3506 |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3507 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3508 xg_event_is_for_scrollbar (FRAME_PTR f, XEvent *event) |
105880
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3509 { |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3510 int retval = 0; |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3511 |
106559
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3512 if (f && event->type == ButtonPress && event->xbutton.button < 4) |
105880
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3513 { |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3514 /* Check if press occurred outside the edit widget. */ |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3515 GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f)); |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3516 retval = gdk_display_get_window_at_pointer (gdpy, NULL, NULL) |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3517 != gtk_widget_get_window (f->output_data.x->edit_widget); |
105880
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3518 } |
106559
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3519 else if (f |
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3520 && ((event->type == ButtonRelease && event->xbutton.button < 4) |
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3521 || event->type == MotionNotify)) |
105880
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3522 { |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3523 /* If we are releasing or moving the scroll bar, it has the grab. */ |
107997
d94009e7a0cc
gtkutils.c (xg_event_is_for_scrollbar): Check if grabbed widget is a scrollbar.
Jan D. <jan.h.d@swipnet.se>
parents:
107891
diff
changeset
|
3524 GtkWidget *w = gtk_grab_get_current (); |
d94009e7a0cc
gtkutils.c (xg_event_is_for_scrollbar): Check if grabbed widget is a scrollbar.
Jan D. <jan.h.d@swipnet.se>
parents:
107891
diff
changeset
|
3525 retval = w != 0 && GTK_IS_SCROLLBAR (w); |
105880
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3526 } |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
3527 |
105880
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3528 return retval; |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3529 } |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3530 |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3531 |
49323 | 3532 |
3533 /*********************************************************************** | |
3534 Tool bar functions | |
3535 ***********************************************************************/ | |
3536 /* The key for the data we put in the GtkImage widgets. The data is | |
3537 the image used by Emacs. We use this to see if we need to update | |
3538 the GtkImage with a new image. */ | |
3539 #define XG_TOOL_BAR_IMAGE_DATA "emacs-tool-bar-image" | |
3540 | |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3541 /* 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
|
3542 get them. */ |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3543 #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
|
3544 |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3545 /* 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
|
3546 #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
|
3547 |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3548 /* 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
|
3549 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
|
3550 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
|
3551 #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
|
3552 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3553 /* 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
|
3554 stock items. */ |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3555 #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
|
3556 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3557 /* 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
|
3558 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
|
3559 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
|
3560 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
|
3561 |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3562 static gboolean |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3563 xg_tool_bar_button_cb (GtkWidget *widget, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3564 GdkEventButton *event, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3565 gpointer user_data) |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3566 { |
73389
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
3567 /* 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
|
3568 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
|
3569 g_object_set_data (G_OBJECT (widget), XG_TOOL_BAR_LAST_MODIFIER, ptr); |
68922 | 3570 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
|
3571 } |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3572 |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3573 |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3574 /* 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
|
3575 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
|
3576 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
|
3577 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
|
3578 |
49323 | 3579 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3580 xg_tool_bar_callback (GtkWidget *w, gpointer client_data) |
49323 | 3581 { |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3582 /* 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
|
3583 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
|
3584 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
|
3585 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
|
3586 |
49323 | 3587 FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA); |
3588 Lisp_Object key, frame; | |
3589 struct input_event event; | |
51569
e7bd8581e306
(xg_tool_bar_callback): Don't pass uninitialized
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51432
diff
changeset
|
3590 EVENT_INIT (event); |
49323 | 3591 |
3592 if (! f || ! f->n_tool_bar_items || NILP (f->tool_bar_items)) | |
3593 return; | |
3594 | |
3595 idx *= TOOL_BAR_ITEM_NSLOTS; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3596 |
49323 | 3597 key = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_KEY); |
3598 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
|
3599 |
2fcf45c12927
(update_frame_tool_bar): Use -1 as index
Jan Djärv <jan.h.d@swipnet.se>
parents:
78260
diff
changeset
|
3600 /* 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
|
3601 to `(tool_bar)', see keyboard.c. */ |
49323 | 3602 event.kind = TOOL_BAR_EVENT; |
3603 event.frame_or_window = frame; | |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3604 event.arg = frame; |
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3605 kbd_buffer_store_event (&event); |
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3606 |
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3607 event.kind = TOOL_BAR_EVENT; |
49323 | 3608 event.frame_or_window = frame; |
3609 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
|
3610 /* 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
|
3611 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
|
3612 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
|
3613 event.modifiers = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f), mod); |
49323 | 3614 kbd_buffer_store_event (&event); |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
3615 |
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
|
3616 /* 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
|
3617 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
|
3618 Fx_focus_frame (frame); |
49323 | 3619 } |
3620 | |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3621 /* 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
|
3622 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
|
3623 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
|
3624 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
|
3625 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
|
3626 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
|
3627 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3628 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3629 xg_tool_bar_proxy_callback (GtkWidget *w, gpointer client_data) |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3630 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3631 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
|
3632 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
|
3633 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
|
3634 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3635 |
103673
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3636 |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3637 static gboolean |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109067
diff
changeset
|
3638 xg_tool_bar_help_callback (GtkWidget *w, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109067
diff
changeset
|
3639 GdkEventCrossing *event, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109067
diff
changeset
|
3640 gpointer client_data); |
103673
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3641 |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3642 /* 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
|
3643 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
|
3644 |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3645 static gboolean |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3646 xg_tool_bar_proxy_help_callback (GtkWidget *w, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3647 GdkEventCrossing *event, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3648 gpointer client_data) |
103673
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3649 { |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3650 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
|
3651 XG_TOOL_BAR_PROXY_BUTTON)); |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
3652 |
106512
471e6932ea09
(xg_tool_bar_proxy_help_callback): Fix missing return.
Andreas Schwab <schwab@linux-m68k.org>
parents:
106186
diff
changeset
|
3653 return xg_tool_bar_help_callback (wbutton, event, client_data); |
103673
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3654 } |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3655 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3656 static GtkWidget * |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3657 xg_get_tool_bar_widgets (GtkWidget *vb, GtkWidget **wimage) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3658 { |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3659 GList *clist = gtk_container_get_children (GTK_CONTAINER (vb)); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3660 GtkWidget *c1 = (GtkWidget *) clist->data; |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
3661 GtkWidget *c2 = clist->next ? (GtkWidget *) clist->next->data : NULL; |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
3662 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3663 *wimage = GTK_IS_IMAGE (c1) ? c1 : c2; |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3664 g_list_free (clist); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3665 return GTK_IS_LABEL (c1) ? c1 : c2; |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3666 } |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3667 |
103673
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3668 |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3669 /* 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
|
3670 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
|
3671 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
|
3672 blank. */ |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3673 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3674 static gboolean |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3675 xg_tool_bar_menu_proxy (GtkToolItem *toolitem, gpointer 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
|
3676 { |
111991
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
3677 GtkButton *wbutton = GTK_BUTTON (XG_BIN_CHILD (XG_BIN_CHILD (toolitem))); |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
3678 GtkWidget *vb = XG_BIN_CHILD (wbutton); |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3679 GtkWidget *c1; |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3680 GtkLabel *wlbl = GTK_LABEL (xg_get_tool_bar_widgets (vb, &c1)); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3681 GtkImage *wimage = GTK_IMAGE (c1); |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3682 GtkWidget *wmenuitem = gtk_image_menu_item_new_with_label |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3683 (gtk_label_get_text (wlbl)); |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3684 GtkWidget *wmenuimage; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3685 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3686 |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3687 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
|
3688 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
|
3689 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
|
3690 else |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3691 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3692 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
|
3693 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
|
3694 |
110521
1cdff3b101d6
Make sure detached tool bar menu isn't blank.
Jan D <jan.h.d@swipnet.se>
parents:
109332
diff
changeset
|
3695 g_object_set (G_OBJECT (settings), "gtk-menu-images", TRUE, NULL); |
1cdff3b101d6
Make sure detached tool bar menu isn't blank.
Jan D <jan.h.d@swipnet.se>
parents:
109332
diff
changeset
|
3696 |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3697 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
|
3698 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3699 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
|
3700 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
|
3701 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
|
3702 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3703 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
|
3704 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3705 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
|
3706 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
|
3707 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
|
3708 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
|
3709 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3710 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
|
3711 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3712 gint width, height; |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3713 |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3714 if (settings && |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3715 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
|
3716 &width, &height)) |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3717 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3718 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
|
3719 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3720 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
|
3721 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
|
3722 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
|
3723 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3724 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
|
3725 } |
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
|
3726 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
|
3727 { |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3728 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
|
3729 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
|
3730 } |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3731 } |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3732 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
|
3733 { |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3734 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
|
3735 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
|
3736 |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3737 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
|
3738 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
|
3739 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
|
3740 } |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3741 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
|
3742 { |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3743 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
|
3744 abort (); |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3745 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3746 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3747 if (wmenuimage) |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3748 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
|
3749 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3750 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
|
3751 "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
|
3752 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
|
3753 user_data); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3754 |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
3755 |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3756 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
|
3757 (gpointer) wbutton); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3758 gtk_tool_item_set_proxy_menu_item (toolitem, "Emacs toolbar item", wmenuitem); |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3759 gtk_widget_set_sensitive (wmenuitem, |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3760 gtk_widget_get_sensitive (GTK_WIDGET (wbutton))); |
103673
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3761 |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3762 /* 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
|
3763 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
|
3764 "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
|
3765 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
|
3766 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
|
3767 "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
|
3768 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
|
3769 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
|
3770 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
|
3771 "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
|
3772 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
|
3773 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
|
3774 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3775 return TRUE; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3776 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3777 |
49323 | 3778 /* This callback is called when a tool bar is detached. We must set |
3779 the height of the tool bar to zero when this happens so frame sizes | |
3780 are correctly calculated. | |
3781 WBOX is the handle box widget that enables detach/attach of the tool bar. | |
3782 W is the tool bar widget. | |
3783 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
|
3784 |
49323 | 3785 static void |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3786 xg_tool_bar_detach_callback (GtkHandleBox *wbox, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3787 GtkWidget *w, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3788 gpointer client_data) |
49323 | 3789 { |
3790 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
|
3791 |
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
|
3792 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
|
3793 NULL); |
49323 | 3794 |
3795 if (f) | |
3796 { | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3797 GtkRequisition req, req2; |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3798 FRAME_X_OUTPUT (f)->toolbar_detached = 1; |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3799 gtk_widget_size_request (GTK_WIDGET (wbox), &req); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3800 gtk_widget_size_request (w, &req2); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3801 req.width -= req2.width; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3802 req.height -= req2.height; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3803 if (FRAME_TOOLBAR_TOP_HEIGHT (f) != 0) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3804 FRAME_TOOLBAR_TOP_HEIGHT (f) = req.height; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3805 else if (FRAME_TOOLBAR_BOTTOM_HEIGHT (f) != 0) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3806 FRAME_TOOLBAR_BOTTOM_HEIGHT (f) = req.height; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3807 else if (FRAME_TOOLBAR_RIGHT_WIDTH (f) != 0) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3808 FRAME_TOOLBAR_RIGHT_WIDTH (f) = req.width; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3809 else if (FRAME_TOOLBAR_LEFT_WIDTH (f) != 0) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3810 FRAME_TOOLBAR_LEFT_WIDTH (f) = req.width; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3811 xg_height_or_width_changed (f); |
49323 | 3812 } |
3813 } | |
3814 | |
3815 /* This callback is called when a tool bar is reattached. We must set | |
3816 the height of the tool bar when this happens so frame sizes | |
3817 are correctly calculated. | |
3818 WBOX is the handle box widget that enables detach/attach of the tool bar. | |
3819 W is the tool bar widget. | |
3820 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
|
3821 |
49323 | 3822 static void |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3823 xg_tool_bar_attach_callback (GtkHandleBox *wbox, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3824 GtkWidget *w, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3825 gpointer client_data) |
49323 | 3826 { |
3827 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
|
3828 g_object_set (G_OBJECT (w), "show-arrow", TRUE, NULL); |
49323 | 3829 |
3830 if (f) | |
3831 { | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3832 GtkRequisition req, req2; |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3833 FRAME_X_OUTPUT (f)->toolbar_detached = 0; |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3834 gtk_widget_size_request (GTK_WIDGET (wbox), &req); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3835 gtk_widget_size_request (w, &req2); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3836 req.width += req2.width; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3837 req.height += req2.height; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3838 if (FRAME_TOOLBAR_TOP_HEIGHT (f) != 0) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3839 FRAME_TOOLBAR_TOP_HEIGHT (f) = req.height; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3840 else if (FRAME_TOOLBAR_BOTTOM_HEIGHT (f) != 0) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3841 FRAME_TOOLBAR_BOTTOM_HEIGHT (f) = req.height; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3842 else if (FRAME_TOOLBAR_RIGHT_WIDTH (f) != 0) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3843 FRAME_TOOLBAR_RIGHT_WIDTH (f) = req.width; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3844 else if (FRAME_TOOLBAR_LEFT_WIDTH (f) != 0) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3845 FRAME_TOOLBAR_LEFT_WIDTH (f) = req.width; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3846 xg_height_or_width_changed (f); |
49323 | 3847 } |
3848 } | |
3849 | |
3850 /* This callback is called when the mouse enters or leaves a tool bar item. | |
3851 It is used for displaying and hiding the help text. | |
3852 W is the tool bar item, a button. | |
3853 EVENT is either an enter event or leave event. | |
3854 CLIENT_DATA is an integer that is the index of the button in the | |
3855 tool bar. 0 is the first button. | |
3856 | |
3857 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
|
3858 |
49323 | 3859 static gboolean |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3860 xg_tool_bar_help_callback (GtkWidget *w, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3861 GdkEventCrossing *event, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3862 gpointer client_data) |
49323 | 3863 { |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3864 /* 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
|
3865 int idx = (int) (EMACS_INT) client_data; |
49323 | 3866 FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA); |
3867 Lisp_Object help, frame; | |
3868 | |
3869 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
|
3870 return FALSE; |
49323 | 3871 |
3872 if (event->type == GDK_ENTER_NOTIFY) | |
3873 { | |
3874 idx *= TOOL_BAR_ITEM_NSLOTS; | |
3875 help = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_HELP); | |
3876 | |
3877 if (NILP (help)) | |
3878 help = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_CAPTION); | |
3879 } | |
3880 else | |
3881 help = Qnil; | |
3882 | |
3883 XSETFRAME (frame, f); | |
3884 kbd_buffer_store_help_event (frame, help); | |
3885 | |
3886 return FALSE; | |
3887 } | |
3888 | |
3889 | |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3890 /* 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
|
3891 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
|
3892 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
|
3893 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
|
3894 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
|
3895 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
|
3896 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
|
3897 |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3898 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
|
3899 |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3900 static gboolean |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3901 xg_tool_bar_item_expose_callback (GtkWidget *w, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3902 GdkEventExpose *event, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3903 gpointer 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
|
3904 { |
50333
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3905 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
|
3906 |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3907 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
|
3908 |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3909 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
|
3910 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
|
3911 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3912 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
|
3913 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
|
3914 |
50333
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3915 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
|
3916 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
|
3917 |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3918 return FALSE; |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3919 } |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3920 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3921 #ifdef HAVE_GTK_ORIENTABLE_SET_ORIENTATION |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3922 #define toolbar_set_orientation(w, o) \ |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3923 gtk_orientable_set_orientation (GTK_ORIENTABLE (w), o) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3924 #else |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3925 #define toolbar_set_orientation(w, o) \ |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3926 gtk_toolbar_set_orientation (GTK_TOOLBAR (w), o) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3927 #endif |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3928 |
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
|
3929 /* 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
|
3930 |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3931 static void |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3932 xg_pack_tool_bar (FRAME_PTR f, Lisp_Object pos) |
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
|
3933 { |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3934 struct x_output *x = f->output_data.x; |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3935 int into_hbox = EQ (pos, Qleft) || EQ (pos, Qright); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3936 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3937 toolbar_set_orientation (x->toolbar_widget, |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3938 into_hbox |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3939 ? GTK_ORIENTATION_VERTICAL |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3940 : GTK_ORIENTATION_HORIZONTAL); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3941 if (!x->handlebox_widget) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3942 { |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3943 x->handlebox_widget = gtk_handle_box_new (); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3944 g_signal_connect (G_OBJECT (x->handlebox_widget), "child-detached", |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3945 G_CALLBACK (xg_tool_bar_detach_callback), f); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3946 g_signal_connect (G_OBJECT (x->handlebox_widget), "child-attached", |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3947 G_CALLBACK (xg_tool_bar_attach_callback), f); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3948 gtk_container_add (GTK_CONTAINER (x->handlebox_widget), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3949 x->toolbar_widget); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3950 } |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3951 |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
3952 if (into_hbox) |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3953 { |
110389
4fd09e92be41
Put handle on top for vertical toolbar, Bug#7051.
Jan D <jan.h.d@swipnet.se>
parents:
109826
diff
changeset
|
3954 gtk_handle_box_set_handle_position (GTK_HANDLE_BOX (x->handlebox_widget), |
4fd09e92be41
Put handle on top for vertical toolbar, Bug#7051.
Jan D <jan.h.d@swipnet.se>
parents:
109826
diff
changeset
|
3955 GTK_POS_TOP); |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3956 gtk_box_pack_start (GTK_BOX (x->hbox_widget), x->handlebox_widget, |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3957 FALSE, FALSE, 0); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3958 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3959 if (EQ (pos, Qleft)) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3960 gtk_box_reorder_child (GTK_BOX (x->hbox_widget), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3961 x->handlebox_widget, |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3962 0); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3963 x->toolbar_in_hbox = 1; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3964 } |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3965 else |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3966 { |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3967 int vbox_pos = x->menubar_widget ? 1 : 0; |
110389
4fd09e92be41
Put handle on top for vertical toolbar, Bug#7051.
Jan D <jan.h.d@swipnet.se>
parents:
109826
diff
changeset
|
3968 gtk_handle_box_set_handle_position (GTK_HANDLE_BOX (x->handlebox_widget), |
4fd09e92be41
Put handle on top for vertical toolbar, Bug#7051.
Jan D <jan.h.d@swipnet.se>
parents:
109826
diff
changeset
|
3969 GTK_POS_LEFT); |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3970 gtk_box_pack_start (GTK_BOX (x->vbox_widget), x->handlebox_widget, |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3971 FALSE, FALSE, 0); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3972 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3973 if (EQ (pos, Qtop)) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3974 gtk_box_reorder_child (GTK_BOX (x->vbox_widget), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3975 x->handlebox_widget, |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3976 vbox_pos); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3977 x->toolbar_in_hbox = 0; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3978 } |
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
|
3979 } |
50063 | 3980 |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3981 /* 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
|
3982 |
49323 | 3983 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3984 xg_create_tool_bar (FRAME_PTR f) |
49323 | 3985 { |
3986 struct x_output *x = f->output_data.x; | |
3987 | |
3988 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
|
3989 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
|
3990 |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3991 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
|
3992 |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3993 gtk_toolbar_set_style (GTK_TOOLBAR (x->toolbar_widget), GTK_TOOLBAR_ICONS); |
109566
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
3994 toolbar_set_orientation (x->toolbar_widget, GTK_ORIENTATION_HORIZONTAL); |
49323 | 3995 } |
3996 | |
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
|
3997 |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3998 #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
|
3999 |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4000 /* 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
|
4001 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
|
4002 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4003 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4004 find_rtl_image (FRAME_PTR f, Lisp_Object image, Lisp_Object rtl) |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4005 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4006 int i; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4007 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
|
4008 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
|
4009 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
|
4010 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4011 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
|
4012 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4013 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
|
4014 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4015 Lisp_Object rtl_image = PROP (TOOL_BAR_ITEM_IMAGES); |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
4016 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
|
4017 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4018 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
|
4019 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
|
4020 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
|
4021 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4022 image = rtl_image; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4023 break; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4024 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4025 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4026 } |
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 return image; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4029 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4030 |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4031 static GtkToolItem * |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4032 xg_make_tool_item (FRAME_PTR f, |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4033 GtkWidget *wimage, |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4034 GtkWidget **wbutton, |
109726
64732fa6188a
Use const char* instead of char*.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109717
diff
changeset
|
4035 const char *label, |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4036 int i, int horiz, int text_image) |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4037 { |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4038 GtkToolItem *ti = gtk_tool_item_new (); |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4039 GtkWidget *vb = horiz ? gtk_hbox_new (FALSE, 0) : gtk_vbox_new (FALSE, 0); |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4040 GtkWidget *wb = gtk_button_new (); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4041 GtkWidget *weventbox = gtk_event_box_new (); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4042 |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4043 if (wimage && !text_image) |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
4044 gtk_box_pack_start (GTK_BOX (vb), wimage, TRUE, TRUE, 0); |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4045 if (label) |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4046 gtk_box_pack_start (GTK_BOX (vb), gtk_label_new (label), TRUE, TRUE, 0); |
109566
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
4047 if (wimage && text_image) |
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
4048 gtk_box_pack_start (GTK_BOX (vb), wimage, TRUE, TRUE, 0); |
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
4049 |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4050 gtk_button_set_focus_on_click (GTK_BUTTON (wb), FALSE); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4051 gtk_button_set_relief (GTK_BUTTON (wb), GTK_RELIEF_NONE); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4052 gtk_container_add (GTK_CONTAINER (wb), vb); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4053 gtk_container_add (GTK_CONTAINER (weventbox), wb); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4054 gtk_container_add (GTK_CONTAINER (ti), weventbox); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4055 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4056 if (wimage) |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4057 { |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4058 /* The EMACS_INT cast avoids a warning. */ |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4059 g_signal_connect (G_OBJECT (ti), "create-menu-proxy", |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4060 G_CALLBACK (xg_tool_bar_menu_proxy), |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4061 (gpointer) (EMACS_INT) i); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4062 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4063 g_signal_connect (G_OBJECT (wb), "clicked", |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4064 G_CALLBACK (xg_tool_bar_callback), |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4065 (gpointer) (EMACS_INT) i); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4066 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4067 g_object_set_data (G_OBJECT (weventbox), XG_FRAME_DATA, (gpointer)f); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4068 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4069 /* Catch expose events to overcome an annoying redraw bug, see |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4070 comment for xg_tool_bar_item_expose_callback. */ |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4071 g_signal_connect (G_OBJECT (ti), |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4072 "expose-event", |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4073 G_CALLBACK (xg_tool_bar_item_expose_callback), |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4074 0); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4075 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4076 gtk_tool_item_set_homogeneous (ti, FALSE); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4077 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4078 /* Callback to save modifyer mask (Shift/Control, etc). GTK makes |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4079 no distinction based on modifiers in the activate callback, |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4080 so we have to do it ourselves. */ |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4081 g_signal_connect (wb, "button-release-event", |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4082 G_CALLBACK (xg_tool_bar_button_cb), |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4083 NULL); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4084 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4085 g_object_set_data (G_OBJECT (wb), XG_FRAME_DATA, (gpointer)f); |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
4086 |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4087 /* Use enter/leave notify to show help. We use the events |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4088 rather than the GtkButton specific signals "enter" and |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4089 "leave", so we can have only one callback. The event |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4090 will tell us what kind of event it is. */ |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4091 /* The EMACS_INT cast avoids a warning. */ |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4092 g_signal_connect (G_OBJECT (weventbox), |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4093 "enter-notify-event", |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4094 G_CALLBACK (xg_tool_bar_help_callback), |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4095 (gpointer) (EMACS_INT) i); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4096 g_signal_connect (G_OBJECT (weventbox), |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4097 "leave-notify-event", |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4098 G_CALLBACK (xg_tool_bar_help_callback), |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4099 (gpointer) (EMACS_INT) i); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4100 } |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
4101 |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4102 if (wbutton) *wbutton = wb; |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4103 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4104 return ti; |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4105 } |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4106 |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4107 static int |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4108 xg_tool_item_stale_p (GtkWidget *wbutton, const char *stock_name, |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4109 const char *icon_name, const struct image *img, |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4110 const char *label, int horiz) |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4111 { |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4112 gpointer old; |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4113 GtkWidget *wimage; |
111991
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4114 GtkWidget *vb = XG_BIN_CHILD (wbutton); |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
4115 GtkWidget *wlbl = xg_get_tool_bar_widgets (vb, &wimage); |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4116 |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4117 /* Check if the tool icon matches. */ |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4118 if (stock_name) |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4119 { |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4120 old = g_object_get_data (G_OBJECT (wimage), |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4121 XG_TOOL_BAR_STOCK_NAME); |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4122 if (!old || strcmp (old, stock_name)) |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4123 return 1; |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4124 } |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4125 else if (icon_name) |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4126 { |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4127 old = g_object_get_data (G_OBJECT (wimage), |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4128 XG_TOOL_BAR_ICON_NAME); |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4129 if (!old || strcmp (old, icon_name)) |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4130 return 1; |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4131 } |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4132 else |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4133 { |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4134 Pixmap old_img |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4135 = (Pixmap) g_object_get_data (G_OBJECT (wimage), |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4136 XG_TOOL_BAR_IMAGE_DATA); |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4137 if (old_img != img->pixmap) |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4138 return 1; |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4139 } |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4140 |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4141 /* Check button configuration and label. */ |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4142 if ((horiz ? GTK_IS_VBOX (vb) : GTK_IS_HBOX (vb)) |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4143 || (label ? (wlbl == NULL) : (wlbl != NULL))) |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4144 return 1; |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4145 |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4146 /* Ensure label is correct. */ |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4147 if (label) |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4148 gtk_label_set_text (GTK_LABEL (wlbl), label); |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4149 return 0; |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4150 } |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4151 |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4152 static int |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4153 xg_update_tool_bar_sizes (FRAME_PTR f) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4154 { |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4155 struct x_output *x = f->output_data.x; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4156 GtkRequisition req; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4157 int nl = 0, nr = 0, nt = 0, nb = 0; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4158 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4159 gtk_widget_size_request (GTK_WIDGET (x->handlebox_widget), &req); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4160 if (x->toolbar_in_hbox) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4161 { |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4162 int pos; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4163 gtk_container_child_get (GTK_CONTAINER (x->hbox_widget), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4164 x->handlebox_widget, |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4165 "position", &pos, NULL); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4166 if (pos == 0) nl = req.width; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4167 else nr = req.width; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4168 } |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4169 else |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4170 { |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4171 int pos; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4172 gtk_container_child_get (GTK_CONTAINER (x->vbox_widget), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4173 x->handlebox_widget, |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4174 "position", &pos, NULL); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4175 if (pos == 0 || (pos == 1 && x->menubar_widget)) nt = req.height; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4176 else nb = req.height; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4177 } |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
4178 |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4179 if (nl != FRAME_TOOLBAR_LEFT_WIDTH (f) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4180 || nr != FRAME_TOOLBAR_RIGHT_WIDTH (f) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4181 || nt != FRAME_TOOLBAR_TOP_HEIGHT (f) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4182 || nb != FRAME_TOOLBAR_BOTTOM_HEIGHT (f)) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4183 { |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4184 FRAME_TOOLBAR_RIGHT_WIDTH (f) = FRAME_TOOLBAR_LEFT_WIDTH (f) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4185 = FRAME_TOOLBAR_TOP_HEIGHT (f) = FRAME_TOOLBAR_BOTTOM_HEIGHT (f) = 0; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4186 FRAME_TOOLBAR_LEFT_WIDTH (f) = nl; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4187 FRAME_TOOLBAR_RIGHT_WIDTH (f) = nr; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4188 FRAME_TOOLBAR_TOP_HEIGHT (f) = nt; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4189 FRAME_TOOLBAR_BOTTOM_HEIGHT (f) = nb; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4190 return 1; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4191 } |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4192 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4193 return 0; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4194 } |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4195 |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4196 |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
4197 /* 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
|
4198 |
49323 | 4199 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4200 update_frame_tool_bar (FRAME_PTR f) |
49323 | 4201 { |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4202 int i, j; |
49323 | 4203 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
|
4204 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
|
4205 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
|
4206 GtkToolItem *ti; |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4207 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
|
4208 int pack_tool_bar = x->handlebox_widget == NULL; |
49323 | 4209 |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4210 Lisp_Object style; |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4211 int text_image, horiz; |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4212 |
49323 | 4213 if (! FRAME_GTK_WIDGET (f)) |
4214 return; | |
4215 | |
4216 BLOCK_INPUT; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
4217 |
59084
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4218 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
|
4219 && 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
|
4220 { |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4221 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
|
4222 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
|
4223 } |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4224 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
|
4225 { |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4226 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
|
4227 && 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
|
4228 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
|
4229 |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4230 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
|
4231 && 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
|
4232 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
|
4233 } |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4234 |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4235 /* 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
|
4236 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
|
4237 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
|
4238 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
|
4239 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
|
4240 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
|
4241 |
49323 | 4242 if (! x->toolbar_widget) |
4243 xg_create_tool_bar (f); | |
4244 | |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4245 wtoolbar = GTK_TOOLBAR (x->toolbar_widget); |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4246 dir = gtk_widget_get_direction (GTK_WIDGET (wtoolbar)); |
111781
0bd93f14fcb6
Fix error in last merge.
Chong Yidong <cyd@stupidchicken.com>
parents:
111779
diff
changeset
|
4247 |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4248 style = Ftool_bar_get_system_style (); |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4249 text_image = EQ (style, Qtext_image_horiz); |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4250 horiz = EQ (style, Qboth_horiz) || text_image; |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4251 |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4252 for (i = j = 0; i < f->n_tool_bar_items; ++i) |
49323 | 4253 { |
4254 int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P)); | |
4255 int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P)); | |
4256 int idx; | |
4257 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
|
4258 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
|
4259 struct image *img = NULL; |
49323 | 4260 Lisp_Object image; |
100100
f5d2a2e44839
(update_frame_tool_bar): Initialize variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
98555
diff
changeset
|
4261 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
|
4262 GtkStockItem stock_item; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4263 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
|
4264 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
|
4265 Lisp_Object rtl; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4266 GtkWidget *wbutton = NULL; |
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
|
4267 Lisp_Object specified_file; |
111650
8fd0d7bcdf7d
Add keyword :vert-only for tool bar items with labels not shown horizontally.
Jan D. <jan.h.d@swipnet.se>
parents:
111186
diff
changeset
|
4268 int vert_only = ! NILP (PROP (TOOL_BAR_ITEM_VERT_ONLY)); |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4269 const char *label |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4270 = (EQ (style, Qimage) || (vert_only && horiz)) ? NULL |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4271 : STRINGP (PROP (TOOL_BAR_ITEM_LABEL)) |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4272 ? SSDATA (PROP (TOOL_BAR_ITEM_LABEL)) |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4273 : ""; |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4274 |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4275 ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), j); |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4276 |
111991
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4277 /* If this is a separator, use a gtk separator item. */ |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4278 if (EQ (PROP (TOOL_BAR_ITEM_TYPE), Qt)) |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4279 { |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4280 if (ti == NULL || !GTK_IS_SEPARATOR_TOOL_ITEM (ti)) |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4281 { |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4282 if (ti) |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4283 gtk_container_remove (GTK_CONTAINER (wtoolbar), |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4284 GTK_WIDGET (ti)); |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4285 ti = gtk_separator_tool_item_new (); |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4286 gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, j); |
111991
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4287 } |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4288 j++; |
111991
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4289 continue; |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4290 } |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4291 |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4292 /* Otherwise, the tool-bar item is an ordinary button. */ |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4293 |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4294 if (ti && GTK_IS_SEPARATOR_TOOL_ITEM (ti)) |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4295 { |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4296 gtk_container_remove (GTK_CONTAINER (wtoolbar), GTK_WIDGET (ti)); |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4297 ti = NULL; |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4298 } |
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4299 |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4300 if (ti) wbutton = XG_BIN_CHILD (XG_BIN_CHILD (ti)); |
49323 | 4301 |
4302 /* Ignore invalid image specifications. */ | |
111991
968255ee954a
Support for menu separators in the GTK tool-bar.
Chong Yidong <cyd@stupidchicken.com>
parents:
111781
diff
changeset
|
4303 image = PROP (TOOL_BAR_ITEM_IMAGES); |
49323 | 4304 if (!valid_image_p (image)) |
4305 { | |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4306 if (ti) |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4307 gtk_container_remove (GTK_CONTAINER (wtoolbar), |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4308 GTK_WIDGET (ti)); |
49323 | 4309 continue; |
4310 } | |
4311 | |
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
|
4312 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
|
4313 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
|
4314 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
|
4315 |
9653887b5cd0
* xterm.c (Qx_gtk_map_stock): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
103690
diff
changeset
|
4316 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
|
4317 { |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4318 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
|
4319 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
|
4320 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4321 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
|
4322 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
|
4323 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4324 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
|
4325 stock_name = NULL; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4326 stock = Qnil; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4327 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4328 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
|
4329 icon_name = NULL; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4330 else |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4331 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
|
4332 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4333 else if (gtk_stock_lookup (SSDATA (stock), &stock_item)) |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4334 icon_size = gtk_toolbar_get_icon_size (wtoolbar); |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
4335 else |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4336 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4337 stock = Qnil; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4338 stock_name = NULL; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4339 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4340 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4341 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4342 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
|
4343 { |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4344 /* No stock image, or stock item not known. Try regular |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4345 image. If image is a vector, choose it according to the |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4346 button state. */ |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4347 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
|
4348 && !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
|
4349 && STRINGP (rtl)) |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4350 image = find_rtl_image (f, image, rtl); |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4351 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4352 if (VECTORP (image)) |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4353 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4354 if (enabled_p) |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4355 idx = (selected_p |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4356 ? 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
|
4357 : 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
|
4358 else |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4359 idx = (selected_p |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4360 ? 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
|
4361 : 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
|
4362 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4363 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
|
4364 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
|
4365 } |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4366 else |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4367 idx = -1; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4368 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4369 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
|
4370 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
|
4371 prepare_image_for_display (f, img); |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
4372 |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4373 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
|
4374 { |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4375 if (ti) |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4376 gtk_container_remove (GTK_CONTAINER (wtoolbar), |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4377 GTK_WIDGET (ti)); |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4378 continue; |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4379 } |
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
|
4380 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
4381 |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4382 /* If there is an existing widget, check if it's stale; if so, |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4383 remove it and make a new tool item from scratch. */ |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4384 if (ti && xg_tool_item_stale_p (wbutton, stock_name, icon_name, |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4385 img, label, horiz)) |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4386 { |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4387 gtk_container_remove (GTK_CONTAINER (wtoolbar), |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4388 GTK_WIDGET (ti)); |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4389 ti = NULL; |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4390 } |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4391 |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4392 if (ti == NULL) |
49323 | 4393 { |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4394 GtkWidget *w; |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4395 |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4396 /* Save the image so we can see if an update is needed the |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4397 next time we call xg_tool_item_match_p. */ |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4398 if (EQ (style, Qtext)) |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4399 w = NULL; |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4400 else if (stock_name) |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4401 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4402 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
|
4403 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
|
4404 (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
|
4405 (GDestroyNotify) xfree); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4406 } |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
4407 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
|
4408 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4409 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
|
4410 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
|
4411 (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
|
4412 (GDestroyNotify) xfree); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4413 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4414 else |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4415 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4416 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
|
4417 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
|
4418 (gpointer)img->pixmap); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4419 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4420 |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4421 if (w) gtk_misc_set_padding (GTK_MISC (w), hmargin, vmargin); |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4422 ti = xg_make_tool_item (f, w, &wbutton, label, i, horiz, text_image); |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4423 gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, j); |
49323 | 4424 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
4425 |
49323 | 4426 #undef PROP |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4427 |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4428 gtk_widget_set_sensitive (wbutton, enabled_p); |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4429 j++; |
49323 | 4430 } |
4431 | |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4432 /* Remove buttons not longer needed. */ |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4433 do |
49323 | 4434 { |
112168
744d9787c683
Minor fix to GTK tool-bar button refresh code.
Chong Yidong <cyd@stupidchicken.com>
parents:
112043
diff
changeset
|
4435 ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), j); |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4436 if (ti) |
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4437 gtk_container_remove (GTK_CONTAINER (wtoolbar), GTK_WIDGET (ti)); |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4438 } while (ti != NULL); |
49323 | 4439 |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4440 if (f->n_tool_bar_items != 0) |
49323 | 4441 { |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4442 if (pack_tool_bar) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4443 xg_pack_tool_bar (f, f->tool_bar_position); |
112043
dffe14ef6b65
Reduce GTK tool-bar switching delay by avoiding selective show/hide of widgets.
Chong Yidong <cyd@stupidchicken.com>
parents:
111991
diff
changeset
|
4444 gtk_widget_show_all (GTK_WIDGET (x->handlebox_widget)); |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4445 if (xg_update_tool_bar_sizes (f)) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4446 xg_height_or_width_changed (f); |
49323 | 4447 } |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4448 |
49323 | 4449 UNBLOCK_INPUT; |
4450 } | |
4451 | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
4452 /* 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
|
4453 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
|
4454 |
49323 | 4455 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4456 free_frame_tool_bar (FRAME_PTR f) |
49323 | 4457 { |
4458 struct x_output *x = f->output_data.x; | |
4459 | |
4460 if (x->toolbar_widget) | |
4461 { | |
93030
d38f7962c052
(free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents:
92366
diff
changeset
|
4462 int is_packed = x->handlebox_widget != 0; |
49323 | 4463 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
|
4464 /* 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
|
4465 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
|
4466 if (is_packed) |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4467 { |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4468 if (x->toolbar_in_hbox) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4469 gtk_container_remove (GTK_CONTAINER (x->hbox_widget), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4470 x->handlebox_widget); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4471 else |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4472 gtk_container_remove (GTK_CONTAINER (x->vbox_widget), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4473 x->handlebox_widget); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4474 } |
93030
d38f7962c052
(free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents:
92366
diff
changeset
|
4475 else |
d38f7962c052
(free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents:
92366
diff
changeset
|
4476 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
|
4477 |
49323 | 4478 x->toolbar_widget = 0; |
4479 x->handlebox_widget = 0; | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4480 FRAME_TOOLBAR_TOP_HEIGHT (f) = FRAME_TOOLBAR_BOTTOM_HEIGHT (f) = 0; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4481 FRAME_TOOLBAR_LEFT_WIDTH (f) = FRAME_TOOLBAR_RIGHT_WIDTH (f) = 0; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4482 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4483 xg_height_or_width_changed (f); |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
4484 |
49323 | 4485 UNBLOCK_INPUT; |
4486 } | |
4487 } | |
4488 | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4489 int |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4490 xg_change_toolbar_position (FRAME_PTR f, Lisp_Object pos) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4491 { |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4492 struct x_output *x = f->output_data.x; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4493 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4494 if (! x->toolbar_widget || ! x->handlebox_widget) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4495 return 1; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4496 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4497 BLOCK_INPUT; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4498 g_object_ref (x->handlebox_widget); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4499 if (x->toolbar_in_hbox) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4500 gtk_container_remove (GTK_CONTAINER (x->hbox_widget), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4501 x->handlebox_widget); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4502 else |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4503 gtk_container_remove (GTK_CONTAINER (x->vbox_widget), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4504 x->handlebox_widget); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4505 xg_pack_tool_bar (f, pos); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4506 g_object_unref (x->handlebox_widget); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4507 if (xg_update_tool_bar_sizes (f)) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4508 xg_height_or_width_changed (f); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4509 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4510 UNBLOCK_INPUT; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4511 return 1; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4512 } |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4513 |
49323 | 4514 |
4515 | |
4516 /*********************************************************************** | |
4517 Initializing | |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4518 ***********************************************************************/ |
49323 | 4519 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4520 xg_initialize (void) |
49323 | 4521 { |
59102
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4522 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
|
4523 |
75417
c21d47d727f3
(xg_initialize): Call XftInit if HAVE_XFT.
Jan Djärv <jan.h.d@swipnet.se>
parents:
75348
diff
changeset
|
4524 #if HAVE_XFT |
c21d47d727f3
(xg_initialize): Call XftInit if HAVE_XFT.
Jan Djärv <jan.h.d@swipnet.se>
parents:
75348
diff
changeset
|
4525 /* 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
|
4526 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
|
4527 XftInit (0); |
c21d47d727f3
(xg_initialize): Call XftInit if HAVE_XFT.
Jan Djärv <jan.h.d@swipnet.se>
parents:
75348
diff
changeset
|
4528 #endif |
84621 | 4529 |
4530 gdpy_def = NULL; | |
49323 | 4531 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
|
4532 xg_detached_menus = 0; |
49323 | 4533 xg_menu_cb_list.prev = xg_menu_cb_list.next = |
4534 xg_menu_item_cb_list.prev = xg_menu_item_cb_list.next = 0; | |
4535 | |
49419
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
4536 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
|
4537 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
|
4538 |
49323 | 4539 /* Remove F10 as a menu accelerator, it does not mix well with Emacs key |
4540 bindings. It doesn't seem to be any way to remove properties, | |
4541 so we set it to VoidSymbol which in X means "no key". */ | |
4542 gtk_settings_set_string_property (gtk_settings_get_default (), | |
4543 "gtk-menu-bar-accel", | |
4544 "VoidSymbol", | |
4545 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
|
4546 |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
4547 /* 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
|
4548 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
|
4549 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
|
4550 "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
|
4551 "Emacs", |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
4552 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
|
4553 |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4554 /* 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
|
4555 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
|
4556 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
|
4557 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
|
4558 "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
|
4559 |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4560 /* 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
|
4561 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
|
4562 (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
|
4563 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
|
4564 "cancel", 0); |
49323 | 4565 } |
4566 | |
4567 #endif /* USE_GTK */ | |
52401 | 4568 |