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.191 by root, Wed Jan 26 07:08:15 2005 UTC vs.
Revision 1.192 by root, Fri Feb 4 11:41:23 2005 UTC

… …
1182 1182
1183/*{{{ process an X event */ 1183/*{{{ process an X event */
1184void 1184void
1185rxvt_term::x_cb (XEvent &ev) 1185rxvt_term::x_cb (XEvent &ev)
1186{ 1186{
1187 dDisp;
1188
1187 SET_R (this); 1189 SET_R (this);
1188 SET_LOCALE (locale); 1190 SET_LOCALE (locale);
1189 1191
1190#if defined(CURSOR_BLINK) 1192#if defined(CURSOR_BLINK)
1191 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1193 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1322 Atom ActualType; 1324 Atom ActualType;
1323 int ActualFormat; 1325 int ActualFormat;
1324 unsigned char *data; 1326 unsigned char *data;
1325 unsigned long Size, RemainingBytes; 1327 unsigned long Size, RemainingBytes;
1326 1328
1327 XGetWindowProperty (display->display, display->root, 1329 XGetWindowProperty (disp, display->root,
1328 xa[XA_DNDSELECTION], 1330 xa[XA_DNDSELECTION],
1329 0L, 1000000L, 1331 0L, 1000000L,
1330 False, AnyPropertyType, 1332 False, AnyPropertyType,
1331 &ActualType, &ActualFormat, 1333 &ActualType, &ActualFormat,
1332 &Size, &RemainingBytes, 1334 &Size, &RemainingBytes,
1333 &data); 1335 &data);
1334 set_string_property (XA_CUT_BUFFER0, data); 1336 set_string_property (XA_CUT_BUFFER0, data);
1335 XFree (data); 1337 XFree (data);
1336 selection_paste (display->root, XA_CUT_BUFFER0, true); 1338 selection_paste (display->root, XA_CUT_BUFFER0, true);
1337 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1339 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1338 } 1340 }
1339#endif /* OFFIX_DND */ 1341#endif /* OFFIX_DND */
1340 break; 1342 break;
1341 1343
1342 case MappingNotify: 1344 case MappingNotify:
… …
1435 { /* Wrap lots of configures into one */ 1437 { /* Wrap lots of configures into one */
1436 width = ev.xconfigure.width; 1438 width = ev.xconfigure.width;
1437 height = ev.xconfigure.height; 1439 height = ev.xconfigure.height;
1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1440 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439 } 1441 }
1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1442 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1441 1443
1442 if (szHint.width != width || szHint.height != height) 1444 if (szHint.width != width || szHint.height != height)
1443 { 1445 {
1444 seen_resize = 1; 1446 seen_resize = 1;
1445 resize_all_windows (width, height, 1); 1447 resize_all_windows (width, height, 1);
… …
1497 if (ev.xany.window == TermWin.vt) 1499 if (ev.xany.window == TermWin.vt)
1498 { 1500 {
1499 do 1501 do
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1502 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1504 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1503 1505
1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505 1507
1506 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1508 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1507 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1508 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1509 1511
1510 scr_refresh (refresh_type); 1512 scr_refresh (refresh_type);
1511 } 1513 }
1512 else 1514 else
1513 { 1515 {
1514 XEvent unused_event; 1516 XEvent unused_event;
1515 1517
1516 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1518 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1517 ; 1519 ;
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1520 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1519 ; 1521 ;
1520 1522
1521 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1522 { 1524 {
1523 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
… …
1528 menubar_expose (); 1530 menubar_expose ();
1529#endif 1531#endif
1530 1532
1531#ifdef TRANSPARENT 1533#ifdef TRANSPARENT
1532 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1534 if (am_transparent && ev.xany.window == TermWin.parent[0])
1533 XClearWindow (display->display, ev.xany.window); 1535 XClearWindow (disp, ev.xany.window);
1534#endif 1536#endif
1535 } 1537 }
1536 break; 1538 break;
1537 1539
1538 case MotionNotify: 1540 case MotionNotify:
… …
1552 1554
1553 if (ev.xany.window == TermWin.vt) 1555 if (ev.xany.window == TermWin.vt)
1554 { 1556 {
1555 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1557 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1556 { 1558 {
1557 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1559 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1558 ; 1560 ;
1559 1561
1560 XQueryPointer (display->display, TermWin.vt, 1562 XQueryPointer (disp, TermWin.vt,
1561 &unused_root, &unused_child, 1563 &unused_root, &unused_child,
1562 &unused_root_x, &unused_root_y, 1564 &unused_root_x, &unused_root_y,
1563 &ev.xbutton.x, &ev.xbutton.y, 1565 &ev.xbutton.x, &ev.xbutton.y,
1564 &ev.xbutton.state); 1566 &ev.xbutton.state);
1565#ifdef MOUSE_THRESHOLD 1567#ifdef MOUSE_THRESHOLD
… …
1629#endif 1631#endif
1630 } 1632 }
1631 } 1633 }
1632 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1634 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1633 { 1635 {
1634 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1636 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1635 MotionNotify, &ev)) 1637 MotionNotify, &ev))
1636 ; 1638 ;
1637 1639
1638 XQueryPointer (display->display, scrollBar.win, 1640 XQueryPointer (disp, scrollBar.win,
1639 &unused_root, &unused_child, 1641 &unused_root, &unused_child,
1640 &unused_root_x, &unused_root_y, 1642 &unused_root_x, &unused_root_y,
1641 &ev.xbutton.x, &ev.xbutton.y, 1643 &ev.xbutton.x, &ev.xbutton.y,
1642 &unused_mask); 1644 &unused_mask);
1643 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1645 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
2081 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2083 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2082 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2084 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2083 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2085 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2084 int i; 2086 int i;
2085 2087
2086 Visual* visual = display->visual; 2088 Visual *visual = display->visual;
2087 2089
2088 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2090 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2089 2091
2090 /* for convenience */ 2092 /* for convenience */
2091 mask_r = visual->red_mask; 2093 mask_r = visual->red_mask;
… …
2312 Atom atype; 2314 Atom atype;
2313 unsigned char *prop = NULL; 2315 unsigned char *prop = NULL;
2314 Window root, oldp, *list; 2316 Window root, oldp, *list;
2315 Pixmap rootpixmap = None; 2317 Pixmap rootpixmap = None;
2316 XWindowAttributes wattr, wrootattr; 2318 XWindowAttributes wattr, wrootattr;
2319 dDisp;
2317 2320
2318 pchanged = 0; 2321 pchanged = 0;
2319 2322
2320 if (!(options & Opt_transparent)) 2323 if (!(options & Opt_transparent))
2321 return pchanged; /* Don't try any more */ 2324 return pchanged; /* Don't try any more */
2322 2325
2323 XGetWindowAttributes (display->display, display->root, &wrootattr); 2326 XGetWindowAttributes (disp, display->root, &wrootattr);
2324 rootdepth = wrootattr.depth; 2327 rootdepth = wrootattr.depth;
2325 2328
2326 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2329 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2327 2330
2328 if (rootdepth != wattr.depth) 2331 if (rootdepth != wattr.depth)
2329 { 2332 {
2330 if (am_transparent) 2333 if (am_transparent)
2331 { 2334 {
2332 pchanged = 1; 2335 pchanged = 1;
2333 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2336 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2334 am_transparent = am_pixmap_trans = 0; 2337 am_transparent = am_pixmap_trans = 0;
2335 } 2338 }
2336 2339
2337 return pchanged; /* Don't try any more */ 2340 return pchanged; /* Don't try any more */
2338 } 2341 }
2339 2342
2340 /* Get all X ops out of the queue so that our information is up-to-date. */ 2343 /* Get all X ops out of the queue so that our information is up-to-date. */
2341 XSync (display->display, False); 2344 XSync (disp, False);
2342 2345
2343 /* 2346 /*
2344 * Make the frame window set by the window manager have 2347 * Make the frame window set by the window manager have
2345 * the root background. Some window managers put multiple nested frame 2348 * the root background. Some window managers put multiple nested frame
2346 * windows for each client, so we have to take care about that. 2349 * windows for each client, so we have to take care about that.
2347 */ 2350 */
2348 i = (xa[XA_XROOTPMAP_ID] 2351 i = (xa[XA_XROOTPMAP_ID]
2349 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2352 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2350 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2353 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2351 &nitems, &bytes_after, &prop) == Success); 2354 &nitems, &bytes_after, &prop) == Success);
2352 2355
2353 if (!i || prop == NULL) 2356 if (!i || prop == NULL)
2354 i = (xa[XA_ESETROOT_PMAP_ID] 2357 i = (xa[XA_ESETROOT_PMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2358 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2359 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2360 &nitems, &bytes_after, &prop) == Success);
2358 2361
2359 if (!i || prop == NULL 2362 if (!i || prop == NULL
2360#if TINTING 2363#if TINTING
… …
2379 Window cr; 2382 Window cr;
2380 XImage *image; 2383 XImage *image;
2381 GC gc; 2384 GC gc;
2382 XGCValues gcvalue; 2385 XGCValues gcvalue;
2383 2386
2384 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2387 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2385 0, 0, &sx, &sy, &cr); 2388 0, 0, &sx, &sy, &cr);
2386 nw = (unsigned int)szHint.width; 2389 nw = (unsigned int)szHint.width;
2387 nh = (unsigned int)szHint.height; 2390 nh = (unsigned int)szHint.height;
2388 nx = ny = 0; 2391 nx = ny = 0;
2389 2392
… …
2402 } 2405 }
2403 2406
2404 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2407 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2405 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2408 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2406 2409
2407 XSync (display->display, False); 2410 XSync (disp, False);
2408 allowedxerror = -1; 2411 allowedxerror = -1;
2409 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2412 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2410 2413
2411 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2414 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2412 /* XXX: may need a delay here? */ 2415 /* XXX: may need a delay here? */
2413 allowedxerror = 0; 2416 allowedxerror = 0;
2414 2417
… …
2417 if (am_transparent && am_pixmap_trans) 2420 if (am_transparent && am_pixmap_trans)
2418 { 2421 {
2419 pchanged = 1; 2422 pchanged = 1;
2420 if (TermWin.pixmap != None) 2423 if (TermWin.pixmap != None)
2421 { 2424 {
2422 XFreePixmap (display->display, TermWin.pixmap); 2425 XFreePixmap (disp, TermWin.pixmap);
2423 TermWin.pixmap = None; 2426 TermWin.pixmap = None;
2424 } 2427 }
2425 } 2428 }
2426 2429
2427 am_pixmap_trans = 0; 2430 am_pixmap_trans = 0;
2428 } 2431 }
2429 else 2432 else
2430 { 2433 {
2431 if (TermWin.pixmap != None) 2434 if (TermWin.pixmap != None)
2432 XFreePixmap (display->display, TermWin.pixmap); 2435 XFreePixmap (disp, TermWin.pixmap);
2433 2436
2434#if TINTING 2437#if TINTING
2435 if (ISSET_PIXCOLOR (Color_tint)) 2438 if (ISSET_PIXCOLOR (Color_tint))
2436 { 2439 {
2437 unsigned short rm, gm, bm; 2440 unsigned short rm, gm, bm;
… …
2441 2444
2442 ShadeXImage (display, image, shade, rm, gm, bm); 2445 ShadeXImage (display, image, shade, rm, gm, bm);
2443 } 2446 }
2444#endif 2447#endif
2445 2448
2446 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2449 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2447 szHint.width, szHint.height, image->depth); 2450 szHint.width, szHint.height, image->depth);
2448 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2451 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2449 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2452 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2450 nx, ny, image->width, image->height); 2453 nx, ny, image->width, image->height);
2451 XFreeGC (display->display, gc); 2454 XFreeGC (disp, gc);
2452 XDestroyImage (image); 2455 XDestroyImage (image);
2453 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2456 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2454 XClearWindow (display->display, TermWin.parent[0]); 2457 XClearWindow (disp, TermWin.parent[0]);
2455 2458
2456 if (!am_transparent || !am_pixmap_trans) 2459 if (!am_transparent || !am_pixmap_trans)
2457 pchanged = 1; 2460 pchanged = 1;
2458 2461
2459 am_transparent = am_pixmap_trans = 1; 2462 am_transparent = am_pixmap_trans = 1;
2460 } 2463 }
2461 } 2464 }
2462 2465
2463 if (am_pixmap_trans) 2466 if (am_pixmap_trans)
2464 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2467 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2465 else 2468 else
2466 { 2469 {
2467 unsigned int n; 2470 unsigned int n;
2468 /* 2471 /*
2469 * InheritPixmap transparency 2472 * InheritPixmap transparency
2470 */ 2473 */
2471 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2474 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2472 { 2475 {
2473 oldp = TermWin.parent[i]; 2476 oldp = TermWin.parent[i];
2474 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2477 XQueryTree (disp, TermWin.parent[i - 1], &root,
2475 &TermWin.parent[i], &list, &n); 2478 &TermWin.parent[i], &list, &n);
2476 XFree (list); 2479 XFree (list);
2477 2480
2478 if (TermWin.parent[i] == display->root) 2481 if (TermWin.parent[i] == display->root)
2479 { 2482 {
… …
2491 2494
2492 if (pchanged) 2495 if (pchanged)
2493 { 2496 {
2494 for (; n < (unsigned int)i; n++) 2497 for (; n < (unsigned int)i; n++)
2495 { 2498 {
2496 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2499 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2497 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2500 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2498 { 2501 {
2499 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2502 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2500 break; 2503 break;
2501 } 2504 }
2502 } 2505 }
2503 } 2506 }
2504 2507
2505 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2508 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2506 { 2509 {
2507 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2510 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2508 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2511 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2509 am_transparent = 0; 2512 am_transparent = 0;
2510 /* XXX: also turn off Opt_transparent? */ 2513 /* XXX: also turn off Opt_transparent? */
2511 } 2514 }
2512 else 2515 else
2513 { 2516 {
… …
2516 * needed for fvwm2.2.2 (and before?) */ 2519 * needed for fvwm2.2.2 (and before?) */
2517 sleep (1); 2520 sleep (1);
2518#endif 2521#endif
2519 for (n = 0; n < (unsigned int)i; n++) 2522 for (n = 0; n < (unsigned int)i; n++)
2520 { 2523 {
2521 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2524 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2522 XClearWindow (display->display, TermWin.parent[n]); 2525 XClearWindow (disp, TermWin.parent[n]);
2523 } 2526 }
2524 2527
2525 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2528 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2526 am_transparent = 1; 2529 am_transparent = 1;
2527 } 2530 }
2528 2531
2529 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2532 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2530 TermWin.parent[i] = None; 2533 TermWin.parent[i] = None;
2531 } 2534 }
2532 2535
2533 if (scrollBar.win) 2536 if (scrollBar.win)
2534 { 2537 {
2535 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2538 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2536 scrollBar.setIdle (); 2539 scrollBar.setIdle ();
2537 scrollbar_show (0); 2540 scrollbar_show (0);
2538 } 2541 }
2539 2542
2540 if (am_transparent) 2543 if (am_transparent)
… …
3413rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3416rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3414{ 3417{
3415 int x, y; 3418 int x, y;
3416 XWindowAttributes wattr; 3419 XWindowAttributes wattr;
3417 Window wdummy; 3420 Window wdummy;
3421 dDisp;
3418 3422
3419 if (nargs == 0) 3423 if (nargs == 0)
3420 return; 3424 return;
3421 3425
3422 switch (args[0]) 3426 switch (args[0])
3423 { 3427 {
3424 /* 3428 /*
3425 * commands 3429 * commands
3426 */ 3430 */
3427 case 1: /* deiconify window */ 3431 case 1: /* deiconify window */
3428 XMapWindow (display->display, TermWin.parent[0]); 3432 XMapWindow (disp, TermWin.parent[0]);
3429 break; 3433 break;
3430 case 2: /* iconify window */ 3434 case 2: /* iconify window */
3431 XIconifyWindow (display->display, TermWin.parent[0], 3435 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3432 DefaultScreen (display->display));
3433 break; 3436 break;
3434 case 3: /* set position (pixels) */ 3437 case 3: /* set position (pixels) */
3435 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3438 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3436 break; 3439 break;
3437 case 4: /* set size (pixels) */ 3440 case 4: /* set size (pixels) */
3438 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3441 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3439 break; 3442 break;
3440 case 5: /* raise window */ 3443 case 5: /* raise window */
3441 XRaiseWindow (display->display, TermWin.parent[0]); 3444 XRaiseWindow (disp, TermWin.parent[0]);
3442 break; 3445 break;
3443 case 6: /* lower window */ 3446 case 6: /* lower window */
3444 XLowerWindow (display->display, TermWin.parent[0]); 3447 XLowerWindow (disp, TermWin.parent[0]);
3445 break; 3448 break;
3446 case 7: /* refresh window */ 3449 case 7: /* refresh window */
3447 scr_touch (true); 3450 scr_touch (true);
3448 break; 3451 break;
3449 case 8: /* set size (chars) */ 3452 case 8: /* set size (chars) */
… …
3461 3464
3462 /* 3465 /*
3463 * reports - some output format copied from XTerm 3466 * reports - some output format copied from XTerm
3464 */ 3467 */
3465 case 11: /* report window state */ 3468 case 11: /* report window state */
3466 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3469 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3467 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3470 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3468 break; 3471 break;
3469 case 13: /* report window position */ 3472 case 13: /* report window position */
3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3473 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3471 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3474 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3472 -wattr.border_width, -wattr.border_width, 3475 -wattr.border_width, -wattr.border_width,
3473 &x, &y, &wdummy); 3476 &x, &y, &wdummy);
3474 tt_printf ("\033[3;%d;%dt", x, y); 3477 tt_printf ("\033[3;%d;%dt", x, y);
3475 break; 3478 break;
3476 case 14: /* report window size (pixels) */ 3479 case 14: /* report window size (pixels) */
3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3480 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3478 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3481 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3479 break; 3482 break;
3480 case 18: /* report text area size (chars) */ 3483 case 18: /* report text area size (chars) */
3481 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3484 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3482 break; 3485 break;
… …
3484 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3485 break; 3488 break;
3486 case 20: /* report icon label */ 3489 case 20: /* report icon label */
3487 { 3490 {
3488 char *s; 3491 char *s;
3489 XGetIconName (display->display, TermWin.parent[0], &s); 3492 XGetIconName (disp, TermWin.parent[0], &s);
3490 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3493 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3491 XFree (s); 3494 XFree (s);
3492 } 3495 }
3493 break; 3496 break;
3494 case 21: /* report window title */ 3497 case 21: /* report window title */
3495 { 3498 {
3496 char *s; 3499 char *s;
3497 XFetchName (display->display, TermWin.parent[0], &s); 3500 XFetchName (disp, TermWin.parent[0], &s);
3498 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3501 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3502 XFree (s);
3500 } 3503 }
3501 break; 3504 break;
3502 } 3505 }
… …
3644 int changed = 0; 3647 int changed = 0;
3645 int color; 3648 int color;
3646 char *buf, *name; 3649 char *buf, *name;
3647 bool query = str[0] == '?' && !str[1]; 3650 bool query = str[0] == '?' && !str[1];
3648 int saveop = op; 3651 int saveop = op;
3652 dDisp;
3649 3653
3650 assert (str != NULL); 3654 assert (str != NULL);
3651 switch (op) 3655 switch (op)
3652 { 3656 {
3653 case XTerm_name: 3657 case XTerm_name:
… …
3669 unsigned long bytes_after; 3673 unsigned long bytes_after;
3670 unsigned char *value = 0; 3674 unsigned char *value = 0;
3671 const char *str = ""; 3675 const char *str = "";
3672 3676
3673 if (prop 3677 if (prop
3674 && XGetWindowProperty (display->display, TermWin.parent[0], 3678 && XGetWindowProperty (disp, TermWin.parent[0],
3675 prop, 0, 1<<16, 0, AnyPropertyType, 3679 prop, 0, 1<<16, 0, AnyPropertyType,
3676 &actual_type, &actual_format, 3680 &actual_type, &actual_format,
3677 &nitems, &bytes_after, &value) == Success 3681 &nitems, &bytes_after, &value) == Success
3678 && actual_type != None 3682 && actual_type != None
3679 && actual_format == 8) 3683 && actual_format == 8)
… …
3691 { 3695 {
3692 *eq = 0; 3696 *eq = 0;
3693 set_utf8_property (display->atom (str), eq + 1); 3697 set_utf8_property (display->atom (str), eq + 1);
3694 } 3698 }
3695 else 3699 else
3696 XDeleteProperty (display->display, TermWin.parent[0], 3700 XDeleteProperty (disp, TermWin.parent[0],
3697 display->atom (str)); 3701 display->atom (str));
3698 } 3702 }
3699 break; 3703 break;
3700 3704
3701 case XTerm_Color: 3705 case XTerm_Color:

Diff Legend

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