Mercurial > emacs
comparison src/xfns.c @ 109701:2cf388f16cae
* w32fns.c (syms_of_w32fns) <x-max-tooltip-size>: Fix typo in docstring.
* xfns.c (syms_of_xfns) <x-max-tooltip-size>: Reflow docstring.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sun, 01 Aug 2010 06:28:09 +0200 |
parents | 60266cf487b0 |
children | df8e0cd18128 ee70db35f80f |
comparison
equal
deleted
inserted
replaced
109700:e100e3aa28fb | 109701:2cf388f16cae |
---|---|
1023 XDefineCursor (dpy, FRAME_X_WINDOW (f), | 1023 XDefineCursor (dpy, FRAME_X_WINDOW (f), |
1024 f->output_data.x->current_cursor = cursor); | 1024 f->output_data.x->current_cursor = cursor); |
1025 | 1025 |
1026 if (FRAME_X_DISPLAY_INFO (f)->invisible_cursor == 0) | 1026 if (FRAME_X_DISPLAY_INFO (f)->invisible_cursor == 0) |
1027 FRAME_X_DISPLAY_INFO (f)->invisible_cursor = make_invisible_cursor (f); | 1027 FRAME_X_DISPLAY_INFO (f)->invisible_cursor = make_invisible_cursor (f); |
1028 | 1028 |
1029 if (cursor != x->text_cursor | 1029 if (cursor != x->text_cursor |
1030 && x->text_cursor != 0) | 1030 && x->text_cursor != 0) |
1031 XFreeCursor (dpy, x->text_cursor); | 1031 XFreeCursor (dpy, x->text_cursor); |
1032 x->text_cursor = cursor; | 1032 x->text_cursor = cursor; |
1033 | 1033 |
3070 read yet. */ | 3070 read yet. */ |
3071 const char *system_font = xsettings_get_system_font (); | 3071 const char *system_font = xsettings_get_system_font (); |
3072 if (system_font) font_param = make_string (system_font, | 3072 if (system_font) font_param = make_string (system_font, |
3073 strlen (system_font)); | 3073 strlen (system_font)); |
3074 } | 3074 } |
3075 | 3075 |
3076 font = !NILP (font_param) ? font_param | 3076 font = !NILP (font_param) ? font_param |
3077 : x_get_arg (dpyinfo, parms, Qfont, "font", "Font", RES_TYPE_STRING); | 3077 : x_get_arg (dpyinfo, parms, Qfont, "font", "Font", RES_TYPE_STRING); |
3078 | 3078 |
3079 if (! STRINGP (font)) | 3079 if (! STRINGP (font)) |
3080 { | 3080 { |
5644 | 5644 |
5645 XSETFONT (font, FRAME_FONT (f)); | 5645 XSETFONT (font, FRAME_FONT (f)); |
5646 font_param = Ffont_get (font, intern (":name")); | 5646 font_param = Ffont_get (font, intern (":name")); |
5647 if (STRINGP (font_param)) | 5647 if (STRINGP (font_param)) |
5648 default_name = xstrdup (SDATA (font_param)); | 5648 default_name = xstrdup (SDATA (font_param)); |
5649 else | 5649 else |
5650 { | 5650 { |
5651 font_param = Fframe_parameter (frame, Qfont_param); | 5651 font_param = Fframe_parameter (frame, Qfont_param); |
5652 if (STRINGP (font_param)) | 5652 if (STRINGP (font_param)) |
5653 default_name = xstrdup (SDATA (font_param)); | 5653 default_name = xstrdup (SDATA (font_param)); |
5654 } | 5654 } |
5655 | 5655 |
5656 if (default_name == NULL && x_last_font_name != NULL) | 5656 if (default_name == NULL && x_last_font_name != NULL) |
5657 default_name = xstrdup (x_last_font_name); | 5657 default_name = xstrdup (x_last_font_name); |
5658 | 5658 |
5659 /* Convert fontconfig names to Gtk names, i.e. remove - before number */ | 5659 /* Convert fontconfig names to Gtk names, i.e. remove - before number */ |
5660 if (default_name) | 5660 if (default_name) |
5661 { | 5661 { |
5662 char *p = strrchr (default_name, '-'); | 5662 char *p = strrchr (default_name, '-'); |
5663 if (p) | 5663 if (p) |
5664 { | 5664 { |
5665 char *ep = p+1; | 5665 char *ep = p+1; |
5916 DEFVAR_LISP ("x-cursor-fore-pixel", &Vx_cursor_fore_pixel, | 5916 DEFVAR_LISP ("x-cursor-fore-pixel", &Vx_cursor_fore_pixel, |
5917 doc: /* A string indicating the foreground color of the cursor box. */); | 5917 doc: /* A string indicating the foreground color of the cursor box. */); |
5918 Vx_cursor_fore_pixel = Qnil; | 5918 Vx_cursor_fore_pixel = Qnil; |
5919 | 5919 |
5920 DEFVAR_LISP ("x-max-tooltip-size", &Vx_max_tooltip_size, | 5920 DEFVAR_LISP ("x-max-tooltip-size", &Vx_max_tooltip_size, |
5921 doc: /* Maximum size for tooltips. Value is a pair (COLUMNS . ROWS). | 5921 doc: /* Maximum size for tooltips. |
5922 Text larger than this is clipped. */); | 5922 Value is a pair (COLUMNS . ROWS). Text larger than this is clipped. */); |
5923 Vx_max_tooltip_size = Fcons (make_number (80), make_number (40)); | 5923 Vx_max_tooltip_size = Fcons (make_number (80), make_number (40)); |
5924 | 5924 |
5925 DEFVAR_LISP ("x-no-window-manager", &Vx_no_window_manager, | 5925 DEFVAR_LISP ("x-no-window-manager", &Vx_no_window_manager, |
5926 doc: /* Non-nil if no X window manager is in use. | 5926 doc: /* Non-nil if no X window manager is in use. |
5927 Emacs doesn't try to figure this out; this is always nil | 5927 Emacs doesn't try to figure this out; this is always nil |