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.198 by root, Sat Feb 19 01:07:58 2005 UTC vs.
Revision 1.224 by root, Sun Jan 1 06:18:20 2006 UTC

… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#if HAVE_SCHED_YIELD
54# include <sched.h>
55#endif
56
53#ifdef KEYSYM_RESOURCE 57#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 58# include "keyboard.h"
55#endif 59#endif
56 60
57#include <csignal> 61#include <csignal>
… …
135rxvt_term::iso14755_54 (int x, int y) 139rxvt_term::iso14755_54 (int x, int y)
136{ 140{
137 x = Pixel2Col (x); 141 x = Pixel2Col (x);
138 y = Pixel2Row (y); 142 y = Pixel2Row (y);
139 143
140 if (x < 0 || x >= TermWin.ncol 144 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 145 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 146 return;
143 147
144 for (;;) 148 for (;;)
145 { 149 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 150 const line_t &l = ROW(y - view_start);
151
152 text_t t = l.t[x];
147 153
148 if (t != NOCHAR || !x) 154 if (t != NOCHAR || !x)
149 { 155 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 156 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; 157 iso14755buf = ISO_14755_54;
153 break; 158 break;
154 } 159 }
155 160
156 x--; 161 x--;
157 } 162 }
158
159} 163}
160#endif
161 164
162#if ENABLE_OVERLAY
163void 165void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 166rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 167{
166 rxvt_fontset *fs = FONTSET (r); 168 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 169 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2; 170 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 171 int len;
170 172
173 fname = rxvt_utf8towcs (f->name);
174
171#if ENABLE_COMBINING 175# if ENABLE_COMBINING
172 if (IS_COMPOSE (ch)) 176 if (IS_COMPOSE (ch))
173 { 177 {
174 len = rxvt_composite.expand (ch, 0); 178 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len]; 179 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr); 180 rxvt_composite.expand (ch, chr);
177 } 181 }
178 else 182 else
179#endif 183# endif
180 { 184 {
181 ch2 = ch; 185 ch2 = ch;
182 186
183 alloc = 0; 187 alloc = 0;
184 chr = &ch2; 188 chr = &ch2;
185 len = 1; 189 len = 1;
186 } 190 }
187 191
188 int width = strlen (f->name); 192 char attr[80]; // plenty
189 193
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 194 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
195 (int)r,
196 fgcolor_of (r), bgcolor_of (r),
197 r & RS_Bold ? " bold" : "",
198 r & RS_Italic ? " italic" : "",
199 r & RS_Blink ? " blink" : "",
200 r & RS_RVid ? " rvid" : "",
201 r & RS_Uline ? " uline" : "",
202 r & RS_Careful ? " careful" : "");
203
204 int width = wcswidth (fname, wcslen (fname));
205
206 max_it (width, 8+5); // for char + hey
207 max_it (width, strlen (attr));
208
209 if (y >= 0)
210 {
211 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
212 x = 0;
213 }
214
215 scr_overlay_new (x, y, width, len + 2);
191 216
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 217 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 218
194 for (int y = 0; y < len; y++) 219 for (int y = 0; y < len; y++)
195 { 220 {
… …
198 ch = *chr++; 223 ch = *chr++;
199 224
200 sprintf (buf, "%8x", ch); 225 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf); 226 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '='); 227 scr_overlay_set (9, y, '=');
203#if !UNICODE3 228# if !UNICODE3
204 if (ch >= 0x10000) 229 if (ch >= 0x10000)
205 ch = 0xfffd; 230 ch = 0xfffd;
206#endif 231# endif
207 scr_overlay_set (11, y, ch, r); 232 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
209 } 234 }
210 235
236 scr_overlay_set (0, len , attr);
211 scr_overlay_set (0, len, f->name); 237 scr_overlay_set (0, len + 1, fname);
212 238
239 free (fname);
240
213#if ENABLE_COMBINING 241# if ENABLE_COMBINING
214 if (alloc) 242 if (alloc)
215 delete [] alloc; 243 delete [] alloc;
216#endif 244# endif
217} 245}
218#endif 246#endif
219 247
220void 248void
221rxvt_term::commit_iso14755 () 249rxvt_term::commit_iso14755 ()
… …
316 344
317 // the XOpenIM manpage lies about hardcoding the locale 345 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 346 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 347 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 348 SET_LOCALE (rs[Rs_imLocale]);
349
321 // assume wchar_t == unicode or better 350 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 351 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 352 KBUFSZ, &keysym, &status_return);
353
324 if (rs[Rs_imLocale]) 354 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 355 SET_LOCALE (locale);
326 356
327 if (status_return == XLookupChars 357 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 358 || status_return == XLookupBoth)
… …
360#ifdef KEYSYM_RESOURCE 390#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 391 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 392 return;
363#endif 393#endif
364 394
365 if (TermWin.saveLines) 395 if (saveLines)
366 { 396 {
367#ifdef UNSHIFTED_SCROLLKEYS 397#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 398 if (!ctrl && !meta)
369#else 399#else
370 if (IS_SCROLL_MOD) 400 if (IS_SCROLL_MOD)
371#endif 401#endif
372 { 402 {
373 int lnsppg; 403 int lnsppg;
374 404
375#ifdef PAGING_CONTEXT_LINES 405#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 406 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 407#else
378 lnsppg = TermWin.nrow * 4 / 5; 408 lnsppg = nrow * 4 / 5;
379#endif 409#endif
380 if (keysym == XK_Prior) 410 if (keysym == XK_Prior)
381 { 411 {
382 scr_page (UP, lnsppg); 412 scr_page (UP, lnsppg);
383 return; 413 return;
… …
838 } 868 }
839 869
840 if (len <= 0) 870 if (len <= 0)
841 return; /* not mapped */ 871 return; /* not mapped */
842 872
843 if (options & Opt_scrollTtyKeypress) 873 if (OPTION (Opt_scrollTtyKeypress))
844 if (TermWin.view_start) 874 if (view_start)
845 { 875 {
846 TermWin.view_start = 0; 876 view_start = 0;
847 want_refresh = 1; 877 want_refresh = 1;
848 } 878 }
849 879
850 /* 880 /*
851 * these modifications only affect the static keybuffer 881 * these modifications only affect the static keybuffer
… …
1028{ 1058{
1029 if (mouse_slip_wheel_speed == 0 1059 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1060 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1061 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1062 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1063 if (view_start == nsaved ||
1034 TermWin.view_start == 0) 1064 view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1065 mouse_slip_wheel_speed = 0;
1036 1066
1037 refresh_type |= SMOOTH_REFRESH; 1067 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1068 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1069 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1054 1084
1055 memmove (cmdbuf_base, cmdbuf_ptr, n); 1085 memmove (cmdbuf_base, cmdbuf_ptr, n);
1056 cmdbuf_ptr = cmdbuf_base; 1086 cmdbuf_ptr = cmdbuf_base;
1057 cmdbuf_endp = cmdbuf_ptr + n; 1087 cmdbuf_endp = cmdbuf_ptr + n;
1058 1088
1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1089 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1060 1090
1061 if (n > 0) 1091 if (r > 0)
1062 { 1092 {
1063 cmdbuf_endp += n; 1093 cmdbuf_endp += r;
1064 return true; 1094 return true;
1065 } 1095 }
1066 else if (n < 0 && errno != EAGAIN) 1096 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1097 {
1098#if HAVE_SCHED_YIELD
1099 sched_yield ();
1100#endif
1101 }
1102 else
1103 {
1104 pty_ev.stop ();
1105
1106 if (!OPTION (Opt_hold))
1067 destroy (); 1107 destroy ();
1108 }
1068 1109
1069 return false; 1110 return false;
1070} 1111}
1071 1112
1072void 1113void
… …
1086} 1127}
1087 1128
1088void 1129void
1089rxvt_term::pointer_unblank () 1130rxvt_term::pointer_unblank ()
1090{ 1131{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1132 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1133 recolour_cursor ();
1093 1134
1094#ifdef POINTER_BLANK 1135#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1136 hidden_pointer = 0;
1096 1137
1097 if (options & Opt_pointerBlank) 1138 if (OPTION (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1139 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif 1140#endif
1100} 1141}
1101 1142
1102#ifdef POINTER_BLANK 1143#ifdef POINTER_BLANK
1103void 1144void
1104rxvt_term::pointer_blank () 1145rxvt_term::pointer_blank ()
1105{ 1146{
1106 if (! (options & Opt_pointerBlank)) 1147 if (! OPTION (Opt_pointerBlank))
1107 return; 1148 return;
1108 1149
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1150 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1151 XFlush (display->display);
1111 1152
1112 hidden_pointer = 1; 1153 hidden_pointer = 1;
1113} 1154}
1114 1155
… …
1209 1250
1210 SET_R (this); 1251 SET_R (this);
1211 SET_LOCALE (locale); 1252 SET_LOCALE (locale);
1212 1253
1213#if defined(CURSOR_BLINK) 1254#if defined(CURSOR_BLINK)
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1255 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1215 { 1256 {
1216 if (hidden_cursor) 1257 if (hidden_cursor)
1217 { 1258 {
1218 hidden_cursor = 0; 1259 hidden_cursor = 0;
1219 want_refresh = 1; 1260 want_refresh = 1;
… …
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1263 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1223 } 1264 }
1224#endif 1265#endif
1225 1266
1226#if defined(POINTER_BLANK) 1267#if defined(POINTER_BLANK)
1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1268 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1228 { 1269 {
1229 if (ev.type == MotionNotify 1270 if (ev.type == MotionNotify
1230 || ev.type == ButtonPress 1271 || ev.type == ButtonPress
1231 || ev.type == ButtonRelease) 1272 || ev.type == ButtonRelease)
1232 if (hidden_pointer) 1273 if (hidden_pointer)
… …
1330 button_release (ev.xbutton); 1371 button_release (ev.xbutton);
1331 break; 1372 break;
1332 1373
1333 case ClientMessage: 1374 case ClientMessage:
1334 if (ev.xclient.format == 32 1375 if (ev.xclient.format == 32
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS] 1376 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1377 {
1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1378 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1337 destroy (); 1379 destroy ();
1380#if ENABLE_EWMH
1381 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1382 XSendEvent (disp, ev.xclient.window = display->root,
1383 False, SubstructureRedirectMask | SubstructureNotifyMask,
1384 &ev);
1385#endif
1386 }
1338#if ENABLE_XEMBED 1387#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32 1388 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1340 && ev.xclient.message_type == xa[XA_XEMBED])
1341 { 1389 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) 1390 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in (); 1391 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out (); 1393 focus_out ();
… …
1409 case FocusOut: 1457 case FocusOut:
1410 focus_out (); 1458 focus_out ();
1411 break; 1459 break;
1412 1460
1413 case ConfigureNotify: 1461 case ConfigureNotify:
1414 if (ev.xconfigure.window == TermWin.parent[0]) 1462 if (ev.xconfigure.window == parent[0])
1415 { 1463 {
1416 int height, width;
1417
1418 do
1419 { /* Wrap lots of configures into one */
1420 width = ev.xconfigure.width;
1421 height = ev.xconfigure.height;
1422 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1423 }
1424 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1464 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1465 ;
1425 1466
1426 if (szHint.width != width || szHint.height != height) 1467 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1427 { 1468 {
1428 seen_resize = 1; 1469 seen_resize = 1;
1429 resize_all_windows (width, height, 1); 1470 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1430 } 1471 }
1431 1472
1432#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1433 if (options & Opt_transparent) 1474 if (OPTION (Opt_transparent))
1434 check_our_parents (); 1475 check_our_parents ();
1435#endif 1476#endif
1436 } 1477 }
1437 break; 1478 break;
1438 1479
… …
1455 case SelectionRequest: 1496 case SelectionRequest:
1456 selection_send (ev.xselectionrequest); 1497 selection_send (ev.xselectionrequest);
1457 break; 1498 break;
1458 1499
1459 case UnmapNotify: 1500 case UnmapNotify:
1460 TermWin.mapped = 0; 1501 mapped = 0;
1461#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1462 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1463#endif 1504#endif
1464 break; 1505 break;
1465 1506
1466 case MapNotify: 1507 case MapNotify:
1467 TermWin.mapped = 1; 1508 mapped = 1;
1468#ifdef TEXT_BLINK 1509#ifdef TEXT_BLINK
1469 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1470#endif 1511#endif
1471 break; 1512 break;
1472 1513
… …
1476 break; 1517 break;
1477#endif /* TRANSPARENT */ 1518#endif /* TRANSPARENT */
1478 1519
1479 case GraphicsExpose: 1520 case GraphicsExpose:
1480 case Expose: 1521 case Expose:
1481 if (ev.xany.window == TermWin.vt) 1522 if (ev.xany.window == vt)
1482 { 1523 {
1483 do 1524 do
1484 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1485 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1527 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1487 1528
1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1489 1530
1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1531 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1532 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1533 ev.xexpose.width, ev.xexpose.height, False);
1493 1534
1494 scr_refresh (refresh_type); 1535 scr_refresh (refresh_type);
1495 } 1536 }
… …
1511 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1552 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1512 menubar_expose (); 1553 menubar_expose ();
1513#endif 1554#endif
1514 1555
1515#ifdef TRANSPARENT 1556#ifdef TRANSPARENT
1516 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1557 if (am_transparent && ev.xany.window == parent[0])
1517 XClearWindow (disp, ev.xany.window); 1558 XClearWindow (disp, ev.xany.window);
1518#endif 1559#endif
1519 } 1560 }
1520 break; 1561 break;
1521 1562
… …
1532 } 1573 }
1533#endif 1574#endif
1534 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1575 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1535 break; 1576 break;
1536 1577
1537 if (ev.xany.window == TermWin.vt) 1578 if (ev.xany.window == vt)
1538 { 1579 {
1539 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1580 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1540 { 1581 {
1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1542 ; 1583 ;
1543 1584
1544 XQueryPointer (disp, TermWin.vt, 1585 XQueryPointer (disp, vt,
1545 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1546 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1547 &ev.xbutton.x, &ev.xbutton.y, 1588 &ev.xbutton.x, &ev.xbutton.y,
1548 &ev.xbutton.state); 1589 &ev.xbutton.state);
1549#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
… …
1561#endif 1602#endif
1562 selection_extend (ev.xbutton.x, ev.xbutton.y, 1603 selection_extend (ev.xbutton.x, ev.xbutton.y,
1563 ev.xbutton.state & Button3Mask ? 2 : 0); 1604 ev.xbutton.state & Button3Mask ? 2 : 0);
1564 1605
1565#ifdef SELECTION_SCROLLING 1606#ifdef SELECTION_SCROLLING
1566 if (ev.xbutton.y < TermWin.int_bwidth 1607 if (ev.xbutton.y < int_bwidth
1567 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1608 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1568 { 1609 {
1569 int dist; 1610 int dist;
1570 1611
1571 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1572 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
… …
1580 selection_save_x = ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
1581 selection_save_y = ev.xbutton.y; 1622 selection_save_y = ev.xbutton.y;
1582 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1623 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1583 1624
1584 /* calc number of lines to scroll */ 1625 /* calc number of lines to scroll */
1585 if (ev.xbutton.y < TermWin.int_bwidth) 1626 if (ev.xbutton.y < int_bwidth)
1586 { 1627 {
1587 scroll_selection_dir = UP; 1628 scroll_selection_dir = UP;
1588 dist = TermWin.int_bwidth - ev.xbutton.y; 1629 dist = int_bwidth - ev.xbutton.y;
1589 } 1630 }
1590 else 1631 else
1591 { 1632 {
1592 scroll_selection_dir = DN; 1633 scroll_selection_dir = DN;
1593 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1634 dist = ev.xbutton.y - (int_bwidth + height);
1594 } 1635 }
1595 1636
1596 scroll_selection_lines = Pixel2Height (dist) 1637 scroll_selection_lines = Pixel2Height (dist)
1597 / SELECTION_SCROLL_LINE_SPEEDUP 1638 / SELECTION_SCROLL_LINE_SPEEDUP
1598 + 1; 1639 + 1;
1599 MIN_IT (scroll_selection_lines, 1640 min_it (scroll_selection_lines,
1600 SELECTION_SCROLL_MAX_LINES); 1641 SELECTION_SCROLL_MAX_LINES);
1601 } 1642 }
1602 else 1643 else
1603 { 1644 {
1604 /* we are within the text window, so we 1645 /* we are within the text window, so we
… …
1635} 1676}
1636 1677
1637void 1678void
1638rxvt_term::focus_in () 1679rxvt_term::focus_in ()
1639{ 1680{
1640 if (!TermWin.focus) 1681 if (!focus)
1641 { 1682 {
1642 TermWin.focus = 1; 1683 focus = 1;
1643 want_refresh = 1; 1684 want_refresh = 1;
1644#ifdef USE_XIM 1685#if USE_XIM
1645 if (Input_Context != NULL) 1686 if (Input_Context != NULL)
1646 { 1687 {
1647 IMSetStatusPosition (); 1688 IMSetStatusPosition ();
1648 XSetICFocus (Input_Context); 1689 XSetICFocus (Input_Context);
1649 } 1690 }
1650#endif 1691#endif
1651#ifdef CURSOR_BLINK 1692#if CURSOR_BLINK
1652 if (options & Opt_cursorBlink) 1693 if (OPTION (Opt_cursorBlink))
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1694 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1654#endif 1695#endif
1655#ifdef OFF_FOCUS_FADING 1696#if OFF_FOCUS_FADING
1656 if (rs[Rs_fade]) 1697 if (rs[Rs_fade])
1657 { 1698 {
1658 pix_colors = pix_colors_focused; 1699 pix_colors = pix_colors_focused;
1659 scr_recolour (); 1700 scr_recolour ();
1660 } 1701 }
… …
1663} 1704}
1664 1705
1665void 1706void
1666rxvt_term::focus_out () 1707rxvt_term::focus_out ()
1667{ 1708{
1668 if (TermWin.focus) 1709 if (focus)
1669 { 1710 {
1670 TermWin.focus = 0; 1711 focus = 0;
1671 want_refresh = 1; 1712 want_refresh = 1;
1672 1713
1673#if ENABLE_FRILLS || ISO_14755 1714#if ENABLE_FRILLS || ISO_14755
1674 iso14755buf = 0; 1715 iso14755buf = 0;
1675#endif 1716#endif
1676#if ENABLE_OVERLAY 1717#if ENABLE_OVERLAY
1677 scr_overlay_off (); 1718 scr_overlay_off ();
1678#endif 1719#endif
1679#ifdef USE_XIM 1720#if USE_XIM
1680 if (Input_Context != NULL) 1721 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context); 1722 XUnsetICFocus (Input_Context);
1682#endif 1723#endif
1683#ifdef CURSOR_BLINK 1724#if CURSOR_BLINK
1684 if (options & Opt_cursorBlink) 1725 if (OPTION (Opt_cursorBlink))
1685 cursor_blink_ev.stop (); 1726 cursor_blink_ev.stop ();
1686 hidden_cursor = 0; 1727 hidden_cursor = 0;
1687#endif 1728#endif
1688#ifdef OFF_FOCUS_FADING 1729#if OFF_FOCUS_FADING
1689 if (rs[Rs_fade]) 1730 if (rs[Rs_fade])
1690 { 1731 {
1691 pix_colors = pix_colors_unfocused; 1732 pix_colors = pix_colors_unfocused;
1692 scr_recolour (); 1733 scr_recolour ();
1693 } 1734 }
… …
1713 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1754 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1714 return; 1755 return;
1715 1756
1716 /* FALLTHROUGH */ 1757 /* FALLTHROUGH */
1717 case ReparentNotify: 1758 case ReparentNotify:
1718 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1759 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1719 want_refresh = want_full_refresh = 1; 1760 want_refresh = want_full_refresh = 1;
1720 break; 1761 break;
1721 } 1762 }
1722} 1763}
1723#endif 1764#endif
… …
1732 reportmode = !! (priv_modes & PrivMode_mouse_report); 1773 reportmode = !! (priv_modes & PrivMode_mouse_report);
1733 1774
1734 /* 1775 /*
1735 * VT window processing of button press 1776 * VT window processing of button press
1736 */ 1777 */
1737 if (ev.window == TermWin.vt) 1778 if (ev.window == vt)
1738 { 1779 {
1739#if ISO_14755 1780#if ISO_14755
1740 // 5.4 1781 // 5.4
1741 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1782 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742 { 1783 {
… …
1947 case Button3: 1988 case Button3:
1948 if (scrollBar.style != R_SB_XTERM) 1989 if (scrollBar.style != R_SB_XTERM)
1949 { 1990 {
1950 if (scrollbar_above_slider (ev.y)) 1991 if (scrollbar_above_slider (ev.y))
1951# ifdef RXVT_SCROLL_FULL 1992# ifdef RXVT_SCROLL_FULL
1952 scr_page (UP, TermWin.nrow - 1); 1993 scr_page (UP, nrow - 1);
1953# else 1994# else
1954 scr_page (UP, TermWin.nrow / 4); 1995 scr_page (UP, nrow / 4);
1955# endif 1996# endif
1956 else if (scrollbar_below_slider (ev.y)) 1997 else if (scrollbar_below_slider (ev.y))
1957# ifdef RXVT_SCROLL_FULL 1998# ifdef RXVT_SCROLL_FULL
1958 scr_page (DN, TermWin.nrow - 1); 1999 scr_page (DN, nrow - 1);
1959# else 2000# else
1960 scr_page (DN, TermWin.nrow / 4); 2001 scr_page (DN, nrow / 4);
1961# endif 2002# endif
1962 else 2003 else
1963 scrollBar.setMotion (); 2004 scrollBar.setMotion ();
1964 } 2005 }
1965 else 2006 else
1966 { 2007 {
1967 scr_page ((ev.button == Button1 ? DN : UP), 2008 scr_page ((ev.button == Button1 ? DN : UP),
1968 (TermWin.nrow 2009 (nrow
1969 * scrollbar_position (ev.y) 2010 * scrollbar_position (ev.y)
1970 / scrollbar_size ())); 2011 / scrollbar_size ()));
1971 } 2012 }
1972 2013
1973 break; 2014 break;
… …
2005#ifdef SELECTION_SCROLLING 2046#ifdef SELECTION_SCROLLING
2006 if (sel_scroll_ev.active) 2047 if (sel_scroll_ev.active)
2007 sel_scroll_ev.stop(); 2048 sel_scroll_ev.stop();
2008#endif 2049#endif
2009 2050
2010 if (ev.window == TermWin.vt) 2051 if (ev.window == vt)
2011 { 2052 {
2012#if ISO_14755 2053#if ISO_14755
2013 // 5.4 2054 // 5.4
2014 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2055 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015 return; 2056 return;
… …
2065 2106
2066 v = ev.button == Button4 ? UP : DN; 2107 v = ev.button == Button4 ? UP : DN;
2067 2108
2068 if (ev.state & ShiftMask) 2109 if (ev.state & ShiftMask)
2069 i = 1; 2110 i = 1;
2070 else if (options & Opt_mouseWheelScrollPage) 2111 else if (OPTION (Opt_mouseWheelScrollPage))
2071 i = TermWin.nrow - 1; 2112 i = nrow - 1;
2072 else 2113 else
2073 i = 5; 2114 i = 5;
2074 2115
2075# ifdef MOUSE_SLIP_WHEELING 2116# ifdef MOUSE_SLIP_WHEELING
2076 if (ev.state & ControlMask) 2117 if (ev.state & ControlMask)
2077 { 2118 {
2078 mouse_slip_wheel_speed += v ? -1 : 1; 2119 mouse_slip_wheel_speed += v ? -1 : 1;
2079 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2120 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2080 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2121 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2081 2122
2082 if (slip_wheel_ev.at < NOW) 2123 if (slip_wheel_ev.at < NOW)
2083 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2124 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2084 2125
2085 slip_wheel_ev.start (); 2126 slip_wheel_ev.start ();
… …
2361 XWindowAttributes wattr, wrootattr; 2402 XWindowAttributes wattr, wrootattr;
2362 dDisp; 2403 dDisp;
2363 2404
2364 pchanged = 0; 2405 pchanged = 0;
2365 2406
2366 if (!(options & Opt_transparent)) 2407 if (!OPTION (Opt_transparent))
2367 return pchanged; /* Don't try any more */ 2408 return pchanged; /* Don't try any more */
2368 2409
2369 XGetWindowAttributes (disp, display->root, &wrootattr); 2410 XGetWindowAttributes (disp, display->root, &wrootattr);
2370 rootdepth = wrootattr.depth; 2411 rootdepth = wrootattr.depth;
2371 2412
2372 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2413 XGetWindowAttributes (disp, parent[0], &wattr);
2373 2414
2374 if (rootdepth != wattr.depth) 2415 if (rootdepth != wattr.depth)
2375 { 2416 {
2376 if (am_transparent) 2417 if (am_transparent)
2377 { 2418 {
2378 pchanged = 1; 2419 pchanged = 1;
2379 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2420 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2380 am_transparent = am_pixmap_trans = 0; 2421 am_transparent = am_pixmap_trans = 0;
2381 } 2422 }
2382 2423
2383 return pchanged; /* Don't try any more */ 2424 return pchanged; /* Don't try any more */
2384 } 2425 }
… …
2425 Window cr; 2466 Window cr;
2426 XImage *image; 2467 XImage *image;
2427 GC gc; 2468 GC gc;
2428 XGCValues gcvalue; 2469 XGCValues gcvalue;
2429 2470
2430 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2471 XTranslateCoordinates (disp, parent[0], display->root,
2431 0, 0, &sx, &sy, &cr); 2472 0, 0, &sx, &sy, &cr);
2432 nw = (unsigned int)szHint.width; 2473 nw = (unsigned int)szHint.width;
2433 nh = (unsigned int)szHint.height; 2474 nh = (unsigned int)szHint.height;
2434 nx = ny = 0; 2475 nx = ny = 0;
2435 2476
… …
2445 nh += sy; 2486 nh += sy;
2446 ny = -sy; 2487 ny = -sy;
2447 sy = 0; 2488 sy = 0;
2448 } 2489 }
2449 2490
2450 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2491 min_it (nw, (unsigned int) (wrootattr.width - sx));
2451 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2492 min_it (nh, (unsigned int) (wrootattr.height - sy));
2452 2493
2453 XSync (disp, False); 2494 XSync (disp, False);
2454 allowedxerror = -1; 2495 allowedxerror = -1;
2455 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2496 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2456 2497
… …
2461 if (image == NULL) 2502 if (image == NULL)
2462 { 2503 {
2463 if (am_transparent && am_pixmap_trans) 2504 if (am_transparent && am_pixmap_trans)
2464 { 2505 {
2465 pchanged = 1; 2506 pchanged = 1;
2466 if (TermWin.pixmap != None) 2507 if (pixmap != None)
2467 { 2508 {
2468 XFreePixmap (disp, TermWin.pixmap); 2509 XFreePixmap (disp, pixmap);
2469 TermWin.pixmap = None; 2510 pixmap = None;
2470 } 2511 }
2471 } 2512 }
2472 2513
2473 am_pixmap_trans = 0; 2514 am_pixmap_trans = 0;
2474 } 2515 }
2475 else 2516 else
2476 { 2517 {
2477 if (TermWin.pixmap != None) 2518 if (pixmap != None)
2478 XFreePixmap (disp, TermWin.pixmap); 2519 XFreePixmap (disp, pixmap);
2479 2520
2480#if TINTING 2521#if TINTING
2481 if (ISSET_PIXCOLOR (Color_tint)) 2522 if (ISSET_PIXCOLOR (Color_tint))
2482 { 2523 {
2483 unsigned short rm, gm, bm; 2524 unsigned short rm, gm, bm;
… …
2487 2528
2488 ShadeXImage (display, image, shade, rm, gm, bm); 2529 ShadeXImage (display, image, shade, rm, gm, bm);
2489 } 2530 }
2490#endif 2531#endif
2491 2532
2492 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2533 pixmap = XCreatePixmap (disp, vt,
2493 szHint.width, szHint.height, image->depth); 2534 szHint.width, szHint.height, image->depth);
2494 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2535 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2495 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2536 XPutImage (disp, pixmap, gc, image, 0, 0,
2496 nx, ny, image->width, image->height); 2537 nx, ny, image->width, image->height);
2497 XFreeGC (disp, gc); 2538 XFreeGC (disp, gc);
2498 XDestroyImage (image); 2539 XDestroyImage (image);
2499 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2540 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2500 XClearWindow (disp, TermWin.parent[0]); 2541 XClearWindow (disp, parent[0]);
2501 2542
2502 if (!am_transparent || !am_pixmap_trans) 2543 if (!am_transparent || !am_pixmap_trans)
2503 pchanged = 1; 2544 pchanged = 1;
2504 2545
2505 am_transparent = am_pixmap_trans = 1; 2546 am_transparent = am_pixmap_trans = 1;
2506 } 2547 }
2507 } 2548 }
2508 2549
2509 if (am_pixmap_trans) 2550 if (am_pixmap_trans)
2510 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2551 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2511 else 2552 else
2512 { 2553 {
2513 unsigned int n; 2554 unsigned int n;
2514 /* 2555 /*
2515 * InheritPixmap transparency 2556 * InheritPixmap transparency
2516 */ 2557 */
2517 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2558 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2518 { 2559 {
2519 oldp = TermWin.parent[i]; 2560 oldp = parent[i];
2520 XQueryTree (disp, TermWin.parent[i - 1], &root, 2561 XQueryTree (disp, parent[i - 1], &root,
2521 &TermWin.parent[i], &list, &n); 2562 &parent[i], &list, &n);
2522 XFree (list); 2563 XFree (list);
2523 2564
2524 if (TermWin.parent[i] == display->root) 2565 if (parent[i] == display->root)
2525 { 2566 {
2526 if (oldp != None) 2567 if (oldp != None)
2527 pchanged = 1; 2568 pchanged = 1;
2528 2569
2529 break; 2570 break;
2530 } 2571 }
2531 2572
2532 if (oldp != TermWin.parent[i]) 2573 if (oldp != parent[i])
2533 pchanged = 1; 2574 pchanged = 1;
2534 } 2575 }
2535 2576
2536 n = 0; 2577 n = 0;
2537 2578
2538 if (pchanged) 2579 if (pchanged)
2539 { 2580 {
2540 for (; n < (unsigned int)i; n++) 2581 for (; n < (unsigned int)i; n++)
2541 { 2582 {
2542 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2583 XGetWindowAttributes (disp, parent[n], &wattr);
2543 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2584 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2544 { 2585 {
2545 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2586 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2546 break; 2587 break;
2547 } 2588 }
2548 } 2589 }
2549 } 2590 }
2550 2591
2551 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2592 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2552 { 2593 {
2553 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2594 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2554 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2595 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2555 am_transparent = 0; 2596 am_transparent = 0;
2556 /* XXX: also turn off Opt_transparent? */ 2597 /* XXX: also turn off Opt_transparent? */
2557 } 2598 }
2558 else 2599 else
2559 { 2600 {
… …
2562 * needed for fvwm2.2.2 (and before?) */ 2603 * needed for fvwm2.2.2 (and before?) */
2563 sleep (1); 2604 sleep (1);
2564#endif 2605#endif
2565 for (n = 0; n < (unsigned int)i; n++) 2606 for (n = 0; n < (unsigned int)i; n++)
2566 { 2607 {
2567 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2608 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2568 XClearWindow (disp, TermWin.parent[n]); 2609 XClearWindow (disp, parent[n]);
2569 } 2610 }
2570 2611
2571 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2612 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2572 am_transparent = 1; 2613 am_transparent = 1;
2573 } 2614 }
2574 2615
2575 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2616 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2576 TermWin.parent[i] = None; 2617 parent[i] = None;
2577 } 2618 }
2578 2619
2579 if (scrollBar.win) 2620 if (scrollBar.win)
2580 { 2621 {
2581 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2622 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2633 /* Read a text string from the input buffer */ 2674 /* Read a text string from the input buffer */
2634 unicode_t buf[UBUFSIZ]; 2675 unicode_t buf[UBUFSIZ];
2635 bool refreshnow = false; 2676 bool refreshnow = false;
2636 int nlines = 0; 2677 int nlines = 0;
2637 unicode_t *str = buf; 2678 unicode_t *str = buf;
2679 unicode_t *eol = str + min (ncol, UBUFSIZ);
2638 2680
2639 for (;;) 2681 for (;;)
2640 { 2682 {
2641 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2683 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2642 break; 2684 break;
2643 2685
2644 *str++ = ch; 2686 *str++ = ch;
2645 2687
2646 if (ch == C0_LF) 2688 if (ch == C0_LF || str >= eol)
2647 { 2689 {
2690 if (ch == C0_LF)
2648 nlines++; 2691 nlines++;
2692
2649 refresh_count++; 2693 refresh_count++;
2650 2694
2651 if (!(options & Opt_jumpScroll) 2695 if (!OPTION (Opt_jumpScroll)
2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2696 || (refresh_count >= refresh_limit * (nrow - 1)))
2653 { 2697 {
2654 refreshnow = true; 2698 refreshnow = true;
2655 ch = NOCHAR; 2699 ch = NOCHAR;
2656 break; 2700 break;
2657 } 2701 }
2658 2702
2659 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2703 // scr_add_lines only works for nlines <= nrow - 1.
2660 if (nlines >= TermWin.nrow - 1) 2704 if (nlines >= nrow - 1)
2661 { 2705 {
2662 scr_add_lines (buf, nlines, str - buf); 2706 scr_add_lines (buf, nlines, str - buf);
2663 nlines = 0; 2707 nlines = 0;
2664 str = buf; 2708 str = buf;
2709 eol = str + min (ncol, UBUFSIZ);
2665 } 2710 }
2666 }
2667 2711
2668 if (str >= buf + UBUFSIZ) 2712 if (str >= eol)
2669 { 2713 {
2714 if (eol >= buf + UBUFSIZ)
2715 {
2670 ch = NOCHAR; 2716 ch = NOCHAR;
2671 break; 2717 break;
2718 }
2719 else
2720 eol = min (eol + ncol, buf + UBUFSIZ);
2721 }
2722
2672 } 2723 }
2673 2724
2674 seq_begin = cmdbuf_ptr; 2725 seq_begin = cmdbuf_ptr;
2675 ch = next_char (); 2726 ch = next_char ();
2676 } 2727 }
… …
2683 * the number of pages between refreshes is refresh_limit, which 2734 * the number of pages between refreshes is refresh_limit, which
2684 * is incremented here because we must be doing flat-out scrolling. 2735 * is incremented here because we must be doing flat-out scrolling.
2685 */ 2736 */
2686 if (refreshnow) 2737 if (refreshnow)
2687 { 2738 {
2688 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2739 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2689 refresh_limit++; 2740 refresh_limit++;
2690 else 2741 else
2691 { 2742 {
2692 flag = true; 2743 flag = true;
2693 scr_refresh (refresh_type); 2744 scr_refresh (refresh_type);
… …
3335 3386
3336 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3387 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3337 arg[0] = -arg[0]; 3388 arg[0] = -arg[0];
3338 /* FALLTHROUGH */ 3389 /* FALLTHROUGH */
3339 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3390 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3340 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3391 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3341 break; 3392 break;
3342 3393
3343 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3394 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3344 tt_write ((const unsigned char *)VT100_ANS, 3395 tt_write ((const unsigned char *)VT100_ANS,
3345 (unsigned int) (sizeof (VT100_ANS) - 1)); 3396 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3357 break; 3408 break;
3358 case 6: /* CPR requested */ 3409 case 6: /* CPR requested */
3359 scr_report_position (); 3410 scr_report_position ();
3360 break; 3411 break;
3361 case 7: /* unofficial extension */ 3412 case 7: /* unofficial extension */
3362 if (options & Opt_insecure) 3413 if (OPTION (Opt_insecure))
3363 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3414 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3364 break; 3415 break;
3365 case 8: /* unofficial extension */ 3416 case 8: /* unofficial extension */
3366 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3417 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3367 break; 3418 break;
… …
3470 { 3521 {
3471 /* 3522 /*
3472 * commands 3523 * commands
3473 */ 3524 */
3474 case 1: /* deiconify window */ 3525 case 1: /* deiconify window */
3475 XMapWindow (disp, TermWin.parent[0]); 3526 XMapWindow (disp, parent[0]);
3476 break; 3527 break;
3477 case 2: /* iconify window */ 3528 case 2: /* iconify window */
3478 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3529 XIconifyWindow (disp, parent[0], display->screen);
3479 break; 3530 break;
3480 case 3: /* set position (pixels) */ 3531 case 3: /* set position (pixels) */
3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3532 XMoveWindow (disp, parent[0], args[1], args[2]);
3482 break; 3533 break;
3483 case 4: /* set size (pixels) */ 3534 case 4: /* set size (pixels) */
3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3535 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3485 break; 3536 break;
3486 case 5: /* raise window */ 3537 case 5: /* raise window */
3487 XRaiseWindow (disp, TermWin.parent[0]); 3538 XRaiseWindow (disp, parent[0]);
3488 break; 3539 break;
3489 case 6: /* lower window */ 3540 case 6: /* lower window */
3490 XLowerWindow (disp, TermWin.parent[0]); 3541 XLowerWindow (disp, parent[0]);
3491 break; 3542 break;
3492 case 7: /* refresh window */ 3543 case 7: /* refresh window */
3493 scr_touch (true); 3544 scr_touch (true);
3494 break; 3545 break;
3495 case 8: /* set size (chars) */ 3546 case 8: /* set size (chars) */
3496 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3547 set_widthheight ((unsigned int) (args[2] * fwidth),
3497 (unsigned int) (args[1] * TermWin.fheight)); 3548 (unsigned int) (args[1] * fheight));
3498 break; 3549 break;
3499 3550
3500 //case 9: NYI, TODO, restore maximized window or maximize window 3551 //case 9: NYI, TODO, restore maximized window or maximize window
3501 default: 3552 default:
3502 if (args[0] >= 24) /* set height (chars) */ 3553 if (args[0] >= 24) /* set height (chars) */
3503 set_widthheight ((unsigned int)TermWin.width, 3554 set_widthheight ((unsigned int)width,
3504 (unsigned int) (args[1] * TermWin.fheight)); 3555 (unsigned int) (args[1] * fheight));
3505 break; 3556 break;
3506 3557
3507 3558
3508 /* 3559 /*
3509 * reports - some output format copied from XTerm 3560 * reports - some output format copied from XTerm
3510 */ 3561 */
3511 case 11: /* report window state */ 3562 case 11: /* report window state */
3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3563 XGetWindowAttributes (disp, parent[0], &wattr);
3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3564 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3514 break; 3565 break;
3515 case 13: /* report window position */ 3566 case 13: /* report window position */
3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3567 XGetWindowAttributes (disp, parent[0], &wattr);
3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3568 XTranslateCoordinates (disp, parent[0], wattr.root,
3518 -wattr.border_width, -wattr.border_width, 3569 -wattr.border_width, -wattr.border_width,
3519 &x, &y, &wdummy); 3570 &x, &y, &wdummy);
3520 tt_printf ("\033[3;%d;%dt", x, y); 3571 tt_printf ("\033[3;%d;%dt", x, y);
3521 break; 3572 break;
3522 case 14: /* report window size (pixels) */ 3573 case 14: /* report window size (pixels) */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3574 XGetWindowAttributes (disp, parent[0], &wattr);
3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3575 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3525 break; 3576 break;
3526 case 18: /* report text area size (chars) */ 3577 case 18: /* report text area size (chars) */
3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3578 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3528 break; 3579 break;
3529 case 19: /* report window size (chars) */ 3580 case 19: /* report window size (chars) */
3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3581 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3531 break; 3582 break;
3532 case 20: /* report icon label */ 3583 case 20: /* report icon label */
3533 { 3584 {
3534 char *s; 3585 char *s;
3535 XGetIconName (disp, TermWin.parent[0], &s); 3586 XGetIconName (disp, parent[0], &s);
3536 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3587 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3537 XFree (s); 3588 XFree (s);
3538 } 3589 }
3539 break; 3590 break;
3540 case 21: /* report window title */ 3591 case 21: /* report window title */
3541 { 3592 {
3542 char *s; 3593 char *s;
3543 XFetchName (disp, TermWin.parent[0], &s); 3594 XFetchName (disp, parent[0], &s);
3544 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3595 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3545 XFree (s); 3596 XFree (s);
3546 } 3597 }
3547 break; 3598 break;
3548 } 3599 }
3549} 3600}
… …
3581 else if (ch < 0x20) 3632 else if (ch < 0x20)
3582 return NULL; /* other control character - exit */ 3633 return NULL; /* other control character - exit */
3583 3634
3584 seen_esc = false; 3635 seen_esc = false;
3585 3636
3586 if (n >= sizeof (string) - 1) 3637 if (n >= STRING_MAX - 1)
3587 // stop at some sane length 3638 // stop at some sane length
3588 return NULL; 3639 return NULL;
3589 3640
3590 if (ch == C0_SYN) 3641 if (ch == C0_SYN)
3591 string[n++] = cmd_get8 (); 3642 string[n++] = cmd_get8 ();
… …
3659 set_window_color (color, str); 3710 set_window_color (color, str);
3660} 3711}
3661 3712
3662/* 3713/*
3663 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3714 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3664 * 0 = change iconName/title
3665 * 1 = change iconName
3666 * 2 = change title
3667 * 4 = change color
3668 * 10 = change fg color
3669 * 11 = change bg color
3670 * 12 = change text color
3671 * 13 = change mouse foreground color
3672 * 17 = change highlight character colour
3673 * 18 = change bold character color
3674 * 19 = change underlined character color
3675 * 46 = change logfile (not implemented)
3676 * 50 = change font
3677 *
3678 * rxvt extensions:
3679 * 20 = bg pixmap
3680 * 39 = change default fg color
3681 * 49 = change default bg color
3682 * 55 = dump scrollback buffer and all of screen
3683 * 701 = change locale
3684 * 702 = find font
3685 * 703 = menu
3686 */ 3715 */
3687void 3716void
3688rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3717rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3689{ 3718{
3690 int changed = 0; 3719 int changed = 0;
… …
3716 unsigned long bytes_after; 3745 unsigned long bytes_after;
3717 unsigned char *value = 0; 3746 unsigned char *value = 0;
3718 const char *str = ""; 3747 const char *str = "";
3719 3748
3720 if (prop 3749 if (prop
3721 && XGetWindowProperty (disp, TermWin.parent[0], 3750 && XGetWindowProperty (disp, parent[0],
3722 prop, 0, 1<<16, 0, AnyPropertyType, 3751 prop, 0, 1<<16, 0, AnyPropertyType,
3723 &actual_type, &actual_format, 3752 &actual_type, &actual_format,
3724 &nitems, &bytes_after, &value) == Success 3753 &nitems, &bytes_after, &value) == Success
3725 && actual_type != None 3754 && actual_type != None
3726 && actual_format == 8) 3755 && actual_format == 8)
… …
3738 { 3767 {
3739 *eq = 0; 3768 *eq = 0;
3740 set_utf8_property (display->atom (str), eq + 1); 3769 set_utf8_property (display->atom (str), eq + 1);
3741 } 3770 }
3742 else 3771 else
3743 XDeleteProperty (disp, TermWin.parent[0], 3772 XDeleteProperty (disp, parent[0],
3744 display->atom (str)); 3773 display->atom (str));
3745 } 3774 }
3746 break; 3775 break;
3747 3776
3748 case XTerm_Color: 3777 case XTerm_Color:
… …
3789 break; 3818 break;
3790#ifndef NO_BOLD_UNDERLINE_REVERSE 3819#ifndef NO_BOLD_UNDERLINE_REVERSE
3791 case XTerm_Color_BD: 3820 case XTerm_Color_BD:
3792 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3821 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3793 break; 3822 break;
3794 case XTerm_Color_IT:
3795 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3796 break;
3797 case XTerm_Color_UL: 3823 case XTerm_Color_UL:
3798 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3824 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3799 break; 3825 break;
3800 case XTerm_Color_RV: 3826 case XTerm_Color_RV:
3801 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3827 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3802 break; 3828 break;
3829 case URxvt_Color_IT:
3830 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3831 break;
3803#endif 3832#endif
3804#if TRANSPARENT && TINTING 3833#if TRANSPARENT && TINTING
3805 case XTerm_Color_tint: 3834 case URxvt_Color_tint:
3806 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3835 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3807 check_our_parents (); 3836 check_our_parents ();
3808 if (am_transparent) 3837 if (am_transparent)
3809 want_full_refresh = want_refresh = 1; 3838 want_full_refresh = want_refresh = 1;
3810 break; 3839 break;
3811#endif 3840#endif
… …
3845 3874
3846 case XTerm_logfile: 3875 case XTerm_logfile:
3847 // TODO, when secure mode? 3876 // TODO, when secure mode?
3848 break; 3877 break;
3849 3878
3879#ifdef MENUBAR
3880 case URxvt_Menu:
3881 if (OPTION (Opt_insecure))
3882 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3883 break;
3884#endif
3885#if 0
3886 case XTerm_dumpscreen: /* no error notices */
3887 {
3888 int fd;
3889 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3890 {
3891 scr_dump (fd);
3892 close (fd);
3893 }
3894 }
3895 break;
3896#endif
3850 case XTerm_font: 3897 case XTerm_font:
3851 op = URxvt_font; 3898 op = URxvt_font;
3852 case URxvt_font: 3899 case URxvt_font:
3853#if ENABLE_STYLES 3900#if ENABLE_STYLES
3854 case URxvt_boldFont: 3901 case URxvt_boldFont:
3855 case URxvt_italicFont: 3902 case URxvt_italicFont:
3856 case URxvt_boldItalicFont: 3903 case URxvt_boldItalicFont:
3857#endif 3904#endif
3858 if (query) 3905 if (query)
3859 tt_printf ("\33]%d;%-.250s%c", saveop, 3906 tt_printf ("\33]%d;%-.250s%c", saveop,
3860 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3907 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3861 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3908 ? fontset[op - URxvt_font]->fontdesc : "",
3862 resp); 3909 resp);
3863 else 3910 else
3864 { 3911 {
3865 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3912 const char *&res = rs[Rs_font + (op - URxvt_font)];
3866 3913
… …
3869 set_fonts (); 3916 set_fonts ();
3870 } 3917 }
3871 break; 3918 break;
3872 3919
3873#if ENABLE_FRILLS 3920#if ENABLE_FRILLS
3874 case XTerm_locale: 3921 case URxvt_locale:
3875 if (query) 3922 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3923 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3877 else 3924 else
3878 { 3925 {
3879 set_locale (str); 3926 set_locale (str);
3880 pty.set_utf8_mode (enc_utf8); 3927 pty.set_utf8_mode (enc_utf8);
3881# ifdef USE_XIM
3882 im_cb (); 3928 init_xlocale ();
3883# endif
3884 } 3929 }
3885 break; 3930 break;
3886#endif
3887 3931
3888#ifdef MENUBAR 3932 case URxvt_view_up:
3889 case XTerm_Menu: 3933 case URxvt_view_down:
3890 if (options & Opt_insecure) 3934 int lines = atoi (str);
3891 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3935
3892 break; 3936 if (lines)
3893#endif 3937 scr_page (op == URxvt_view_up ? UP : DN, lines);
3894#if 0
3895 case XTerm_dumpscreen: /* no error notices */
3896 { 3938 else
3897 int fd;
3898 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3899 { 3939 {
3900 scr_dump (fd); 3940 scr_erase_savelines ();
3901 close (fd);
3902 } 3941 }
3903 } 3942
3904 break; 3943 break;
3905#endif 3944#endif
3906 } 3945 }
3907} 3946}
3908/*----------------------------------------------------------------------*/ 3947/*----------------------------------------------------------------------*/
… …
4017 } 4056 }
4018 4057
4019 /* extra handling for values with state unkept */ 4058 /* extra handling for values with state unkept */
4020 switch (arg[i]) 4059 switch (arg[i])
4021 { 4060 {
4061#if ENABLE_STYLES
4062 case 1021:
4063 if (mode)
4064 SET_OPTION (Opt_intensityStyles);
4065 else
4066 CLR_OPTION (Opt_intensityStyles);
4067
4068 want_refresh = 1;
4069 want_full_refresh = 1;
4070 break;
4071#endif
4022 case 1048: /* alternative cursor save */ 4072 case 1048: /* alternative cursor save */
4023 case 1049: 4073 case 1049:
4024 if (options & Opt_secondaryScreen) 4074 if (OPTION (Opt_secondaryScreen))
4025 if (mode == 0) 4075 if (mode == 0)
4026 scr_cursor (RESTORE); 4076 scr_cursor (RESTORE);
4027 else if (mode == 1) 4077 else if (mode == 1)
4028 scr_cursor (SAVE); 4078 scr_cursor (SAVE);
4029 break; 4079 break;
… …
4041 */ 4091 */
4042 PrivMode (1, PrivMode_vt52); 4092 PrivMode (1, PrivMode_vt52);
4043 break; 4093 break;
4044 case 3: /* 80/132 */ 4094 case 3: /* 80/132 */
4045 if (priv_modes & PrivMode_132OK) 4095 if (priv_modes & PrivMode_132OK)
4046 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4096 set_widthheight (((state ? 132 : 80) * fwidth), height);
4047 break; 4097 break;
4048 case 4: /* smooth scrolling */ 4098 case 4: /* smooth scrolling */
4049 if (state) 4099 if (!state)
4050 options &= ~Opt_jumpScroll; 4100 SET_OPTION (Opt_jumpScroll);
4051 else 4101 else
4052 options |= Opt_jumpScroll; 4102 CLR_OPTION (Opt_jumpScroll);
4053 break; 4103 break;
4054 case 5: /* reverse video */ 4104 case 5: /* reverse video */
4055 scr_rvideo_mode (state); 4105 scr_rvideo_mode (state);
4056 break; 4106 break;
4057 case 6: /* relative/absolute origins */ 4107 case 6: /* relative/absolute origins */
… …
4098#if 0 4148#if 0
4099 case 1001: 4149 case 1001:
4100 break; /* X11 mouse highlighting */ 4150 break; /* X11 mouse highlighting */
4101#endif 4151#endif
4102 case 1010: /* scroll to bottom on TTY output inhibit */ 4152 case 1010: /* scroll to bottom on TTY output inhibit */
4103 if (state) 4153 if (!state)
4104 options &= ~Opt_scrollTtyOutput; 4154 SET_OPTION (Opt_scrollTtyOutput);
4105 else 4155 else
4106 options |= Opt_scrollTtyOutput; 4156 CLR_OPTION (Opt_scrollTtyOutput);
4107 break; 4157 break;
4108 case 1011: /* scroll to bottom on key press */ 4158 case 1011: /* scroll to bottom on key press */
4109 if (state) 4159 if (state)
4110 options |= Opt_scrollTtyKeypress; 4160 SET_OPTION (Opt_scrollTtyKeypress);
4111 else 4161 else
4112 options &= ~Opt_scrollTtyKeypress; 4162 CLR_OPTION (Opt_scrollTtyKeypress);
4113 break; 4163 break;
4114 case 1047: /* secondary screen w/ clearing last */ 4164 case 1047: /* secondary screen w/ clearing last */
4115 if (options & Opt_secondaryScreen) 4165 if (OPTION (Opt_secondaryScreen))
4116 if (current_screen != PRIMARY) 4166 if (current_screen != PRIMARY)
4117 scr_erase_screen (2); 4167 scr_erase_screen (2);
4118 scr_change_screen (state); 4168 scr_change_screen (state);
4119 break; 4169 break;
4120 case 1049: /* secondary screen w/ clearing first */ 4170 case 1049: /* secondary screen w/ clearing first */
4121 scr_change_screen (state); 4171 scr_change_screen (state);
4122 if (options & Opt_secondaryScreen) 4172 if (OPTION (Opt_secondaryScreen))
4123 if (current_screen != PRIMARY) 4173 if (current_screen != PRIMARY)
4124 scr_erase_screen (2); 4174 scr_erase_screen (2);
4125 break; 4175 break;
4126 default: 4176 default:
4127 break; 4177 break;
… …
4277 case 106: 4327 case 106:
4278 case 107: 4328 case 107:
4279 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4329 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4280 break; 4330 break;
4281#endif 4331#endif
4282
4283 } 4332 }
4284 } 4333 }
4285} 4334}
4286/*}}} */ 4335/*}}} */
4287 4336
… …
4368 } 4417 }
4369 4418
4370 memmove (v_buffer, v_buffer + written, v_buflen); 4419 memmove (v_buffer, v_buffer + written, v_buflen);
4371 } 4420 }
4372 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4421 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4373 // original code just ignores this... 4422 pty_ev.set (EVENT_READ);
4374 destroy ();
4375} 4423}
4376 4424
4377/*----------------------- end-of-file (C source) -----------------------*/ 4425/*----------------------- end-of-file (C source) -----------------------*/
4378 4426

Diff Legend

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