Mercurial > hg > xemacs-beta
annotate src/input-method-motif.c @ 5124:623d57b7fbe8 ben-lisp-object
separate regular and disksave finalization, print method fixes.
Create separate disksave method and make the finalize method only be for
actual object finalization, not disksave finalization.
Fix places where 0 was given in place of a printer -- print methods are
mandatory, and internal objects formerly without a print method now must
explicitly specify internal_object_printer().
Change the defn of CONSOLE_LIVE_P to avoid problems in some weird situations.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-01-20 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (very_old_free_lcrecord):
* alloc.c (disksave_object_finalization_1):
* alloc.c (make_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* buffer.c:
* bytecode.c:
* bytecode.c (Fcompiled_function_p):
* chartab.c:
* console-impl.h:
* console-impl.h (CONSOLE_TYPE_P):
* console.c:
* console.c (set_quit_events):
* data.c:
* data.c (Fmake_ephemeron):
* database.c:
* database.c (finalize_database):
* database.c (Fclose_database):
* device-msw.c:
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device.c:
* elhash.c:
* elhash.c (finalize_hash_table):
* eval.c:
* eval.c (bind_multiple_value_limits):
* event-stream.c:
* event-stream.c (finalize_command_builder):
* events.c:
* events.c (mark_event):
* extents.c:
* extents.c (finalize_extent_info):
* extents.c (uninit_buffer_extents):
* faces.c:
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.h:
* file-coding.h (struct coding_system_methods):
* file-coding.h (struct detector):
* floatfns.c:
* floatfns.c (extract_float):
* fns.c:
* fns.c (Fidentity):
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (finalize_fc_config):
* frame.c:
* glyphs.c:
* glyphs.c (finalize_image_instance):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* gui.c:
* gui.c (gui_error):
* keymap.c:
* lisp.h (struct Lisp_Symbol):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE):
* lrecord.h (DEFINE_DUMPABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (MAKE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (MAKE_MODULE_LISP_OBJECT):
* lstream.c:
* lstream.c (finalize_lstream):
* lstream.c (disksave_lstream):
* marker.c:
* marker.c (finalize_marker):
* mule-charset.c (make_charset):
* number.c:
* objects.c:
* objects.c (finalize_color_instance):
* objects.c (finalize_font_instance):
* opaque.c:
* opaque.c (make_opaque_ptr):
* process-nt.c:
* process-nt.c (nt_finalize_process_data):
* process-nt.c (nt_deactivate_process):
* process.c:
* process.c (finalize_process):
* procimpl.h (struct process_methods):
* scrollbar.c:
* scrollbar.c (free_scrollbar_instance):
* specifier.c (finalize_specifier):
* symbols.c:
* toolbar.c:
* toolbar.c (Ftoolbar_button_p):
* tooltalk.c:
* ui-gtk.c:
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* window.c:
* window.c (finalize_window):
* window.c (mark_window_as_deleted):
Separate out regular and disksave finalization. Instead of a
FOR_DISKSAVE argument to the finalizer, create a separate object
method `disksaver'. Make `finalizer' have only one argument.
Go through and separate out all finalize methods into finalize
and disksave. Delete lots of thereby redundant disksave checking.
Delete places that signal an error if we attempt to disksave --
all of these objects are non-dumpable and we will get an error
from pdump anyway if we attempt to dump them. After this is done,
only one object remains that has a disksave method -- lstream.
Change DEFINE_*_LISP_OBJECT_WITH_PROPS to DEFINE_*_GENERAL_LISP_OBJECT,
which is used for specifying either property methods or disksave
methods (or in the future, any other less-used methods).
Remove the for_disksave argument to finalize_process_data. Don't
provide a disksaver for processes because no one currently needs
it.
Clean up various places where objects didn't provide a print method.
It was made mandatory in previous changes, and all methods now
either provide their own print method or use internal_object_printer
or external_object_printer.
Change the definition of CONSOLE_LIVE_P to use the contype enum
rather than looking into the conmeths structure -- in some weird
situations with dead objects, the conmeths structure is NULL,
and printing such objects from debug_print() will crash if we try
to look into the conmeths structure.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 20 Jan 2010 07:05:57 -0600 |
| parents | 04bc9d2f42c7 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Various functions for X11R5+ input methods, using the Motif XmIm* functions. |
| 2 input-method-xlib.c provides a lower-level implementation. | |
| 3 Copyright (C) 1996 Sun Microsystems. | |
| 4 | |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 24 /* Written by Martin Buchholz. */ | |
| 25 | |
| 26 #include <config.h> | |
| 27 #include <X11/Xlocale.h> /* More portable than <locale.h> ? */ | |
| 28 #include "lisp.h" | |
| 897 | 29 #include "frame-impl.h" |
| 30 #include "console-x-impl.h" | |
| 428 | 31 #include "device.h" |
| 32 #include "frame.h" | |
| 33 #include "EmacsFrame.h" | |
| 1315 | 34 #include "xmotif.h" |
| 428 | 35 |
| 36 #ifndef XIM_MOTIF | |
| 37 #error XIM_MOTIF is not defined?? | |
| 38 #endif | |
| 39 | |
| 40 | |
| 41 /* Create X input method for device */ | |
| 42 void | |
| 2286 | 43 XIM_init_device (struct device *UNUSED (d)) |
| 428 | 44 { |
| 45 /* Nothing to do */ | |
| 46 } | |
| 47 | |
| 651 | 48 /* Callback for the deleting frame. */ |
| 49 static void | |
| 2286 | 50 XIM_delete_frame (Widget UNUSED (w), XtPointer client_data, |
| 51 XtPointer UNUSED (call_data)) | |
| 651 | 52 { |
| 53 XmImUnregister ((Widget) client_data); | |
| 54 } | |
| 55 | |
| 428 | 56 void |
| 57 XIM_init_frame (struct frame *f) | |
| 58 { | |
| 59 Widget w = FRAME_X_TEXT_WIDGET (f); | |
| 60 XPoint spot = {0,0}; | |
| 61 XmFontList fontlist; | |
| 62 XmFontListEntry fontlistEntry; | |
| 63 | |
| 64 typedef struct | |
| 65 { | |
| 66 XFontSet fontset; | |
| 67 Pixel fg; | |
| 68 Pixel bg; | |
| 69 } xim_resources_t; | |
| 70 | |
| 71 xim_resources_t xim_resources; | |
| 72 | |
| 73 /* mrb: #### Fix so that background and foreground is set from | |
| 74 default face, rather than foreground and background resources, or | |
| 75 that the user can use set-frame-parameters to set xic attributes */ | |
| 76 | |
| 1204 | 77 #define res(name, class_, representation, field, default_value) \ |
| 78 { name, class_, representation, sizeof(xim_resources.field), \ | |
| 438 | 79 XtOffsetOf(xim_resources_t, field), \ |
| 80 XtRString, (XtPointer) (default_value) } | |
| 428 | 81 |
| 82 static XtResource resources[] = | |
| 83 { | |
| 84 /* name class represent'n field default value */ | |
| 85 res(XtNfontSet, XtCFontSet, XtRFontSet, fontset, XtDefaultFontSet), | |
| 86 res(XtNximForeground, XtCForeground, XtRPixel, fg, XtDefaultForeground), | |
| 87 res(XtNximBackground, XtCBackground, XtRPixel, bg, XtDefaultBackground) | |
| 88 }; | |
| 89 | |
| 90 XtGetApplicationResources (w, &xim_resources, | |
| 91 resources, XtNumber (resources), | |
| 92 NULL, 0); | |
| 93 | |
| 94 if (! xim_resources.fontset) | |
| 95 { | |
| 96 stderr_out ("Can't get fontset resource for Input Method\n"); | |
| 97 return; | |
| 98 } | |
| 99 | |
| 100 fontlistEntry = XmFontListEntryCreate(XmFONTLIST_DEFAULT_TAG, | |
| 101 XmFONT_IS_FONTSET, | |
| 102 (XtPointer) xim_resources.fontset); | |
| 103 fontlist = XmFontListAppendEntry (NULL, fontlistEntry); | |
| 104 XmImRegister (w, 0); | |
| 105 XmImVaSetValues (w, | |
| 106 XmNfontList, fontlist, | |
| 107 XmNforeground, xim_resources.fg, | |
| 108 XmNbackground, xim_resources.bg, | |
| 109 XmNspotLocation, &spot, | |
| 110 /* XmNlineSpace, 0, */ | |
| 111 NULL); | |
| 112 | |
| 113 XmFontListEntryFree (&fontlistEntry); | |
| 651 | 114 |
| 115 XtAddCallback (w, XmNdestroyCallback, XIM_delete_frame, (XtPointer) w); | |
| 428 | 116 } |
| 117 | |
| 118 void | |
| 2286 | 119 XIM_SetGeometry (struct frame *UNUSED (f)) |
| 428 | 120 { |
| 121 } | |
| 122 | |
| 123 void | |
| 124 XIM_SetSpotLocation (struct frame *f, int x, int y) | |
| 125 { | |
| 440 | 126 /* #### FIX: Must make sure spot fits within Preedit Area */ |
| 428 | 127 XPoint *spot = &(FRAME_X_XIC_SPOT (f)); |
| 128 if (spot->x == (short) x && | |
| 129 spot->y == (short) y) | |
| 130 return; | |
| 131 | |
| 132 spot->x = (short) x; | |
| 133 spot->y = (short) y; | |
| 134 | |
| 135 XmImVaSetValues (FRAME_X_TEXT_WIDGET (f), XmNspotLocation, spot, NULL); | |
| 136 } | |
| 137 | |
| 138 void | |
| 139 XIM_focus_event (struct frame *f, int in_p) | |
| 140 { | |
| 141 if (in_p) | |
| 142 XmImVaSetFocusValues (FRAME_X_TEXT_WIDGET (f), NULL); | |
| 143 else | |
| 144 XmImUnsetFocus (FRAME_X_TEXT_WIDGET (f)); | |
| 145 } | |
| 146 | |
| 147 void | |
| 148 vars_of_input_method_motif (void) | |
| 149 { | |
| 150 Fprovide (intern ("xim")); | |
| 151 } |