emacs: src/xfns.c comparison

comparison src/xfns.c @ 25528:b5dd1bafd001

Include math.h. Add extern declaration for atof in case we don't see one. (Qscreen_gamma): New. (struct x_frame_parm_table): Add prototypes, add x_set_screen_gamma. (gamma_correct): New function. (defined_color): Call it. (x_set_screen_gamma): New. (x_set_title): Add parameter old_value. (RES_TYPE_FLOAT): New. (x_get_arg): Handle RES_TYPE_FLOAT. (Fx_create_frame): Call x_default_parameter for `screen-gamma'. (lookup_pixel_color): Change call to x_alloc_nearest_color to new prototype. (lookup_rgb_color): Ditto. (syms_of_xfns): Initialize Qscreen_gamma.

author	Gerd Moellmann <gerd@gnu.org>
date	Fri, 03 Sep 1999 18:49:56 +0000
parents	9bc9d4d6c716
children	693ca9ba497a

comparison

equal deleted inserted replaced

-:93b2f5b92137
+:b5dd1bafd001
 /* Rewritten for X11 by Joseph Arceneaux */
 #include <signal.h>
 #include <config.h>
 #include <stdio.h>
+#include <math.h>
 /* This makes the fields of a Display accessible, in Xlib header files.  */
 #define XLIB_ILLEGAL_ACCESS
 /* This is part of a kludge--see lwlib/xlwmenu.c.  */
 extern XFontStruct *xlwmenu_default_font;
 #endif
 extern void free_frame_menubar ();
+extern double atof ();
 #endif /* USE_X_TOOLKIT */
 #define min(a,b) ((a) < (b) ? (a) : (b))
 #define max(a,b) ((a) > (b) ? (a) : (b))
 Lisp_Object Qx_resource_name;
 Lisp_Object Quser_position;
 Lisp_Object Quser_size;
 Lisp_Object Qdisplay;
 Lisp_Object Qscroll_bar_foreground, Qscroll_bar_background;
+Lisp_Object Qscreen_gamma;
 /* The below are defined in frame.c.  */
 extern Lisp_Object Qheight, Qminibuffer, Qname, Qonly, Qwidth;
 extern Lisp_Object Qunsplittable, Qmenu_bar_lines, Qbuffer_predicate, Qtitle;
 that is an index in this table.  */
 struct x_frame_parm_table
 {
 char *name;
-void (*setter)( /* struct frame *frame, Lisp_Object val, oldval */ );
+void (*setter) P_ ((struct frame *, Lisp_Object, Lisp_Object));
 };
-void x_set_foreground_color ();
+void x_set_foreground_color P_ ((struct frame *, Lisp_Object, Lisp_Object));
-void x_set_background_color ();
+void x_set_background_color P_ ((struct frame *, Lisp_Object, Lisp_Object));
-void x_set_mouse_color ();
+void x_set_mouse_color P_ ((struct frame *, Lisp_Object, Lisp_Object));
-void x_set_cursor_color ();
+void x_set_cursor_color P_ ((struct frame *, Lisp_Object, Lisp_Object));
-void x_set_border_color ();
+void x_set_border_color P_ ((struct frame *, Lisp_Object, Lisp_Object));
-void x_set_cursor_type ();
+void x_set_cursor_type P_ ((struct frame *, Lisp_Object, Lisp_Object));
-void x_set_icon_type ();
+void x_set_icon_type P_ ((struct frame *, Lisp_Object, Lisp_Object));
-void x_set_icon_name ();
+void x_set_icon_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
-void x_set_font ();
+void x_set_font P_ ((struct frame *, Lisp_Object, Lisp_Object));
-void x_set_border_width ();
+void x_set_border_width P_ ((struct frame *, Lisp_Object, Lisp_Object));
-void x_set_internal_border_width ();
+void x_set_internal_border_width P_ ((struct frame *, Lisp_Object,
-void x_explicitly_set_name ();
+				      Lisp_Object));
-void x_set_autoraise ();
+void x_explicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
-void x_set_autolower ();
+void x_set_autoraise P_ ((struct frame *, Lisp_Object, Lisp_Object));
-void x_set_vertical_scroll_bars ();
+void x_set_autolower P_ ((struct frame *, Lisp_Object, Lisp_Object));
-void x_set_visibility ();
+void x_set_vertical_scroll_bars P_ ((struct frame *, Lisp_Object,
-void x_set_menu_bar_lines ();
+				     Lisp_Object));
-void x_set_scroll_bar_width ();
+void x_set_visibility P_ ((struct frame *, Lisp_Object, Lisp_Object));
-void x_set_title ();
+void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
-void x_set_unsplittable ();
+void x_set_scroll_bar_width P_ ((struct frame *, Lisp_Object, Lisp_Object));
+void x_set_title P_ ((struct frame *, Lisp_Object, Lisp_Object));
+void x_set_unsplittable P_ ((struct frame *, Lisp_Object, Lisp_Object));
 void x_set_toolbar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
 void x_set_scroll_bar_foreground P_ ((struct frame *, Lisp_Object,
 				      Lisp_Object));
 void x_set_scroll_bar_background P_ ((struct frame *, Lisp_Object,
 				      Lisp_Object));
 static Lisp_Object x_default_scroll_bar_color_parameter P_ ((struct frame *,
 							     Lisp_Object,
 							     Lisp_Object,
 							     char *, char *,
 							     int));
+static void x_set_screen_gamma P_ ((struct frame *, Lisp_Object, Lisp_Object));
 static struct x_frame_parm_table x_frame_parms[] =
 {
 "auto-raise", x_set_autoraise,
 "auto-lower", x_set_autolower,
 "vertical-scroll-bars", x_set_vertical_scroll_bars,
 "visibility", x_set_visibility,
 "toolbar-lines", x_set_toolbar_lines,
 "scroll-bar-foreground", x_set_scroll_bar_foreground,
 "scroll-bar-background", x_set_scroll_bar_background,
+"screen-gamma", x_set_screen_gamma
 };
 /* Attach the `x-frame-parameter' properties to
 the Lisp symbol names of parameters relevant to X.  */
 XSETFASTINT (tem, f->output_data.x->parent_desc);
 store_in_alist (alistptr, Qparent_id, tem);
 }
+/* Gamma-correct COLOR on frame F.  */
+void
+gamma_correct (f, color)
+struct frame *f;
+XColor *color;
+{
+if (f->gamma)
+{
+color->red = pow (color->red / 65535.0, f->gamma) * 65535.0 + 0.5;
+color->green = pow (color->green / 65535.0, f->gamma) * 65535.0 + 0.5;
+color->blue = pow (color->blue / 65535.0, f->gamma) * 65535.0 + 0.5;
+}
+}
 /* Decide if color named COLOR is valid for the display associated with
 the selected frame; if so, return the rgb values in COLOR_DEF.
 If ALLOC is nonzero, allocate a new colormap cell.  */
 int
 screen_colormap = DefaultColormap (display, XDefaultScreen (display));
 status = XParseColor (display, screen_colormap, color, color_def);
 if (status && alloc)
 {
+/* Apply gamma correction.  */
+gamma_correct (f, color_def);
 status = XAllocColor (display, screen_colormap, color_def);
 if (!status)
 	{
 	  /* If we got to this point, the colormap is full, so we're
 	     going to try and get the next closest color.
 Fsignal (Qerror, Fcons (build_string ("undefined color"),
 			  Fcons (arg, Qnil)));
 }
+/* Change the `screen-gamma' frame parameter of frame F.  OLD_VALUE is
+the previous value of that parameter, NEW_VALUE is the new value.  */
+static void
+x_set_screen_gamma (f, new_value, old_value)
+struct frame *f;
+Lisp_Object new_value, old_value;
+{
+if (NILP (new_value))
+f->gamma = 0;
+else if (NUMBERP (new_value) && XFLOATINT (new_value) > 0)
+/* The value 0.4545 is the normal viewing gamma.  */
+f->gamma = 1.0 / (0.4545 * XFLOATINT (new_value));
+else
+Fsignal (Qerror, Fcons (build_string ("Illegal screen-gamma"),
+			    Fcons (new_value, Qnil)));
+clear_face_cache (0);
+}
 /* Functions called only from `x_set_frame_param'
 to set individual parameters.
 If FRAME_X_WINDOW (f) is 0,
 the frame is being created and its X-window does not exist yet.
 If EXPLICIT is zero, that indicates that Emacs redisplay code is
 suggesting a new name, which lisp code should override; if
 F->explicit_name is set, ignore the new name; otherwise, set it.  */
 void
-x_set_title (f, name)
+x_set_title (f, name, old_name)
 struct frame *f;
-Lisp_Object name;
+Lisp_Object name, old_name;
 {
 /* Don't change the title if it's already NAME.  */
 if (EQ (name, f->title))
 return;
 /* Types we might convert a resource string into.  */
 enum resource_types
 {
 RES_TYPE_NUMBER,
+RES_TYPE_FLOAT,
 RES_TYPE_BOOLEAN,
 RES_TYPE_STRING,
 RES_TYPE_SYMBOL
 };
 	  switch (type)
 	    {
 	    case RES_TYPE_NUMBER:
 	      return make_number (atoi (XSTRING (tem)->data));
+	    case RES_TYPE_FLOAT:
+	      return make_float (atof (XSTRING (tem)->data));
 	    case RES_TYPE_BOOLEAN:
 	      tem = Fdowncase (tem);
 	      if (!strcmp (XSTRING (tem)->data, "on")
 		  || !strcmp (XSTRING (tem)->data, "true"))
 		       "pointerColor", "Foreground", RES_TYPE_STRING);
 x_default_parameter (f, parms, Qcursor_color, build_string ("black"),
 		       "cursorColor", "Foreground", RES_TYPE_STRING);
 x_default_parameter (f, parms, Qborder_color, build_string ("black"),
 		       "borderColor", "BorderColor", RES_TYPE_STRING);
+x_default_parameter (f, parms, Qscreen_gamma, Qnil,
+		       "screenGamma", "ScreenGamma", RES_TYPE_FLOAT);
 x_default_scroll_bar_color_parameter (f, parms, Qscroll_bar_foreground,
 					"scrollBarForeground",
 					"ScrollBarForeground", 1);
 x_default_scroll_bar_color_parameter (f, parms, Qscroll_bar_background,
 color.green = g;
 color.blue = b;
 BLOCK_INPUT;
 cmap = DefaultColormapOfScreen (FRAME_X_SCREEN (f));
-rc = x_alloc_nearest_color (FRAME_X_DISPLAY (f), FRAME_X_SCREEN (f),
+rc = x_alloc_nearest_color (f, cmap, &color);
-				  cmap, &color);
 UNBLOCK_INPUT;
 if (rc)
 	{
 	  ++ct_colors_allocated;
 BLOCK_INPUT;
 cmap = DefaultColormapOfScreen (FRAME_X_SCREEN (f));
 color.pixel = pixel;
 XQueryColor (FRAME_X_DISPLAY (f), cmap, &color);
-rc = x_alloc_nearest_color (FRAME_X_DISPLAY (f), FRAME_X_SCREEN (f),
+rc = x_alloc_nearest_color (f, cmap, &color);
-				  cmap, &color);
 UNBLOCK_INPUT;
 if (rc)
 	{
 	  ++ct_colors_allocated;
 staticpro (&Qdisplay);
 Qscroll_bar_foreground = intern ("scroll-bar-foreground");
 staticpro (&Qscroll_bar_foreground);
 Qscroll_bar_background = intern ("scroll-bar-background");
 staticpro (&Qscroll_bar_background);
+Qscreen_gamma = intern ("screen-gamma");
+staticpro (&Qscreen_gamma);
 /* This is the end of symbol initialization.  */
 Qlaplace = intern ("laplace");
 staticpro (&Qlaplace);

Mercurial > emacs

comparison src/xfns.c @ 25528:b5dd1bafd001