comparison src/xfns.c @ 90519:138ce2701550

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 320-342) - Update from CVS - Merge from gnus--rel--5.10 - lisp/play/cookie1.el (cookie): Work properly when there's only one entry - Add note about "link" button-class to etc/TODO * gnus--rel--5.10 (patch 108-112) - Merge from emacs--devo--0 - Clean up merge mistakes - Update from CVS - Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo. Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-86
author Miles Bader <miles@gnu.org>
date Thu, 06 Jul 2006 08:59:39 +0000
parents 5981c99ef5ba ae1e5666e49f
children 8a8e69664178
comparison
equal deleted inserted replaced
90518:64c755511769 90519:138ce2701550
3097 f->output_data.x->scroll_bar_background_pixel = -1; 3097 f->output_data.x->scroll_bar_background_pixel = -1;
3098 #ifdef USE_TOOLKIT_SCROLL_BARS 3098 #ifdef USE_TOOLKIT_SCROLL_BARS
3099 f->output_data.x->scroll_bar_top_shadow_pixel = -1; 3099 f->output_data.x->scroll_bar_top_shadow_pixel = -1;
3100 f->output_data.x->scroll_bar_bottom_shadow_pixel = -1; 3100 f->output_data.x->scroll_bar_bottom_shadow_pixel = -1;
3101 #endif /* USE_TOOLKIT_SCROLL_BARS */ 3101 #endif /* USE_TOOLKIT_SCROLL_BARS */
3102 record_unwind_protect (unwind_create_frame, frame);
3103 3102
3104 f->icon_name 3103 f->icon_name
3105 = x_get_arg (dpyinfo, parms, Qicon_name, "iconName", "Title", 3104 = x_get_arg (dpyinfo, parms, Qicon_name, "iconName", "Title",
3106 RES_TYPE_STRING); 3105 RES_TYPE_STRING);
3107 if (! STRINGP (f->icon_name)) 3106 if (! STRINGP (f->icon_name))
3108 f->icon_name = Qnil; 3107 f->icon_name = Qnil;
3109 3108
3110 FRAME_X_DISPLAY_INFO (f) = dpyinfo; 3109 FRAME_X_DISPLAY_INFO (f) = dpyinfo;
3110
3111 /* With FRAME_X_DISPLAY_INFO set up, this unwind-protect is safe. */
3112 record_unwind_protect (unwind_create_frame, frame);
3111 #if GLYPH_DEBUG 3113 #if GLYPH_DEBUG
3112 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; 3114 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
3113 dpyinfo_refcount = dpyinfo->reference_count; 3115 dpyinfo_refcount = dpyinfo->reference_count;
3114 #endif /* GLYPH_DEBUG */ 3116 #endif /* GLYPH_DEBUG */
3115 #ifdef MULTI_KBOARD 3117 #ifdef MULTI_KBOARD
4845 font = x_new_font (f, "-*-fixed-*-*-*-*-*-140-*-*-c-*-iso8859-1"); 4847 font = x_new_font (f, "-*-fixed-*-*-*-*-*-140-*-*-c-*-iso8859-1");
4846 UNBLOCK_INPUT; 4848 UNBLOCK_INPUT;
4847 if (! STRINGP (font)) 4849 if (! STRINGP (font))
4848 font = build_string ("fixed"); 4850 font = build_string ("fixed");
4849 4851
4850 x_default_parameter (f, parms, Qfont, font, 4852 x_set_frame_parameters (f, Fcons (Fcons (Qfont, font), Qnil));
4851 "font", "Font", RES_TYPE_STRING);
4852 } 4853 }
4853 4854
4854 x_default_parameter (f, parms, Qborder_width, make_number (2), 4855 x_default_parameter (f, parms, Qborder_width, make_number (2),
4855 "borderWidth", "BorderWidth", RES_TYPE_NUMBER); 4856 "borderWidth", "BorderWidth", RES_TYPE_NUMBER);
4856 4857