ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.282 by root, Tue Jan 24 18:57:33 2006 UTC vs.
Revision 1.304 by root, Tue Jan 31 22:01:25 2006 UTC

… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
… …
227# if !UNICODE3 226# if !UNICODE3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
… …
299rxvt_term::lookup_key (XKeyEvent &ev) 305rxvt_term::lookup_key (XKeyEvent &ev)
300{ 306{
301 int ctrl, meta, shft, len; 307 int ctrl, meta, shft, len;
302 unsigned int newlen; 308 unsigned int newlen;
303 KeySym keysym; 309 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 310 int valid_keysym;
308 char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
309 312
310 /* 313 /*
311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
… …
902 { 905 {
903 const char ch = C0_ESC; 906 const char ch = C0_ESC;
904 tt_write (&ch, 1); 907 tt_write (&ch, 1);
905 } 908 }
906 909
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 910 tt_write (kbuf, (unsigned int)len);
918} 911}
919/*}}} */ 912/*}}} */
920 913
921#if defined (KEYSYM_RESOURCE) 914#if defined (KEYSYM_RESOURCE)
… …
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102 } 1095 }
1103} 1096}
1104#endif 1097#endif
1105 1098
1106#if HAVE_SCHED_YIELD 1099#if LINUX_YIELD_HACK
1107static struct event_handler 1100static struct event_handler
1108{ 1101{
1109 check_watcher cw_yield; 1102 check_watcher yield_ev;
1110 1103
1111 void yield (check_watcher &w) 1104 void yield_cb (check_watcher &w)
1112 { 1105 {
1113 sched_yield (); 1106 // this should really be sched_yield(), but the linux guys thought
1107 // that giving a process calling sched_yield () less cpu time than
1108 // ones with high nice levels is a useful thing to do. It surely is is
1109 // allowed by the sus... as is returning ENOSYS.
1110
1111 struct timespec ts = { 0, 0 };
1112 nanosleep (&ts, 0);
1113
1114 w.stop (); 1114 w.stop ();
1115 } 1115 }
1116 1116
1117 event_handler () 1117 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1118 : yield_ev (this, &event_handler::yield_cb)
1119 { 1119 {
1120 } 1120 }
1121} event_handler; 1121} event_handler;
1122#endif 1122#endif
1123 1123
… …
1143 cmdbuf_endp += r; 1143 cmdbuf_endp += r;
1144 return true; 1144 return true;
1145 } 1145 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1147 {
1148#if HAVE_SCHED_YIELD 1148#if LINUX_YIELD_HACK
1149 if (display->is_local) 1149 if (display->is_local)
1150 event_handler.cw_yield.start (); 1150 event_handler.yield_ev.start ();
1151#endif 1151#endif
1152 } 1152 }
1153 else 1153 else
1154 { 1154 {
1155 pty_ev.stop (); 1155 pty_ev.stop ();
… …
1177} 1177}
1178 1178
1179void 1179void
1180rxvt_term::pointer_unblank () 1180rxvt_term::pointer_unblank ()
1181{ 1181{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1182 XDefineCursor (xdisp, vt, TermWin_cursor);
1183 recolour_cursor (); 1183 recolour_cursor ();
1184 1184
1185#ifdef POINTER_BLANK 1185#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1186 hidden_pointer = 0;
1187 1187
… …
1195rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1196{ 1196{
1197 if (!OPTION (Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1198 return; 1198 return;
1199 1199
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1200 XDefineCursor (xdisp, vt, display->blank_cursor);
1201 XFlush (display->display); 1201 XFlush (xdisp);
1202 1202
1203 hidden_pointer = 1; 1203 hidden_pointer = 1;
1204} 1204}
1205 1205
1206void 1206void
… …
1279 (32 + button_number + key_state), 1279 (32 + button_number + key_state),
1280 (32 + x + 1), 1280 (32 + x + 1),
1281 (32 + y + 1)); 1281 (32 + y + 1));
1282} 1282}
1283 1283
1284#ifdef USING_W11LIB
1285void
1286rxvt_W11_process_x_event (XEvent *ev)
1287{
1288 rxvt_t *r = rxvt_get_r ();
1289
1290 x_cb (*ev);
1291}
1292#endif
1293
1294/*{{{ process an X event */ 1284/*{{{ process an X event */
1295void 1285void
1296rxvt_term::x_cb (XEvent &ev) 1286rxvt_term::x_cb (XEvent &ev)
1297{ 1287{
1298 make_current (); 1288 make_current ();
1299 1289
1300 dDisp; 1290 dLocal (Display *, xdisp);
1301 1291
1302 if (ev.xany.window == vt 1292 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1293 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1294 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1295 return;
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1405 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1406 destroy ();
1417 } 1407 }
1418#if ENABLE_EWMH 1408#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1409 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1410 XSendEvent (xdisp, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1411 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1412 &ev);
1423#endif 1413#endif
1424 } 1414 }
1425 } 1415 }
… …
1473 break; 1463 break;
1474 1464
1475 case ConfigureNotify: 1465 case ConfigureNotify:
1476 if (ev.xconfigure.window == parent[0]) 1466 if (ev.xconfigure.window == parent[0])
1477 { 1467 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1468 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1469 ;
1480 1470
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1472 {
1483 seen_resize = 1; 1473 seen_resize = 1;
… …
1541 if (ev.xany.window == vt) 1531 if (ev.xany.window == vt)
1542 { 1532 {
1543 do 1533 do
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1534 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1535 ev.xexpose.width, ev.xexpose.height, False);
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1536 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1547 1537
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1538 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1539
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1540 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1553 1543
1554 want_refresh = 1; 1544 want_refresh = 1;
1555 } 1545 }
1556 else 1546 else
1557 { 1547 {
1558 XEvent unused_event; 1548 XEvent unused_event;
1559 1549
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1550 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1561 ; 1551 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1552 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1553 ;
1564 1554
1565 if (isScrollbarWindow (ev.xany.window)) 1555 if (isScrollbarWindow (ev.xany.window))
1566 { 1556 {
1567 scrollBar.setIdle (); 1557 scrollBar.setIdle ();
1568 scrollbar_show (0); 1558 scrollbar_show (0);
1569 } 1559 }
1570 1560
1571#ifdef TRANSPARENT 1561#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0]) 1562 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window); 1563 XClearWindow (xdisp, ev.xany.window);
1574#endif 1564#endif
1575 } 1565 }
1576 break; 1566 break;
1577 1567
1578 case MotionNotify: 1568 case MotionNotify:
… …
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1578 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1579 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1580 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1581 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1582 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1583 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1594 ; 1584 ;
1595 1585
1596 XQueryPointer (disp, vt, 1586 XQueryPointer (xdisp, vt,
1597 &unused_root, &unused_child, 1587 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1588 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1589 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1590 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1591#ifdef MOUSE_THRESHOLD
… …
1665#endif 1655#endif
1666 } 1656 }
1667 } 1657 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1669 { 1659 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1660 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1671 MotionNotify, &ev)) 1661 MotionNotify, &ev))
1672 ; 1662 ;
1673 1663
1674 XQueryPointer (disp, scrollBar.win, 1664 XQueryPointer (xdisp, scrollBar.win,
1675 &unused_root, &unused_child, 1665 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1666 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1667 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1668 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
2194#if TINTING 2184#if TINTING
2195/* taken from aterm-0.4.2 */ 2185/* taken from aterm-0.4.2 */
2196 2186
2197typedef uint32_t RUINT32T; 2187typedef uint32_t RUINT32T;
2198 2188
2199void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2189void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2200{ 2190{
2201 int sh_r, sh_g, sh_b; 2191 int sh_r, sh_g, sh_b;
2202 RUINT32T mask_r, mask_g, mask_b; 2192 RUINT32T mask_r, mask_g, mask_b;
2203 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2193 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2204 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2194 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2205 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2195 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2206 int i; 2196 int i;
2207 2197
2208 Visual *visual = display->visual; 2198 Visual *visual = term->visual;
2209 2199
2210 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2200 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2211 2201
2212 /* for convenience */ 2202 /* for convenience */
2213 mask_r = visual->red_mask; 2203 mask_r = visual->red_mask;
… …
2434 Atom atype; 2424 Atom atype;
2435 unsigned char *prop = NULL; 2425 unsigned char *prop = NULL;
2436 Window root, oldp, *list; 2426 Window root, oldp, *list;
2437 Pixmap rootpixmap = None; 2427 Pixmap rootpixmap = None;
2438 XWindowAttributes wattr, wrootattr; 2428 XWindowAttributes wattr, wrootattr;
2439 dDisp;
2440 2429
2441 pchanged = 0; 2430 pchanged = 0;
2442 2431
2443 if (!OPTION (Opt_transparent)) 2432 if (!OPTION (Opt_transparent))
2444 return pchanged; /* Don't try any more */ 2433 return pchanged; /* Don't try any more */
2445 2434
2446 XGetWindowAttributes (disp, display->root, &wrootattr); 2435 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2447 rootdepth = wrootattr.depth; 2436 rootdepth = wrootattr.depth;
2448 2437
2449 XGetWindowAttributes (disp, parent[0], &wattr); 2438 XGetWindowAttributes (xdisp, parent[0], &wattr);
2450 2439
2451 if (rootdepth != wattr.depth) 2440 if (rootdepth != wattr.depth)
2452 { 2441 {
2453 if (am_transparent) 2442 if (am_transparent)
2454 { 2443 {
2455 pchanged = 1; 2444 pchanged = 1;
2456 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2445 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2457 am_transparent = am_pixmap_trans = 0; 2446 am_transparent = am_pixmap_trans = 0;
2458 } 2447 }
2459 2448
2460 return pchanged; /* Don't try any more */ 2449 return pchanged; /* Don't try any more */
2461 } 2450 }
2462 2451
2463 /* Get all X ops out of the queue so that our information is up-to-date. */ 2452 /* Get all X ops out of the queue so that our information is up-to-date. */
2464 XSync (disp, False); 2453 XSync (xdisp, False);
2465 2454
2466 /* 2455 /*
2467 * Make the frame window set by the window manager have 2456 * Make the frame window set by the window manager have
2468 * the root background. Some window managers put multiple nested frame 2457 * the root background. Some window managers put multiple nested frame
2469 * windows for each client, so we have to take care about that. 2458 * windows for each client, so we have to take care about that.
2470 */ 2459 */
2471 i = (xa[XA_XROOTPMAP_ID] 2460 i = (xa[XA_XROOTPMAP_ID]
2472 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2461 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2474 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2475 2464
2476 if (!i || prop == NULL) 2465 if (!i || prop == NULL)
2477 i = (xa[XA_ESETROOT_PMAP_ID] 2466 i = (xa[XA_ESETROOT_PMAP_ID]
2478 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2467 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2479 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2480 &nitems, &bytes_after, &prop) == Success); 2469 &nitems, &bytes_after, &prop) == Success);
2481 2470
2482 if (!i || prop == NULL 2471 if (!i || prop == NULL
2483#if TINTING 2472#if TINTING
2484 || !rs[Rs_color + Color_tint] 2473 || !ISSET_PIXCOLOR (Color_tint)
2485#endif 2474#endif
2486 ) 2475 )
2487 have_pixmap = 0; 2476 have_pixmap = 0;
2488 else 2477 else
2489 { 2478 {
… …
2502 Window cr; 2491 Window cr;
2503 XImage *image; 2492 XImage *image;
2504 GC gc; 2493 GC gc;
2505 XGCValues gcvalue; 2494 XGCValues gcvalue;
2506 2495
2507 XTranslateCoordinates (disp, parent[0], display->root, 2496 XTranslateCoordinates (xdisp, parent[0], display->root,
2508 0, 0, &sx, &sy, &cr); 2497 0, 0, &sx, &sy, &cr);
2509 nw = (unsigned int)szHint.width; 2498 nw = (unsigned int)szHint.width;
2510 nh = (unsigned int)szHint.height; 2499 nh = (unsigned int)szHint.height;
2511 nx = ny = 0; 2500 nx = ny = 0;
2512 2501
… …
2525 } 2514 }
2526 2515
2527 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2516 min_it (nw, (unsigned int) (wrootattr.width - sx));
2528 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2517 min_it (nh, (unsigned int) (wrootattr.height - sy));
2529 2518
2530 XSync (disp, False); 2519 XSync (xdisp, False);
2531 allowedxerror = -1; 2520 allowedxerror = -1;
2532 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2521 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2533 2522
2534 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2523 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2535 /* XXX: may need a delay here? */ 2524 /* XXX: may need a delay here? */
2536 allowedxerror = 0; 2525 allowedxerror = 0;
2537 2526
… …
2540 if (am_transparent && am_pixmap_trans) 2529 if (am_transparent && am_pixmap_trans)
2541 { 2530 {
2542 pchanged = 1; 2531 pchanged = 1;
2543 if (pixmap != None) 2532 if (pixmap != None)
2544 { 2533 {
2545 XFreePixmap (disp, pixmap); 2534 XFreePixmap (xdisp, pixmap);
2546 pixmap = None; 2535 pixmap = None;
2547 } 2536 }
2548 } 2537 }
2549 2538
2550 am_pixmap_trans = 0; 2539 am_pixmap_trans = 0;
2551 } 2540 }
2552 else 2541 else
2553 { 2542 {
2554 if (pixmap != None) 2543 if (pixmap != None)
2555 XFreePixmap (disp, pixmap); 2544 XFreePixmap (xdisp, pixmap);
2556 2545
2557#if TINTING 2546#if TINTING
2558 if (ISSET_PIXCOLOR (Color_tint)) 2547 if (ISSET_PIXCOLOR (Color_tint))
2559 { 2548 {
2560 unsigned short rm, gm, bm;
2561 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2549 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2562 2550
2551 rgba c;
2563 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2552 pix_colors_focused [Color_tint].get (c);
2564 2553
2565 ShadeXImage (display, image, shade, rm, gm, bm); 2554 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2566 } 2555 }
2567#endif 2556#endif
2568 2557
2569 pixmap = XCreatePixmap (disp, vt, 2558 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2570 szHint.width, szHint.height, image->depth);
2571 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2559 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2572 XPutImage (disp, pixmap, gc, image, 0, 0, 2560 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2573 nx, ny, image->width, image->height); 2561 nx, ny, image->width, image->height);
2574 XFreeGC (disp, gc); 2562 XFreeGC (xdisp, gc);
2575 XDestroyImage (image); 2563 XDestroyImage (image);
2576 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2564 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2577 XClearWindow (disp, parent[0]); 2565 XClearWindow (xdisp, parent[0]);
2578 2566
2579 if (!am_transparent || !am_pixmap_trans) 2567 if (!am_transparent || !am_pixmap_trans)
2580 pchanged = 1; 2568 pchanged = 1;
2581 2569
2582 am_transparent = am_pixmap_trans = 1; 2570 am_transparent = am_pixmap_trans = 1;
2583 } 2571 }
2584 } 2572 }
2585 2573
2586 if (am_pixmap_trans) 2574 if (am_pixmap_trans)
2587 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2575 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2588 else 2576 else
2589 { 2577 {
2590 unsigned int n; 2578 unsigned int n;
2591 /* 2579 /*
2592 * InheritPixmap transparency 2580 * InheritPixmap transparency
2593 */ 2581 */
2594 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2582 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2595 { 2583 {
2596 oldp = parent[i]; 2584 oldp = parent[i];
2597 XQueryTree (disp, parent[i - 1], &root, 2585 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2598 &parent[i], &list, &n);
2599 XFree (list); 2586 XFree (list);
2600 2587
2601 if (parent[i] == display->root) 2588 if (parent[i] == display->root)
2602 { 2589 {
2603 if (oldp != None) 2590 if (oldp != None)
… …
2611 } 2598 }
2612 2599
2613 n = 0; 2600 n = 0;
2614 2601
2615 if (pchanged) 2602 if (pchanged)
2616 {
2617 for (; n < (unsigned int)i; n++) 2603 for (; n < (unsigned int)i; n++)
2618 { 2604 {
2619 XGetWindowAttributes (disp, parent[n], &wattr); 2605 XGetWindowAttributes (xdisp, parent[n], &wattr);
2606
2620 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2621 { 2608 {
2622 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2623 break; 2610 break;
2624 } 2611 }
2625 } 2612 }
2626 }
2627 2613
2628 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2614 if (n > (sizeof (parent) / sizeof (parent[0])))
2629 { 2615 {
2630 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2616 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2631 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2617 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2632 am_transparent = 0; 2618 am_transparent = 0;
2633 /* XXX: also turn off Opt_transparent? */ 2619 /* XXX: also turn off Opt_transparent? */
2634 } 2620 }
2635 else 2621 else
2636 { 2622 {
2637 for (n = 0; n < (unsigned int)i; n++) 2623 for (n = 0; n < (unsigned int)i; n++)
2638 { 2624 {
2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2625 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2640 XClearWindow (disp, parent[n]); 2626 XClearWindow (xdisp, parent[n]);
2641 } 2627 }
2642 2628
2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2629 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2644 am_transparent = 1; 2630 am_transparent = 1;
2645 } 2631 }
2646 2632
2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2633 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648 parent[i] = None; 2634 parent[i] = None;
2649 } 2635 }
2650 2636
2651 if (scrollBar.win) 2637 if (scrollBar.win)
2652 { 2638 {
2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2639 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2654 scrollBar.setIdle (); 2640 scrollBar.setIdle ();
2655 scrollbar_show (0); 2641 scrollbar_show (0);
2656 } 2642 }
2657 2643
2658 if (am_transparent) 2644 if (am_transparent)
… …
3109 scr_charset_set (2, (unsigned int)cmd_getc ()); 3095 scr_charset_set (2, (unsigned int)cmd_getc ());
3110 break; 3096 break;
3111 case '+': 3097 case '+':
3112 scr_charset_set (3, (unsigned int)cmd_getc ()); 3098 scr_charset_set (3, (unsigned int)cmd_getc ());
3113 break; 3099 break;
3114#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3115 case '6': 3101 case '6':
3116 scr_backindex (); 3102 scr_backindex ();
3117 break; 3103 break;
3118#endif 3104#endif
3119 case '7': 3105 case '7':
3120 scr_cursor (SAVE); 3106 scr_cursor (SAVE);
3121 break; 3107 break;
3122 case '8': 3108 case '8':
3123 scr_cursor (RESTORE); 3109 scr_cursor (RESTORE);
3124 break; 3110 break;
3125#if ENABLE_FRILLS 3111#if !ENABLE_MINIMAL
3126 case '9': 3112 case '9':
3127 scr_forwardindex (); 3113 scr_forwardindex ();
3128 break; 3114 break;
3129#endif 3115#endif
3130 case '=': 3116 case '=':
… …
3292 ndef = get_byte_array_bit (csi_defaults, i); 3278 ndef = get_byte_array_bit (csi_defaults, i);
3293 for (p = 0; p < nargs; p++) 3279 for (p = 0; p < nargs; p++)
3294 if (arg[p] == -1) 3280 if (arg[p] == -1)
3295 arg[p] = ndef; 3281 arg[p] = ndef;
3296 3282
3297#ifdef DEBUG_CMD
3298 fprintf (stderr, "CSI ");
3299 for (p = 0; p < nargs; p++)
3300 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3301 fprintf (stderr, "%c\n", ch);
3302#endif
3303
3304 /* 3283 /*
3305 * private mode handling 3284 * private mode handling
3306 */ 3285 */
3307 if (priv) 3286 if (priv)
3308 { 3287 {
… …
3310 { 3289 {
3311 case '>': 3290 case '>':
3312 if (ch == CSI_DA) /* secondary device attributes */ 3291 if (ch == CSI_DA) /* secondary device attributes */
3313 { 3292 {
3314 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 3293 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3315 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 3294 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3316 // 3295 //
3317 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 3296 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3318 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 3297 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3319 // that we do not support xterm mouse reporting (should be 95 when we do). 3298 // that we do not support xterm mouse reporting (should be 95 when we do).
3320 // 3299 //
3321 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 3300 tt_printf ("\033[>%d;94;0c", 'U');
3322 } 3301 }
3323 break; 3302 break;
3324 case '?': 3303 case '?':
3325 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3304 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3326 process_terminal_mode (ch, priv, nargs, arg); 3305 process_terminal_mode (ch, priv, nargs, arg);
… …
3530 break; 3509 break;
3531 case CSI_75: 3510 case CSI_75:
3532 scr_cursor (RESTORE); 3511 scr_cursor (RESTORE);
3533 break; 3512 break;
3534 3513
3535#if ENABLE_FRILLS 3514#if !ENABLE_MINIMAL
3536 case CSI_74: 3515 case CSI_74:
3537 process_window_ops (arg, nargs); 3516 process_window_ops (arg, nargs);
3538 break; 3517 break;
3539#endif 3518#endif
3540 3519
… …
3547 break; 3526 break;
3548 } 3527 }
3549} 3528}
3550/*}}} */ 3529/*}}} */
3551 3530
3552#if ENABLE_FRILLS 3531#if !ENABLE_MINIMAL
3553/* ARGSUSED */ 3532/* ARGSUSED */
3554void 3533void
3555rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3534rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3556{ 3535{
3557 int x, y; 3536 int x, y;
3558 XWindowAttributes wattr; 3537 XWindowAttributes wattr;
3559 Window wdummy; 3538 Window wdummy;
3560 dDisp; 3539
3540 dLocal (Display *, xdisp);
3561 3541
3562 if (nargs == 0) 3542 if (nargs == 0)
3563 return; 3543 return;
3564 3544
3565 switch (args[0]) 3545 switch (args[0])
3566 { 3546 {
3567 /* 3547 /*
3568 * commands 3548 * commands
3569 */ 3549 */
3570 case 1: /* deiconify window */ 3550 case 1: /* deiconify window */
3571 XMapWindow (disp, parent[0]); 3551 XMapWindow (xdisp, parent[0]);
3572 break; 3552 break;
3573 case 2: /* iconify window */ 3553 case 2: /* iconify window */
3574 XIconifyWindow (disp, parent[0], display->screen); 3554 XIconifyWindow (xdisp, parent[0], display->screen);
3575 break; 3555 break;
3576 case 3: /* set position (pixels) */ 3556 case 3: /* set position (pixels) */
3577 XMoveWindow (disp, parent[0], args[1], args[2]); 3557 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3578 break; 3558 break;
3579 case 4: /* set size (pixels) */ 3559 case 4: /* set size (pixels) */
3580 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3581 break; 3561 break;
3582 case 5: /* raise window */ 3562 case 5: /* raise window */
3583 XRaiseWindow (disp, parent[0]); 3563 XRaiseWindow (xdisp, parent[0]);
3584 break; 3564 break;
3585 case 6: /* lower window */ 3565 case 6: /* lower window */
3586 XLowerWindow (disp, parent[0]); 3566 XLowerWindow (xdisp, parent[0]);
3587 break; 3567 break;
3588 case 7: /* refresh window */ 3568 case 7: /* refresh window */
3589 scr_touch (true); 3569 scr_touch (true);
3590 break; 3570 break;
3591 case 8: /* set size (chars) */ 3571 case 8: /* set size (chars) */
… …
3598 if (args[0] >= 24) /* set height (chars) */ 3578 if (args[0] >= 24) /* set height (chars) */
3599 set_widthheight ((unsigned int)width, 3579 set_widthheight ((unsigned int)width,
3600 (unsigned int) (args[1] * fheight)); 3580 (unsigned int) (args[1] * fheight));
3601 break; 3581 break;
3602 3582
3603
3604 /* 3583 /*
3605 * reports - some output format copied from XTerm 3584 * reports - some output format copied from XTerm
3606 */ 3585 */
3607 case 11: /* report window state */ 3586 case 11: /* report window state */
3608 XGetWindowAttributes (disp, parent[0], &wattr); 3587 XGetWindowAttributes (xdisp, parent[0], &wattr);
3609 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3588 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3610 break; 3589 break;
3611 case 13: /* report window position */ 3590 case 13: /* report window position */
3612 XGetWindowAttributes (disp, parent[0], &wattr); 3591 XGetWindowAttributes (xdisp, parent[0], &wattr);
3613 XTranslateCoordinates (disp, parent[0], wattr.root, 3592 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3614 -wattr.border_width, -wattr.border_width, 3593 -wattr.border_width, -wattr.border_width,
3615 &x, &y, &wdummy); 3594 &x, &y, &wdummy);
3616 tt_printf ("\033[3;%d;%dt", x, y); 3595 tt_printf ("\033[3;%d;%dt", x, y);
3617 break; 3596 break;
3618 case 14: /* report window size (pixels) */ 3597 case 14: /* report window size (pixels) */
3619 XGetWindowAttributes (disp, parent[0], &wattr); 3598 XGetWindowAttributes (xdisp, parent[0], &wattr);
3620 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3599 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3621 break; 3600 break;
3622 case 18: /* report text area size (chars) */ 3601 case 18: /* report text area size (chars) */
3623 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3602 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3624 break; 3603 break;
… …
3626 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3605 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3627 break; 3606 break;
3628 case 20: /* report icon label */ 3607 case 20: /* report icon label */
3629 { 3608 {
3630 char *s; 3609 char *s;
3631 XGetIconName (disp, parent[0], &s); 3610 XGetIconName (xdisp, parent[0], &s);
3632 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3611 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3633 XFree (s); 3612 XFree (s);
3634 } 3613 }
3635 break; 3614 break;
3636 case 21: /* report window title */ 3615 case 21: /* report window title */
3637 { 3616 {
3638 char *s; 3617 char *s;
3639 XFetchName (disp, parent[0], &s); 3618 XFetchName (xdisp, parent[0], &s);
3640 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3619 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3641 XFree (s); 3620 XFree (s);
3642 } 3621 }
3643 break; 3622 break;
3644 } 3623 }
… …
3745void 3724void
3746rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3725rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3747{ 3726{
3748 if (str[0] == '?' && !str[1]) 3727 if (str[0] == '?' && !str[1])
3749 { 3728 {
3750 unsigned short r, g, b; 3729 rgba c;
3751 pix_colors_focused[color].get (display, r, g, b); 3730 pix_colors_focused[color].get (c);
3731
3732#if XFT
3733 if (c.a != rgba::MAX_CC)
3734 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3735 else
3736#endif
3752 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3737 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3753 } 3738 }
3754 else 3739 else
3755 set_window_color (color, str); 3740 set_window_color (color, str);
3756} 3741}
3757 3742
… …
3763{ 3748{
3764 int color; 3749 int color;
3765 char *buf, *name; 3750 char *buf, *name;
3766 bool query = str[0] == '?' && !str[1]; 3751 bool query = str[0] == '?' && !str[1];
3767 int saveop = op; 3752 int saveop = op;
3768 dDisp; 3753
3754 dLocal (Display *, xdisp);
3769 3755
3770 assert (str != NULL); 3756 assert (str != NULL);
3771 switch (op) 3757 switch (op)
3772 { 3758 {
3773 case XTerm_name: 3759 case XTerm_name:
… …
3789 unsigned long bytes_after; 3775 unsigned long bytes_after;
3790 unsigned char *value = 0; 3776 unsigned char *value = 0;
3791 const char *str = ""; 3777 const char *str = "";
3792 3778
3793 if (prop 3779 if (prop
3794 && XGetWindowProperty (disp, parent[0], 3780 && XGetWindowProperty (xdisp, parent[0],
3795 prop, 0, 1<<16, 0, AnyPropertyType, 3781 prop, 0, 1<<16, 0, AnyPropertyType,
3796 &actual_type, &actual_format, 3782 &actual_type, &actual_format,
3797 &nitems, &bytes_after, &value) == Success 3783 &nitems, &bytes_after, &value) == Success
3798 && actual_type != None 3784 && actual_type != None
3799 && actual_format == 8) 3785 && actual_format == 8)
3800 str = (const char *)(value); 3786 str = (const char *)(value);
3801 3787
3802 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3788 tt_printf ("\033]%d;%s%c", op, str, resp);
3803 3789
3804 XFree (value); 3790 XFree (value);
3805 } 3791 }
3806 else 3792 else
3807 { 3793 {
… …
3811 { 3797 {
3812 *eq = 0; 3798 *eq = 0;
3813 set_utf8_property (display->atom (str), eq + 1); 3799 set_utf8_property (display->atom (str), eq + 1);
3814 } 3800 }
3815 else 3801 else
3816 XDeleteProperty (disp, parent[0], 3802 XDeleteProperty (xdisp, parent[0],
3817 display->atom (str)); 3803 display->atom (str));
3818 } 3804 }
3819 break; 3805 break;
3820 3806
3821 case XTerm_Color: 3807 case XTerm_Color:
… …
3831 break; 3817 break;
3832 3818
3833 if ((buf = strchr (name, ';')) != NULL) 3819 if ((buf = strchr (name, ';')) != NULL)
3834 *buf++ = '\0'; 3820 *buf++ = '\0';
3835 3821
3836 if (name[0] == '?' && !name[1]) 3822 process_color_seq (op, color, name, resp);
3837 {
3838 unsigned short r, g, b;
3839 pix_colors_focused[color].get (display, r, g, b);
3840 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3841 }
3842 else
3843 set_window_color (color, name);
3844 } 3823 }
3845 break; 3824 break;
3846 case XTerm_Color00: 3825 case XTerm_Color00:
3847 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3826 process_color_seq (op, Color_fg, str, resp);
3848 break; 3827 break;
3849 case XTerm_Color01: 3828 case XTerm_Color01:
3850 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3829 process_color_seq (op, Color_bg, str, resp);
3851 break; 3830 break;
3852#ifndef NO_CURSORCOLOR 3831#ifndef NO_CURSORCOLOR
3853 case XTerm_Color_cursor: 3832 case XTerm_Color_cursor:
3854 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3833 process_color_seq (op, Color_cursor, str, resp);
3855 break; 3834 break;
3856#endif 3835#endif
3857 case XTerm_Color_pointer_fg: 3836 case XTerm_Color_pointer_fg:
3858 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3837 process_color_seq (op, Color_pointer_fg, str, resp);
3859 break; 3838 break;
3860 case XTerm_Color_pointer_bg: 3839 case XTerm_Color_pointer_bg:
3861 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3840 process_color_seq (op, Color_pointer_bg, str, resp);
3862 break; 3841 break;
3863#ifndef NO_BOLD_UNDERLINE_REVERSE 3842#ifndef NO_BOLD_UNDERLINE_REVERSE
3864 case XTerm_Color_RV: 3843 case XTerm_Color_RV:
3865 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3844 process_color_seq (op, Color_RV, str, resp);
3866 break; 3845 break;
3867 case Rxvt_Color_BD: 3846 case Rxvt_Color_BD:
3868 case URxvt_Color_BD: 3847 case URxvt_Color_BD:
3869 process_color_seq (op, Color_BD, str, resp); 3848 process_color_seq (op, Color_BD, str, resp);
3870 break; 3849 break;
3871 case Rxvt_Color_UL: 3850 case Rxvt_Color_UL:
3872 case URxvt_Color_UL: 3851 case URxvt_Color_UL:
3873 process_color_seq (op, Color_UL, str, resp); 3852 process_color_seq (op, Color_UL, str, resp);
3874 break; 3853 break;
3875 case URxvt_Color_IT: 3854 case URxvt_Color_IT:
3876 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3855 process_color_seq (op, Color_IT, str, resp);
3877 break; 3856 break;
3878#endif 3857#endif
3879#if TRANSPARENT && TINTING 3858#if TRANSPARENT && TINTING
3880 case URxvt_Color_tint: 3859 case URxvt_Color_tint:
3881 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3860 process_color_seq (op, Color_tint, str, resp);
3861
3882 check_our_parents (); 3862 check_our_parents ();
3863
3883 if (am_transparent) 3864 if (am_transparent)
3884 want_full_refresh = want_refresh = 1; 3865 want_full_refresh = want_refresh = 1;
3866
3885 break; 3867 break;
3886#endif 3868#endif
3887 3869
3888 case Rxvt_Pixmap: 3870 case Rxvt_Pixmap:
3889 { 3871 {
… …
3960 allocated.push_back ((void *)res); 3942 allocated.push_back ((void *)res);
3961 set_fonts (); 3943 set_fonts ();
3962 } 3944 }
3963 break; 3945 break;
3964 3946
3965#if ENABLE_FRILLS 3947 case URxvt_version:
3948 if (query)
3949 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3950 op,
3951 rs[Rs_name], VERSION[0], VERSION[2],
3952 resp);
3953 break;
3954
3955#if !ENABLE_MINIMAL
3966 case URxvt_locale: 3956 case URxvt_locale:
3967 if (query) 3957 if (query)
3968 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3958 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3969 else 3959 else
3970 { 3960 {
3971 set_locale (str); 3961 set_locale (str);
3972 pty->set_utf8_mode (enc_utf8); 3962 pty->set_utf8_mode (enc_utf8);
3973 init_xlocale (); 3963 init_xlocale ();
… …
4334 scr_color (Color_bg, Color_bg); 4324 scr_color (Color_bg, Color_bg);
4335 break; 4325 break;
4336 4326
4337 //case 50: // not variable spacing 4327 //case 50: // not variable spacing
4338 4328
4339#if ENABLE_FRILLS 4329#if !ENABLE_MINIMAL
4340 case 90: 4330 case 90:
4341 case 91: /* set bright fg color */ 4331 case 91: /* set bright fg color */
4342 case 92: 4332 case 92:
4343 case 93: 4333 case 93:
4344 case 94: 4334 case 94:

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines