… | |
… | |
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 | |
… | |
… | |
1164 | } |
1171 | } |
1165 | |
1172 | |
1166 | void |
1173 | void |
1167 | rxvt_term::pointer_unblank () |
1174 | rxvt_term::pointer_unblank () |
1168 | { |
1175 | { |
1169 | XDefineCursor (display->display, vt, TermWin_cursor); |
1176 | XDefineCursor (xdisp, vt, TermWin_cursor); |
1170 | recolour_cursor (); |
1177 | recolour_cursor (); |
1171 | |
1178 | |
1172 | #ifdef POINTER_BLANK |
1179 | #ifdef POINTER_BLANK |
1173 | hidden_pointer = 0; |
1180 | hidden_pointer = 0; |
1174 | |
1181 | |
… | |
… | |
1182 | rxvt_term::pointer_blank () |
1189 | rxvt_term::pointer_blank () |
1183 | { |
1190 | { |
1184 | if (!OPTION (Opt_pointerBlank)) |
1191 | if (!OPTION (Opt_pointerBlank)) |
1185 | return; |
1192 | return; |
1186 | |
1193 | |
1187 | XDefineCursor (display->display, vt, display->blank_cursor); |
1194 | XDefineCursor (xdisp, vt, display->blank_cursor); |
1188 | XFlush (display->display); |
1195 | XFlush (xdisp); |
1189 | |
1196 | |
1190 | hidden_pointer = 1; |
1197 | hidden_pointer = 1; |
1191 | } |
1198 | } |
1192 | |
1199 | |
1193 | void |
1200 | void |
… | |
… | |
1272 | void |
1279 | void |
1273 | rxvt_term::x_cb (XEvent &ev) |
1280 | rxvt_term::x_cb (XEvent &ev) |
1274 | { |
1281 | { |
1275 | make_current (); |
1282 | make_current (); |
1276 | |
1283 | |
1277 | dDisp; |
1284 | dLocal (Display *, xdisp); |
1278 | |
1285 | |
1279 | if (ev.xany.window == vt |
1286 | if (ev.xany.window == vt |
1280 | && SHOULD_INVOKE (HOOK_X_EVENT) |
1287 | && SHOULD_INVOKE (HOOK_X_EVENT) |
1281 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
1288 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
1282 | return; |
1289 | return; |
… | |
… | |
1392 | 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))) |
1393 | destroy (); |
1400 | destroy (); |
1394 | } |
1401 | } |
1395 | #if ENABLE_EWMH |
1402 | #if ENABLE_EWMH |
1396 | 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]) |
1397 | XSendEvent (disp, ev.xclient.window = display->root, |
1404 | XSendEvent (xdisp, ev.xclient.window = display->root, |
1398 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
1405 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
1399 | &ev); |
1406 | &ev); |
1400 | #endif |
1407 | #endif |
1401 | } |
1408 | } |
1402 | } |
1409 | } |
… | |
… | |
1450 | break; |
1457 | break; |
1451 | |
1458 | |
1452 | case ConfigureNotify: |
1459 | case ConfigureNotify: |
1453 | if (ev.xconfigure.window == parent[0]) |
1460 | if (ev.xconfigure.window == parent[0]) |
1454 | { |
1461 | { |
1455 | while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) |
1462 | while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) |
1456 | ; |
1463 | ; |
1457 | |
1464 | |
1458 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1465 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1459 | { |
1466 | { |
1460 | seen_resize = 1; |
1467 | seen_resize = 1; |
… | |
… | |
1518 | if (ev.xany.window == vt) |
1525 | if (ev.xany.window == vt) |
1519 | { |
1526 | { |
1520 | do |
1527 | do |
1521 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1528 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1522 | ev.xexpose.width, ev.xexpose.height, False); |
1529 | ev.xexpose.width, ev.xexpose.height, False); |
1523 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); |
1530 | while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); |
1524 | |
1531 | |
1525 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1532 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1526 | |
1533 | |
1527 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1534 | while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) |
1528 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1535 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1529 | ev.xexpose.width, ev.xexpose.height, False); |
1536 | ev.xexpose.width, ev.xexpose.height, False); |
1530 | |
1537 | |
1531 | want_refresh = 1; |
1538 | want_refresh = 1; |
1532 | } |
1539 | } |
1533 | else |
1540 | else |
1534 | { |
1541 | { |
1535 | XEvent unused_event; |
1542 | XEvent unused_event; |
1536 | |
1543 | |
1537 | while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) |
1544 | while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) |
1538 | ; |
1545 | ; |
1539 | while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) |
1546 | while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) |
1540 | ; |
1547 | ; |
1541 | |
1548 | |
1542 | if (isScrollbarWindow (ev.xany.window)) |
1549 | if (isScrollbarWindow (ev.xany.window)) |
1543 | { |
1550 | { |
1544 | scrollBar.setIdle (); |
1551 | scrollBar.setIdle (); |
1545 | scrollbar_show (0); |
1552 | scrollbar_show (0); |
1546 | } |
1553 | } |
1547 | |
1554 | |
1548 | #ifdef TRANSPARENT |
1555 | #ifdef TRANSPARENT |
1549 | if (am_transparent && ev.xany.window == parent[0]) |
1556 | if (am_transparent && ev.xany.window == parent[0]) |
1550 | XClearWindow (disp, ev.xany.window); |
1557 | XClearWindow (xdisp, ev.xany.window); |
1551 | #endif |
1558 | #endif |
1552 | } |
1559 | } |
1553 | break; |
1560 | break; |
1554 | |
1561 | |
1555 | case MotionNotify: |
1562 | case MotionNotify: |
… | |
… | |
1565 | if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) |
1572 | if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) |
1566 | && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1573 | && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1567 | ; // nop |
1574 | ; // nop |
1568 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1575 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1569 | { |
1576 | { |
1570 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1577 | while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) |
1571 | ; |
1578 | ; |
1572 | |
1579 | |
1573 | XQueryPointer (disp, vt, |
1580 | XQueryPointer (xdisp, vt, |
1574 | &unused_root, &unused_child, |
1581 | &unused_root, &unused_child, |
1575 | &unused_root_x, &unused_root_y, |
1582 | &unused_root_x, &unused_root_y, |
1576 | &ev.xbutton.x, &ev.xbutton.y, |
1583 | &ev.xbutton.x, &ev.xbutton.y, |
1577 | &ev.xbutton.state); |
1584 | &ev.xbutton.state); |
1578 | #ifdef MOUSE_THRESHOLD |
1585 | #ifdef MOUSE_THRESHOLD |
… | |
… | |
1642 | #endif |
1649 | #endif |
1643 | } |
1650 | } |
1644 | } |
1651 | } |
1645 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1652 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1646 | { |
1653 | { |
1647 | while (XCheckTypedWindowEvent (disp, scrollBar.win, |
1654 | while (XCheckTypedWindowEvent (xdisp, scrollBar.win, |
1648 | MotionNotify, &ev)) |
1655 | MotionNotify, &ev)) |
1649 | ; |
1656 | ; |
1650 | |
1657 | |
1651 | XQueryPointer (disp, scrollBar.win, |
1658 | XQueryPointer (xdisp, scrollBar.win, |
1652 | &unused_root, &unused_child, |
1659 | &unused_root, &unused_child, |
1653 | &unused_root_x, &unused_root_y, |
1660 | &unused_root_x, &unused_root_y, |
1654 | &ev.xbutton.x, &ev.xbutton.y, |
1661 | &ev.xbutton.x, &ev.xbutton.y, |
1655 | &unused_mask); |
1662 | &unused_mask); |
1656 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1663 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
… | |
… | |
2171 | #if TINTING |
2178 | #if TINTING |
2172 | /* taken from aterm-0.4.2 */ |
2179 | /* taken from aterm-0.4.2 */ |
2173 | |
2180 | |
2174 | typedef uint32_t RUINT32T; |
2181 | typedef uint32_t RUINT32T; |
2175 | |
2182 | |
2176 | void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) |
2183 | void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) |
2177 | { |
2184 | { |
2178 | int sh_r, sh_g, sh_b; |
2185 | int sh_r, sh_g, sh_b; |
2179 | RUINT32T mask_r, mask_g, mask_b; |
2186 | RUINT32T mask_r, mask_g, mask_b; |
2180 | RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; |
2187 | RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; |
2181 | unsigned int lower_lim_r, lower_lim_g, lower_lim_b; |
2188 | unsigned int lower_lim_r, lower_lim_g, lower_lim_b; |
2182 | unsigned int upper_lim_r, upper_lim_g, upper_lim_b; |
2189 | unsigned int upper_lim_r, upper_lim_g, upper_lim_b; |
2183 | int i; |
2190 | int i; |
2184 | |
2191 | |
2185 | Visual *visual = display->visual; |
2192 | Visual *visual = term->visual; |
2186 | |
2193 | |
2187 | if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; |
2194 | if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; |
2188 | |
2195 | |
2189 | /* for convenience */ |
2196 | /* for convenience */ |
2190 | mask_r = visual->red_mask; |
2197 | mask_r = visual->red_mask; |
… | |
… | |
2411 | Atom atype; |
2418 | Atom atype; |
2412 | unsigned char *prop = NULL; |
2419 | unsigned char *prop = NULL; |
2413 | Window root, oldp, *list; |
2420 | Window root, oldp, *list; |
2414 | Pixmap rootpixmap = None; |
2421 | Pixmap rootpixmap = None; |
2415 | XWindowAttributes wattr, wrootattr; |
2422 | XWindowAttributes wattr, wrootattr; |
2416 | dDisp; |
|
|
2417 | |
2423 | |
2418 | pchanged = 0; |
2424 | pchanged = 0; |
2419 | |
2425 | |
2420 | if (!OPTION (Opt_transparent)) |
2426 | if (!OPTION (Opt_transparent)) |
2421 | return pchanged; /* Don't try any more */ |
2427 | return pchanged; /* Don't try any more */ |
2422 | |
2428 | |
2423 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2429 | XGetWindowAttributes (xdisp, display->root, &wrootattr); |
2424 | rootdepth = wrootattr.depth; |
2430 | rootdepth = wrootattr.depth; |
2425 | |
2431 | |
2426 | XGetWindowAttributes (disp, parent[0], &wattr); |
2432 | XGetWindowAttributes (xdisp, parent[0], &wattr); |
2427 | |
2433 | |
2428 | if (rootdepth != wattr.depth) |
2434 | if (rootdepth != wattr.depth) |
2429 | { |
2435 | { |
2430 | if (am_transparent) |
2436 | if (am_transparent) |
2431 | { |
2437 | { |
2432 | pchanged = 1; |
2438 | pchanged = 1; |
2433 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2439 | XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); |
2434 | am_transparent = am_pixmap_trans = 0; |
2440 | am_transparent = am_pixmap_trans = 0; |
2435 | } |
2441 | } |
2436 | |
2442 | |
2437 | return pchanged; /* Don't try any more */ |
2443 | return pchanged; /* Don't try any more */ |
2438 | } |
2444 | } |
2439 | |
2445 | |
2440 | /* 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. */ |
2441 | XSync (disp, False); |
2447 | XSync (xdisp, False); |
2442 | |
2448 | |
2443 | /* |
2449 | /* |
2444 | * Make the frame window set by the window manager have |
2450 | * Make the frame window set by the window manager have |
2445 | * the root background. Some window managers put multiple nested frame |
2451 | * the root background. Some window managers put multiple nested frame |
2446 | * 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. |
2447 | */ |
2453 | */ |
2448 | i = (xa[XA_XROOTPMAP_ID] |
2454 | i = (xa[XA_XROOTPMAP_ID] |
2449 | && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], |
2455 | && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], |
2450 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2456 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2451 | &nitems, &bytes_after, &prop) == Success); |
2457 | &nitems, &bytes_after, &prop) == Success); |
2452 | |
2458 | |
2453 | if (!i || prop == NULL) |
2459 | if (!i || prop == NULL) |
2454 | i = (xa[XA_ESETROOT_PMAP_ID] |
2460 | i = (xa[XA_ESETROOT_PMAP_ID] |
2455 | && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], |
2461 | && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], |
2456 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2462 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2457 | &nitems, &bytes_after, &prop) == Success); |
2463 | &nitems, &bytes_after, &prop) == Success); |
2458 | |
2464 | |
2459 | if (!i || prop == NULL |
2465 | if (!i || prop == NULL |
2460 | #if TINTING |
2466 | #if TINTING |
… | |
… | |
2479 | Window cr; |
2485 | Window cr; |
2480 | XImage *image; |
2486 | XImage *image; |
2481 | GC gc; |
2487 | GC gc; |
2482 | XGCValues gcvalue; |
2488 | XGCValues gcvalue; |
2483 | |
2489 | |
2484 | XTranslateCoordinates (disp, parent[0], display->root, |
2490 | XTranslateCoordinates (xdisp, parent[0], display->root, |
2485 | 0, 0, &sx, &sy, &cr); |
2491 | 0, 0, &sx, &sy, &cr); |
2486 | nw = (unsigned int)szHint.width; |
2492 | nw = (unsigned int)szHint.width; |
2487 | nh = (unsigned int)szHint.height; |
2493 | nh = (unsigned int)szHint.height; |
2488 | nx = ny = 0; |
2494 | nx = ny = 0; |
2489 | |
2495 | |
… | |
… | |
2502 | } |
2508 | } |
2503 | |
2509 | |
2504 | min_it (nw, (unsigned int) (wrootattr.width - sx)); |
2510 | min_it (nw, (unsigned int) (wrootattr.width - sx)); |
2505 | min_it (nh, (unsigned int) (wrootattr.height - sy)); |
2511 | min_it (nh, (unsigned int) (wrootattr.height - sy)); |
2506 | |
2512 | |
2507 | XSync (disp, False); |
2513 | XSync (xdisp, False); |
2508 | allowedxerror = -1; |
2514 | allowedxerror = -1; |
2509 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2515 | image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2510 | |
2516 | |
2511 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2517 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2512 | /* XXX: may need a delay here? */ |
2518 | /* XXX: may need a delay here? */ |
2513 | allowedxerror = 0; |
2519 | allowedxerror = 0; |
2514 | |
2520 | |
… | |
… | |
2517 | if (am_transparent && am_pixmap_trans) |
2523 | if (am_transparent && am_pixmap_trans) |
2518 | { |
2524 | { |
2519 | pchanged = 1; |
2525 | pchanged = 1; |
2520 | if (pixmap != None) |
2526 | if (pixmap != None) |
2521 | { |
2527 | { |
2522 | XFreePixmap (disp, pixmap); |
2528 | XFreePixmap (xdisp, pixmap); |
2523 | pixmap = None; |
2529 | pixmap = None; |
2524 | } |
2530 | } |
2525 | } |
2531 | } |
2526 | |
2532 | |
2527 | am_pixmap_trans = 0; |
2533 | am_pixmap_trans = 0; |
2528 | } |
2534 | } |
2529 | else |
2535 | else |
2530 | { |
2536 | { |
2531 | if (pixmap != None) |
2537 | if (pixmap != None) |
2532 | XFreePixmap (disp, pixmap); |
2538 | XFreePixmap (xdisp, pixmap); |
2533 | |
2539 | |
2534 | #if TINTING |
2540 | #if TINTING |
2535 | if (ISSET_PIXCOLOR (Color_tint)) |
2541 | if (ISSET_PIXCOLOR (Color_tint)) |
2536 | { |
2542 | { |
2537 | unsigned short rm, gm, bm; |
|
|
2538 | int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; |
2543 | int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; |
2539 | |
2544 | |
|
|
2545 | rxvt_rgba c; |
2540 | pix_colors_focused[Color_tint].get (display, rm, gm, bm); |
2546 | pix_colors_focused [Color_tint].get (this, c); |
2541 | |
2547 | |
2542 | ShadeXImage (display, image, shade, rm, gm, bm); |
2548 | ShadeXImage (this, image, shade, c.r, c.g, c.b); |
2543 | } |
2549 | } |
2544 | #endif |
2550 | #endif |
2545 | |
2551 | |
2546 | pixmap = XCreatePixmap (disp, vt, |
2552 | pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); |
2547 | szHint.width, szHint.height, image->depth); |
|
|
2548 | gc = XCreateGC (disp, vt, 0UL, &gcvalue); |
2553 | gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); |
2549 | XPutImage (disp, pixmap, gc, image, 0, 0, |
2554 | XPutImage (xdisp, pixmap, gc, image, 0, 0, |
2550 | nx, ny, image->width, image->height); |
2555 | nx, ny, image->width, image->height); |
2551 | XFreeGC (disp, gc); |
2556 | XFreeGC (xdisp, gc); |
2552 | XDestroyImage (image); |
2557 | XDestroyImage (image); |
2553 | XSetWindowBackgroundPixmap (disp, parent[0], pixmap); |
2558 | XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); |
2554 | XClearWindow (disp, parent[0]); |
2559 | XClearWindow (xdisp, parent[0]); |
2555 | |
2560 | |
2556 | if (!am_transparent || !am_pixmap_trans) |
2561 | if (!am_transparent || !am_pixmap_trans) |
2557 | pchanged = 1; |
2562 | pchanged = 1; |
2558 | |
2563 | |
2559 | am_transparent = am_pixmap_trans = 1; |
2564 | am_transparent = am_pixmap_trans = 1; |
2560 | } |
2565 | } |
2561 | } |
2566 | } |
2562 | |
2567 | |
2563 | if (am_pixmap_trans) |
2568 | if (am_pixmap_trans) |
2564 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2569 | XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); |
2565 | else |
2570 | else |
2566 | { |
2571 | { |
2567 | unsigned int n; |
2572 | unsigned int n; |
2568 | /* |
2573 | /* |
2569 | * InheritPixmap transparency |
2574 | * InheritPixmap transparency |
2570 | */ |
2575 | */ |
2571 | for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2576 | for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2572 | { |
2577 | { |
2573 | oldp = parent[i]; |
2578 | oldp = parent[i]; |
2574 | XQueryTree (disp, parent[i - 1], &root, |
2579 | XQueryTree (xdisp, parent[i - 1], &root, |
2575 | &parent[i], &list, &n); |
2580 | &parent[i], &list, &n); |
2576 | XFree (list); |
2581 | XFree (list); |
2577 | |
2582 | |
2578 | if (parent[i] == display->root) |
2583 | if (parent[i] == display->root) |
2579 | { |
2584 | { |
… | |
… | |
2591 | |
2596 | |
2592 | if (pchanged) |
2597 | if (pchanged) |
2593 | { |
2598 | { |
2594 | for (; n < (unsigned int)i; n++) |
2599 | for (; n < (unsigned int)i; n++) |
2595 | { |
2600 | { |
2596 | XGetWindowAttributes (disp, parent[n], &wattr); |
2601 | XGetWindowAttributes (xdisp, parent[n], &wattr); |
2597 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2602 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2598 | { |
2603 | { |
2599 | n = (int) (sizeof (parent) / sizeof (Window)) + 1; |
2604 | n = (int) (sizeof (parent) / sizeof (Window)) + 1; |
2600 | break; |
2605 | break; |
2601 | } |
2606 | } |
2602 | } |
2607 | } |
2603 | } |
2608 | } |
2604 | |
2609 | |
2605 | if (n > (int) (sizeof (parent) / sizeof (parent[0]))) |
2610 | if (n > (int) (sizeof (parent) / sizeof (parent[0]))) |
2606 | { |
2611 | { |
2607 | XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); |
2612 | XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); |
2608 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2613 | XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); |
2609 | am_transparent = 0; |
2614 | am_transparent = 0; |
2610 | /* XXX: also turn off Opt_transparent? */ |
2615 | /* XXX: also turn off Opt_transparent? */ |
2611 | } |
2616 | } |
2612 | else |
2617 | else |
2613 | { |
2618 | { |
2614 | for (n = 0; n < (unsigned int)i; n++) |
2619 | for (n = 0; n < (unsigned int)i; n++) |
2615 | { |
2620 | { |
2616 | XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); |
2621 | XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); |
2617 | XClearWindow (disp, parent[n]); |
2622 | XClearWindow (xdisp, parent[n]); |
2618 | } |
2623 | } |
2619 | |
2624 | |
2620 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2625 | XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); |
2621 | am_transparent = 1; |
2626 | am_transparent = 1; |
2622 | } |
2627 | } |
2623 | |
2628 | |
2624 | for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2629 | for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2625 | parent[i] = None; |
2630 | parent[i] = None; |
2626 | } |
2631 | } |
2627 | |
2632 | |
2628 | if (scrollBar.win) |
2633 | if (scrollBar.win) |
2629 | { |
2634 | { |
2630 | XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); |
2635 | XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); |
2631 | scrollBar.setIdle (); |
2636 | scrollBar.setIdle (); |
2632 | scrollbar_show (0); |
2637 | scrollbar_show (0); |
2633 | } |
2638 | } |
2634 | |
2639 | |
2635 | if (am_transparent) |
2640 | if (am_transparent) |
… | |
… | |
3086 | scr_charset_set (2, (unsigned int)cmd_getc ()); |
3091 | scr_charset_set (2, (unsigned int)cmd_getc ()); |
3087 | break; |
3092 | break; |
3088 | case '+': |
3093 | case '+': |
3089 | scr_charset_set (3, (unsigned int)cmd_getc ()); |
3094 | scr_charset_set (3, (unsigned int)cmd_getc ()); |
3090 | break; |
3095 | break; |
3091 | #if ENABLE_FRILLS |
3096 | #if !ENABLE_MINIMAL |
3092 | case '6': |
3097 | case '6': |
3093 | scr_backindex (); |
3098 | scr_backindex (); |
3094 | break; |
3099 | break; |
3095 | #endif |
3100 | #endif |
3096 | case '7': |
3101 | case '7': |
3097 | scr_cursor (SAVE); |
3102 | scr_cursor (SAVE); |
3098 | break; |
3103 | break; |
3099 | case '8': |
3104 | case '8': |
3100 | scr_cursor (RESTORE); |
3105 | scr_cursor (RESTORE); |
3101 | break; |
3106 | break; |
3102 | #if ENABLE_FRILLS |
3107 | #if !ENABLE_MINIMAL |
3103 | case '9': |
3108 | case '9': |
3104 | scr_forwardindex (); |
3109 | scr_forwardindex (); |
3105 | break; |
3110 | break; |
3106 | #endif |
3111 | #endif |
3107 | case '=': |
3112 | case '=': |
… | |
… | |
3280 | { |
3285 | { |
3281 | case '>': |
3286 | case '>': |
3282 | if (ch == CSI_DA) /* secondary device attributes */ |
3287 | if (ch == CSI_DA) /* secondary device attributes */ |
3283 | { |
3288 | { |
3284 | // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, |
3289 | // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, |
3285 | // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. |
3290 | // 'U' for rxvt-unicode != 7.[34] (where it was broken). |
3286 | // |
3291 | // |
3287 | // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt |
3292 | // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt |
3288 | // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify |
3293 | // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify |
3289 | // that we do not support xterm mouse reporting (should be 95 when we do). |
3294 | // that we do not support xterm mouse reporting (should be 95 when we do). |
3290 | // |
3295 | // |
3291 | tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); |
3296 | tt_printf ("\033[>%d;94;0c", 'U'); |
3292 | } |
3297 | } |
3293 | break; |
3298 | break; |
3294 | case '?': |
3299 | case '?': |
3295 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3300 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3296 | process_terminal_mode (ch, priv, nargs, arg); |
3301 | process_terminal_mode (ch, priv, nargs, arg); |
… | |
… | |
3500 | break; |
3505 | break; |
3501 | case CSI_75: |
3506 | case CSI_75: |
3502 | scr_cursor (RESTORE); |
3507 | scr_cursor (RESTORE); |
3503 | break; |
3508 | break; |
3504 | |
3509 | |
3505 | #if ENABLE_FRILLS |
3510 | #if !ENABLE_MINIMAL |
3506 | case CSI_74: |
3511 | case CSI_74: |
3507 | process_window_ops (arg, nargs); |
3512 | process_window_ops (arg, nargs); |
3508 | break; |
3513 | break; |
3509 | #endif |
3514 | #endif |
3510 | |
3515 | |
… | |
… | |
3517 | break; |
3522 | break; |
3518 | } |
3523 | } |
3519 | } |
3524 | } |
3520 | /*}}} */ |
3525 | /*}}} */ |
3521 | |
3526 | |
3522 | #if ENABLE_FRILLS |
3527 | #if !ENABLE_MINIMAL |
3523 | /* ARGSUSED */ |
3528 | /* ARGSUSED */ |
3524 | void |
3529 | void |
3525 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3530 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3526 | { |
3531 | { |
3527 | int x, y; |
3532 | int x, y; |
3528 | XWindowAttributes wattr; |
3533 | XWindowAttributes wattr; |
3529 | Window wdummy; |
3534 | Window wdummy; |
3530 | dDisp; |
3535 | |
|
|
3536 | dLocal (Display *, xdisp); |
3531 | |
3537 | |
3532 | if (nargs == 0) |
3538 | if (nargs == 0) |
3533 | return; |
3539 | return; |
3534 | |
3540 | |
3535 | switch (args[0]) |
3541 | switch (args[0]) |
3536 | { |
3542 | { |
3537 | /* |
3543 | /* |
3538 | * commands |
3544 | * commands |
3539 | */ |
3545 | */ |
3540 | case 1: /* deiconify window */ |
3546 | case 1: /* deiconify window */ |
3541 | XMapWindow (disp, parent[0]); |
3547 | XMapWindow (xdisp, parent[0]); |
3542 | break; |
3548 | break; |
3543 | case 2: /* iconify window */ |
3549 | case 2: /* iconify window */ |
3544 | XIconifyWindow (disp, parent[0], display->screen); |
3550 | XIconifyWindow (xdisp, parent[0], display->screen); |
3545 | break; |
3551 | break; |
3546 | case 3: /* set position (pixels) */ |
3552 | case 3: /* set position (pixels) */ |
3547 | XMoveWindow (disp, parent[0], args[1], args[2]); |
3553 | XMoveWindow (xdisp, parent[0], args[1], args[2]); |
3548 | break; |
3554 | break; |
3549 | case 4: /* set size (pixels) */ |
3555 | case 4: /* set size (pixels) */ |
3550 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3556 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3551 | break; |
3557 | break; |
3552 | case 5: /* raise window */ |
3558 | case 5: /* raise window */ |
3553 | XRaiseWindow (disp, parent[0]); |
3559 | XRaiseWindow (xdisp, parent[0]); |
3554 | break; |
3560 | break; |
3555 | case 6: /* lower window */ |
3561 | case 6: /* lower window */ |
3556 | XLowerWindow (disp, parent[0]); |
3562 | XLowerWindow (xdisp, parent[0]); |
3557 | break; |
3563 | break; |
3558 | case 7: /* refresh window */ |
3564 | case 7: /* refresh window */ |
3559 | scr_touch (true); |
3565 | scr_touch (true); |
3560 | break; |
3566 | break; |
3561 | case 8: /* set size (chars) */ |
3567 | case 8: /* set size (chars) */ |
… | |
… | |
3573 | |
3579 | |
3574 | /* |
3580 | /* |
3575 | * reports - some output format copied from XTerm |
3581 | * reports - some output format copied from XTerm |
3576 | */ |
3582 | */ |
3577 | case 11: /* report window state */ |
3583 | case 11: /* report window state */ |
3578 | XGetWindowAttributes (disp, parent[0], &wattr); |
3584 | XGetWindowAttributes (xdisp, parent[0], &wattr); |
3579 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3585 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3580 | break; |
3586 | break; |
3581 | case 13: /* report window position */ |
3587 | case 13: /* report window position */ |
3582 | XGetWindowAttributes (disp, parent[0], &wattr); |
3588 | XGetWindowAttributes (xdisp, parent[0], &wattr); |
3583 | XTranslateCoordinates (disp, parent[0], wattr.root, |
3589 | XTranslateCoordinates (xdisp, parent[0], wattr.root, |
3584 | -wattr.border_width, -wattr.border_width, |
3590 | -wattr.border_width, -wattr.border_width, |
3585 | &x, &y, &wdummy); |
3591 | &x, &y, &wdummy); |
3586 | tt_printf ("\033[3;%d;%dt", x, y); |
3592 | tt_printf ("\033[3;%d;%dt", x, y); |
3587 | break; |
3593 | break; |
3588 | case 14: /* report window size (pixels) */ |
3594 | case 14: /* report window size (pixels) */ |
3589 | XGetWindowAttributes (disp, parent[0], &wattr); |
3595 | XGetWindowAttributes (xdisp, parent[0], &wattr); |
3590 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3596 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3591 | break; |
3597 | break; |
3592 | case 18: /* report text area size (chars) */ |
3598 | case 18: /* report text area size (chars) */ |
3593 | tt_printf ("\033[8;%d;%dt", nrow, ncol); |
3599 | tt_printf ("\033[8;%d;%dt", nrow, ncol); |
3594 | break; |
3600 | break; |
… | |
… | |
3596 | tt_printf ("\033[9;%d;%dt", nrow, ncol); |
3602 | tt_printf ("\033[9;%d;%dt", nrow, ncol); |
3597 | break; |
3603 | break; |
3598 | case 20: /* report icon label */ |
3604 | case 20: /* report icon label */ |
3599 | { |
3605 | { |
3600 | char *s; |
3606 | char *s; |
3601 | XGetIconName (disp, parent[0], &s); |
3607 | XGetIconName (xdisp, parent[0], &s); |
3602 | 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 */ |
3603 | XFree (s); |
3609 | XFree (s); |
3604 | } |
3610 | } |
3605 | break; |
3611 | break; |
3606 | case 21: /* report window title */ |
3612 | case 21: /* report window title */ |
3607 | { |
3613 | { |
3608 | char *s; |
3614 | char *s; |
3609 | XFetchName (disp, parent[0], &s); |
3615 | XFetchName (xdisp, parent[0], &s); |
3610 | 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 */ |
3611 | XFree (s); |
3617 | XFree (s); |
3612 | } |
3618 | } |
3613 | break; |
3619 | break; |
3614 | } |
3620 | } |
… | |
… | |
3715 | void |
3721 | void |
3716 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3722 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3717 | { |
3723 | { |
3718 | if (str[0] == '?' && !str[1]) |
3724 | if (str[0] == '?' && !str[1]) |
3719 | { |
3725 | { |
3720 | unsigned short r, g, b; |
3726 | rxvt_rgba c; |
3721 | 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 |
3722 | 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); |
3723 | } |
3735 | } |
3724 | else |
3736 | else |
3725 | set_window_color (color, str); |
3737 | set_window_color (color, str); |
3726 | } |
3738 | } |
3727 | |
3739 | |
… | |
… | |
3733 | { |
3745 | { |
3734 | int color; |
3746 | int color; |
3735 | char *buf, *name; |
3747 | char *buf, *name; |
3736 | bool query = str[0] == '?' && !str[1]; |
3748 | bool query = str[0] == '?' && !str[1]; |
3737 | int saveop = op; |
3749 | int saveop = op; |
3738 | dDisp; |
3750 | |
|
|
3751 | dLocal (Display *, xdisp); |
3739 | |
3752 | |
3740 | assert (str != NULL); |
3753 | assert (str != NULL); |
3741 | switch (op) |
3754 | switch (op) |
3742 | { |
3755 | { |
3743 | case XTerm_name: |
3756 | case XTerm_name: |
… | |
… | |
3759 | unsigned long bytes_after; |
3772 | unsigned long bytes_after; |
3760 | unsigned char *value = 0; |
3773 | unsigned char *value = 0; |
3761 | const char *str = ""; |
3774 | const char *str = ""; |
3762 | |
3775 | |
3763 | if (prop |
3776 | if (prop |
3764 | && XGetWindowProperty (disp, parent[0], |
3777 | && XGetWindowProperty (xdisp, parent[0], |
3765 | prop, 0, 1<<16, 0, AnyPropertyType, |
3778 | prop, 0, 1<<16, 0, AnyPropertyType, |
3766 | &actual_type, &actual_format, |
3779 | &actual_type, &actual_format, |
3767 | &nitems, &bytes_after, &value) == Success |
3780 | &nitems, &bytes_after, &value) == Success |
3768 | && actual_type != None |
3781 | && actual_type != None |
3769 | && actual_format == 8) |
3782 | && actual_format == 8) |
3770 | str = (const char *)(value); |
3783 | str = (const char *)(value); |
3771 | |
3784 | |
3772 | tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); |
3785 | tt_printf ("\033]%d;%s%c", op, str, resp); |
3773 | |
3786 | |
3774 | XFree (value); |
3787 | XFree (value); |
3775 | } |
3788 | } |
3776 | else |
3789 | else |
3777 | { |
3790 | { |
… | |
… | |
3781 | { |
3794 | { |
3782 | *eq = 0; |
3795 | *eq = 0; |
3783 | set_utf8_property (display->atom (str), eq + 1); |
3796 | set_utf8_property (display->atom (str), eq + 1); |
3784 | } |
3797 | } |
3785 | else |
3798 | else |
3786 | XDeleteProperty (disp, parent[0], |
3799 | XDeleteProperty (xdisp, parent[0], |
3787 | display->atom (str)); |
3800 | display->atom (str)); |
3788 | } |
3801 | } |
3789 | break; |
3802 | break; |
3790 | |
3803 | |
3791 | case XTerm_Color: |
3804 | case XTerm_Color: |
… | |
… | |
3801 | break; |
3814 | break; |
3802 | |
3815 | |
3803 | if ((buf = strchr (name, ';')) != NULL) |
3816 | if ((buf = strchr (name, ';')) != NULL) |
3804 | *buf++ = '\0'; |
3817 | *buf++ = '\0'; |
3805 | |
3818 | |
3806 | if (name[0] == '?' && !name[1]) |
3819 | process_color_seq (op, color, name, resp); |
3807 | { |
|
|
3808 | unsigned short r, g, b; |
|
|
3809 | pix_colors_focused[color].get (display, r, g, b); |
|
|
3810 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
|
|
3811 | } |
|
|
3812 | else |
|
|
3813 | set_window_color (color, name); |
|
|
3814 | } |
3820 | } |
3815 | break; |
3821 | break; |
3816 | case XTerm_Color00: |
3822 | case XTerm_Color00: |
3817 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3823 | process_color_seq (op, Color_fg, str, resp); |
3818 | break; |
3824 | break; |
3819 | case XTerm_Color01: |
3825 | case XTerm_Color01: |
3820 | process_color_seq (XTerm_Color01, Color_bg, str, resp); |
3826 | process_color_seq (op, Color_bg, str, resp); |
3821 | break; |
3827 | break; |
3822 | #ifndef NO_CURSORCOLOR |
3828 | #ifndef NO_CURSORCOLOR |
3823 | case XTerm_Color_cursor: |
3829 | case XTerm_Color_cursor: |
3824 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3830 | process_color_seq (op, Color_cursor, str, resp); |
3825 | break; |
3831 | break; |
3826 | #endif |
3832 | #endif |
3827 | case XTerm_Color_pointer_fg: |
3833 | case XTerm_Color_pointer_fg: |
3828 | process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); |
3834 | process_color_seq (op, Color_pointer_fg, str, resp); |
3829 | break; |
3835 | break; |
3830 | case XTerm_Color_pointer_bg: |
3836 | case XTerm_Color_pointer_bg: |
3831 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3837 | process_color_seq (op, Color_pointer_bg, str, resp); |
3832 | break; |
3838 | break; |
3833 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3839 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3834 | case XTerm_Color_RV: |
3840 | case XTerm_Color_RV: |
3835 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3841 | process_color_seq (op, Color_RV, str, resp); |
3836 | break; |
3842 | break; |
3837 | case Rxvt_Color_BD: |
3843 | case Rxvt_Color_BD: |
3838 | case URxvt_Color_BD: |
3844 | case URxvt_Color_BD: |
3839 | process_color_seq (op, Color_BD, str, resp); |
3845 | process_color_seq (op, Color_BD, str, resp); |
3840 | break; |
3846 | break; |
3841 | case Rxvt_Color_UL: |
3847 | case Rxvt_Color_UL: |
3842 | case URxvt_Color_UL: |
3848 | case URxvt_Color_UL: |
3843 | process_color_seq (op, Color_UL, str, resp); |
3849 | process_color_seq (op, Color_UL, str, resp); |
3844 | break; |
3850 | break; |
3845 | case URxvt_Color_IT: |
3851 | case URxvt_Color_IT: |
3846 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3852 | process_color_seq (op, Color_IT, str, resp); |
3847 | break; |
3853 | break; |
3848 | #endif |
3854 | #endif |
3849 | #if TRANSPARENT && TINTING |
3855 | #if TRANSPARENT && TINTING |
3850 | case URxvt_Color_tint: |
3856 | case URxvt_Color_tint: |
3851 | process_color_seq (URxvt_Color_tint, Color_tint, str, resp); |
3857 | process_color_seq (op, Color_tint, str, resp); |
3852 | check_our_parents (); |
3858 | check_our_parents (); |
3853 | if (am_transparent) |
3859 | if (am_transparent) |
3854 | want_full_refresh = want_refresh = 1; |
3860 | want_full_refresh = want_refresh = 1; |
3855 | break; |
3861 | break; |
3856 | #endif |
3862 | #endif |
… | |
… | |
3930 | allocated.push_back ((void *)res); |
3936 | allocated.push_back ((void *)res); |
3931 | set_fonts (); |
3937 | set_fonts (); |
3932 | } |
3938 | } |
3933 | break; |
3939 | break; |
3934 | |
3940 | |
3935 | #if ENABLE_FRILLS |
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 | |
|
|
3949 | #if !ENABLE_MINIMAL |
3936 | case URxvt_locale: |
3950 | case URxvt_locale: |
3937 | if (query) |
3951 | if (query) |
3938 | 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); |
3939 | else |
3953 | else |
3940 | { |
3954 | { |
3941 | set_locale (str); |
3955 | set_locale (str); |
3942 | pty->set_utf8_mode (enc_utf8); |
3956 | pty->set_utf8_mode (enc_utf8); |
3943 | init_xlocale (); |
3957 | init_xlocale (); |
… | |
… | |
4304 | scr_color (Color_bg, Color_bg); |
4318 | scr_color (Color_bg, Color_bg); |
4305 | break; |
4319 | break; |
4306 | |
4320 | |
4307 | //case 50: // not variable spacing |
4321 | //case 50: // not variable spacing |
4308 | |
4322 | |
4309 | #if ENABLE_FRILLS |
4323 | #if !ENABLE_MINIMAL |
4310 | case 90: |
4324 | case 90: |
4311 | case 91: /* set bright fg color */ |
4325 | case 91: /* set bright fg color */ |
4312 | case 92: |
4326 | case 92: |
4313 | case 93: |
4327 | case 93: |
4314 | case 94: |
4328 | case 94: |