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.202 by root, Sat Mar 12 23:35:14 2005 UTC vs.
Revision 1.228 by root, Mon Jan 2 16:08:34 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; 171 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 172 int len;
170 173
174 fname = rxvt_utf8towcs (f->name);
175
171#if ENABLE_COMBINING 176# if ENABLE_COMBINING
172 if (IS_COMPOSE (ch)) 177 if (IS_COMPOSE (ch))
173 { 178 {
174 len = rxvt_composite.expand (ch, 0); 179 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len]; 180 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr); 181 rxvt_composite.expand (ch, chr);
177 } 182 }
178 else 183 else
179#endif 184# endif
180 { 185 {
181 ch2 = ch; 186 ch2 = ch;
182 187
183 alloc = 0; 188 alloc = 0;
184 chr = &ch2; 189 chr = &ch2;
185 len = 1; 190 len = 1;
186 } 191 }
187 192
188 int width = strlen (f->name); 193 char attr[80]; // plenty
189 194
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 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
205 int width = wcswidth (fname, wcslen (fname));
206
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);
191 217
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 218 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 219
194 for (int y = 0; y < len; y++) 220 for (int y = 0; y < len; y++)
195 { 221 {
… …
198 ch = *chr++; 224 ch = *chr++;
199 225
200 sprintf (buf, "%8x", ch); 226 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf); 227 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '='); 228 scr_overlay_set (9, y, '=');
203#if !UNICODE3 229# if !UNICODE3
204 if (ch >= 0x10000) 230 if (ch >= 0x10000)
205 ch = 0xfffd; 231 ch = 0xfffd;
206#endif 232# endif
207 scr_overlay_set (11, y, ch, r); 233 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r); 234 scr_overlay_set (12, y, NOCHAR, r);
209 } 235 }
210 236
237 scr_overlay_set (0, len , attr);
211 scr_overlay_set (0, len, f->name); 238 scr_overlay_set (0, len + 1, fname);
212 239
240 free (fname);
241
213#if ENABLE_COMBINING 242# if ENABLE_COMBINING
214 if (alloc) 243 if (alloc)
215 delete [] alloc; 244 delete [] alloc;
216#endif 245# endif
217} 246}
218#endif 247#endif
219 248
220void 249void
221rxvt_term::commit_iso14755 () 250rxvt_term::commit_iso14755 ()
… …
362#ifdef KEYSYM_RESOURCE 391#ifdef KEYSYM_RESOURCE
363 if (keyboard->dispatch (this, keysym, ev.state)) 392 if (keyboard->dispatch (this, keysym, ev.state))
364 return; 393 return;
365#endif 394#endif
366 395
367 if (TermWin.saveLines) 396 if (saveLines)
368 { 397 {
369#ifdef UNSHIFTED_SCROLLKEYS 398#ifdef UNSHIFTED_SCROLLKEYS
370 if (!ctrl && !meta) 399 if (!ctrl && !meta)
371#else 400#else
372 if (IS_SCROLL_MOD) 401 if (IS_SCROLL_MOD)
373#endif 402#endif
374 { 403 {
375 int lnsppg; 404 int lnsppg;
376 405
377#ifdef PAGING_CONTEXT_LINES 406#ifdef PAGING_CONTEXT_LINES
378 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 407 lnsppg = nrow - PAGING_CONTEXT_LINES;
379#else 408#else
380 lnsppg = TermWin.nrow * 4 / 5; 409 lnsppg = nrow * 4 / 5;
381#endif 410#endif
382 if (keysym == XK_Prior) 411 if (keysym == XK_Prior)
383 { 412 {
384 scr_page (UP, lnsppg); 413 scr_page (UP, lnsppg);
385 return; 414 return;
… …
840 } 869 }
841 870
842 if (len <= 0) 871 if (len <= 0)
843 return; /* not mapped */ 872 return; /* not mapped */
844 873
845 if (options & Opt_scrollTtyKeypress) 874 if (OPTION (Opt_scrollTtyKeypress))
846 if (TermWin.view_start) 875 if (view_start)
847 { 876 {
848 TermWin.view_start = 0; 877 view_start = 0;
849 want_refresh = 1; 878 want_refresh = 1;
850 } 879 }
851 880
852 /* 881 /*
853 * these modifications only affect the static keybuffer 882 * these modifications only affect the static keybuffer
… …
956 SET_LOCALE (locale); 985 SET_LOCALE (locale);
957 986
958 display->flush (); 987 display->flush ();
959 988
960 if (want_refresh && !flush_ev.active) 989 if (want_refresh && !flush_ev.active)
961 flush_ev.start (NOW + 0.01); 990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
962} 991}
963 992
964void 993void
965rxvt_term::flush_cb (time_watcher &w) 994rxvt_term::flush_cb (time_watcher &w)
966{ 995{
… …
1030{ 1059{
1031 if (mouse_slip_wheel_speed == 0 1060 if (mouse_slip_wheel_speed == 0
1032 || 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)
1033 : scr_page (UP, mouse_slip_wheel_speed)) 1062 : scr_page (UP, mouse_slip_wheel_speed))
1034 { 1063 {
1035 if (TermWin.view_start == TermWin.nscrolled || 1064 if (view_start == nsaved ||
1036 TermWin.view_start == 0) 1065 view_start == 0)
1037 mouse_slip_wheel_speed = 0; 1066 mouse_slip_wheel_speed = 0;
1038 1067
1039 refresh_type |= SMOOTH_REFRESH; 1068 refresh_type |= SMOOTH_REFRESH;
1040 want_refresh = 1; 1069 want_refresh = 1;
1041 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1042 } 1071 }
1043} 1072}
1044#endif 1073#endif
1045 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
1046bool 1093bool
1047rxvt_term::pty_fill () 1094rxvt_term::pty_fill ()
1048{ 1095{
1049 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1050 1097
… …
1056 1103
1057 memmove (cmdbuf_base, cmdbuf_ptr, n); 1104 memmove (cmdbuf_base, cmdbuf_ptr, n);
1058 cmdbuf_ptr = cmdbuf_base; 1105 cmdbuf_ptr = cmdbuf_base;
1059 cmdbuf_endp = cmdbuf_ptr + n; 1106 cmdbuf_endp = cmdbuf_ptr + n;
1060 1107
1061 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1062 1109
1063 if (n > 0) 1110 if (r > 0)
1064 { 1111 {
1065 cmdbuf_endp += n; 1112 cmdbuf_endp += r;
1066 return true; 1113 return true;
1067 } 1114 }
1068 else if (n < 0 && errno != EAGAIN) 1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 {
1117#if HAVE_SCHED_YIELD
1118 if (display->is_local)
1119 event_handler.cw_yield.start ();
1120#endif
1121 }
1122 else
1123 {
1124 pty_ev.stop ();
1125
1126 if (!OPTION (Opt_hold))
1069 destroy (); 1127 destroy ();
1128 }
1070 1129
1071 return false; 1130 return false;
1072} 1131}
1073 1132
1074void 1133void
… …
1088} 1147}
1089 1148
1090void 1149void
1091rxvt_term::pointer_unblank () 1150rxvt_term::pointer_unblank ()
1092{ 1151{
1093 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1152 XDefineCursor (display->display, vt, TermWin_cursor);
1094 recolour_cursor (); 1153 recolour_cursor ();
1095 1154
1096#ifdef POINTER_BLANK 1155#ifdef POINTER_BLANK
1097 hidden_pointer = 0; 1156 hidden_pointer = 0;
1098 1157
1099 if (options & Opt_pointerBlank) 1158 if (OPTION (Opt_pointerBlank))
1100 pointer_ev.start (NOW + pointerBlankDelay); 1159 pointer_ev.start (NOW + pointerBlankDelay);
1101#endif 1160#endif
1102} 1161}
1103 1162
1104#ifdef POINTER_BLANK 1163#ifdef POINTER_BLANK
1105void 1164void
1106rxvt_term::pointer_blank () 1165rxvt_term::pointer_blank ()
1107{ 1166{
1108 if (! (options & Opt_pointerBlank)) 1167 if (! OPTION (Opt_pointerBlank))
1109 return; 1168 return;
1110 1169
1111 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1170 XDefineCursor (display->display, vt, display->blank_cursor);
1112 XFlush (display->display); 1171 XFlush (display->display);
1113 1172
1114 hidden_pointer = 1; 1173 hidden_pointer = 1;
1115} 1174}
1116 1175
… …
1211 1270
1212 SET_R (this); 1271 SET_R (this);
1213 SET_LOCALE (locale); 1272 SET_LOCALE (locale);
1214 1273
1215#if defined(CURSOR_BLINK) 1274#if defined(CURSOR_BLINK)
1216 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1217 { 1276 {
1218 if (hidden_cursor) 1277 if (hidden_cursor)
1219 { 1278 {
1220 hidden_cursor = 0; 1279 hidden_cursor = 0;
1221 want_refresh = 1; 1280 want_refresh = 1;
… …
1224 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1225 } 1284 }
1226#endif 1285#endif
1227 1286
1228#if defined(POINTER_BLANK) 1287#if defined(POINTER_BLANK)
1229 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1288 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1230 { 1289 {
1231 if (ev.type == MotionNotify 1290 if (ev.type == MotionNotify
1232 || ev.type == ButtonPress 1291 || ev.type == ButtonPress
1233 || ev.type == ButtonRelease) 1292 || ev.type == ButtonRelease)
1234 if (hidden_pointer) 1293 if (hidden_pointer)
… …
1418 case FocusOut: 1477 case FocusOut:
1419 focus_out (); 1478 focus_out ();
1420 break; 1479 break;
1421 1480
1422 case ConfigureNotify: 1481 case ConfigureNotify:
1423 if (ev.xconfigure.window == TermWin.parent[0]) 1482 if (ev.xconfigure.window == parent[0])
1424 { 1483 {
1425 int height, width;
1426
1427 do
1428 { /* Wrap lots of configures into one */
1429 width = ev.xconfigure.width;
1430 height = ev.xconfigure.height;
1431 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1432 }
1433 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1484 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1485 ;
1434 1486
1435 if (szHint.width != width || szHint.height != height) 1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1488 {
1437 seen_resize = 1; 1489 seen_resize = 1;
1438 resize_all_windows (width, height, 1); 1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1491 }
1440 1492
1441#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1493#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1442 if (options & Opt_transparent) 1494 if (OPTION (Opt_transparent))
1443 check_our_parents (); 1495 check_our_parents ();
1444#endif 1496#endif
1445 } 1497 }
1446 break; 1498 break;
1447 1499
… …
1464 case SelectionRequest: 1516 case SelectionRequest:
1465 selection_send (ev.xselectionrequest); 1517 selection_send (ev.xselectionrequest);
1466 break; 1518 break;
1467 1519
1468 case UnmapNotify: 1520 case UnmapNotify:
1469 TermWin.mapped = 0; 1521 mapped = 0;
1470#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1471 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1472#endif 1524#endif
1473 break; 1525 break;
1474 1526
1475 case MapNotify: 1527 case MapNotify:
1476 TermWin.mapped = 1; 1528 mapped = 1;
1477#ifdef TEXT_BLINK 1529#ifdef TEXT_BLINK
1478 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1530 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1479#endif 1531#endif
1480 break; 1532 break;
1481 1533
… …
1485 break; 1537 break;
1486#endif /* TRANSPARENT */ 1538#endif /* TRANSPARENT */
1487 1539
1488 case GraphicsExpose: 1540 case GraphicsExpose:
1489 case Expose: 1541 case Expose:
1490 if (ev.xany.window == TermWin.vt) 1542 if (ev.xany.window == vt)
1491 { 1543 {
1492 do 1544 do
1493 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1494 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1495 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1496 1548
1497 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1498 1550
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1502 1554
1503 scr_refresh (refresh_type); 1555 scr_refresh (refresh_type);
1504 } 1556 }
… …
1520 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1572 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1521 menubar_expose (); 1573 menubar_expose ();
1522#endif 1574#endif
1523 1575
1524#ifdef TRANSPARENT 1576#ifdef TRANSPARENT
1525 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1577 if (am_transparent && ev.xany.window == parent[0])
1526 XClearWindow (disp, ev.xany.window); 1578 XClearWindow (disp, ev.xany.window);
1527#endif 1579#endif
1528 } 1580 }
1529 break; 1581 break;
1530 1582
… …
1541 } 1593 }
1542#endif 1594#endif
1543 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1544 break; 1596 break;
1545 1597
1546 if (ev.xany.window == TermWin.vt) 1598 if (ev.xany.window == vt)
1547 { 1599 {
1548 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1549 { 1601 {
1550 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1551 ; 1603 ;
1552 1604
1553 XQueryPointer (disp, TermWin.vt, 1605 XQueryPointer (disp, vt,
1554 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1555 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1556 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1557 &ev.xbutton.state); 1609 &ev.xbutton.state);
1558#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
… …
1570#endif 1622#endif
1571 selection_extend (ev.xbutton.x, ev.xbutton.y, 1623 selection_extend (ev.xbutton.x, ev.xbutton.y,
1572 ev.xbutton.state & Button3Mask ? 2 : 0); 1624 ev.xbutton.state & Button3Mask ? 2 : 0);
1573 1625
1574#ifdef SELECTION_SCROLLING 1626#ifdef SELECTION_SCROLLING
1575 if (ev.xbutton.y < TermWin.int_bwidth 1627 if (ev.xbutton.y < int_bwidth
1576 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1628 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1577 { 1629 {
1578 int dist; 1630 int dist;
1579 1631
1580 /* don't clobber the current delay if we are 1632 /* don't clobber the current delay if we are
1581 * already in the middle of scrolling. 1633 * already in the middle of scrolling.
… …
1589 selection_save_x = ev.xbutton.x; 1641 selection_save_x = ev.xbutton.x;
1590 selection_save_y = ev.xbutton.y; 1642 selection_save_y = ev.xbutton.y;
1591 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1643 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1592 1644
1593 /* calc number of lines to scroll */ 1645 /* calc number of lines to scroll */
1594 if (ev.xbutton.y < TermWin.int_bwidth) 1646 if (ev.xbutton.y < int_bwidth)
1595 { 1647 {
1596 scroll_selection_dir = UP; 1648 scroll_selection_dir = UP;
1597 dist = TermWin.int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1598 } 1650 }
1599 else 1651 else
1600 { 1652 {
1601 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1602 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1654 dist = ev.xbutton.y - (int_bwidth + height);
1603 } 1655 }
1604 1656
1605 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1606 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1607 + 1; 1659 + 1;
1608 MIN_IT (scroll_selection_lines, 1660 min_it (scroll_selection_lines,
1609 SELECTION_SCROLL_MAX_LINES); 1661 SELECTION_SCROLL_MAX_LINES);
1610 } 1662 }
1611 else 1663 else
1612 { 1664 {
1613 /* we are within the text window, so we 1665 /* we are within the text window, so we
… …
1644} 1696}
1645 1697
1646void 1698void
1647rxvt_term::focus_in () 1699rxvt_term::focus_in ()
1648{ 1700{
1649 if (!TermWin.focus) 1701 if (!focus)
1650 { 1702 {
1651 TermWin.focus = 1; 1703 focus = 1;
1652 want_refresh = 1; 1704 want_refresh = 1;
1705
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1707
1653#ifdef USE_XIM 1708#if USE_XIM
1654 if (Input_Context != NULL) 1709 if (Input_Context != NULL)
1655 { 1710 {
1656 IMSetStatusPosition (); 1711 IMSetStatusPosition ();
1657 XSetICFocus (Input_Context); 1712 XSetICFocus (Input_Context);
1658 } 1713 }
1659#endif 1714#endif
1660#ifdef CURSOR_BLINK 1715#if CURSOR_BLINK
1661 if (options & Opt_cursorBlink) 1716 if (OPTION (Opt_cursorBlink))
1662 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1717 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1663#endif 1718#endif
1664#ifdef OFF_FOCUS_FADING 1719#if OFF_FOCUS_FADING
1665 if (rs[Rs_fade]) 1720 if (rs[Rs_fade])
1666 { 1721 {
1667 pix_colors = pix_colors_focused; 1722 pix_colors = pix_colors_focused;
1668 scr_recolour (); 1723 scr_recolour ();
1669 } 1724 }
… …
1672} 1727}
1673 1728
1674void 1729void
1675rxvt_term::focus_out () 1730rxvt_term::focus_out ()
1676{ 1731{
1677 if (TermWin.focus) 1732 if (focus)
1678 { 1733 {
1679 TermWin.focus = 0; 1734 focus = 0;
1680 want_refresh = 1; 1735 want_refresh = 1;
1681 1736
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738
1682#if ENABLE_FRILLS || ISO_14755 1739#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf)
1741 {
1683 iso14755buf = 0; 1742 iso14755buf = 0;
1684#endif
1685#if ENABLE_OVERLAY 1743# if ENABLE_OVERLAY
1686 scr_overlay_off (); 1744 scr_overlay_off ();
1687#endif 1745# endif
1746 }
1747#endif
1688#ifdef USE_XIM 1748#if USE_XIM
1689 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1690 XUnsetICFocus (Input_Context); 1750 XUnsetICFocus (Input_Context);
1691#endif 1751#endif
1692#ifdef CURSOR_BLINK 1752#if CURSOR_BLINK
1693 if (options & Opt_cursorBlink) 1753 if (OPTION (Opt_cursorBlink))
1694 cursor_blink_ev.stop (); 1754 cursor_blink_ev.stop ();
1695 hidden_cursor = 0; 1755 hidden_cursor = 0;
1696#endif 1756#endif
1697#ifdef OFF_FOCUS_FADING 1757#if OFF_FOCUS_FADING
1698 if (rs[Rs_fade]) 1758 if (rs[Rs_fade])
1699 { 1759 {
1700 pix_colors = pix_colors_unfocused; 1760 pix_colors = pix_colors_unfocused;
1701 scr_recolour (); 1761 scr_recolour ();
1702 } 1762 }
… …
1722 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1782 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1723 return; 1783 return;
1724 1784
1725 /* FALLTHROUGH */ 1785 /* FALLTHROUGH */
1726 case ReparentNotify: 1786 case ReparentNotify:
1727 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1787 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1728 want_refresh = want_full_refresh = 1; 1788 want_refresh = want_full_refresh = 1;
1729 break; 1789 break;
1730 } 1790 }
1731} 1791}
1732#endif 1792#endif
… …
1741 reportmode = !! (priv_modes & PrivMode_mouse_report); 1801 reportmode = !! (priv_modes & PrivMode_mouse_report);
1742 1802
1743 /* 1803 /*
1744 * VT window processing of button press 1804 * VT window processing of button press
1745 */ 1805 */
1746 if (ev.window == TermWin.vt) 1806 if (ev.window == vt)
1747 { 1807 {
1748#if ISO_14755 1808#if ISO_14755
1749 // 5.4 1809 // 5.4
1750 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1751 { 1811 {
… …
1956 case Button3: 2016 case Button3:
1957 if (scrollBar.style != R_SB_XTERM) 2017 if (scrollBar.style != R_SB_XTERM)
1958 { 2018 {
1959 if (scrollbar_above_slider (ev.y)) 2019 if (scrollbar_above_slider (ev.y))
1960# ifdef RXVT_SCROLL_FULL 2020# ifdef RXVT_SCROLL_FULL
1961 scr_page (UP, TermWin.nrow - 1); 2021 scr_page (UP, nrow - 1);
1962# else 2022# else
1963 scr_page (UP, TermWin.nrow / 4); 2023 scr_page (UP, nrow / 4);
1964# endif 2024# endif
1965 else if (scrollbar_below_slider (ev.y)) 2025 else if (scrollbar_below_slider (ev.y))
1966# ifdef RXVT_SCROLL_FULL 2026# ifdef RXVT_SCROLL_FULL
1967 scr_page (DN, TermWin.nrow - 1); 2027 scr_page (DN, nrow - 1);
1968# else 2028# else
1969 scr_page (DN, TermWin.nrow / 4); 2029 scr_page (DN, nrow / 4);
1970# endif 2030# endif
1971 else 2031 else
1972 scrollBar.setMotion (); 2032 scrollBar.setMotion ();
1973 } 2033 }
1974 else 2034 else
1975 { 2035 {
1976 scr_page ((ev.button == Button1 ? DN : UP), 2036 scr_page ((ev.button == Button1 ? DN : UP),
1977 (TermWin.nrow 2037 (nrow
1978 * scrollbar_position (ev.y) 2038 * scrollbar_position (ev.y)
1979 / scrollbar_size ())); 2039 / scrollbar_size ()));
1980 } 2040 }
1981 2041
1982 break; 2042 break;
… …
2014#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2015 if (sel_scroll_ev.active) 2075 if (sel_scroll_ev.active)
2016 sel_scroll_ev.stop(); 2076 sel_scroll_ev.stop();
2017#endif 2077#endif
2018 2078
2019 if (ev.window == TermWin.vt) 2079 if (ev.window == vt)
2020 { 2080 {
2021#if ISO_14755 2081#if ISO_14755
2022 // 5.4 2082 // 5.4
2023 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2083 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2024 return; 2084 return;
… …
2074 2134
2075 v = ev.button == Button4 ? UP : DN; 2135 v = ev.button == Button4 ? UP : DN;
2076 2136
2077 if (ev.state & ShiftMask) 2137 if (ev.state & ShiftMask)
2078 i = 1; 2138 i = 1;
2079 else if (options & Opt_mouseWheelScrollPage) 2139 else if (OPTION (Opt_mouseWheelScrollPage))
2080 i = TermWin.nrow - 1; 2140 i = nrow - 1;
2081 else 2141 else
2082 i = 5; 2142 i = 5;
2083 2143
2084# ifdef MOUSE_SLIP_WHEELING 2144# ifdef MOUSE_SLIP_WHEELING
2085 if (ev.state & ControlMask) 2145 if (ev.state & ControlMask)
2086 { 2146 {
2087 mouse_slip_wheel_speed += v ? -1 : 1; 2147 mouse_slip_wheel_speed += v ? -1 : 1;
2088 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;
2089 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2149 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2090 2150
2091 if (slip_wheel_ev.at < NOW) 2151 if (slip_wheel_ev.at < NOW)
2092 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2152 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2093 2153
2094 slip_wheel_ev.start (); 2154 slip_wheel_ev.start ();
… …
2370 XWindowAttributes wattr, wrootattr; 2430 XWindowAttributes wattr, wrootattr;
2371 dDisp; 2431 dDisp;
2372 2432
2373 pchanged = 0; 2433 pchanged = 0;
2374 2434
2375 if (!(options & Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
2376 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
2377 2437
2378 XGetWindowAttributes (disp, display->root, &wrootattr); 2438 XGetWindowAttributes (disp, display->root, &wrootattr);
2379 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
2380 2440
2381 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2441 XGetWindowAttributes (disp, parent[0], &wattr);
2382 2442
2383 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
2384 { 2444 {
2385 if (am_transparent) 2445 if (am_transparent)
2386 { 2446 {
2387 pchanged = 1; 2447 pchanged = 1;
2388 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2448 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2389 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
2390 } 2450 }
2391 2451
2392 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
2393 } 2453 }
… …
2434 Window cr; 2494 Window cr;
2435 XImage *image; 2495 XImage *image;
2436 GC gc; 2496 GC gc;
2437 XGCValues gcvalue; 2497 XGCValues gcvalue;
2438 2498
2439 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2499 XTranslateCoordinates (disp, parent[0], display->root,
2440 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
2441 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
2442 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
2443 nx = ny = 0; 2503 nx = ny = 0;
2444 2504
… …
2454 nh += sy; 2514 nh += sy;
2455 ny = -sy; 2515 ny = -sy;
2456 sy = 0; 2516 sy = 0;
2457 } 2517 }
2458 2518
2459 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2460 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2461 2521
2462 XSync (disp, False); 2522 XSync (disp, False);
2463 allowedxerror = -1; 2523 allowedxerror = -1;
2464 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2524 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2465 2525
… …
2470 if (image == NULL) 2530 if (image == NULL)
2471 { 2531 {
2472 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
2473 { 2533 {
2474 pchanged = 1; 2534 pchanged = 1;
2475 if (TermWin.pixmap != None) 2535 if (pixmap != None)
2476 { 2536 {
2477 XFreePixmap (disp, TermWin.pixmap); 2537 XFreePixmap (disp, pixmap);
2478 TermWin.pixmap = None; 2538 pixmap = None;
2479 } 2539 }
2480 } 2540 }
2481 2541
2482 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
2483 } 2543 }
2484 else 2544 else
2485 { 2545 {
2486 if (TermWin.pixmap != None) 2546 if (pixmap != None)
2487 XFreePixmap (disp, TermWin.pixmap); 2547 XFreePixmap (disp, pixmap);
2488 2548
2489#if TINTING 2549#if TINTING
2490 if (ISSET_PIXCOLOR (Color_tint)) 2550 if (ISSET_PIXCOLOR (Color_tint))
2491 { 2551 {
2492 unsigned short rm, gm, bm; 2552 unsigned short rm, gm, bm;
… …
2496 2556
2497 ShadeXImage (display, image, shade, rm, gm, bm); 2557 ShadeXImage (display, image, shade, rm, gm, bm);
2498 } 2558 }
2499#endif 2559#endif
2500 2560
2501 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2561 pixmap = XCreatePixmap (disp, vt,
2502 szHint.width, szHint.height, image->depth); 2562 szHint.width, szHint.height, image->depth);
2503 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2563 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2504 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2564 XPutImage (disp, pixmap, gc, image, 0, 0,
2505 nx, ny, image->width, image->height); 2565 nx, ny, image->width, image->height);
2506 XFreeGC (disp, gc); 2566 XFreeGC (disp, gc);
2507 XDestroyImage (image); 2567 XDestroyImage (image);
2508 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2568 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2509 XClearWindow (disp, TermWin.parent[0]); 2569 XClearWindow (disp, parent[0]);
2510 2570
2511 if (!am_transparent || !am_pixmap_trans) 2571 if (!am_transparent || !am_pixmap_trans)
2512 pchanged = 1; 2572 pchanged = 1;
2513 2573
2514 am_transparent = am_pixmap_trans = 1; 2574 am_transparent = am_pixmap_trans = 1;
2515 } 2575 }
2516 } 2576 }
2517 2577
2518 if (am_pixmap_trans) 2578 if (am_pixmap_trans)
2519 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2579 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2520 else 2580 else
2521 { 2581 {
2522 unsigned int n; 2582 unsigned int n;
2523 /* 2583 /*
2524 * InheritPixmap transparency 2584 * InheritPixmap transparency
2525 */ 2585 */
2526 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2586 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2527 { 2587 {
2528 oldp = TermWin.parent[i]; 2588 oldp = parent[i];
2529 XQueryTree (disp, TermWin.parent[i - 1], &root, 2589 XQueryTree (disp, parent[i - 1], &root,
2530 &TermWin.parent[i], &list, &n); 2590 &parent[i], &list, &n);
2531 XFree (list); 2591 XFree (list);
2532 2592
2533 if (TermWin.parent[i] == display->root) 2593 if (parent[i] == display->root)
2534 { 2594 {
2535 if (oldp != None) 2595 if (oldp != None)
2536 pchanged = 1; 2596 pchanged = 1;
2537 2597
2538 break; 2598 break;
2539 } 2599 }
2540 2600
2541 if (oldp != TermWin.parent[i]) 2601 if (oldp != parent[i])
2542 pchanged = 1; 2602 pchanged = 1;
2543 } 2603 }
2544 2604
2545 n = 0; 2605 n = 0;
2546 2606
2547 if (pchanged) 2607 if (pchanged)
2548 { 2608 {
2549 for (; n < (unsigned int)i; n++) 2609 for (; n < (unsigned int)i; n++)
2550 { 2610 {
2551 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2611 XGetWindowAttributes (disp, parent[n], &wattr);
2552 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2612 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2553 { 2613 {
2554 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2614 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2555 break; 2615 break;
2556 } 2616 }
2557 } 2617 }
2558 } 2618 }
2559 2619
2560 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2620 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2561 { 2621 {
2562 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2622 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2563 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2623 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2564 am_transparent = 0; 2624 am_transparent = 0;
2565 /* XXX: also turn off Opt_transparent? */ 2625 /* XXX: also turn off Opt_transparent? */
2566 } 2626 }
2567 else 2627 else
2568 { 2628 {
… …
2571 * needed for fvwm2.2.2 (and before?) */ 2631 * needed for fvwm2.2.2 (and before?) */
2572 sleep (1); 2632 sleep (1);
2573#endif 2633#endif
2574 for (n = 0; n < (unsigned int)i; n++) 2634 for (n = 0; n < (unsigned int)i; n++)
2575 { 2635 {
2576 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2577 XClearWindow (disp, TermWin.parent[n]); 2637 XClearWindow (disp, parent[n]);
2578 } 2638 }
2579 2639
2580 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2581 am_transparent = 1; 2641 am_transparent = 1;
2582 } 2642 }
2583 2643
2584 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2585 TermWin.parent[i] = None; 2645 parent[i] = None;
2586 } 2646 }
2587 2647
2588 if (scrollBar.win) 2648 if (scrollBar.win)
2589 { 2649 {
2590 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2642 /* Read a text string from the input buffer */ 2702 /* Read a text string from the input buffer */
2643 unicode_t buf[UBUFSIZ]; 2703 unicode_t buf[UBUFSIZ];
2644 bool refreshnow = false; 2704 bool refreshnow = false;
2645 int nlines = 0; 2705 int nlines = 0;
2646 unicode_t *str = buf; 2706 unicode_t *str = buf;
2707 unicode_t *eol = str + min (ncol, UBUFSIZ);
2647 2708
2648 for (;;) 2709 for (;;)
2649 { 2710 {
2650 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2711 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2651 break; 2712 break;
2652 2713
2653 *str++ = ch; 2714 *str++ = ch;
2654 2715
2655 if (ch == C0_LF) 2716 if (ch == C0_LF || str >= eol)
2656 { 2717 {
2718 if (ch == C0_LF)
2657 nlines++; 2719 nlines++;
2720
2658 refresh_count++; 2721 refresh_count++;
2659 2722
2660 if (!(options & Opt_jumpScroll) 2723 if (!OPTION (Opt_jumpScroll)
2661 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2724 || (refresh_count >= refresh_limit * (nrow - 1)))
2662 { 2725 {
2663 refreshnow = true; 2726 refreshnow = true;
2727 refresh_count = 0;
2664 ch = NOCHAR; 2728 ch = NOCHAR;
2665 break; 2729 break;
2666 } 2730 }
2667 2731
2668 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2732 // scr_add_lines only works for nlines <= nrow - 1.
2669 if (nlines >= TermWin.nrow - 1) 2733 if (nlines >= nrow - 1)
2670 { 2734 {
2671 scr_add_lines (buf, nlines, str - buf); 2735 scr_add_lines (buf, nlines, str - buf);
2672 nlines = 0; 2736 nlines = 0;
2673 str = buf; 2737 str = buf;
2738 eol = str + min (ncol, UBUFSIZ);
2674 } 2739 }
2675 }
2676 2740
2677 if (str >= buf + UBUFSIZ) 2741 if (str >= eol)
2678 { 2742 {
2743 if (eol >= buf + UBUFSIZ)
2744 {
2679 ch = NOCHAR; 2745 ch = NOCHAR;
2680 break; 2746 break;
2747 }
2748 else
2749 eol = min (eol + ncol, buf + UBUFSIZ);
2750 }
2751
2681 } 2752 }
2682 2753
2683 seq_begin = cmdbuf_ptr; 2754 seq_begin = cmdbuf_ptr;
2684 ch = next_char (); 2755 ch = next_char ();
2685 } 2756 }
… …
2692 * the number of pages between refreshes is refresh_limit, which 2763 * the number of pages between refreshes is refresh_limit, which
2693 * is incremented here because we must be doing flat-out scrolling. 2764 * is incremented here because we must be doing flat-out scrolling.
2694 */ 2765 */
2695 if (refreshnow) 2766 if (refreshnow)
2696 { 2767 {
2697 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2768 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2698 refresh_limit++; 2769 refresh_limit++;
2699 else 2770 else
2700 { 2771 {
2701 flag = true; 2772 flag = true;
2702 scr_refresh (refresh_type); 2773 scr_refresh (refresh_type);
2774 flush_ev.stop ();
2703 } 2775 }
2704 } 2776 }
2705 2777
2706 } 2778 }
2707 else 2779 else
… …
3344 3416
3345 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3417 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3346 arg[0] = -arg[0]; 3418 arg[0] = -arg[0];
3347 /* FALLTHROUGH */ 3419 /* FALLTHROUGH */
3348 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3349 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3350 break; 3422 break;
3351 3423
3352 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3353 tt_write ((const unsigned char *)VT100_ANS, 3425 tt_write ((const unsigned char *)VT100_ANS,
3354 (unsigned int) (sizeof (VT100_ANS) - 1)); 3426 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3366 break; 3438 break;
3367 case 6: /* CPR requested */ 3439 case 6: /* CPR requested */
3368 scr_report_position (); 3440 scr_report_position ();
3369 break; 3441 break;
3370 case 7: /* unofficial extension */ 3442 case 7: /* unofficial extension */
3371 if (options & Opt_insecure) 3443 if (OPTION (Opt_insecure))
3372 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3444 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3373 break; 3445 break;
3374 case 8: /* unofficial extension */ 3446 case 8: /* unofficial extension */
3375 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3447 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3376 break; 3448 break;
… …
3479 { 3551 {
3480 /* 3552 /*
3481 * commands 3553 * commands
3482 */ 3554 */
3483 case 1: /* deiconify window */ 3555 case 1: /* deiconify window */
3484 XMapWindow (disp, TermWin.parent[0]); 3556 XMapWindow (disp, parent[0]);
3485 break; 3557 break;
3486 case 2: /* iconify window */ 3558 case 2: /* iconify window */
3487 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3559 XIconifyWindow (disp, parent[0], display->screen);
3488 break; 3560 break;
3489 case 3: /* set position (pixels) */ 3561 case 3: /* set position (pixels) */
3490 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3562 XMoveWindow (disp, parent[0], args[1], args[2]);
3491 break; 3563 break;
3492 case 4: /* set size (pixels) */ 3564 case 4: /* set size (pixels) */
3493 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3565 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3494 break; 3566 break;
3495 case 5: /* raise window */ 3567 case 5: /* raise window */
3496 XRaiseWindow (disp, TermWin.parent[0]); 3568 XRaiseWindow (disp, parent[0]);
3497 break; 3569 break;
3498 case 6: /* lower window */ 3570 case 6: /* lower window */
3499 XLowerWindow (disp, TermWin.parent[0]); 3571 XLowerWindow (disp, parent[0]);
3500 break; 3572 break;
3501 case 7: /* refresh window */ 3573 case 7: /* refresh window */
3502 scr_touch (true); 3574 scr_touch (true);
3503 break; 3575 break;
3504 case 8: /* set size (chars) */ 3576 case 8: /* set size (chars) */
3505 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3577 set_widthheight ((unsigned int) (args[2] * fwidth),
3506 (unsigned int) (args[1] * TermWin.fheight)); 3578 (unsigned int) (args[1] * fheight));
3507 break; 3579 break;
3508 3580
3509 //case 9: NYI, TODO, restore maximized window or maximize window 3581 //case 9: NYI, TODO, restore maximized window or maximize window
3510 default: 3582 default:
3511 if (args[0] >= 24) /* set height (chars) */ 3583 if (args[0] >= 24) /* set height (chars) */
3512 set_widthheight ((unsigned int)TermWin.width, 3584 set_widthheight ((unsigned int)width,
3513 (unsigned int) (args[1] * TermWin.fheight)); 3585 (unsigned int) (args[1] * fheight));
3514 break; 3586 break;
3515 3587
3516 3588
3517 /* 3589 /*
3518 * reports - some output format copied from XTerm 3590 * reports - some output format copied from XTerm
3519 */ 3591 */
3520 case 11: /* report window state */ 3592 case 11: /* report window state */
3521 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3593 XGetWindowAttributes (disp, parent[0], &wattr);
3522 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3594 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3523 break; 3595 break;
3524 case 13: /* report window position */ 3596 case 13: /* report window position */
3525 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3597 XGetWindowAttributes (disp, parent[0], &wattr);
3526 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3598 XTranslateCoordinates (disp, parent[0], wattr.root,
3527 -wattr.border_width, -wattr.border_width, 3599 -wattr.border_width, -wattr.border_width,
3528 &x, &y, &wdummy); 3600 &x, &y, &wdummy);
3529 tt_printf ("\033[3;%d;%dt", x, y); 3601 tt_printf ("\033[3;%d;%dt", x, y);
3530 break; 3602 break;
3531 case 14: /* report window size (pixels) */ 3603 case 14: /* report window size (pixels) */
3532 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3604 XGetWindowAttributes (disp, parent[0], &wattr);
3533 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3605 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3534 break; 3606 break;
3535 case 18: /* report text area size (chars) */ 3607 case 18: /* report text area size (chars) */
3536 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3608 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3537 break; 3609 break;
3538 case 19: /* report window size (chars) */ 3610 case 19: /* report window size (chars) */
3539 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3611 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3540 break; 3612 break;
3541 case 20: /* report icon label */ 3613 case 20: /* report icon label */
3542 { 3614 {
3543 char *s; 3615 char *s;
3544 XGetIconName (disp, TermWin.parent[0], &s); 3616 XGetIconName (disp, parent[0], &s);
3545 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3617 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3546 XFree (s); 3618 XFree (s);
3547 } 3619 }
3548 break; 3620 break;
3549 case 21: /* report window title */ 3621 case 21: /* report window title */
3550 { 3622 {
3551 char *s; 3623 char *s;
3552 XFetchName (disp, TermWin.parent[0], &s); 3624 XFetchName (disp, parent[0], &s);
3553 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3625 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3554 XFree (s); 3626 XFree (s);
3555 } 3627 }
3556 break; 3628 break;
3557 } 3629 }
3558} 3630}
… …
3703 unsigned long bytes_after; 3775 unsigned long bytes_after;
3704 unsigned char *value = 0; 3776 unsigned char *value = 0;
3705 const char *str = ""; 3777 const char *str = "";
3706 3778
3707 if (prop 3779 if (prop
3708 && XGetWindowProperty (disp, TermWin.parent[0], 3780 && XGetWindowProperty (disp, parent[0],
3709 prop, 0, 1<<16, 0, AnyPropertyType, 3781 prop, 0, 1<<16, 0, AnyPropertyType,
3710 &actual_type, &actual_format, 3782 &actual_type, &actual_format,
3711 &nitems, &bytes_after, &value) == Success 3783 &nitems, &bytes_after, &value) == Success
3712 && actual_type != None 3784 && actual_type != None
3713 && actual_format == 8) 3785 && actual_format == 8)
… …
3725 { 3797 {
3726 *eq = 0; 3798 *eq = 0;
3727 set_utf8_property (display->atom (str), eq + 1); 3799 set_utf8_property (display->atom (str), eq + 1);
3728 } 3800 }
3729 else 3801 else
3730 XDeleteProperty (disp, TermWin.parent[0], 3802 XDeleteProperty (disp, parent[0],
3731 display->atom (str)); 3803 display->atom (str));
3732 } 3804 }
3733 break; 3805 break;
3734 3806
3735 case XTerm_Color: 3807 case XTerm_Color:
… …
3834 // TODO, when secure mode? 3906 // TODO, when secure mode?
3835 break; 3907 break;
3836 3908
3837#ifdef MENUBAR 3909#ifdef MENUBAR
3838 case URxvt_Menu: 3910 case URxvt_Menu:
3839 if (options & Opt_insecure) 3911 if (OPTION (Opt_insecure))
3840 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3912 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3841 break; 3913 break;
3842#endif 3914#endif
3843#if 0 3915#if 0
3844 case XTerm_dumpscreen: /* no error notices */ 3916 case XTerm_dumpscreen: /* no error notices */
… …
3860 case URxvt_italicFont: 3932 case URxvt_italicFont:
3861 case URxvt_boldItalicFont: 3933 case URxvt_boldItalicFont:
3862#endif 3934#endif
3863 if (query) 3935 if (query)
3864 tt_printf ("\33]%d;%-.250s%c", saveop, 3936 tt_printf ("\33]%d;%-.250s%c", saveop,
3865 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3937 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3866 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3938 ? fontset[op - URxvt_font]->fontdesc : "",
3867 resp); 3939 resp);
3868 else 3940 else
3869 { 3941 {
3870 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3942 const char *&res = rs[Rs_font + (op - URxvt_font)];
3871 3943
… …
3876 break; 3948 break;
3877 3949
3878#if ENABLE_FRILLS 3950#if ENABLE_FRILLS
3879 case URxvt_locale: 3951 case URxvt_locale:
3880 if (query) 3952 if (query)
3881 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3953 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3882 else 3954 else
3883 { 3955 {
3884 set_locale (str); 3956 set_locale (str);
3885 pty.set_utf8_mode (enc_utf8); 3957 pty.set_utf8_mode (enc_utf8);
3886 init_xlocale (); 3958 init_xlocale ();
… …
4014 } 4086 }
4015 4087
4016 /* extra handling for values with state unkept */ 4088 /* extra handling for values with state unkept */
4017 switch (arg[i]) 4089 switch (arg[i])
4018 { 4090 {
4091#if ENABLE_STYLES
4092 case 1021:
4093 if (mode)
4094 SET_OPTION (Opt_intensityStyles);
4095 else
4096 CLR_OPTION (Opt_intensityStyles);
4097
4098 scr_touch (true);
4099 break;
4100#endif
4019 case 1048: /* alternative cursor save */ 4101 case 1048: /* alternative cursor save */
4020 case 1049: 4102 case 1049:
4021 if (options & Opt_secondaryScreen) 4103 if (OPTION (Opt_secondaryScreen))
4022 if (mode == 0) 4104 if (mode == 0)
4023 scr_cursor (RESTORE); 4105 scr_cursor (RESTORE);
4024 else if (mode == 1) 4106 else if (mode == 1)
4025 scr_cursor (SAVE); 4107 scr_cursor (SAVE);
4026 break; 4108 break;
… …
4038 */ 4120 */
4039 PrivMode (1, PrivMode_vt52); 4121 PrivMode (1, PrivMode_vt52);
4040 break; 4122 break;
4041 case 3: /* 80/132 */ 4123 case 3: /* 80/132 */
4042 if (priv_modes & PrivMode_132OK) 4124 if (priv_modes & PrivMode_132OK)
4043 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4125 set_widthheight (((state ? 132 : 80) * fwidth), height);
4044 break; 4126 break;
4045 case 4: /* smooth scrolling */ 4127 case 4: /* smooth scrolling */
4046 if (state) 4128 if (!state)
4047 options &= ~Opt_jumpScroll; 4129 SET_OPTION (Opt_jumpScroll);
4048 else 4130 else
4049 options |= Opt_jumpScroll; 4131 CLR_OPTION (Opt_jumpScroll);
4050 break; 4132 break;
4051 case 5: /* reverse video */ 4133 case 5: /* reverse video */
4052 scr_rvideo_mode (state); 4134 scr_rvideo_mode (state);
4053 break; 4135 break;
4054 case 6: /* relative/absolute origins */ 4136 case 6: /* relative/absolute origins */
… …
4095#if 0 4177#if 0
4096 case 1001: 4178 case 1001:
4097 break; /* X11 mouse highlighting */ 4179 break; /* X11 mouse highlighting */
4098#endif 4180#endif
4099 case 1010: /* scroll to bottom on TTY output inhibit */ 4181 case 1010: /* scroll to bottom on TTY output inhibit */
4100 if (state) 4182 if (!state)
4101 options &= ~Opt_scrollTtyOutput; 4183 SET_OPTION (Opt_scrollTtyOutput);
4102 else 4184 else
4103 options |= Opt_scrollTtyOutput; 4185 CLR_OPTION (Opt_scrollTtyOutput);
4104 break; 4186 break;
4105 case 1011: /* scroll to bottom on key press */ 4187 case 1011: /* scroll to bottom on key press */
4106 if (state) 4188 if (state)
4107 options |= Opt_scrollTtyKeypress; 4189 SET_OPTION (Opt_scrollTtyKeypress);
4108 else 4190 else
4109 options &= ~Opt_scrollTtyKeypress; 4191 CLR_OPTION (Opt_scrollTtyKeypress);
4110 break; 4192 break;
4111 case 1047: /* secondary screen w/ clearing last */ 4193 case 1047: /* secondary screen w/ clearing last */
4112 if (options & Opt_secondaryScreen) 4194 if (OPTION (Opt_secondaryScreen))
4113 if (current_screen != PRIMARY) 4195 if (current_screen != PRIMARY)
4114 scr_erase_screen (2); 4196 scr_erase_screen (2);
4115 scr_change_screen (state); 4197 scr_change_screen (state);
4116 break; 4198 break;
4117 case 1049: /* secondary screen w/ clearing first */ 4199 case 1049: /* secondary screen w/ clearing first */
4118 scr_change_screen (state); 4200 scr_change_screen (state);
4119 if (options & Opt_secondaryScreen) 4201 if (OPTION (Opt_secondaryScreen))
4120 if (current_screen != PRIMARY) 4202 if (current_screen != PRIMARY)
4121 scr_erase_screen (2); 4203 scr_erase_screen (2);
4122 break; 4204 break;
4123 default: 4205 default:
4124 break; 4206 break;
… …
4274 case 106: 4356 case 106:
4275 case 107: 4357 case 107:
4276 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4358 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4277 break; 4359 break;
4278#endif 4360#endif
4279
4280 } 4361 }
4281 } 4362 }
4282} 4363}
4283/*}}} */ 4364/*}}} */
4284 4365
… …
4365 } 4446 }
4366 4447
4367 memmove (v_buffer, v_buffer + written, v_buflen); 4448 memmove (v_buffer, v_buffer + written, v_buflen);
4368 } 4449 }
4369 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4450 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4370 // original code just ignores this... 4451 pty_ev.set (EVENT_READ);
4371 destroy ();
4372} 4452}
4373 4453
4374/*----------------------- end-of-file (C source) -----------------------*/ 4454/*----------------------- end-of-file (C source) -----------------------*/
4375 4455

Diff Legend

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