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

Diff Legend

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