resource->mswindows-resource Try 2 (was Re: Somebody needs to test this)

Remek Trzaska <remek(a)npac.syr.edu&gt; writes: O.K. Ben has told me what went wrong, apparently the renaming _was_ a little more complicated than just renaming a handful of variables. Let's try this again. Reverse the previous patch, this is off a virgin 21.0 "Zhong Wei". 1998-07-12 SL Baur <steve(a)altair.xemacs.org&gt; * general.c (syms_of_general): Add defsymbol for Qresource. * glyphs-msw.c (vars_of_glyphs_mswindows): Rename Qresource to Qmswindows_resource. (TopLevel): Rename 'resource image format to 'mswindows_resource. (mswindows_resource_validate): Rename. (mswindows_resource_normalize): Rename. (mswindows_resource_possible_dest_types): Rename. (mswindows_resource_instantiate): Rename. (image_instantiator_format_create_glyphs_mswindows): Replace `resource' with `mswindows.resource'. 1998-07-12 SL Baur <steve(a)altair.xemacs.org&gt; * msw-mouse.el: Global change resource -> mswindows-resource. Index: src/general.c =================================================================== RCS file: /usr/local/xemacs/xemacs-20.0/src/general.c,v retrieving revision 1.13 diff -u -r1.13 general.c --- src/general.c 1998/05/24 05:40:43 1.13 +++ src/general.c 1998/07/12 23:47:13 ＠＠ -298,6 +298,7 ＠＠ defsymbol (&Qrassoc, "rassoc"); defsymbol (&Qrassq, "rassq"); defsymbol (&Qrequire, "require"); + defsymbol (&Qresource, "resource"); defsymbol (&Qreturn, "return"); defsymbol (&Qreverse, "reverse"); defsymbol (&Qright, "right"); Index: src/glyphs-msw.c =================================================================== RCS file: /usr/local/xemacs/xemacs-20.0/src/glyphs-msw.c,v retrieving revision 1.21 diff -u -r1.21 glyphs-msw.c --- src/glyphs-msw.c 1998/07/10 02:49:11 1.21 +++ src/glyphs-msw.c 1998/07/12 23:42:45 ＠＠ -52,8 +52,9 ＠＠ Lisp_Object Vmswindows_bitmap_file_path; static COLORREF transparent_color = RGB (1,1,1); -DEFINE_IMAGE_INSTANTIATOR_FORMAT (resource); +DEFINE_IMAGE_INSTANTIATOR_FORMAT (mswindows_resource); Lisp_Object Q_resource_type, Q_resource_id; +Lisp_Object Qmswindows_resource; static void mswindows_initialize_dibitmap_image_instance (struct Lisp_Image_Instance *ii, ＠＠ -940,7 +941,7 ＠＠ **********************************************************************/ static void -resource_validate (Lisp_Object instantiator) +mswindows_resource_validate (Lisp_Object instantiator) { if ((NILP (find_keyword_in_vector (instantiator, Q_file)) && ＠＠ -952,7 +953,7 ＠＠ } static Lisp_Object -resource_normalize (Lisp_Object inst, Lisp_Object console_type) +mswindows_resource_normalize (Lisp_Object inst, Lisp_Object console_type) { /* This function can call lisp */ Lisp_Object file = Qnil; ＠＠ -987,7 +988,7 ＠＠ } static int -resource_possible_dest_types (void) +mswindows_resource_possible_dest_types (void) { return IMAGE_POINTER_MASK | IMAGE_COLOR_PIXMAP_MASK; } ＠＠ -1108,7 +1109,7 ＠＠ } static void -resource_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, +mswindows_resource_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, Lisp_Object pointer_fg, Lisp_Object pointer_bg, int dest_mask, Lisp_Object domain) { ＠＠ -1960,24 +1961,25 ＠＠ IIFORMAT_VALID_KEYWORD (bmp, Q_data, check_valid_string); IIFORMAT_VALID_KEYWORD (bmp, Q_file, check_valid_string); - INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (resource, "resource"); + INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (mswindows_resource, + "mswindows-resource"); - IIFORMAT_HAS_METHOD (resource, validate); - IIFORMAT_HAS_METHOD (resource, normalize); - IIFORMAT_HAS_METHOD (resource, possible_dest_types); - IIFORMAT_HAS_METHOD (resource, instantiate); + IIFORMAT_HAS_METHOD (mswindows_resource, validate); + IIFORMAT_HAS_METHOD (mswindows_resource, normalize); + IIFORMAT_HAS_METHOD (mswindows_resource, possible_dest_types); + IIFORMAT_HAS_METHOD (mswindows_resource, instantiate); - IIFORMAT_VALID_KEYWORD (resource, Q_resource_type, + IIFORMAT_VALID_KEYWORD (mswindows_resource, Q_resource_type, check_valid_resource_symbol); - IIFORMAT_VALID_KEYWORD (resource, Q_resource_id, check_valid_resource_id); - IIFORMAT_VALID_KEYWORD (resource, Q_file, check_valid_string); + IIFORMAT_VALID_KEYWORD (mswindows_resource, Q_resource_id, check_valid_resource_id); + IIFORMAT_VALID_KEYWORD (mswindows_resource, Q_file, check_valid_string); } void vars_of_glyphs_mswindows (void) { Fprovide (Qbmp); - Fprovide (Qresource); + Fprovide (Qmswindows_resource); DEFVAR_LISP ("mswindows-bitmap-file-path", &Vmswindows_bitmap_file_path /* A list of the directories in which mswindows bitmap files may be found. This is used by the `make-image-instance' function. Index: lisp/msw-mouse.el =================================================================== RCS file: /usr/local/xemacs/xemacs-20.0/lisp/msw-mouse.el,v retrieving revision 1.3 diff -u -r1.3 msw-mouse.el --- lisp/msw-mouse.el 1998/06/13 04:28:02 1.3 +++ lisp/msw-mouse.el 1998/07/12 23:49:06 ＠＠ -31,18 +31,18 ＠＠ ;;; Code: (set-glyph-image text-pointer-glyph - [resource :resource-type cursor :resource-id "Ibeam"]) + [mswindows-resource :resource-type cursor :resource-id "Ibeam"]) (set-glyph-image nontext-pointer-glyph - [resource :resource-type cursor :resource-id "Normal"]) + [mswindows-resource :resource-type cursor :resource-id "Normal"]) (set-glyph-image selection-pointer-glyph - [resource :resource-type cursor :resource-id "Normal"]) + [mswindows-resource :resource-type cursor :resource-id "Normal"]) (set-glyph-image modeline-pointer-glyph - [resource :resource-type cursor :resource-id "SizeNS"]) + [mswindows-resource :resource-type cursor :resource-id "SizeNS"]) (set-glyph-image divider-pointer-glyph - [resource :resource-type cursor :resource-id "SizeWE"]) + [mswindows-resource :resource-type cursor :resource-id "SizeWE"]) (set-glyph-image busy-pointer-glyph - [resource :resource-type cursor :resource-id "Wait"]) + [mswindows-resource :resource-type cursor :resource-id "Wait"]) (set-glyph-image gc-pointer-glyph - [resource :resource-type cursor :resource-id "Wait"]) + [mswindows-resource :resource-type cursor :resource-id "Wait"]) ;;; msw-mouse.el ends here