Mercurial > hg > xemacs-beta
annotate src/toolbar-x.c @ 5350:94bbd4792049
Have #'sort*, #'merge use the same test approach as functions from cl-seq.el
2011-02-05 Aidan Kehoe <kehoea@parhasard.net>
* fns.c:
* fns.c (check_lss_key, check_lss_key_car): New.
* fns.c (check_string_lessp_key check_string_lessp_key_car): New.
* fns.c (get_merge_predicate): New.
* fns.c (list_merge):
* fns.c (array_merge):
* fns.c (list_array_merge_into_list):
* fns.c (list_list_merge_into_array):
* fns.c (list_array_merge_into_array):
* fns.c (Fmerge):
* fns.c (list_sort):
* fns.c (array_sort):
* fns.c (FsortX):
* fns.c (syms_of_fns):
* lisp.h:
Move #'sort, #'merge to using the same test approach as is used in
the functions that take TEST, TEST-NOT and KEY arguments. This
allows us to avoid the Ffuncall() overhead when the most common
PREDICATE arguments are supplied, in particular #'< and
#'string-lessp.
* fontcolor-msw.c (sort_font_list_function):
* fontcolor-msw.c (mswindows_enumerate_fonts):
* dired.c:
* dired.c (Fdirectory_files):
* fileio.c:
* fileio.c (build_annotations):
* fileio.c (syms_of_fileio):
* keymap.c:
* keymap.c (keymap_submaps):
* keymap.c (map_keymap_sort_predicate):
* keymap.c (describe_map_sort_predicate):
* keymap.c (describe_map):
Change the various C predicates passed to list_sort () and
list_merge () to fit the new calling convention, returning
non-zero if the first argument is less than the second, zero
otherwise.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 05 Feb 2011 12:04:34 +0000 |
| parents | 8b2f75cecb89 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* toolbar implementation -- X interface. |
| 2 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
| 3 Copyright (C) 1995 Sun Microsystems, Inc. | |
| 4 Copyright (C) 1995, 1996 Ben Wing. | |
| 5 Copyright (C) 1996 Chuck Thompson. | |
| 6 | |
| 7 This file is part of XEmacs. | |
| 8 | |
| 9 XEmacs is free software; you can redistribute it and/or modify it | |
| 10 under the terms of the GNU General Public License as published by the | |
| 11 Free Software Foundation; either version 2, or (at your option) any | |
| 12 later version. | |
| 13 | |
| 14 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 for more details. | |
| 18 | |
| 19 You should have received a copy of the GNU General Public License | |
| 20 along with XEmacs; see the file COPYING. If not, write to | |
| 21 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 22 Boston, MA 02111-1307, USA. */ | |
| 23 | |
| 24 /* Synched up with: Not in FSF. */ | |
| 25 | |
| 442 | 26 /* This file Mule-ized (more like Mule-verified) by Ben Wing, 7-8-00. */ |
| 27 | |
| 428 | 28 #include <config.h> |
| 29 #include "lisp.h" | |
| 30 | |
| 31 #include "faces.h" | |
| 872 | 32 #include "frame-impl.h" |
| 428 | 33 #include "toolbar.h" |
| 34 #include "window.h" | |
| 35 | |
| 4917 | 36 #include "toolbar-xlike.h" |
| 428 | 37 |
| 872 | 38 #include "console-x-impl.h" |
| 39 #include "glyphs-x.h" | |
|
5176
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
4917
diff
changeset
|
40 #include "fontcolor-x.h" |
| 872 | 41 |
| 42 #include "EmacsFrame.h" | |
| 43 #include "EmacsFrameP.h" | |
| 44 | |
| 4917 | 45 /* We should really create a 'xlike' console type and fill it with |
| 744 | 46 ** all the shared code. We would then just use |
| 4917 | 47 ** CONSOLE_INHERITS_METHOD(x,xlike,blah) |
| 744 | 48 */ |
| 4917 | 49 #define x_output_frame_toolbars xlike_output_frame_toolbars |
| 50 #define x_output_toolbar_button xlike_output_toolbar_button | |
| 51 #define x_redraw_exposed_toolbars xlike_redraw_exposed_toolbars | |
| 52 #define x_redraw_frame_toolbars xlike_redraw_frame_toolbars | |
| 53 #define x_clear_frame_toolbars xlike_clear_frame_toolbars | |
| 428 | 54 |
| 55 static void | |
| 56 x_initialize_frame_toolbars (struct frame *f) | |
| 57 { | |
| 58 EmacsFrame ef = (EmacsFrame) FRAME_X_TEXT_WIDGET (f); | |
| 59 | |
| 60 if (ef->emacs_frame.toolbar_shadow_thickness < MINIMUM_SHADOW_THICKNESS) | |
| 61 Xt_SET_VALUE (FRAME_X_TEXT_WIDGET (f), | |
| 62 XtNtoolBarShadowThickness, MINIMUM_SHADOW_THICKNESS); | |
| 63 } | |
| 64 | |
| 65 /* This only calls one function but we go ahead and create this in | |
| 66 case we ever do decide that we need to do more work. */ | |
| 67 static void | |
| 2286 | 68 x_free_frame_toolbars (struct frame *UNUSED (unused)) |
| 428 | 69 { |
| 70 } | |
| 71 | |
| 72 | |
| 73 /************************************************************************/ | |
| 74 /* initialization */ | |
| 75 /************************************************************************/ | |
| 76 | |
| 77 void | |
| 78 console_type_create_toolbar_x (void) | |
| 79 { | |
| 80 CONSOLE_HAS_METHOD (x, output_frame_toolbars); | |
| 905 | 81 CONSOLE_HAS_METHOD (x, clear_frame_toolbars); |
| 428 | 82 CONSOLE_HAS_METHOD (x, initialize_frame_toolbars); |
| 83 CONSOLE_HAS_METHOD (x, free_frame_toolbars); | |
| 84 CONSOLE_HAS_METHOD (x, output_toolbar_button); | |
| 85 CONSOLE_HAS_METHOD (x, redraw_exposed_toolbars); | |
| 86 CONSOLE_HAS_METHOD (x, redraw_frame_toolbars); | |
| 87 } |