Mercurial > hg > xemacs-beta
comparison src/glyphs-x.c @ 863:42375619fa45
[xemacs-hg @ 2002-06-04 06:03:59 by andyp]
merge 21.4 windows changes, minimally tested
author | andyp |
---|---|
date | Tue, 04 Jun 2002 06:05:53 +0000 |
parents | 2b6fa2618f76 |
children | 804517e16990 |
comparison
equal
deleted
inserted
replaced
862:278c743f1578 | 863:42375619fa45 |
---|---|
2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. | 2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. |
3 Copyright (C) 1995 Board of Trustees, University of Illinois. | 3 Copyright (C) 1995 Board of Trustees, University of Illinois. |
4 Copyright (C) 1995 Tinker Systems | 4 Copyright (C) 1995 Tinker Systems |
5 Copyright (C) 1995, 1996, 2001, 2002 Ben Wing | 5 Copyright (C) 1995, 1996, 2001, 2002 Ben Wing |
6 Copyright (C) 1995 Sun Microsystems | 6 Copyright (C) 1995 Sun Microsystems |
7 Copyright (C) 1999, 2000 Andy Piper | 7 Copyright (C) 1999, 2000, 2002 Andy Piper |
8 | 8 |
9 This file is part of XEmacs. | 9 This file is part of XEmacs. |
10 | 10 |
11 XEmacs is free software; you can redistribute it and/or modify it | 11 XEmacs is free software; you can redistribute it and/or modify it |
12 under the terms of the GNU General Public License as published by the | 12 under the terms of the GNU General Public License as published by the |
148 update_tab_widget_face (widget_value* wv, | 148 update_tab_widget_face (widget_value* wv, |
149 Lisp_Image_Instance* ii, Lisp_Object domain); | 149 Lisp_Image_Instance* ii, Lisp_Object domain); |
150 #endif | 150 #endif |
151 void | 151 void |
152 emacs_Xt_handle_widget_losing_focus (struct frame* f, Widget losing_widget); | 152 emacs_Xt_handle_widget_losing_focus (struct frame* f, Widget losing_widget); |
153 void | |
154 enqueue_focus_event (Widget wants_it, Lisp_Object frame, int in_p); | |
153 | 155 |
154 #include "bitmaps.h" | 156 #include "bitmaps.h" |
155 | 157 |
156 | 158 |
157 /************************************************************************/ | 159 /************************************************************************/ |
2062 dga->width, dga->height, 0); | 2064 dga->width, dga->height, 0); |
2063 XtMoveWidget (IMAGE_INSTANCE_X_WIDGET_ID (p), | 2065 XtMoveWidget (IMAGE_INSTANCE_X_WIDGET_ID (p), |
2064 -dga->xoffset, -dga->yoffset); | 2066 -dga->xoffset, -dga->yoffset); |
2065 if (!IMAGE_INSTANCE_SUBWINDOW_DISPLAYEDP (p)) | 2067 if (!IMAGE_INSTANCE_SUBWINDOW_DISPLAYEDP (p)) |
2066 XtMapWidget (IMAGE_INSTANCE_X_CLIPWIDGET (p)); | 2068 XtMapWidget (IMAGE_INSTANCE_X_CLIPWIDGET (p)); |
2069 /* See comments in glyphs-msw.c about keyboard focus. */ | |
2070 if (IMAGE_INSTANCE_WANTS_INITIAL_FOCUS (p)) { | |
2071 /* #### FIXME to pop-up the find dialog we map the text-field | |
2072 seven times! This doesn't show on a fast linux box but does | |
2073 under X on windows. */ | |
2074 enqueue_focus_event (IMAGE_INSTANCE_X_WIDGET_ID (p), | |
2075 IMAGE_INSTANCE_FRAME (p), 1); | |
2076 } | |
2067 } | 2077 } |
2068 } | 2078 } |
2069 | 2079 |
2070 /* when you click on a widget you may activate another widget this | 2080 /* when you click on a widget you may activate another widget this |
2071 needs to be checked and all appropriate widgets updated */ | 2081 needs to be checked and all appropriate widgets updated */ |
2235 &xswa); | 2245 &xswa); |
2236 | 2246 |
2237 IMAGE_INSTANCE_SUBWINDOW_ID (ii) = (void*)win; | 2247 IMAGE_INSTANCE_SUBWINDOW_ID (ii) = (void*)win; |
2238 } | 2248 } |
2239 | 2249 |
2250 /* Account for some of the limitations with widget images. */ | |
2251 static int | |
2252 x_widget_border_width (void) | |
2253 { | |
2254 return DEFAULT_WIDGET_BORDER_WIDTH * 2; | |
2255 } | |
2256 | |
2257 | |
2240 #if 0 | 2258 #if 0 |
2241 /* #### Should this function exist? If there's any doubt I'm not implementing it --andyp */ | 2259 /* #### Should this function exist? If there's any doubt I'm not implementing it --andyp */ |
2242 DEFUN ("change-subwindow-property", Fchange_subwindow_property, 3, 3, 0, /* | 2260 DEFUN ("change-subwindow-property", Fchange_subwindow_property, 3, 3, 0, /* |
2243 For the given SUBWINDOW, set PROPERTY to DATA, which is a string. | 2261 For the given SUBWINDOW, set PROPERTY to DATA, which is a string. |
2244 Subwindows are not currently implemented. | 2262 Subwindows are not currently implemented. |
2398 = lw_create_widget ("clip-window", "clip-window", new_lwlib_id (), | 2416 = lw_create_widget ("clip-window", "clip-window", new_lwlib_id (), |
2399 clip_wv, FRAME_X_CONTAINER_WIDGET (f), | 2417 clip_wv, FRAME_X_CONTAINER_WIDGET (f), |
2400 False, 0, 0, 0); | 2418 False, 0, 0, 0); |
2401 | 2419 |
2402 free_widget_value_tree (clip_wv); | 2420 free_widget_value_tree (clip_wv); |
2421 | |
2422 /* create a sensible name. */ | |
2423 if (wv->name == 0 || strcmp(wv->name, "") == 0) | |
2424 wv->name = xstrdup (type); | |
2403 | 2425 |
2404 /* copy any args we were given */ | 2426 /* copy any args we were given */ |
2405 ac = 0; | 2427 ac = 0; |
2406 lw_add_value_args_to_args (wv, al, &ac); | 2428 lw_add_value_args_to_args (wv, al, &ac); |
2407 | 2429 |
2770 CONSOLE_HAS_METHOD (x, locate_pixmap_file); | 2792 CONSOLE_HAS_METHOD (x, locate_pixmap_file); |
2771 CONSOLE_HAS_METHOD (x, unmap_subwindow); | 2793 CONSOLE_HAS_METHOD (x, unmap_subwindow); |
2772 CONSOLE_HAS_METHOD (x, map_subwindow); | 2794 CONSOLE_HAS_METHOD (x, map_subwindow); |
2773 CONSOLE_HAS_METHOD (x, redisplay_widget); | 2795 CONSOLE_HAS_METHOD (x, redisplay_widget); |
2774 CONSOLE_HAS_METHOD (x, redisplay_subwindow); | 2796 CONSOLE_HAS_METHOD (x, redisplay_subwindow); |
2797 CONSOLE_HAS_METHOD (x, widget_border_width); | |
2775 } | 2798 } |
2776 | 2799 |
2777 void | 2800 void |
2778 image_instantiator_format_create_glyphs_x (void) | 2801 image_instantiator_format_create_glyphs_x (void) |
2779 { | 2802 { |