Mercurial > hg > xemacs-beta
annotate src/widget.c @ 4882:eab9498ecc0e
merge most of rest of redisplay-x.c and redisplay-gtk.c into redisplay-xlike-inc.c
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-01-18 Ben Wing <ben@xemacs.org>
* redisplay-gtk.c:
* redisplay-gtk.c (gtk_bevel_area):
* redisplay-x.c:
* redisplay-x.c (THIS_IS_X):
* redisplay-xlike-inc.c:
* redisplay-xlike-inc.c (XLIKE_text_width_single_run):
* redisplay-xlike-inc.c (XLIKE_text_width):
* redisplay-xlike-inc.c (XLIKE_output_display_block):
* redisplay-xlike-inc.c (XLIKE_get_gc):
* redisplay-xlike-inc.c (XLIKE_output_string):
* redisplay-xlike-inc.c (XLIKE_OUTPUT_XLIKE_PIXMAP):
* redisplay-xlike-inc.c (XLIKE_output_pixmap):
* redisplay-xlike-inc.c (XLIKE_output_vertical_divider):
* redisplay-xlike-inc.c (XLIKE_output_blank):
* redisplay-xlike-inc.c (XLIKE_output_horizontal_line):
* redisplay-xlike-inc.c (XLIKE_clear_region):
* redisplay-xlike-inc.c (XLIKE_output_eol_cursor):
* redisplay-xlike-inc.c (XLIKE_clear_frame_window):
* redisplay-xlike-inc.c (XLIKE_clear_frame):
* redisplay-xlike-inc.c (XLIKE_flash):
* redisplay-xlike-inc.c (console_type_create_redisplay_XLIKE):
Move lots more code into redisplay-xlike-inc.c. Use macros to
isolate the code that differs among X vs. GTK, to reduce the need
for ifdefs in the middle of the code. Now, redisplay-x.c and
redisplay-gtk.c only contain a few functions whose implementation
is completely different from one to the other, or which are not
present at all in one of them.
GTK code not currently tested, but it has bitrotted somewhat
any. Doing this will help keep it less bitrotty.
* depend: Regenerate.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 18 Jan 2010 08:44:49 -0600 |
| parents | 80cd90837ac5 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Primitives for work of the "widget" library. |
| 2 Copyright (C) 1997 Free Software Foundation, Inc. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 23 /* In an ideal world, this file would not have been necessary. | |
| 24 However, elisp function calls being as slow as they are, it turns | |
| 25 out that some functions in the widget library (wid-edit.el) are the | |
| 26 bottleneck of Widget operation. Here is their translation to C, | |
| 27 for the sole reason of efficiency. */ | |
| 28 | |
| 29 #include <config.h> | |
| 30 #include "lisp.h" | |
| 31 #include "buffer.h" | |
| 32 | |
| 33 | |
| 34 Lisp_Object Qwidget_type; | |
| 35 | |
| 36 | |
| 37 DEFUN ("widget-plist-member", Fwidget_plist_member, 2, 2, 0, /* | |
| 38 Like `plist-get', but returns the tail of PLIST whose car is PROP. | |
| 39 */ | |
| 40 (plist, prop)) | |
| 41 { | |
| 42 while (!NILP (plist) && !EQ (Fcar (plist), prop)) | |
| 43 { | |
| 44 /* Check for QUIT, so a circular plist doesn't lock up the | |
| 45 editor. */ | |
| 46 QUIT; | |
| 47 plist = Fcdr (Fcdr (plist)); | |
| 48 } | |
| 49 return plist; | |
| 50 } | |
| 51 | |
| 52 DEFUN ("widget-put", Fwidget_put, 3, 3, 0, /* | |
| 53 In WIDGET set PROPERTY to VALUE. | |
| 54 The value can later be retrieved with `widget-get'. | |
| 55 */ | |
| 56 (widget, property, value)) | |
| 57 { | |
| 58 CHECK_CONS (widget); | |
| 59 XCDR (widget) = Fplist_put (XCDR (widget), property, value); | |
| 60 return widget; | |
| 61 } | |
| 62 | |
| 63 DEFUN ("widget-get", Fwidget_get, 2, 2, 0, /* | |
| 64 In WIDGET, get the value of PROPERTY. | |
| 65 The value could either be specified when the widget was created, or | |
| 66 later with `widget-put'. | |
| 67 */ | |
| 68 (widget, property)) | |
| 69 { | |
| 70 Lisp_Object value = Qnil; | |
| 71 | |
| 72 while (1) | |
| 73 { | |
| 74 Lisp_Object tmp = Fwidget_plist_member (Fcdr (widget), property); | |
| 75 if (!NILP (tmp)) | |
| 76 { | |
| 77 value = Fcar (Fcdr (tmp)); | |
| 78 break; | |
| 79 } | |
| 80 tmp = Fcar (widget); | |
| 81 if (!NILP (tmp)) | |
| 82 { | |
| 83 widget = Fget (tmp, Qwidget_type, Qnil); | |
| 84 continue; | |
| 85 } | |
| 86 break; | |
| 87 } | |
| 88 return value; | |
| 89 } | |
| 90 | |
| 91 DEFUN ("widget-apply", Fwidget_apply, 2, MANY, 0, /* | |
| 92 Apply the value of WIDGET's PROPERTY to the widget itself. | |
| 93 ARGS are passed as extra arguments to the function. | |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
563
diff
changeset
|
94 |
|
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
563
diff
changeset
|
95 arguments: (WIDGET PROPERTY &rest ARGS) |
| 428 | 96 */ |
| 97 (int nargs, Lisp_Object *args)) | |
| 98 { | |
| 99 /* This function can GC */ | |
| 100 Lisp_Object newargs[3]; | |
| 101 struct gcpro gcpro1; | |
| 102 | |
| 103 newargs[0] = Fwidget_get (args[0], args[1]); | |
| 104 newargs[1] = args[0]; | |
| 105 newargs[2] = Flist (nargs - 2, args + 2); | |
| 434 | 106 GCPRO1 (newargs[2]); |
| 428 | 107 RETURN_UNGCPRO (Fapply (3, newargs)); |
| 108 } | |
| 109 | |
| 110 void | |
| 111 syms_of_widget (void) | |
| 112 { | |
| 563 | 113 DEFSYMBOL (Qwidget_type); |
| 428 | 114 |
| 115 DEFSUBR (Fwidget_plist_member); | |
| 116 DEFSUBR (Fwidget_put); | |
| 117 DEFSUBR (Fwidget_get); | |
| 118 DEFSUBR (Fwidget_apply); | |
| 119 } |