ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.204 by root, Wed Jul 13 02:47:02 2005 UTC vs.
Revision 1.229 by root, Tue Jan 3 17:34:44 2006 UTC

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

Diff Legend

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