comparison src/input-method-xlib.c @ 563:183866b06e0b

[xemacs-hg @ 2001-05-24 07:50:48 by ben] Makefile.in.in, abbrev.c, alloc.c, buffer.c, bytecode.c, callint.c, callproc.c, casetab.c, chartab.c, cmdloop.c, cmds.c, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console.c, data.c, database.c, debug.c, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, dired.c, doc.c, doprnt.c, dragdrop.c, editfns.c, eldap.c, eldap.h, elhash.c, emacs-widget-accessors.c, emacs.c, emodules.c, esd.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, filelock.c, floatfns.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, general-slots.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-gtk.c, gui-x.c, gui.c, gutter.c, hpplay.c, indent.c, input-method-xlib.c, insdel.c, intl.c, keymap.c, libsst.c, libsst.h, linuxplay.c, lisp.h, lread.c, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, miscplay.c, miscplay.h, mule-ccl.c, mule-charset.c, mule-wnnfns.c, mule.c, nas.c, ntplay.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay.c, scrollbar.c, search.c, select-gtk.c, select-x.c, select.c, sgiplay.c, sheap.c, sound.c, specifier.c, sunplay.c, symbols.c, symeval.h, symsinit.h, syntax.c, sysdep.c, toolbar-msw.c, toolbar.c, tooltalk.c, ui-byhand.c, ui-gtk.c, undo.c, unexaix.c, unexapollo.c, unexconvex.c, unexec.c, widget.c, win32.c, window.c: -- defsymbol -> DEFSYMBOL. -- add an error type to all errors. -- eliminate the error functions in eval.c that let you just use Qerror as the type. -- redo the error API to be more consistent, sensibly named, and easier to use. -- redo the error hierarchy somewhat. create new errors: structure-formation-error, gui-error, invalid-constant, stack-overflow, out-of-memory, process-error, network-error, sound-error, printing-unreadable-object, base64-conversion- error; coding-system-error renamed to text-conversion error; some others. -- fix Mule problems in error strings in emodules.c, tooltalk.c. -- fix error handling in mswin open-network-stream. -- Mule-ize all sound files and clean up the headers. -- nativesound.h -> sound.h and used for all sound files. -- move some shared stuff into glyphs-shared.c: first attempt at eliminating some of the massive GTK code duplication. xemacs.mak: add glyphs-shared.c. xemacs-faq.texi: document how to debug X errors subr.el: fix doc string to reflect reality
author ben
date Thu, 24 May 2001 07:51:33 +0000
parents 3078fd1074e8
children 943eaba38521
comparison
equal deleted inserted replaced
562:c775bd016b32 563:183866b06e0b
814 struct frame *f; 814 struct frame *f;
815 815
816 CHECK_LIVE_FRAME (frame); 816 CHECK_LIVE_FRAME (frame);
817 f = XFRAME (frame); 817 f = XFRAME (frame);
818 if (!FRAME_X_P (f)) 818 if (!FRAME_X_P (f))
819 return signal_simple_error ("This frame is not on X device", frame); 819 invalid_argument ("This frame is not on X device", frame);
820 820
821 XIM_init_frame (f); 821 XIM_init_frame (f);
822 return FRAME_X_XIC (f) ? Qt : Qnil; 822 return FRAME_X_XIC (f) ? Qt : Qnil;
823 } 823 }
824 824
834 struct device *d; 834 struct device *d;
835 835
836 CHECK_LIVE_FRAME (frame); 836 CHECK_LIVE_FRAME (frame);
837 f = XFRAME (frame); 837 f = XFRAME (frame);
838 if (!FRAME_X_P (f)) 838 if (!FRAME_X_P (f))
839 return signal_simple_error ("This frame is not on X device", frame); 839 invalid_argument ("This frame is not on X device", frame);
840 840
841 d = XDEVICE (FRAME_DEVICE (f)); 841 d = XDEVICE (FRAME_DEVICE (f));
842 if (DEVICE_X_XIM (d)) { 842 if (DEVICE_X_XIM (d)) {
843 /* XDestroyIC (FRAME_X_XIC (XFRAME (f))); */ 843 /* XDestroyIC (FRAME_X_XIC (XFRAME (f))); */
844 FRAME_X_XIC (XFRAME (f)) = NULL; 844 FRAME_X_XIC (XFRAME (f)) = NULL;
848 #endif /* if 0 */ 848 #endif /* if 0 */
849 849
850 void 850 void
851 syms_of_input_method_xlib (void) 851 syms_of_input_method_xlib (void)
852 { 852 {
853 defsymbol (&Qxim_xlib, "xim-xlib"); 853 DEFSYMBOL (Qxim_xlib);
854 #if 0 /* see above */ 854 #if 0 /* see above */
855 DEFSUBR (Fx_open_xim); 855 DEFSUBR (Fx_open_xim);
856 DEFSUBR (Fx_close_xim); 856 DEFSUBR (Fx_close_xim);
857 #endif 857 #endif
858 } 858 }