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.204 by root, Wed Jul 13 02:47:02 2005 UTC vs.
Revision 1.227 by root, Mon Jan 2 15:35:43 2006 UTC

43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
53
54#if HAVE_SCHED_YIELD
55# include <sched.h>
56#endif
52 57
53#ifdef KEYSYM_RESOURCE 58#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 59# include "keyboard.h"
55#endif 60#endif
56 61
135rxvt_term::iso14755_54 (int x, int y) 140rxvt_term::iso14755_54 (int x, int y)
136{ 141{
137 x = Pixel2Col (x); 142 x = Pixel2Col (x);
138 y = Pixel2Row (y); 143 y = Pixel2Row (y);
139 144
140 if (x < 0 || x >= TermWin.ncol 145 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 146 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 147 return;
143 148
144 for (;;) 149 for (;;)
145 { 150 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 151 const line_t &l = ROW(y - view_start);
152
153 text_t t = l.t[x];
147 154
148 if (t != NOCHAR || !x) 155 if (t != NOCHAR || !x)
149 { 156 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 157 iso14755_51 (l.t[x], l.r[x], x, y);
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54; 158 iso14755buf = ISO_14755_54;
153 break; 159 break;
154 } 160 }
155 161
156 x--; 162 x--;
157 } 163 }
158
159} 164}
160#endif
161 165
162#if ENABLE_OVERLAY
163void 166void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 167rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 168{
166 rxvt_fontset *fs = FONTSET (r); 169 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 170 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 171 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 172 int len;
170 173
171 fname = rxvt_utf8towcs (f->name); 174 fname = rxvt_utf8towcs (f->name);
172 175
173#if ENABLE_COMBINING 176# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 177 if (IS_COMPOSE (ch))
175 { 178 {
176 len = rxvt_composite.expand (ch, 0); 179 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 180 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 181 rxvt_composite.expand (ch, chr);
179 } 182 }
180 else 183 else
181#endif 184# endif
182 { 185 {
183 ch2 = ch; 186 ch2 = ch;
184 187
185 alloc = 0; 188 alloc = 0;
186 chr = &ch2; 189 chr = &ch2;
187 len = 1; 190 len = 1;
188 } 191 }
189 192
193 char attr[80]; // plenty
194
195 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
196 (int)r,
197 fgcolor_of (r), bgcolor_of (r),
198 r & RS_Bold ? " bold" : "",
199 r & RS_Italic ? " italic" : "",
200 r & RS_Blink ? " blink" : "",
201 r & RS_RVid ? " rvid" : "",
202 r & RS_Uline ? " uline" : "",
203 r & RS_Careful ? " careful" : "");
204
190 int width = wcswidth (fname, wcslen (fname)); 205 int width = wcswidth (fname, wcslen (fname));
191 206
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 207 max_it (width, 8+5); // for char + hey
208 max_it (width, strlen (attr));
209
210 if (y >= 0)
211 {
212 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
213 x = 0;
214 }
215
216 scr_overlay_new (x, y, width, len + 2);
193 217
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 218 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 219
196 for (int y = 0; y < len; y++) 220 for (int y = 0; y < len; y++)
197 { 221 {
200 ch = *chr++; 224 ch = *chr++;
201 225
202 sprintf (buf, "%8x", ch); 226 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 227 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 228 scr_overlay_set (9, y, '=');
205#if !UNICODE3 229# if !UNICODE3
206 if (ch >= 0x10000) 230 if (ch >= 0x10000)
207 ch = 0xfffd; 231 ch = 0xfffd;
208#endif 232# endif
209 scr_overlay_set (11, y, ch, r); 233 scr_overlay_set (11, y, ch, r);
210 scr_overlay_set (12, y, NOCHAR, r); 234 scr_overlay_set (12, y, NOCHAR, r);
211 } 235 }
212 236
237 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 238 scr_overlay_set (0, len + 1, fname);
214 239
215 free (fname); 240 free (fname);
216 241
217#if ENABLE_COMBINING 242# if ENABLE_COMBINING
218 if (alloc) 243 if (alloc)
219 delete [] alloc; 244 delete [] alloc;
220#endif 245# endif
221} 246}
222#endif 247#endif
223 248
224void 249void
225rxvt_term::commit_iso14755 () 250rxvt_term::commit_iso14755 ()
366#ifdef KEYSYM_RESOURCE 391#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state)) 392 if (keyboard->dispatch (this, keysym, ev.state))
368 return; 393 return;
369#endif 394#endif
370 395
371 if (TermWin.saveLines) 396 if (saveLines)
372 { 397 {
373#ifdef UNSHIFTED_SCROLLKEYS 398#ifdef UNSHIFTED_SCROLLKEYS
374 if (!ctrl && !meta) 399 if (!ctrl && !meta)
375#else 400#else
376 if (IS_SCROLL_MOD) 401 if (IS_SCROLL_MOD)
377#endif 402#endif
378 { 403 {
379 int lnsppg; 404 int lnsppg;
380 405
381#ifdef PAGING_CONTEXT_LINES 406#ifdef PAGING_CONTEXT_LINES
382 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 407 lnsppg = nrow - PAGING_CONTEXT_LINES;
383#else 408#else
384 lnsppg = TermWin.nrow * 4 / 5; 409 lnsppg = nrow * 4 / 5;
385#endif 410#endif
386 if (keysym == XK_Prior) 411 if (keysym == XK_Prior)
387 { 412 {
388 scr_page (UP, lnsppg); 413 scr_page (UP, lnsppg);
389 return; 414 return;
844 } 869 }
845 870
846 if (len <= 0) 871 if (len <= 0)
847 return; /* not mapped */ 872 return; /* not mapped */
848 873
849 if (options & Opt_scrollTtyKeypress) 874 if (OPTION (Opt_scrollTtyKeypress))
850 if (TermWin.view_start) 875 if (view_start)
851 { 876 {
852 TermWin.view_start = 0; 877 view_start = 0;
853 want_refresh = 1; 878 want_refresh = 1;
854 } 879 }
855 880
856 /* 881 /*
857 * these modifications only affect the static keybuffer 882 * these modifications only affect the static keybuffer
960 SET_LOCALE (locale); 985 SET_LOCALE (locale);
961 986
962 display->flush (); 987 display->flush ();
963 988
964 if (want_refresh && !flush_ev.active) 989 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01); 990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
966} 991}
967 992
968void 993void
969rxvt_term::flush_cb (time_watcher &w) 994rxvt_term::flush_cb (time_watcher &w)
970{ 995{
1034{ 1059{
1035 if (mouse_slip_wheel_speed == 0 1060 if (mouse_slip_wheel_speed == 0
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1062 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1063 {
1039 if (TermWin.view_start == TermWin.nscrolled || 1064 if (view_start == nsaved ||
1040 TermWin.view_start == 0) 1065 view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1066 mouse_slip_wheel_speed = 0;
1042 1067
1043 refresh_type |= SMOOTH_REFRESH; 1068 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1069 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1046 } 1071 }
1047} 1072}
1048#endif 1073#endif
1049 1074
1075#if HAVE_SCHED_YIELD
1076static struct event_handler
1077{
1078 check_watcher cw_yield;
1079
1080 void yield (check_watcher &w)
1081 {
1082 sched_yield ();
1083 w.stop ();
1084 }
1085
1086 event_handler ()
1087 : cw_yield (this, &event_handler::yield)
1088 {
1089 }
1090} event_handler;
1091#endif
1092
1050bool 1093bool
1051rxvt_term::pty_fill () 1094rxvt_term::pty_fill ()
1052{ 1095{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1097
1060 1103
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1104 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1105 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1106 cmdbuf_endp = cmdbuf_ptr + n;
1064 1107
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1066 1109
1067 if (n > 0) 1110 if (r > 0)
1068 { 1111 {
1069 cmdbuf_endp += n; 1112 cmdbuf_endp += r;
1070 return true; 1113 return true;
1071 } 1114 }
1072 else if (n < 0 && errno != EAGAIN) 1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 {
1117#if HAVE_SCHED_YIELD
1118 event_handler.cw_yield.start ();
1119#endif
1120 }
1121 else
1122 {
1123 pty_ev.stop ();
1124
1125 if (!OPTION (Opt_hold))
1073 destroy (); 1126 destroy ();
1127 }
1074 1128
1075 return false; 1129 return false;
1076} 1130}
1077 1131
1078void 1132void
1092} 1146}
1093 1147
1094void 1148void
1095rxvt_term::pointer_unblank () 1149rxvt_term::pointer_unblank ()
1096{ 1150{
1097 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1151 XDefineCursor (display->display, vt, TermWin_cursor);
1098 recolour_cursor (); 1152 recolour_cursor ();
1099 1153
1100#ifdef POINTER_BLANK 1154#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1155 hidden_pointer = 0;
1102 1156
1103 if (options & Opt_pointerBlank) 1157 if (OPTION (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1158 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1159#endif
1106} 1160}
1107 1161
1108#ifdef POINTER_BLANK 1162#ifdef POINTER_BLANK
1109void 1163void
1110rxvt_term::pointer_blank () 1164rxvt_term::pointer_blank ()
1111{ 1165{
1112 if (! (options & Opt_pointerBlank)) 1166 if (! OPTION (Opt_pointerBlank))
1113 return; 1167 return;
1114 1168
1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1169 XDefineCursor (display->display, vt, display->blank_cursor);
1116 XFlush (display->display); 1170 XFlush (display->display);
1117 1171
1118 hidden_pointer = 1; 1172 hidden_pointer = 1;
1119} 1173}
1120 1174
1215 1269
1216 SET_R (this); 1270 SET_R (this);
1217 SET_LOCALE (locale); 1271 SET_LOCALE (locale);
1218 1272
1219#if defined(CURSOR_BLINK) 1273#if defined(CURSOR_BLINK)
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1274 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1221 { 1275 {
1222 if (hidden_cursor) 1276 if (hidden_cursor)
1223 { 1277 {
1224 hidden_cursor = 0; 1278 hidden_cursor = 0;
1225 want_refresh = 1; 1279 want_refresh = 1;
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1282 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1229 } 1283 }
1230#endif 1284#endif
1231 1285
1232#if defined(POINTER_BLANK) 1286#if defined(POINTER_BLANK)
1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1287 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1234 { 1288 {
1235 if (ev.type == MotionNotify 1289 if (ev.type == MotionNotify
1236 || ev.type == ButtonPress 1290 || ev.type == ButtonPress
1237 || ev.type == ButtonRelease) 1291 || ev.type == ButtonRelease)
1238 if (hidden_pointer) 1292 if (hidden_pointer)
1422 case FocusOut: 1476 case FocusOut:
1423 focus_out (); 1477 focus_out ();
1424 break; 1478 break;
1425 1479
1426 case ConfigureNotify: 1480 case ConfigureNotify:
1427 if (ev.xconfigure.window == TermWin.parent[0]) 1481 if (ev.xconfigure.window == parent[0])
1428 { 1482 {
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)); 1483 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1484 ;
1438 1485
1439 if (szHint.width != width || szHint.height != height) 1486 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1440 { 1487 {
1441 seen_resize = 1; 1488 seen_resize = 1;
1442 resize_all_windows (width, height, 1); 1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1443 } 1490 }
1444 1491
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1492#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent) 1493 if (OPTION (Opt_transparent))
1447 check_our_parents (); 1494 check_our_parents ();
1448#endif 1495#endif
1449 } 1496 }
1450 break; 1497 break;
1451 1498
1468 case SelectionRequest: 1515 case SelectionRequest:
1469 selection_send (ev.xselectionrequest); 1516 selection_send (ev.xselectionrequest);
1470 break; 1517 break;
1471 1518
1472 case UnmapNotify: 1519 case UnmapNotify:
1473 TermWin.mapped = 0; 1520 mapped = 0;
1474#ifdef TEXT_BLINK 1521#ifdef TEXT_BLINK
1475 text_blink_ev.stop (); 1522 text_blink_ev.stop ();
1476#endif 1523#endif
1477 break; 1524 break;
1478 1525
1479 case MapNotify: 1526 case MapNotify:
1480 TermWin.mapped = 1; 1527 mapped = 1;
1481#ifdef TEXT_BLINK 1528#ifdef TEXT_BLINK
1482 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1529 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1483#endif 1530#endif
1484 break; 1531 break;
1485 1532
1489 break; 1536 break;
1490#endif /* TRANSPARENT */ 1537#endif /* TRANSPARENT */
1491 1538
1492 case GraphicsExpose: 1539 case GraphicsExpose:
1493 case Expose: 1540 case Expose:
1494 if (ev.xany.window == TermWin.vt) 1541 if (ev.xany.window == vt)
1495 { 1542 {
1496 do 1543 do
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1500 1547
1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1502 1549
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1504 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1505 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1506 1553
1507 scr_refresh (refresh_type); 1554 scr_refresh (refresh_type);
1508 } 1555 }
1524 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1571 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1525 menubar_expose (); 1572 menubar_expose ();
1526#endif 1573#endif
1527 1574
1528#ifdef TRANSPARENT 1575#ifdef TRANSPARENT
1529 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1576 if (am_transparent && ev.xany.window == parent[0])
1530 XClearWindow (disp, ev.xany.window); 1577 XClearWindow (disp, ev.xany.window);
1531#endif 1578#endif
1532 } 1579 }
1533 break; 1580 break;
1534 1581
1545 } 1592 }
1546#endif 1593#endif
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break; 1595 break;
1549 1596
1550 if (ev.xany.window == TermWin.vt) 1597 if (ev.xany.window == vt)
1551 { 1598 {
1552 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1599 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1600 {
1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1601 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1555 ; 1602 ;
1556 1603
1557 XQueryPointer (disp, TermWin.vt, 1604 XQueryPointer (disp, vt,
1558 &unused_root, &unused_child, 1605 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1606 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1607 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1608 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1609#ifdef MOUSE_THRESHOLD
1574#endif 1621#endif
1575 selection_extend (ev.xbutton.x, ev.xbutton.y, 1622 selection_extend (ev.xbutton.x, ev.xbutton.y,
1576 ev.xbutton.state & Button3Mask ? 2 : 0); 1623 ev.xbutton.state & Button3Mask ? 2 : 0);
1577 1624
1578#ifdef SELECTION_SCROLLING 1625#ifdef SELECTION_SCROLLING
1579 if (ev.xbutton.y < TermWin.int_bwidth 1626 if (ev.xbutton.y < int_bwidth
1580 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1627 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1581 { 1628 {
1582 int dist; 1629 int dist;
1583 1630
1584 /* don't clobber the current delay if we are 1631 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1632 * already in the middle of scrolling.
1593 selection_save_x = ev.xbutton.x; 1640 selection_save_x = ev.xbutton.x;
1594 selection_save_y = ev.xbutton.y; 1641 selection_save_y = ev.xbutton.y;
1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1642 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1596 1643
1597 /* calc number of lines to scroll */ 1644 /* calc number of lines to scroll */
1598 if (ev.xbutton.y < TermWin.int_bwidth) 1645 if (ev.xbutton.y < int_bwidth)
1599 { 1646 {
1600 scroll_selection_dir = UP; 1647 scroll_selection_dir = UP;
1601 dist = TermWin.int_bwidth - ev.xbutton.y; 1648 dist = int_bwidth - ev.xbutton.y;
1602 } 1649 }
1603 else 1650 else
1604 { 1651 {
1605 scroll_selection_dir = DN; 1652 scroll_selection_dir = DN;
1606 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1653 dist = ev.xbutton.y - (int_bwidth + height);
1607 } 1654 }
1608 1655
1609 scroll_selection_lines = Pixel2Height (dist) 1656 scroll_selection_lines = Pixel2Height (dist)
1610 / SELECTION_SCROLL_LINE_SPEEDUP 1657 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1; 1658 + 1;
1612 MIN_IT (scroll_selection_lines, 1659 min_it (scroll_selection_lines,
1613 SELECTION_SCROLL_MAX_LINES); 1660 SELECTION_SCROLL_MAX_LINES);
1614 } 1661 }
1615 else 1662 else
1616 { 1663 {
1617 /* we are within the text window, so we 1664 /* we are within the text window, so we
1648} 1695}
1649 1696
1650void 1697void
1651rxvt_term::focus_in () 1698rxvt_term::focus_in ()
1652{ 1699{
1653 if (!TermWin.focus) 1700 if (!focus)
1654 { 1701 {
1655 TermWin.focus = 1; 1702 focus = 1;
1656 want_refresh = 1; 1703 want_refresh = 1;
1704
1705 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1706
1657#ifdef USE_XIM 1707#if USE_XIM
1658 if (Input_Context != NULL) 1708 if (Input_Context != NULL)
1659 { 1709 {
1660 IMSetStatusPosition (); 1710 IMSetStatusPosition ();
1661 XSetICFocus (Input_Context); 1711 XSetICFocus (Input_Context);
1662 } 1712 }
1663#endif 1713#endif
1664#ifdef CURSOR_BLINK 1714#if CURSOR_BLINK
1665 if (options & Opt_cursorBlink) 1715 if (OPTION (Opt_cursorBlink))
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1667#endif 1717#endif
1668#ifdef OFF_FOCUS_FADING 1718#if OFF_FOCUS_FADING
1669 if (rs[Rs_fade]) 1719 if (rs[Rs_fade])
1670 { 1720 {
1671 pix_colors = pix_colors_focused; 1721 pix_colors = pix_colors_focused;
1672 scr_recolour (); 1722 scr_recolour ();
1673 } 1723 }
1676} 1726}
1677 1727
1678void 1728void
1679rxvt_term::focus_out () 1729rxvt_term::focus_out ()
1680{ 1730{
1681 if (TermWin.focus) 1731 if (focus)
1682 { 1732 {
1683 TermWin.focus = 0; 1733 focus = 0;
1684 want_refresh = 1; 1734 want_refresh = 1;
1685 1735
1736 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1737
1686#if ENABLE_FRILLS || ISO_14755 1738#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf)
1740 {
1687 iso14755buf = 0; 1741 iso14755buf = 0;
1688#endif
1689#if ENABLE_OVERLAY 1742# if ENABLE_OVERLAY
1690 scr_overlay_off (); 1743 scr_overlay_off ();
1691#endif 1744# endif
1745 }
1746#endif
1692#ifdef USE_XIM 1747#if USE_XIM
1693 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context); 1749 XUnsetICFocus (Input_Context);
1695#endif 1750#endif
1696#ifdef CURSOR_BLINK 1751#if CURSOR_BLINK
1697 if (options & Opt_cursorBlink) 1752 if (OPTION (Opt_cursorBlink))
1698 cursor_blink_ev.stop (); 1753 cursor_blink_ev.stop ();
1699 hidden_cursor = 0; 1754 hidden_cursor = 0;
1700#endif 1755#endif
1701#ifdef OFF_FOCUS_FADING 1756#if OFF_FOCUS_FADING
1702 if (rs[Rs_fade]) 1757 if (rs[Rs_fade])
1703 { 1758 {
1704 pix_colors = pix_colors_unfocused; 1759 pix_colors = pix_colors_unfocused;
1705 scr_recolour (); 1760 scr_recolour ();
1706 } 1761 }
1726 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1781 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1727 return; 1782 return;
1728 1783
1729 /* FALLTHROUGH */ 1784 /* FALLTHROUGH */
1730 case ReparentNotify: 1785 case ReparentNotify:
1731 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1786 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1732 want_refresh = want_full_refresh = 1; 1787 want_refresh = want_full_refresh = 1;
1733 break; 1788 break;
1734 } 1789 }
1735} 1790}
1736#endif 1791#endif
1745 reportmode = !! (priv_modes & PrivMode_mouse_report); 1800 reportmode = !! (priv_modes & PrivMode_mouse_report);
1746 1801
1747 /* 1802 /*
1748 * VT window processing of button press 1803 * VT window processing of button press
1749 */ 1804 */
1750 if (ev.window == TermWin.vt) 1805 if (ev.window == vt)
1751 { 1806 {
1752#if ISO_14755 1807#if ISO_14755
1753 // 5.4 1808 // 5.4
1754 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1809 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1755 { 1810 {
1960 case Button3: 2015 case Button3:
1961 if (scrollBar.style != R_SB_XTERM) 2016 if (scrollBar.style != R_SB_XTERM)
1962 { 2017 {
1963 if (scrollbar_above_slider (ev.y)) 2018 if (scrollbar_above_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 2019# ifdef RXVT_SCROLL_FULL
1965 scr_page (UP, TermWin.nrow - 1); 2020 scr_page (UP, nrow - 1);
1966# else 2021# else
1967 scr_page (UP, TermWin.nrow / 4); 2022 scr_page (UP, nrow / 4);
1968# endif 2023# endif
1969 else if (scrollbar_below_slider (ev.y)) 2024 else if (scrollbar_below_slider (ev.y))
1970# ifdef RXVT_SCROLL_FULL 2025# ifdef RXVT_SCROLL_FULL
1971 scr_page (DN, TermWin.nrow - 1); 2026 scr_page (DN, nrow - 1);
1972# else 2027# else
1973 scr_page (DN, TermWin.nrow / 4); 2028 scr_page (DN, nrow / 4);
1974# endif 2029# endif
1975 else 2030 else
1976 scrollBar.setMotion (); 2031 scrollBar.setMotion ();
1977 } 2032 }
1978 else 2033 else
1979 { 2034 {
1980 scr_page ((ev.button == Button1 ? DN : UP), 2035 scr_page ((ev.button == Button1 ? DN : UP),
1981 (TermWin.nrow 2036 (nrow
1982 * scrollbar_position (ev.y) 2037 * scrollbar_position (ev.y)
1983 / scrollbar_size ())); 2038 / scrollbar_size ()));
1984 } 2039 }
1985 2040
1986 break; 2041 break;
2018#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
2019 if (sel_scroll_ev.active) 2074 if (sel_scroll_ev.active)
2020 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2021#endif 2076#endif
2022 2077
2023 if (ev.window == TermWin.vt) 2078 if (ev.window == vt)
2024 { 2079 {
2025#if ISO_14755 2080#if ISO_14755
2026 // 5.4 2081 // 5.4
2027 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2082 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2028 return; 2083 return;
2078 2133
2079 v = ev.button == Button4 ? UP : DN; 2134 v = ev.button == Button4 ? UP : DN;
2080 2135
2081 if (ev.state & ShiftMask) 2136 if (ev.state & ShiftMask)
2082 i = 1; 2137 i = 1;
2083 else if (options & Opt_mouseWheelScrollPage) 2138 else if (OPTION (Opt_mouseWheelScrollPage))
2084 i = TermWin.nrow - 1; 2139 i = nrow - 1;
2085 else 2140 else
2086 i = 5; 2141 i = 5;
2087 2142
2088# ifdef MOUSE_SLIP_WHEELING 2143# ifdef MOUSE_SLIP_WHEELING
2089 if (ev.state & ControlMask) 2144 if (ev.state & ControlMask)
2090 { 2145 {
2091 mouse_slip_wheel_speed += v ? -1 : 1; 2146 mouse_slip_wheel_speed += v ? -1 : 1;
2092 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2147 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; 2148 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2094 2149
2095 if (slip_wheel_ev.at < NOW) 2150 if (slip_wheel_ev.at < NOW)
2096 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2151 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2097 2152
2098 slip_wheel_ev.start (); 2153 slip_wheel_ev.start ();
2374 XWindowAttributes wattr, wrootattr; 2429 XWindowAttributes wattr, wrootattr;
2375 dDisp; 2430 dDisp;
2376 2431
2377 pchanged = 0; 2432 pchanged = 0;
2378 2433
2379 if (!(options & Opt_transparent)) 2434 if (!OPTION (Opt_transparent))
2380 return pchanged; /* Don't try any more */ 2435 return pchanged; /* Don't try any more */
2381 2436
2382 XGetWindowAttributes (disp, display->root, &wrootattr); 2437 XGetWindowAttributes (disp, display->root, &wrootattr);
2383 rootdepth = wrootattr.depth; 2438 rootdepth = wrootattr.depth;
2384 2439
2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2440 XGetWindowAttributes (disp, parent[0], &wattr);
2386 2441
2387 if (rootdepth != wattr.depth) 2442 if (rootdepth != wattr.depth)
2388 { 2443 {
2389 if (am_transparent) 2444 if (am_transparent)
2390 { 2445 {
2391 pchanged = 1; 2446 pchanged = 1;
2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2447 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2393 am_transparent = am_pixmap_trans = 0; 2448 am_transparent = am_pixmap_trans = 0;
2394 } 2449 }
2395 2450
2396 return pchanged; /* Don't try any more */ 2451 return pchanged; /* Don't try any more */
2397 } 2452 }
2438 Window cr; 2493 Window cr;
2439 XImage *image; 2494 XImage *image;
2440 GC gc; 2495 GC gc;
2441 XGCValues gcvalue; 2496 XGCValues gcvalue;
2442 2497
2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2498 XTranslateCoordinates (disp, parent[0], display->root,
2444 0, 0, &sx, &sy, &cr); 2499 0, 0, &sx, &sy, &cr);
2445 nw = (unsigned int)szHint.width; 2500 nw = (unsigned int)szHint.width;
2446 nh = (unsigned int)szHint.height; 2501 nh = (unsigned int)szHint.height;
2447 nx = ny = 0; 2502 nx = ny = 0;
2448 2503
2458 nh += sy; 2513 nh += sy;
2459 ny = -sy; 2514 ny = -sy;
2460 sy = 0; 2515 sy = 0;
2461 } 2516 }
2462 2517
2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2518 min_it (nw, (unsigned int) (wrootattr.width - sx));
2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2519 min_it (nh, (unsigned int) (wrootattr.height - sy));
2465 2520
2466 XSync (disp, False); 2521 XSync (disp, False);
2467 allowedxerror = -1; 2522 allowedxerror = -1;
2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2523 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2469 2524
2474 if (image == NULL) 2529 if (image == NULL)
2475 { 2530 {
2476 if (am_transparent && am_pixmap_trans) 2531 if (am_transparent && am_pixmap_trans)
2477 { 2532 {
2478 pchanged = 1; 2533 pchanged = 1;
2479 if (TermWin.pixmap != None) 2534 if (pixmap != None)
2480 { 2535 {
2481 XFreePixmap (disp, TermWin.pixmap); 2536 XFreePixmap (disp, pixmap);
2482 TermWin.pixmap = None; 2537 pixmap = None;
2483 } 2538 }
2484 } 2539 }
2485 2540
2486 am_pixmap_trans = 0; 2541 am_pixmap_trans = 0;
2487 } 2542 }
2488 else 2543 else
2489 { 2544 {
2490 if (TermWin.pixmap != None) 2545 if (pixmap != None)
2491 XFreePixmap (disp, TermWin.pixmap); 2546 XFreePixmap (disp, pixmap);
2492 2547
2493#if TINTING 2548#if TINTING
2494 if (ISSET_PIXCOLOR (Color_tint)) 2549 if (ISSET_PIXCOLOR (Color_tint))
2495 { 2550 {
2496 unsigned short rm, gm, bm; 2551 unsigned short rm, gm, bm;
2500 2555
2501 ShadeXImage (display, image, shade, rm, gm, bm); 2556 ShadeXImage (display, image, shade, rm, gm, bm);
2502 } 2557 }
2503#endif 2558#endif
2504 2559
2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2560 pixmap = XCreatePixmap (disp, vt,
2506 szHint.width, szHint.height, image->depth); 2561 szHint.width, szHint.height, image->depth);
2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2562 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2563 XPutImage (disp, pixmap, gc, image, 0, 0,
2509 nx, ny, image->width, image->height); 2564 nx, ny, image->width, image->height);
2510 XFreeGC (disp, gc); 2565 XFreeGC (disp, gc);
2511 XDestroyImage (image); 2566 XDestroyImage (image);
2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2567 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2513 XClearWindow (disp, TermWin.parent[0]); 2568 XClearWindow (disp, parent[0]);
2514 2569
2515 if (!am_transparent || !am_pixmap_trans) 2570 if (!am_transparent || !am_pixmap_trans)
2516 pchanged = 1; 2571 pchanged = 1;
2517 2572
2518 am_transparent = am_pixmap_trans = 1; 2573 am_transparent = am_pixmap_trans = 1;
2519 } 2574 }
2520 } 2575 }
2521 2576
2522 if (am_pixmap_trans) 2577 if (am_pixmap_trans)
2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2524 else 2579 else
2525 { 2580 {
2526 unsigned int n; 2581 unsigned int n;
2527 /* 2582 /*
2528 * InheritPixmap transparency 2583 * InheritPixmap transparency
2529 */ 2584 */
2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2531 { 2586 {
2532 oldp = TermWin.parent[i]; 2587 oldp = parent[i];
2533 XQueryTree (disp, TermWin.parent[i - 1], &root, 2588 XQueryTree (disp, parent[i - 1], &root,
2534 &TermWin.parent[i], &list, &n); 2589 &parent[i], &list, &n);
2535 XFree (list); 2590 XFree (list);
2536 2591
2537 if (TermWin.parent[i] == display->root) 2592 if (parent[i] == display->root)
2538 { 2593 {
2539 if (oldp != None) 2594 if (oldp != None)
2540 pchanged = 1; 2595 pchanged = 1;
2541 2596
2542 break; 2597 break;
2543 } 2598 }
2544 2599
2545 if (oldp != TermWin.parent[i]) 2600 if (oldp != parent[i])
2546 pchanged = 1; 2601 pchanged = 1;
2547 } 2602 }
2548 2603
2549 n = 0; 2604 n = 0;
2550 2605
2551 if (pchanged) 2606 if (pchanged)
2552 { 2607 {
2553 for (; n < (unsigned int)i; n++) 2608 for (; n < (unsigned int)i; n++)
2554 { 2609 {
2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2610 XGetWindowAttributes (disp, parent[n], &wattr);
2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2611 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2557 { 2612 {
2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2613 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2559 break; 2614 break;
2560 } 2615 }
2561 } 2616 }
2562 } 2617 }
2563 2618
2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2619 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2565 { 2620 {
2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2621 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2622 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2568 am_transparent = 0; 2623 am_transparent = 0;
2569 /* XXX: also turn off Opt_transparent? */ 2624 /* XXX: also turn off Opt_transparent? */
2570 } 2625 }
2571 else 2626 else
2572 { 2627 {
2575 * needed for fvwm2.2.2 (and before?) */ 2630 * needed for fvwm2.2.2 (and before?) */
2576 sleep (1); 2631 sleep (1);
2577#endif 2632#endif
2578 for (n = 0; n < (unsigned int)i; n++) 2633 for (n = 0; n < (unsigned int)i; n++)
2579 { 2634 {
2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2635 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2581 XClearWindow (disp, TermWin.parent[n]); 2636 XClearWindow (disp, parent[n]);
2582 } 2637 }
2583 2638
2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 am_transparent = 1; 2640 am_transparent = 1;
2586 } 2641 }
2587 2642
2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2643 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 TermWin.parent[i] = None; 2644 parent[i] = None;
2590 } 2645 }
2591 2646
2592 if (scrollBar.win) 2647 if (scrollBar.win)
2593 { 2648 {
2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2649 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2646 /* Read a text string from the input buffer */ 2701 /* Read a text string from the input buffer */
2647 unicode_t buf[UBUFSIZ]; 2702 unicode_t buf[UBUFSIZ];
2648 bool refreshnow = false; 2703 bool refreshnow = false;
2649 int nlines = 0; 2704 int nlines = 0;
2650 unicode_t *str = buf; 2705 unicode_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ); 2706 unicode_t *eol = str + min (ncol, UBUFSIZ);
2652 2707
2653 for (;;) 2708 for (;;)
2654 { 2709 {
2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2710 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2656 break; 2711 break;
2657 2712
2658 *str++ = ch; 2713 *str++ = ch;
2659 2714
2660 if (ch == C0_LF || str >= eol) 2715 if (ch == C0_LF || str >= eol)
2661 { 2716 {
2717 if (ch == C0_LF)
2662 nlines++; 2718 nlines++;
2719
2663 refresh_count++; 2720 refresh_count++;
2664 2721
2665 if (!(options & Opt_jumpScroll) 2722 if (!OPTION (Opt_jumpScroll)
2666 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2723 || (refresh_count >= refresh_limit * (nrow - 1)))
2667 { 2724 {
2668 refreshnow = true; 2725 refreshnow = true;
2726 refresh_count = 0;
2669 ch = NOCHAR; 2727 ch = NOCHAR;
2670 break; 2728 break;
2671 } 2729 }
2672 2730
2673 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2731 // scr_add_lines only works for nlines <= nrow - 1.
2674 if (nlines >= TermWin.nrow - 1) 2732 if (nlines >= nrow - 1)
2675 { 2733 {
2676 scr_add_lines (buf, nlines, str - buf); 2734 scr_add_lines (buf, nlines, str - buf);
2677 nlines = 0; 2735 nlines = 0;
2678 str = buf; 2736 str = buf;
2679 eol = str + min (TermWin.ncol, UBUFSIZ); 2737 eol = str + min (ncol, UBUFSIZ);
2680 } 2738 }
2681 2739
2682 if (str >= eol) 2740 if (str >= eol)
2683 { 2741 {
2684 if (eol >= buf + UBUFSIZ) 2742 if (eol >= buf + UBUFSIZ)
2685 { 2743 {
2686 ch = NOCHAR; 2744 ch = NOCHAR;
2687 break; 2745 break;
2688 } 2746 }
2689 else 2747 else
2690 eol = min (eol + TermWin.ncol, buf + UBUFSIZ); 2748 eol = min (eol + ncol, buf + UBUFSIZ);
2691 } 2749 }
2692 2750
2693 } 2751 }
2694 2752
2695 seq_begin = cmdbuf_ptr; 2753 seq_begin = cmdbuf_ptr;
2704 * the number of pages between refreshes is refresh_limit, which 2762 * the number of pages between refreshes is refresh_limit, which
2705 * is incremented here because we must be doing flat-out scrolling. 2763 * is incremented here because we must be doing flat-out scrolling.
2706 */ 2764 */
2707 if (refreshnow) 2765 if (refreshnow)
2708 { 2766 {
2709 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2767 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2710 refresh_limit++; 2768 refresh_limit++;
2711 else 2769 else
2712 { 2770 {
2713 flag = true; 2771 flag = true;
2714 scr_refresh (refresh_type); 2772 scr_refresh (refresh_type);
2773 flush_ev.stop ();
2715 } 2774 }
2716 } 2775 }
2717 2776
2718 } 2777 }
2719 else 2778 else
3356 3415
3357 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3416 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3358 arg[0] = -arg[0]; 3417 arg[0] = -arg[0];
3359 /* FALLTHROUGH */ 3418 /* FALLTHROUGH */
3360 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3419 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3361 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3420 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3362 break; 3421 break;
3363 3422
3364 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3423 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3365 tt_write ((const unsigned char *)VT100_ANS, 3424 tt_write ((const unsigned char *)VT100_ANS,
3366 (unsigned int) (sizeof (VT100_ANS) - 1)); 3425 (unsigned int) (sizeof (VT100_ANS) - 1));
3378 break; 3437 break;
3379 case 6: /* CPR requested */ 3438 case 6: /* CPR requested */
3380 scr_report_position (); 3439 scr_report_position ();
3381 break; 3440 break;
3382 case 7: /* unofficial extension */ 3441 case 7: /* unofficial extension */
3383 if (options & Opt_insecure) 3442 if (OPTION (Opt_insecure))
3384 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3443 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3385 break; 3444 break;
3386 case 8: /* unofficial extension */ 3445 case 8: /* unofficial extension */
3387 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3446 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3388 break; 3447 break;
3491 { 3550 {
3492 /* 3551 /*
3493 * commands 3552 * commands
3494 */ 3553 */
3495 case 1: /* deiconify window */ 3554 case 1: /* deiconify window */
3496 XMapWindow (disp, TermWin.parent[0]); 3555 XMapWindow (disp, parent[0]);
3497 break; 3556 break;
3498 case 2: /* iconify window */ 3557 case 2: /* iconify window */
3499 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3558 XIconifyWindow (disp, parent[0], display->screen);
3500 break; 3559 break;
3501 case 3: /* set position (pixels) */ 3560 case 3: /* set position (pixels) */
3502 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3561 XMoveWindow (disp, parent[0], args[1], args[2]);
3503 break; 3562 break;
3504 case 4: /* set size (pixels) */ 3563 case 4: /* set size (pixels) */
3505 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3506 break; 3565 break;
3507 case 5: /* raise window */ 3566 case 5: /* raise window */
3508 XRaiseWindow (disp, TermWin.parent[0]); 3567 XRaiseWindow (disp, parent[0]);
3509 break; 3568 break;
3510 case 6: /* lower window */ 3569 case 6: /* lower window */
3511 XLowerWindow (disp, TermWin.parent[0]); 3570 XLowerWindow (disp, parent[0]);
3512 break; 3571 break;
3513 case 7: /* refresh window */ 3572 case 7: /* refresh window */
3514 scr_touch (true); 3573 scr_touch (true);
3515 break; 3574 break;
3516 case 8: /* set size (chars) */ 3575 case 8: /* set size (chars) */
3517 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3576 set_widthheight ((unsigned int) (args[2] * fwidth),
3518 (unsigned int) (args[1] * TermWin.fheight)); 3577 (unsigned int) (args[1] * fheight));
3519 break; 3578 break;
3520 3579
3521 //case 9: NYI, TODO, restore maximized window or maximize window 3580 //case 9: NYI, TODO, restore maximized window or maximize window
3522 default: 3581 default:
3523 if (args[0] >= 24) /* set height (chars) */ 3582 if (args[0] >= 24) /* set height (chars) */
3524 set_widthheight ((unsigned int)TermWin.width, 3583 set_widthheight ((unsigned int)width,
3525 (unsigned int) (args[1] * TermWin.fheight)); 3584 (unsigned int) (args[1] * fheight));
3526 break; 3585 break;
3527 3586
3528 3587
3529 /* 3588 /*
3530 * reports - some output format copied from XTerm 3589 * reports - some output format copied from XTerm
3531 */ 3590 */
3532 case 11: /* report window state */ 3591 case 11: /* report window state */
3533 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3592 XGetWindowAttributes (disp, parent[0], &wattr);
3534 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3593 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3535 break; 3594 break;
3536 case 13: /* report window position */ 3595 case 13: /* report window position */
3537 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3596 XGetWindowAttributes (disp, parent[0], &wattr);
3538 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3597 XTranslateCoordinates (disp, parent[0], wattr.root,
3539 -wattr.border_width, -wattr.border_width, 3598 -wattr.border_width, -wattr.border_width,
3540 &x, &y, &wdummy); 3599 &x, &y, &wdummy);
3541 tt_printf ("\033[3;%d;%dt", x, y); 3600 tt_printf ("\033[3;%d;%dt", x, y);
3542 break; 3601 break;
3543 case 14: /* report window size (pixels) */ 3602 case 14: /* report window size (pixels) */
3544 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3603 XGetWindowAttributes (disp, parent[0], &wattr);
3545 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3604 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3546 break; 3605 break;
3547 case 18: /* report text area size (chars) */ 3606 case 18: /* report text area size (chars) */
3548 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3607 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3549 break; 3608 break;
3550 case 19: /* report window size (chars) */ 3609 case 19: /* report window size (chars) */
3551 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3610 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3552 break; 3611 break;
3553 case 20: /* report icon label */ 3612 case 20: /* report icon label */
3554 { 3613 {
3555 char *s; 3614 char *s;
3556 XGetIconName (disp, TermWin.parent[0], &s); 3615 XGetIconName (disp, parent[0], &s);
3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3558 XFree (s); 3617 XFree (s);
3559 } 3618 }
3560 break; 3619 break;
3561 case 21: /* report window title */ 3620 case 21: /* report window title */
3562 { 3621 {
3563 char *s; 3622 char *s;
3564 XFetchName (disp, TermWin.parent[0], &s); 3623 XFetchName (disp, parent[0], &s);
3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3624 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3566 XFree (s); 3625 XFree (s);
3567 } 3626 }
3568 break; 3627 break;
3569 } 3628 }
3570} 3629}
3715 unsigned long bytes_after; 3774 unsigned long bytes_after;
3716 unsigned char *value = 0; 3775 unsigned char *value = 0;
3717 const char *str = ""; 3776 const char *str = "";
3718 3777
3719 if (prop 3778 if (prop
3720 && XGetWindowProperty (disp, TermWin.parent[0], 3779 && XGetWindowProperty (disp, parent[0],
3721 prop, 0, 1<<16, 0, AnyPropertyType, 3780 prop, 0, 1<<16, 0, AnyPropertyType,
3722 &actual_type, &actual_format, 3781 &actual_type, &actual_format,
3723 &nitems, &bytes_after, &value) == Success 3782 &nitems, &bytes_after, &value) == Success
3724 && actual_type != None 3783 && actual_type != None
3725 && actual_format == 8) 3784 && actual_format == 8)
3737 { 3796 {
3738 *eq = 0; 3797 *eq = 0;
3739 set_utf8_property (display->atom (str), eq + 1); 3798 set_utf8_property (display->atom (str), eq + 1);
3740 } 3799 }
3741 else 3800 else
3742 XDeleteProperty (disp, TermWin.parent[0], 3801 XDeleteProperty (disp, parent[0],
3743 display->atom (str)); 3802 display->atom (str));
3744 } 3803 }
3745 break; 3804 break;
3746 3805
3747 case XTerm_Color: 3806 case XTerm_Color:
3846 // TODO, when secure mode? 3905 // TODO, when secure mode?
3847 break; 3906 break;
3848 3907
3849#ifdef MENUBAR 3908#ifdef MENUBAR
3850 case URxvt_Menu: 3909 case URxvt_Menu:
3851 if (options & Opt_insecure) 3910 if (OPTION (Opt_insecure))
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3853 break; 3912 break;
3854#endif 3913#endif
3855#if 0 3914#if 0
3856 case XTerm_dumpscreen: /* no error notices */ 3915 case XTerm_dumpscreen: /* no error notices */
3872 case URxvt_italicFont: 3931 case URxvt_italicFont:
3873 case URxvt_boldItalicFont: 3932 case URxvt_boldItalicFont:
3874#endif 3933#endif
3875 if (query) 3934 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", saveop, 3935 tt_printf ("\33]%d;%-.250s%c", saveop,
3877 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3936 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3878 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3937 ? fontset[op - URxvt_font]->fontdesc : "",
3879 resp); 3938 resp);
3880 else 3939 else
3881 { 3940 {
3882 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3941 const char *&res = rs[Rs_font + (op - URxvt_font)];
3883 3942
3888 break; 3947 break;
3889 3948
3890#if ENABLE_FRILLS 3949#if ENABLE_FRILLS
3891 case URxvt_locale: 3950 case URxvt_locale:
3892 if (query) 3951 if (query)
3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3952 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3894 else 3953 else
3895 { 3954 {
3896 set_locale (str); 3955 set_locale (str);
3897 pty.set_utf8_mode (enc_utf8); 3956 pty.set_utf8_mode (enc_utf8);
3898 init_xlocale (); 3957 init_xlocale ();
4026 } 4085 }
4027 4086
4028 /* extra handling for values with state unkept */ 4087 /* extra handling for values with state unkept */
4029 switch (arg[i]) 4088 switch (arg[i])
4030 { 4089 {
4090#if ENABLE_STYLES
4091 case 1021:
4092 if (mode)
4093 SET_OPTION (Opt_intensityStyles);
4094 else
4095 CLR_OPTION (Opt_intensityStyles);
4096
4097 scr_touch (true);
4098 break;
4099#endif
4031 case 1048: /* alternative cursor save */ 4100 case 1048: /* alternative cursor save */
4032 case 1049: 4101 case 1049:
4033 if (options & Opt_secondaryScreen) 4102 if (OPTION (Opt_secondaryScreen))
4034 if (mode == 0) 4103 if (mode == 0)
4035 scr_cursor (RESTORE); 4104 scr_cursor (RESTORE);
4036 else if (mode == 1) 4105 else if (mode == 1)
4037 scr_cursor (SAVE); 4106 scr_cursor (SAVE);
4038 break; 4107 break;
4050 */ 4119 */
4051 PrivMode (1, PrivMode_vt52); 4120 PrivMode (1, PrivMode_vt52);
4052 break; 4121 break;
4053 case 3: /* 80/132 */ 4122 case 3: /* 80/132 */
4054 if (priv_modes & PrivMode_132OK) 4123 if (priv_modes & PrivMode_132OK)
4055 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4124 set_widthheight (((state ? 132 : 80) * fwidth), height);
4056 break; 4125 break;
4057 case 4: /* smooth scrolling */ 4126 case 4: /* smooth scrolling */
4058 if (state) 4127 if (!state)
4059 options &= ~Opt_jumpScroll; 4128 SET_OPTION (Opt_jumpScroll);
4060 else 4129 else
4061 options |= Opt_jumpScroll; 4130 CLR_OPTION (Opt_jumpScroll);
4062 break; 4131 break;
4063 case 5: /* reverse video */ 4132 case 5: /* reverse video */
4064 scr_rvideo_mode (state); 4133 scr_rvideo_mode (state);
4065 break; 4134 break;
4066 case 6: /* relative/absolute origins */ 4135 case 6: /* relative/absolute origins */
4107#if 0 4176#if 0
4108 case 1001: 4177 case 1001:
4109 break; /* X11 mouse highlighting */ 4178 break; /* X11 mouse highlighting */
4110#endif 4179#endif
4111 case 1010: /* scroll to bottom on TTY output inhibit */ 4180 case 1010: /* scroll to bottom on TTY output inhibit */
4112 if (state) 4181 if (!state)
4113 options &= ~Opt_scrollTtyOutput; 4182 SET_OPTION (Opt_scrollTtyOutput);
4114 else 4183 else
4115 options |= Opt_scrollTtyOutput; 4184 CLR_OPTION (Opt_scrollTtyOutput);
4116 break; 4185 break;
4117 case 1011: /* scroll to bottom on key press */ 4186 case 1011: /* scroll to bottom on key press */
4118 if (state) 4187 if (state)
4119 options |= Opt_scrollTtyKeypress; 4188 SET_OPTION (Opt_scrollTtyKeypress);
4120 else 4189 else
4121 options &= ~Opt_scrollTtyKeypress; 4190 CLR_OPTION (Opt_scrollTtyKeypress);
4122 break; 4191 break;
4123 case 1047: /* secondary screen w/ clearing last */ 4192 case 1047: /* secondary screen w/ clearing last */
4124 if (options & Opt_secondaryScreen) 4193 if (OPTION (Opt_secondaryScreen))
4125 if (current_screen != PRIMARY) 4194 if (current_screen != PRIMARY)
4126 scr_erase_screen (2); 4195 scr_erase_screen (2);
4127 scr_change_screen (state); 4196 scr_change_screen (state);
4128 break; 4197 break;
4129 case 1049: /* secondary screen w/ clearing first */ 4198 case 1049: /* secondary screen w/ clearing first */
4130 scr_change_screen (state); 4199 scr_change_screen (state);
4131 if (options & Opt_secondaryScreen) 4200 if (OPTION (Opt_secondaryScreen))
4132 if (current_screen != PRIMARY) 4201 if (current_screen != PRIMARY)
4133 scr_erase_screen (2); 4202 scr_erase_screen (2);
4134 break; 4203 break;
4135 default: 4204 default:
4136 break; 4205 break;
4286 case 106: 4355 case 106:
4287 case 107: 4356 case 107:
4288 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4357 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4289 break; 4358 break;
4290#endif 4359#endif
4291
4292 } 4360 }
4293 } 4361 }
4294} 4362}
4295/*}}} */ 4363/*}}} */
4296 4364
4377 } 4445 }
4378 4446
4379 memmove (v_buffer, v_buffer + written, v_buflen); 4447 memmove (v_buffer, v_buffer + written, v_buflen);
4380 } 4448 }
4381 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4449 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4382 // original code just ignores this... 4450 pty_ev.set (EVENT_READ);
4383 destroy ();
4384} 4451}
4385 4452
4386/*----------------------- end-of-file (C source) -----------------------*/ 4453/*----------------------- end-of-file (C source) -----------------------*/
4387 4454

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines