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.323 by ayin, Mon May 28 18:38:03 2007 UTC vs.
Revision 1.333 by ayin, Tue Jun 26 09:55:22 2007 UTC

536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 538# endif
539 } 539 }
540#endif 540#endif
541 541
542#ifdef PRINTPIPE 542#ifdef PRINTPIPE
543 if (keysym == XK_Print) 543 if (keysym == XK_Print)
544 { 544 {
545 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
546 return; 546 return;
973 scr_overlay_off (); 973 scr_overlay_off ();
974# endif 974# endif
975 if (iso14755buf & ISO_14755_51) 975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 976 commit_iso14755 ();
977#if ISO_14755 977#if ISO_14755
978 else if (iso14755buf & ISO_14755_STARTED) 978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 { 979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981 981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1035void 1035void
1036rxvt_term::flush () 1036rxvt_term::flush ()
1037{ 1037{
1038 flush_ev.stop (); 1038 flush_ev.stop ();
1039 1039
1040#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
1041 if (want_full_refresh) 1041 if (want_full_refresh)
1042 { 1042 {
1043 want_full_refresh = 0; 1043 want_full_refresh = 0;
1044 scr_clear (); 1044 scr_clear ();
1045 scr_touch (false); 1045 scr_touch (false);
1110void 1110void
1111rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1112{ 1112{
1113 make_current (); 1113 make_current ();
1114 1114
1115 refresh_limit = 1;
1116 refresh_count = 0; 1115 refresh_count = 0;
1117 flush (); 1116 flush ();
1118} 1117}
1119 1118
1120#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
1186 1185
1187#if LINUX_YIELD_HACK 1186#if LINUX_YIELD_HACK
1188static struct event_handler 1187static struct event_handler
1189{ 1188{
1190 check_watcher yield_ev; 1189 check_watcher yield_ev;
1191 1190
1192 void yield_cb (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1193 { 1192 {
1194 // this should really be sched_yield(), but the linux guys thought 1193 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than 1194 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is 1195 // ones with high nice levels is a useful thing to do. It surely is is
1243 pty_ev.stop (); 1242 pty_ev.stop ();
1244 1243
1245 if (!option (Opt_hold)) 1244 if (!option (Opt_hold))
1246 destroy (); 1245 destroy ();
1247 } 1246 }
1248 1247
1249 return false; 1248 return false;
1250} 1249}
1251 1250
1252void 1251void
1253rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
1489 1488
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1490 {
1492 seen_resize = 1; 1491 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1495 {
1496 resize_pixmap ();
1497 scr_touch (true);
1498 }
1499#endif
1494 } 1500 }
1495 1501
1496 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1497 1503
1498#ifdef TRANSPARENT 1504#ifdef ENABLE_TRANSPARENCY
1499 if (option (Opt_transparent)) 1505 if (option (Opt_transparent))
1500 check_our_parents (); 1506 check_our_parents ();
1501#endif 1507#endif
1502 } 1508 }
1503 break; 1509 break;
1537 text_blink_ev.stop (); 1543 text_blink_ev.stop ();
1538#endif 1544#endif
1539 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1545 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1540 break; 1546 break;
1541 1547
1542#ifdef TRANSPARENT 1548#ifdef ENABLE_TRANSPARENCY
1543 case ReparentNotify: 1549 case ReparentNotify:
1544 rootwin_cb (ev); 1550 rootwin_cb (ev);
1545 break; 1551 break;
1546#endif /* TRANSPARENT */ 1552#endif /* ENABLE_TRANSPARENCY */
1547 1553
1548 case GraphicsExpose: 1554 case GraphicsExpose:
1549 case Expose: 1555 case Expose:
1550 if (ev.xany.window == vt) 1556 if (ev.xany.window == vt)
1551 { 1557 {
1575 { 1581 {
1576 scrollBar.setIdle (); 1582 scrollBar.setIdle ();
1577 scrollbar_show (0); 1583 scrollbar_show (0);
1578 } 1584 }
1579 1585
1580#ifdef TRANSPARENT 1586#ifdef ENABLE_TRANSPARENCY
1581 if (am_transparent && ev.xany.window == parent[0]) 1587 if (am_transparent && ev.xany.window == parent[0])
1582 XClearWindow (dpy, ev.xany.window); 1588 XClearWindow (dpy, ev.xany.window);
1583#endif 1589#endif
1584 } 1590 }
1585 break; 1591 break;
1686 &ev.xbutton.x, &ev.xbutton.y, 1692 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1693 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1695 scrollbar_size ());
1690 want_refresh = 1; 1696 want_refresh = 1;
1691 refresh_limit = 0;
1692 scrollbar_show (1); 1697 scrollbar_show (1);
1693 } 1698 }
1694 break; 1699 break;
1695 } 1700 }
1696 1701
1815 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1820 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1816 } 1821 }
1817#endif 1822#endif
1818} 1823}
1819 1824
1820#if TRANSPARENT || ENABLE_PERL 1825#if ENABLE_TRANSPARENCY || ENABLE_PERL
1821void 1826void
1822rxvt_term::rootwin_cb (XEvent &ev) 1827rxvt_term::rootwin_cb (XEvent &ev)
1823{ 1828{
1824 make_current (); 1829 make_current ();
1825 1830
1826 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1827 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1828 return; 1833 return;
1829 1834
1830# if TRANSPARENT 1835# if ENABLE_TRANSPARENCY
1831 switch (ev.type) 1836 switch (ev.type)
1832 { 1837 {
1833 case PropertyNotify: 1838 case PropertyNotify:
1834 /* 1839 /*
1835 * if user used some Esetroot compatible prog to set the root bg, 1840 * if user used some Esetroot compatible prog to set the root bg,
1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1840 return; 1845 return;
1841 1846
1842 /* FALLTHROUGH */ 1847 /* FALLTHROUGH */
1843 case ReparentNotify: 1848 case ReparentNotify:
1844 if (option (Opt_transparent) && check_our_parents () && am_transparent) 1849 if (option (Opt_transparent))
1845 want_refresh = want_full_refresh = 1; 1850 check_our_parents ();
1846 break; 1851 break;
1847 } 1852 }
1848# endif 1853# endif
1849} 1854}
1850#endif 1855#endif
2227#endif 2232#endif
2228 } 2233 }
2229 } 2234 }
2230} 2235}
2231 2236
2232#ifdef TRANSPARENT
2233#if TINTING
2234/* taken from aterm-0.4.2 */
2235
2236typedef uint32_t RUINT32T;
2237
2238void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2239{
2240 int sh_r, sh_g, sh_b;
2241 RUINT32T mask_r, mask_g, mask_b;
2242 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2243 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2244 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2245 int i;
2246
2247 Visual *visual = term->visual;
2248
2249 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2250
2251 /* for convenience */
2252 mask_r = visual->red_mask;
2253 mask_g = visual->green_mask;
2254 mask_b = visual->blue_mask;
2255
2256 /* boring lookup table pre-initialization */
2257 switch (srcImage->bits_per_pixel) {
2258 case 15:
2259 if ((mask_r != 0x7c00) ||
2260 (mask_g != 0x03e0) ||
2261 (mask_b != 0x001f))
2262 return;
2263 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2264 lookup_r = lookup;
2265 lookup_g = lookup+32;
2266 lookup_b = lookup+32+32;
2267 sh_r = 10;
2268 sh_g = 5;
2269 sh_b = 0;
2270 break;
2271 case 16:
2272 if ((mask_r != 0xf800) ||
2273 (mask_g != 0x07e0) ||
2274 (mask_b != 0x001f))
2275 return;
2276 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2277 lookup_r = lookup;
2278 lookup_g = lookup+32;
2279 lookup_b = lookup+32+64;
2280 sh_r = 11;
2281 sh_g = 5;
2282 sh_b = 0;
2283 break;
2284 case 24:
2285 if ((mask_r != 0xff0000) ||
2286 (mask_g != 0x00ff00) ||
2287 (mask_b != 0x0000ff))
2288 return;
2289 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2290 lookup_r = lookup;
2291 lookup_g = lookup+256;
2292 lookup_b = lookup+256+256;
2293 sh_r = 16;
2294 sh_g = 8;
2295 sh_b = 0;
2296 break;
2297 case 32:
2298 if ((mask_r != 0xff0000) ||
2299 (mask_g != 0x00ff00) ||
2300 (mask_b != 0x0000ff))
2301 return;
2302 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2303 lookup_r = lookup;
2304 lookup_g = lookup+256;
2305 lookup_b = lookup+256+256;
2306 sh_r = 16;
2307 sh_g = 8;
2308 sh_b = 0;
2309 break;
2310 default:
2311 return; /* we do not support this color depth */
2312 }
2313
2314 /* prepare limits for color transformation (each channel is handled separately) */
2315 if (shade < 0) {
2316 shade = -shade;
2317 if (shade < 0) shade = 0;
2318 if (shade > 100) shade = 100;
2319
2320 lower_lim_r = 65535-rm;
2321 lower_lim_g = 65535-gm;
2322 lower_lim_b = 65535-bm;
2323
2324 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2325 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2326 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2327
2328 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2329 } else {
2330 if (shade < 0) shade = 0;
2331 if (shade > 100) shade = 100;
2332
2333 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2334
2335 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2336 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2337 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2338 }
2339
2340 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2341 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2342 {
2343 unsigned int tmp;
2344
2345 tmp = lower_lim_r;
2346 lower_lim_r = lower_lim_b;
2347 lower_lim_b = tmp;
2348
2349 tmp = upper_lim_r;
2350 upper_lim_r = upper_lim_b;
2351 upper_lim_b = tmp;
2352 }
2353
2354 /* fill our lookup tables */
2355 for (i = 0; i <= mask_r>>sh_r; i++)
2356 {
2357 RUINT32T tmp;
2358 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2359 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2360 lookup_r[i] = (tmp/65535)<<sh_r;
2361 }
2362 for (i = 0; i <= mask_g>>sh_g; i++)
2363 {
2364 RUINT32T tmp;
2365 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2366 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2367 lookup_g[i] = (tmp/65535)<<sh_g;
2368 }
2369 for (i = 0; i <= mask_b>>sh_b; i++)
2370 {
2371 RUINT32T tmp;
2372 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2373 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2374 lookup_b[i] = (tmp/65535)<<sh_b;
2375 }
2376
2377 /* apply table to input image (replacing colors by newly calculated ones) */
2378 switch (srcImage->bits_per_pixel)
2379 {
2380 case 15:
2381 {
2382 unsigned short *p1, *pf, *p, *pl;
2383 p1 = (unsigned short *) srcImage->data;
2384 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2385 while (p1 < pf)
2386 {
2387 p = p1;
2388 pl = p1 + srcImage->width;
2389 for (; p < pl; p++)
2390 {
2391 *p = lookup_r[(*p & 0x7c00)>>10] |
2392 lookup_g[(*p & 0x03e0)>> 5] |
2393 lookup_b[(*p & 0x001f)];
2394 }
2395 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2396 }
2397 break;
2398 }
2399 case 16:
2400 {
2401 unsigned short *p1, *pf, *p, *pl;
2402 p1 = (unsigned short *) srcImage->data;
2403 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2404 while (p1 < pf)
2405 {
2406 p = p1;
2407 pl = p1 + srcImage->width;
2408 for (; p < pl; p++)
2409 {
2410 *p = lookup_r[(*p & 0xf800)>>11] |
2411 lookup_g[(*p & 0x07e0)>> 5] |
2412 lookup_b[(*p & 0x001f)];
2413 }
2414 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2415 }
2416 break;
2417 }
2418 case 24:
2419 {
2420 unsigned char *p1, *pf, *p, *pl;
2421 p1 = (unsigned char *) srcImage->data;
2422 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2423 while (p1 < pf)
2424 {
2425 p = p1;
2426 pl = p1 + srcImage->width * 3;
2427 for (; p < pl; p += 3)
2428 {
2429 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2430 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2431 p[2] = lookup_r[(p[2] & 0x0000ff)];
2432 }
2433 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2434 }
2435 break;
2436 }
2437 case 32:
2438 {
2439 RUINT32T *p1, *pf, *p, *pl;
2440 p1 = (RUINT32T *) srcImage->data;
2441 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2442
2443 while (p1 < pf)
2444 {
2445 p = p1;
2446 pl = p1 + srcImage->width;
2447 for (; p < pl; p++)
2448 {
2449 *p = lookup_r[(*p & 0xff0000)>>16] |
2450 lookup_g[(*p & 0x00ff00)>> 8] |
2451 lookup_b[(*p & 0x0000ff)] |
2452 (*p & ~0xffffff);
2453 }
2454 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2455 }
2456 break;
2457 }
2458 }
2459
2460 free (lookup);
2461}
2462#endif
2463
2464/*
2465 * Check our parents are still who we think they are.
2466 * Do transparency updates if required
2467 */
2468int
2469rxvt_term::check_our_parents ()
2470{
2471 int i, pchanged, aformat, have_pixmap, rootdepth;
2472 unsigned long nitems, bytes_after;
2473 Atom atype;
2474 unsigned char *prop = NULL;
2475 Window root, oldp, *list;
2476 Pixmap rootpixmap = None;
2477 XWindowAttributes wattr, wrootattr;
2478
2479 pchanged = 0;
2480
2481 if (!option (Opt_transparent))
2482 return pchanged; /* Don't try any more */
2483
2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2485 rootdepth = wrootattr.depth;
2486
2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2488
2489 if (rootdepth != wattr.depth)
2490 {
2491 if (am_transparent)
2492 {
2493 pchanged = 1;
2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2495 am_transparent = am_pixmap_trans = 0;
2496 }
2497
2498 return pchanged; /* Don't try any more */
2499 }
2500
2501 /* Get all X ops out of the queue so that our information is up-to-date. */
2502 XSync (dpy, False);
2503
2504 /*
2505 * Make the frame window set by the window manager have
2506 * the root background. Some window managers put multiple nested frame
2507 * windows for each client, so we have to take care about that.
2508 */
2509 i = (xa[XA_XROOTPMAP_ID]
2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2512 &nitems, &bytes_after, &prop) == Success);
2513
2514 if (!i || prop == NULL)
2515 i = (xa[XA_ESETROOT_PMAP_ID]
2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2518 &nitems, &bytes_after, &prop) == Success);
2519
2520 if (!i || prop == NULL
2521#if TINTING
2522 || !ISSET_PIXCOLOR (Color_tint)
2523#endif
2524 )
2525 have_pixmap = 0;
2526 else
2527 {
2528 have_pixmap = 1;
2529 rootpixmap = *(Pixmap *)prop;
2530 XFree (prop);
2531 }
2532
2533 if (have_pixmap)
2534 {
2535 /*
2536 * Copy display->root pixmap transparency
2537 */
2538 int sx, sy, nx, ny;
2539 unsigned int nw, nh;
2540 Window cr;
2541 XImage *image;
2542 GC gc;
2543 XGCValues gcvalue;
2544
2545 XTranslateCoordinates (dpy, parent[0], display->root,
2546 0, 0, &sx, &sy, &cr);
2547 nw = (unsigned int)szHint.width;
2548 nh = (unsigned int)szHint.height;
2549 nx = ny = 0;
2550
2551 if (sx < 0)
2552 {
2553 nw += sx;
2554 nx = -sx;
2555 sx = 0;
2556 }
2557
2558 if (sy < 0)
2559 {
2560 nh += sy;
2561 ny = -sy;
2562 sy = 0;
2563 }
2564
2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2567
2568 XSync (dpy, False);
2569 allowedxerror = -1;
2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2571
2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2573 /* XXX: may need a delay here? */
2574 allowedxerror = 0;
2575
2576 if (image == NULL)
2577 {
2578 if (am_transparent && am_pixmap_trans)
2579 {
2580 pchanged = 1;
2581 if (pixmap != None)
2582 {
2583 XFreePixmap (dpy, pixmap);
2584 pixmap = None;
2585 }
2586 }
2587
2588 am_pixmap_trans = 0;
2589 }
2590 else
2591 {
2592 if (pixmap != None)
2593 XFreePixmap (dpy, pixmap);
2594
2595#if TINTING
2596 if (ISSET_PIXCOLOR (Color_tint))
2597 {
2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2599
2600 rgba c;
2601 pix_colors_focused [Color_tint].get (c);
2602
2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2604 }
2605#endif
2606
2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2610 nx, ny, image->width, image->height);
2611 XFreeGC (dpy, gc);
2612 XDestroyImage (image);
2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2614 XClearWindow (dpy, parent[0]);
2615
2616 if (!am_transparent || !am_pixmap_trans)
2617 pchanged = 1;
2618
2619 am_transparent = am_pixmap_trans = 1;
2620 }
2621 }
2622
2623 if (am_pixmap_trans)
2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2625 else
2626 {
2627 unsigned int n;
2628 /*
2629 * InheritPixmap transparency
2630 */
2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2632 {
2633 oldp = parent[i];
2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2635 XFree (list);
2636
2637 if (parent[i] == display->root)
2638 {
2639 if (oldp != None)
2640 pchanged = 1;
2641
2642 break;
2643 }
2644
2645 if (oldp != parent[i])
2646 pchanged = 1;
2647 }
2648
2649 n = 0;
2650
2651 if (pchanged)
2652 for (; n < (unsigned int)i; n++)
2653 {
2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2655
2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2657 {
2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2659 break;
2660 }
2661 }
2662
2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2664 {
2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2667 am_transparent = 0;
2668 /* XXX: also turn off Opt_transparent? */
2669 }
2670 else
2671 {
2672 for (n = 0; n < (unsigned int)i; n++)
2673 {
2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2675 XClearWindow (dpy, parent[n]);
2676 }
2677
2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2679 am_transparent = 1;
2680 }
2681
2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2683 parent[i] = None;
2684 }
2685
2686 if (scrollBar.win)
2687 {
2688 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2689 scrollBar.setIdle ();
2690 scrollbar_show (0);
2691 }
2692
2693 if (am_transparent)
2694 {
2695 want_refresh = want_full_refresh = 1;
2696 if (am_pixmap_trans)
2697 flush ();
2698 }
2699
2700 return pchanged;
2701}
2702#endif
2703
2704/*}}} */ 2237/*}}} */
2705 2238
2706bool 2239bool
2707rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
2708{ 2241{
2756 if (ch == C0_LF) 2289 if (ch == C0_LF)
2757 nlines++; 2290 nlines++;
2758 2291
2759 refresh_count++; 2292 refresh_count++;
2760 2293
2761 if (!option (Opt_jumpScroll) 2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2763 { 2295 {
2764 refreshnow = true;
2765 refresh_count = 0; 2296 refresh_count = 0;
2297
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2299 {
2300 refreshnow = true;
2766 ch = NOCHAR; 2301 ch = NOCHAR;
2767 break; 2302 break;
2303 }
2768 } 2304 }
2769 2305
2770 // scr_add_lines only works for nlines <= nrow - 1. 2306 // scr_add_lines only works for nlines <= nrow - 1.
2771 if (nlines >= nrow - 1) 2307 if (nlines >= nrow - 1)
2772 { 2308 {
2800 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2336 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2801 scr_add_lines (buf, str - buf, nlines); 2337 scr_add_lines (buf, str - buf, nlines);
2802 2338
2803 /* 2339 /*
2804 * If there have been a lot of new lines, then update the screen 2340 * If there have been a lot of new lines, then update the screen
2805 * What the heck I'll cheat and only refresh less than every page-full. 2341 * What the heck we'll cheat and only refresh less than every page-full.
2806 * the number of pages between refreshes is refresh_limit, which 2342 * if skipScroll is enabled.
2807 * is incremented here because we must be doing flat-out scrolling.
2808 */ 2343 */
2809 if (refreshnow) 2344 if (refreshnow)
2810 { 2345 {
2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2812 refresh_limit++;
2813 else
2814 {
2815 flag = true; 2346 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2817 scr_refresh (); 2347 scr_refresh ();
2818 want_refresh = 1; 2348 want_refresh = 1;
2819 }
2820 } 2349 }
2821 2350
2822 } 2351 }
2823 else 2352 else
2824 { 2353 {
2973 { 2502 {
2974 if ((buf[len++] = cmd_getc ()) == 'i') 2503 if ((buf[len++] = cmd_getc ()) == 'i')
2975 break; /* done = 1 */ 2504 break; /* done = 1 */
2976 } 2505 }
2977 } 2506 }
2978 2507
2979 for (i = 0; i < len; i++) 2508 for (i = 0; i < len; i++)
2980 if (putc (buf[i], fd) == EOF) 2509 if (putc (buf[i], fd) == EOF)
2981 { 2510 {
2982 done = 1; 2511 done = 1;
2983 break; 2512 break;
3045 process_dcs_seq (); 2574 process_dcs_seq ();
3046 break; 2575 break;
3047 case 0x9b: /* CSI */ 2576 case 0x9b: /* CSI */
3048 process_csi_seq (); 2577 process_csi_seq ();
3049 break; 2578 break;
3050 case 0x9d: /* CSI */ 2579 case 0x9d: /* OSC */
3051 process_osc_seq (); 2580 process_osc_seq ();
3052 break; 2581 break;
3053#endif 2582#endif
3054 } 2583 }
3055} 2584}
3801 int saveop = op; 3330 int saveop = op;
3802 3331
3803 dLocal (Display *, dpy); 3332 dLocal (Display *, dpy);
3804 3333
3805 assert (str != NULL); 3334 assert (str != NULL);
3806 3335
3807 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3336 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3808 return; 3337 return;
3809 3338
3810 switch (op) 3339 switch (op)
3811 { 3340 {
3906 break; 3435 break;
3907 case URxvt_Color_IT: 3436 case URxvt_Color_IT:
3908 process_color_seq (op, Color_IT, str, resp); 3437 process_color_seq (op, Color_IT, str, resp);
3909 break; 3438 break;
3910#endif 3439#endif
3911#if TRANSPARENT && TINTING 3440#if ENABLE_TRANSPARENCY && TINTING
3912 case URxvt_Color_tint: 3441 case URxvt_Color_tint:
3913 process_color_seq (op, Color_tint, str, resp); 3442 process_color_seq (op, Color_tint, str, resp);
3914 3443
3915 check_our_parents (); 3444 check_our_parents ();
3916 3445
3946#ifdef XPM_BACKGROUND 3475#ifdef XPM_BACKGROUND
3947 resize_pixmap (); 3476 resize_pixmap ();
3948 scr_touch (true); 3477 scr_touch (true);
3949#endif 3478#endif
3950 } 3479 }
3480#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3951 } 3484 }
3952 break; 3485 break;
3953 3486
3954 case Rxvt_restoreFG: 3487 case Rxvt_restoreFG:
3955 set_window_color (Color_fg, str); 3488 set_window_color (Color_fg, str);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines