emacs: src/xfns.c comparison

comparison src/xfns.c @ 11917:2314b62ca4ab

(Fx_get_resource): Major rewrite to make it clearer. (validate_x_resource_name): Use build_string, not make_string. (Fx_create_frame): Initially use Vinvocation_name as resource name. Switch to frame name if frame name is explicit. (x_display_info_for_name, Fx_open_connection): Add casts. Initially use Vinvocation_name as resource name. [USE_X_TOOLKIT] (x_window): Use Vx_resource_name for widget names.

author	Karl Heuer <kwzh@gnu.org>
date	Thu, 25 May 1995 16:00:51 +0000
parents	54186a96c5b2
children	f3fb1e5dfde1

comparison

equal deleted inserted replaced

-:03675a551746
+:2314b62ca4ab
 }
 }
 /* Subroutines of creating an X frame.  */
-/* Make sure that Vx_resource_name is set to a reasonable value.  */
+/* Make sure that Vx_resource_name is set to a reasonable value.
+Fix it up, or set it to `emacs' if it is too hopeless.  */
 static void
 validate_x_resource_name ()
 {
 int len;
 /* Number of valid characters in the resource name.  */
 /* If name is entirely invalid, or nearly so, use `emacs'.  */
 if (good_count == 0
 || (good_count == 1 && bad_count > 0))
 {
-Vx_resource_name = make_string ("emacs", 5);
+Vx_resource_name = build_string ("emacs");
 return;
 }
 /* Name is partly valid.  Copy it and replace the invalid characters
 with underscores.  */
 Lisp_Object attribute, class, component, subclass;
 {
 register char *value;
 char *name_key;
 char *class_key;
-Lisp_Object resname;
 check_x ();
 CHECK_STRING (attribute, 0);
 CHECK_STRING (class, 0);
 CHECK_STRING (subclass, 2);
 if (NILP (component) != NILP (subclass))
 error ("x-get-resource: must specify both COMPONENT and SUBCLASS or neither");
 validate_x_resource_name ();
-resname = Vx_resource_name;
+/* Allocate space for the components, the dots which separate them,
-if (NILP (component))
+and the final '\0'.  Make them big enough for the worst case.  */
-{
+name_key = (char *) alloca (XSTRING (Vx_resource_name)->size
-/* Allocate space for the components, the dots which separate them,
+			      + (STRINGP (component)
-	 and the final '\0'.  */
+				 ? XSTRING (component)->size : 0)
-name_key = (char *) alloca (XSTRING (resname)->size
+			      + XSTRING (attribute)->size
-				  + XSTRING (attribute)->size
+			      + 3);
-				  + 2);
 class_key = (char *) alloca ((sizeof (EMACS_CLASS) - 1)
-				   + XSTRING (class)->size
+			       + XSTRING (class)->size
-				   + 2);
+			       + (STRINGP (subclass)
+				  ? XSTRING (subclass)->size : 0)
-sprintf (name_key, "%s.%s",
+			       + 3);
-	       XSTRING (resname)->data,
-	       XSTRING (attribute)->data);
+/* Start with emacs.FRAMENAME for the name (the specific one)
-sprintf (class_key, "%s.%s",
+and with `Emacs' for the class key (the general one).  */
-	       EMACS_CLASS,
+strcpy (name_key, XSTRING (Vx_resource_name)->data);
-	       XSTRING (class)->data);
+strcpy (class_key, EMACS_CLASS);
-}
-else
+strcat (class_key, ".");
-{
+strcat (class_key, XSTRING (class)->data);
-name_key = (char *) alloca (XSTRING (resname)->size
-				  + XSTRING (component)->size
+if (!NILP (component))
-				  + XSTRING (attribute)->size
+{
-				  + 3);
+strcat (class_key, ".");
+strcat (class_key, XSTRING (subclass)->data);
-class_key = (char *) alloca ((sizeof (EMACS_CLASS) - 1)
-				   + XSTRING (class)->size
+strcat (name_key, ".");
-				   + XSTRING (subclass)->size
+strcat (name_key, XSTRING (component)->data);
-				   + 3);
+}
-sprintf (name_key, "%s.%s.%s",
+strcat (name_key, ".");
-	       XSTRING (resname)->data,
+strcat (name_key, XSTRING (attribute)->data);
-	       XSTRING (component)->data,
-	       XSTRING (attribute)->data);
-sprintf (class_key, "%s.%s.%s",
-	       EMACS_CLASS,
-	       XSTRING (class)->data,
-	       XSTRING (subclass)->data);
-}
 value = x_get_string_resource (check_x_display_info (Qnil)->xrdb,
 				 name_key, class_key);
 if (value != (char *) 0)
 Arg al [25];
 int ac;
 BLOCK_INPUT;
+/* Use the resource name as the top-level widget name
+for looking up resources.  Make a non-Lisp copy
+for the window manager, so GC relocation won't bother it.
+Elsewhere we specify the window name for the window manager.  */
 {
-char *str
+char *str = (char *) XSTRING (Vx_resource_name)->data;
-= (STRINGP (f->name) ? (char *)XSTRING (f->name)->data : "emacs");
+f->namebuf = (char *) xmalloc (strlen (str) + 1);
-f->namebuf = (char *) xrealloc (f->namebuf, strlen (str) + 1);
 strcpy (f->namebuf, str);
 }
 ac = 0;
 XtSetArg (al[ac], XtNallowShellResize, 1); ac++;
 XtRealizeWidget (shell_widget);
 FRAME_X_WINDOW (f) = XtWindow (frame_widget);
 validate_x_resource_name ();
 class_hints.res_name = (char *) XSTRING (Vx_resource_name)->data;
 class_hints.res_class = EMACS_CLASS;
 XSetClassHint (FRAME_X_DISPLAY (f), XtWindow (shell_widget), &class_hints);
 f->display.x->wm_hints.input = True;
 		     InputOutput, /* class */
 		     FRAME_X_DISPLAY_INFO (f)->visual,
 		     attribute_mask, &attributes);
 validate_x_resource_name ();
 class_hints.res_name = (char *) XSTRING (Vx_resource_name)->data;
 class_hints.res_class = EMACS_CLASS;
 XSetClassHint (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), &class_hints);
 /* The menubar is part of the ordinary display;
 Lisp_Object parent;
 struct kboard *kb;
 check_x ();
+/* Use this general default value to start with
+until we know if this frame has a specified name.  */
+Vx_resource_name = Vinvocation_name;
 display = x_get_arg (parms, Qdisplay, 0, 0, 0);
 if (EQ (display, Qunbound))
 display = Qnil;
 dpyinfo = check_x_display_info (display);
 #ifdef MULTI_KBOARD
 name = x_get_arg (parms, Qname, "title", "Title", string);
 if (!STRINGP (name)
 && ! EQ (name, Qunbound)
 && ! NILP (name))
 error ("Invalid frame name--not a string or nil");
+if (STRINGP (name))
+Vx_resource_name = name;
 /* See if parent window is specified.  */
 parent = x_get_arg (parms, Qparent_id, NULL, NULL, number);
 if (EQ (parent, Qunbound))
 parent = Qnil;
 tem = Fstring_equal (XCONS (XCONS (names)->car)->car, name);
 if (!NILP (tem))
 	return dpyinfo;
 }
+/* Use this general default value to start with.  */
+Vx_resource_name = Vinvocation_name;
 validate_x_resource_name ();
 dpyinfo = x_term_init (name, (unsigned char *)0,
-			 XSTRING (Vx_resource_name)->data);
+			 (char *) XSTRING (Vx_resource_name)->data);
 if (dpyinfo == 0)
 error ("X server %s not responding", XSTRING (name)->data);
 x_in_use = 1;
 if (! NILP (xrm_string))
 xrm_option = (unsigned char *) XSTRING (xrm_string)->data;
 else
 xrm_option = (unsigned char *) 0;
+/* Use this general default value to start with.  */
+Vx_resource_name = Vinvocation_name;
 validate_x_resource_name ();
 /* This is what opens the connection and sets x_current_display.
 This also initializes many symbols, such as those used for input.  */
 dpyinfo = x_term_init (display, xrm_option,
-			 XSTRING (Vx_resource_name)->data);
+			 (char *) XSTRING (Vx_resource_name)->data);
 if (dpyinfo == 0)
 {
 if (!NILP (must_succeed))
 	fatal ("X server %s not responding.\n\

Mercurial > emacs

comparison src/xfns.c @ 11917:2314b62ca4ab