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.207 by root, Tue Oct 25 19:04:45 2005 UTC vs.
Revision 1.208 by root, Sun Dec 18 00:59:42 2005 UTC

… …
135rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
136{ 136{
137 x = Pixel2Col (x); 137 x = Pixel2Col (x);
138 y = Pixel2Row (y); 138 y = Pixel2Row (y);
139 139
140 if (x < 0 || x >= TermWin.ncol 140 if (x < 0 || x >= ncol
141 || y < 0 || y >= TermWin.nrow) 141 || y < 0 || y >= nrow)
142 return; 142 return;
143 143
144 for (;;) 144 for (;;)
145 { 145 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 146 const line_t &l = save[y + saveLines - view_start];
147
148 text_t t = l.t[x];
147 149
148 if (t != NOCHAR || !x) 150 if (t != NOCHAR || !x)
149 { 151 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 152 iso14755_51 (l.t[x], l.r[x]);
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54; 153 iso14755buf = ISO_14755_54;
153 break; 154 break;
154 } 155 }
155 156
156 x--; 157 x--;
… …
366#ifdef KEYSYM_RESOURCE 367#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state)) 368 if (keyboard->dispatch (this, keysym, ev.state))
368 return; 369 return;
369#endif 370#endif
370 371
371 if (TermWin.saveLines) 372 if (saveLines)
372 { 373 {
373#ifdef UNSHIFTED_SCROLLKEYS 374#ifdef UNSHIFTED_SCROLLKEYS
374 if (!ctrl && !meta) 375 if (!ctrl && !meta)
375#else 376#else
376 if (IS_SCROLL_MOD) 377 if (IS_SCROLL_MOD)
377#endif 378#endif
378 { 379 {
379 int lnsppg; 380 int lnsppg;
380 381
381#ifdef PAGING_CONTEXT_LINES 382#ifdef PAGING_CONTEXT_LINES
382 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 383 lnsppg = nrow - PAGING_CONTEXT_LINES;
383#else 384#else
384 lnsppg = TermWin.nrow * 4 / 5; 385 lnsppg = nrow * 4 / 5;
385#endif 386#endif
386 if (keysym == XK_Prior) 387 if (keysym == XK_Prior)
387 { 388 {
388 scr_page (UP, lnsppg); 389 scr_page (UP, lnsppg);
389 return; 390 return;
… …
845 846
846 if (len <= 0) 847 if (len <= 0)
847 return; /* not mapped */ 848 return; /* not mapped */
848 849
849 if (options & Opt_scrollTtyKeypress) 850 if (options & Opt_scrollTtyKeypress)
850 if (TermWin.view_start) 851 if (view_start)
851 { 852 {
852 TermWin.view_start = 0; 853 view_start = 0;
853 want_refresh = 1; 854 want_refresh = 1;
854 } 855 }
855 856
856 /* 857 /*
857 * these modifications only affect the static keybuffer 858 * these modifications only affect the static keybuffer
… …
1034{ 1035{
1035 if (mouse_slip_wheel_speed == 0 1036 if (mouse_slip_wheel_speed == 0
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1037 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1038 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1039 {
1039 if (TermWin.view_start == TermWin.nscrolled || 1040 if (view_start == nscrolled ||
1040 TermWin.view_start == 0) 1041 view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1042 mouse_slip_wheel_speed = 0;
1042 1043
1043 refresh_type |= SMOOTH_REFRESH; 1044 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1045 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1092} 1093}
1093 1094
1094void 1095void
1095rxvt_term::pointer_unblank () 1096rxvt_term::pointer_unblank ()
1096{ 1097{
1097 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1098 XDefineCursor (display->display, vt, TermWin_cursor);
1098 recolour_cursor (); 1099 recolour_cursor ();
1099 1100
1100#ifdef POINTER_BLANK 1101#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1102 hidden_pointer = 0;
1102 1103
… …
1110rxvt_term::pointer_blank () 1111rxvt_term::pointer_blank ()
1111{ 1112{
1112 if (! (options & Opt_pointerBlank)) 1113 if (! (options & Opt_pointerBlank))
1113 return; 1114 return;
1114 1115
1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1116 XDefineCursor (display->display, vt, display->blank_cursor);
1116 XFlush (display->display); 1117 XFlush (display->display);
1117 1118
1118 hidden_pointer = 1; 1119 hidden_pointer = 1;
1119} 1120}
1120 1121
… …
1422 case FocusOut: 1423 case FocusOut:
1423 focus_out (); 1424 focus_out ();
1424 break; 1425 break;
1425 1426
1426 case ConfigureNotify: 1427 case ConfigureNotify:
1427 if (ev.xconfigure.window == TermWin.parent[0]) 1428 if (ev.xconfigure.window == parent[0])
1428 { 1429 {
1429 int height, width;
1430
1431 do
1432 { /* Wrap lots of configures into one */
1433 width = ev.xconfigure.width;
1434 height = ev.xconfigure.height;
1435 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1436 }
1437 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1430 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ;
1438 1432
1439 if (szHint.width != width || szHint.height != height) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1440 { 1434 {
1441 seen_resize = 1; 1435 seen_resize = 1;
1442 resize_all_windows (width, height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1443 } 1437 }
1444 1438
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent) 1440 if (options & Opt_transparent)
1447 check_our_parents (); 1441 check_our_parents ();
… …
1468 case SelectionRequest: 1462 case SelectionRequest:
1469 selection_send (ev.xselectionrequest); 1463 selection_send (ev.xselectionrequest);
1470 break; 1464 break;
1471 1465
1472 case UnmapNotify: 1466 case UnmapNotify:
1473 TermWin.mapped = 0; 1467 mapped = 0;
1474#ifdef TEXT_BLINK 1468#ifdef TEXT_BLINK
1475 text_blink_ev.stop (); 1469 text_blink_ev.stop ();
1476#endif 1470#endif
1477 break; 1471 break;
1478 1472
1479 case MapNotify: 1473 case MapNotify:
1480 TermWin.mapped = 1; 1474 mapped = 1;
1481#ifdef TEXT_BLINK 1475#ifdef TEXT_BLINK
1482 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1483#endif 1477#endif
1484 break; 1478 break;
1485 1479
… …
1489 break; 1483 break;
1490#endif /* TRANSPARENT */ 1484#endif /* TRANSPARENT */
1491 1485
1492 case GraphicsExpose: 1486 case GraphicsExpose:
1493 case Expose: 1487 case Expose:
1494 if (ev.xany.window == TermWin.vt) 1488 if (ev.xany.window == vt)
1495 { 1489 {
1496 do 1490 do
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1493 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1500 1494
1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1502 1496
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1504 scr_expose (ev.xexpose.x, ev.xexpose.y, 1498 scr_expose (ev.xexpose.x, ev.xexpose.y,
1505 ev.xexpose.width, ev.xexpose.height, False); 1499 ev.xexpose.width, ev.xexpose.height, False);
1506 1500
1507 scr_refresh (refresh_type); 1501 scr_refresh (refresh_type);
1508 } 1502 }
… …
1524 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1525 menubar_expose (); 1519 menubar_expose ();
1526#endif 1520#endif
1527 1521
1528#ifdef TRANSPARENT 1522#ifdef TRANSPARENT
1529 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1523 if (am_transparent && ev.xany.window == parent[0])
1530 XClearWindow (disp, ev.xany.window); 1524 XClearWindow (disp, ev.xany.window);
1531#endif 1525#endif
1532 } 1526 }
1533 break; 1527 break;
1534 1528
… …
1545 } 1539 }
1546#endif 1540#endif
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break; 1542 break;
1549 1543
1550 if (ev.xany.window == TermWin.vt) 1544 if (ev.xany.window == vt)
1551 { 1545 {
1552 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1546 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1547 {
1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1548 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1555 ; 1549 ;
1556 1550
1557 XQueryPointer (disp, TermWin.vt, 1551 XQueryPointer (disp, vt,
1558 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1554 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1555 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
… …
1574#endif 1568#endif
1575 selection_extend (ev.xbutton.x, ev.xbutton.y, 1569 selection_extend (ev.xbutton.x, ev.xbutton.y,
1576 ev.xbutton.state & Button3Mask ? 2 : 0); 1570 ev.xbutton.state & Button3Mask ? 2 : 0);
1577 1571
1578#ifdef SELECTION_SCROLLING 1572#ifdef SELECTION_SCROLLING
1579 if (ev.xbutton.y < TermWin.int_bwidth 1573 if (ev.xbutton.y < int_bwidth
1580 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1574 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1581 { 1575 {
1582 int dist; 1576 int dist;
1583 1577
1584 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
… …
1593 selection_save_x = ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
1594 selection_save_y = ev.xbutton.y; 1588 selection_save_y = ev.xbutton.y;
1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1596 1590
1597 /* calc number of lines to scroll */ 1591 /* calc number of lines to scroll */
1598 if (ev.xbutton.y < TermWin.int_bwidth) 1592 if (ev.xbutton.y < int_bwidth)
1599 { 1593 {
1600 scroll_selection_dir = UP; 1594 scroll_selection_dir = UP;
1601 dist = TermWin.int_bwidth - ev.xbutton.y; 1595 dist = int_bwidth - ev.xbutton.y;
1602 } 1596 }
1603 else 1597 else
1604 { 1598 {
1605 scroll_selection_dir = DN; 1599 scroll_selection_dir = DN;
1606 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1600 dist = ev.xbutton.y - (int_bwidth + height);
1607 } 1601 }
1608 1602
1609 scroll_selection_lines = Pixel2Height (dist) 1603 scroll_selection_lines = Pixel2Height (dist)
1610 / SELECTION_SCROLL_LINE_SPEEDUP 1604 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1; 1605 + 1;
… …
1648} 1642}
1649 1643
1650void 1644void
1651rxvt_term::focus_in () 1645rxvt_term::focus_in ()
1652{ 1646{
1653 if (!TermWin.focus) 1647 if (!focus)
1654 { 1648 {
1655 TermWin.focus = 1; 1649 focus = 1;
1656 want_refresh = 1; 1650 want_refresh = 1;
1657#if USE_XIM 1651#if USE_XIM
1658 if (Input_Context != NULL) 1652 if (Input_Context != NULL)
1659 { 1653 {
1660 IMSetStatusPosition (); 1654 IMSetStatusPosition ();
… …
1676} 1670}
1677 1671
1678void 1672void
1679rxvt_term::focus_out () 1673rxvt_term::focus_out ()
1680{ 1674{
1681 if (TermWin.focus) 1675 if (focus)
1682 { 1676 {
1683 TermWin.focus = 0; 1677 focus = 0;
1684 want_refresh = 1; 1678 want_refresh = 1;
1685 1679
1686#if ENABLE_FRILLS || ISO_14755 1680#if ENABLE_FRILLS || ISO_14755
1687 iso14755buf = 0; 1681 iso14755buf = 0;
1688#endif 1682#endif
… …
1745 reportmode = !! (priv_modes & PrivMode_mouse_report); 1739 reportmode = !! (priv_modes & PrivMode_mouse_report);
1746 1740
1747 /* 1741 /*
1748 * VT window processing of button press 1742 * VT window processing of button press
1749 */ 1743 */
1750 if (ev.window == TermWin.vt) 1744 if (ev.window == vt)
1751 { 1745 {
1752#if ISO_14755 1746#if ISO_14755
1753 // 5.4 1747 // 5.4
1754 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1755 { 1749 {
… …
1960 case Button3: 1954 case Button3:
1961 if (scrollBar.style != R_SB_XTERM) 1955 if (scrollBar.style != R_SB_XTERM)
1962 { 1956 {
1963 if (scrollbar_above_slider (ev.y)) 1957 if (scrollbar_above_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 1958# ifdef RXVT_SCROLL_FULL
1965 scr_page (UP, TermWin.nrow - 1); 1959 scr_page (UP, nrow - 1);
1966# else 1960# else
1967 scr_page (UP, TermWin.nrow / 4); 1961 scr_page (UP, nrow / 4);
1968# endif 1962# endif
1969 else if (scrollbar_below_slider (ev.y)) 1963 else if (scrollbar_below_slider (ev.y))
1970# ifdef RXVT_SCROLL_FULL 1964# ifdef RXVT_SCROLL_FULL
1971 scr_page (DN, TermWin.nrow - 1); 1965 scr_page (DN, nrow - 1);
1972# else 1966# else
1973 scr_page (DN, TermWin.nrow / 4); 1967 scr_page (DN, nrow / 4);
1974# endif 1968# endif
1975 else 1969 else
1976 scrollBar.setMotion (); 1970 scrollBar.setMotion ();
1977 } 1971 }
1978 else 1972 else
1979 { 1973 {
1980 scr_page ((ev.button == Button1 ? DN : UP), 1974 scr_page ((ev.button == Button1 ? DN : UP),
1981 (TermWin.nrow 1975 (nrow
1982 * scrollbar_position (ev.y) 1976 * scrollbar_position (ev.y)
1983 / scrollbar_size ())); 1977 / scrollbar_size ()));
1984 } 1978 }
1985 1979
1986 break; 1980 break;
… …
2018#ifdef SELECTION_SCROLLING 2012#ifdef SELECTION_SCROLLING
2019 if (sel_scroll_ev.active) 2013 if (sel_scroll_ev.active)
2020 sel_scroll_ev.stop(); 2014 sel_scroll_ev.stop();
2021#endif 2015#endif
2022 2016
2023 if (ev.window == TermWin.vt) 2017 if (ev.window == vt)
2024 { 2018 {
2025#if ISO_14755 2019#if ISO_14755
2026 // 5.4 2020 // 5.4
2027 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2028 return; 2022 return;
… …
2079 v = ev.button == Button4 ? UP : DN; 2073 v = ev.button == Button4 ? UP : DN;
2080 2074
2081 if (ev.state & ShiftMask) 2075 if (ev.state & ShiftMask)
2082 i = 1; 2076 i = 1;
2083 else if (options & Opt_mouseWheelScrollPage) 2077 else if (options & Opt_mouseWheelScrollPage)
2084 i = TermWin.nrow - 1; 2078 i = nrow - 1;
2085 else 2079 else
2086 i = 5; 2080 i = 5;
2087 2081
2088# ifdef MOUSE_SLIP_WHEELING 2082# ifdef MOUSE_SLIP_WHEELING
2089 if (ev.state & ControlMask) 2083 if (ev.state & ControlMask)
2090 { 2084 {
2091 mouse_slip_wheel_speed += v ? -1 : 1; 2085 mouse_slip_wheel_speed += v ? -1 : 1;
2092 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2086 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2093 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2087 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2094 2088
2095 if (slip_wheel_ev.at < NOW) 2089 if (slip_wheel_ev.at < NOW)
2096 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2097 2091
2098 slip_wheel_ev.start (); 2092 slip_wheel_ev.start ();
… …
2380 return pchanged; /* Don't try any more */ 2374 return pchanged; /* Don't try any more */
2381 2375
2382 XGetWindowAttributes (disp, display->root, &wrootattr); 2376 XGetWindowAttributes (disp, display->root, &wrootattr);
2383 rootdepth = wrootattr.depth; 2377 rootdepth = wrootattr.depth;
2384 2378
2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2379 XGetWindowAttributes (disp, parent[0], &wattr);
2386 2380
2387 if (rootdepth != wattr.depth) 2381 if (rootdepth != wattr.depth)
2388 { 2382 {
2389 if (am_transparent) 2383 if (am_transparent)
2390 { 2384 {
2391 pchanged = 1; 2385 pchanged = 1;
2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2386 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2393 am_transparent = am_pixmap_trans = 0; 2387 am_transparent = am_pixmap_trans = 0;
2394 } 2388 }
2395 2389
2396 return pchanged; /* Don't try any more */ 2390 return pchanged; /* Don't try any more */
2397 } 2391 }
… …
2438 Window cr; 2432 Window cr;
2439 XImage *image; 2433 XImage *image;
2440 GC gc; 2434 GC gc;
2441 XGCValues gcvalue; 2435 XGCValues gcvalue;
2442 2436
2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2437 XTranslateCoordinates (disp, parent[0], display->root,
2444 0, 0, &sx, &sy, &cr); 2438 0, 0, &sx, &sy, &cr);
2445 nw = (unsigned int)szHint.width; 2439 nw = (unsigned int)szHint.width;
2446 nh = (unsigned int)szHint.height; 2440 nh = (unsigned int)szHint.height;
2447 nx = ny = 0; 2441 nx = ny = 0;
2448 2442
… …
2474 if (image == NULL) 2468 if (image == NULL)
2475 { 2469 {
2476 if (am_transparent && am_pixmap_trans) 2470 if (am_transparent && am_pixmap_trans)
2477 { 2471 {
2478 pchanged = 1; 2472 pchanged = 1;
2479 if (TermWin.pixmap != None) 2473 if (pixmap != None)
2480 { 2474 {
2481 XFreePixmap (disp, TermWin.pixmap); 2475 XFreePixmap (disp, pixmap);
2482 TermWin.pixmap = None; 2476 pixmap = None;
2483 } 2477 }
2484 } 2478 }
2485 2479
2486 am_pixmap_trans = 0; 2480 am_pixmap_trans = 0;
2487 } 2481 }
2488 else 2482 else
2489 { 2483 {
2490 if (TermWin.pixmap != None) 2484 if (pixmap != None)
2491 XFreePixmap (disp, TermWin.pixmap); 2485 XFreePixmap (disp, pixmap);
2492 2486
2493#if TINTING 2487#if TINTING
2494 if (ISSET_PIXCOLOR (Color_tint)) 2488 if (ISSET_PIXCOLOR (Color_tint))
2495 { 2489 {
2496 unsigned short rm, gm, bm; 2490 unsigned short rm, gm, bm;
… …
2500 2494
2501 ShadeXImage (display, image, shade, rm, gm, bm); 2495 ShadeXImage (display, image, shade, rm, gm, bm);
2502 } 2496 }
2503#endif 2497#endif
2504 2498
2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2499 pixmap = XCreatePixmap (disp, vt,
2506 szHint.width, szHint.height, image->depth); 2500 szHint.width, szHint.height, image->depth);
2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2501 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2502 XPutImage (disp, pixmap, gc, image, 0, 0,
2509 nx, ny, image->width, image->height); 2503 nx, ny, image->width, image->height);
2510 XFreeGC (disp, gc); 2504 XFreeGC (disp, gc);
2511 XDestroyImage (image); 2505 XDestroyImage (image);
2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2506 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2513 XClearWindow (disp, TermWin.parent[0]); 2507 XClearWindow (disp, parent[0]);
2514 2508
2515 if (!am_transparent || !am_pixmap_trans) 2509 if (!am_transparent || !am_pixmap_trans)
2516 pchanged = 1; 2510 pchanged = 1;
2517 2511
2518 am_transparent = am_pixmap_trans = 1; 2512 am_transparent = am_pixmap_trans = 1;
2519 } 2513 }
2520 } 2514 }
2521 2515
2522 if (am_pixmap_trans) 2516 if (am_pixmap_trans)
2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2517 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2524 else 2518 else
2525 { 2519 {
2526 unsigned int n; 2520 unsigned int n;
2527 /* 2521 /*
2528 * InheritPixmap transparency 2522 * InheritPixmap transparency
2529 */ 2523 */
2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2524 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2531 { 2525 {
2532 oldp = TermWin.parent[i]; 2526 oldp = parent[i];
2533 XQueryTree (disp, TermWin.parent[i - 1], &root, 2527 XQueryTree (disp, parent[i - 1], &root,
2534 &TermWin.parent[i], &list, &n); 2528 &parent[i], &list, &n);
2535 XFree (list); 2529 XFree (list);
2536 2530
2537 if (TermWin.parent[i] == display->root) 2531 if (parent[i] == display->root)
2538 { 2532 {
2539 if (oldp != None) 2533 if (oldp != None)
2540 pchanged = 1; 2534 pchanged = 1;
2541 2535
2542 break; 2536 break;
2543 } 2537 }
2544 2538
2545 if (oldp != TermWin.parent[i]) 2539 if (oldp != parent[i])
2546 pchanged = 1; 2540 pchanged = 1;
2547 } 2541 }
2548 2542
2549 n = 0; 2543 n = 0;
2550 2544
2551 if (pchanged) 2545 if (pchanged)
2552 { 2546 {
2553 for (; n < (unsigned int)i; n++) 2547 for (; n < (unsigned int)i; n++)
2554 { 2548 {
2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2549 XGetWindowAttributes (disp, parent[n], &wattr);
2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2557 { 2551 {
2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2552 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2559 break; 2553 break;
2560 } 2554 }
2561 } 2555 }
2562 } 2556 }
2563 2557
2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2558 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2565 { 2559 {
2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_border]); 2560 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2561 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2568 am_transparent = 0; 2562 am_transparent = 0;
2569 /* XXX: also turn off Opt_transparent? */ 2563 /* XXX: also turn off Opt_transparent? */
2570 } 2564 }
2571 else 2565 else
2572 { 2566 {
… …
2575 * needed for fvwm2.2.2 (and before?) */ 2569 * needed for fvwm2.2.2 (and before?) */
2576 sleep (1); 2570 sleep (1);
2577#endif 2571#endif
2578 for (n = 0; n < (unsigned int)i; n++) 2572 for (n = 0; n < (unsigned int)i; n++)
2579 { 2573 {
2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2574 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2581 XClearWindow (disp, TermWin.parent[n]); 2575 XClearWindow (disp, parent[n]);
2582 } 2576 }
2583 2577
2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 am_transparent = 1; 2579 am_transparent = 1;
2586 } 2580 }
2587 2581
2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2582 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 TermWin.parent[i] = None; 2583 parent[i] = None;
2590 } 2584 }
2591 2585
2592 if (scrollBar.win) 2586 if (scrollBar.win)
2593 { 2587 {
2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2646 /* Read a text string from the input buffer */ 2640 /* Read a text string from the input buffer */
2647 unicode_t buf[UBUFSIZ]; 2641 unicode_t buf[UBUFSIZ];
2648 bool refreshnow = false; 2642 bool refreshnow = false;
2649 int nlines = 0; 2643 int nlines = 0;
2650 unicode_t *str = buf; 2644 unicode_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ); 2645 unicode_t *eol = str + min (ncol, UBUFSIZ);
2652 2646
2653 for (;;) 2647 for (;;)
2654 { 2648 {
2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2649 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2656 break; 2650 break;
… …
2663 nlines++; 2657 nlines++;
2664 2658
2665 refresh_count++; 2659 refresh_count++;
2666 2660
2667 if (!(options & Opt_jumpScroll) 2661 if (!(options & Opt_jumpScroll)
2668 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2662 || (refresh_count >= refresh_limit * (nrow - 1)))
2669 { 2663 {
2670 refreshnow = true; 2664 refreshnow = true;
2671 ch = NOCHAR; 2665 ch = NOCHAR;
2672 break; 2666 break;
2673 } 2667 }
2674 2668
2675 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2669 // scr_add_lines only works for nlines <= nrow - 1.
2676 if (nlines >= TermWin.nrow - 1) 2670 if (nlines >= nrow - 1)
2677 { 2671 {
2678 scr_add_lines (buf, nlines, str - buf); 2672 scr_add_lines (buf, nlines, str - buf);
2679 nlines = 0; 2673 nlines = 0;
2680 str = buf; 2674 str = buf;
2681 eol = str + min (TermWin.ncol, UBUFSIZ); 2675 eol = str + min (ncol, UBUFSIZ);
2682 } 2676 }
2683 2677
2684 if (str >= eol) 2678 if (str >= eol)
2685 { 2679 {
2686 if (eol >= buf + UBUFSIZ) 2680 if (eol >= buf + UBUFSIZ)
2687 { 2681 {
2688 ch = NOCHAR; 2682 ch = NOCHAR;
2689 break; 2683 break;
2690 } 2684 }
2691 else 2685 else
2692 eol = min (eol + TermWin.ncol, buf + UBUFSIZ); 2686 eol = min (eol + ncol, buf + UBUFSIZ);
2693 } 2687 }
2694 2688
2695 } 2689 }
2696 2690
2697 seq_begin = cmdbuf_ptr; 2691 seq_begin = cmdbuf_ptr;
… …
3493 { 3487 {
3494 /* 3488 /*
3495 * commands 3489 * commands
3496 */ 3490 */
3497 case 1: /* deiconify window */ 3491 case 1: /* deiconify window */
3498 XMapWindow (disp, TermWin.parent[0]); 3492 XMapWindow (disp, parent[0]);
3499 break; 3493 break;
3500 case 2: /* iconify window */ 3494 case 2: /* iconify window */
3501 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3495 XIconifyWindow (disp, parent[0], display->screen);
3502 break; 3496 break;
3503 case 3: /* set position (pixels) */ 3497 case 3: /* set position (pixels) */
3504 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3498 XMoveWindow (disp, parent[0], args[1], args[2]);
3505 break; 3499 break;
3506 case 4: /* set size (pixels) */ 3500 case 4: /* set size (pixels) */
3507 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3501 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3508 break; 3502 break;
3509 case 5: /* raise window */ 3503 case 5: /* raise window */
3510 XRaiseWindow (disp, TermWin.parent[0]); 3504 XRaiseWindow (disp, parent[0]);
3511 break; 3505 break;
3512 case 6: /* lower window */ 3506 case 6: /* lower window */
3513 XLowerWindow (disp, TermWin.parent[0]); 3507 XLowerWindow (disp, parent[0]);
3514 break; 3508 break;
3515 case 7: /* refresh window */ 3509 case 7: /* refresh window */
3516 scr_touch (true); 3510 scr_touch (true);
3517 break; 3511 break;
3518 case 8: /* set size (chars) */ 3512 case 8: /* set size (chars) */
3519 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3513 set_widthheight ((unsigned int) (args[2] * fwidth),
3520 (unsigned int) (args[1] * TermWin.fheight)); 3514 (unsigned int) (args[1] * fheight));
3521 break; 3515 break;
3522 3516
3523 //case 9: NYI, TODO, restore maximized window or maximize window 3517 //case 9: NYI, TODO, restore maximized window or maximize window
3524 default: 3518 default:
3525 if (args[0] >= 24) /* set height (chars) */ 3519 if (args[0] >= 24) /* set height (chars) */
3526 set_widthheight ((unsigned int)TermWin.width, 3520 set_widthheight ((unsigned int)width,
3527 (unsigned int) (args[1] * TermWin.fheight)); 3521 (unsigned int) (args[1] * fheight));
3528 break; 3522 break;
3529 3523
3530 3524
3531 /* 3525 /*
3532 * reports - some output format copied from XTerm 3526 * reports - some output format copied from XTerm
3533 */ 3527 */
3534 case 11: /* report window state */ 3528 case 11: /* report window state */
3535 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3529 XGetWindowAttributes (disp, parent[0], &wattr);
3536 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3530 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3537 break; 3531 break;
3538 case 13: /* report window position */ 3532 case 13: /* report window position */
3539 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3533 XGetWindowAttributes (disp, parent[0], &wattr);
3540 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3534 XTranslateCoordinates (disp, parent[0], wattr.root,
3541 -wattr.border_width, -wattr.border_width, 3535 -wattr.border_width, -wattr.border_width,
3542 &x, &y, &wdummy); 3536 &x, &y, &wdummy);
3543 tt_printf ("\033[3;%d;%dt", x, y); 3537 tt_printf ("\033[3;%d;%dt", x, y);
3544 break; 3538 break;
3545 case 14: /* report window size (pixels) */ 3539 case 14: /* report window size (pixels) */
3546 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3540 XGetWindowAttributes (disp, parent[0], &wattr);
3547 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3541 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3548 break; 3542 break;
3549 case 18: /* report text area size (chars) */ 3543 case 18: /* report text area size (chars) */
3550 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3544 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3551 break; 3545 break;
3552 case 19: /* report window size (chars) */ 3546 case 19: /* report window size (chars) */
3553 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3547 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3554 break; 3548 break;
3555 case 20: /* report icon label */ 3549 case 20: /* report icon label */
3556 { 3550 {
3557 char *s; 3551 char *s;
3558 XGetIconName (disp, TermWin.parent[0], &s); 3552 XGetIconName (disp, parent[0], &s);
3559 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3553 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3560 XFree (s); 3554 XFree (s);
3561 } 3555 }
3562 break; 3556 break;
3563 case 21: /* report window title */ 3557 case 21: /* report window title */
3564 { 3558 {
3565 char *s; 3559 char *s;
3566 XFetchName (disp, TermWin.parent[0], &s); 3560 XFetchName (disp, parent[0], &s);
3567 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3561 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3568 XFree (s); 3562 XFree (s);
3569 } 3563 }
3570 break; 3564 break;
3571 } 3565 }
… …
3717 unsigned long bytes_after; 3711 unsigned long bytes_after;
3718 unsigned char *value = 0; 3712 unsigned char *value = 0;
3719 const char *str = ""; 3713 const char *str = "";
3720 3714
3721 if (prop 3715 if (prop
3722 && XGetWindowProperty (disp, TermWin.parent[0], 3716 && XGetWindowProperty (disp, parent[0],
3723 prop, 0, 1<<16, 0, AnyPropertyType, 3717 prop, 0, 1<<16, 0, AnyPropertyType,
3724 &actual_type, &actual_format, 3718 &actual_type, &actual_format,
3725 &nitems, &bytes_after, &value) == Success 3719 &nitems, &bytes_after, &value) == Success
3726 && actual_type != None 3720 && actual_type != None
3727 && actual_format == 8) 3721 && actual_format == 8)
… …
3739 { 3733 {
3740 *eq = 0; 3734 *eq = 0;
3741 set_utf8_property (display->atom (str), eq + 1); 3735 set_utf8_property (display->atom (str), eq + 1);
3742 } 3736 }
3743 else 3737 else
3744 XDeleteProperty (disp, TermWin.parent[0], 3738 XDeleteProperty (disp, parent[0],
3745 display->atom (str)); 3739 display->atom (str));
3746 } 3740 }
3747 break; 3741 break;
3748 3742
3749 case XTerm_Color: 3743 case XTerm_Color:
… …
3874 case URxvt_italicFont: 3868 case URxvt_italicFont:
3875 case URxvt_boldItalicFont: 3869 case URxvt_boldItalicFont:
3876#endif 3870#endif
3877 if (query) 3871 if (query)
3878 tt_printf ("\33]%d;%-.250s%c", saveop, 3872 tt_printf ("\33]%d;%-.250s%c", saveop,
3879 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3873 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3880 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3874 ? fontset[op - URxvt_font]->fontdesc : "",
3881 resp); 3875 resp);
3882 else 3876 else
3883 { 3877 {
3884 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3878 const char *&res = rs[Rs_font + (op - URxvt_font)];
3885 3879
… …
4052 */ 4046 */
4053 PrivMode (1, PrivMode_vt52); 4047 PrivMode (1, PrivMode_vt52);
4054 break; 4048 break;
4055 case 3: /* 80/132 */ 4049 case 3: /* 80/132 */
4056 if (priv_modes & PrivMode_132OK) 4050 if (priv_modes & PrivMode_132OK)
4057 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4051 set_widthheight (((state ? 132 : 80) * fwidth), height);
4058 break; 4052 break;
4059 case 4: /* smooth scrolling */ 4053 case 4: /* smooth scrolling */
4060 if (state) 4054 if (state)
4061 options &= ~Opt_jumpScroll; 4055 options &= ~Opt_jumpScroll;
4062 else 4056 else

Diff Legend

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