diff options
| author | Richard M. Stallman | 1993-06-03 05:55:55 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1993-06-03 05:55:55 +0000 |
| commit | ebc9936d6a4d80fe69ad492c9b0a8cf654f41afc (patch) | |
| tree | 739fdad255645e2ee910aa88105e902d8bcee14b /src | |
| parent | 949d4ac78ebf71380c79269c221e118290607c51 (diff) | |
| download | emacs-ebc9936d6a4d80fe69ad492c9b0a8cf654f41afc.tar.gz emacs-ebc9936d6a4d80fe69ad492c9b0a8cf654f41afc.zip | |
(x_window): Use Vxrdb_name for res_name field.
Delete the shortname stuff.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/xfns.c b/src/xfns.c index 65fada912d1..f2d12df3e02 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -1484,8 +1484,6 @@ x_window (f) | |||
| 1484 | XSetWindowAttributes attributes; | 1484 | XSetWindowAttributes attributes; |
| 1485 | unsigned long attribute_mask; | 1485 | unsigned long attribute_mask; |
| 1486 | XClassHint class_hints; | 1486 | XClassHint class_hints; |
| 1487 | char *shortname; | ||
| 1488 | char *p; | ||
| 1489 | 1487 | ||
| 1490 | attributes.background_pixel = f->display.x->background_pixel; | 1488 | attributes.background_pixel = f->display.x->background_pixel; |
| 1491 | attributes.border_pixel = f->display.x->border_pixel; | 1489 | attributes.border_pixel = f->display.x->border_pixel; |
| @@ -1511,15 +1509,7 @@ x_window (f) | |||
| 1511 | screen_visual, /* set in Fx_open_connection */ | 1509 | screen_visual, /* set in Fx_open_connection */ |
| 1512 | attribute_mask, &attributes); | 1510 | attribute_mask, &attributes); |
| 1513 | 1511 | ||
| 1514 | /* X resource names should not have periods in them. | 1512 | class_hints.res_name = (char *) XSTRING (Vxrdb_name)->data; |
| 1515 | So copy the frame name, discarding from the first period onward. */ | ||
| 1516 | shortname = (char *) alloca (XSTRING (f->name)->size + 1); | ||
| 1517 | bcopy (XSTRING (f->name)->data, shortname, XSTRING (f->name)->size + 1); | ||
| 1518 | for (p = shortname; *p; p++) | ||
| 1519 | if (*p == '.') | ||
| 1520 | *p = 0; | ||
| 1521 | |||
| 1522 | class_hints.res_name = shortname; | ||
| 1523 | class_hints.res_class = EMACS_CLASS; | 1513 | class_hints.res_class = EMACS_CLASS; |
| 1524 | XSetClassHint (x_current_display, FRAME_X_WINDOW (f), &class_hints); | 1514 | XSetClassHint (x_current_display, FRAME_X_WINDOW (f), &class_hints); |
| 1525 | 1515 | ||