Mercurial > hg > xemacs-beta
annotate src/scrollbar-x.h @ 5769:ffc0c5a66ab1
Be lazy converting markers to integers, bytecode_{arithcompare,arithop}().
src/ChangeLog addition:
2013-12-15 Aidan Kehoe <kehoea@parhasard.net>
* bytecode.c (bytecode_arithcompare):
* bytecode.c (bytecode_arithop):
Call promote_args_lazy () in these two functions, only converting
markers to fixnums if absolutely necessary (since that is ON with
large, mule buffers).
* data.c (BIGNUM_CASE):
* data.c (RATIO_CASE):
* data.c (BIGFLOAT_CASE):
* data.c (ARITHCOMPARE_MANY):
Call promote_args_lazy () here too if WITH_NUMBER_TYPES is defined.
We're not doing the equivalent with the non-NUMBER_TYPES code, but
that's mostly fine, we are doing it in the bytecode.
* number.h:
* number.h (NUMBER_TYPES):
* number.h (promote_args_lazy):
Add this, returning LAZY_MARKER_T if both arguments are markers
that point to the same buffer.
tests/ChangeLog addition:
2013-12-15 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test arithmetic comparisons with markers, check the type of the
returned values for #'min and #'max.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 15 Dec 2013 10:26:31 +0000 |
| parents | 308d34e9f07d |
| children |
| rev | line source |
|---|---|
| 428 | 1 /* Define X-specific scrollbar instance. |
| 2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
665
diff
changeset
|
6 XEmacs is free software: you can redistribute it and/or modify it |
| 428 | 7 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:
665
diff
changeset
|
8 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:
665
diff
changeset
|
9 option) any later version. |
| 428 | 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 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
665
diff
changeset
|
17 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 428 | 18 |
| 19 /* Synched up with: Not in FSF. */ | |
| 20 | |
| 440 | 21 #ifndef INCLUDED_scrollbar_x_h_ |
| 22 #define INCLUDED_scrollbar_x_h_ | |
| 428 | 23 |
| 24 #if defined (HAVE_X_WINDOWS) && defined (HAVE_SCROLLBARS) | |
| 25 | |
| 26 #include "scrollbar.h" | |
| 27 | |
| 28 struct x_scrollbar_data | |
| 29 { | |
| 30 /* Unique scrollbar identifier and name. */ | |
| 31 unsigned int id; | |
| 32 char *name; | |
| 33 | |
| 34 /* Is set if we have already set the backing_store attribute correctly */ | |
| 35 char backing_store_initialized; | |
| 36 | |
| 37 /* Positioning and sizing information for scrollbar and slider. */ | |
| 38 scrollbar_values pos_data; | |
| 39 | |
| 40 /* Pointer to the scrollbar widget this structure describes. */ | |
| 41 Widget widget; | |
| 42 | |
| 43 #if defined (LWLIB_SCROLLBARS_MOTIF) || defined (LWLIB_SCROLLBARS_LUCID) || \ | |
| 44 defined (LWLIB_SCROLLBARS_ATHENA3D) | |
| 45 /* Recorded starting position for Motif-like scrollbar drags. */ | |
| 46 int vdrag_orig_value; | |
| 665 | 47 Charbpos vdrag_orig_window_start; |
| 428 | 48 #endif |
| 49 }; | |
| 50 | |
| 51 #define SCROLLBAR_X_DATA(i) ((struct x_scrollbar_data *) ((i)->scrollbar_data)) | |
| 52 | |
| 53 #define SCROLLBAR_X_ID(i) (SCROLLBAR_X_DATA (i)->id) | |
| 54 #define SCROLLBAR_X_NAME(i) (SCROLLBAR_X_DATA (i)->name) | |
| 55 #define SCROLLBAR_X_BACKING_STORE_INITIALIZED(i) \ | |
| 56 (SCROLLBAR_X_DATA (i)->backing_store_initialized) | |
| 57 #define SCROLLBAR_X_POS_DATA(i) (SCROLLBAR_X_DATA (i)->pos_data) | |
| 58 #define SCROLLBAR_X_WIDGET(i) (SCROLLBAR_X_DATA (i)->widget) | |
| 59 | |
| 60 #if defined (LWLIB_SCROLLBARS_MOTIF) || defined (LWLIB_SCROLLBARS_LUCID) || \ | |
| 61 defined (LWLIB_SCROLLBARS_ATHENA3D) | |
| 62 #define SCROLLBAR_X_VDRAG_ORIG_VALUE(i) \ | |
| 63 (SCROLLBAR_X_DATA (i)->vdrag_orig_value) | |
| 64 #define SCROLLBAR_X_VDRAG_ORIG_WINDOW_START(i) \ | |
| 65 (SCROLLBAR_X_DATA (i)->vdrag_orig_window_start) | |
| 66 #endif | |
| 67 | |
| 68 void x_update_frame_scrollbars (struct frame *f); | |
| 69 void x_set_scrollbar_pointer (struct frame *f, Lisp_Object cursor); | |
| 70 | |
| 71 #endif /* HAVE_X_WINDOWS and HAVE_SCROLLBARS */ | |
| 440 | 72 |
| 73 #endif /* INCLUDED_scrollbar_x_h_ */ |