From 92737a6a880345a8c2c35ad564f5086efc1ede8c Mon Sep 17 00:00:00 2001 From: "Guillermo J. Rozas" Date: Wed, 2 Oct 1991 21:17:49 +0000 Subject: [PATCH] Rename x-graphics-set-class-hint to x-window-set-class-hint. --- v7/src/microcode/prename.h | 7 ++++--- v7/src/microcode/version.h | 4 ++-- v7/src/microcode/x11base.c | 31 +++++++++++++++++++++++++++++-- v7/src/microcode/x11graph.c | 30 ++---------------------------- v8/src/microcode/version.h | 4 ++-- 5 files changed, 39 insertions(+), 37 deletions(-) diff --git a/v7/src/microcode/prename.h b/v7/src/microcode/prename.h index 1aedce227..3f23b7879 100644 --- a/v7/src/microcode/prename.h +++ b/v7/src/microcode/prename.h @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/prename.h,v 1.4 1990/06/20 17:41:41 cph Rel $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/prename.h,v 1.5 1991/10/02 21:17:20 jinx Exp $ Copyright (c) 1988, 1990 Massachusetts Institute of Technology @@ -55,7 +55,8 @@ static struct primitive_alias aliases [] = { "OPEN-DIRECTORY", "DIRECTORY-OPEN" }, { "SCREEN-X-SIZE", "TTY-X-SIZE" }, { "SCREEN-Y-SIZE", "TTY-Y-SIZE" }, - { "FILE-SYMLINK?", "FILE-SOFT-LINK?" } + { "FILE-SYMLINK?", "FILE-SOFT-LINK?" }, + { "X-GRAPHICS-SET-CLASS-HINT", "X-WINDOW-SET-CLASS-HINT" } }; -#define N_ALIASES 20 +#define N_ALIASES 21 diff --git a/v7/src/microcode/version.h b/v7/src/microcode/version.h index f71faa9f7..9a8b8fcf4 100644 --- a/v7/src/microcode/version.h +++ b/v7/src/microcode/version.h @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/version.h,v 11.98 1991/09/07 22:48:14 jinx Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/version.h,v 11.99 1991/10/02 21:17:49 jinx Exp $ Copyright (c) 1988-91 Massachusetts Institute of Technology @@ -46,5 +46,5 @@ MIT in each case. */ #define VERSION 11 #endif #ifndef SUBVERSION -#define SUBVERSION 98 +#define SUBVERSION 99 #endif diff --git a/v7/src/microcode/x11base.c b/v7/src/microcode/x11base.c index 4b79c8947..704cbbf94 100644 --- a/v7/src/microcode/x11base.c +++ b/v7/src/microcode/x11base.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/x11base.c,v 1.25 1991/08/06 15:11:28 arthur Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/x11base.c,v 1.26 1991/10/02 21:17:07 jinx Exp $ Copyright (c) 1989-91 Massachusetts Institute of Technology @@ -1226,7 +1226,7 @@ DEFINE_PRIMITIVE ("X-WINDOW-SET-NAME", Prim_x_window_set_name, 2, 2, } PRIMITIVE_RETURN (UNSPECIFIC); } - + DEFINE_PRIMITIVE ("X-WINDOW-SET-ICON-NAME", Prim_x_window_set_icon_name, 2, 2, "Set the icon name of WINDOW to STRING.") { @@ -1237,6 +1237,33 @@ DEFINE_PRIMITIVE ("X-WINDOW-SET-ICON-NAME", Prim_x_window_set_icon_name, 2, 2, } PRIMITIVE_RETURN (UNSPECIFIC); } + +DEFINE_PRIMITIVE ("X-WINDOW-SET-CLASS-HINT", + Prim_x_graphics_set_class_hint, 4, 4, + "(X-WINDOW-SET-CLASS-HINT DISPLAY WINDOW RESOURCE_CLASS RESOURCE_NAME)\n\ +Set the XA_WM_CLASS property of WINDOW on DISPLAY to RESOURCE_CLASS\n\ +and RESOURCE_NAME.") +{ + PRIMITIVE_HEADER (4); + { + struct xdisplay * xd = (x_display_arg (1)); + Display * display = (XD_DISPLAY (xd)); + struct xwindow * xw = (x_window_arg (2)); + Window window = (XW_WINDOW (xw)); + XClassHint *class_hint; + + CHECK_ARG (3, STRING_P); + CHECK_ARG (4, STRING_P); + class_hint = XAllocClassHint (); + if (class_hint == NULL) + error_external_return (); + class_hint->res_class = STRING_ARG (3); + class_hint->res_name = STRING_ARG (4); + XSetClassHint (display, window, class_hint); + XFree ((caddr_t) class_hint); + } + PRIMITIVE_RETURN (UNSPECIFIC); +} unsigned int DEFUN (allocate_x_image, (image), XImage * image) diff --git a/v7/src/microcode/x11graph.c b/v7/src/microcode/x11graph.c index 4af0af73f..82a250864 100644 --- a/v7/src/microcode/x11graph.c +++ b/v7/src/microcode/x11graph.c @@ -1,6 +1,7 @@ + /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/x11graph.c,v 1.16 1991/07/24 19:42:14 arthur Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/x11graph.c,v 1.17 1991/10/02 21:16:39 jinx Exp $ Copyright (c) 1989-91 Massachusetts Institute of Technology @@ -366,33 +367,6 @@ If third argument SUPPRESS-MAP? is true, do not map the window immediately.") } } } - -DEFINE_PRIMITIVE ("X-GRAPHICS-SET-CLASS-HINT", - Prim_x_graphics_set_class_hint, 4, 4, - "(X-GRAPHICS-SET-CLASS-HINT DISPLAY WINDOW RESOURCE_CLASS RESOURCE_NAME)\n\ -Set the XA_WM_CLASS property of WINDOW on DISPLAY to RESOURCE_CLASS\n\ -and RESOURCE_NAME.") -{ - PRIMITIVE_HEADER (4); - { - struct xdisplay * xd = (x_display_arg (1)); - Display * display = (XD_DISPLAY (xd)); - struct xwindow * xw = (x_window_arg (2)); - Window window = (XW_WINDOW (xw)); - XClassHint *class_hint; - - CHECK_ARG (3, STRING_P); - CHECK_ARG (4, STRING_P); - class_hint = XAllocClassHint (); - if (class_hint == NULL) - error_external_return (); - class_hint->res_class = STRING_ARG (3); - class_hint->res_name = STRING_ARG (4); - XSetClassHint (display, window, class_hint); - XFree ((caddr_t) class_hint); - } - PRIMITIVE_RETURN (UNSPECIFIC); -} DEFINE_PRIMITIVE ("X-GRAPHICS-DRAW-LINE", Prim_x_graphics_draw_line, 5, 5, "(X-GRAPHICS-DRAW-LINE WINDOW X-START Y-START X-END Y-END)\n\ diff --git a/v8/src/microcode/version.h b/v8/src/microcode/version.h index 344b9e611..b57809980 100644 --- a/v8/src/microcode/version.h +++ b/v8/src/microcode/version.h @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/version.h,v 11.98 1991/09/07 22:48:14 jinx Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/version.h,v 11.99 1991/10/02 21:17:49 jinx Exp $ Copyright (c) 1988-91 Massachusetts Institute of Technology @@ -46,5 +46,5 @@ MIT in each case. */ #define VERSION 11 #endif #ifndef SUBVERSION -#define SUBVERSION 98 +#define SUBVERSION 99 #endif -- 2.25.1