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.293 by root, Mon Jan 30 04:27:17 2006 UTC

… …
227# if !UNICODE3 227# if !UNICODE3
228 if (ch >= 0x10000) 228 if (ch >= 0x10000)
229 ch = 0xfffd; 229 ch = 0xfffd;
230# endif 230# endif
231 scr_overlay_set (11, y, ch, r); 231 scr_overlay_set (11, y, ch, r);
232
233 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 234 scr_overlay_set (12, y, NOCHAR, r);
233 } 235 }
234 236
237// {
238// char buf[4+4+3+1];
239// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
240// scr_overlay_set (0, 0, buf);
241// }
235 scr_overlay_set (0, len , attr); 242 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 243 scr_overlay_set (0, len + 1, fname);
237 244
238 free (fname); 245 free (fname);
239 246
… …
299rxvt_term::lookup_key (XKeyEvent &ev) 306rxvt_term::lookup_key (XKeyEvent &ev)
300{ 307{
301 int ctrl, meta, shft, len; 308 int ctrl, meta, shft, len;
302 unsigned int newlen; 309 unsigned int newlen;
303 KeySym keysym; 310 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 311 int valid_keysym;
308 char kbuf[KBUFSZ]; 312 char kbuf[KBUFSZ];
309 313
310 /* 314 /*
311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 315 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
… …
902 { 906 {
903 const char ch = C0_ESC; 907 const char ch = C0_ESC;
904 tt_write (&ch, 1); 908 tt_write (&ch, 1);
905 } 909 }
906 910
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); 911 tt_write (kbuf, (unsigned int)len);
918} 912}
919/*}}} */ 913/*}}} */
920 914
921#if defined (KEYSYM_RESOURCE) 915#if defined (KEYSYM_RESOURCE)
… …
1177} 1171}
1178 1172
1179void 1173void
1180rxvt_term::pointer_unblank () 1174rxvt_term::pointer_unblank ()
1181{ 1175{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1176 XDefineCursor (xdisp, vt, TermWin_cursor);
1183 recolour_cursor (); 1177 recolour_cursor ();
1184 1178
1185#ifdef POINTER_BLANK 1179#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1180 hidden_pointer = 0;
1187 1181
… …
1195rxvt_term::pointer_blank () 1189rxvt_term::pointer_blank ()
1196{ 1190{
1197 if (!OPTION (Opt_pointerBlank)) 1191 if (!OPTION (Opt_pointerBlank))
1198 return; 1192 return;
1199 1193
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1194 XDefineCursor (xdisp, vt, display->blank_cursor);
1201 XFlush (display->display); 1195 XFlush (xdisp);
1202 1196
1203 hidden_pointer = 1; 1197 hidden_pointer = 1;
1204} 1198}
1205 1199
1206void 1200void
… …
1279 (32 + button_number + key_state), 1273 (32 + button_number + key_state),
1280 (32 + x + 1), 1274 (32 + x + 1),
1281 (32 + y + 1)); 1275 (32 + y + 1));
1282} 1276}
1283 1277
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 */ 1278/*{{{ process an X event */
1295void 1279void
1296rxvt_term::x_cb (XEvent &ev) 1280rxvt_term::x_cb (XEvent &ev)
1297{ 1281{
1298 make_current (); 1282 make_current ();
1299 1283
1300 dDisp; 1284 dLocal (Display *, xdisp);
1301 1285
1302 if (ev.xany.window == vt 1286 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1287 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1288 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1289 return;
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1399 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1400 destroy ();
1417 } 1401 }
1418#if ENABLE_EWMH 1402#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1403 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1404 XSendEvent (xdisp, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1405 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1406 &ev);
1423#endif 1407#endif
1424 } 1408 }
1425 } 1409 }
… …
1473 break; 1457 break;
1474 1458
1475 case ConfigureNotify: 1459 case ConfigureNotify:
1476 if (ev.xconfigure.window == parent[0]) 1460 if (ev.xconfigure.window == parent[0])
1477 { 1461 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1463 ;
1480 1464
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1466 {
1483 seen_resize = 1; 1467 seen_resize = 1;
… …
1541 if (ev.xany.window == vt) 1525 if (ev.xany.window == vt)
1542 { 1526 {
1543 do 1527 do
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1547 1531
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1533
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1535 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1536 ev.xexpose.width, ev.xexpose.height, False);
1553 1537
1554 want_refresh = 1; 1538 want_refresh = 1;
1555 } 1539 }
1556 else 1540 else
1557 { 1541 {
1558 XEvent unused_event; 1542 XEvent unused_event;
1559 1543
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1561 ; 1545 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1547 ;
1564 1548
1565 if (isScrollbarWindow (ev.xany.window)) 1549 if (isScrollbarWindow (ev.xany.window))
1566 { 1550 {
1567 scrollBar.setIdle (); 1551 scrollBar.setIdle ();
1568 scrollbar_show (0); 1552 scrollbar_show (0);
1569 } 1553 }
1570 1554
1571#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0]) 1556 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window); 1557 XClearWindow (xdisp, ev.xany.window);
1574#endif 1558#endif
1575 } 1559 }
1576 break; 1560 break;
1577 1561
1578 case MotionNotify: 1562 case MotionNotify:
… …
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1574 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1576 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1594 ; 1578 ;
1595 1579
1596 XQueryPointer (disp, vt, 1580 XQueryPointer (xdisp, vt,
1597 &unused_root, &unused_child, 1581 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1582 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1583 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1584 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1585#ifdef MOUSE_THRESHOLD
… …
1665#endif 1649#endif
1666 } 1650 }
1667 } 1651 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1669 { 1653 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1671 MotionNotify, &ev)) 1655 MotionNotify, &ev))
1672 ; 1656 ;
1673 1657
1674 XQueryPointer (disp, scrollBar.win, 1658 XQueryPointer (xdisp, scrollBar.win,
1675 &unused_root, &unused_child, 1659 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1660 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1661 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1662 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
2142 selection_make (ev.time); 2126 selection_make (ev.time);
2143 break; 2127 break;
2144 2128
2145 case Button2: 2129 case Button2:
2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2130 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); 2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2148 break; 2132 break;
2149 2133
2150#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
2151 case Button4: 2135 case Button4:
2152 case Button5: 2136 case Button5:
… …
2194#if TINTING 2178#if TINTING
2195/* taken from aterm-0.4.2 */ 2179/* taken from aterm-0.4.2 */
2196 2180
2197typedef uint32_t RUINT32T; 2181typedef uint32_t RUINT32T;
2198 2182
2199void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2183void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2200{ 2184{
2201 int sh_r, sh_g, sh_b; 2185 int sh_r, sh_g, sh_b;
2202 RUINT32T mask_r, mask_g, mask_b; 2186 RUINT32T mask_r, mask_g, mask_b;
2203 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2187 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2204 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2188 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2205 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2189 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2206 int i; 2190 int i;
2207 2191
2208 Visual *visual = display->visual; 2192 Visual *visual = term->visual;
2209 2193
2210 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2194 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2211 2195
2212 /* for convenience */ 2196 /* for convenience */
2213 mask_r = visual->red_mask; 2197 mask_r = visual->red_mask;
… …
2434 Atom atype; 2418 Atom atype;
2435 unsigned char *prop = NULL; 2419 unsigned char *prop = NULL;
2436 Window root, oldp, *list; 2420 Window root, oldp, *list;
2437 Pixmap rootpixmap = None; 2421 Pixmap rootpixmap = None;
2438 XWindowAttributes wattr, wrootattr; 2422 XWindowAttributes wattr, wrootattr;
2439 dDisp;
2440 2423
2441 pchanged = 0; 2424 pchanged = 0;
2442 2425
2443 if (!OPTION (Opt_transparent)) 2426 if (!OPTION (Opt_transparent))
2444 return pchanged; /* Don't try any more */ 2427 return pchanged; /* Don't try any more */
2445 2428
2446 XGetWindowAttributes (disp, display->root, &wrootattr); 2429 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2447 rootdepth = wrootattr.depth; 2430 rootdepth = wrootattr.depth;
2448 2431
2449 XGetWindowAttributes (disp, parent[0], &wattr); 2432 XGetWindowAttributes (xdisp, parent[0], &wattr);
2450 2433
2451 if (rootdepth != wattr.depth) 2434 if (rootdepth != wattr.depth)
2452 { 2435 {
2453 if (am_transparent) 2436 if (am_transparent)
2454 { 2437 {
2455 pchanged = 1; 2438 pchanged = 1;
2456 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2457 am_transparent = am_pixmap_trans = 0; 2440 am_transparent = am_pixmap_trans = 0;
2458 } 2441 }
2459 2442
2460 return pchanged; /* Don't try any more */ 2443 return pchanged; /* Don't try any more */
2461 } 2444 }
2462 2445
2463 /* Get all X ops out of the queue so that our information is up-to-date. */ 2446 /* Get all X ops out of the queue so that our information is up-to-date. */
2464 XSync (disp, False); 2447 XSync (xdisp, False);
2465 2448
2466 /* 2449 /*
2467 * Make the frame window set by the window manager have 2450 * Make the frame window set by the window manager have
2468 * the root background. Some window managers put multiple nested frame 2451 * the root background. Some window managers put multiple nested frame
2469 * windows for each client, so we have to take care about that. 2452 * windows for each client, so we have to take care about that.
2470 */ 2453 */
2471 i = (xa[XA_XROOTPMAP_ID] 2454 i = (xa[XA_XROOTPMAP_ID]
2472 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2474 &nitems, &bytes_after, &prop) == Success); 2457 &nitems, &bytes_after, &prop) == Success);
2475 2458
2476 if (!i || prop == NULL) 2459 if (!i || prop == NULL)
2477 i = (xa[XA_ESETROOT_PMAP_ID] 2460 i = (xa[XA_ESETROOT_PMAP_ID]
2478 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2479 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2480 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2481 2464
2482 if (!i || prop == NULL 2465 if (!i || prop == NULL
2483#if TINTING 2466#if TINTING
… …
2502 Window cr; 2485 Window cr;
2503 XImage *image; 2486 XImage *image;
2504 GC gc; 2487 GC gc;
2505 XGCValues gcvalue; 2488 XGCValues gcvalue;
2506 2489
2507 XTranslateCoordinates (disp, parent[0], display->root, 2490 XTranslateCoordinates (xdisp, parent[0], display->root,
2508 0, 0, &sx, &sy, &cr); 2491 0, 0, &sx, &sy, &cr);
2509 nw = (unsigned int)szHint.width; 2492 nw = (unsigned int)szHint.width;
2510 nh = (unsigned int)szHint.height; 2493 nh = (unsigned int)szHint.height;
2511 nx = ny = 0; 2494 nx = ny = 0;
2512 2495
… …
2525 } 2508 }
2526 2509
2527 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2510 min_it (nw, (unsigned int) (wrootattr.width - sx));
2528 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2511 min_it (nh, (unsigned int) (wrootattr.height - sy));
2529 2512
2530 XSync (disp, False); 2513 XSync (xdisp, False);
2531 allowedxerror = -1; 2514 allowedxerror = -1;
2532 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2533 2516
2534 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2535 /* XXX: may need a delay here? */ 2518 /* XXX: may need a delay here? */
2536 allowedxerror = 0; 2519 allowedxerror = 0;
2537 2520
… …
2540 if (am_transparent && am_pixmap_trans) 2523 if (am_transparent && am_pixmap_trans)
2541 { 2524 {
2542 pchanged = 1; 2525 pchanged = 1;
2543 if (pixmap != None) 2526 if (pixmap != None)
2544 { 2527 {
2545 XFreePixmap (disp, pixmap); 2528 XFreePixmap (xdisp, pixmap);
2546 pixmap = None; 2529 pixmap = None;
2547 } 2530 }
2548 } 2531 }
2549 2532
2550 am_pixmap_trans = 0; 2533 am_pixmap_trans = 0;
2551 } 2534 }
2552 else 2535 else
2553 { 2536 {
2554 if (pixmap != None) 2537 if (pixmap != None)
2555 XFreePixmap (disp, pixmap); 2538 XFreePixmap (xdisp, pixmap);
2556 2539
2557#if TINTING 2540#if TINTING
2558 if (ISSET_PIXCOLOR (Color_tint)) 2541 if (ISSET_PIXCOLOR (Color_tint))
2559 { 2542 {
2560 unsigned short rm, gm, bm; 2543 rxvt_rgba c;
2561 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2544 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2562 2545
2563 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2546 pix_colors_focused[Color_tint].get (this, c);
2564 2547
2565 ShadeXImage (display, image, shade, rm, gm, bm); 2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2566 } 2549 }
2567#endif 2550#endif
2568 2551
2569 pixmap = XCreatePixmap (disp, vt, 2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2570 szHint.width, szHint.height, image->depth);
2571 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2572 XPutImage (disp, pixmap, gc, image, 0, 0, 2554 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2573 nx, ny, image->width, image->height); 2555 nx, ny, image->width, image->height);
2574 XFreeGC (disp, gc); 2556 XFreeGC (xdisp, gc);
2575 XDestroyImage (image); 2557 XDestroyImage (image);
2576 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2577 XClearWindow (disp, parent[0]); 2559 XClearWindow (xdisp, parent[0]);
2578 2560
2579 if (!am_transparent || !am_pixmap_trans) 2561 if (!am_transparent || !am_pixmap_trans)
2580 pchanged = 1; 2562 pchanged = 1;
2581 2563
2582 am_transparent = am_pixmap_trans = 1; 2564 am_transparent = am_pixmap_trans = 1;
2583 } 2565 }
2584 } 2566 }
2585 2567
2586 if (am_pixmap_trans) 2568 if (am_pixmap_trans)
2587 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2588 else 2570 else
2589 { 2571 {
2590 unsigned int n; 2572 unsigned int n;
2591 /* 2573 /*
2592 * InheritPixmap transparency 2574 * InheritPixmap transparency
2593 */ 2575 */
2594 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2595 { 2577 {
2596 oldp = parent[i]; 2578 oldp = parent[i];
2597 XQueryTree (disp, parent[i - 1], &root, 2579 XQueryTree (xdisp, parent[i - 1], &root,
2598 &parent[i], &list, &n); 2580 &parent[i], &list, &n);
2599 XFree (list); 2581 XFree (list);
2600 2582
2601 if (parent[i] == display->root) 2583 if (parent[i] == display->root)
2602 { 2584 {
… …
2614 2596
2615 if (pchanged) 2597 if (pchanged)
2616 { 2598 {
2617 for (; n < (unsigned int)i; n++) 2599 for (; n < (unsigned int)i; n++)
2618 { 2600 {
2619 XGetWindowAttributes (disp, parent[n], &wattr); 2601 XGetWindowAttributes (xdisp, parent[n], &wattr);
2620 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2602 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2621 { 2603 {
2622 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2604 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2623 break; 2605 break;
2624 } 2606 }
2625 } 2607 }
2626 } 2608 }
2627 2609
2628 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2610 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2629 { 2611 {
2630 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2612 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2631 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2613 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2632 am_transparent = 0; 2614 am_transparent = 0;
2633 /* XXX: also turn off Opt_transparent? */ 2615 /* XXX: also turn off Opt_transparent? */
2634 } 2616 }
2635 else 2617 else
2636 { 2618 {
2637 for (n = 0; n < (unsigned int)i; n++) 2619 for (n = 0; n < (unsigned int)i; n++)
2638 { 2620 {
2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2621 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2640 XClearWindow (disp, parent[n]); 2622 XClearWindow (xdisp, parent[n]);
2641 } 2623 }
2642 2624
2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2625 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2644 am_transparent = 1; 2626 am_transparent = 1;
2645 } 2627 }
2646 2628
2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2629 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648 parent[i] = None; 2630 parent[i] = None;
2649 } 2631 }
2650 2632
2651 if (scrollBar.win) 2633 if (scrollBar.win)
2652 { 2634 {
2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2635 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2654 scrollBar.setIdle (); 2636 scrollBar.setIdle ();
2655 scrollbar_show (0); 2637 scrollbar_show (0);
2656 } 2638 }
2657 2639
2658 if (am_transparent) 2640 if (am_transparent)
… …
3292 ndef = get_byte_array_bit (csi_defaults, i); 3274 ndef = get_byte_array_bit (csi_defaults, i);
3293 for (p = 0; p < nargs; p++) 3275 for (p = 0; p < nargs; p++)
3294 if (arg[p] == -1) 3276 if (arg[p] == -1)
3295 arg[p] = ndef; 3277 arg[p] = ndef;
3296 3278
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 /* 3279 /*
3305 * private mode handling 3280 * private mode handling
3306 */ 3281 */
3307 if (priv) 3282 if (priv)
3308 { 3283 {
3309 switch (priv) 3284 switch (priv)
3310 { 3285 {
3311 case '>': 3286 case '>':
3312 if (ch == CSI_DA) /* secondary device attributes */ 3287 if (ch == CSI_DA) /* secondary device attributes */
3313 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3288 {
3289 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3290 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3291 //
3292 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3293 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3294 // that we do not support xterm mouse reporting (should be 95 when we do).
3295 //
3296 tt_printf ("\033[>%d;94;0c", 'U');
3297 }
3314 break; 3298 break;
3315 case '?': 3299 case '?':
3316 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3300 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3317 process_terminal_mode (ch, priv, nargs, arg); 3301 process_terminal_mode (ch, priv, nargs, arg);
3318 break; 3302 break;
… …
3546rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3530rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3547{ 3531{
3548 int x, y; 3532 int x, y;
3549 XWindowAttributes wattr; 3533 XWindowAttributes wattr;
3550 Window wdummy; 3534 Window wdummy;
3551 dDisp; 3535
3536 dLocal (Display *, xdisp);
3552 3537
3553 if (nargs == 0) 3538 if (nargs == 0)
3554 return; 3539 return;
3555 3540
3556 switch (args[0]) 3541 switch (args[0])
3557 { 3542 {
3558 /* 3543 /*
3559 * commands 3544 * commands
3560 */ 3545 */
3561 case 1: /* deiconify window */ 3546 case 1: /* deiconify window */
3562 XMapWindow (disp, parent[0]); 3547 XMapWindow (xdisp, parent[0]);
3563 break; 3548 break;
3564 case 2: /* iconify window */ 3549 case 2: /* iconify window */
3565 XIconifyWindow (disp, parent[0], display->screen); 3550 XIconifyWindow (xdisp, parent[0], display->screen);
3566 break; 3551 break;
3567 case 3: /* set position (pixels) */ 3552 case 3: /* set position (pixels) */
3568 XMoveWindow (disp, parent[0], args[1], args[2]); 3553 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3569 break; 3554 break;
3570 case 4: /* set size (pixels) */ 3555 case 4: /* set size (pixels) */
3571 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3556 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3572 break; 3557 break;
3573 case 5: /* raise window */ 3558 case 5: /* raise window */
3574 XRaiseWindow (disp, parent[0]); 3559 XRaiseWindow (xdisp, parent[0]);
3575 break; 3560 break;
3576 case 6: /* lower window */ 3561 case 6: /* lower window */
3577 XLowerWindow (disp, parent[0]); 3562 XLowerWindow (xdisp, parent[0]);
3578 break; 3563 break;
3579 case 7: /* refresh window */ 3564 case 7: /* refresh window */
3580 scr_touch (true); 3565 scr_touch (true);
3581 break; 3566 break;
3582 case 8: /* set size (chars) */ 3567 case 8: /* set size (chars) */
… …
3594 3579
3595 /* 3580 /*
3596 * reports - some output format copied from XTerm 3581 * reports - some output format copied from XTerm
3597 */ 3582 */
3598 case 11: /* report window state */ 3583 case 11: /* report window state */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3584 XGetWindowAttributes (xdisp, parent[0], &wattr);
3600 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3585 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3601 break; 3586 break;
3602 case 13: /* report window position */ 3587 case 13: /* report window position */
3603 XGetWindowAttributes (disp, parent[0], &wattr); 3588 XGetWindowAttributes (xdisp, parent[0], &wattr);
3604 XTranslateCoordinates (disp, parent[0], wattr.root, 3589 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3605 -wattr.border_width, -wattr.border_width, 3590 -wattr.border_width, -wattr.border_width,
3606 &x, &y, &wdummy); 3591 &x, &y, &wdummy);
3607 tt_printf ("\033[3;%d;%dt", x, y); 3592 tt_printf ("\033[3;%d;%dt", x, y);
3608 break; 3593 break;
3609 case 14: /* report window size (pixels) */ 3594 case 14: /* report window size (pixels) */
3610 XGetWindowAttributes (disp, parent[0], &wattr); 3595 XGetWindowAttributes (xdisp, parent[0], &wattr);
3611 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3596 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3612 break; 3597 break;
3613 case 18: /* report text area size (chars) */ 3598 case 18: /* report text area size (chars) */
3614 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3599 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3615 break; 3600 break;
… …
3617 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3602 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3618 break; 3603 break;
3619 case 20: /* report icon label */ 3604 case 20: /* report icon label */
3620 { 3605 {
3621 char *s; 3606 char *s;
3622 XGetIconName (disp, parent[0], &s); 3607 XGetIconName (xdisp, parent[0], &s);
3623 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3608 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3624 XFree (s); 3609 XFree (s);
3625 } 3610 }
3626 break; 3611 break;
3627 case 21: /* report window title */ 3612 case 21: /* report window title */
3628 { 3613 {
3629 char *s; 3614 char *s;
3630 XFetchName (disp, parent[0], &s); 3615 XFetchName (xdisp, parent[0], &s);
3631 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3632 XFree (s); 3617 XFree (s);
3633 } 3618 }
3634 break; 3619 break;
3635 } 3620 }
… …
3736void 3721void
3737rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3722rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3738{ 3723{
3739 if (str[0] == '?' && !str[1]) 3724 if (str[0] == '?' && !str[1])
3740 { 3725 {
3741 unsigned short r, g, b; 3726 rxvt_rgba c;
3742 pix_colors_focused[color].get (display, r, g, b); 3727 pix_colors_focused[color].get (this, c);
3728
3729#if XFT
3730 if (c.a != rxvt_rgba::MAX_CC)
3731 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3732 else
3733#endif
3743 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3734 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3744 } 3735 }
3745 else 3736 else
3746 set_window_color (color, str); 3737 set_window_color (color, str);
3747} 3738}
3748 3739
… …
3754{ 3745{
3755 int color; 3746 int color;
3756 char *buf, *name; 3747 char *buf, *name;
3757 bool query = str[0] == '?' && !str[1]; 3748 bool query = str[0] == '?' && !str[1];
3758 int saveop = op; 3749 int saveop = op;
3759 dDisp; 3750
3751 dLocal (Display *, xdisp);
3760 3752
3761 assert (str != NULL); 3753 assert (str != NULL);
3762 switch (op) 3754 switch (op)
3763 { 3755 {
3764 case XTerm_name: 3756 case XTerm_name:
… …
3780 unsigned long bytes_after; 3772 unsigned long bytes_after;
3781 unsigned char *value = 0; 3773 unsigned char *value = 0;
3782 const char *str = ""; 3774 const char *str = "";
3783 3775
3784 if (prop 3776 if (prop
3785 && XGetWindowProperty (disp, parent[0], 3777 && XGetWindowProperty (xdisp, parent[0],
3786 prop, 0, 1<<16, 0, AnyPropertyType, 3778 prop, 0, 1<<16, 0, AnyPropertyType,
3787 &actual_type, &actual_format, 3779 &actual_type, &actual_format,
3788 &nitems, &bytes_after, &value) == Success 3780 &nitems, &bytes_after, &value) == Success
3789 && actual_type != None 3781 && actual_type != None
3790 && actual_format == 8) 3782 && actual_format == 8)
3791 str = (const char *)(value); 3783 str = (const char *)(value);
3792 3784
3793 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3785 tt_printf ("\033]%d;%s%c", op, str, resp);
3794 3786
3795 XFree (value); 3787 XFree (value);
3796 } 3788 }
3797 else 3789 else
3798 { 3790 {
… …
3802 { 3794 {
3803 *eq = 0; 3795 *eq = 0;
3804 set_utf8_property (display->atom (str), eq + 1); 3796 set_utf8_property (display->atom (str), eq + 1);
3805 } 3797 }
3806 else 3798 else
3807 XDeleteProperty (disp, parent[0], 3799 XDeleteProperty (xdisp, parent[0],
3808 display->atom (str)); 3800 display->atom (str));
3809 } 3801 }
3810 break; 3802 break;
3811 3803
3812 case XTerm_Color: 3804 case XTerm_Color:
… …
3822 break; 3814 break;
3823 3815
3824 if ((buf = strchr (name, ';')) != NULL) 3816 if ((buf = strchr (name, ';')) != NULL)
3825 *buf++ = '\0'; 3817 *buf++ = '\0';
3826 3818
3827 if (name[0] == '?' && !name[1]) 3819 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 } 3820 }
3836 break; 3821 break;
3837 case XTerm_Color00: 3822 case XTerm_Color00:
3838 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3823 process_color_seq (op, Color_fg, str, resp);
3839 break; 3824 break;
3840 case XTerm_Color01: 3825 case XTerm_Color01:
3841 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3826 process_color_seq (op, Color_bg, str, resp);
3842 break; 3827 break;
3843#ifndef NO_CURSORCOLOR 3828#ifndef NO_CURSORCOLOR
3844 case XTerm_Color_cursor: 3829 case XTerm_Color_cursor:
3845 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3830 process_color_seq (op, Color_cursor, str, resp);
3846 break; 3831 break;
3847#endif 3832#endif
3848 case XTerm_Color_pointer_fg: 3833 case XTerm_Color_pointer_fg:
3849 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3834 process_color_seq (op, Color_pointer_fg, str, resp);
3850 break; 3835 break;
3851 case XTerm_Color_pointer_bg: 3836 case XTerm_Color_pointer_bg:
3852 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3837 process_color_seq (op, Color_pointer_bg, str, resp);
3853 break; 3838 break;
3854#ifndef NO_BOLD_UNDERLINE_REVERSE 3839#ifndef NO_BOLD_UNDERLINE_REVERSE
3855 case XTerm_Color_RV: 3840 case XTerm_Color_RV:
3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3841 process_color_seq (op, Color_RV, str, resp);
3857 break; 3842 break;
3858 case Rxvt_Color_BD: 3843 case Rxvt_Color_BD:
3859 case URxvt_Color_BD: 3844 case URxvt_Color_BD:
3860 process_color_seq (op, Color_BD, str, resp); 3845 process_color_seq (op, Color_BD, str, resp);
3861 break; 3846 break;
3862 case Rxvt_Color_UL: 3847 case Rxvt_Color_UL:
3863 case URxvt_Color_UL: 3848 case URxvt_Color_UL:
3864 process_color_seq (op, Color_UL, str, resp); 3849 process_color_seq (op, Color_UL, str, resp);
3865 break; 3850 break;
3866 case URxvt_Color_IT: 3851 case URxvt_Color_IT:
3867 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3852 process_color_seq (op, Color_IT, str, resp);
3868 break; 3853 break;
3869#endif 3854#endif
3870#if TRANSPARENT && TINTING 3855#if TRANSPARENT && TINTING
3871 case URxvt_Color_tint: 3856 case URxvt_Color_tint:
3872 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3857 process_color_seq (op, Color_tint, str, resp);
3873 check_our_parents (); 3858 check_our_parents ();
3874 if (am_transparent) 3859 if (am_transparent)
3875 want_full_refresh = want_refresh = 1; 3860 want_full_refresh = want_refresh = 1;
3876 break; 3861 break;
3877#endif 3862#endif
… …
3951 allocated.push_back ((void *)res); 3936 allocated.push_back ((void *)res);
3952 set_fonts (); 3937 set_fonts ();
3953 } 3938 }
3954 break; 3939 break;
3955 3940
3941 case URxvt_version:
3942 if (query)
3943 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3944 op,
3945 rs[Rs_name], VERSION[0], VERSION[2],
3946 resp);
3947 break;
3948
3956#if ENABLE_FRILLS 3949#if ENABLE_FRILLS
3957 case URxvt_locale: 3950 case URxvt_locale:
3958 if (query) 3951 if (query)
3959 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3952 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3960 else 3953 else
3961 { 3954 {
3962 set_locale (str); 3955 set_locale (str);
3963 pty->set_utf8_mode (enc_utf8); 3956 pty->set_utf8_mode (enc_utf8);
3964 init_xlocale (); 3957 init_xlocale ();

Diff Legend

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