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.280 by root, Mon Jan 23 23:33:58 2006 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 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>
… …
227# if !UNICODE3 222# if !UNICODE3
228 if (ch >= 0x10000) 223 if (ch >= 0x10000)
229 ch = 0xfffd; 224 ch = 0xfffd;
230# endif 225# endif
231 scr_overlay_set (11, y, ch, r); 226 scr_overlay_set (11, y, ch, r);
227
228 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 229 scr_overlay_set (12, y, NOCHAR, r);
233 } 230 }
234 231
232// {
233// char buf[4+4+3+1];
234// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
235// scr_overlay_set (0, 0, buf);
236// }
235 scr_overlay_set (0, len , attr); 237 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 238 scr_overlay_set (0, len + 1, fname);
237 239
238 free (fname); 240 free (fname);
239 241
… …
299rxvt_term::lookup_key (XKeyEvent &ev) 301rxvt_term::lookup_key (XKeyEvent &ev)
300{ 302{
301 int ctrl, meta, shft, len; 303 int ctrl, meta, shft, len;
302 unsigned int newlen; 304 unsigned int newlen;
303 KeySym keysym; 305 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 306 int valid_keysym;
308 char kbuf[KBUFSZ]; 307 char kbuf[KBUFSZ];
309 308
310 /* 309 /*
311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
… …
902 { 901 {
903 const char ch = C0_ESC; 902 const char ch = C0_ESC;
904 tt_write (&ch, 1); 903 tt_write (&ch, 1);
905 } 904 }
906 905
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); 906 tt_write (kbuf, (unsigned int)len);
918} 907}
919/*}}} */ 908/*}}} */
920 909
921#if defined (KEYSYM_RESOURCE) 910#if defined (KEYSYM_RESOURCE)
… …
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102 } 1091 }
1103} 1092}
1104#endif 1093#endif
1105 1094
1106#if HAVE_SCHED_YIELD
1107static struct event_handler
1108{
1109 check_watcher cw_yield;
1110
1111 void yield (check_watcher &w)
1112 {
1113 sched_yield ();
1114 w.stop ();
1115 }
1116
1117 event_handler ()
1118 : cw_yield (this, &event_handler::yield)
1119 {
1120 }
1121} event_handler;
1122#endif
1123
1124bool 1095bool
1125rxvt_term::pty_fill () 1096rxvt_term::pty_fill ()
1126{ 1097{
1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1098 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1128 1099
… …
1177} 1148}
1178 1149
1179void 1150void
1180rxvt_term::pointer_unblank () 1151rxvt_term::pointer_unblank ()
1181{ 1152{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1153 XDefineCursor (xdisp, vt, TermWin_cursor);
1183 recolour_cursor (); 1154 recolour_cursor ();
1184 1155
1185#ifdef POINTER_BLANK 1156#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1157 hidden_pointer = 0;
1187 1158
… …
1195rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
1196{ 1167{
1197 if (!OPTION (Opt_pointerBlank)) 1168 if (!OPTION (Opt_pointerBlank))
1198 return; 1169 return;
1199 1170
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1171 XDefineCursor (xdisp, vt, display->blank_cursor);
1201 XFlush (display->display); 1172 XFlush (xdisp);
1202 1173
1203 hidden_pointer = 1; 1174 hidden_pointer = 1;
1204} 1175}
1205 1176
1206void 1177void
… …
1279 (32 + button_number + key_state), 1250 (32 + button_number + key_state),
1280 (32 + x + 1), 1251 (32 + x + 1),
1281 (32 + y + 1)); 1252 (32 + y + 1));
1282} 1253}
1283 1254
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 */ 1255/*{{{ process an X event */
1295void 1256void
1296rxvt_term::x_cb (XEvent &ev) 1257rxvt_term::x_cb (XEvent &ev)
1297{ 1258{
1298 make_current (); 1259 make_current ();
1299 1260
1300 dDisp; 1261 dLocal (Display *, xdisp);
1301 1262
1302 if (ev.xany.window == vt 1263 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1264 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1266 return;
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1376 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1377 destroy ();
1417 } 1378 }
1418#if ENABLE_EWMH 1379#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1380 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1381 XSendEvent (xdisp, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1382 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1383 &ev);
1423#endif 1384#endif
1424 } 1385 }
1425 } 1386 }
… …
1473 break; 1434 break;
1474 1435
1475 case ConfigureNotify: 1436 case ConfigureNotify:
1476 if (ev.xconfigure.window == parent[0]) 1437 if (ev.xconfigure.window == parent[0])
1477 { 1438 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1440 ;
1480 1441
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1443 {
1483 seen_resize = 1; 1444 seen_resize = 1;
… …
1541 if (ev.xany.window == vt) 1502 if (ev.xany.window == vt)
1542 { 1503 {
1543 do 1504 do
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1547 1508
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1510
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1553 1514
1554 want_refresh = 1; 1515 want_refresh = 1;
1555 } 1516 }
1556 else 1517 else
1557 { 1518 {
1558 XEvent unused_event; 1519 XEvent unused_event;
1559 1520
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1561 ; 1522 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1524 ;
1564 1525
1565 if (isScrollbarWindow (ev.xany.window)) 1526 if (isScrollbarWindow (ev.xany.window))
1566 { 1527 {
1567 scrollBar.setIdle (); 1528 scrollBar.setIdle ();
1568 scrollbar_show (0); 1529 scrollbar_show (0);
1569 } 1530 }
1570 1531
1571#ifdef TRANSPARENT 1532#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0]) 1533 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window); 1534 XClearWindow (xdisp, ev.xany.window);
1574#endif 1535#endif
1575 } 1536 }
1576 break; 1537 break;
1577 1538
1578 case MotionNotify: 1539 case MotionNotify:
… …
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1551 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1553 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1594 ; 1555 ;
1595 1556
1596 XQueryPointer (disp, vt, 1557 XQueryPointer (xdisp, vt,
1597 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1560 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1561 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
… …
1665#endif 1626#endif
1666 } 1627 }
1667 } 1628 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1669 { 1630 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1671 MotionNotify, &ev)) 1632 MotionNotify, &ev))
1672 ; 1633 ;
1673 1634
1674 XQueryPointer (disp, scrollBar.win, 1635 XQueryPointer (xdisp, scrollBar.win,
1675 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1638 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1639 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
2142 selection_make (ev.time); 2103 selection_make (ev.time);
2143 break; 2104 break;
2144 2105
2145 case Button2: 2106 case Button2:
2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2107 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2148 break; 2109 break;
2149 2110
2150#ifdef MOUSE_WHEEL 2111#ifdef MOUSE_WHEEL
2151 case Button4: 2112 case Button4:
2152 case Button5: 2113 case Button5:
… …
2194#if TINTING 2155#if TINTING
2195/* taken from aterm-0.4.2 */ 2156/* taken from aterm-0.4.2 */
2196 2157
2197typedef uint32_t RUINT32T; 2158typedef uint32_t RUINT32T;
2198 2159
2199void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2160void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2200{ 2161{
2201 int sh_r, sh_g, sh_b; 2162 int sh_r, sh_g, sh_b;
2202 RUINT32T mask_r, mask_g, mask_b; 2163 RUINT32T mask_r, mask_g, mask_b;
2203 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2204 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2165 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2205 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2166 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2206 int i; 2167 int i;
2207 2168
2208 Visual *visual = display->visual; 2169 Visual *visual = term->visual;
2209 2170
2210 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2211 2172
2212 /* for convenience */ 2173 /* for convenience */
2213 mask_r = visual->red_mask; 2174 mask_r = visual->red_mask;
… …
2434 Atom atype; 2395 Atom atype;
2435 unsigned char *prop = NULL; 2396 unsigned char *prop = NULL;
2436 Window root, oldp, *list; 2397 Window root, oldp, *list;
2437 Pixmap rootpixmap = None; 2398 Pixmap rootpixmap = None;
2438 XWindowAttributes wattr, wrootattr; 2399 XWindowAttributes wattr, wrootattr;
2439 dDisp;
2440 2400
2441 pchanged = 0; 2401 pchanged = 0;
2442 2402
2443 if (!OPTION (Opt_transparent)) 2403 if (!OPTION (Opt_transparent))
2444 return pchanged; /* Don't try any more */ 2404 return pchanged; /* Don't try any more */
2445 2405
2446 XGetWindowAttributes (disp, display->root, &wrootattr); 2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2447 rootdepth = wrootattr.depth; 2407 rootdepth = wrootattr.depth;
2448 2408
2449 XGetWindowAttributes (disp, parent[0], &wattr); 2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
2450 2410
2451 if (rootdepth != wattr.depth) 2411 if (rootdepth != wattr.depth)
2452 { 2412 {
2453 if (am_transparent) 2413 if (am_transparent)
2454 { 2414 {
2455 pchanged = 1; 2415 pchanged = 1;
2456 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2457 am_transparent = am_pixmap_trans = 0; 2417 am_transparent = am_pixmap_trans = 0;
2458 } 2418 }
2459 2419
2460 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
2461 } 2421 }
2462 2422
2463 /* Get all X ops out of the queue so that our information is up-to-date. */ 2423 /* Get all X ops out of the queue so that our information is up-to-date. */
2464 XSync (disp, False); 2424 XSync (xdisp, False);
2465 2425
2466 /* 2426 /*
2467 * Make the frame window set by the window manager have 2427 * Make the frame window set by the window manager have
2468 * the root background. Some window managers put multiple nested frame 2428 * the root background. Some window managers put multiple nested frame
2469 * windows for each client, so we have to take care about that. 2429 * windows for each client, so we have to take care about that.
2470 */ 2430 */
2471 i = (xa[XA_XROOTPMAP_ID] 2431 i = (xa[XA_XROOTPMAP_ID]
2472 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2474 &nitems, &bytes_after, &prop) == Success); 2434 &nitems, &bytes_after, &prop) == Success);
2475 2435
2476 if (!i || prop == NULL) 2436 if (!i || prop == NULL)
2477 i = (xa[XA_ESETROOT_PMAP_ID] 2437 i = (xa[XA_ESETROOT_PMAP_ID]
2478 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2479 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2480 &nitems, &bytes_after, &prop) == Success); 2440 &nitems, &bytes_after, &prop) == Success);
2481 2441
2482 if (!i || prop == NULL 2442 if (!i || prop == NULL
2483#if TINTING 2443#if TINTING
2484 || !rs[Rs_color + Color_tint] 2444 || !ISSET_PIXCOLOR (Color_tint)
2485#endif 2445#endif
2486 ) 2446 )
2487 have_pixmap = 0; 2447 have_pixmap = 0;
2488 else 2448 else
2489 { 2449 {
… …
2502 Window cr; 2462 Window cr;
2503 XImage *image; 2463 XImage *image;
2504 GC gc; 2464 GC gc;
2505 XGCValues gcvalue; 2465 XGCValues gcvalue;
2506 2466
2507 XTranslateCoordinates (disp, parent[0], display->root, 2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2508 0, 0, &sx, &sy, &cr); 2468 0, 0, &sx, &sy, &cr);
2509 nw = (unsigned int)szHint.width; 2469 nw = (unsigned int)szHint.width;
2510 nh = (unsigned int)szHint.height; 2470 nh = (unsigned int)szHint.height;
2511 nx = ny = 0; 2471 nx = ny = 0;
2512 2472
… …
2525 } 2485 }
2526 2486
2527 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2528 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2529 2489
2530 XSync (disp, False); 2490 XSync (xdisp, False);
2531 allowedxerror = -1; 2491 allowedxerror = -1;
2532 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2533 2493
2534 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2535 /* XXX: may need a delay here? */ 2495 /* XXX: may need a delay here? */
2536 allowedxerror = 0; 2496 allowedxerror = 0;
2537 2497
… …
2540 if (am_transparent && am_pixmap_trans) 2500 if (am_transparent && am_pixmap_trans)
2541 { 2501 {
2542 pchanged = 1; 2502 pchanged = 1;
2543 if (pixmap != None) 2503 if (pixmap != None)
2544 { 2504 {
2545 XFreePixmap (disp, pixmap); 2505 XFreePixmap (xdisp, pixmap);
2546 pixmap = None; 2506 pixmap = None;
2547 } 2507 }
2548 } 2508 }
2549 2509
2550 am_pixmap_trans = 0; 2510 am_pixmap_trans = 0;
2551 } 2511 }
2552 else 2512 else
2553 { 2513 {
2554 if (pixmap != None) 2514 if (pixmap != None)
2555 XFreePixmap (disp, pixmap); 2515 XFreePixmap (xdisp, pixmap);
2556 2516
2557#if TINTING 2517#if TINTING
2558 if (ISSET_PIXCOLOR (Color_tint)) 2518 if (ISSET_PIXCOLOR (Color_tint))
2559 { 2519 {
2560 unsigned short rm, gm, bm;
2561 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2562 2521
2522 rgba c;
2563 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2523 pix_colors_focused [Color_tint].get (c);
2564 2524
2565 ShadeXImage (display, image, shade, rm, gm, bm); 2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2566 } 2526 }
2567#endif 2527#endif
2568 2528
2569 pixmap = XCreatePixmap (disp, vt, 2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2570 szHint.width, szHint.height, image->depth);
2571 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2572 XPutImage (disp, pixmap, gc, image, 0, 0, 2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2573 nx, ny, image->width, image->height); 2532 nx, ny, image->width, image->height);
2574 XFreeGC (disp, gc); 2533 XFreeGC (xdisp, gc);
2575 XDestroyImage (image); 2534 XDestroyImage (image);
2576 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2577 XClearWindow (disp, parent[0]); 2536 XClearWindow (xdisp, parent[0]);
2578 2537
2579 if (!am_transparent || !am_pixmap_trans) 2538 if (!am_transparent || !am_pixmap_trans)
2580 pchanged = 1; 2539 pchanged = 1;
2581 2540
2582 am_transparent = am_pixmap_trans = 1; 2541 am_transparent = am_pixmap_trans = 1;
2583 } 2542 }
2584 } 2543 }
2585 2544
2586 if (am_pixmap_trans) 2545 if (am_pixmap_trans)
2587 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2588 else 2547 else
2589 { 2548 {
2590 unsigned int n; 2549 unsigned int n;
2591 /* 2550 /*
2592 * InheritPixmap transparency 2551 * InheritPixmap transparency
2593 */ 2552 */
2594 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2595 { 2554 {
2596 oldp = parent[i]; 2555 oldp = parent[i];
2597 XQueryTree (disp, parent[i - 1], &root, 2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2598 &parent[i], &list, &n);
2599 XFree (list); 2557 XFree (list);
2600 2558
2601 if (parent[i] == display->root) 2559 if (parent[i] == display->root)
2602 { 2560 {
2603 if (oldp != None) 2561 if (oldp != None)
… …
2611 } 2569 }
2612 2570
2613 n = 0; 2571 n = 0;
2614 2572
2615 if (pchanged) 2573 if (pchanged)
2616 {
2617 for (; n < (unsigned int)i; n++) 2574 for (; n < (unsigned int)i; n++)
2618 { 2575 {
2619 XGetWindowAttributes (disp, parent[n], &wattr); 2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2577
2620 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2621 { 2579 {
2622 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2623 break; 2581 break;
2624 } 2582 }
2625 } 2583 }
2626 }
2627 2584
2628 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2629 { 2586 {
2630 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2631 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2632 am_transparent = 0; 2589 am_transparent = 0;
2633 /* XXX: also turn off Opt_transparent? */ 2590 /* XXX: also turn off Opt_transparent? */
2634 } 2591 }
2635 else 2592 else
2636 { 2593 {
2637 for (n = 0; n < (unsigned int)i; n++) 2594 for (n = 0; n < (unsigned int)i; n++)
2638 { 2595 {
2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2640 XClearWindow (disp, parent[n]); 2597 XClearWindow (xdisp, parent[n]);
2641 } 2598 }
2642 2599
2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2644 am_transparent = 1; 2601 am_transparent = 1;
2645 } 2602 }
2646 2603
2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648 parent[i] = None; 2605 parent[i] = None;
2649 } 2606 }
2650 2607
2651 if (scrollBar.win) 2608 if (scrollBar.win)
2652 { 2609 {
2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2654 scrollBar.setIdle (); 2611 scrollBar.setIdle ();
2655 scrollbar_show (0); 2612 scrollbar_show (0);
2656 } 2613 }
2657 2614
2658 if (am_transparent) 2615 if (am_transparent)
… …
3109 scr_charset_set (2, (unsigned int)cmd_getc ()); 3066 scr_charset_set (2, (unsigned int)cmd_getc ());
3110 break; 3067 break;
3111 case '+': 3068 case '+':
3112 scr_charset_set (3, (unsigned int)cmd_getc ()); 3069 scr_charset_set (3, (unsigned int)cmd_getc ());
3113 break; 3070 break;
3114#if ENABLE_FRILLS 3071#if !ENABLE_MINIMAL
3115 case '6': 3072 case '6':
3116 scr_backindex (); 3073 scr_backindex ();
3117 break; 3074 break;
3118#endif 3075#endif
3119 case '7': 3076 case '7':
3120 scr_cursor (SAVE); 3077 scr_cursor (SAVE);
3121 break; 3078 break;
3122 case '8': 3079 case '8':
3123 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
3124 break; 3081 break;
3125#if ENABLE_FRILLS 3082#if !ENABLE_MINIMAL
3126 case '9': 3083 case '9':
3127 scr_forwardindex (); 3084 scr_forwardindex ();
3128 break; 3085 break;
3129#endif 3086#endif
3130 case '=': 3087 case '=':
… …
3292 ndef = get_byte_array_bit (csi_defaults, i); 3249 ndef = get_byte_array_bit (csi_defaults, i);
3293 for (p = 0; p < nargs; p++) 3250 for (p = 0; p < nargs; p++)
3294 if (arg[p] == -1) 3251 if (arg[p] == -1)
3295 arg[p] = ndef; 3252 arg[p] = ndef;
3296 3253
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 /* 3254 /*
3305 * private mode handling 3255 * private mode handling
3306 */ 3256 */
3307 if (priv) 3257 if (priv)
3308 { 3258 {
3309 switch (priv) 3259 switch (priv)
3310 { 3260 {
3311 case '>': 3261 case '>':
3312 if (ch == CSI_DA) /* secondary device attributes */ 3262 if (ch == CSI_DA) /* secondary device attributes */
3313 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3263 {
3264 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3265 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3266 //
3267 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3268 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3269 // that we do not support xterm mouse reporting (should be 95 when we do).
3270 //
3271 tt_printf ("\033[>%d;94;0c", 'U');
3272 }
3314 break; 3273 break;
3315 case '?': 3274 case '?':
3316 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3275 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3317 process_terminal_mode (ch, priv, nargs, arg); 3276 process_terminal_mode (ch, priv, nargs, arg);
3318 break; 3277 break;
… …
3521 break; 3480 break;
3522 case CSI_75: 3481 case CSI_75:
3523 scr_cursor (RESTORE); 3482 scr_cursor (RESTORE);
3524 break; 3483 break;
3525 3484
3526#if ENABLE_FRILLS 3485#if !ENABLE_MINIMAL
3527 case CSI_74: 3486 case CSI_74:
3528 process_window_ops (arg, nargs); 3487 process_window_ops (arg, nargs);
3529 break; 3488 break;
3530#endif 3489#endif
3531 3490
… …
3538 break; 3497 break;
3539 } 3498 }
3540} 3499}
3541/*}}} */ 3500/*}}} */
3542 3501
3543#if ENABLE_FRILLS 3502#if !ENABLE_MINIMAL
3544/* ARGSUSED */ 3503/* ARGSUSED */
3545void 3504void
3546rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3505rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3547{ 3506{
3548 int x, y; 3507 int x, y;
3549 XWindowAttributes wattr; 3508 XWindowAttributes wattr;
3550 Window wdummy; 3509 Window wdummy;
3551 dDisp; 3510
3511 dLocal (Display *, xdisp);
3552 3512
3553 if (nargs == 0) 3513 if (nargs == 0)
3554 return; 3514 return;
3555 3515
3556 switch (args[0]) 3516 switch (args[0])
3557 { 3517 {
3558 /* 3518 /*
3559 * commands 3519 * commands
3560 */ 3520 */
3561 case 1: /* deiconify window */ 3521 case 1: /* deiconify window */
3562 XMapWindow (disp, parent[0]); 3522 XMapWindow (xdisp, parent[0]);
3563 break; 3523 break;
3564 case 2: /* iconify window */ 3524 case 2: /* iconify window */
3565 XIconifyWindow (disp, parent[0], display->screen); 3525 XIconifyWindow (xdisp, parent[0], display->screen);
3566 break; 3526 break;
3567 case 3: /* set position (pixels) */ 3527 case 3: /* set position (pixels) */
3568 XMoveWindow (disp, parent[0], args[1], args[2]); 3528 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3569 break; 3529 break;
3570 case 4: /* set size (pixels) */ 3530 case 4: /* set size (pixels) */
3571 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3572 break; 3532 break;
3573 case 5: /* raise window */ 3533 case 5: /* raise window */
3574 XRaiseWindow (disp, parent[0]); 3534 XRaiseWindow (xdisp, parent[0]);
3575 break; 3535 break;
3576 case 6: /* lower window */ 3536 case 6: /* lower window */
3577 XLowerWindow (disp, parent[0]); 3537 XLowerWindow (xdisp, parent[0]);
3578 break; 3538 break;
3579 case 7: /* refresh window */ 3539 case 7: /* refresh window */
3580 scr_touch (true); 3540 scr_touch (true);
3581 break; 3541 break;
3582 case 8: /* set size (chars) */ 3542 case 8: /* set size (chars) */
… …
3589 if (args[0] >= 24) /* set height (chars) */ 3549 if (args[0] >= 24) /* set height (chars) */
3590 set_widthheight ((unsigned int)width, 3550 set_widthheight ((unsigned int)width,
3591 (unsigned int) (args[1] * fheight)); 3551 (unsigned int) (args[1] * fheight));
3592 break; 3552 break;
3593 3553
3594
3595 /* 3554 /*
3596 * reports - some output format copied from XTerm 3555 * reports - some output format copied from XTerm
3597 */ 3556 */
3598 case 11: /* report window state */ 3557 case 11: /* report window state */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3558 XGetWindowAttributes (xdisp, parent[0], &wattr);
3600 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3601 break; 3560 break;
3602 case 13: /* report window position */ 3561 case 13: /* report window position */
3603 XGetWindowAttributes (disp, parent[0], &wattr); 3562 XGetWindowAttributes (xdisp, parent[0], &wattr);
3604 XTranslateCoordinates (disp, parent[0], wattr.root, 3563 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3605 -wattr.border_width, -wattr.border_width, 3564 -wattr.border_width, -wattr.border_width,
3606 &x, &y, &wdummy); 3565 &x, &y, &wdummy);
3607 tt_printf ("\033[3;%d;%dt", x, y); 3566 tt_printf ("\033[3;%d;%dt", x, y);
3608 break; 3567 break;
3609 case 14: /* report window size (pixels) */ 3568 case 14: /* report window size (pixels) */
3610 XGetWindowAttributes (disp, parent[0], &wattr); 3569 XGetWindowAttributes (xdisp, parent[0], &wattr);
3611 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3612 break; 3571 break;
3613 case 18: /* report text area size (chars) */ 3572 case 18: /* report text area size (chars) */
3614 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3573 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3615 break; 3574 break;
… …
3617 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3576 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3618 break; 3577 break;
3619 case 20: /* report icon label */ 3578 case 20: /* report icon label */
3620 { 3579 {
3621 char *s; 3580 char *s;
3622 XGetIconName (disp, parent[0], &s); 3581 XGetIconName (xdisp, parent[0], &s);
3623 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3582 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3624 XFree (s); 3583 XFree (s);
3625 } 3584 }
3626 break; 3585 break;
3627 case 21: /* report window title */ 3586 case 21: /* report window title */
3628 { 3587 {
3629 char *s; 3588 char *s;
3630 XFetchName (disp, parent[0], &s); 3589 XFetchName (xdisp, parent[0], &s);
3631 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3590 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3632 XFree (s); 3591 XFree (s);
3633 } 3592 }
3634 break; 3593 break;
3635 } 3594 }
… …
3736void 3695void
3737rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3696rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3738{ 3697{
3739 if (str[0] == '?' && !str[1]) 3698 if (str[0] == '?' && !str[1])
3740 { 3699 {
3741 unsigned short r, g, b; 3700 rgba c;
3742 pix_colors_focused[color].get (display, r, g, b); 3701 pix_colors_focused[color].get (c);
3702
3703#if XFT
3704 if (c.a != rgba::MAX_CC)
3705 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3706 else
3707#endif
3743 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3708 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3744 } 3709 }
3745 else 3710 else
3746 set_window_color (color, str); 3711 set_window_color (color, str);
3747} 3712}
3748 3713
… …
3754{ 3719{
3755 int color; 3720 int color;
3756 char *buf, *name; 3721 char *buf, *name;
3757 bool query = str[0] == '?' && !str[1]; 3722 bool query = str[0] == '?' && !str[1];
3758 int saveop = op; 3723 int saveop = op;
3759 dDisp; 3724
3725 dLocal (Display *, xdisp);
3760 3726
3761 assert (str != NULL); 3727 assert (str != NULL);
3762 switch (op) 3728 switch (op)
3763 { 3729 {
3764 case XTerm_name: 3730 case XTerm_name:
… …
3780 unsigned long bytes_after; 3746 unsigned long bytes_after;
3781 unsigned char *value = 0; 3747 unsigned char *value = 0;
3782 const char *str = ""; 3748 const char *str = "";
3783 3749
3784 if (prop 3750 if (prop
3785 && XGetWindowProperty (disp, parent[0], 3751 && XGetWindowProperty (xdisp, parent[0],
3786 prop, 0, 1<<16, 0, AnyPropertyType, 3752 prop, 0, 1<<16, 0, AnyPropertyType,
3787 &actual_type, &actual_format, 3753 &actual_type, &actual_format,
3788 &nitems, &bytes_after, &value) == Success 3754 &nitems, &bytes_after, &value) == Success
3789 && actual_type != None 3755 && actual_type != None
3790 && actual_format == 8) 3756 && actual_format == 8)
3791 str = (const char *)(value); 3757 str = (const char *)(value);
3792 3758
3793 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3759 tt_printf ("\033]%d;%s%c", op, str, resp);
3794 3760
3795 XFree (value); 3761 XFree (value);
3796 } 3762 }
3797 else 3763 else
3798 { 3764 {
… …
3802 { 3768 {
3803 *eq = 0; 3769 *eq = 0;
3804 set_utf8_property (display->atom (str), eq + 1); 3770 set_utf8_property (display->atom (str), eq + 1);
3805 } 3771 }
3806 else 3772 else
3807 XDeleteProperty (disp, parent[0], 3773 XDeleteProperty (xdisp, parent[0],
3808 display->atom (str)); 3774 display->atom (str));
3809 } 3775 }
3810 break; 3776 break;
3811 3777
3812 case XTerm_Color: 3778 case XTerm_Color:
… …
3822 break; 3788 break;
3823 3789
3824 if ((buf = strchr (name, ';')) != NULL) 3790 if ((buf = strchr (name, ';')) != NULL)
3825 *buf++ = '\0'; 3791 *buf++ = '\0';
3826 3792
3827 if (name[0] == '?' && !name[1]) 3793 process_color_seq (op, color, name, resp);
3828 {
3829 unsigned short r, g, b;
3830 pix_colors_focused[color].get (display, r, g, b);
3831 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3832 }
3833 else
3834 set_window_color (color, name);
3835 } 3794 }
3836 break; 3795 break;
3837 case XTerm_Color00: 3796 case XTerm_Color00:
3838 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3797 process_color_seq (op, Color_fg, str, resp);
3839 break; 3798 break;
3840 case XTerm_Color01: 3799 case XTerm_Color01:
3841 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3800 process_color_seq (op, Color_bg, str, resp);
3842 break; 3801 break;
3843#ifndef NO_CURSORCOLOR 3802#ifndef NO_CURSORCOLOR
3844 case XTerm_Color_cursor: 3803 case XTerm_Color_cursor:
3845 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3804 process_color_seq (op, Color_cursor, str, resp);
3846 break; 3805 break;
3847#endif 3806#endif
3848 case XTerm_Color_pointer_fg: 3807 case XTerm_Color_pointer_fg:
3849 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3808 process_color_seq (op, Color_pointer_fg, str, resp);
3850 break; 3809 break;
3851 case XTerm_Color_pointer_bg: 3810 case XTerm_Color_pointer_bg:
3852 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3811 process_color_seq (op, Color_pointer_bg, str, resp);
3853 break; 3812 break;
3854#ifndef NO_BOLD_UNDERLINE_REVERSE 3813#ifndef NO_BOLD_UNDERLINE_REVERSE
3855 case XTerm_Color_RV: 3814 case XTerm_Color_RV:
3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3815 process_color_seq (op, Color_RV, str, resp);
3857 break; 3816 break;
3858 case Rxvt_Color_BD: 3817 case Rxvt_Color_BD:
3859 case URxvt_Color_BD: 3818 case URxvt_Color_BD:
3860 process_color_seq (op, Color_BD, str, resp); 3819 process_color_seq (op, Color_BD, str, resp);
3861 break; 3820 break;
3862 case Rxvt_Color_UL: 3821 case Rxvt_Color_UL:
3863 case URxvt_Color_UL: 3822 case URxvt_Color_UL:
3864 process_color_seq (op, Color_UL, str, resp); 3823 process_color_seq (op, Color_UL, str, resp);
3865 break; 3824 break;
3866 case URxvt_Color_IT: 3825 case URxvt_Color_IT:
3867 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3826 process_color_seq (op, Color_IT, str, resp);
3868 break; 3827 break;
3869#endif 3828#endif
3870#if TRANSPARENT && TINTING 3829#if TRANSPARENT && TINTING
3871 case URxvt_Color_tint: 3830 case URxvt_Color_tint:
3872 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3831 process_color_seq (op, Color_tint, str, resp);
3832
3873 check_our_parents (); 3833 check_our_parents ();
3834
3874 if (am_transparent) 3835 if (am_transparent)
3875 want_full_refresh = want_refresh = 1; 3836 want_full_refresh = want_refresh = 1;
3837
3876 break; 3838 break;
3877#endif 3839#endif
3878 3840
3879 case Rxvt_Pixmap: 3841 case Rxvt_Pixmap:
3880 { 3842 {
… …
3951 allocated.push_back ((void *)res); 3913 allocated.push_back ((void *)res);
3952 set_fonts (); 3914 set_fonts ();
3953 } 3915 }
3954 break; 3916 break;
3955 3917
3956#if ENABLE_FRILLS 3918 case URxvt_version:
3919 if (query)
3920 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3921 op,
3922 rs[Rs_name], VERSION[0], VERSION[2],
3923 resp);
3924 break;
3925
3926#if !ENABLE_MINIMAL
3957 case URxvt_locale: 3927 case URxvt_locale:
3958 if (query) 3928 if (query)
3959 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3929 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3960 else 3930 else
3961 { 3931 {
3962 set_locale (str); 3932 set_locale (str);
3963 pty->set_utf8_mode (enc_utf8); 3933 pty->set_utf8_mode (enc_utf8);
3964 init_xlocale (); 3934 init_xlocale ();
… …
4325 scr_color (Color_bg, Color_bg); 4295 scr_color (Color_bg, Color_bg);
4326 break; 4296 break;
4327 4297
4328 //case 50: // not variable spacing 4298 //case 50: // not variable spacing
4329 4299
4330#if ENABLE_FRILLS 4300#if !ENABLE_MINIMAL
4331 case 90: 4301 case 90:
4332 case 91: /* set bright fg color */ 4302 case 91: /* set bright fg color */
4333 case 92: 4303 case 92:
4334 case 93: 4304 case 93:
4335 case 94: 4305 case 94:

Diff Legend

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