Mercurial > hg > xemacs-beta
annotate lisp/dialog-gtk.el @ 4981:4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_lo_import):
* postgresql/postgresql.c (Fpq_lo_export):
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* ldap/eldap.c (Fldap_add):
* ldap/eldap.c (Fldap_modify):
* ldap/eldap.c (Fldap_delete):
* canna/canna_api.c (Fcanna_initialize):
* canna/canna_api.c (Fcanna_store_yomi):
* canna/canna_api.c (Fcanna_parse):
* canna/canna_api.c (Fcanna_henkan_begin):
EXTERNAL_TO_C_STRING returns its argument instead of storing it
in a parameter, and is renamed to EXTERNAL_TO_ITEXT. Similar
things happen to related macros. See entry in src/ChangeLog.
More Mule-izing of postgresql.c. Extract out common code
between `pq-connectdb' and `pq-connect-start'. Fix places
that signal an error string using a formatted string to instead
follow the standard and have a fixed reason followed by the
particular error message stored as one of the frobs.
src/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* console-msw.c (write_string_to_mswindows_debugging_output):
* console-msw.c (Fmswindows_message_box):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* console.c:
* database.c (dbm_get):
* database.c (dbm_put):
* database.c (dbm_remove):
* database.c (berkdb_get):
* database.c (berkdb_put):
* database.c (berkdb_remove):
* database.c (Fopen_database):
* device-gtk.c (gtk_init_device):
* device-msw.c (msprinter_init_device_internal):
* device-msw.c (msprinter_default_printer):
* device-msw.c (msprinter_init_device):
* device-msw.c (sync_printer_with_devmode):
* device-msw.c (Fmsprinter_select_settings):
* device-x.c (sanity_check_geometry_resource):
* device-x.c (Dynarr_add_validified_lisp_string):
* device-x.c (x_init_device):
* device-x.c (Fx_put_resource):
* device-x.c (Fx_valid_keysym_name_p):
* device-x.c (Fx_set_font_path):
* dialog-msw.c (push_lisp_string_as_unicode):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-x.c (dbox_descriptor_to_widget_value):
* editfns.c (Fformat_time_string):
* editfns.c (Fencode_time):
* editfns.c (Fset_time_zone_rule):
* emacs.c (make_argc_argv):
* emacs.c (Fdump_emacs):
* emodules.c (emodules_load):
* eval.c:
* eval.c (maybe_signal_error_1):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* fileio.c (report_error_with_errno):
* fileio.c (Fsysnetunam):
* fileio.c (Fdo_auto_save):
* font-mgr.c (extract_fcapi_string):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_filename):
* frame-gtk.c (gtk_set_frame_text_value):
* frame-gtk.c (gtk_create_widgets):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_set_title_from_ibyte):
* frame-msw.c (msprinter_init_frame_3):
* frame-x.c (x_set_frame_text_value):
* frame-x.c (x_set_frame_properties):
* frame-x.c (start_drag_internal_1):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (x_create_widgets):
* glyphs-eimage.c (my_jpeg_output_message):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (gif_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (xbm_instantiate_1):
* glyphs-gtk.c (gtk_xbm_instantiate):
* glyphs-gtk.c (gtk_xpm_instantiate):
* glyphs-gtk.c (gtk_xface_instantiate):
* glyphs-gtk.c (cursor_font_instantiate):
* glyphs-gtk.c (gtk_redisplay_widget):
* glyphs-gtk.c (gtk_widget_instantiate_1):
* glyphs-gtk.c (gtk_add_tab_item):
* glyphs-msw.c (mswindows_xpm_instantiate):
* glyphs-msw.c (bmp_instantiate):
* glyphs-msw.c (mswindows_resource_instantiate):
* glyphs-msw.c (xbm_instantiate_1):
* glyphs-msw.c (mswindows_xbm_instantiate):
* glyphs-msw.c (mswindows_xface_instantiate):
* glyphs-msw.c (mswindows_redisplay_widget):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs-msw.c (add_tree_item):
* glyphs-msw.c (add_tab_item):
* glyphs-msw.c (mswindows_combo_box_instantiate):
* glyphs-msw.c (mswindows_widget_query_string_geometry):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (xbm_instantiate_1):
* glyphs-x.c (x_xbm_instantiate):
* glyphs-x.c (extract_xpm_color_names):
* glyphs-x.c (x_xpm_instantiate):
* glyphs-x.c (x_xface_instantiate):
* glyphs-x.c (autodetect_instantiate):
* glyphs-x.c (safe_XLoadFont):
* glyphs-x.c (cursor_font_instantiate):
* glyphs-x.c (x_redisplay_widget):
* glyphs-x.c (Fchange_subwindow_property):
* glyphs-x.c (x_widget_instantiate):
* glyphs-x.c (x_tab_control_redisplay):
* glyphs.c (pixmap_to_lisp_data):
* gui-x.c (menu_separator_style_and_to_external):
* gui-x.c (add_accel_and_to_external):
* gui-x.c (button_item_to_widget_value):
* hpplay.c (player_error_internal):
* hpplay.c (play_sound_file):
* hpplay.c (play_sound_data):
* intl.c (Fset_current_locale):
* lisp.h:
* menubar-gtk.c (gtk_xemacs_set_accel_keys):
* menubar-msw.c (populate_menu_add_item):
* menubar-msw.c (populate_or_checksum_helper):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* nt.c (init_user_info):
* nt.c (get_long_basename):
* nt.c (nt_get_resource):
* nt.c (init_mswindows_environment):
* nt.c (get_cached_volume_information):
* nt.c (mswindows_readdir):
* nt.c (read_unc_volume):
* nt.c (mswindows_stat):
* nt.c (mswindows_getdcwd):
* nt.c (mswindows_executable_type):
* nt.c (Fmswindows_short_file_name):
* ntplay.c (nt_play_sound_file):
* objects-gtk.c:
* objects-gtk.c (gtk_valid_color_name_p):
* objects-gtk.c (gtk_initialize_font_instance):
* objects-gtk.c (gtk_font_list):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (parse_font_spec):
* objects-x.c (x_parse_nearest_color):
* objects-x.c (x_valid_color_name_p):
* objects-x.c (x_initialize_font_instance):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_list):
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_create_process):
* process-nt.c (get_internet_address):
* process-nt.c (nt_open_network_stream):
* process-unix.c:
* process-unix.c (allocate_pty):
* process-unix.c (get_internet_address):
* process-unix.c (unix_canonicalize_host_name):
* process-unix.c (unix_open_network_stream):
* realpath.c:
* select-common.h (lisp_data_to_selection_data):
* select-gtk.c (symbol_to_gtk_atom):
* select-gtk.c (atom_to_symbol):
* select-msw.c (symbol_to_ms_cf):
* select-msw.c (mswindows_register_selection_data_type):
* select-x.c (symbol_to_x_atom):
* select-x.c (x_atom_to_symbol):
* select-x.c (hack_motif_clipboard_selection):
* select-x.c (Fx_store_cutbuffer_internal):
* sound.c (Fplay_sound_file):
* sound.c (Fplay_sound):
* sound.h (sound_perror):
* sysdep.c:
* sysdep.c (qxe_allocating_getcwd):
* sysdep.c (qxe_execve):
* sysdep.c (copy_in_passwd):
* sysdep.c (qxe_getpwnam):
* sysdep.c (qxe_ctime):
* sysdll.c (dll_open):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (search_linked_libs):
* sysdll.c (dll_error):
* sysfile.h:
* sysfile.h (PATHNAME_CONVERT_OUT_TSTR):
* sysfile.h (PATHNAME_CONVERT_OUT_UTF_8):
* sysfile.h (PATHNAME_CONVERT_OUT):
* sysfile.h (LISP_PATHNAME_CONVERT_OUT):
* syswindows.h (ITEXT_TO_TSTR):
* syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR):
* syswindows.h (TSTR_TO_LOCAL_FILE_FORMAT):
* syswindows.h (LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN):
* syswindows.h (LISP_LOCAL_FILE_FORMAT_MAYBE_URL_TO_TSTR):
* text.h:
* text.h (eicpy_ext_len):
* text.h (enum new_dfc_src_type):
* text.h (EXTERNAL_TO_ITEXT):
* text.h (GET_STRERROR):
* tooltalk.c (check_status):
* tooltalk.c (Fadd_tooltalk_message_arg):
* tooltalk.c (Fadd_tooltalk_pattern_attribute):
* tooltalk.c (Fadd_tooltalk_pattern_arg):
* win32.c (tstr_to_local_file_format):
* win32.c (mswindows_lisp_error_1):
* win32.c (mswindows_report_process_error):
* win32.c (Fmswindows_shell_execute):
* win32.c (mswindows_read_link_1):
Changes involving external/internal format conversion,
mostly code cleanup and renaming.
1. Eliminate the previous macros like LISP_STRING_TO_EXTERNAL
that stored its result in a parameter. The new version of
LISP_STRING_TO_EXTERNAL returns its result through the
return value, same as the previous NEW_LISP_STRING_TO_EXTERNAL.
Use the new-style macros throughout the code.
2. Rename C_STRING_TO_EXTERNAL and friends to ITEXT_TO_EXTERNAL,
in keeping with overall naming rationalization involving
Itext and related types.
Macros involved in previous two:
EXTERNAL_TO_C_STRING -> EXTERNAL_TO_ITEXT
EXTERNAL_TO_C_STRING_MALLOC -> EXTERNAL_TO_ITEXT_MALLOC
SIZED_EXTERNAL_TO_C_STRING -> SIZED_EXTERNAL_TO_ITEXT
SIZED_EXTERNAL_TO_C_STRING_MALLOC -> SIZED_EXTERNAL_TO_ITEXT_MALLOC
C_STRING_TO_EXTERNAL -> ITEXT_TO_EXTERNAL
C_STRING_TO_EXTERNAL_MALLOC -> ITEXT_TO_EXTERNAL_MALLOC
LISP_STRING_TO_EXTERNAL
LISP_STRING_TO_EXTERNAL_MALLOC
LISP_STRING_TO_TSTR
C_STRING_TO_TSTR -> ITEXT_TO_TSTR
TSTR_TO_C_STRING -> TSTR_TO_ITEXT
The following four still return their values through parameters,
since they have more than one value to return:
C_STRING_TO_SIZED_EXTERNAL -> ITEXT_TO_SIZED_EXTERNAL
LISP_STRING_TO_SIZED_EXTERNAL
C_STRING_TO_SIZED_EXTERNAL_MALLOC -> ITEXT_TO_SIZED_EXTERNAL_MALLOC
LISP_STRING_TO_SIZED_EXTERNAL_MALLOC
Sometimes additional casts had to be inserted, since the old
macros played strange games and completely defeated the type system
of the store params.
3. Rewrite many places where direct calls to TO_EXTERNAL_FORMAT
occurred with calls to one of the convenience macros listed above,
or to make_extstring().
4. Eliminate SIZED_C_STRING macros (they were hardly used, anyway)
and use a direct call to TO_EXTERNAL_FORMAT or TO_INTERNAL_FORMAT.
4. Use LISP_PATHNAME_CONVERT_OUT in many places instead of something
like LISP_STRING_TO_EXTERNAL(..., Qfile_name).
5. Eliminate some temporary variables that are no longer necessary
now that we return a value rather than storing it into a variable.
6. Some Mule-izing in database.c.
7. Error functions:
-- A bit of code cleanup in maybe_signal_error_1.
-- Eliminate report_file_type_error; it's just an alias for
signal_error_2 with params in a different order.
-- Fix some places in the hostname-handling code that directly
inserted externally-retrieved error strings into the
supposed ASCII "reason" param instead of doing the right thing
and sticking text descriptive of what was going on in "reason"
and putting the external message in a frob.
8. Use Ascbyte instead of CIbyte in process-unix.c and maybe one
or two other places.
9. Some code cleanup in copy_in_passwd() in sysdep.c.
10. Fix a real bug due to accidental variable shadowing in
tstr_to_local_file_format() in win32.c.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Feb 2010 11:02:24 -0600 |
| parents | ecf1ebac70d8 |
| children | f00192e1cd49 308d34e9f07d |
| rev | line source |
|---|---|
| 462 | 1 ;;; dialog-gtk.el --- Dialog-box support for XEmacs w/GTK primitives |
| 2 | |
| 3 ;; Copyright (C) 2000 Free Software Foundation, Inc. | |
| 4 | |
| 5 ;; Maintainer: William M. Perry <wmperry@gnu.org> | |
| 6 ;; Keywords: extensions, internal, dumped | |
| 7 | |
| 8 ;; This file is part of XEmacs. | |
| 9 | |
| 10 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 11 ;; under the terms of the GNU General Public License as published by | |
| 12 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 13 ;; any later version. | |
| 14 | |
| 15 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 16 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 18 ;; General Public License for more details. | |
| 19 | |
| 20 ;; You should have received a copy of the GNU General Public License | |
| 21 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 22 ;; Free Software Foundation, 59 Temple Place - Suite 330, | |
| 23 ;; Boston, MA 02111-1307, USA. | |
| 24 | |
| 25 ;;; Synched up with: Not in FSF. | |
| 26 | |
| 27 ;;; Commentary: | |
| 28 | |
| 29 ;; This file is dumped with XEmacs (when dialog boxes are compiled in). | |
| 30 | |
| 31 (require 'cl) | |
| 32 (require 'gtk-password-dialog) | |
| 33 (require 'gtk-file-dialog) | |
| 34 | |
| 502 | 35 (globally-declare-fboundp |
| 36 '(gtk-signal-connect | |
| 37 gtk-main-quit gtk-window-set-transient-for | |
| 38 gtk-widget-show-all gtk-main gtk-color-selection-dialog-new | |
| 39 gtk-color-selection-dialog-ok-button gtk-widget-hide-all | |
| 40 gtk-color-selection-get-color | |
| 41 gtk-color-selection-dialog-colorsel | |
| 42 gtk-color-selection-dialog-cancel-button gtk-widget-show-now | |
| 43 gtk-widget-grab-focus gtk-widget-destroy gtk-dialog-new | |
| 44 gtk-window-set-title gtk-container-set-border-width | |
| 45 gtk-box-set-spacing gtk-dialog-vbox gtk-container-add | |
| 46 gtk-label-new gtk-button-new-with-label | |
| 2081 | 47 gtk-widget-set-sensitive gtk-widget-show gtk-dialog-action-area |
| 2367 | 48 gtk-label-parse-uline gtk-widget-add-accelerator gtk-accel-group-new |
| 49 gtk-misc-set-alignment gtk-button-new gtk-window-add-accel-group)) | |
| 2081 | 50 |
| 51 (defun gtk-popup-convert-underscores (str) | |
| 52 ;; Convert the XEmacs button accelerator representation to Gtk mnemonic | |
| 53 ;; form. If no accelerator has been provided, put one at the start of the | |
| 54 ;; string (this mirrors the behaviour under X). This algorithm is also found | |
| 55 ;; in menubar-gtk.c:convert_underscores(). | |
| 56 (let ((new-str (string)) | |
| 57 (i 0) | |
| 58 (found-accel nil)) | |
| 59 (while (< i (length str)) | |
| 60 (let ((c (aref str i))) | |
| 61 (cond ((eq c ?%) | |
| 62 (setq i (1+ i)) | |
| 63 (if (and (not (eq (aref str i) ?_)) (not (eq (aref str i) ?%))) | |
| 64 (setq i (1- i))) | |
| 65 (setq found-accel 1) | |
| 66 ) | |
| 67 ((eq c ?_) | |
| 68 (setq new-str (concat new-str "_"))) | |
| 69 )) | |
| 70 (setq new-str (concat new-str (string (aref str i)))) | |
| 71 (setq i (1+ i)) | |
| 72 ) | |
| 73 (if found-accel new-str (concat "_" new-str)) | |
| 74 )) | |
| 502 | 75 |
| 462 | 76 (defun popup-builtin-open-dialog (keys) |
| 77 ;; Allowed keywords are: | |
| 78 ;; | |
| 79 ;; :initial-filename fname | |
| 80 ;; :initial-directory dir | |
| 81 ;; :filter-list (filter-desc filter ...) | |
| 82 ;; :directory t/nil | |
| 83 ;; :title string | |
| 84 ;; :allow-multi-select t/nil | |
| 85 ;; :create-prompt-on-nonexistent t/nil | |
| 86 ;; :overwrite-prompt t/nil | |
| 87 ;; :file-must-exist t/nil | |
| 88 ;; :no-network-button t/nil | |
| 89 ;; :no-read-only-return t/nil | |
| 90 (let ((initial-filename (plist-get keys :initial-filename)) | |
| 91 (clicked-ok nil) | |
| 622 | 92 (widget nil) |
| 93 filename) | |
| 462 | 94 (setq widget (gtk-file-dialog-new |
| 95 :directory (plist-get keys :directory) | |
| 96 :callback `(lambda (f) | |
| 97 (setq clicked-ok t | |
| 98 filename f)) | |
| 99 :initial-directory (or (plist-get keys :initial-directory nil) | |
| 100 (if initial-filename | |
| 101 (file-name-directory initial-filename) | |
| 102 default-directory)) | |
| 103 :filter-list (plist-to-alist | |
| 104 (plist-get keys :filter-list nil)) | |
| 105 :file-must-exist (plist-get keys :file-must-exist nil))) | |
| 106 | |
| 107 (gtk-signal-connect widget 'destroy (lambda (obj data) (gtk-main-quit))) | |
| 108 | |
| 109 (gtk-window-set-transient-for widget (frame-property nil 'shell-widget)) | |
| 110 (gtk-widget-show-all widget) | |
| 111 (gtk-main) | |
| 112 (if (not clicked-ok) | |
| 608 | 113 (signal 'quit nil) |
| 114 filename))) | |
| 462 | 115 |
| 116 (defalias 'popup-builtin-save-as-dialog 'popup-builtin-open-dialog) | |
| 117 | |
| 118 (defun popup-builtin-color-dialog (keys) | |
| 119 ;; Allowed keys: | |
| 120 ;; :initial-color COLOR | |
| 502 | 121 (let (;(initial-color (or (plist-get keys :initial-color) "white")) |
| 462 | 122 (title (or (plist-get keys :title "Select color..."))) |
| 123 (dialog nil) | |
| 124 (clicked-ok nil) | |
| 125 (color nil)) | |
| 126 (setq dialog (gtk-color-selection-dialog-new title)) | |
| 127 (gtk-signal-connect | |
| 128 (gtk-color-selection-dialog-ok-button dialog) 'clicked | |
| 129 (lambda (button colorsel) | |
| 130 (gtk-widget-hide-all dialog) | |
| 131 (setq color (gtk-color-selection-get-color colorsel) | |
| 132 clicked-ok t) | |
| 133 (gtk-main-quit)) | |
| 134 (gtk-color-selection-dialog-colorsel dialog)) | |
| 135 | |
| 136 (gtk-signal-connect | |
| 137 (gtk-color-selection-dialog-cancel-button dialog) 'clicked | |
| 138 (lambda (&rest ignored) | |
| 139 (gtk-main-quit))) | |
| 140 | |
| 141 (put dialog 'modal t) | |
| 142 (put dialog 'type 'dialog) | |
| 143 (gtk-window-set-transient-for dialog (frame-property nil 'shell-widget)) | |
| 144 | |
| 145 (unwind-protect | |
| 146 (progn | |
| 147 (gtk-widget-show-now dialog) | |
| 148 (gtk-main)) | |
| 149 '(gtk-widget-destroy dialog)) | |
| 150 (if (not clicked-ok) | |
| 151 (signal 'quit nil)) | |
| 152 ;; Need to convert from (R G B A) to #rrggbb | |
| 153 (format "#%02x%02x%02x" | |
| 154 (* 256 (nth 0 color)) | |
| 155 (* 256 (nth 1 color)) | |
| 156 (* 256 (nth 2 color))))) | |
| 157 | |
| 158 (defun popup-builtin-password-dialog (keys) | |
| 159 ;; Format is (default callback :keyword value) | |
| 160 ;; Allowed keywords are: | |
| 161 ;; | |
| 162 ;; :title string | |
| 163 :; :prompt string | |
| 164 ;; :default string | |
| 165 ;; :verify boolean | |
| 166 ;; :verify-prompt string | |
| 167 (let* ((default (plist-get keys :default)) | |
| 168 (dialog nil) | |
| 169 (clicked-ok nil) | |
| 170 (passwd nil) | |
| 171 (info nil) | |
| 172 (generic-cb (lambda (x) | |
| 173 (setq clicked-ok t | |
| 174 passwd x)))) | |
| 175 | |
| 176 ;; Convert the descriptor to keywords and create the dialog | |
| 177 (setq info (copy-list keys) | |
| 178 info (plist-put info :callback generic-cb) | |
| 179 info (plist-put info :default default) | |
| 180 dialog (apply 'gtk-password-dialog-new info)) | |
| 181 | |
| 182 ;; Clicking any button or closing the box exits the main loop. | |
| 183 (gtk-signal-connect (gtk-password-dialog-ok-button dialog) | |
| 184 'clicked | |
| 185 (lambda (&rest ignored) | |
| 186 (gtk-main-quit))) | |
| 187 | |
| 188 (gtk-signal-connect (gtk-password-dialog-cancel-button dialog) | |
| 189 'clicked | |
| 190 (lambda (&rest ignored) | |
| 191 (gtk-main-quit))) | |
| 192 | |
| 193 (gtk-signal-connect dialog | |
| 194 'delete-event | |
| 195 (lambda (&rest ignored) | |
| 196 (gtk-main-quit))) | |
| 197 | |
| 198 (gtk-widget-grab-focus (gtk-password-dialog-entry-widget dialog)) | |
| 199 | |
| 200 ;; Make us modal... | |
| 201 (put dialog 'modal t) | |
| 202 (gtk-window-set-transient-for dialog (frame-property nil 'shell-widget)) | |
| 203 | |
| 204 ;; Realize the damn thing & wait for some action... | |
| 205 (gtk-widget-show-all dialog) | |
| 206 (gtk-main) | |
| 207 | |
| 208 (if (not clicked-ok) | |
| 209 (signal 'quit nil)) | |
| 210 | |
| 211 (gtk-widget-destroy dialog) | |
| 212 passwd)) | |
| 213 | |
| 214 (defun popup-builtin-question-dialog (keys) | |
| 215 ;; Allowed keywords: | |
| 216 ;; :question STRING | |
| 217 ;; :buttons BUTTONDESC | |
| 218 (let ((title (or (plist-get keys :title) "Question")) | |
| 219 (buttons-descr (plist-get keys :buttons)) | |
| 220 (question (or (plist-get keys :question) "Question goes here...")) | |
| 221 (dialog nil) ; GtkDialog | |
| 222 (buttons nil) ; List of GtkButton objects | |
| 223 (activep t) | |
| 707 | 224 (callback nil) |
| 462 | 225 (flushrightp nil) |
| 707 | 226 (length nil) |
| 2081 | 227 (label nil) |
| 228 (gui-button nil) | |
| 229 (accel-group (gtk-accel-group-new)) | |
| 230 (accel-key nil) | |
| 462 | 231 (errp t)) |
| 232 (if (not buttons-descr) | |
| 233 (error 'syntax-error | |
| 234 "Dialog descriptor must supply at least one button")) | |
| 235 | |
| 236 ;; Do the basics - create the dialog, set the window title, and | |
| 237 ;; add the label asking the question. | |
| 238 (unwind-protect | |
| 239 (progn | |
| 240 (setq dialog (gtk-dialog-new)) | |
| 241 (gtk-window-set-title dialog title) | |
| 242 (gtk-container-set-border-width dialog 3) | |
| 243 (gtk-box-set-spacing (gtk-dialog-vbox dialog) 5) | |
| 244 (gtk-container-add (gtk-dialog-vbox dialog) (gtk-label-new question)) | |
| 245 | |
| 246 ;; Create the buttons. | |
| 247 (mapc (lambda (button) | |
| 248 ;; Handle flushright buttons | |
| 249 (if (null button) | |
| 250 (setq flushrightp t) | |
| 251 | |
| 252 ;; More sanity checking first of all. | |
| 253 (if (not (vectorp button)) | |
| 254 (error "Button descriptor is not a vector: %S" button)) | |
| 255 | |
| 707 | 256 (setq length (length button)) |
| 257 | |
| 258 (cond | |
| 259 ((= length 1) ; [ "name" ] | |
| 260 (setq callback nil | |
| 261 activep nil)) | |
| 262 ((= length 2) ; [ "name" callback ] | |
| 263 (setq callback (aref button 1) | |
| 264 activep t)) | |
| 265 ((and (or (= length 3) (= length 4)) | |
| 266 (not (keywordp (aref button 2)))) | |
| 267 ;; [ "name" callback active-p ] or | |
| 268 ;; [ "name" callback active-p suffix ] | |
| 269 ;; We ignore the 'suffix' entry, because that is | |
| 270 ;; what the X code does. | |
| 271 (setq callback (aref button 1) | |
| 272 activep (aref button 2))) | |
| 273 (t ; 100% keyword specification | |
| 274 (let ((plist (cdr (mapcar 'identity button)))) | |
| 275 (setq activep (plist-get plist :active) | |
| 276 callback (plist-get plist :callback))))) | |
| 462 | 277 |
| 2081 | 278 ;; Create the label and determine what the mnemonic key is. |
| 279 (setq label (gtk-label-new "")) | |
| 280 (setq accel-key (gtk-label-parse-uline label | |
| 281 (gtk-popup-convert-underscores (aref button 0)))) | |
| 282 ;; Place the label in the button. | |
| 283 (gtk-misc-set-alignment label 0.5 0.5) | |
| 284 (setq gui-button (gtk-button-new)) | |
| 285 (gtk-container-add gui-button label) | |
| 286 ;; Add ALT-mnemonic to the dialog's accelerator group. | |
| 287 (gtk-widget-add-accelerator gui-button "clicked" accel-group | |
| 288 accel-key | |
| 289 8 ; GDK_MOD1_MASK | |
| 290 4 ; GTK_ACCEL_LOCKED | |
| 291 ) | |
| 292 | |
| 293 (push gui-button buttons) | |
| 462 | 294 (gtk-widget-set-sensitive (car buttons) (eval activep)) |
| 295 | |
| 296 ;; Apply the callback | |
| 297 (gtk-signal-connect | |
| 298 (car buttons) 'clicked | |
| 299 (lambda (button data) | |
| 300 (push (make-event 'misc-user | |
| 301 (list 'object (car data) | |
| 302 'function | |
| 303 (if (symbolp (car data)) | |
| 304 'call-interactively | |
| 305 'eval))) | |
| 306 unread-command-events) | |
| 307 (gtk-main-quit) | |
| 308 t) | |
| 707 | 309 (cons callback dialog)) |
| 462 | 310 |
| 311 (gtk-widget-show (car buttons)) | |
| 312 (funcall (if flushrightp 'gtk-box-pack-end 'gtk-box-pack-start) | |
| 313 (gtk-dialog-action-area dialog) (car buttons) | |
| 314 nil t 2))) | |
| 315 buttons-descr) | |
| 316 | |
| 317 ;; Make sure they can't close it with the window manager | |
| 318 (gtk-signal-connect dialog 'delete-event (lambda (&rest ignored) t)) | |
| 319 (gtk-window-set-transient-for dialog (frame-property nil 'shell-widget)) | |
| 320 (put dialog 'type 'dialog) | |
| 321 (put dialog 'modal t) | |
| 2081 | 322 ;; Make the dialog listen for global mnemonic keys/ |
| 323 (gtk-window-add-accel-group dialog accel-group) | |
| 324 | |
| 462 | 325 (gtk-widget-show-all dialog) |
| 326 (gtk-main) | |
| 327 (gtk-widget-destroy dialog) | |
| 328 (setq errp nil)) | |
| 329 (if (not errp) | |
| 330 ;; Nothing, we successfully showed the dialog | |
| 331 nil | |
| 332 ;; We need to destroy all the widgets, just in case. | |
| 333 (mapc 'gtk-widget-destroy buttons) | |
| 334 (gtk-widget-destroy dialog))))) | |
| 335 | |
| 336 (defun gtk-make-dialog-box-internal (type keys) | |
| 337 (case type | |
| 338 (file | |
| 339 (popup-builtin-open-dialog keys)) | |
| 340 (password | |
| 341 (popup-builtin-password-dialog keys)) | |
| 342 (question | |
| 343 (popup-builtin-question-dialog keys)) | |
| 344 (color | |
| 345 (popup-builtin-color-dialog keys)) | |
| 346 (find | |
| 347 ) | |
| 348 (font | |
| 349 ) | |
| 350 (replace | |
| 351 ) | |
| 352 (mswindows-message | |
| 353 ;; This should really be renamed! | |
| 354 ) | |
| 355 (print | |
| 356 ) | |
| 357 (page-setup | |
| 358 ) | |
| 359 (print-setup | |
| 360 ) | |
| 361 (default | |
| 362 (error "Unknown type of dialog: %S" type)))) | |
| 363 | |
| 364 (provide 'dialog-gtk) |