annotate src/gtkutil.c @ 109126:aec1143e8d85

Convert (most) functions in src to standard C. * src/alloc.c: Convert function definitions to standard C. * src/atimer.c: * src/bidi.c: * src/bytecode.c: * src/callint.c: * src/callproc.c: * src/casefiddle.c: * src/casetab.c: * src/category.c: * src/ccl.c: * src/character.c: * src/charset.c: * src/chartab.c: * src/cmds.c: * src/coding.c: * src/composite.c: * src/data.c: * src/dbusbind.c: * src/dired.c: * src/dispnew.c: * src/doc.c: * src/doprnt.c: * src/ecrt0.c: * src/editfns.c: * src/fileio.c: * src/filelock.c: * src/filemode.c: * src/fns.c: * src/font.c: * src/fontset.c: * src/frame.c: * src/fringe.c: * src/ftfont.c: * src/ftxfont.c: * src/gtkutil.c: * src/indent.c: * src/insdel.c: * src/intervals.c: * src/keymap.c: * src/lread.c: * src/macros.c: * src/marker.c: * src/md5.c: * src/menu.c: * src/minibuf.c: * src/prefix-args.c: * src/print.c: * src/ralloc.c: * src/regex.c: * src/region-cache.c: * src/scroll.c: * src/search.c: * src/sound.c: * src/strftime.c: * src/syntax.c: * src/sysdep.c: * src/termcap.c: * src/terminal.c: * src/terminfo.c: * src/textprop.c: * src/tparam.c: * src/undo.c: * src/unexelf.c: * src/window.c: * src/xfaces.c: * src/xfns.c: * src/xfont.c: * src/xftfont.c: * src/xgselect.c: * src/xmenu.c: * src/xrdb.c: * src/xselect.c: * src/xsettings.c: * src/xsmfns.c: * src/xterm.c: Likewise.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sun, 04 Jul 2010 00:50:25 -0700
parents 2bc9a0c04c87
children c25c24812fb1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1 /* Functions for creating and updating GTK widgets.
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 106720
diff changeset
2 Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
79759
fc2bcd2a8aad Add 2008 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 79460
diff changeset
3 Free Software Foundation, Inc.
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
5 This file is part of GNU Emacs.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
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
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
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
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
11
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
12 GNU Emacs is distributed in the hope that it will be useful,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
15 GNU General Public License for more details.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
16
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
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
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
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
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
21
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
22 #ifdef USE_GTK
49359
14cf50ecf91a gtkutil.c: Must include stdio.h before termhooks.h
Jan Djärv <jan.h.d@swipnet.se>
parents: 49325
diff changeset
23 #include <string.h>
58818
f8cddae7d959 * gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents: 58817
diff changeset
24 #include <signal.h>
49359
14cf50ecf91a gtkutil.c: Must include stdio.h before termhooks.h
Jan Djärv <jan.h.d@swipnet.se>
parents: 49325
diff changeset
25 #include <stdio.h>
105669
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105522
diff changeset
26 #include <setjmp.h>
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
27 #include "lisp.h"
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
28 #include "xterm.h"
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
29 #include "blockinput.h"
58818
f8cddae7d959 * gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents: 58817
diff changeset
30 #include "syssignal.h"
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
31 #include "window.h"
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
32 #include "gtkutil.h"
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
33 #include "termhooks.h"
51408
8f1bed1dee3c Include keyboard.h, charset.h, coding.h.
Dave Love <fx@gnu.org>
parents: 51211
diff changeset
34 #include "keyboard.h"
8f1bed1dee3c Include keyboard.h, charset.h, coding.h.
Dave Love <fx@gnu.org>
parents: 51211
diff changeset
35 #include "charset.h"
8f1bed1dee3c Include keyboard.h, charset.h, coding.h.
Dave Love <fx@gnu.org>
parents: 51211
diff changeset
36 #include "coding.h"
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
37 #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
38 #include "xsettings.h"
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
39
97059
984f2ac5a637 * lisp.h (init_weak_hash_tables, syms_of_font)
Andreas Schwab <schwab@suse.de>
parents: 97056
diff changeset
40 #ifdef HAVE_XFT
984f2ac5a637 * lisp.h (init_weak_hash_tables, syms_of_font)
Andreas Schwab <schwab@suse.de>
parents: 97056
diff changeset
41 #include <X11/Xft/Xft.h>
984f2ac5a637 * lisp.h (init_weak_hash_tables, syms_of_font)
Andreas Schwab <schwab@suse.de>
parents: 97056
diff changeset
42 #endif
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
43
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
44 #define FRAME_TOTAL_PIXEL_HEIGHT(f) \
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50778
diff changeset
45 (FRAME_PIXEL_HEIGHT (f) + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f))
50129
d0142038feaa Reduce flicker in GTK scrollbars.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50112
diff changeset
46
67528
c5c00342184b * gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents: 65628
diff changeset
47 /* Avoid "differ in sign" warnings */
c5c00342184b * gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents: 65628
diff changeset
48 #define SSDATA(x) ((char *) SDATA (x))
c5c00342184b * gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents: 65628
diff changeset
49
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
50 #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
51 #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
52 (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
53 #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
54 #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
55 #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
56 #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
57 #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
58 #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
59 #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
60 #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
61 #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
62 #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
63 #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
64 #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
65 #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
66 #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
67 #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
68 #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
69 #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
70 #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
71 #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
72
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
73
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
74 /***********************************************************************
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
75 Display handling functions
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
76 ***********************************************************************/
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
77
98555
440d088b9a23 (xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents: 98545
diff changeset
78 /* 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
79 may close all its displays. */
84621
5d074ea0e4a2 (gdpy_def): New variable.
Jan Djärv <jan.h.d@swipnet.se>
parents: 84604
diff changeset
80
5d074ea0e4a2 (gdpy_def): New variable.
Jan Djärv <jan.h.d@swipnet.se>
parents: 84604
diff changeset
81 static GdkDisplay *gdpy_def;
5d074ea0e4a2 (gdpy_def): New variable.
Jan Djärv <jan.h.d@swipnet.se>
parents: 84604
diff changeset
82
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
83 /* 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
84 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
85 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
86
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
87 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
88 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
89 {
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
90 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
91 {
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
92 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
93 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
94
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
95 if (GTK_IS_MENU (w))
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
96 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
97 else
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
98 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
99 }
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
100 }
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
101
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
102
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
103 /* 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
104 *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
105
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
106 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
107 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
108 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
109
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
110 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
111 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
112 {
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
113 GdkDisplay *gdpy;
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
114
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
115 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
116 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
117 {
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
118 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
119 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
120 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 }
98555
440d088b9a23 (xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents: 98545
diff changeset
122
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
123 *dpy = gdpy ? GDK_DISPLAY_XDISPLAY (gdpy) : NULL;
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
124 }
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
125
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
126
57715
cdc48cdd5b0e * gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 57597
diff changeset
127 /* 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
128
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
129 void
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
130 xg_display_close (Display *dpy)
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
131 {
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
132 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
133
98555
440d088b9a23 (xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents: 98545
diff changeset
134 /* 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
135 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
136 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
137 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
138 {
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
139 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
140 GdkDisplay *gdpy_new = NULL;
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
141
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
142 /* Find another display. */
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
143 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
144 if (dpyinfo->display != dpy)
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
145 {
98555
440d088b9a23 (xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents: 98545
diff changeset
146 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
147 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
148 gdpy_new);
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
149 break;
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
150 }
98555
440d088b9a23 (xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents: 98545
diff changeset
151 gdpy_def = gdpy_new;
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
152 }
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
153
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
154 #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
155 /* 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
156 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
157 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
158 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
159 #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
160 /* 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
161 gdk_display_close (gdpy);
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
162 #endif
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
163 }
50129
d0142038feaa Reduce flicker in GTK scrollbars.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50112
diff changeset
164
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
165
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
166 /***********************************************************************
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
167 Utility functions
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
168 ***********************************************************************/
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
169 /* The next two variables and functions are taken from lwlib. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
170 static widget_value *widget_value_free_list;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
171 static int malloc_cpt;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
172
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
173 /* Allocate a widget_value structure, either by taking one from the
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
174 widget_value_free_list or by malloc:ing a new one.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
175
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
176 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
177
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
178 widget_value *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
179 malloc_widget_value (void)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
180 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
181 widget_value *wv;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
182 if (widget_value_free_list)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
183 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
184 wv = widget_value_free_list;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
185 widget_value_free_list = wv->free_list;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
186 wv->free_list = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
187 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
188 else
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
189 {
69025
5d9232b72d14 (malloc_widget_value): Use xmalloc.
Richard M. Stallman <rms@gnu.org>
parents: 68922
diff changeset
190 wv = (widget_value *) xmalloc (sizeof (widget_value));
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
191 malloc_cpt++;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
192 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
193 memset (wv, 0, sizeof (widget_value));
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
194 return wv;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
195 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
196
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
197 /* This is analogous to free. It frees only what was allocated
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
198 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
199
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
200 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
201 free_widget_value (widget_value *wv)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
202 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
203 if (wv->free_list)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
204 abort ();
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
205
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
206 if (malloc_cpt > 25)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
207 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
208 /* When the number of already allocated cells is too big,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
209 We free it. */
100633
5395c014feb8 * buffer.c (init_buffer): Use realloc instead of xrealloc.
Andreas Schwab <schwab@suse.de>
parents: 100501
diff changeset
210 xfree (wv);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
211 malloc_cpt--;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
212 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
213 else
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
214 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
215 wv->free_list = widget_value_free_list;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
216 widget_value_free_list = wv;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
217 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
218 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
219
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
220
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
221 /* 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
222 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
223
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
224 GdkCursor *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
225 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
226 {
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
227 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
228 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
229 }
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
230
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
231 /* 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
232
65006
ec2fa2e1d4ea * gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 64936
diff changeset
233 static GdkPixbuf *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
234 xg_get_pixbuf_from_pix_and_mask (GdkPixmap *gpix, GdkPixmap *gmask, 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
235 {
107219
07507204ac6f Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
236 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
237 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
238
d5e998f50c2d * gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 64783
diff changeset
239 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
240 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
241 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
242 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
243 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
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 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
246 {
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 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
248 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
249 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
250 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
251 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
252 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
253 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
254 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
255 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
256 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
257
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 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
259 {
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 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
261 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
262
d5e998f50c2d * gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 64783
diff changeset
263 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
264 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
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 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
267 {
d5e998f50c2d * gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 64783
diff changeset
268 /* 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
269 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
270 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
271 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
272
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 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
274 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
275 }
d5e998f50c2d * gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 64783
diff changeset
276 }
d5e998f50c2d * gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 64783
diff changeset
277
d5e998f50c2d * gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 64783
diff changeset
278 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
279 }
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
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 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
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
78721
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
284 static Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
285 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
286 {
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
287 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
288 Lisp_Object tail;
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
289 extern Lisp_Object QCfile;
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
290
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
291 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
292 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
293 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
294 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
295 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
296
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
297 return specified_file;
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
298 }
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
299
56112
e4cfda8330d5 * gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 55342
diff changeset
300 /* 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
301 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
302 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
303 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
304 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
305 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
306 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
307 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
308 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
309 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
310
56112
e4cfda8330d5 * gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 55342
diff changeset
311 static GtkWidget *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
312 xg_get_image_for_pixmap (FRAME_PTR f, struct image *img, GtkWidget *widget, GtkImage *old_widget)
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
313 {
56112
e4cfda8330d5 * gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 55342
diff changeset
314 GdkPixmap *gpix;
e4cfda8330d5 * gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 55342
diff changeset
315 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
316 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
317 GdkColormap *cmap;
c1d129148b98 (xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents: 78787
diff changeset
318 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
319
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
320 /* 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
321 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
322 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
323 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
324 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
325
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
326 /* 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
327 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
328 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
329
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
330 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
331 && 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
332 {
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 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
334 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
335 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
336 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
337
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
338 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
339 }
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 /* 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
342 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
343 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
344
56269
4f8b4f60e748 (xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents: 56268
diff changeset
345 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
346 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
347 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
348
78809
c1d129148b98 (xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents: 78787
diff changeset
349 /* 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
350 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
351 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
352 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
353 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
354 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
355 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
356 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
357 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
358 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
359 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
360
c1d129148b98 (xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents: 78787
diff changeset
361 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
362 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
363 else
78809
c1d129148b98 (xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents: 78787
diff changeset
364 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
365
c1d129148b98 (xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents: 78787
diff changeset
366 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
367
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
368 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
369 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
370
56112
e4cfda8330d5 * gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 55342
diff changeset
371 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
372 }
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
373
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
374
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
375 /* Set CURSOR on W and all widgets W contain. We must do like this
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
376 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
377 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
378
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
379 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
380 xg_set_cursor (GtkWidget *w, GdkCursor *cursor)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
381 {
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
382 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
383 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
384
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
385 gdk_window_set_cursor (window, cursor);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
386
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
387 /* The scroll bar widget has more than one GDK window (had to look at
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
388 the source to figure this out), and there is no way to set cursor
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
389 on widgets in GTK. So we must set the cursor for all GDK windows.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
390 Ditto for menus. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
391
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
392 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
393 gdk_window_set_cursor (GDK_WINDOW (children->data), cursor);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
394 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
395
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
396 /* 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
397
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
398 static void
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
399 xg_list_insert (xg_list_node *list, xg_list_node *node)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
400 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
401 xg_list_node *list_start = list->next;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
402
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
403 if (list_start) list_start->prev = node;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
404 node->next = list_start;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
405 node->prev = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
406 list->next = node;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
407 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
408
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
409 /* 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
410
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
411 static void
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
412 xg_list_remove (xg_list_node *list, xg_list_node *node)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
413 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
414 xg_list_node *list_start = list->next;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
415 if (node == list_start)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
416 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
417 list->next = node->next;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
418 if (list->next) list->next->prev = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
419 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
420 else
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
421 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
422 node->prev->next = node->next;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
423 if (node->next) node->next->prev = node->prev;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
424 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
425 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
426
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
427 /* Allocate and return a utf8 version of STR. If STR is already
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
428 utf8 or NULL, just return STR.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
429 If not, a new string is allocated and the caller must free the result
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
430 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
431
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
432 static char *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
433 get_utf8_string (char *str)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
434 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
435 char *utf8_str = str;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
436
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
437 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
438
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
439 /* 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
440 if (!g_utf8_validate (str, -1, NULL))
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
441 utf8_str = g_locale_to_utf8 (str, -1, 0, 0, 0);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
442
102283
43221c2f4272 Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 100951
diff changeset
443 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
444 {
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 /* 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
446 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
447 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
448 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
449 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
450 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
451 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
452
73389
7b5c0104efb0 * gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents: 73066
diff changeset
453 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
454 &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
455 && 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
456 {
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 ++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
458 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
459 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
460 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
461 }
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
102283
43221c2f4272 Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 100951
diff changeset
463 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
464 {
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 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
466 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
467 }
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 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
469
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 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
471 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
472
7b5c0104efb0 * gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents: 73066
diff changeset
473 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
474 &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
475 && 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
476 {
73389
7b5c0104efb0 * gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents: 73066
diff changeset
477 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
478 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
479 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
480 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
481 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
482 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
483 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
484 }
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
102283
43221c2f4272 Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 100951
diff changeset
486 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
487 {
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 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
489 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
490 }
102283
43221c2f4272 Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 100951
diff changeset
491 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
492 {
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 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
494 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
495 }
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
496 }
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
497 return utf8_str;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
498 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
499
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
500
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
501
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
502 /***********************************************************************
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
503 General functions for creating widgets, resizing, events, e.t.c.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
504 ***********************************************************************/
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
505
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
506 /* Make a geometry string and pass that to GTK. It seems this is the
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
507 only way to get geometry position right if the user explicitly
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
508 asked for a position when starting Emacs.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
509 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
510
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
511 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
512 xg_set_geometry (FRAME_PTR f)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
513 {
107851
2a74858bccc0 Fix so top -10 and left -10 in frame parameters work.
Jan D. <jan.h.d@swipnet.se>
parents: 107219
diff changeset
514 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
515 {
753ad51473c7 (xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents: 93030
diff changeset
516 int left = f->left_pos;
753ad51473c7 (xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents: 93030
diff changeset
517 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
518 int top = f->top_pos;
753ad51473c7 (xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents: 93030
diff changeset
519 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
520 char geom_str[32];
753ad51473c7 (xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents: 93030
diff changeset
521
753ad51473c7 (xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents: 93030
diff changeset
522 if (xneg)
753ad51473c7 (xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents: 93030
diff changeset
523 left = -left;
753ad51473c7 (xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents: 93030
diff changeset
524 if (yneg)
753ad51473c7 (xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents: 93030
diff changeset
525 top = -top;
753ad51473c7 (xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents: 93030
diff changeset
526
107891
bf5fce1e8e34 Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents: 107851
diff changeset
527 sprintf (geom_str, "=%dx%d%c%d%c%d",
bf5fce1e8e34 Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents: 107851
diff changeset
528 FRAME_PIXEL_WIDTH (f),
bf5fce1e8e34 Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents: 107851
diff changeset
529 FRAME_PIXEL_HEIGHT (f),
93427
753ad51473c7 (xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents: 93030
diff changeset
530 (xneg ? '-' : '+'), left,
753ad51473c7 (xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents: 93030
diff changeset
531 (yneg ? '-' : '+'), top);
753ad51473c7 (xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents: 93030
diff changeset
532
753ad51473c7 (xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents: 93030
diff changeset
533 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
534 geom_str))
753ad51473c7 (xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents: 93030
diff changeset
535 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
536 }
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
537 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
538
106720
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
539 /* 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
540 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
541
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
542 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
543 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
544 {
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
545 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
546 {
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
547 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
548 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
549 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
550 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
551 FRAME_X_WINDOW (f),
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
552 0, 0,
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
553 FRAME_PIXEL_WIDTH (f),
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
554 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
555 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
556 FRAME_X_WINDOW (f),
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
557 0, 0,
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
558 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
559 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
560 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
561 FRAME_X_WINDOW (f),
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
562 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
563 FRAME_PIXEL_WIDTH (f),
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
564 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
565 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
566 FRAME_X_WINDOW (f),
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
567 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
568 0,
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
569 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
570 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
571 }
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
572 }
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
573
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
574 /* 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
575 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
576 frame only. We let Gtk+ deal with the Gtk+ parts.
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
577 F is the frame to resize.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
578 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
579
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
580 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
581 xg_frame_resized (FRAME_PTR f, int pixelwidth, int pixelheight)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
582 {
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
583 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
584
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
585 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
586 {
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
587 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
588 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
589 0, 0,
106720
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
590 &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
591 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
592 }
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
593
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
594
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
595 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
596 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
597
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
598 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
599 || 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
600 || 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
601 || pixelheight != FRAME_PIXEL_HEIGHT (f))
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
602 {
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
603 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
604 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
605
106720
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
606 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
607 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
608 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
609 cancel_mouse_face (f);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
610 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
611 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
612
93427
753ad51473c7 (xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents: 93030
diff changeset
613 /* 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
614 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
615
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
616 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
617 xg_frame_set_char_size (FRAME_PTR f, int cols, int rows)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
618 {
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50778
diff changeset
619 int pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
620 + 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
621 int pixelwidth;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
622
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
623 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
624 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
625
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
626 /* Take into account the size of the scroll bar. Always use the
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
627 number of columns occupied by the scroll bar here otherwise we
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
628 might end up with a frame width that is not a multiple of the
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
629 frame's character width which is bad for vertically split
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
630 windows. */
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50778
diff changeset
631 f->scroll_bar_actual_width
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50778
diff changeset
632 = FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
633
50099
a62497b91c74 Use generic compute_fringe_widths.
Kim F. Storm <storm@cua.dk>
parents: 50063
diff changeset
634 compute_fringe_widths (f, 0);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
635
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50778
diff changeset
636 /* 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
637 after calculating that value. */
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50778
diff changeset
638 pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols);
50318
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
639
106720
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
640
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
641 /* 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
642 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
643
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
644 /* 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
645 but not rows/cols. */
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
646 gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
647 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
648 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
649
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
650 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
651 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
652
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
653 /* 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
654 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
655 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
656 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
657 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
658 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
659 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
660 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
661 {
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
662 /* 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
663 (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
664 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
665 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
666 }
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
667 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
668 {
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
669 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
670 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
671 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
672 }
103665
340c701162a6 * emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103198
diff changeset
673 }
340c701162a6 * emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103198
diff changeset
674
340c701162a6 * emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103198
diff changeset
675 /* Handle height changes (i.e. add/remove menu/toolbar).
340c701162a6 * emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103198
diff changeset
676 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
677
340c701162a6 * emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103198
diff changeset
678 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
679 xg_height_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
680 {
340c701162a6 * emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103198
diff changeset
681 gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
340c701162a6 * emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103198
diff changeset
682 FRAME_PIXEL_WIDTH (f), FRAME_TOTAL_PIXEL_HEIGHT (f));
340c701162a6 * emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103198
diff changeset
683 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
684 x_wm_set_size_hint (f, 0, 0);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
685 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
686
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
687 /* Convert an X Window WSESC on display DPY to its corresponding GtkWidget.
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
688 Must be done like this, because GtkWidget:s can have "hidden"
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
689 X Window that aren't accessible.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
690
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
691 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
692
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
693 GtkWidget *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
694 xg_win_to_widget (Display *dpy, Window wdesc)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
695 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
696 gpointer gdkwin;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
697 GtkWidget *gwdesc = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
698
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
699 BLOCK_INPUT;
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
700
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
701 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
702 wdesc);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
703 if (gdkwin)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
704 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
705 GdkEvent event;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
706 event.any.window = gdkwin;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
707 gwdesc = gtk_get_event_widget (&event);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
708 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
709
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
710 UNBLOCK_INPUT;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
711 return gwdesc;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
712 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
713
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
714 /* Fill in the GdkColor C so that it represents PIXEL.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
715 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
716
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
717 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
718 xg_pix_to_gcolor (GtkWidget *w, long unsigned int pixel, GdkColor *c)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
719 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
720 GdkColormap *map = gtk_widget_get_colormap (w);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
721 gdk_colormap_query_color (map, pixel, c);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
722 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
723
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
724 /* Create and set up the GTK widgets for frame F.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
725 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
726
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
727 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
728 xg_create_frame_widgets (FRAME_PTR f)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
729 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
730 GtkWidget *wtop;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
731 GtkWidget *wvbox;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
732 GtkWidget *wfixed;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
733 GdkColor bg;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
734 GtkRcStyle *style;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
735 char *title = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
736
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
737 BLOCK_INPUT;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
738
91632
370f67c176eb (xg_create_frame_widgets): If frame is embedded, call
Jan Djärv <jan.h.d@swipnet.se>
parents: 87649
diff changeset
739 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
740 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
741 else
370f67c176eb (xg_create_frame_widgets): If frame is embedded, call
Jan Djärv <jan.h.d@swipnet.se>
parents: 87649
diff changeset
742 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
743
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
744 xg_set_screen (wtop, f);
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
745
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
746 wvbox = gtk_vbox_new (FALSE, 0);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
747 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
748
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
749 if (! wtop || ! wvbox || ! wfixed)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
750 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
751 if (wtop) gtk_widget_destroy (wtop);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
752 if (wvbox) gtk_widget_destroy (wvbox);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
753 if (wfixed) gtk_widget_destroy (wfixed);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
754
60185
391f44959566 (xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents: 59913
diff changeset
755 UNBLOCK_INPUT;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
756 return 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
757 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
758
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
759 /* Use same names as the Xt port does. I.e. Emacs.pane.emacs by default */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
760 gtk_widget_set_name (wtop, EMACS_CLASS);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
761 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
762 gtk_widget_set_name (wfixed, SSDATA (Vx_resource_name));
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
763
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
764 /* 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
765 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
766 else if (! NILP (f->name)) title = SSDATA (ENCODE_UTF_8 (f->name));
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
767
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
768 if (title) gtk_window_set_title (GTK_WINDOW (wtop), title);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
769
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
770 FRAME_GTK_OUTER_WIDGET (f) = wtop;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
771 FRAME_GTK_WIDGET (f) = wfixed;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
772 f->output_data.x->vbox_widget = wvbox;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
773
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
774 gtk_widget_set_has_window (wfixed, TRUE);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
775
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
776 gtk_container_add (GTK_CONTAINER (wtop), wvbox);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
777 gtk_box_pack_end (GTK_BOX (wvbox), wfixed, TRUE, TRUE, 0);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
778
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
779 if (FRAME_EXTERNAL_TOOL_BAR (f))
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
780 update_frame_tool_bar (f);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
781
50270
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
782 /* 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
783 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
784 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
785 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
786 a lot, so we turn off double buffering. */
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
787 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
788
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
789 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
790 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
791 SSDATA (Vx_resource_class));
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
792
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
793 /* Add callback to do nothing on WM_DELETE_WINDOW. The default in
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
794 GTK is to destroy the widget. We want Emacs to do that instead. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
795 g_signal_connect (G_OBJECT (wtop), "delete-event",
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
796 G_CALLBACK (gtk_true), 0);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
797
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
798 /* Convert our geometry parameters into a geometry string
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
799 and specify it.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
800 GTK will itself handle calculating the real position this way. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
801 xg_set_geometry (f);
107219
07507204ac6f Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
802 f->win_gravity
07507204ac6f Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
803 = gtk_window_get_gravity (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)));
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
804
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
805 gtk_widget_add_events (wfixed,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
806 GDK_POINTER_MOTION_MASK
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
807 | GDK_EXPOSURE_MASK
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
808 | GDK_BUTTON_PRESS_MASK
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
809 | GDK_BUTTON_RELEASE_MASK
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
810 | GDK_KEY_PRESS_MASK
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
811 | GDK_ENTER_NOTIFY_MASK
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
812 | GDK_LEAVE_NOTIFY_MASK
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
813 | GDK_FOCUS_CHANGE_MASK
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
814 | GDK_STRUCTURE_MASK
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
815 | GDK_VISIBILITY_NOTIFY_MASK);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
816
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
817 /* Must realize the windows so the X window gets created. It is used
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
818 by callers of this function. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
819 gtk_widget_realize (wfixed);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
820 FRAME_X_WINDOW (f) = GTK_WIDGET_TO_X_WIN (wfixed);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
821
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
822 /* Since GTK clears its window by filling with the background color,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
823 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
824 xg_pix_to_gcolor (wfixed, FRAME_BACKGROUND_PIXEL (f), &bg);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
825 gtk_widget_modify_bg (wfixed, GTK_STATE_NORMAL, &bg);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
826
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
827 /* Also, do not let any background pixmap to be set, this looks very
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
828 bad as Emacs overwrites the background pixmap with its own idea
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
829 of background color. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
830 style = gtk_widget_get_modifier_style (wfixed);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
831
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
832 /* Must use g_strdup because gtk_widget_modify_style does g_free. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
833 style->bg_pixmap_name[GTK_STATE_NORMAL] = g_strdup ("<none>");
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
834 gtk_widget_modify_style (wfixed, style);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
835
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
836 /* GTK does not set any border, and they look bad with GTK. */
95954
184aae567806 * xfns.c (Fx_create_frame): internal-border-width default to 0 for Gtk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95794
diff changeset
837 /* That they look bad is no excuse for imposing this here. --Stef
184aae567806 * xfns.c (Fx_create_frame): internal-border-width default to 0 for Gtk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95794
diff changeset
838 It should be done by providing the proper default in Fx_create_Frame.
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50778
diff changeset
839 f->border_width = 0;
95954
184aae567806 * xfns.c (Fx_create_frame): internal-border-width default to 0 for Gtk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95794
diff changeset
840 f->internal_border_width = 0; */
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
841
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
842 UNBLOCK_INPUT;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
843
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
844 return 1;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
845 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
846
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
847 /* Set the normal size hints for the window manager, for frame F.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
848 FLAGS is the flags word to use--or 0 meaning preserve the flags
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
849 that the window now has.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
850 If USER_POSITION is nonzero, we set the User Position
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
851 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
852
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
853 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
854 x_wm_set_size_hint (FRAME_PTR f, long int flags, int user_position)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
855 {
98545
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
856 /* 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
857 to its own defaults. */
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
858 GdkGeometry size_hints;
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
859 gint hint_flags = 0;
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
860 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
861 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
862 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
863
107219
07507204ac6f Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
864 /* 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
865 to a race condition. See the thread at
07507204ac6f Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
866 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
867 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
868 return;
07507204ac6f Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
869
98545
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
870 if (flags)
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
871 {
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
872 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
873 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
874 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
875 }
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
876 else
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
877 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
878
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
879 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
880 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
881
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
882 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
883 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
884 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
885
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
886 hint_flags |= GDK_HINT_BASE_SIZE;
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
887 base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0);
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
888 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
889 + 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
890
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
891 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
892
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
893 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
894 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
895 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
896 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
897
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
898 /* 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
899 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
900 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
901 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
902 if (win_gravity == NorthWestGravity)
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
903 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
904 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
905 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
906 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
907 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
908 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
909 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
910 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
911 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
912 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
913 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
914 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
915 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
916 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
917 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
918 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
919 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
920 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
921 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
922
107891
bf5fce1e8e34 Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents: 107851
diff changeset
923 if (user_position)
bf5fce1e8e34 Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents: 107851
diff changeset
924 {
bf5fce1e8e34 Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents: 107851
diff changeset
925 hint_flags &= ~GDK_HINT_POS;
bf5fce1e8e34 Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents: 107851
diff changeset
926 hint_flags |= GDK_HINT_USER_POS;
bf5fce1e8e34 Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents: 107851
diff changeset
927 }
bf5fce1e8e34 Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents: 107851
diff changeset
928
98545
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
929 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
930 || memcmp (&size_hints,
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
931 &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
932 sizeof (size_hints)) != 0)
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
933 {
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
934 BLOCK_INPUT;
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
935 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
936 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
937 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
938 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
939 UNBLOCK_INPUT;
d19cd21bc42d (x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents: 97076
diff changeset
940 }
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
941 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
942
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
943 /* Change background color of a frame.
96363
f9d35151b907 American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents: 95954
diff changeset
944 Since GTK uses the background color to clear the window, we must
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
945 keep the GTK and X colors in sync.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
946 F is the frame to change,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
947 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
948
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
949 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
950 xg_set_background_color (FRAME_PTR f, long unsigned int bg)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
951 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
952 if (FRAME_GTK_WIDGET (f))
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
953 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
954 GdkColor gdk_bg;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
955
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
956 BLOCK_INPUT;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
957 xg_pix_to_gcolor (FRAME_GTK_WIDGET (f), bg, &gdk_bg);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
958 gtk_widget_modify_bg (FRAME_GTK_WIDGET (f), GTK_STATE_NORMAL, &gdk_bg);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
959 UNBLOCK_INPUT;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
960 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
961 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
962
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
963
65006
ec2fa2e1d4ea * gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 64936
diff changeset
964 /* 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
965 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
966
ec2fa2e1d4ea * gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 64936
diff changeset
967 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
968 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
969 {
ec2fa2e1d4ea * gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 64936
diff changeset
970 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
971 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
972 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
973 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
974
ec2fa2e1d4ea * gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 64936
diff changeset
975 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
976 }
ec2fa2e1d4ea * gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 64936
diff changeset
977
ec2fa2e1d4ea * gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 64936
diff changeset
978
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
979
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
980 /***********************************************************************
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
981 Dialog functions
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
982 ***********************************************************************/
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
983 /* Return the dialog title to use for a dialog of type KEY.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
984 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
985
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
986 static char *
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
987 get_dialog_title (char key)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
988 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
989 char *title = "";
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
990
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
991 switch (key) {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
992 case 'E': case 'e':
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
993 title = "Error";
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
994 break;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
995
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
996 case 'I': case 'i':
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
997 title = "Information";
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
998 break;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
999
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1000 case 'L': case 'l':
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1001 title = "Prompt";
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1002 break;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1003
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1004 case 'P': case 'p':
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1005 title = "Prompt";
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1006 break;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1007
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1008 case 'Q': case 'q':
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1009 title = "Question";
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1010 break;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1011 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1012
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1013 return title;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1014 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1015
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1016 /* Callback for dialogs that get WM_DELETE_WINDOW. We pop down
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1017 the dialog, but return TRUE so the event does not propagate further
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1018 in GTK. This prevents GTK from destroying the dialog widget automatically
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1019 and we can always destrou the widget manually, regardles of how
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1020 it was popped down (button press or WM_DELETE_WINDOW).
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1021 W is the dialog widget.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1022 EVENT is the GdkEvent that represents WM_DELETE_WINDOW (not used).
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1023 user_data is NULL (not used).
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1024
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1025 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
1026
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1027 static gboolean
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1028 dialog_delete_callback (GtkWidget *w, GdkEvent *event, gpointer user_data)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1029 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1030 gtk_widget_unmap (w);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1031 return TRUE;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1032 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1033
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1034 /* Create a popup dialog window. See also xg_create_widget below.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1035 WV is a widget_value describing the dialog.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1036 SELECT_CB is the callback to use when a button has been pressed.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1037 DEACTIVATE_CB is the callback to use when the dialog pops down.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1038
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1039 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
1040
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1041 static GtkWidget *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1042 create_dialog (widget_value *wv, GCallback select_cb, GCallback deactivate_cb)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1043 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1044 char *title = get_dialog_title (wv->name[0]);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1045 int total_buttons = wv->name[1] - '0';
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1046 int right_buttons = wv->name[4] - '0';
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1047 int left_buttons;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1048 int button_nr = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1049 int button_spacing = 10;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1050 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
1051 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
1052 GtkBox *cur_box = GTK_BOX (gtk_dialog_get_action_area (wd));
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1053 widget_value *item;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1054 GtkWidget *wvbox;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1055 GtkWidget *whbox_up;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1056 GtkWidget *whbox_down;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1057
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1058 /* If the number of buttons is greater than 4, make two rows of buttons
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1059 instead. This looks better. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1060 int make_two_rows = total_buttons > 4;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1061
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1062 if (right_buttons == 0) right_buttons = total_buttons/2;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1063 left_buttons = total_buttons - right_buttons;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1064
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1065 gtk_window_set_title (GTK_WINDOW (wdialog), title);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1066 gtk_widget_set_name (wdialog, "emacs-dialog");
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1067
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1068
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1069 if (make_two_rows)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1070 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1071 wvbox = gtk_vbox_new (TRUE, button_spacing);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1072 whbox_up = gtk_hbox_new (FALSE, 0);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1073 whbox_down = gtk_hbox_new (FALSE, 0);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1074
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1075 gtk_box_pack_start (cur_box, wvbox, FALSE, FALSE, 0);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1076 gtk_box_pack_start (GTK_BOX (wvbox), whbox_up, FALSE, FALSE, 0);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1077 gtk_box_pack_start (GTK_BOX (wvbox), whbox_down, FALSE, FALSE, 0);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1078
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1079 cur_box = GTK_BOX (whbox_up);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1080 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1081
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1082 g_signal_connect (G_OBJECT (wdialog), "delete-event",
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1083 G_CALLBACK (dialog_delete_callback), 0);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
1084
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1085 if (deactivate_cb)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1086 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1087 g_signal_connect (G_OBJECT (wdialog), "close", deactivate_cb, 0);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1088 g_signal_connect (G_OBJECT (wdialog), "response", deactivate_cb, 0);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1089 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1090
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1091 for (item = wv->contents; item; item = item->next)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1092 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1093 char *utf8_label = get_utf8_string (item->value);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1094 GtkWidget *w;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1095 GtkRequisition req;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1096
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
1097 if (item->name && strcmp (item->name, "message") == 0)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1098 {
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
1099 GtkBox *wvbox = GTK_BOX (gtk_dialog_get_content_area (wd));
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1100 /* This is the text part of the dialog. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1101 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
1102 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
1103 gtk_box_pack_start (wvbox, w, TRUE, TRUE, 0);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1104 gtk_misc_set_alignment (GTK_MISC (w), 0.1, 0.5);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1105
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1106 /* Try to make dialog look better. Must realize first so
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1107 the widget can calculate the size it needs. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1108 gtk_widget_realize (w);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1109 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
1110 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
1111 if (item->value && strlen (item->value) > 0)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1112 button_spacing = 2*req.width/strlen (item->value);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1113 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1114 else
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1115 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1116 /* 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
1117 w = gtk_button_new_with_label (utf8_label);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1118 if (! item->enabled)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1119 gtk_widget_set_sensitive (w, FALSE);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1120 if (select_cb)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1121 g_signal_connect (G_OBJECT (w), "clicked",
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1122 select_cb, item->call_data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1123
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1124 gtk_box_pack_start (cur_box, w, TRUE, TRUE, button_spacing);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1125 if (++button_nr == left_buttons)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1126 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1127 if (make_two_rows)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1128 cur_box = GTK_BOX (whbox_down);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1129 else
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1130 gtk_box_pack_start (cur_box,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1131 gtk_label_new (""),
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1132 TRUE, TRUE,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1133 button_spacing);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1134 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1135 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1136
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1137 if (utf8_label && utf8_label != item->value)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1138 g_free (utf8_label);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1139 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1140
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1141 return wdialog;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1142 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1143
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
1144 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
1145 {
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
1146 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
1147 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
1148 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
1149 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
1150 };
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
1151
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
1152 /* 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
1153 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
1154 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
1155
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
1156 static void
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
1157 xg_dialog_response_cb (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
1158 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
1159 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
1160 GtkDialog *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
1161 gint 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
1162 gpointer 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
1163 {
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
1164 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
1165 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
1166 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
1167 }
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
1168
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
1169
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
1170 /* 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
1171
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
1172 static Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1173 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
1174 {
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
1175 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
1176 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
1177
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
1178 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
1179 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
1180 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
1181
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
1182 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
1183 g_main_loop_unref (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
1184
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
1185 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
1186
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
1187 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
1188 }
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
1189
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
1190 /* 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
1191 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
1192
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
1193 static gboolean
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1194 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
1195 {
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
1196 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
1197 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
1198 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
1199 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
1200
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
1201 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
1202
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
1203 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
1204 {
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
1205 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
1206 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
1207 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
1208 }
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
1209 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
1210 }
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
1211
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
1212
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
1213 /* 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
1214 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
1215 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
1216
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
1217 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1218 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
1219 {
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
1220 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
1221 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
1222
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
1223 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
1224 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
1225 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
1226 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
1227 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
1228
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
1229 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
1230 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
1231 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
1232 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
1233
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
1234 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
1235 "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
1236 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
1237 &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
1238 /* 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
1239 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
1240 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
1241
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
1242 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
1243
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
1244 (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
1245 g_main_loop_run (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
1246
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
1247 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
1248 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
1249
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
1250 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
1251 }
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1252
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
1253
c955f6add62a * fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents: 57715
diff changeset
1254 /***********************************************************************
c955f6add62a * fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents: 57715
diff changeset
1255 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
1256 ***********************************************************************/
67761
5b8799d65159 * xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67528
diff changeset
1257 /* 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
1258 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
1259
5b8799d65159 * xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67528
diff changeset
1260 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1261 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
1262 {
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
1263 #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
1264 extern int x_gtk_use_old_file_dialog;
e5e5fcf4397e * gtkutil.c (xg_uses_old_file_dialog): Rename x-use-old-gtk-file-dialog
Jan Djärv <jan.h.d@swipnet.se>
parents: 72931
diff changeset
1265 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
1266 #else
5b8799d65159 * xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67528
diff changeset
1267 return 0;
5b8799d65159 * xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67528
diff changeset
1268 #endif
5b8799d65159 * xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67528
diff changeset
1269 }
5b8799d65159 * xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67528
diff changeset
1270
5b8799d65159 * xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67528
diff changeset
1271
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
1272 typedef char * (*xg_get_file_func) (GtkWidget *);
57868
c955f6add62a * fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents: 57715
diff changeset
1273
58200
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1274 /* 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
1275 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
1276
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1277 static char *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1278 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
1279 {
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1280 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
1281 }
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1282
68100
e5611feba7f7 * gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68027
diff changeset
1283 /* 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
1284 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
1285
67843
6cf5dc28bd1e * gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67761
diff changeset
1286 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1287 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
1288 {
6cf5dc28bd1e * gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67761
diff changeset
1289 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
1290 gboolean visible;
6cf5dc28bd1e * gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67761
diff changeset
1291 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
1292 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
1293 }
e5611feba7f7 * gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68027
diff changeset
1294
e5611feba7f7 * gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68027
diff changeset
1295
e5611feba7f7 * gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68027
diff changeset
1296 /* 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
1297 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
1298 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
1299 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
1300 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
1301
e5611feba7f7 * gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68027
diff changeset
1302 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1303 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
1304 {
e5611feba7f7 * gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68027
diff changeset
1305 extern int x_gtk_show_hidden_files;
e5611feba7f7 * gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68027
diff changeset
1306
e5611feba7f7 * gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68027
diff changeset
1307 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
1308 {
e5611feba7f7 * gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68027
diff changeset
1309 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
1310 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
1311
e5611feba7f7 * gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68027
diff changeset
1312 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
1313 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
1314
e5611feba7f7 * gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68027
diff changeset
1315 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
1316 {
e5611feba7f7 * gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68027
diff changeset
1317 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
1318 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
1319 gobject);
e5611feba7f7 * gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68027
diff changeset
1320 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
1321 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
1322 (G_OBJECT (wtoggle),
e5611feba7f7 * gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68027
diff changeset
1323 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
1324 gobject);
e5611feba7f7 * gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68027
diff changeset
1325 }
e5611feba7f7 * gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68027
diff changeset
1326 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
1327 }
67843
6cf5dc28bd1e * gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67761
diff changeset
1328 }
6cf5dc28bd1e * gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67761
diff changeset
1329
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
1330 /* 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
1331 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
1332 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
1333 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
1334 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
1335 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
1336 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
1337
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1338 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
1339
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1340 static GtkWidget *
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1341 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
1342 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
1343 FRAME_PTR f;
c955f6add62a * fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents: 57715
diff changeset
1344 char *prompt;
c955f6add62a * fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents: 57715
diff changeset
1345 char *default_filename;
c955f6add62a * fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents: 57715
diff changeset
1346 int mustmatch_p, only_dir_p;
58200
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1347 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
1348 {
67843
6cf5dc28bd1e * gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67761
diff changeset
1349 char message[1024];
6cf5dc28bd1e * gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67761
diff changeset
1350
6cf5dc28bd1e * gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67761
diff changeset
1351 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
1352 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
1353 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
1354 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
1355 GTK_FILE_CHOOSER_ACTION_SAVE);
67843
6cf5dc28bd1e * gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67761
diff changeset
1356 extern int x_gtk_show_hidden_files;
72968
13a9a628ff21 * gtkutil.c (xg_get_file_with_chooser): Rename x_gtk_show_chooser_help_text to
Jan Djärv <jan.h.d@swipnet.se>
parents: 72963
diff changeset
1357 extern int x_gtk_file_dialog_help_text;
72931
0ee8cea94c25 * gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents: 72928
diff changeset
1358
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
1359
c955f6add62a * fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents: 57715
diff changeset
1360 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
1361 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
1362
c955f6add62a * fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents: 57715
diff changeset
1363 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
1364 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
1365 (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
1366 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
1367 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
1368 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
1369 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
1370
67843
6cf5dc28bd1e * gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67761
diff changeset
1371 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
1372 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
1373 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
1374
43221c2f4272 Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 100951
diff changeset
1375 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
1376 {
6cf5dc28bd1e * gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67761
diff changeset
1377 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
1378 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
1379 }
6cf5dc28bd1e * gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67761
diff changeset
1380 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
1381 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
1382 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
1383 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
1384 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
1385
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
1386 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
1387 {
0ee8cea94c25 * gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents: 72928
diff changeset
1388 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
1389 /* 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
1390 Show the C-l help text only for versions < 2.10. */
73066
dcaff8f63a2b Whitespace fix.
Richard M. Stallman <rms@gnu.org>
parents: 73048
diff changeset
1391 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
1392 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
1393 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
1394 "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
1395 "use-file-dialog to turn it off.");
102283
43221c2f4272 Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 100951
diff changeset
1396
72931
0ee8cea94c25 * gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents: 72928
diff changeset
1397 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
1398 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
1399 }
0ee8cea94c25 * gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents: 72928
diff changeset
1400
67843
6cf5dc28bd1e * gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67761
diff changeset
1401 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
1402 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
1403 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
1404 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
1405
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
1406 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
1407 {
a3fa0e63dd67 * gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents: 57900
diff changeset
1408 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
1409 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
1410 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
1411 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
1412
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
1413 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
1414
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
1415 /* 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
1416 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
1417 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
1418 file = Fexpand_file_name (file, Qnil);
102283
43221c2f4272 Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 100951
diff changeset
1419
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
1420 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
1421 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
1422 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
1423 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
1424 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
1425 {
af91ff74c754 * gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents: 71160
diff changeset
1426 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
1427 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
1428 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
1429 {
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
1430 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
1431 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
1432 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
1433 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
1434 }
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
1435 }
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
1436
a3fa0e63dd67 * gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents: 57900
diff changeset
1437 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
1438 }
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
1439
58200
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1440 *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
1441 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
1442 }
c955f6add62a * fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents: 57715
diff changeset
1443
c955f6add62a * fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents: 57715
diff changeset
1444 #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
1445
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1446 /* 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
1447 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
1448
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1449 static char *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1450 xg_get_file_name_from_selector (GtkWidget *w)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1451 {
58200
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1452 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
1453 return xstrdup ((char*) gtk_file_selection_get_filename (filesel));
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1454 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1455
58200
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1456 /* Create a file selection dialog.
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1457 F is the current frame.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1458 PROMPT is a prompt to show to the user. May not be NULL.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1459 DEFAULT_FILENAME is a default selection to be displayed. May be NULL.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1460 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
1461 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
1462 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
1463
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1464 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
1465
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1466 static GtkWidget *
57868
c955f6add62a * fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents: 57715
diff changeset
1467 xg_get_file_with_selection (f, prompt, default_filename,
58200
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1468 mustmatch_p, only_dir_p, func)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1469 FRAME_PTR f;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1470 char *prompt;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1471 char *default_filename;
57868
c955f6add62a * fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents: 57715
diff changeset
1472 int mustmatch_p, only_dir_p;
58200
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1473 xg_get_file_func *func;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1474 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1475 GtkWidget *filewin;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1476 GtkFileSelection *filesel;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
1477
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1478 filewin = gtk_file_selection_new (prompt);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1479 filesel = GTK_FILE_SELECTION (filewin);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1480
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1481 if (default_filename)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1482 gtk_file_selection_set_filename (filesel, default_filename);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1483
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1484 if (mustmatch_p)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1485 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1486 /* The selection_entry part of filesel is not documented. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1487 gtk_widget_set_sensitive (filesel->selection_entry, FALSE);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1488 gtk_file_selection_hide_fileop_buttons (filesel);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1489 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1490
58200
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1491 *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
1492
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1493 return filewin;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1494 }
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
1495 #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
1496
c955f6add62a * fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents: 57715
diff changeset
1497 /* 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
1498 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
1499 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
1500 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
1501 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
1502 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
1503 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
1504 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
1505 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
1506
c955f6add62a * fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents: 57715
diff changeset
1507 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
1508 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
1509
c955f6add62a * fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents: 57715
diff changeset
1510 char *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1511 xg_get_file_name (FRAME_PTR f, char *prompt, char *default_filename, int mustmatch_p, 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
1512 {
58284
10efc827e15c * gtkutil.c (xg_get_file_name): Fix typo in
Jan Djärv <jan.h.d@swipnet.se>
parents: 58201
diff changeset
1513 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
1514 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
1515 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
1516 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
1517
58818
f8cddae7d959 * gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents: 58817
diff changeset
1518 #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
1519 /* 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
1520 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
1521 threads. */
f8cddae7d959 * gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents: 58817
diff changeset
1522 sigblock (sigmask (__SIGRTMIN));
f8cddae7d959 * gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents: 58817
diff changeset
1523 #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
1524
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
1525 #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
1526
67761
5b8799d65159 * xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 67528
diff changeset
1527 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
1528 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
1529 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
1530 else
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1531 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
1532 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
1533
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
1534 #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
1535 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
1536 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
1537 #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
1538
3608b64ba20f * gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents: 57941
diff changeset
1539 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
1540
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
1541 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
1542
58818
f8cddae7d959 * gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents: 58817
diff changeset
1543 #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
1544 sigunblock (sigmask (__SIGRTMIN));
f8cddae7d959 * gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents: 58817
diff changeset
1545 #endif
f8cddae7d959 * gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents: 58817
diff changeset
1546
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 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
1548 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
1549
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
1550 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
1551 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
1552 }
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1553
95794
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1554 #ifdef HAVE_FREETYPE
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1555 /* 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
1556 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
1557 format:
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1558
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1559 `FAMILY [VALUE1 VALUE2] SIZE'
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1560
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1561 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
1562 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
1563
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1564 char *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1565 xg_get_font_name (FRAME_PTR f, char *default_name)
95794
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1566 {
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
1567 GtkWidget *w;
95794
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1568 char *fontname = NULL;
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1569 int done = 0;
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1570
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1571 #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
1572 sigblock (sigmask (__SIGRTMIN));
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1573 #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
1574
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1575 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
1576 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
1577 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
1578 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
1579 default_name);
95794
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1580
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1581 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
1582
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
1583 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
1584
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1585 #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
1586 sigunblock (sigmask (__SIGRTMIN));
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1587 #endif
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1588
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1589 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
1590 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
1591 (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
1592
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
1593 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
1594 return fontname;
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1595 }
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1596 #endif /* HAVE_FREETYPE */
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1597
e4d692886628 (xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents: 95481
diff changeset
1598
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1599
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1600 /***********************************************************************
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1601 Menu functions.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1602 ***********************************************************************/
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1603
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
1604 /* The name of menu items that can be used for customization. Since GTK
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1605 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
1606 menu item names so a user can easily customize menu items. */
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1607
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1608 #define MENU_ITEM_NAME "emacs-menuitem"
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1609
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1610
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1611 /* Linked list of all allocated struct xg_menu_cb_data. Used for marking
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1612 during GC. The next member points to the items. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1613 static xg_list_node xg_menu_cb_list;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1614
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1615 /* Linked list of all allocated struct xg_menu_item_cb_data. Used for marking
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1616 during GC. The next member points to the items. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1617 static xg_list_node xg_menu_item_cb_list;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1618
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1619 /* Allocate and initialize CL_DATA if NULL, otherwise increase ref_count.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1620 F is the frame CL_DATA will be initialized for.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1621 HIGHLIGHT_CB is the callback to call when entering/leaving menu items.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1622
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1623 The menu bar and all sub menus under the menu bar in a frame
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1624 share the same structure, hence the reference count.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
1625
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1626 Returns CL_DATA if CL_DATA is not NULL, or a pointer to a newly
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1627 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
1628
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1629 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
1630 make_cl_data (xg_menu_cb_data *cl_data, FRAME_PTR f, GCallback highlight_cb)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1631 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1632 if (! cl_data)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1633 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1634 cl_data = (xg_menu_cb_data*) xmalloc (sizeof (*cl_data));
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1635 cl_data->f = f;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1636 cl_data->menu_bar_vector = f->menu_bar_vector;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1637 cl_data->menu_bar_items_used = f->menu_bar_items_used;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1638 cl_data->highlight_cb = highlight_cb;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1639 cl_data->ref_count = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1640
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1641 xg_list_insert (&xg_menu_cb_list, &cl_data->ptrs);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1642 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1643
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1644 cl_data->ref_count++;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1645
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1646 return cl_data;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1647 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1648
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1649 /* Update CL_DATA with values from frame F and with HIGHLIGHT_CB.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1650 HIGHLIGHT_CB is the callback to call when entering/leaving menu items.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1651
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1652 When the menu bar is updated, menu items may have been added and/or
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1653 removed, so menu_bar_vector and menu_bar_items_used change. We must
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1654 then update CL_DATA since it is used to determine which menu
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1655 item that is invoked in the menu.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1656 HIGHLIGHT_CB could change, there is no check that the same
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1657 function is given when modifying a menu bar as was given when
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1658 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
1659
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1660 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1661 update_cl_data (xg_menu_cb_data *cl_data, FRAME_PTR f, GCallback highlight_cb)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1662 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1663 if (cl_data)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1664 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1665 cl_data->f = f;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1666 cl_data->menu_bar_vector = f->menu_bar_vector;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1667 cl_data->menu_bar_items_used = f->menu_bar_items_used;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1668 cl_data->highlight_cb = highlight_cb;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1669 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1670 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1671
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1672 /* Decrease reference count for CL_DATA.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1673 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
1674
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1675 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1676 unref_cl_data (xg_menu_cb_data *cl_data)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1677 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1678 if (cl_data && cl_data->ref_count > 0)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1679 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1680 cl_data->ref_count--;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1681 if (cl_data->ref_count == 0)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1682 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1683 xg_list_remove (&xg_menu_cb_list, &cl_data->ptrs);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1684 xfree (cl_data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1685 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1686 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1687 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1688
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1689 /* 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
1690
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1691 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1692 xg_mark_data (void)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1693 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1694 xg_list_node *iter;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1695
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1696 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
1697 mark_object (((xg_menu_cb_data *) iter)->menu_bar_vector);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1698
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1699 for (iter = xg_menu_item_cb_list.next; iter; iter = iter->next)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1700 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1701 xg_menu_item_cb_data *cb_data = (xg_menu_item_cb_data *) iter;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1702
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1703 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
1704 mark_object (cb_data->help);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1705 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1706 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1707
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1708
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1709 /* Callback called when a menu item is destroyed. Used to free data.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1710 W is the widget that is being destroyed (not used).
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1711 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
1712
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1713 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1714 menuitem_destroy_callback (GtkWidget *w, gpointer client_data)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1715 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1716 if (client_data)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1717 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1718 xg_menu_item_cb_data *data = (xg_menu_item_cb_data*) client_data;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1719 xg_list_remove (&xg_menu_item_cb_list, &data->ptrs);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1720 xfree (data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1721 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1722 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1723
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1724 /* 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
1725 W is the parent of the menu item.
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1726 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
1727 CLIENT_DATA is not used.
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1728
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1729 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
1730
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1731 static gboolean
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1732 menuitem_highlight_callback (GtkWidget *w, GdkEventCrossing *event, gpointer client_data)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1733 {
75040
37202e2fc35f (menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents: 75009
diff changeset
1734 GdkEvent ev;
37202e2fc35f (menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents: 75009
diff changeset
1735 GtkWidget *subwidget;
37202e2fc35f (menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents: 75009
diff changeset
1736 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
1737
37202e2fc35f (menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents: 75009
diff changeset
1738 ev.crossing = *event;
37202e2fc35f (menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents: 75009
diff changeset
1739 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
1740 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
1741 XG_ITEM_DATA);
37202e2fc35f (menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents: 75009
diff changeset
1742 if (data)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1743 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1744 if (! NILP (data->help) && data->cl_data->highlight_cb)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1745 {
75040
37202e2fc35f (menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents: 75009
diff changeset
1746 gpointer call_data = event->type == GDK_LEAVE_NOTIFY ? 0 : data;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1747 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
1748 (*func) (subwidget, call_data);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1749 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1750 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1751
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1752 return FALSE;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1753 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1754
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1755 /* Callback called when a menu is destroyed. Used to free data.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1756 W is the widget that is being destroyed (not used).
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1757 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
1758
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1759 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1760 menu_destroy_callback (GtkWidget *w, gpointer client_data)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1761 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1762 unref_cl_data ((xg_menu_cb_data*) client_data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1763 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1764
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1765 /* Make a GTK widget that contains both UTF8_LABEL and UTF8_KEY (both
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1766 must be non-NULL) and can be inserted into a menu item.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1767
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1768 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
1769
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1770 static GtkWidget *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1771 make_widget_for_menu_item (char *utf8_label, char *utf8_key)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1772 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1773 GtkWidget *wlbl;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1774 GtkWidget *wkey;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1775 GtkWidget *wbox;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
1776
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1777 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
1778 wlbl = gtk_label_new (utf8_label);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1779 wkey = gtk_label_new (utf8_key);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1780
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1781 gtk_misc_set_alignment (GTK_MISC (wlbl), 0.0, 0.5);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1782 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
1783
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1784 gtk_box_pack_start (GTK_BOX (wbox), wlbl, TRUE, TRUE, 0);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1785 gtk_box_pack_start (GTK_BOX (wbox), wkey, FALSE, FALSE, 0);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1786
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1787 gtk_widget_set_name (wlbl, MENU_ITEM_NAME);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1788 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
1789 gtk_widget_set_name (wbox, MENU_ITEM_NAME);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1790
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1791 return wbox;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1792 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1793
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1794 /* Make and return a menu item widget with the key to the right.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1795 UTF8_LABEL is the text for the menu item (GTK uses UTF8 internally).
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1796 UTF8_KEY is the text representing the key binding.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1797 ITEM is the widget_value describing the menu item.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
1798
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1799 GROUP is an in/out parameter. If the menu item to be created is not
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1800 part of any radio menu group, *GROUP contains NULL on entry and exit.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1801 If the menu item to be created is part of a radio menu group, on entry
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1802 *GROUP contains the group to use, or NULL if this is the first item
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1803 in the group. On exit, *GROUP contains the radio item group.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1804
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1805 Unfortunately, keys don't line up as nicely as in Motif,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1806 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
1807
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1808 static GtkWidget *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1809 make_menu_item (char *utf8_label, char *utf8_key, widget_value *item, GSList **group)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1810 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1811 GtkWidget *w;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1812 GtkWidget *wtoadd = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
1813
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
1814 /* 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
1815 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
1816 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
1817 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
1818 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
1819
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1820 if (utf8_key)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1821 wtoadd = make_widget_for_menu_item (utf8_label, utf8_key);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
1822
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1823 if (item->button_type == BUTTON_TYPE_TOGGLE)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1824 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1825 *group = NULL;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1826 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
1827 else w = gtk_check_menu_item_new_with_label (utf8_label);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1828 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), item->selected);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1829 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1830 else if (item->button_type == BUTTON_TYPE_RADIO)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1831 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1832 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
1833 else w = gtk_radio_menu_item_new_with_label (*group, utf8_label);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1834 *group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (w));
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1835 if (item->selected)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1836 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), TRUE);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1837 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1838 else
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1839 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1840 *group = NULL;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1841 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
1842 else w = gtk_menu_item_new_with_label (utf8_label);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1843 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
1844
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1845 if (wtoadd) gtk_container_add (GTK_CONTAINER (w), wtoadd);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1846 if (! item->enabled) gtk_widget_set_sensitive (w, FALSE);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1847
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1848 return w;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1849 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1850
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
1851 /* Return non-zero if LABEL specifies a separator (GTK only has one
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1852 separator type) */
57715
cdc48cdd5b0e * gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 57597
diff changeset
1853
105959
ba3ffbd9c422 * process.c (ifflag_def): Make flag_sym constant.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105936
diff changeset
1854 static const char* separator_names[] = {
78787
96a27ec4e6c5 (xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78781
diff changeset
1855 "space",
96a27ec4e6c5 (xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78781
diff changeset
1856 "no-line",
96a27ec4e6c5 (xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78781
diff changeset
1857 "single-line",
96a27ec4e6c5 (xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78781
diff changeset
1858 "double-line",
96a27ec4e6c5 (xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78781
diff changeset
1859 "single-dashed-line",
96a27ec4e6c5 (xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78781
diff changeset
1860 "double-dashed-line",
96a27ec4e6c5 (xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78781
diff changeset
1861 "shadow-etched-in",
96a27ec4e6c5 (xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78781
diff changeset
1862 "shadow-etched-out",
96a27ec4e6c5 (xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78781
diff changeset
1863 "shadow-etched-in-dash",
96a27ec4e6c5 (xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78781
diff changeset
1864 "shadow-etched-out-dash",
96a27ec4e6c5 (xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78781
diff changeset
1865 "shadow-double-etched-in",
96a27ec4e6c5 (xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78781
diff changeset
1866 "shadow-double-etched-out",
96a27ec4e6c5 (xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78781
diff changeset
1867 "shadow-double-etched-in-dash",
96a27ec4e6c5 (xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78781
diff changeset
1868 "shadow-double-etched-out-dash",
96a27ec4e6c5 (xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78781
diff changeset
1869 0,
96a27ec4e6c5 (xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78781
diff changeset
1870 };
96a27ec4e6c5 (xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78781
diff changeset
1871
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1872 static int
50318
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1873 xg_separator_p (char *label)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1874 {
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
1875 if (! label) return 0;
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1876 else if (strlen (label) > 3
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1877 && strncmp (label, "--", 2) == 0
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1878 && label[2] != '-')
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1879 {
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1880 int i;
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1881
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1882 label += 2;
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1883 for (i = 0; separator_names[i]; ++i)
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1884 if (strcmp (label, separator_names[i]) == 0)
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1885 return 1;
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1886 }
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1887 else
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1888 {
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1889 /* Old-style separator, maybe. It's a separator if it contains
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1890 only dashes. */
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1891 while (*label == '-')
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1892 ++label;
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1893 if (*label == 0) return 1;
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1894 }
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1895
5b50d76d9211 * gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50272
diff changeset
1896 return 0;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1897 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1898
52981
54482f5ea7be Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
1899 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
1900
54482f5ea7be Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
1901 /* 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
1902
52981
54482f5ea7be Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
1903 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1904 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
1905 {
54482f5ea7be Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
1906 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
1907 }
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1908
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1909 /* 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
1910 decrease the xg_detached_menus count.
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1911 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
1912 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
1913
52981
54482f5ea7be Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
1914 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1915 tearoff_remove (GtkWidget *widget, gpointer client_data)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1916 {
52981
54482f5ea7be Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
1917 if (xg_detached_menus > 0) --xg_detached_menus;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1918 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1919
52981
54482f5ea7be Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
1920 /* 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
1921 xg_detached_menus count.
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1922 WIDGET is the GtkTearoffMenuItem.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
1923 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
1924
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1925 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1926 tearoff_activate (GtkWidget *widget, gpointer client_data)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1927 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1928 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
1929 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
1930 {
54482f5ea7be Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
1931 ++xg_detached_menus;
54482f5ea7be Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
1932 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
1933 "destroy",
54482f5ea7be Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
1934 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
1935 }
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1936 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1937
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1938
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1939 /* Create a menu item widget, and connect the callbacks.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1940 ITEM decribes the menu item.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1941 F is the frame the created menu belongs to.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1942 SELECT_CB is the callback to use when a menu item is selected.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1943 HIGHLIGHT_CB is the callback to call when entering/leaving menu items.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1944 CL_DATA points to the callback data to be used for this menu.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1945 GROUP is an in/out parameter. If the menu item to be created is not
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1946 part of any radio menu group, *GROUP contains NULL on entry and exit.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1947 If the menu item to be created is part of a radio menu group, on entry
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1948 *GROUP contains the group to use, or NULL if this is the first item
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1949 in the group. On exit, *GROUP contains the radio item group.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1950
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1951 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
1952
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1953 static GtkWidget *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1954 xg_create_one_menuitem (widget_value *item, FRAME_PTR f, GCallback select_cb, GCallback highlight_cb, xg_menu_cb_data *cl_data, GSList **group)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1955 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1956 char *utf8_label;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1957 char *utf8_key;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1958 GtkWidget *w;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1959 xg_menu_item_cb_data *cb_data;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1960
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1961 utf8_label = get_utf8_string (item->name);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1962 utf8_key = get_utf8_string (item->key);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1963
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1964 w = make_menu_item (utf8_label, utf8_key, item, group);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1965
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1966 if (utf8_label && utf8_label != item->name) g_free (utf8_label);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1967 if (utf8_key && utf8_key != item->key) g_free (utf8_key);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1968
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1969 cb_data = xmalloc (sizeof (xg_menu_item_cb_data));
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1970
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1971 xg_list_insert (&xg_menu_item_cb_list, &cb_data->ptrs);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1972
75040
37202e2fc35f (menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents: 75009
diff changeset
1973 cb_data->select_id = 0;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1974 cb_data->help = item->help;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1975 cb_data->cl_data = cl_data;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1976 cb_data->call_data = item->call_data;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
1977
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1978 g_signal_connect (G_OBJECT (w),
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1979 "destroy",
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1980 G_CALLBACK (menuitem_destroy_callback),
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1981 cb_data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1982
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1983 /* Put cb_data in widget, so we can get at it when modifying menubar */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1984 g_object_set_data (G_OBJECT (w), XG_ITEM_DATA, cb_data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1985
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1986 /* final item, not a submenu */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1987 if (item->call_data && ! item->contents)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1988 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1989 if (select_cb)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1990 cb_data->select_id
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1991 = g_signal_connect (G_OBJECT (w), "activate", select_cb, cb_data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1992 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1993
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1994 return w;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1995 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1996
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
1997 static GtkWidget *create_menus (widget_value *, FRAME_PTR, GCallback,
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
1998 GCallback, GCallback, int, int, int,
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
1999 GtkWidget *, xg_menu_cb_data *, char *);
50112
50df9e41f1a3 Add prototype for create_menus.
Andreas Schwab <schwab@suse.de>
parents: 50108
diff changeset
2000
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2001 /* Create a full menu tree specified by DATA.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2002 F is the frame the created menu belongs to.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2003 SELECT_CB is the callback to use when a menu item is selected.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2004 DEACTIVATE_CB is the callback to use when a sub menu is not shown anymore.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2005 HIGHLIGHT_CB is the callback to call when entering/leaving menu items.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2006 POP_UP_P is non-zero if we shall create a popup menu.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2007 MENU_BAR_P is non-zero if we shall create a menu bar.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2008 ADD_TEAROFF_P is non-zero if we shall add a teroff menu item. Ignored
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2009 if MENU_BAR_P is non-zero.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2010 TOPMENU is the topmost GtkWidget that others shall be placed under.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2011 It may be NULL, in that case we create the appropriate widget
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2012 (menu bar or menu item depending on POP_UP_P and MENU_BAR_P)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2013 CL_DATA is the callback data we shall use for this menu, or NULL
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2014 if we haven't set the first callback yet.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2015 NAME is the name to give to the top level menu if this function
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2016 creates it. May be NULL to not set any name.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2017
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2018 Returns the top level GtkWidget. This is TOPLEVEL if TOPLEVEL is
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2019 not NULL.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2020
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2021 This function calls itself to create submenus. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2022
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2023 static GtkWidget *
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2024 create_menus (data, f, select_cb, deactivate_cb, highlight_cb,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2025 pop_up_p, menu_bar_p, add_tearoff_p, topmenu, cl_data, name)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2026 widget_value *data;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2027 FRAME_PTR f;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2028 GCallback select_cb;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2029 GCallback deactivate_cb;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2030 GCallback highlight_cb;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2031 int pop_up_p;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2032 int menu_bar_p;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2033 int add_tearoff_p;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2034 GtkWidget *topmenu;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2035 xg_menu_cb_data *cl_data;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2036 char *name;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2037 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2038 widget_value *item;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2039 GtkWidget *wmenu = topmenu;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2040 GSList *group = NULL;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2041
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2042 if (! topmenu)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2043 {
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
2044 if (! menu_bar_p)
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
2045 {
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
2046 wmenu = gtk_menu_new ();
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
2047 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
2048 /* 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
2049 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
2050 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
2051 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
2052 "enter-notify-event",
37202e2fc35f (menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents: 75009
diff changeset
2053 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
2054 NULL);
37202e2fc35f (menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents: 75009
diff changeset
2055 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
2056 "leave-notify-event",
37202e2fc35f (menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents: 75009
diff changeset
2057 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
2058 NULL);
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
2059 }
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
2060 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
2061 {
695dbf5b3bb9 gtkutil.c (create_menus): Call gtk_widget_set_size_request for
Jan Djärv <jan.h.d@swipnet.se>
parents: 103916
diff changeset
2062 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
2063 /* 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
2064 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
2065 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
2066 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
2067 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
2068 }
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2069
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2070 /* Put cl_data on the top menu for easier access. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2071 cl_data = make_cl_data (cl_data, f, highlight_cb);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2072 g_object_set_data (G_OBJECT (wmenu), XG_FRAME_DATA, (gpointer)cl_data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2073 g_signal_connect (G_OBJECT (wmenu), "destroy",
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2074 G_CALLBACK (menu_destroy_callback), cl_data);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
2075
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2076 if (name)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2077 gtk_widget_set_name (wmenu, name);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2078
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2079 if (deactivate_cb)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2080 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
2081 "selection-done", deactivate_cb, 0);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2082 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
2083
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2084 if (! menu_bar_p && add_tearoff_p)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2085 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2086 GtkWidget *tearoff = gtk_tearoff_menu_item_new ();
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2087 gtk_menu_shell_append (GTK_MENU_SHELL (wmenu), tearoff);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2088
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2089 g_signal_connect (G_OBJECT (tearoff), "activate",
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2090 G_CALLBACK (tearoff_activate), 0);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2091 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2092
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2093 for (item = data; item; item = item->next)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2094 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2095 GtkWidget *w;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
2096
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2097 if (pop_up_p && !item->contents && !item->call_data
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2098 && !xg_separator_p (item->name))
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2099 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2100 char *utf8_label;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2101 /* A title for a popup. We do the same as GTK does when
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2102 creating titles, but it does not look good. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2103 group = NULL;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2104 utf8_label = get_utf8_string (item->name);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2105
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2106 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
2107 w = gtk_menu_item_new_with_label (utf8_label);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2108 gtk_widget_set_sensitive (w, FALSE);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2109 if (utf8_label && utf8_label != item->name) g_free (utf8_label);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2110 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2111 else if (xg_separator_p (item->name))
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2112 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2113 group = NULL;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2114 /* GTK only have one separator type. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2115 w = gtk_separator_menu_item_new ();
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2116 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2117 else
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2118 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2119 w = xg_create_one_menuitem (item,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2120 f,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2121 item->contents ? 0 : select_cb,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2122 highlight_cb,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2123 cl_data,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2124 &group);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2125
77511
1962a74982ce (xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents: 76906
diff changeset
2126 /* 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
2127 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
2128 if (item->contents || menu_bar_p)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2129 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2130 GtkWidget *submenu = create_menus (item->contents,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2131 f,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2132 select_cb,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2133 deactivate_cb,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2134 highlight_cb,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2135 0,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2136 0,
52981
54482f5ea7be Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
2137 add_tearoff_p,
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2138 0,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2139 cl_data,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2140 0);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2141 gtk_menu_item_set_submenu (GTK_MENU_ITEM (w), submenu);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2142 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2143 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2144
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2145 gtk_menu_shell_append (GTK_MENU_SHELL (wmenu), w);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2146 gtk_widget_set_name (w, MENU_ITEM_NAME);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2147 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2148
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2149 return wmenu;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2150 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2151
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2152 /* Create a menubar, popup menu or dialog, depending on the TYPE argument.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2153 TYPE can be "menubar", "popup" for popup menu, or "dialog" for a dialog
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2154 with some text and buttons.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2155 F is the frame the created item belongs to.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2156 NAME is the name to use for the top widget.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2157 VAL is a widget_value structure describing items to be created.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2158 SELECT_CB is the callback to use when a menu item is selected or
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2159 a dialog button is pressed.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2160 DEACTIVATE_CB is the callback to use when an item is deactivated.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2161 For a menu, when a sub menu is not shown anymore, for a dialog it is
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2162 called when the dialog is popped down.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2163 HIGHLIGHT_CB is the callback to call when entering/leaving menu items.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2164
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2165 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
2166
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2167 GtkWidget *
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2168 xg_create_widget (type, name, f, val,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2169 select_cb, deactivate_cb, highlight_cb)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2170 char *type;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2171 char *name;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2172 FRAME_PTR f;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2173 widget_value *val;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2174 GCallback select_cb;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2175 GCallback deactivate_cb;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2176 GCallback highlight_cb;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2177 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2178 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
2179 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
2180 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
2181
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2182 if (strcmp (type, "dialog") == 0)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2183 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2184 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
2185 xg_set_screen (w, f);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2186 gtk_window_set_transient_for (GTK_WINDOW (w),
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2187 GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)));
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2188 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
2189 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
2190 gtk_window_set_modal (GTK_WINDOW (w), TRUE);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2191 }
52981
54482f5ea7be Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
2192 else if (menu_bar_p || pop_up_p)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2193 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2194 w = create_menus (val->contents,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2195 f,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2196 select_cb,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2197 deactivate_cb,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2198 highlight_cb,
52981
54482f5ea7be Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
2199 pop_up_p,
54482f5ea7be Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
2200 menu_bar_p,
54482f5ea7be Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
2201 menu_bar_p,
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2202 0,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2203 0,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2204 name);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2205
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2206 /* Set the cursor to an arrow for popup menus when they are mapped.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2207 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
2208 if (pop_up_p)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2209 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2210 /* Must realize so the GdkWindow inside the widget is created. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2211 gtk_widget_realize (w);
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
2212 xg_set_cursor (w, FRAME_X_DISPLAY_INFO (f)->xg_cursor);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2213 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2214 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2215 else
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2216 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2217 fprintf (stderr, "bad type in xg_create_widget: %s, doing nothing\n",
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2218 type);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2219 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2220
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2221 return w;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2222 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2223
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
2224 /* 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
2225
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2226 static const char *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
2227 xg_get_menu_item_label (GtkMenuItem *witem)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2228 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2229 GtkLabel *wlabel = GTK_LABEL (gtk_bin_get_child (GTK_BIN (witem)));
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2230 return gtk_label_get_label (wlabel);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2231 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2232
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
2233 /* 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
2234
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2235 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
2236 xg_item_label_same_p (GtkMenuItem *witem, char *label)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2237 {
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
2238 int is_same = 0;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2239 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
2240 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
2241
da6abcaef15c gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49468
diff changeset
2242 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
2243 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
2244 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
2245 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
2246
da6abcaef15c gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49468
diff changeset
2247 if (utf8_label && utf8_label != label) g_free (utf8_label);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2248
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2249 return is_same;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2250 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2251
57715
cdc48cdd5b0e * gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 57597
diff changeset
2252 /* 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
2253
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2254 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
2255 xg_destroy_widgets (GList *list)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2256 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2257 GList *iter;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2258
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2259 for (iter = list; iter; iter = g_list_next (iter))
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2260 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2261 GtkWidget *w = GTK_WIDGET (iter->data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2262
57715
cdc48cdd5b0e * gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 57597
diff changeset
2263 /* Destroying the widget will remove it from the container it is in. */
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2264 gtk_widget_destroy (w);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2265 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2266 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2267
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2268 /* Update the top level names in MENUBAR (i.e. not submenus).
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2269 F is the frame the menu bar belongs to.
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2270 *LIST is a list with the current menu bar names (menu item widgets).
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2271 ITER is the item within *LIST that shall be updated.
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2272 POS is the numerical position, starting at 0, of ITER in *LIST.
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2273 VAL describes what the menu bar shall look like after the update.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2274 SELECT_CB is the callback to use when a menu item is selected.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2275 HIGHLIGHT_CB is the callback to call when entering/leaving menu items.
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2276 CL_DATA points to the callback data to be used for this menu bar.
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2277
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2278 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
2279
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2280 static void
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2281 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
2282 select_cb, deactivate_cb, highlight_cb, cl_data)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2283 GtkWidget *menubar;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2284 FRAME_PTR f;
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2285 GList **list;
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2286 GList *iter;
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2287 int pos;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2288 widget_value *val;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2289 GCallback select_cb;
96971
8a07ea5be91d (xg_get_font_name): Cast w to GTK_FONT_SELECTION_DIALOG.
Jan Djärv <jan.h.d@swipnet.se>
parents: 96774
diff changeset
2290 GCallback deactivate_cb;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2291 GCallback highlight_cb;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2292 xg_menu_cb_data *cl_data;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2293 {
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2294 if (! iter && ! val)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2295 return;
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2296 else if (iter && ! val)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2297 {
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2298 /* 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
2299 xg_destroy_widgets (iter);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2300
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
2301 /* 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
2302 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
2303 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
2304 0);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2305 /* All updated. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2306 val = 0;
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2307 iter = 0;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2308 }
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2309 else if (! iter && val)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2310 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2311 /* 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
2312 create_menus (val, f, select_cb, deactivate_cb, highlight_cb,
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2313 0, 1, 0, menubar, cl_data, 0);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2314
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2315 /* All updated. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2316 val = 0;
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2317 iter = 0;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2318 }
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2319 /* Below this neither iter or val is NULL */
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2320 else if (xg_item_label_same_p (GTK_MENU_ITEM (iter->data), val->name))
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2321 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2322 /* This item is still the same, check next item. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2323 val = val->next;
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2324 iter = g_list_next (iter);
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2325 ++pos;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2326 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2327 else /* This item is changed. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2328 {
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2329 GtkMenuItem *witem = GTK_MENU_ITEM (iter->data);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2330 GtkMenuItem *witem2 = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2331 int val_in_menubar = 0;
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2332 int iter_in_new_menubar = 0;
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2333 GList *iter2;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2334 widget_value *cur;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2335
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2336 /* See if the changed entry (val) is present later in the menu bar */
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2337 for (iter2 = iter;
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2338 iter2 && ! val_in_menubar;
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2339 iter2 = g_list_next (iter2))
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2340 {
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2341 witem2 = GTK_MENU_ITEM (iter2->data);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2342 val_in_menubar = xg_item_label_same_p (witem2, val->name);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2343 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2344
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2345 /* See if the current entry (iter) is present later in the
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2346 specification for the new menu bar. */
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2347 for (cur = val; cur && ! iter_in_new_menubar; cur = cur->next)
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2348 iter_in_new_menubar = xg_item_label_same_p (witem, cur->name);
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2349
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2350 if (val_in_menubar && ! iter_in_new_menubar)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2351 {
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2352 int nr = pos;
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2353
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2354 /* This corresponds to:
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2355 Current: A B C
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2356 New: A C
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2357 Remove B. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
2358
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
2359 g_object_ref (G_OBJECT (witem));
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2360 gtk_container_remove (GTK_CONTAINER (menubar), GTK_WIDGET (witem));
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2361 gtk_widget_destroy (GTK_WIDGET (witem));
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2362
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2363 /* Must get new list since the old changed. */
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2364 g_list_free (*list);
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2365 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar));
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2366 while (nr-- > 0) iter = g_list_next (iter);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2367 }
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2368 else if (! val_in_menubar && ! iter_in_new_menubar)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2369 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2370 /* This corresponds to:
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2371 Current: A B C
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2372 New: A X C
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2373 Rename B to X. This might seem to be a strange thing to do,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2374 since if there is a menu under B it will be totally wrong for X.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2375 But consider editing a C file. Then there is a C-mode menu
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2376 (corresponds to B above).
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2377 If then doing C-x C-f the minibuf menu (X above) replaces the
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2378 C-mode menu. When returning from the minibuffer, we get
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2379 back the C-mode menu. Thus we do:
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2380 Rename B to X (C-mode to minibuf menu)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2381 Rename X to B (minibuf to C-mode menu).
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2382 If the X menu hasn't been invoked, the menu under B
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2383 is up to date when leaving the minibuffer. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2384 GtkLabel *wlabel = GTK_LABEL (gtk_bin_get_child (GTK_BIN (witem)));
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2385 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
2386 GtkWidget *submenu = gtk_menu_item_get_submenu (witem);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
2387
50778
f30e6f029d65 * gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents: 50521
diff changeset
2388 gtk_label_set_text (wlabel, utf8_label);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2389
52981
54482f5ea7be Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
2390 /* 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
2391 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
2392 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
2393 /* 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
2394 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
2395
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2396 iter = g_list_next (iter);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2397 val = val->next;
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2398 ++pos;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2399 }
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2400 else if (! val_in_menubar && iter_in_new_menubar)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2401 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2402 /* This corresponds to:
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2403 Current: A B C
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2404 New: A X B C
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2405 Insert X. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2406
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2407 int nr = pos;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2408 GList *group = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2409 GtkWidget *w = xg_create_one_menuitem (val,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2410 f,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2411 select_cb,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2412 highlight_cb,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2413 cl_data,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2414 &group);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2415
77511
1962a74982ce (xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents: 76906
diff changeset
2416 /* 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
2417 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
2418 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
2419 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
2420 highlight_cb,
77511
1962a74982ce (xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents: 76906
diff changeset
2421 0, 0, 0, 0, cl_data, 0);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2422 gtk_widget_set_name (w, MENU_ITEM_NAME);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2423 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
2424 gtk_menu_item_set_submenu (GTK_MENU_ITEM (w), submenu);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2425
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2426 g_list_free (*list);
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2427 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar));
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2428 while (nr-- > 0) iter = g_list_next (iter);
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2429 iter = g_list_next (iter);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2430 val = val->next;
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2431 ++pos;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2432 }
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2433 else /* if (val_in_menubar && iter_in_new_menubar) */
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2434 {
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2435 int nr = pos;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2436 /* This corresponds to:
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2437 Current: A B C
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2438 New: A C B
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2439 Move C before B */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2440
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
2441 g_object_ref (G_OBJECT (witem2));
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2442 gtk_container_remove (GTK_CONTAINER (menubar), GTK_WIDGET (witem2));
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2443 gtk_menu_shell_insert (GTK_MENU_SHELL (menubar),
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2444 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
2445 g_object_unref (G_OBJECT (witem2));
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2446
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2447 g_list_free (*list);
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2448 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar));
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2449 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
2450 if (iter) iter = g_list_next (iter);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2451 val = val->next;
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2452 ++pos;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2453 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2454 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2455
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2456 /* Update the rest of the menu bar. */
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2457 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
2458 select_cb, deactivate_cb, highlight_cb, cl_data);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2459 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2460
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2461 /* Update the menu item W so it corresponds to VAL.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2462 SELECT_CB is the callback to use when a menu item is selected.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2463 HIGHLIGHT_CB is the callback to call when entering/leaving menu items.
102358
07bc423d78f1 Fix typos.
Juanma Barranquero <lekktu@gmail.com>
parents: 102283
diff changeset
2464 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
2465
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2466 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
2467 xg_update_menu_item (widget_value *val, GtkWidget *w, GCallback select_cb, GCallback highlight_cb, xg_menu_cb_data *cl_data)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2468 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2469 GtkWidget *wchild;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2470 GtkLabel *wlbl = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2471 GtkLabel *wkey = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2472 char *utf8_label;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2473 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
2474 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
2475 const char *old_key = 0;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2476 xg_menu_item_cb_data *cb_data;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
2477
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
2478 wchild = gtk_bin_get_child (GTK_BIN (w));
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2479 utf8_label = get_utf8_string (val->name);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2480 utf8_key = get_utf8_string (val->key);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2481
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2482 /* See if W is a menu item with a key. See make_menu_item above. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2483 if (GTK_IS_HBOX (wchild))
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2484 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2485 GList *list = gtk_container_get_children (GTK_CONTAINER (wchild));
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2486
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2487 wlbl = GTK_LABEL (list->data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2488 wkey = GTK_LABEL (list->next->data);
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2489 g_list_free (list);
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2490
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2491 if (! utf8_key)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2492 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2493 /* 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
2494 g_object_ref (G_OBJECT (wlbl));
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2495 gtk_container_remove (GTK_CONTAINER (w), wchild);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2496 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
2497 g_object_unref (G_OBJECT (wlbl));
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2498 wkey = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2499 }
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2500
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2501 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2502 else /* Just a label. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2503 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2504 wlbl = GTK_LABEL (wchild);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2505
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2506 /* Check if there is now a key. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2507 if (utf8_key)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2508 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2509 GtkWidget *wtoadd = make_widget_for_menu_item (utf8_label, utf8_key);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2510 GList *list = gtk_container_get_children (GTK_CONTAINER (wtoadd));
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2511
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2512 wlbl = GTK_LABEL (list->data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2513 wkey = GTK_LABEL (list->next->data);
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2514 g_list_free (list);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2515
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2516 gtk_container_remove (GTK_CONTAINER (w), wchild);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2517 gtk_container_add (GTK_CONTAINER (w), wtoadd);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2518 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2519 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2520
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
2521
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
2522 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
2523 if (wlbl) old_label = gtk_label_get_label (wlbl);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
2524
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
2525 if (wkey && utf8_key && (! old_key || strcmp (utf8_key, old_key) != 0))
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2526 gtk_label_set_text (wkey, utf8_key);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2527
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
2528 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
2529 gtk_label_set_text (wlbl, utf8_label);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2530
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
2531 if (utf8_key && utf8_key != val->key) g_free (utf8_key);
da6abcaef15c gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49468
diff changeset
2532 if (utf8_label && utf8_label != val->name) g_free (utf8_label);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
2533
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
2534 if (! val->enabled && gtk_widget_get_sensitive (w))
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2535 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
2536 else if (val->enabled && ! gtk_widget_get_sensitive (w))
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2537 gtk_widget_set_sensitive (w, TRUE);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2538
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2539 cb_data = (xg_menu_item_cb_data*) g_object_get_data (G_OBJECT (w),
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2540 XG_ITEM_DATA);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2541 if (cb_data)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2542 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2543 cb_data->call_data = val->call_data;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2544 cb_data->help = val->help;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2545 cb_data->cl_data = cl_data;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
2546
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2547 /* We assume the callback functions don't change. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2548 if (val->call_data && ! val->contents)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2549 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2550 /* This item shall have a select callback. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2551 if (! cb_data->select_id)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2552 cb_data->select_id
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2553 = g_signal_connect (G_OBJECT (w), "activate",
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2554 select_cb, cb_data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2555 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2556 else if (cb_data->select_id)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2557 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2558 g_signal_handler_disconnect (w, cb_data->select_id);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2559 cb_data->select_id = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2560 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2561 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2562 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2563
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2564 /* 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
2565
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2566 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
2567 xg_update_toggle_item (widget_value *val, GtkWidget *w)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2568 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2569 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), val->selected);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2570 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2571
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2572 /* 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
2573
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2574 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
2575 xg_update_radio_item (widget_value *val, GtkWidget *w)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2576 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2577 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), val->selected);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2578 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2579
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2580 /* Update the sub menu SUBMENU and all its children so it corresponds to VAL.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2581 SUBMENU may be NULL, in that case a new menu is created.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2582 F is the frame the menu bar belongs to.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2583 VAL describes the contents of the menu bar.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2584 SELECT_CB is the callback to use when a menu item is selected.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2585 DEACTIVATE_CB is the callback to use when a sub menu is not shown anymore.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2586 HIGHLIGHT_CB is the callback to call when entering/leaving menu items.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2587 CL_DATA is the call back data to use for any newly created items.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2588
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2589 Returns the updated submenu widget, that is SUBMENU unless SUBMENU
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2590 was NULL. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2591
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2592 static GtkWidget *
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2593 xg_update_submenu (submenu, f, val,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2594 select_cb, deactivate_cb, highlight_cb, cl_data)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2595 GtkWidget *submenu;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2596 FRAME_PTR f;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2597 widget_value *val;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2598 GCallback select_cb;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2599 GCallback deactivate_cb;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2600 GCallback highlight_cb;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2601 xg_menu_cb_data *cl_data;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2602 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2603 GtkWidget *newsub = submenu;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2604 GList *list = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2605 GList *iter;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2606 widget_value *cur;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2607 int has_tearoff_p = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2608 GList *first_radio = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
2609
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2610 if (submenu)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2611 list = gtk_container_get_children (GTK_CONTAINER (submenu));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
2612
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2613 for (cur = val, iter = list;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2614 cur && iter;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2615 iter = g_list_next (iter), cur = cur->next)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2616 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2617 GtkWidget *w = GTK_WIDGET (iter->data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2618
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2619 /* Skip tearoff items, they have no counterpart in val. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2620 if (GTK_IS_TEAROFF_MENU_ITEM (w))
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2621 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2622 has_tearoff_p = 1;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2623 iter = g_list_next (iter);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2624 if (iter) w = GTK_WIDGET (iter->data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2625 else break;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2626 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2627
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2628 /* Remember first radio button in a group. If we get a mismatch in
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2629 a radio group we must rebuild the whole group so that the connections
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2630 in GTK becomes correct. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2631 if (cur->button_type == BUTTON_TYPE_RADIO && ! first_radio)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2632 first_radio = iter;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2633 else if (cur->button_type != BUTTON_TYPE_RADIO
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2634 && ! GTK_IS_RADIO_MENU_ITEM (w))
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2635 first_radio = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2636
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2637 if (GTK_IS_SEPARATOR_MENU_ITEM (w))
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2638 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2639 if (! xg_separator_p (cur->name))
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2640 break;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2641 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2642 else if (GTK_IS_CHECK_MENU_ITEM (w))
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2643 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2644 if (cur->button_type != BUTTON_TYPE_TOGGLE)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2645 break;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2646 xg_update_toggle_item (cur, w);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2647 xg_update_menu_item (cur, w, select_cb, highlight_cb, cl_data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2648 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2649 else if (GTK_IS_RADIO_MENU_ITEM (w))
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2650 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2651 if (cur->button_type != BUTTON_TYPE_RADIO)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2652 break;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2653 xg_update_radio_item (cur, w);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2654 xg_update_menu_item (cur, w, select_cb, highlight_cb, cl_data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2655 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2656 else if (GTK_IS_MENU_ITEM (w))
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2657 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2658 GtkMenuItem *witem = GTK_MENU_ITEM (w);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2659 GtkWidget *sub;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2660
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2661 if (cur->button_type != BUTTON_TYPE_NONE ||
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2662 xg_separator_p (cur->name))
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2663 break;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2664
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2665 xg_update_menu_item (cur, w, select_cb, highlight_cb, cl_data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2666
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2667 sub = gtk_menu_item_get_submenu (witem);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2668 if (sub && ! cur->contents)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2669 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2670 /* 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
2671 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
2672 remove_submenu (witem);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2673 gtk_widget_destroy (sub);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2674 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2675 else if (cur->contents)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2676 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2677 GtkWidget *nsub;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2678
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2679 nsub = xg_update_submenu (sub, f, cur->contents,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2680 select_cb, deactivate_cb,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2681 highlight_cb, cl_data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2682
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2683 /* If this item just became a submenu, we must set it. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2684 if (nsub != sub)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2685 gtk_menu_item_set_submenu (witem, nsub);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2686 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2687 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2688 else
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2689 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2690 /* Structural difference. Remove everything from here and down
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2691 in SUBMENU. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2692 break;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2693 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2694 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2695
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2696 /* Remove widgets from first structual change. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2697 if (iter)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2698 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2699 /* If we are adding new menu items below, we must remove from
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2700 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
2701 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
2702 else xg_destroy_widgets (iter);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2703 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
2704
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2705 if (cur)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2706 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2707 /* More items added. Create them. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2708 newsub = create_menus (cur,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2709 f,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2710 select_cb,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2711 deactivate_cb,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2712 highlight_cb,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2713 0,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2714 0,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2715 ! has_tearoff_p,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2716 submenu,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2717 cl_data,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2718 0);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2719 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
2720
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2721 if (list) g_list_free (list);
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2722
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2723 return newsub;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2724 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2725
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2726 /* Update the MENUBAR.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2727 F is the frame the menu bar belongs to.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2728 VAL describes the contents of the menu bar.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2729 If DEEP_P is non-zero, rebuild all but the top level menu names in
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2730 the MENUBAR. If DEEP_P is zero, just rebuild the names in the menubar.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2731 SELECT_CB is the callback to use when a menu item is selected.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2732 DEACTIVATE_CB is the callback to use when a sub menu is not shown anymore.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2733 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
2734
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2735 void
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2736 xg_modify_menubar_widgets (menubar, f, val, deep_p,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2737 select_cb, deactivate_cb, highlight_cb)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2738 GtkWidget *menubar;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2739 FRAME_PTR f;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2740 widget_value *val;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2741 int deep_p;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2742 GCallback select_cb;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2743 GCallback deactivate_cb;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2744 GCallback highlight_cb;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2745 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2746 xg_menu_cb_data *cl_data;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2747 GList *list = gtk_container_get_children (GTK_CONTAINER (menubar));
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2748
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2749 if (! list) return;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
2750
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2751 cl_data = (xg_menu_cb_data*) g_object_get_data (G_OBJECT (menubar),
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2752 XG_FRAME_DATA);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2753
52981
54482f5ea7be Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52401
diff changeset
2754 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
2755 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
2756
64783
0975467abc17 * gtkutil.c (xg_modify_menubar_widgets): Remove semicolon that
Jan Djärv <jan.h.d@swipnet.se>
parents: 64770
diff changeset
2757 if (deep_p)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2758 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2759 widget_value *cur;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2760
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2761 /* 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
2762 We must keep the submenus (GTK menu item widgets) since the
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2763 X Window in the XEvent that activates the menu are those widgets. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2764
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2765 /* Update cl_data, menu_item things in F may have changed. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2766 update_cl_data (cl_data, f, highlight_cb);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2767
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2768 for (cur = val->contents; cur; cur = cur->next)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2769 {
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2770 GList *iter;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2771 GtkWidget *sub = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2772 GtkWidget *newsub;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2773 GtkMenuItem *witem;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2774
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2775 /* Find sub menu that corresponds to val and update it. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2776 for (iter = list ; iter; iter = g_list_next (iter))
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2777 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2778 witem = GTK_MENU_ITEM (iter->data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2779 if (xg_item_label_same_p (witem, cur->name))
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2780 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2781 sub = gtk_menu_item_get_submenu (witem);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2782 break;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2783 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2784 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
2785
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2786 newsub = xg_update_submenu (sub,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2787 f,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2788 cur->contents,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2789 select_cb,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2790 deactivate_cb,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2791 highlight_cb,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2792 cl_data);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2793 /* sub may still be NULL. If we just updated non deep and added
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2794 a new menu bar item, it has no sub menu yet. So we set the
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2795 newly created sub menu under witem. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2796 if (newsub != sub)
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
2797 {
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
2798 xg_set_screen (newsub, f);
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
2799 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
2800 }
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2801 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2802 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2803
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
2804 g_list_free (list);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2805 gtk_widget_show_all (menubar);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2806 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2807
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2808 /* Recompute all the widgets of frame F, when the menu bar has been
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2809 changed. Value is non-zero if widgets were updated. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2810
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2811 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
2812 xg_update_frame_menubar (FRAME_PTR f)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2813 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2814 struct x_output *x = f->output_data.x;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2815 GtkRequisition req;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
2816
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
2817 if (!x->menubar_widget || gtk_widget_get_mapped (x->menubar_widget))
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2818 return 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2819
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
2820 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
2821 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
2822
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2823 BLOCK_INPUT;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2824
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2825 gtk_box_pack_start (GTK_BOX (x->vbox_widget), x->menubar_widget,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2826 FALSE, FALSE, 0);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2827 gtk_box_reorder_child (GTK_BOX (x->vbox_widget), x->menubar_widget, 0);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2828
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2829 gtk_widget_show_all (x->menubar_widget);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2830 gtk_widget_size_request (x->menubar_widget, &req);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2831 FRAME_MENUBAR_HEIGHT (f) = req.height;
103665
340c701162a6 * emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103198
diff changeset
2832 xg_height_changed (f);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2833 UNBLOCK_INPUT;
50106
5675d6a0080c (xg_update_frame_menubar): Add missing return value.
Andreas Schwab <schwab@suse.de>
parents: 50099
diff changeset
2834
5675d6a0080c (xg_update_frame_menubar): Add missing return value.
Andreas Schwab <schwab@suse.de>
parents: 50099
diff changeset
2835 return 1;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2836 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2837
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2838 /* Get rid of the menu bar of frame F, and free its storage.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2839 This is used when deleting a frame, and when turning off the menu bar. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2840
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2841 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
2842 free_frame_menubar (FRAME_PTR f)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2843 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2844 struct x_output *x = f->output_data.x;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2845
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2846 if (x->menubar_widget)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2847 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2848 BLOCK_INPUT;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2849
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2850 gtk_container_remove (GTK_CONTAINER (x->vbox_widget), x->menubar_widget);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2851 /* The menubar and its children shall be deleted when removed from
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2852 the container. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2853 x->menubar_widget = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2854 FRAME_MENUBAR_HEIGHT (f) = 0;
103665
340c701162a6 * emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103198
diff changeset
2855 xg_height_changed (f);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2856 UNBLOCK_INPUT;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2857 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2858 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2859
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2860
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2861
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2862 /***********************************************************************
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2863 Scroll bar functions
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2864 ***********************************************************************/
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2865
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2866
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2867 /* Setting scroll bar values invokes the callback. Use this variable
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2868 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
2869
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2870 int xg_ignore_gtk_scrollbar;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2871
86161
3408ab8b4152 * xterm.h (struct scroll_bar): Only use Lisp_Object for lisp data.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85938
diff changeset
2872 /* 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
2873 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
2874 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
2875
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2876 static struct
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2877 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2878 GtkWidget **widgets;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2879 int max_size;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2880 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
2881 } id_to_widget;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2882
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2883 /* 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
2884
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2885 #define ID_TO_WIDGET_INCR 32
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2886
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2887 /* 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
2888
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2889 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
2890 xg_store_widget_in_map (GtkWidget *w)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2891 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2892 int i;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2893
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2894 if (id_to_widget.max_size == id_to_widget.used)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2895 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2896 int new_size = id_to_widget.max_size + ID_TO_WIDGET_INCR;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2897
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2898 id_to_widget.widgets = xrealloc (id_to_widget.widgets,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2899 sizeof (GtkWidget *)*new_size);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2900
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2901 for (i = id_to_widget.max_size; i < new_size; ++i)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2902 id_to_widget.widgets[i] = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2903 id_to_widget.max_size = new_size;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2904 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2905
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2906 /* Just loop over the array and find a free place. After all,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2907 how many scroll bars are we creating? Should be a small number.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2908 The check above guarantees we will find a free place. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2909 for (i = 0; i < id_to_widget.max_size; ++i)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2910 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2911 if (! id_to_widget.widgets[i])
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2912 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2913 id_to_widget.widgets[i] = w;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2914 ++id_to_widget.used;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2915
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2916 return i;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2917 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2918 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2919
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2920 /* Should never end up here */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2921 abort ();
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2922 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2923
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2924 /* Remove pointer at IDX from id_to_widget.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2925 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
2926
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2927 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
2928 xg_remove_widget_from_map (int idx)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2929 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2930 if (idx < id_to_widget.max_size && id_to_widget.widgets[idx] != 0)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2931 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2932 id_to_widget.widgets[idx] = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2933 --id_to_widget.used;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2934 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2935 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2936
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2937 /* 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
2938
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2939 static GtkWidget *
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
2940 xg_get_widget_from_map (int idx)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2941 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2942 if (idx < id_to_widget.max_size && id_to_widget.widgets[idx] != 0)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2943 return id_to_widget.widgets[idx];
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2944
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2945 return 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2946 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2947
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
2948 /* Return the scrollbar id for X Window WID on display DPY.
50063
464ffd8b9e33 Another fix for BadGC.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50059
diff changeset
2949 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
2950
50063
464ffd8b9e33 Another fix for BadGC.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50059
diff changeset
2951 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
2952 xg_get_scroll_id_for_window (Display *dpy, Window wid)
50063
464ffd8b9e33 Another fix for BadGC.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50059
diff changeset
2953 {
464ffd8b9e33 Another fix for BadGC.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50059
diff changeset
2954 int idx;
464ffd8b9e33 Another fix for BadGC.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50059
diff changeset
2955 GtkWidget *w;
464ffd8b9e33 Another fix for BadGC.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50059
diff changeset
2956
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
2957 w = xg_win_to_widget (dpy, wid);
50063
464ffd8b9e33 Another fix for BadGC.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50059
diff changeset
2958
464ffd8b9e33 Another fix for BadGC.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50059
diff changeset
2959 if (w)
464ffd8b9e33 Another fix for BadGC.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50059
diff changeset
2960 {
464ffd8b9e33 Another fix for BadGC.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50059
diff changeset
2961 for (idx = 0; idx < id_to_widget.max_size; ++idx)
464ffd8b9e33 Another fix for BadGC.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50059
diff changeset
2962 if (id_to_widget.widgets[idx] == w)
464ffd8b9e33 Another fix for BadGC.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50059
diff changeset
2963 return idx;
464ffd8b9e33 Another fix for BadGC.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50059
diff changeset
2964 }
464ffd8b9e33 Another fix for BadGC.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50059
diff changeset
2965
464ffd8b9e33 Another fix for BadGC.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50059
diff changeset
2966 return -1;
464ffd8b9e33 Another fix for BadGC.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50059
diff changeset
2967 }
464ffd8b9e33 Another fix for BadGC.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50059
diff changeset
2968
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2969 /* Callback invoked when scroll bar WIDGET is destroyed.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2970 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
2971 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
2972
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2973 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
2974 xg_gtk_scroll_destroy (GtkWidget *widget, gpointer data)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2975 {
59411
ecb6689e04bf * gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents: 59102
diff changeset
2976 int id = (int) (EMACS_INT) data; /* The EMACS_INT cast avoids a warning. */
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2977 xg_remove_widget_from_map (id);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2978 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2979
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2980 /* Create a scroll bar widget for frame F. Store the scroll bar
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2981 in BAR.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2982 SCROLL_CALLBACK is the callback to invoke when the value of the
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2983 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
2984 END_CALLBACK is the callback to invoke when scrolling ends.
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2985 SCROLL_BAR_NAME is the name we use for the scroll bar. Can be used
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2986 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
2987
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2988 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
2989 xg_create_scroll_bar (FRAME_PTR f, struct scroll_bar *bar, GCallback scroll_callback, GCallback end_callback, char *scroll_bar_name)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2990 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2991 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
2992 GtkWidget *webox;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2993 GtkObject *vadj;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2994 int scroll_id;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
2995
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2996 /* Page, step increment values are not so important here, they
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2997 will be corrected in x_set_toolkit_scroll_bar_thumb. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2998 vadj = gtk_adjustment_new (XG_SB_MIN, XG_SB_MIN, XG_SB_MAX,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2999 0.1, 0.1, 0.1);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3000
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3001 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
3002 webox = gtk_event_box_new ();
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3003 gtk_widget_set_name (wscroll, scroll_bar_name);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3004 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
3005 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
3006
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3007 scroll_id = xg_store_widget_in_map (wscroll);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
3008
59411
ecb6689e04bf * gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents: 59102
diff changeset
3009 /* The EMACS_INT cast avoids a warning. */
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3010 g_signal_connect (G_OBJECT (wscroll),
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3011 "destroy",
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3012 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
3013 (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
3014 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
3015 "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
3016 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
3017 (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
3018 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
3019 "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
3020 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
3021 (gpointer) bar);
3acd32c3e0ac gtkutil.c: Scroll bar thumb not updated properly (bug #5177).
Jan Djärv <jan.h.d@swipnet.se>
parents: 106512
diff changeset
3022
57597
754a6433f048 * gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents: 57575
diff changeset
3023 /* 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
3024 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
3025 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
3026 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
3027 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
3028 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
3029 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
3030 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
3031
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3032
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3033 /* 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
3034 xg_set_cursor (webox, FRAME_X_DISPLAY_INFO (f)->xg_cursor);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3035
86161
3408ab8b4152 * xterm.h (struct scroll_bar): Only use Lisp_Object for lisp data.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85938
diff changeset
3036 bar->x_window = scroll_id;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3037 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3038
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3039 /* 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
3040
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3041 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
3042 xg_remove_scroll_bar (FRAME_PTR f, int scrollbar_id)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3043 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3044 GtkWidget *w = xg_get_widget_from_map (scrollbar_id);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3045 if (w)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3046 {
57597
754a6433f048 * gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents: 57575
diff changeset
3047 GtkWidget *wparent = gtk_widget_get_parent (w);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3048 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
3049 gtk_widget_destroy (wparent);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3050 SET_FRAME_GARBAGED (f);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3051 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3052 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3053
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3054 /* Update the position of the vertical scroll bar represented by SCROLLBAR_ID
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3055 in frame F.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3056 TOP/LEFT are the new pixel positions where the bar shall appear.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3057 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
3058
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3059 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
3060 xg_update_scrollbar_pos (FRAME_PTR f, int scrollbar_id, int top, int left, int width, int height)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3061 {
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
3062
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
3063 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
3064
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
3065 if (wscroll)
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
3066 {
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
3067 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
3068 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
3069 gint msl;
106720
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
3070
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
3071 /* Clear out old position. */
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
3072 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
3073 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
3074 {
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
3075 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
3076 "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
3077 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
3078 }
55342
44d086f5e08a * gtkutil.c (xg_update_scrollbar_pos): Call XClearWindow to clear
Jan Djärv <jan.h.d@swipnet.se>
parents: 53275
diff changeset
3079
44d086f5e08a * gtkutil.c (xg_update_scrollbar_pos): Call XClearWindow to clear
Jan Djärv <jan.h.d@swipnet.se>
parents: 53275
diff changeset
3080 /* 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
3081 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
3082 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
3083 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
3084 {
3e9a832a5533 Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents: 108315
diff changeset
3085 /* 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
3086 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
3087 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
3088 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
3089 }
3e9a832a5533 Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents: 108315
diff changeset
3090 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
3091 {
3e9a832a5533 Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents: 108315
diff changeset
3092 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
3093 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
3094 }
106720
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
3095 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
3096 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
3097 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
3098 {
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
3099 /* 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
3100 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
3101 above. */
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
3102 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
3103 FRAME_X_WINDOW (f),
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
3104 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
3105 }
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
3106
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
3107 /* 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
3108 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
3109 here to get some events. */
106720
3db7e57ee4e9 Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents: 106559
diff changeset
3110
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
3111 x_sync (f);
49572
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
3112 SET_FRAME_GARBAGED (f);
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
3113 cancel_mouse_face (f);
f492ad3945ad Fix memory leak.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49531
diff changeset
3114 }
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3115 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3116
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3117 /* Set the thumb size and position of scroll bar BAR. We are currently
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3118 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
3119
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3120 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
3121 xg_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar, int portion, int position, int whole)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3122 {
86161
3408ab8b4152 * xterm.h (struct scroll_bar): Only use Lisp_Object for lisp data.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85938
diff changeset
3123 GtkWidget *wscroll = xg_get_widget_from_map (bar->x_window);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3124
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3125 FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3126
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
3127 if (wscroll && NILP (bar->dragging))
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3128 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3129 GtkAdjustment *adj;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3130 gdouble shown;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3131 gdouble top;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3132 int size, value;
50270
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3133 int new_step;
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3134 int changed = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
3135
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3136 adj = gtk_range_get_adjustment (GTK_RANGE (wscroll));
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3137
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
3138 /* 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
3139 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
3140 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
3141 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
3142 /* 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
3143 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
3144 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
3145
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3146 if (whole <= 0)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3147 top = 0, shown = 1;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3148 else
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3149 {
50270
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3150 top = (gdouble) position / whole;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3151 shown = (gdouble) portion / whole;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3152 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3153
50270
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3154 size = shown * XG_SB_RANGE;
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3155 size = min (size, XG_SB_RANGE);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3156 size = max (size, 1);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3157
50270
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3158 value = top * XG_SB_RANGE;
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3159 value = min (value, XG_SB_MAX - size);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3160 value = max (value, XG_SB_MIN);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3161
50270
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3162 /* 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
3163 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
3164
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
3165 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
3166 || (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
3167 {
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
3168 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
3169 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
3170 /* 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
3171 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
3172 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
3173 }
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
3174
50270
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3175 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
3176 {
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3177 BLOCK_INPUT;
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3178
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3179 /* 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
3180 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
3181 xg_ignore_gtk_scrollbar = 1;
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3182
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3183 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
3184 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
3185 else if (changed)
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3186 gtk_adjustment_changed (adj);
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3187
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3188 xg_ignore_gtk_scrollbar = 0;
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3189
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3190 UNBLOCK_INPUT;
fa50953c02dc Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50192
diff changeset
3191 }
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3192 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3193 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3194
105880
5910e0380daf Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents: 105693
diff changeset
3195 /* 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
3196 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
3197 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
3198 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
3199
5910e0380daf Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents: 105693
diff changeset
3200 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
3201
5910e0380daf Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents: 105693
diff changeset
3202 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
3203 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
3204 {
5910e0380daf Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents: 105693
diff changeset
3205 int retval = 0;
5910e0380daf Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents: 105693
diff changeset
3206
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
3207 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
3208 {
5910e0380daf Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents: 105693
diff changeset
3209 /* 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
3210 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
3211 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
3212 != 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
3213 }
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
3214 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
3215 && ((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
3216 || event->type == MotionNotify))
105880
5910e0380daf Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents: 105693
diff changeset
3217 {
5910e0380daf Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents: 105693
diff changeset
3218 /* 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
3219 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
3220 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
3221 }
106549
3acd32c3e0ac gtkutil.c: Scroll bar thumb not updated properly (bug #5177).
Jan Djärv <jan.h.d@swipnet.se>
parents: 106512
diff changeset
3222
105880
5910e0380daf Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents: 105693
diff changeset
3223 return retval;
5910e0380daf Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents: 105693
diff changeset
3224 }
5910e0380daf Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents: 105693
diff changeset
3225
5910e0380daf Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents: 105693
diff changeset
3226
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3227
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3228 /***********************************************************************
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3229 Tool bar functions
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3230 ***********************************************************************/
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3231 /* The key for the data we put in the GtkImage widgets. The data is
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3232 the image used by Emacs. We use this to see if we need to update
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3233 the GtkImage with a new image. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3234 #define XG_TOOL_BAR_IMAGE_DATA "emacs-tool-bar-image"
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3235
68874
8ccdd5aee32d * gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68651
diff changeset
3236 /* 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
3237 get them. */
8ccdd5aee32d * gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68651
diff changeset
3238 #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
3239
75009
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3240 /* 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
3241 #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
3242
78721
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3243 /* 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
3244 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
3245 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
3246 #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
3247
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3248 /* 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
3249 stock items. */
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3250 #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
3251
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3252 /* 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
3253 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
3254 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
3255 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
3256
68874
8ccdd5aee32d * gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68651
diff changeset
3257 static gboolean
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
3258 xg_tool_bar_button_cb (GtkWidget *widget, GdkEventButton *event, 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
3259 {
73389
7b5c0104efb0 * gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents: 73066
diff changeset
3260 /* 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
3261 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
3262 g_object_set_data (G_OBJECT (widget), XG_TOOL_BAR_LAST_MODIFIER, ptr);
68922
4f694ddb3ed0 Indentation fix
Jan Djärv <jan.h.d@swipnet.se>
parents: 68879
diff changeset
3263 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
3264 }
8ccdd5aee32d * gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68651
diff changeset
3265
8ccdd5aee32d * gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 68651
diff changeset
3266
74990
de706755c4d7 (xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents: 74376
diff changeset
3267 /* 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
3268 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
3269 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
3270 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
3271
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3272 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
3273 xg_tool_bar_callback (GtkWidget *w, gpointer client_data)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3274 {
59411
ecb6689e04bf * gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents: 59102
diff changeset
3275 /* 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
3276 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
3277 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
3278 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
3279
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3280 FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3281 Lisp_Object key, frame;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3282 struct input_event event;
51569
e7bd8581e306 (xg_tool_bar_callback): Don't pass uninitialized
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51432
diff changeset
3283 EVENT_INIT (event);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3284
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3285 if (! f || ! f->n_tool_bar_items || NILP (f->tool_bar_items))
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3286 return;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3287
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3288 idx *= TOOL_BAR_ITEM_NSLOTS;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
3289
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3290 key = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_KEY);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3291 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
3292
2fcf45c12927 (update_frame_tool_bar): Use -1 as index
Jan Djärv <jan.h.d@swipnet.se>
parents: 78260
diff changeset
3293 /* 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
3294 to `(tool_bar)', see keyboard.c. */
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3295 event.kind = TOOL_BAR_EVENT;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3296 event.frame_or_window = frame;
102283
43221c2f4272 Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 100951
diff changeset
3297 event.arg = frame;
43221c2f4272 Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 100951
diff changeset
3298 kbd_buffer_store_event (&event);
43221c2f4272 Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 100951
diff changeset
3299
43221c2f4272 Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 100951
diff changeset
3300 event.kind = TOOL_BAR_EVENT;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3301 event.frame_or_window = frame;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3302 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
3303 /* 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
3304 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
3305 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
3306 event.modifiers = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f), mod);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3307 kbd_buffer_store_event (&event);
102549
f737bc68655e * gtkutil.c (xg_tool_bar_callback): Set focus back to the frame
Jan Djärv <jan.h.d@swipnet.se>
parents: 102358
diff changeset
3308
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
3309 /* 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
3310 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
3311 Fx_focus_frame (frame);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3312 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3313
75009
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3314 /* 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
3315 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
3316 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
3317 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
3318 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
3319 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
3320
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3321 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
3322 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
3323 {
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3324 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
3325 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
3326 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
3327 }
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3328
103673
34f3338fd2bf * gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103665
diff changeset
3329
34f3338fd2bf * gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103665
diff changeset
3330 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
3331 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
3332 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
3333 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
3334
34f3338fd2bf * gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103665
diff changeset
3335 /* 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
3336 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
3337
34f3338fd2bf * gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103665
diff changeset
3338 static gboolean
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
3339 xg_tool_bar_proxy_help_callback (GtkWidget *w, GdkEventCrossing *event, 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
3340 {
34f3338fd2bf * gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103665
diff changeset
3341 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
3342 XG_TOOL_BAR_PROXY_BUTTON));
34f3338fd2bf * gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103665
diff changeset
3343
106512
471e6932ea09 (xg_tool_bar_proxy_help_callback): Fix missing return.
Andreas Schwab <schwab@linux-m68k.org>
parents: 106186
diff changeset
3344 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
3345 }
34f3338fd2bf * gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103665
diff changeset
3346
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
3347 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
3348 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
3349 {
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
3350 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
3351 GtkWidget *c1 = (GtkWidget *) clist->data;
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
3352 GtkWidget *c2 = (GtkWidget *) clist->next->data;
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
3353 *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
3354 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
3355 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
3356 }
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
3357
103673
34f3338fd2bf * gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103665
diff changeset
3358
75009
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3359 /* 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
3360 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
3361 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
3362 blank. */
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3363
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3364 static gboolean
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
3365 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
3366 {
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3367 GtkWidget *weventbox = gtk_bin_get_child (GTK_BIN (toolitem));
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3368 GtkButton *wbutton = GTK_BUTTON (gtk_bin_get_child (GTK_BIN (weventbox)));
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
3369 GtkWidget *vb = gtk_bin_get_child (GTK_BIN (wbutton));
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
3370 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
3371 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
3372 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
3373 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
3374 (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
3375 GtkWidget *wmenuimage;
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3376
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
3377
102283
43221c2f4272 Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 100951
diff changeset
3378 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
3379 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
3380 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
3381 else
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3382 {
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3383 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
3384 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
3385
75009
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3386 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
3387 {
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3388 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
3389 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
3390 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
3391 }
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3392 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
3393 {
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3394 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
3395 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
3396 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
3397 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
3398 }
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3399 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
3400 {
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3401 gint width, height;
102283
43221c2f4272 Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 100951
diff changeset
3402
75009
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3403 if (settings &&
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3404 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
3405 &width, &height))
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3406 {
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3407 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
3408
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3409 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
3410 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
3411 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
3412
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3413 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
3414 }
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
3415 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
3416 {
7c710af0ae5e (xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents: 78809
diff changeset
3417 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
3418 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
3419 }
7c710af0ae5e (xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents: 78809
diff changeset
3420 }
102283
43221c2f4272 Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 100951
diff changeset
3421 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
3422 {
7c710af0ae5e (xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents: 78809
diff changeset
3423 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
3424 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
3425
7c710af0ae5e (xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents: 78809
diff changeset
3426 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
3427 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
3428 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
3429 }
7c710af0ae5e (xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents: 78809
diff changeset
3430 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
3431 {
7c710af0ae5e (xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents: 78809
diff changeset
3432 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
3433 abort ();
75009
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3434 }
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3435 }
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3436 if (wmenuimage)
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3437 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
3438
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3439 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
3440 "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
3441 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
3442 user_data);
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3443
103673
34f3338fd2bf * gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103665
diff changeset
3444
75009
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3445 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
3446 (gpointer) wbutton);
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3447 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
3448 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
3449 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
3450
34f3338fd2bf * gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103665
diff changeset
3451 /* 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
3452 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
3453 "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
3454 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
3455 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
3456 "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
3457 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
3458 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
3459 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
3460 "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
3461 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
3462 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
3463
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3464 return TRUE;
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3465 }
6ec19c8cca02 (update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents: 74990
diff changeset
3466
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3467 /* This callback is called when a tool bar is detached. We must set
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3468 the height of the tool bar to zero when this happens so frame sizes
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3469 are correctly calculated.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3470 WBOX is the handle box widget that enables detach/attach of the tool bar.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3471 W is the tool bar widget.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3472 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
3473
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3474 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
3475 xg_tool_bar_detach_callback (GtkHandleBox *wbox, GtkWidget *w, gpointer client_data)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3476 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3477 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
3478 extern int x_gtk_whole_detached_tool_bar;
3249a3dd3284 * gtkutil.c (xg_tool_bar_detach_callback): Set show-arrow to the
Jan Djärv <jan.h.d@swipnet.se>
parents: 68874
diff changeset
3479
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
3480 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
3481 NULL);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3482
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3483 if (f)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3484 {
59420
eb72706060ad * xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents: 59411
diff changeset
3485 FRAME_X_OUTPUT (f)->toolbar_detached = 1;
eb72706060ad * xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents: 59411
diff changeset
3486
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3487 /* When detaching a tool bar, not everything dissapear. There are
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3488 a few pixels left that are used to drop the tool bar back into
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3489 place. */
103665
340c701162a6 * emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103198
diff changeset
3490 FRAME_TOOLBAR_HEIGHT (f) = 4;
340c701162a6 * emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103198
diff changeset
3491 xg_height_changed (f);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3492 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3493 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3494
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3495 /* This callback is called when a tool bar is reattached. We must set
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3496 the height of the tool bar when this happens so frame sizes
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3497 are correctly calculated.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3498 WBOX is the handle box widget that enables detach/attach of the tool bar.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3499 W is the tool bar widget.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3500 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
3501
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3502 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
3503 xg_tool_bar_attach_callback (GtkHandleBox *wbox, GtkWidget *w, gpointer client_data)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3504 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3505 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
3506 g_object_set (G_OBJECT (w), "show-arrow", TRUE, NULL);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3507
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3508 if (f)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3509 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3510 GtkRequisition req;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3511
59420
eb72706060ad * xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents: 59411
diff changeset
3512 FRAME_X_OUTPUT (f)->toolbar_detached = 0;
eb72706060ad * xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents: 59411
diff changeset
3513
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3514 gtk_widget_size_request (w, &req);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3515 FRAME_TOOLBAR_HEIGHT (f) = req.height;
103665
340c701162a6 * emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103198
diff changeset
3516 xg_height_changed (f);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3517 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3518 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3519
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3520 /* This callback is called when the mouse enters or leaves a tool bar item.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3521 It is used for displaying and hiding the help text.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3522 W is the tool bar item, a button.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3523 EVENT is either an enter event or leave event.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3524 CLIENT_DATA is an integer that is the index of the button in the
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3525 tool bar. 0 is the first button.
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3526
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3527 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
3528
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3529 static gboolean
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
3530 xg_tool_bar_help_callback (GtkWidget *w, GdkEventCrossing *event, gpointer client_data)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3531 {
59411
ecb6689e04bf * gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents: 59102
diff changeset
3532 /* 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
3533 int idx = (int) (EMACS_INT) client_data;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3534 FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3535 Lisp_Object help, frame;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3536
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3537 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
3538 return FALSE;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3539
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3540 if (event->type == GDK_ENTER_NOTIFY)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3541 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3542 idx *= TOOL_BAR_ITEM_NSLOTS;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3543 help = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_HELP);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3544
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3545 if (NILP (help))
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3546 help = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_CAPTION);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3547 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3548 else
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3549 help = Qnil;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3550
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3551 XSETFRAME (frame, f);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3552 kbd_buffer_store_help_event (frame, help);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3553
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3554 return FALSE;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3555 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3556
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3557
49826
e99f1a981a3b * gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49600
diff changeset
3558 /* 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
3559 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
3560 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
3561 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
3562 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
3563 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
3564 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
3565
e99f1a981a3b * gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49600
diff changeset
3566 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
3567
49826
e99f1a981a3b * gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49600
diff changeset
3568 static gboolean
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
3569 xg_tool_bar_item_expose_callback (GtkWidget *w, GdkEventExpose *event, 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
3570 {
50333
60da21fd968b * gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents: 50318
diff changeset
3571 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
3572
60da21fd968b * gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents: 50318
diff changeset
3573 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
3574
60da21fd968b * gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents: 50318
diff changeset
3575 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
3576 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
3577
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52981
diff changeset
3578 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
3579 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
3580
50333
60da21fd968b * gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents: 50318
diff changeset
3581 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
3582 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
3583
49826
e99f1a981a3b * gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49600
diff changeset
3584 return FALSE;
e99f1a981a3b * gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49600
diff changeset
3585 }
e99f1a981a3b * gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49600
diff changeset
3586
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
3587 /* 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
3588
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3589 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
3590 xg_pack_tool_bar (FRAME_PTR f)
92366
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3591 {
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3592 struct x_output *x = f->output_data.x;
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3593 int vbox_pos = x->menubar_widget ? 1 : 0;
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3594
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3595 x->handlebox_widget = gtk_handle_box_new ();
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3596 g_signal_connect (G_OBJECT (x->handlebox_widget), "child-detached",
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3597 G_CALLBACK (xg_tool_bar_detach_callback), f);
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3598 g_signal_connect (G_OBJECT (x->handlebox_widget), "child-attached",
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3599 G_CALLBACK (xg_tool_bar_attach_callback), f);
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3600
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3601 gtk_container_add (GTK_CONTAINER (x->handlebox_widget),
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3602 x->toolbar_widget);
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3603
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3604 gtk_box_pack_start (GTK_BOX (x->vbox_widget), x->handlebox_widget,
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3605 FALSE, FALSE, 0);
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3606
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3607 gtk_box_reorder_child (GTK_BOX (x->vbox_widget), x->handlebox_widget,
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3608 vbox_pos);
108315
8bb62bdbd80a Fix bug #6139, text is briefly shown in tool bar on startup.
Jan D <jan.h.d@swipnet.se>
parents: 108082
diff changeset
3609
8bb62bdbd80a Fix bug #6139, text is briefly shown in tool bar on startup.
Jan D <jan.h.d@swipnet.se>
parents: 108082
diff changeset
3610 gtk_widget_show (x->toolbar_widget);
8bb62bdbd80a Fix bug #6139, text is briefly shown in tool bar on startup.
Jan D <jan.h.d@swipnet.se>
parents: 108082
diff changeset
3611 gtk_widget_show (x->handlebox_widget);
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
3612 }
50063
464ffd8b9e33 Another fix for BadGC.
Jan Djärv <jan.h.d@swipnet.se>
parents: 50059
diff changeset
3613
57715
cdc48cdd5b0e * gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 57597
diff changeset
3614 /* Create a tool bar for frame F. */
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
3615 #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
3616 #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
3617 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
3618 #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
3619 #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
3620 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
3621 #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
3622
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3623 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
3624 xg_create_tool_bar (FRAME_PTR f)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3625 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3626 struct x_output *x = f->output_data.x;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3627
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3628 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
3629 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
3630
49826
e99f1a981a3b * gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49600
diff changeset
3631 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
3632
e99f1a981a3b * gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49600
diff changeset
3633 gtk_toolbar_set_style (GTK_TOOLBAR (x->toolbar_widget), GTK_TOOLBAR_ICONS);
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
3634 toolbar_set_orientation (x->toolbar_widget,
49826
e99f1a981a3b * gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49600
diff changeset
3635 GTK_ORIENTATION_HORIZONTAL);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3636 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3637
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
3638
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
3639 #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
3640
78721
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3641 /* 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
3642 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
3643
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3644 static Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
3645 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
3646 {
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3647 int i;
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3648 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
3649 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
3650 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
3651
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3652 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
3653
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3654 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
3655 {
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3656 Lisp_Object rtl_image = PROP (TOOL_BAR_ITEM_IMAGES);
102283
43221c2f4272 Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 100951
diff changeset
3657 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
3658 {
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3659 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
3660 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
3661 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
3662 {
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3663 image = rtl_image;
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3664 break;
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3665 }
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3666 }
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3667 }
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3668
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3669 return image;
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3670 }
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3671
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
3672 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
3673 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
3674 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
3675 GtkWidget **wbutton,
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3676 char *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
3677 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
3678 {
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3679 GtkToolItem *ti = gtk_tool_item_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
3680 GtkWidget *vb = EQ (Vtool_bar_style, Qboth_horiz)
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3681 ? gtk_hbox_new (FALSE, 0) : gtk_vbox_new (FALSE, 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
3682 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
3683 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
3684
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3685 if (wimage)
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 gtk_box_pack_start (GTK_BOX (vb), wimage, TRUE, TRUE, 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
3687
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
3688 gtk_box_pack_start (GTK_BOX (vb), gtk_label_new (label), TRUE, TRUE, 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
3689 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
3690 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
3691 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
3692 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
3693 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
3694
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3695 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
3696 {
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3697 /* 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
3698 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
3699 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
3700 (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
3701
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3702 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
3703 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
3704 (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
3705
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3706 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
3707
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3708 /* 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
3709 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
3710 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
3711 "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
3712 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
3713 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
3714
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3715 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
3716
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3717 /* 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
3718 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
3719 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
3720 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
3721 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
3722 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
3723
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3724 g_object_set_data (G_OBJECT (wb), 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
3725
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3726 /* 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
3727 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
3728 "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
3729 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
3730 /* 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
3731 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
3732 "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
3733 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
3734 (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
3735 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
3736 "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
3737 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
3738 (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
3739 }
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3740
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3741 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
3742
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3743 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
3744 }
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3745
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3746 static void
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3747 xg_show_toolbar_item (GtkToolItem *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
3748 {
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3749 Lisp_Object style = Ftool_bar_get_system_style ();
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3750
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3751 int show_label = EQ (style, Qboth)
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3752 || EQ (style, Qboth_horiz) || EQ (style, Qtext);
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3753 int show_image = ! EQ (style, Qtext);
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3754 int horiz = EQ (style, Qboth_horiz);
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3755
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3756 GtkWidget *weventbox = gtk_bin_get_child (GTK_BIN (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
3757 GtkWidget *wbutton = gtk_bin_get_child (GTK_BIN (weventbox));
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
3758 GtkWidget *vb = gtk_bin_get_child (GTK_BIN (wbutton));
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 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
3760 GtkWidget *wlbl = xg_get_tool_bar_widgets (vb, &wimage);
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
3761 GtkWidget *new_box = 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
3762
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3763 if (GTK_IS_VBOX (vb) && horiz)
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3764 new_box = gtk_hbox_new (FALSE, 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
3765 else if (GTK_IS_HBOX (vb) && !horiz && show_label && show_image)
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3766 new_box = gtk_vbox_new (FALSE, 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
3767 if (new_box)
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3768 {
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
3769 g_object_ref (G_OBJECT (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
3770 g_object_ref (G_OBJECT (wlbl));
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
3771 gtk_container_remove (GTK_CONTAINER (vb), 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
3772 gtk_container_remove (GTK_CONTAINER (vb), wlbl);
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3773 gtk_widget_destroy (GTK_WIDGET (vb));
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
3774 gtk_box_pack_start (GTK_BOX (new_box), wimage, TRUE, TRUE, 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
3775 gtk_box_pack_start (GTK_BOX (new_box), wlbl, TRUE, TRUE, 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
3776 gtk_container_add (GTK_CONTAINER (wbutton), new_box);
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
3777 g_object_unref (G_OBJECT (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
3778 g_object_unref (G_OBJECT (wlbl));
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
3779 vb = new_box;
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
3780 }
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3781
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3782 if (show_label) gtk_widget_show (wlbl);
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3783 else gtk_widget_hide (wlbl);
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3784 if (show_image) gtk_widget_show (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
3785 else gtk_widget_hide (wimage);
108315
8bb62bdbd80a Fix bug #6139, text is briefly shown in tool bar on startup.
Jan D <jan.h.d@swipnet.se>
parents: 108082
diff changeset
3786 gtk_widget_show (GTK_WIDGET (weventbox));
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
3787 gtk_widget_show (GTK_WIDGET (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
3788 gtk_widget_show (GTK_WIDGET (wbutton));
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3789 gtk_widget_show (GTK_WIDGET (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
3790 }
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3791
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3792
57715
cdc48cdd5b0e * gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 57597
diff changeset
3793 /* Update the tool bar for frame F. Add new buttons and remove old. */
cdc48cdd5b0e * gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 57597
diff changeset
3794
103916
9653887b5cd0 * xterm.c (Qx_gtk_map_stock): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 103690
diff changeset
3795 extern Lisp_Object Qx_gtk_map_stock;
9653887b5cd0 * xterm.c (Qx_gtk_map_stock): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 103690
diff changeset
3796
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3797 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
3798 update_frame_tool_bar (FRAME_PTR f)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3799 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3800 int i;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3801 GtkRequisition old_req, new_req;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3802 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
3803 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
3804 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
3805 GtkToolItem *ti;
78721
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3806 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
3807 int pack_tool_bar = x->handlebox_widget == NULL;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3808
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3809 if (! FRAME_GTK_WIDGET (f))
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3810 return;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3811
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3812 BLOCK_INPUT;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
3813
59084
6a0b8f23858b * gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents: 58818
diff changeset
3814 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
3815 && 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
3816 {
6a0b8f23858b * gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents: 58818
diff changeset
3817 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
3818 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
3819 }
6a0b8f23858b * gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents: 58818
diff changeset
3820 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
3821 {
6a0b8f23858b * gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents: 58818
diff changeset
3822 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
3823 && 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
3824 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
3825
6a0b8f23858b * gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents: 58818
diff changeset
3826 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
3827 && 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
3828 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
3829 }
6a0b8f23858b * gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents: 58818
diff changeset
3830
6a0b8f23858b * gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents: 58818
diff changeset
3831 /* 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
3832 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
3833 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
3834 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
3835 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
3836 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
3837
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3838 if (! x->toolbar_widget)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3839 xg_create_tool_bar (f);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3840
78721
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3841 wtoolbar = GTK_TOOLBAR (x->toolbar_widget);
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3842 gtk_widget_size_request (GTK_WIDGET (wtoolbar), &old_req);
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
3843 dir = gtk_widget_get_direction (GTK_WIDGET (wtoolbar));
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3844
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3845 for (i = 0; i < f->n_tool_bar_items; ++i)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3846 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3847 int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P));
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3848 int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P));
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3849 int idx;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3850 int img_id;
78721
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3851 int icon_size = 0;
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3852 struct image *img = NULL;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3853 Lisp_Object image;
100100
f5d2a2e44839 (update_frame_tool_bar): Initialize variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 98555
diff changeset
3854 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
3855 GtkStockItem stock_item;
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3856 char *stock_name = NULL;
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3857 char *icon_name = NULL;
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3858 Lisp_Object rtl;
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3859 GtkWidget *wbutton = NULL;
74990
de706755c4d7 (xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents: 74376
diff changeset
3860 GtkWidget *weventbox;
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
3861 Lisp_Object specified_file;
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
3862 Lisp_Object lbl = PROP (TOOL_BAR_ITEM_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
3863 char *label = SSDATA (PROP (TOOL_BAR_ITEM_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
3864
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3865 ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), i);
74990
de706755c4d7 (xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents: 74376
diff changeset
3866
de706755c4d7 (xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents: 74376
diff changeset
3867 if (ti)
de706755c4d7 (xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents: 74376
diff changeset
3868 {
de706755c4d7 (xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents: 74376
diff changeset
3869 weventbox = gtk_bin_get_child (GTK_BIN (ti));
de706755c4d7 (xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents: 74376
diff changeset
3870 wbutton = gtk_bin_get_child (GTK_BIN (weventbox));
de706755c4d7 (xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents: 74376
diff changeset
3871 }
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3872
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
3873
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3874 image = PROP (TOOL_BAR_ITEM_IMAGES);
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3875
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3876 /* Ignore invalid image specifications. */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3877 if (!valid_image_p (image))
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3878 {
78721
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3879 if (wbutton) gtk_widget_hide (wbutton);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3880 continue;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3881 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3882
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
3883 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
3884 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
3885 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
3886
9653887b5cd0 * xterm.c (Qx_gtk_map_stock): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 103690
diff changeset
3887 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
3888 {
78721
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3889 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
3890 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
3891 {
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3892 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
3893 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
3894
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3895 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
3896 stock_name = NULL;
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3897 stock = Qnil;
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3898
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3899 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
3900 icon_name = NULL;
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3901 else
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3902 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
3903 }
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3904 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
3905 icon_size = gtk_toolbar_get_icon_size (wtoolbar);
102283
43221c2f4272 Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 100951
diff changeset
3906 else
78721
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3907 {
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3908 stock = Qnil;
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3909 stock_name = NULL;
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3910 }
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3911 }
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3912
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3913 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
3914 {
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3915 /* No stock image, or stock item not known. Try regular image. */
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3916
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3917 /* If image is a vector, choose the image according to the
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3918 button state. */
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3919 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
3920 && !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
3921 && STRINGP (rtl))
74990
de706755c4d7 (xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents: 74376
diff changeset
3922 {
78721
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3923 image = find_rtl_image (f, image, rtl);
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3924 }
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3925
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3926 if (VECTORP (image))
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3927 {
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3928 if (enabled_p)
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3929 idx = (selected_p
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3930 ? 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
3931 : 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
3932 else
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3933 idx = (selected_p
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3934 ? 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
3935 : 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
3936
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3937 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
3938 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
3939 }
78721
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3940 else
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3941 idx = -1;
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3942
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3943 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
3944 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
3945 prepare_image_for_display (f, img);
102283
43221c2f4272 Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 100951
diff changeset
3946
78721
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3947 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
3948 {
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
3949 if (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
3950 gtk_widget_hide_all (GTK_WIDGET (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
3951 else
78721
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3952 {
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
3953 /* Insert an empty (non-image) button */
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
3954 ti = xg_make_tool_item (f, NULL, NULL, "", 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
3955 gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, -1);
78721
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3956 }
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
3957 continue;
78721
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3958 }
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
3959 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
3960
74990
de706755c4d7 (xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents: 74376
diff changeset
3961 if (ti == NULL)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3962 {
78721
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3963 GtkWidget *w;
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3964 if (stock_name)
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3965 {
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3966 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
3967 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
3968 (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
3969 (GDestroyNotify) xfree);
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3970 }
102283
43221c2f4272 Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 100951
diff changeset
3971 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
3972 {
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3973 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
3974 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
3975 (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
3976 (GDestroyNotify) xfree);
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3977 }
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3978 else
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3979 {
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3980 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
3981 /* Save the image so we can see if an update is needed when
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3982 this function is called again. */
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3983 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
3984 (gpointer)img->pixmap);
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3985 }
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
3986
59084
6a0b8f23858b * gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents: 58818
diff changeset
3987 gtk_misc_set_padding (GTK_MISC (w), hmargin, vmargin);
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
3988 ti = xg_make_tool_item (f, w, &wbutton, label, 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
3989 gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, -1);
74990
de706755c4d7 (xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents: 74376
diff changeset
3990 gtk_widget_set_sensitive (wbutton, enabled_p);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3991 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3992 else
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
3993 {
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
3994 GtkWidget *vb = gtk_bin_get_child (GTK_BIN (wbutton));
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
3995 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
3996 GtkWidget *wlbl = xg_get_tool_bar_widgets (vb, &wimage);
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
3997
50059
ffb4a4dbe4c0 * gtkutil.c (update_frame_tool_bar): Compare pixmap ID instead of
Jan Djärv <jan.h.d@swipnet.se>
parents: 49826
diff changeset
3998 Pixmap old_img = (Pixmap)g_object_get_data (G_OBJECT (wimage),
ffb4a4dbe4c0 * gtkutil.c (update_frame_tool_bar): Compare pixmap ID instead of
Jan Djärv <jan.h.d@swipnet.se>
parents: 49826
diff changeset
3999 XG_TOOL_BAR_IMAGE_DATA);
78721
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4000 gpointer old_stock_name = g_object_get_data (G_OBJECT (wimage),
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4001 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
4002 gpointer old_icon_name = g_object_get_data (G_OBJECT (wimage),
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4003 XG_TOOL_BAR_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
4004 gtk_label_set_text (GTK_LABEL (wlbl), label);
78721
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4005 if (stock_name &&
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4006 (! old_stock_name || strcmp (old_stock_name, stock_name) != 0))
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4007 {
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4008 gtk_image_set_from_stock (GTK_IMAGE (wimage),
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4009 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
4010 g_object_set_data_full (G_OBJECT (wimage), XG_TOOL_BAR_STOCK_NAME,
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4011 (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
4012 (GDestroyNotify) xfree);
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4013 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA,
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4014 NULL);
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
4015 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_ICON_NAME,
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
4016 NULL);
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 else if (icon_name &&
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4019 (! old_icon_name || strcmp (old_icon_name, icon_name) != 0))
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4020 {
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4021 gtk_image_set_from_icon_name (GTK_IMAGE (wimage),
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4022 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
4023 g_object_set_data_full (G_OBJECT (wimage), XG_TOOL_BAR_ICON_NAME,
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4024 (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
4025 (GDestroyNotify) xfree);
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4026 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA,
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4027 NULL);
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4028 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_STOCK_NAME,
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4029 NULL);
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4030 }
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4031 else if (img && old_img != img->pixmap)
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4032 {
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4033 (void) xg_get_image_for_pixmap (f, img, x->widget, wimage);
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4034 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA,
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4035 (gpointer)img->pixmap);
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4036
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4037 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_STOCK_NAME,
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4038 NULL);
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
4039 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_ICON_NAME,
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 NULL);
78721
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4041 }
a888c5a82ba5 (file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents: 78690
diff changeset
4042
59084
6a0b8f23858b * gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents: 58818
diff changeset
4043 gtk_misc_set_padding (GTK_MISC (wimage), hmargin, vmargin);
6a0b8f23858b * gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents: 58818
diff changeset
4044
74990
de706755c4d7 (xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents: 74376
diff changeset
4045 gtk_widget_set_sensitive (wbutton, enabled_p);
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
4046 }
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 107997
diff changeset
4047 xg_show_toolbar_item (ti);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49572
diff changeset
4048
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4049 #undef PROP
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4050 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4051
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4052 /* Remove buttons not longer needed. We just hide them so they
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4053 can be reused later on. */
74990
de706755c4d7 (xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents: 74376
diff changeset
4054 do
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4055 {
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
4056 ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), i++);
74990
de706755c4d7 (xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents: 74376
diff changeset
4057 if (ti) gtk_widget_hide_all (GTK_WIDGET (ti));
de706755c4d7 (xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents: 74376
diff changeset
4058 } while (ti != NULL);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4059
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
4060 new_req.height = 0;
39b38c867ca4 (xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents: 91632
diff changeset
4061 if (pack_tool_bar && f->n_tool_bar_items != 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
4062 xg_pack_tool_bar (f);
103665
340c701162a6 * emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103198
diff changeset
4063
340c701162a6 * emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103198
diff changeset
4064
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
4065 gtk_widget_size_request (GTK_WIDGET (wtoolbar), &new_req);
103665
340c701162a6 * emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103198
diff changeset
4066 if (old_req.height != new_req.height
59420
eb72706060ad * xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents: 59411
diff changeset
4067 && ! FRAME_X_OUTPUT (f)->toolbar_detached)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4068 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4069 FRAME_TOOLBAR_HEIGHT (f) = new_req.height;
103665
340c701162a6 * emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103198
diff changeset
4070 xg_height_changed (f);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4071 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4072 UNBLOCK_INPUT;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4073 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4074
57715
cdc48cdd5b0e * gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 57597
diff changeset
4075 /* 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
4076 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
4077
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4078 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
4079 free_frame_tool_bar (FRAME_PTR f)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4080 {
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4081 struct x_output *x = f->output_data.x;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4082
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4083 if (x->toolbar_widget)
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4084 {
93030
d38f7962c052 (free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents: 92366
diff changeset
4085 int is_packed = x->handlebox_widget != 0;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4086 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
4087 /* 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
4088 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
4089 if (is_packed)
d38f7962c052 (free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents: 92366
diff changeset
4090 gtk_container_remove (GTK_CONTAINER (x->vbox_widget),
d38f7962c052 (free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents: 92366
diff changeset
4091 x->handlebox_widget);
d38f7962c052 (free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents: 92366
diff changeset
4092 else
d38f7962c052 (free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents: 92366
diff changeset
4093 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
4094
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4095 x->toolbar_widget = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4096 x->handlebox_widget = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4097 FRAME_TOOLBAR_HEIGHT (f) = 0;
103665
340c701162a6 * emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103198
diff changeset
4098 xg_height_changed (f);
340c701162a6 * emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents: 103198
diff changeset
4099
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4100 UNBLOCK_INPUT;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4101 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4102 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4103
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4104
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4105
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4106 /***********************************************************************
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4107 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
4108 ***********************************************************************/
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4109 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
4110 xg_initialize (void)
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4111 {
59102
0096c58ce34a * xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents: 59084
diff changeset
4112 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
4113
75417
c21d47d727f3 (xg_initialize): Call XftInit if HAVE_XFT.
Jan Djärv <jan.h.d@swipnet.se>
parents: 75348
diff changeset
4114 #if HAVE_XFT
c21d47d727f3 (xg_initialize): Call XftInit if HAVE_XFT.
Jan Djärv <jan.h.d@swipnet.se>
parents: 75348
diff changeset
4115 /* 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
4116 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
4117 XftInit (0);
c21d47d727f3 (xg_initialize): Call XftInit if HAVE_XFT.
Jan Djärv <jan.h.d@swipnet.se>
parents: 75348
diff changeset
4118 #endif
84621
5d074ea0e4a2 (gdpy_def): New variable.
Jan Djärv <jan.h.d@swipnet.se>
parents: 84604
diff changeset
4119
5d074ea0e4a2 (gdpy_def): New variable.
Jan Djärv <jan.h.d@swipnet.se>
parents: 84604
diff changeset
4120 gdpy_def = NULL;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4121 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
4122 xg_detached_menus = 0;
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4123 xg_menu_cb_list.prev = xg_menu_cb_list.next =
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4124 xg_menu_item_cb_list.prev = xg_menu_item_cb_list.next = 0;
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4125
49419
6562bb5f04aa gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents: 49359
diff changeset
4126 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
4127 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
4128
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4129 /* Remove F10 as a menu accelerator, it does not mix well with Emacs key
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4130 bindings. It doesn't seem to be any way to remove properties,
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4131 so we set it to VoidSymbol which in X means "no key". */
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4132 gtk_settings_set_string_property (gtk_settings_get_default (),
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4133 "gtk-menu-bar-accel",
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4134 "VoidSymbol",
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4135 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
4136
6562bb5f04aa gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents: 49359
diff changeset
4137 /* 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
4138 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
4139 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
4140 "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
4141 "Emacs",
6562bb5f04aa gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents: 49359
diff changeset
4142 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
4143
0096c58ce34a * xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents: 59084
diff changeset
4144 /* 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
4145 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
4146 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
4147 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
4148 "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
4149
0096c58ce34a * xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents: 59084
diff changeset
4150 /* 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
4151 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
4152 (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
4153 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
4154 "cancel", 0);
49323
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4155 }
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4156
078b78ea8e76 GTK files gtkutil.c and .h
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4157 #endif /* USE_GTK */
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52080
diff changeset
4158
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52080
diff changeset
4159 /* arch-tag: fe7104da-bc1e-4aba-9bd1-f349c528f7e3
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52080
diff changeset
4160 (do not change this comment) */