annotate src/gui-gtk.c @ 5891:a0e751d6c3ad

Import the #'clear-string API from GNU, use it in tls.c src/ChangeLog addition: 2015-04-18 Aidan Kehoe <kehoea@parhasard.net> * sequence.c (Fclear_string): New, API from GNU. Zero a string's contents, making sure the text is not kept around even when the string's data is reallocated because of a changed character length. * sequence.c (syms_of_sequence): Make it available to Lisp. * lisp.h: Make it available to C code. * tls.c (nss_pk11_password): Use it. * tls.c (gnutls_pk11_password): Use it. * tls.c (openssl_password): Use it. tests/ChangeLog addition: 2015-04-18 Aidan Kehoe <kehoea@parhasard.net> * automated/lisp-tests.el: Test #'clear-string, just added. Unfortunately there's no way to be certain from Lisp that the old password data has been erased after realloc; it may be worth adding a test to tests.c, but *we'll be reading memory we shouldn't be*, so that gives me pause.
author Aidan Kehoe <kehoea@parhasard.net>
date Sat, 18 Apr 2015 23:00:14 +0100
parents 56144c8593a8
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2168
95fee4a1420e [xemacs-hg @ 2004-07-07 12:00:58 by malcolmp]
malcolmp
parents: 2054
diff changeset
1 /* General GUI code -- GTK-specific. (menubars, scrollbars, toolbars, dialogs)
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
2 Copyright (C) 1995 Board of Trustees, University of Illinois.
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 563
diff changeset
3 Copyright (C) 1995, 1996, 2002 Ben Wing.
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
4 Copyright (C) 1995 Sun Microsystems, Inc.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
5 Copyright (C) 1998 Free Software Foundation, Inc.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
6
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
7 This file is part of XEmacs.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
8
5402
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 2552
diff changeset
9 XEmacs is free software: you can redistribute it and/or modify it
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
10 under the terms of the GNU General Public License as published by the
5402
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 2552
diff changeset
11 Free Software Foundation, either version 3 of the License, or (at your
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 2552
diff changeset
12 option) any later version.
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
13
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
14 XEmacs is distributed in the hope that it will be useful, but WITHOUT
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
17 for more details.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
18
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
19 You should have received a copy of the GNU General Public License
5402
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 2552
diff changeset
20 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
21
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
22 /* Synched up with: Not in FSF. */
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
23
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
24 #include <config.h>
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
25 #include "lisp.h"
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
26
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
27 #include "buffer.h"
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 563
diff changeset
28 #include "device-impl.h"
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
29 #include "frame.h"
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
30 #include "gui.h"
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
31 #include "opaque.h"
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
32
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 563
diff changeset
33 #include "console-gtk-impl.h"
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 563
diff changeset
34
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
35 static GUI_ID gui_id_ctr = 0;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
36
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
37 GUI_ID
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
38 new_gui_id (void)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
39 {
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
40 return (++gui_id_ctr);
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
41 }
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
42
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
43 /* This is like FRAME_MENUBAR_DATA (f), but contains an alist of
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
44 (id . popup-data) for GCPRO'ing the callbacks of the popup menus
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
45 and dialog boxes. */
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
46 static Lisp_Object Vpopup_callbacks;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
47
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
48 void
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
49 gcpro_popup_callbacks (GUI_ID id, Lisp_Object data)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
50 {
5581
56144c8593a8 Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents: 5402
diff changeset
51 Vpopup_callbacks = Fcons (Fcons (make_fixnum (id), data), Vpopup_callbacks);
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
52 }
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
53
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
54 void
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
55 ungcpro_popup_callbacks (GUI_ID id)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
56 {
5581
56144c8593a8 Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents: 5402
diff changeset
57 Lisp_Object lid = make_fixnum (id);
2552
166ed8151e62 [xemacs-hg @ 2005-02-03 16:30:33 by james]
james
parents: 2168
diff changeset
58 Lisp_Object this_callback = assq_no_quit (lid, Vpopup_callbacks);
166ed8151e62 [xemacs-hg @ 2005-02-03 16:30:33 by james]
james
parents: 2168
diff changeset
59 Vpopup_callbacks = delq_no_quit (this_callback, Vpopup_callbacks);
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
60 }
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
61
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
62 Lisp_Object
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
63 get_gcpro_popup_callbacks (GUI_ID id)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
64 {
5581
56144c8593a8 Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents: 5402
diff changeset
65 Lisp_Object lid = make_fixnum (id);
2552
166ed8151e62 [xemacs-hg @ 2005-02-03 16:30:33 by james]
james
parents: 2168
diff changeset
66 Lisp_Object this_callback = assq_no_quit (lid, Vpopup_callbacks);
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
67
2552
166ed8151e62 [xemacs-hg @ 2005-02-03 16:30:33 by james]
james
parents: 2168
diff changeset
68 if (!NILP (this_callback))
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
69 {
2552
166ed8151e62 [xemacs-hg @ 2005-02-03 16:30:33 by james]
james
parents: 2168
diff changeset
70 return (XCDR (this_callback));
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
71 }
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
72 return (Qnil);
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
73 }
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
74
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
75 void
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
76 syms_of_gui_gtk (void)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
77 {
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
78 #ifdef HAVE_POPUPS
563
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 462
diff changeset
79 DEFSYMBOL (Qmenu_no_selection_hook);
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
80 #endif
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
81 }
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
82
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
83 void
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
84 vars_of_gui_gtk (void)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
85 {
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
86 staticpro (&Vpopup_callbacks);
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
87 Vpopup_callbacks = Qnil;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
88 #ifdef HAVE_POPUPS
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
89 popup_up_p = 0;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
90
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
91 #if 0
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
92 /* This DEFVAR_LISP is just for the benefit of make-docfile. */
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
93 /* #### misnamed */
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
94 DEFVAR_LISP ("menu-no-selection-hook", &Vmenu_no_selection_hook /*
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
95 Function or functions to call when a menu or dialog box is dismissed
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
96 without a selection having been made.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
97 */ );
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
98 #endif
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
99
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
100 Fset (Qmenu_no_selection_hook, Qnil);
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
101 #endif /* HAVE_POPUPS */
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
102 }