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.196 by root, Thu Feb 17 12:23:39 2005 UTC vs.
Revision 1.221 by root, Sat Dec 31 18:27:57 2005 UTC

… …
135rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
136{ 136{
137 x = Pixel2Col (x); 137 x = Pixel2Col (x);
138 y = Pixel2Row (y); 138 y = Pixel2Row (y);
139 139
140 if (x < 0 || x >= TermWin.ncol 140 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 141 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 142 return;
143 143
144 for (;;) 144 for (;;)
145 { 145 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 146 const line_t &l = ROW(y - view_start);
147
148 text_t t = l.t[x];
147 149
148 if (t != NOCHAR || !x) 150 if (t != NOCHAR || !x)
149 { 151 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 152 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; 153 iso14755buf = ISO_14755_54;
153 break; 154 break;
154 } 155 }
155 156
156 x--; 157 x--;
157 } 158 }
158
159} 159}
160#endif
161 160
162#if ENABLE_OVERLAY
163void 161void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 162rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 163{
166 rxvt_fontset *fs = FONTSET (r); 164 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 165 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2; 166 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 167 int len;
170 168
169 fname = rxvt_utf8towcs (f->name);
170
171#if ENABLE_COMBINING 171# if ENABLE_COMBINING
172 if (IS_COMPOSE (ch)) 172 if (IS_COMPOSE (ch))
173 { 173 {
174 len = rxvt_composite.expand (ch, 0); 174 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len]; 175 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr); 176 rxvt_composite.expand (ch, chr);
177 } 177 }
178 else 178 else
179#endif 179# endif
180 { 180 {
181 ch2 = ch; 181 ch2 = ch;
182 182
183 alloc = 0; 183 alloc = 0;
184 chr = &ch2; 184 chr = &ch2;
185 len = 1; 185 len = 1;
186 } 186 }
187 187
188 int width = strlen (f->name); 188 char attr[80]; // plenty
189 189
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 190 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
191 (int)r,
192 fgcolor_of (r), bgcolor_of (r),
193 r & RS_Bold ? " bold" : "",
194 r & RS_Italic ? " italic" : "",
195 r & RS_Blink ? " blink" : "",
196 r & RS_RVid ? " rvid" : "",
197 r & RS_Uline ? " uline" : "",
198 r & RS_Careful ? " careful" : "");
199
200 int width = wcswidth (fname, wcslen (fname));
201
202 max_it (width, 8+5); // for char + hey
203 max_it (width, strlen (attr));
204
205 if (y >= 0)
206 {
207 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
208 x = 0;
209 }
210
211 scr_overlay_new (x, y, width, len + 2);
191 212
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 213 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 214
194 for (int y = 0; y < len; y++) 215 for (int y = 0; y < len; y++)
195 { 216 {
… …
198 ch = *chr++; 219 ch = *chr++;
199 220
200 sprintf (buf, "%8x", ch); 221 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf); 222 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '='); 223 scr_overlay_set (9, y, '=');
203#if !UNICODE3 224# if !UNICODE3
204 if (ch >= 0x10000) 225 if (ch >= 0x10000)
205 ch = 0xfffd; 226 ch = 0xfffd;
206#endif 227# endif
207 scr_overlay_set (11, y, ch, r); 228 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r); 229 scr_overlay_set (12, y, NOCHAR, r);
209 } 230 }
210 231
232 scr_overlay_set (0, len , attr);
211 scr_overlay_set (0, len, f->name); 233 scr_overlay_set (0, len + 1, fname);
212 234
235 free (fname);
236
213#if ENABLE_COMBINING 237# if ENABLE_COMBINING
214 if (alloc) 238 if (alloc)
215 delete [] alloc; 239 delete [] alloc;
216#endif 240# endif
217} 241}
218#endif 242#endif
219 243
220void 244void
221rxvt_term::commit_iso14755 () 245rxvt_term::commit_iso14755 ()
… …
316 340
317 // the XOpenIM manpage lies about hardcoding the locale 341 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 342 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 343 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 344 SET_LOCALE (rs[Rs_imLocale]);
345
321 // assume wchar_t == unicode or better 346 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 347 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 348 KBUFSZ, &keysym, &status_return);
349
324 if (rs[Rs_imLocale]) 350 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 351 SET_LOCALE (locale);
326 352
327 if (status_return == XLookupChars 353 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 354 || status_return == XLookupBoth)
… …
360#ifdef KEYSYM_RESOURCE 386#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 387 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 388 return;
363#endif 389#endif
364 390
365 if (TermWin.saveLines) 391 if (saveLines)
366 { 392 {
367#ifdef UNSHIFTED_SCROLLKEYS 393#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 394 if (!ctrl && !meta)
369#else 395#else
370 if (IS_SCROLL_MOD) 396 if (IS_SCROLL_MOD)
371#endif 397#endif
372 { 398 {
373 int lnsppg; 399 int lnsppg;
374 400
375#ifdef PAGING_CONTEXT_LINES 401#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 402 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 403#else
378 lnsppg = TermWin.nrow * 4 / 5; 404 lnsppg = nrow * 4 / 5;
379#endif 405#endif
380 if (keysym == XK_Prior) 406 if (keysym == XK_Prior)
381 { 407 {
382 scr_page (UP, lnsppg); 408 scr_page (UP, lnsppg);
383 return; 409 return;
… …
838 } 864 }
839 865
840 if (len <= 0) 866 if (len <= 0)
841 return; /* not mapped */ 867 return; /* not mapped */
842 868
843 if (options & Opt_scrollTtyKeypress) 869 if (OPTION (Opt_scrollTtyKeypress))
844 if (TermWin.view_start) 870 if (view_start)
845 { 871 {
846 TermWin.view_start = 0; 872 view_start = 0;
847 want_refresh = 1; 873 want_refresh = 1;
848 } 874 }
849 875
850 /* 876 /*
851 * these modifications only affect the static keybuffer 877 * these modifications only affect the static keybuffer
… …
1028{ 1054{
1029 if (mouse_slip_wheel_speed == 0 1055 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1056 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1057 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1058 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1059 if (view_start == nsaved ||
1034 TermWin.view_start == 0) 1060 view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1061 mouse_slip_wheel_speed = 0;
1036 1062
1037 refresh_type |= SMOOTH_REFRESH; 1063 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1064 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1061 if (n > 0) 1087 if (n > 0)
1062 { 1088 {
1063 cmdbuf_endp += n; 1089 cmdbuf_endp += n;
1064 return true; 1090 return true;
1065 } 1091 }
1066 else if (n < 0 && errno != EAGAIN) 1092 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1093 {
1094 pty_ev.stop ();
1095
1096 if (!OPTION (Opt_hold))
1067 destroy (); 1097 destroy ();
1098 }
1068 1099
1069 return false; 1100 return false;
1070} 1101}
1071 1102
1072void 1103void
… …
1086} 1117}
1087 1118
1088void 1119void
1089rxvt_term::pointer_unblank () 1120rxvt_term::pointer_unblank ()
1090{ 1121{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1122 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1123 recolour_cursor ();
1093 1124
1094#ifdef POINTER_BLANK 1125#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1126 hidden_pointer = 0;
1096 1127
1097 if (options & Opt_pointerBlank) 1128 if (OPTION (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1129 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif 1130#endif
1100} 1131}
1101 1132
1102#ifdef POINTER_BLANK 1133#ifdef POINTER_BLANK
1103void 1134void
1104rxvt_term::pointer_blank () 1135rxvt_term::pointer_blank ()
1105{ 1136{
1106 if (! (options & Opt_pointerBlank)) 1137 if (! OPTION (Opt_pointerBlank))
1107 return; 1138 return;
1108 1139
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1140 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1141 XFlush (display->display);
1111 1142
1112 hidden_pointer = 1; 1143 hidden_pointer = 1;
1113} 1144}
1114 1145
… …
1209 1240
1210 SET_R (this); 1241 SET_R (this);
1211 SET_LOCALE (locale); 1242 SET_LOCALE (locale);
1212 1243
1213#if defined(CURSOR_BLINK) 1244#if defined(CURSOR_BLINK)
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1245 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1215 { 1246 {
1216 if (hidden_cursor) 1247 if (hidden_cursor)
1217 { 1248 {
1218 hidden_cursor = 0; 1249 hidden_cursor = 0;
1219 want_refresh = 1; 1250 want_refresh = 1;
… …
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1253 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1223 } 1254 }
1224#endif 1255#endif
1225 1256
1226#if defined(POINTER_BLANK) 1257#if defined(POINTER_BLANK)
1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1258 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1228 { 1259 {
1229 if (ev.type == MotionNotify 1260 if (ev.type == MotionNotify
1230 || ev.type == ButtonPress 1261 || ev.type == ButtonPress
1231 || ev.type == ButtonRelease) 1262 || ev.type == ButtonRelease)
1232 if (hidden_pointer) 1263 if (hidden_pointer)
… …
1330 button_release (ev.xbutton); 1361 button_release (ev.xbutton);
1331 break; 1362 break;
1332 1363
1333 case ClientMessage: 1364 case ClientMessage:
1334 if (ev.xclient.format == 32 1365 if (ev.xclient.format == 32
1366 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1367 {
1335 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1368 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1336 destroy (); 1369 destroy ();
1370#if ENABLE_EWMH
1371 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1372 XSendEvent (disp, ev.xclient.window = display->root,
1373 False, SubstructureRedirectMask | SubstructureNotifyMask,
1374 &ev);
1375#endif
1376 }
1377#if ENABLE_XEMBED
1378 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1379 {
1380 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1381 focus_in ();
1382 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1383 focus_out ();
1384 }
1385#endif
1337#ifdef OFFIX_DND 1386#ifdef OFFIX_DND
1338 /* OffiX Dnd (drag 'n' drop) protocol */ 1387 /* OffiX Dnd (drag 'n' drop) protocol */
1339 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1388 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1340 && (ev.xclient.data.l[0] == DndFile 1389 && (ev.xclient.data.l[0] == DndFile
1341 || ev.xclient.data.l[0] == DndDir 1390 || ev.xclient.data.l[0] == DndDir
1342 || ev.xclient.data.l[0] == DndLink)) 1391 || ev.xclient.data.l[0] == DndLink))
1343 { 1392 {
1344 /* Get Dnd data */ 1393 /* Get Dnd data */
1345 Atom ActualType; 1394 Atom ActualType;
1346 int ActualFormat; 1395 int ActualFormat;
1347 unsigned char *data; 1396 unsigned char *data;
… …
1390 break; 1439 break;
1391 } 1440 }
1392 break; 1441 break;
1393 1442
1394 case FocusIn: 1443 case FocusIn:
1395 if (!TermWin.focus) 1444 focus_in ();
1445 break;
1446
1447 case FocusOut:
1448 focus_out ();
1449 break;
1450
1451 case ConfigureNotify:
1452 if (ev.xconfigure.window == parent[0])
1396 { 1453 {
1397 TermWin.focus = 1;
1398 want_refresh = 1;
1399#ifdef USE_XIM
1400 if (Input_Context != NULL)
1401 {
1402 IMSetStatusPosition ();
1403 XSetICFocus (Input_Context);
1404 }
1405#endif
1406#ifdef CURSOR_BLINK
1407 if (options & Opt_cursorBlink)
1408 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1409#endif
1410#ifdef OFF_FOCUS_FADING
1411 if (rs[Rs_fade])
1412 {
1413 pix_colors = pix_colors_focused;
1414 scr_recolour ();
1415 }
1416#endif
1417
1418 }
1419 break;
1420
1421 case FocusOut:
1422 if (TermWin.focus)
1423 {
1424 TermWin.focus = 0;
1425 want_refresh = 1;
1426
1427#if ENABLE_FRILLS || ISO_14755
1428 iso14755buf = 0;
1429#endif
1430#if ENABLE_OVERLAY
1431 scr_overlay_off ();
1432#endif
1433#ifdef USE_XIM
1434 if (Input_Context != NULL)
1435 XUnsetICFocus (Input_Context);
1436#endif
1437#ifdef CURSOR_BLINK
1438 if (options & Opt_cursorBlink)
1439 cursor_blink_ev.stop ();
1440 hidden_cursor = 0;
1441#endif
1442#ifdef OFF_FOCUS_FADING
1443 if (rs[Rs_fade])
1444 {
1445 pix_colors = pix_colors_unfocused;
1446 scr_recolour ();
1447 }
1448#endif
1449 }
1450 break;
1451
1452 case ConfigureNotify:
1453 if (ev.xconfigure.window == TermWin.parent[0])
1454 {
1455 int height, width;
1456
1457 do
1458 { /* Wrap lots of configures into one */
1459 width = ev.xconfigure.width;
1460 height = ev.xconfigure.height;
1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1462 }
1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1454 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1455 ;
1464 1456
1465 if (szHint.width != width || szHint.height != height) 1457 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1458 {
1467 seen_resize = 1; 1459 seen_resize = 1;
1468 resize_all_windows (width, height, 1); 1460 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1461 }
1470 1462
1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1463#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1472 if (options & Opt_transparent) 1464 if (OPTION (Opt_transparent))
1473 check_our_parents (); 1465 check_our_parents ();
1474#endif 1466#endif
1475 } 1467 }
1476 break; 1468 break;
1477 1469
… …
1494 case SelectionRequest: 1486 case SelectionRequest:
1495 selection_send (ev.xselectionrequest); 1487 selection_send (ev.xselectionrequest);
1496 break; 1488 break;
1497 1489
1498 case UnmapNotify: 1490 case UnmapNotify:
1499 TermWin.mapped = 0; 1491 mapped = 0;
1500#ifdef TEXT_BLINK 1492#ifdef TEXT_BLINK
1501 text_blink_ev.stop (); 1493 text_blink_ev.stop ();
1502#endif 1494#endif
1503 break; 1495 break;
1504 1496
1505 case MapNotify: 1497 case MapNotify:
1506 TermWin.mapped = 1; 1498 mapped = 1;
1507#ifdef TEXT_BLINK 1499#ifdef TEXT_BLINK
1508 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1500 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1509#endif 1501#endif
1510 break; 1502 break;
1511 1503
… …
1515 break; 1507 break;
1516#endif /* TRANSPARENT */ 1508#endif /* TRANSPARENT */
1517 1509
1518 case GraphicsExpose: 1510 case GraphicsExpose:
1519 case Expose: 1511 case Expose:
1520 if (ev.xany.window == TermWin.vt) 1512 if (ev.xany.window == vt)
1521 { 1513 {
1522 do 1514 do
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1515 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1516 ev.xexpose.width, ev.xexpose.height, False);
1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1526 1518
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1520
1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1521 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1522 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1523 ev.xexpose.width, ev.xexpose.height, False);
1532 1524
1533 scr_refresh (refresh_type); 1525 scr_refresh (refresh_type);
1534 } 1526 }
… …
1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1542 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1551 menubar_expose (); 1543 menubar_expose ();
1552#endif 1544#endif
1553 1545
1554#ifdef TRANSPARENT 1546#ifdef TRANSPARENT
1555 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1547 if (am_transparent && ev.xany.window == parent[0])
1556 XClearWindow (disp, ev.xany.window); 1548 XClearWindow (disp, ev.xany.window);
1557#endif 1549#endif
1558 } 1550 }
1559 break; 1551 break;
1560 1552
… …
1571 } 1563 }
1572#endif 1564#endif
1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1574 break; 1566 break;
1575 1567
1576 if (ev.xany.window == TermWin.vt) 1568 if (ev.xany.window == vt)
1577 { 1569 {
1578 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1570 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1571 {
1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1572 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1581 ; 1573 ;
1582 1574
1583 XQueryPointer (disp, TermWin.vt, 1575 XQueryPointer (disp, vt,
1584 &unused_root, &unused_child, 1576 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1577 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1578 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1579 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1580#ifdef MOUSE_THRESHOLD
… …
1600#endif 1592#endif
1601 selection_extend (ev.xbutton.x, ev.xbutton.y, 1593 selection_extend (ev.xbutton.x, ev.xbutton.y,
1602 ev.xbutton.state & Button3Mask ? 2 : 0); 1594 ev.xbutton.state & Button3Mask ? 2 : 0);
1603 1595
1604#ifdef SELECTION_SCROLLING 1596#ifdef SELECTION_SCROLLING
1605 if (ev.xbutton.y < TermWin.int_bwidth 1597 if (ev.xbutton.y < int_bwidth
1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1598 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1607 { 1599 {
1608 int dist; 1600 int dist;
1609 1601
1610 /* don't clobber the current delay if we are 1602 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1603 * already in the middle of scrolling.
… …
1619 selection_save_x = ev.xbutton.x; 1611 selection_save_x = ev.xbutton.x;
1620 selection_save_y = ev.xbutton.y; 1612 selection_save_y = ev.xbutton.y;
1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1613 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1622 1614
1623 /* calc number of lines to scroll */ 1615 /* calc number of lines to scroll */
1624 if (ev.xbutton.y < TermWin.int_bwidth) 1616 if (ev.xbutton.y < int_bwidth)
1625 { 1617 {
1626 scroll_selection_dir = UP; 1618 scroll_selection_dir = UP;
1627 dist = TermWin.int_bwidth - ev.xbutton.y; 1619 dist = int_bwidth - ev.xbutton.y;
1628 } 1620 }
1629 else 1621 else
1630 { 1622 {
1631 scroll_selection_dir = DN; 1623 scroll_selection_dir = DN;
1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1624 dist = ev.xbutton.y - (int_bwidth + height);
1633 } 1625 }
1634 1626
1635 scroll_selection_lines = Pixel2Height (dist) 1627 scroll_selection_lines = Pixel2Height (dist)
1636 / SELECTION_SCROLL_LINE_SPEEDUP 1628 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1; 1629 + 1;
1638 MIN_IT (scroll_selection_lines, 1630 min_it (scroll_selection_lines,
1639 SELECTION_SCROLL_MAX_LINES); 1631 SELECTION_SCROLL_MAX_LINES);
1640 } 1632 }
1641 else 1633 else
1642 { 1634 {
1643 /* we are within the text window, so we 1635 /* we are within the text window, so we
… …
1671 } 1663 }
1672 break; 1664 break;
1673 } 1665 }
1674} 1666}
1675 1667
1668void
1669rxvt_term::focus_in ()
1670{
1671 if (!focus)
1672 {
1673 focus = 1;
1674 want_refresh = 1;
1675#if USE_XIM
1676 if (Input_Context != NULL)
1677 {
1678 IMSetStatusPosition ();
1679 XSetICFocus (Input_Context);
1680 }
1681#endif
1682#if CURSOR_BLINK
1683 if (OPTION (Opt_cursorBlink))
1684 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1685#endif
1686#if OFF_FOCUS_FADING
1687 if (rs[Rs_fade])
1688 {
1689 pix_colors = pix_colors_focused;
1690 scr_recolour ();
1691 }
1692#endif
1693 }
1694}
1695
1696void
1697rxvt_term::focus_out ()
1698{
1699 if (focus)
1700 {
1701 focus = 0;
1702 want_refresh = 1;
1703
1704#if ENABLE_FRILLS || ISO_14755
1705 iso14755buf = 0;
1706#endif
1707#if ENABLE_OVERLAY
1708 scr_overlay_off ();
1709#endif
1710#if USE_XIM
1711 if (Input_Context != NULL)
1712 XUnsetICFocus (Input_Context);
1713#endif
1714#if CURSOR_BLINK
1715 if (OPTION (Opt_cursorBlink))
1716 cursor_blink_ev.stop ();
1717 hidden_cursor = 0;
1718#endif
1719#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade])
1721 {
1722 pix_colors = pix_colors_unfocused;
1723 scr_recolour ();
1724 }
1725#endif
1726 }
1727}
1728
1676#if TRANSPARENT 1729#if TRANSPARENT
1677void 1730void
1678rxvt_term::rootwin_cb (XEvent &ev) 1731rxvt_term::rootwin_cb (XEvent &ev)
1679{ 1732{
1680 SET_R (this); 1733 SET_R (this);
… …
1691 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1744 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1692 return; 1745 return;
1693 1746
1694 /* FALLTHROUGH */ 1747 /* FALLTHROUGH */
1695 case ReparentNotify: 1748 case ReparentNotify:
1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1749 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1697 want_refresh = want_full_refresh = 1; 1750 want_refresh = want_full_refresh = 1;
1698 break; 1751 break;
1699 } 1752 }
1700} 1753}
1701#endif 1754#endif
… …
1710 reportmode = !! (priv_modes & PrivMode_mouse_report); 1763 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711 1764
1712 /* 1765 /*
1713 * VT window processing of button press 1766 * VT window processing of button press
1714 */ 1767 */
1715 if (ev.window == TermWin.vt) 1768 if (ev.window == vt)
1716 { 1769 {
1717#if ISO_14755 1770#if ISO_14755
1718 // 5.4 1771 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1772 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 { 1773 {
… …
1925 case Button3: 1978 case Button3:
1926 if (scrollBar.style != R_SB_XTERM) 1979 if (scrollBar.style != R_SB_XTERM)
1927 { 1980 {
1928 if (scrollbar_above_slider (ev.y)) 1981 if (scrollbar_above_slider (ev.y))
1929# ifdef RXVT_SCROLL_FULL 1982# ifdef RXVT_SCROLL_FULL
1930 scr_page (UP, TermWin.nrow - 1); 1983 scr_page (UP, nrow - 1);
1931# else 1984# else
1932 scr_page (UP, TermWin.nrow / 4); 1985 scr_page (UP, nrow / 4);
1933# endif 1986# endif
1934 else if (scrollbar_below_slider (ev.y)) 1987 else if (scrollbar_below_slider (ev.y))
1935# ifdef RXVT_SCROLL_FULL 1988# ifdef RXVT_SCROLL_FULL
1936 scr_page (DN, TermWin.nrow - 1); 1989 scr_page (DN, nrow - 1);
1937# else 1990# else
1938 scr_page (DN, TermWin.nrow / 4); 1991 scr_page (DN, nrow / 4);
1939# endif 1992# endif
1940 else 1993 else
1941 scrollBar.setMotion (); 1994 scrollBar.setMotion ();
1942 } 1995 }
1943 else 1996 else
1944 { 1997 {
1945 scr_page ((ev.button == Button1 ? DN : UP), 1998 scr_page ((ev.button == Button1 ? DN : UP),
1946 (TermWin.nrow 1999 (nrow
1947 * scrollbar_position (ev.y) 2000 * scrollbar_position (ev.y)
1948 / scrollbar_size ())); 2001 / scrollbar_size ()));
1949 } 2002 }
1950 2003
1951 break; 2004 break;
… …
1983#ifdef SELECTION_SCROLLING 2036#ifdef SELECTION_SCROLLING
1984 if (sel_scroll_ev.active) 2037 if (sel_scroll_ev.active)
1985 sel_scroll_ev.stop(); 2038 sel_scroll_ev.stop();
1986#endif 2039#endif
1987 2040
1988 if (ev.window == TermWin.vt) 2041 if (ev.window == vt)
1989 { 2042 {
1990#if ISO_14755 2043#if ISO_14755
1991 // 5.4 2044 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2045 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return; 2046 return;
… …
2043 2096
2044 v = ev.button == Button4 ? UP : DN; 2097 v = ev.button == Button4 ? UP : DN;
2045 2098
2046 if (ev.state & ShiftMask) 2099 if (ev.state & ShiftMask)
2047 i = 1; 2100 i = 1;
2048 else if (options & Opt_mouseWheelScrollPage) 2101 else if (OPTION (Opt_mouseWheelScrollPage))
2049 i = TermWin.nrow - 1; 2102 i = nrow - 1;
2050 else 2103 else
2051 i = 5; 2104 i = 5;
2052 2105
2053# ifdef MOUSE_SLIP_WHEELING 2106# ifdef MOUSE_SLIP_WHEELING
2054 if (ev.state & ControlMask) 2107 if (ev.state & ControlMask)
2055 { 2108 {
2056 mouse_slip_wheel_speed += v ? -1 : 1; 2109 mouse_slip_wheel_speed += v ? -1 : 1;
2057 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2110 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2058 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2111 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2059 2112
2060 if (slip_wheel_ev.at < NOW) 2113 if (slip_wheel_ev.at < NOW)
2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2114 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062 2115
2063 slip_wheel_ev.start (); 2116 slip_wheel_ev.start ();
… …
2339 XWindowAttributes wattr, wrootattr; 2392 XWindowAttributes wattr, wrootattr;
2340 dDisp; 2393 dDisp;
2341 2394
2342 pchanged = 0; 2395 pchanged = 0;
2343 2396
2344 if (!(options & Opt_transparent)) 2397 if (!OPTION (Opt_transparent))
2345 return pchanged; /* Don't try any more */ 2398 return pchanged; /* Don't try any more */
2346 2399
2347 XGetWindowAttributes (disp, display->root, &wrootattr); 2400 XGetWindowAttributes (disp, display->root, &wrootattr);
2348 rootdepth = wrootattr.depth; 2401 rootdepth = wrootattr.depth;
2349 2402
2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2403 XGetWindowAttributes (disp, parent[0], &wattr);
2351 2404
2352 if (rootdepth != wattr.depth) 2405 if (rootdepth != wattr.depth)
2353 { 2406 {
2354 if (am_transparent) 2407 if (am_transparent)
2355 { 2408 {
2356 pchanged = 1; 2409 pchanged = 1;
2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2410 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2358 am_transparent = am_pixmap_trans = 0; 2411 am_transparent = am_pixmap_trans = 0;
2359 } 2412 }
2360 2413
2361 return pchanged; /* Don't try any more */ 2414 return pchanged; /* Don't try any more */
2362 } 2415 }
… …
2403 Window cr; 2456 Window cr;
2404 XImage *image; 2457 XImage *image;
2405 GC gc; 2458 GC gc;
2406 XGCValues gcvalue; 2459 XGCValues gcvalue;
2407 2460
2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2461 XTranslateCoordinates (disp, parent[0], display->root,
2409 0, 0, &sx, &sy, &cr); 2462 0, 0, &sx, &sy, &cr);
2410 nw = (unsigned int)szHint.width; 2463 nw = (unsigned int)szHint.width;
2411 nh = (unsigned int)szHint.height; 2464 nh = (unsigned int)szHint.height;
2412 nx = ny = 0; 2465 nx = ny = 0;
2413 2466
… …
2423 nh += sy; 2476 nh += sy;
2424 ny = -sy; 2477 ny = -sy;
2425 sy = 0; 2478 sy = 0;
2426 } 2479 }
2427 2480
2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2481 min_it (nw, (unsigned int) (wrootattr.width - sx));
2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2482 min_it (nh, (unsigned int) (wrootattr.height - sy));
2430 2483
2431 XSync (disp, False); 2484 XSync (disp, False);
2432 allowedxerror = -1; 2485 allowedxerror = -1;
2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2486 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2434 2487
… …
2439 if (image == NULL) 2492 if (image == NULL)
2440 { 2493 {
2441 if (am_transparent && am_pixmap_trans) 2494 if (am_transparent && am_pixmap_trans)
2442 { 2495 {
2443 pchanged = 1; 2496 pchanged = 1;
2444 if (TermWin.pixmap != None) 2497 if (pixmap != None)
2445 { 2498 {
2446 XFreePixmap (disp, TermWin.pixmap); 2499 XFreePixmap (disp, pixmap);
2447 TermWin.pixmap = None; 2500 pixmap = None;
2448 } 2501 }
2449 } 2502 }
2450 2503
2451 am_pixmap_trans = 0; 2504 am_pixmap_trans = 0;
2452 } 2505 }
2453 else 2506 else
2454 { 2507 {
2455 if (TermWin.pixmap != None) 2508 if (pixmap != None)
2456 XFreePixmap (disp, TermWin.pixmap); 2509 XFreePixmap (disp, pixmap);
2457 2510
2458#if TINTING 2511#if TINTING
2459 if (ISSET_PIXCOLOR (Color_tint)) 2512 if (ISSET_PIXCOLOR (Color_tint))
2460 { 2513 {
2461 unsigned short rm, gm, bm; 2514 unsigned short rm, gm, bm;
… …
2465 2518
2466 ShadeXImage (display, image, shade, rm, gm, bm); 2519 ShadeXImage (display, image, shade, rm, gm, bm);
2467 } 2520 }
2468#endif 2521#endif
2469 2522
2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2523 pixmap = XCreatePixmap (disp, vt,
2471 szHint.width, szHint.height, image->depth); 2524 szHint.width, szHint.height, image->depth);
2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2525 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2526 XPutImage (disp, pixmap, gc, image, 0, 0,
2474 nx, ny, image->width, image->height); 2527 nx, ny, image->width, image->height);
2475 XFreeGC (disp, gc); 2528 XFreeGC (disp, gc);
2476 XDestroyImage (image); 2529 XDestroyImage (image);
2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2530 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2478 XClearWindow (disp, TermWin.parent[0]); 2531 XClearWindow (disp, parent[0]);
2479 2532
2480 if (!am_transparent || !am_pixmap_trans) 2533 if (!am_transparent || !am_pixmap_trans)
2481 pchanged = 1; 2534 pchanged = 1;
2482 2535
2483 am_transparent = am_pixmap_trans = 1; 2536 am_transparent = am_pixmap_trans = 1;
2484 } 2537 }
2485 } 2538 }
2486 2539
2487 if (am_pixmap_trans) 2540 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2541 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2489 else 2542 else
2490 { 2543 {
2491 unsigned int n; 2544 unsigned int n;
2492 /* 2545 /*
2493 * InheritPixmap transparency 2546 * InheritPixmap transparency
2494 */ 2547 */
2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2548 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2496 { 2549 {
2497 oldp = TermWin.parent[i]; 2550 oldp = parent[i];
2498 XQueryTree (disp, TermWin.parent[i - 1], &root, 2551 XQueryTree (disp, parent[i - 1], &root,
2499 &TermWin.parent[i], &list, &n); 2552 &parent[i], &list, &n);
2500 XFree (list); 2553 XFree (list);
2501 2554
2502 if (TermWin.parent[i] == display->root) 2555 if (parent[i] == display->root)
2503 { 2556 {
2504 if (oldp != None) 2557 if (oldp != None)
2505 pchanged = 1; 2558 pchanged = 1;
2506 2559
2507 break; 2560 break;
2508 } 2561 }
2509 2562
2510 if (oldp != TermWin.parent[i]) 2563 if (oldp != parent[i])
2511 pchanged = 1; 2564 pchanged = 1;
2512 } 2565 }
2513 2566
2514 n = 0; 2567 n = 0;
2515 2568
2516 if (pchanged) 2569 if (pchanged)
2517 { 2570 {
2518 for (; n < (unsigned int)i; n++) 2571 for (; n < (unsigned int)i; n++)
2519 { 2572 {
2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2573 XGetWindowAttributes (disp, parent[n], &wattr);
2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2574 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2522 { 2575 {
2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2576 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2524 break; 2577 break;
2525 } 2578 }
2526 } 2579 }
2527 } 2580 }
2528 2581
2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2582 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2530 { 2583 {
2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2584 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2585 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2533 am_transparent = 0; 2586 am_transparent = 0;
2534 /* XXX: also turn off Opt_transparent? */ 2587 /* XXX: also turn off Opt_transparent? */
2535 } 2588 }
2536 else 2589 else
2537 { 2590 {
… …
2540 * needed for fvwm2.2.2 (and before?) */ 2593 * needed for fvwm2.2.2 (and before?) */
2541 sleep (1); 2594 sleep (1);
2542#endif 2595#endif
2543 for (n = 0; n < (unsigned int)i; n++) 2596 for (n = 0; n < (unsigned int)i; n++)
2544 { 2597 {
2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2598 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2546 XClearWindow (disp, TermWin.parent[n]); 2599 XClearWindow (disp, parent[n]);
2547 } 2600 }
2548 2601
2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2602 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2550 am_transparent = 1; 2603 am_transparent = 1;
2551 } 2604 }
2552 2605
2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2606 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 TermWin.parent[i] = None; 2607 parent[i] = None;
2555 } 2608 }
2556 2609
2557 if (scrollBar.win) 2610 if (scrollBar.win)
2558 { 2611 {
2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2612 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2602 // some window managers resize the window early, and these programs 2655 // some window managers resize the window early, and these programs
2603 // then sometimes get the size wrong. 2656 // then sometimes get the size wrong.
2604 // unfortunately other programs are even more buggy and dislike 2657 // unfortunately other programs are even more buggy and dislike
2605 // being sent SIGWINCH, so only do it when we were in fact being 2658 // being sent SIGWINCH, so only do it when we were in fact being
2606 // resized. 2659 // resized.
2607 if (seen_resize) 2660 if (seen_resize && cmd_pid)
2608 kill (-cmd_pid, SIGWINCH); 2661 kill (-cmd_pid, SIGWINCH);
2609 } 2662 }
2610 2663
2611 /* Read a text string from the input buffer */ 2664 /* Read a text string from the input buffer */
2612 unicode_t buf[UBUFSIZ]; 2665 unicode_t buf[UBUFSIZ];
2613 bool refreshnow = false; 2666 bool refreshnow = false;
2614 int nlines = 0; 2667 int nlines = 0;
2615 unicode_t *str = buf; 2668 unicode_t *str = buf;
2669 unicode_t *eol = str + min (ncol, UBUFSIZ);
2616 2670
2617 for (;;) 2671 for (;;)
2618 { 2672 {
2619 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2673 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2620 break; 2674 break;
2621 2675
2622 *str++ = ch; 2676 *str++ = ch;
2623 2677
2624 if (ch == C0_LF) 2678 if (ch == C0_LF || str >= eol)
2625 { 2679 {
2680 if (ch == C0_LF)
2626 nlines++; 2681 nlines++;
2682
2627 refresh_count++; 2683 refresh_count++;
2628 2684
2629 if (!(options & Opt_jumpScroll) 2685 if (!OPTION (Opt_jumpScroll)
2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2686 || (refresh_count >= refresh_limit * (nrow - 1)))
2631 { 2687 {
2632 refreshnow = true; 2688 refreshnow = true;
2633 ch = NOCHAR; 2689 ch = NOCHAR;
2634 break; 2690 break;
2635 } 2691 }
2636 2692
2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2693 // scr_add_lines only works for nlines <= nrow - 1.
2638 if (nlines >= TermWin.nrow - 1) 2694 if (nlines >= nrow - 1)
2639 { 2695 {
2640 scr_add_lines (buf, nlines, str - buf); 2696 scr_add_lines (buf, nlines, str - buf);
2641 nlines = 0; 2697 nlines = 0;
2642 str = buf; 2698 str = buf;
2699 eol = str + min (ncol, UBUFSIZ);
2643 } 2700 }
2644 }
2645 2701
2646 if (str >= buf + UBUFSIZ) 2702 if (str >= eol)
2647 { 2703 {
2704 if (eol >= buf + UBUFSIZ)
2705 {
2648 ch = NOCHAR; 2706 ch = NOCHAR;
2649 break; 2707 break;
2708 }
2709 else
2710 eol = min (eol + ncol, buf + UBUFSIZ);
2711 }
2712
2650 } 2713 }
2651 2714
2652 seq_begin = cmdbuf_ptr; 2715 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2716 ch = next_char ();
2654 } 2717 }
… …
2661 * the number of pages between refreshes is refresh_limit, which 2724 * the number of pages between refreshes is refresh_limit, which
2662 * is incremented here because we must be doing flat-out scrolling. 2725 * is incremented here because we must be doing flat-out scrolling.
2663 */ 2726 */
2664 if (refreshnow) 2727 if (refreshnow)
2665 { 2728 {
2666 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2729 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2667 refresh_limit++; 2730 refresh_limit++;
2668 else 2731 else
2669 { 2732 {
2670 flag = true; 2733 flag = true;
2671 scr_refresh (refresh_type); 2734 scr_refresh (refresh_type);
… …
3313 3376
3314 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3377 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3315 arg[0] = -arg[0]; 3378 arg[0] = -arg[0];
3316 /* FALLTHROUGH */ 3379 /* FALLTHROUGH */
3317 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3380 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3381 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3319 break; 3382 break;
3320 3383
3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3384 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3322 tt_write ((const unsigned char *)VT100_ANS, 3385 tt_write ((const unsigned char *)VT100_ANS,
3323 (unsigned int) (sizeof (VT100_ANS) - 1)); 3386 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3335 break; 3398 break;
3336 case 6: /* CPR requested */ 3399 case 6: /* CPR requested */
3337 scr_report_position (); 3400 scr_report_position ();
3338 break; 3401 break;
3339 case 7: /* unofficial extension */ 3402 case 7: /* unofficial extension */
3340 if (options & Opt_insecure) 3403 if (OPTION (Opt_insecure))
3341 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3404 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3342 break; 3405 break;
3343 case 8: /* unofficial extension */ 3406 case 8: /* unofficial extension */
3344 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3407 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3345 break; 3408 break;
… …
3448 { 3511 {
3449 /* 3512 /*
3450 * commands 3513 * commands
3451 */ 3514 */
3452 case 1: /* deiconify window */ 3515 case 1: /* deiconify window */
3453 XMapWindow (disp, TermWin.parent[0]); 3516 XMapWindow (disp, parent[0]);
3454 break; 3517 break;
3455 case 2: /* iconify window */ 3518 case 2: /* iconify window */
3456 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3519 XIconifyWindow (disp, parent[0], display->screen);
3457 break; 3520 break;
3458 case 3: /* set position (pixels) */ 3521 case 3: /* set position (pixels) */
3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3522 XMoveWindow (disp, parent[0], args[1], args[2]);
3460 break; 3523 break;
3461 case 4: /* set size (pixels) */ 3524 case 4: /* set size (pixels) */
3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3525 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3463 break; 3526 break;
3464 case 5: /* raise window */ 3527 case 5: /* raise window */
3465 XRaiseWindow (disp, TermWin.parent[0]); 3528 XRaiseWindow (disp, parent[0]);
3466 break; 3529 break;
3467 case 6: /* lower window */ 3530 case 6: /* lower window */
3468 XLowerWindow (disp, TermWin.parent[0]); 3531 XLowerWindow (disp, parent[0]);
3469 break; 3532 break;
3470 case 7: /* refresh window */ 3533 case 7: /* refresh window */
3471 scr_touch (true); 3534 scr_touch (true);
3472 break; 3535 break;
3473 case 8: /* set size (chars) */ 3536 case 8: /* set size (chars) */
3474 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3537 set_widthheight ((unsigned int) (args[2] * fwidth),
3475 (unsigned int) (args[1] * TermWin.fheight)); 3538 (unsigned int) (args[1] * fheight));
3476 break; 3539 break;
3477 3540
3478 //case 9: NYI, TODO, restore maximized window or maximize window 3541 //case 9: NYI, TODO, restore maximized window or maximize window
3479 default: 3542 default:
3480 if (args[0] >= 24) /* set height (chars) */ 3543 if (args[0] >= 24) /* set height (chars) */
3481 set_widthheight ((unsigned int)TermWin.width, 3544 set_widthheight ((unsigned int)width,
3482 (unsigned int) (args[1] * TermWin.fheight)); 3545 (unsigned int) (args[1] * fheight));
3483 break; 3546 break;
3484 3547
3485 3548
3486 /* 3549 /*
3487 * reports - some output format copied from XTerm 3550 * reports - some output format copied from XTerm
3488 */ 3551 */
3489 case 11: /* report window state */ 3552 case 11: /* report window state */
3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3553 XGetWindowAttributes (disp, parent[0], &wattr);
3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3554 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3492 break; 3555 break;
3493 case 13: /* report window position */ 3556 case 13: /* report window position */
3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3557 XGetWindowAttributes (disp, parent[0], &wattr);
3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3558 XTranslateCoordinates (disp, parent[0], wattr.root,
3496 -wattr.border_width, -wattr.border_width, 3559 -wattr.border_width, -wattr.border_width,
3497 &x, &y, &wdummy); 3560 &x, &y, &wdummy);
3498 tt_printf ("\033[3;%d;%dt", x, y); 3561 tt_printf ("\033[3;%d;%dt", x, y);
3499 break; 3562 break;
3500 case 14: /* report window size (pixels) */ 3563 case 14: /* report window size (pixels) */
3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3564 XGetWindowAttributes (disp, parent[0], &wattr);
3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3565 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3503 break; 3566 break;
3504 case 18: /* report text area size (chars) */ 3567 case 18: /* report text area size (chars) */
3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3568 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3506 break; 3569 break;
3507 case 19: /* report window size (chars) */ 3570 case 19: /* report window size (chars) */
3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3571 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3509 break; 3572 break;
3510 case 20: /* report icon label */ 3573 case 20: /* report icon label */
3511 { 3574 {
3512 char *s; 3575 char *s;
3513 XGetIconName (disp, TermWin.parent[0], &s); 3576 XGetIconName (disp, parent[0], &s);
3514 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3577 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3515 XFree (s); 3578 XFree (s);
3516 } 3579 }
3517 break; 3580 break;
3518 case 21: /* report window title */ 3581 case 21: /* report window title */
3519 { 3582 {
3520 char *s; 3583 char *s;
3521 XFetchName (disp, TermWin.parent[0], &s); 3584 XFetchName (disp, parent[0], &s);
3522 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3585 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3523 XFree (s); 3586 XFree (s);
3524 } 3587 }
3525 break; 3588 break;
3526 } 3589 }
3527} 3590}
… …
3559 else if (ch < 0x20) 3622 else if (ch < 0x20)
3560 return NULL; /* other control character - exit */ 3623 return NULL; /* other control character - exit */
3561 3624
3562 seen_esc = false; 3625 seen_esc = false;
3563 3626
3564 if (n >= sizeof (string) - 1) 3627 if (n >= STRING_MAX - 1)
3565 // stop at some sane length 3628 // stop at some sane length
3566 return NULL; 3629 return NULL;
3567 3630
3568 if (ch == C0_SYN) 3631 if (ch == C0_SYN)
3569 string[n++] = cmd_get8 (); 3632 string[n++] = cmd_get8 ();
… …
3637 set_window_color (color, str); 3700 set_window_color (color, str);
3638} 3701}
3639 3702
3640/* 3703/*
3641 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3704 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3642 * 0 = change iconName/title
3643 * 1 = change iconName
3644 * 2 = change title
3645 * 4 = change color
3646 * 10 = change fg color
3647 * 11 = change bg color
3648 * 12 = change text color
3649 * 13 = change mouse foreground color
3650 * 17 = change highlight character colour
3651 * 18 = change bold character color
3652 * 19 = change underlined character color
3653 * 46 = change logfile (not implemented)
3654 * 50 = change font
3655 *
3656 * rxvt extensions:
3657 * 20 = bg pixmap
3658 * 39 = change default fg color
3659 * 49 = change default bg color
3660 * 55 = dump scrollback buffer and all of screen
3661 * 701 = change locale
3662 * 702 = find font
3663 * 703 = menu
3664 */ 3705 */
3665void 3706void
3666rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3707rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3667{ 3708{
3668 int changed = 0; 3709 int changed = 0;
… …
3694 unsigned long bytes_after; 3735 unsigned long bytes_after;
3695 unsigned char *value = 0; 3736 unsigned char *value = 0;
3696 const char *str = ""; 3737 const char *str = "";
3697 3738
3698 if (prop 3739 if (prop
3699 && XGetWindowProperty (disp, TermWin.parent[0], 3740 && XGetWindowProperty (disp, parent[0],
3700 prop, 0, 1<<16, 0, AnyPropertyType, 3741 prop, 0, 1<<16, 0, AnyPropertyType,
3701 &actual_type, &actual_format, 3742 &actual_type, &actual_format,
3702 &nitems, &bytes_after, &value) == Success 3743 &nitems, &bytes_after, &value) == Success
3703 && actual_type != None 3744 && actual_type != None
3704 && actual_format == 8) 3745 && actual_format == 8)
… …
3716 { 3757 {
3717 *eq = 0; 3758 *eq = 0;
3718 set_utf8_property (display->atom (str), eq + 1); 3759 set_utf8_property (display->atom (str), eq + 1);
3719 } 3760 }
3720 else 3761 else
3721 XDeleteProperty (disp, TermWin.parent[0], 3762 XDeleteProperty (disp, parent[0],
3722 display->atom (str)); 3763 display->atom (str));
3723 } 3764 }
3724 break; 3765 break;
3725 3766
3726 case XTerm_Color: 3767 case XTerm_Color:
… …
3767 break; 3808 break;
3768#ifndef NO_BOLD_UNDERLINE_REVERSE 3809#ifndef NO_BOLD_UNDERLINE_REVERSE
3769 case XTerm_Color_BD: 3810 case XTerm_Color_BD:
3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3811 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3771 break; 3812 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3774 break;
3775 case XTerm_Color_UL: 3813 case XTerm_Color_UL:
3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3814 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3777 break; 3815 break;
3778 case XTerm_Color_RV: 3816 case XTerm_Color_RV:
3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3817 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3780 break; 3818 break;
3819 case URxvt_Color_IT:
3820 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3821 break;
3781#endif 3822#endif
3782#if TRANSPARENT && TINTING 3823#if TRANSPARENT && TINTING
3783 case XTerm_Color_tint: 3824 case URxvt_Color_tint:
3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3825 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3785 check_our_parents (); 3826 check_our_parents ();
3786 if (am_transparent) 3827 if (am_transparent)
3787 want_full_refresh = want_refresh = 1; 3828 want_full_refresh = want_refresh = 1;
3788 break; 3829 break;
3789#endif 3830#endif
… …
3823 3864
3824 case XTerm_logfile: 3865 case XTerm_logfile:
3825 // TODO, when secure mode? 3866 // TODO, when secure mode?
3826 break; 3867 break;
3827 3868
3869#ifdef MENUBAR
3870 case URxvt_Menu:
3871 if (OPTION (Opt_insecure))
3872 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3873 break;
3874#endif
3875#if 0
3876 case XTerm_dumpscreen: /* no error notices */
3877 {
3878 int fd;
3879 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3880 {
3881 scr_dump (fd);
3882 close (fd);
3883 }
3884 }
3885 break;
3886#endif
3828 case XTerm_font: 3887 case XTerm_font:
3829 op = URxvt_font; 3888 op = URxvt_font;
3830 case URxvt_font: 3889 case URxvt_font:
3831#if ENABLE_STYLES 3890#if ENABLE_STYLES
3832 case URxvt_boldFont: 3891 case URxvt_boldFont:
3833 case URxvt_italicFont: 3892 case URxvt_italicFont:
3834 case URxvt_boldItalicFont: 3893 case URxvt_boldItalicFont:
3835#endif 3894#endif
3836 if (query) 3895 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", saveop, 3896 tt_printf ("\33]%d;%-.250s%c", saveop,
3838 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3897 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3839 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3898 ? fontset[op - URxvt_font]->fontdesc : "",
3840 resp); 3899 resp);
3841 else 3900 else
3842 { 3901 {
3843 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3902 const char *&res = rs[Rs_font + (op - URxvt_font)];
3844 3903
… …
3847 set_fonts (); 3906 set_fonts ();
3848 } 3907 }
3849 break; 3908 break;
3850 3909
3851#if ENABLE_FRILLS 3910#if ENABLE_FRILLS
3852 case XTerm_locale: 3911 case URxvt_locale:
3853 if (query) 3912 if (query)
3854 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3913 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3855 else 3914 else
3856 { 3915 {
3857 set_locale (str); 3916 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8); 3917 pty.set_utf8_mode (enc_utf8);
3859# ifdef USE_XIM
3860 im_cb (); 3918 init_xlocale ();
3861# endif
3862 } 3919 }
3863 break; 3920 break;
3864#endif
3865 3921
3866#ifdef MENUBAR 3922 case URxvt_view_up:
3867 case XTerm_Menu: 3923 case URxvt_view_down:
3868 if (options & Opt_insecure) 3924 int lines = atoi (str);
3869 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3925
3870 break; 3926 if (lines)
3871#endif 3927 scr_page (op == URxvt_view_up ? UP : DN, lines);
3872#if 0
3873 case XTerm_dumpscreen: /* no error notices */
3874 { 3928 else
3875 int fd;
3876 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3877 { 3929 {
3878 scr_dump (fd); 3930 scr_erase_savelines ();
3879 close (fd);
3880 } 3931 }
3881 } 3932
3882 break; 3933 break;
3883#endif 3934#endif
3884 } 3935 }
3885} 3936}
3886/*----------------------------------------------------------------------*/ 3937/*----------------------------------------------------------------------*/
… …
3995 } 4046 }
3996 4047
3997 /* extra handling for values with state unkept */ 4048 /* extra handling for values with state unkept */
3998 switch (arg[i]) 4049 switch (arg[i])
3999 { 4050 {
4051#if ENABLE_STYLES
4052 case 1021:
4053 if (mode)
4054 SET_OPTION (Opt_intensityStyles);
4055 else
4056 CLR_OPTION (Opt_intensityStyles);
4057#endif
4000 case 1048: /* alternative cursor save */ 4058 case 1048: /* alternative cursor save */
4001 case 1049: 4059 case 1049:
4002 if (options & Opt_secondaryScreen) 4060 if (OPTION (Opt_secondaryScreen))
4003 if (mode == 0) 4061 if (mode == 0)
4004 scr_cursor (RESTORE); 4062 scr_cursor (RESTORE);
4005 else if (mode == 1) 4063 else if (mode == 1)
4006 scr_cursor (SAVE); 4064 scr_cursor (SAVE);
4007 break; 4065 break;
… …
4019 */ 4077 */
4020 PrivMode (1, PrivMode_vt52); 4078 PrivMode (1, PrivMode_vt52);
4021 break; 4079 break;
4022 case 3: /* 80/132 */ 4080 case 3: /* 80/132 */
4023 if (priv_modes & PrivMode_132OK) 4081 if (priv_modes & PrivMode_132OK)
4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4082 set_widthheight (((state ? 132 : 80) * fwidth), height);
4025 break; 4083 break;
4026 case 4: /* smooth scrolling */ 4084 case 4: /* smooth scrolling */
4027 if (state) 4085 if (!state)
4028 options &= ~Opt_jumpScroll; 4086 SET_OPTION (Opt_jumpScroll);
4029 else 4087 else
4030 options |= Opt_jumpScroll; 4088 CLR_OPTION (Opt_jumpScroll);
4031 break; 4089 break;
4032 case 5: /* reverse video */ 4090 case 5: /* reverse video */
4033 scr_rvideo_mode (state); 4091 scr_rvideo_mode (state);
4034 break; 4092 break;
4035 case 6: /* relative/absolute origins */ 4093 case 6: /* relative/absolute origins */
… …
4076#if 0 4134#if 0
4077 case 1001: 4135 case 1001:
4078 break; /* X11 mouse highlighting */ 4136 break; /* X11 mouse highlighting */
4079#endif 4137#endif
4080 case 1010: /* scroll to bottom on TTY output inhibit */ 4138 case 1010: /* scroll to bottom on TTY output inhibit */
4081 if (state) 4139 if (!state)
4082 options &= ~Opt_scrollTtyOutput; 4140 SET_OPTION (Opt_scrollTtyOutput);
4083 else 4141 else
4084 options |= Opt_scrollTtyOutput; 4142 CLR_OPTION (Opt_scrollTtyOutput);
4085 break; 4143 break;
4086 case 1011: /* scroll to bottom on key press */ 4144 case 1011: /* scroll to bottom on key press */
4087 if (state) 4145 if (state)
4088 options |= Opt_scrollTtyKeypress; 4146 SET_OPTION (Opt_scrollTtyKeypress);
4089 else 4147 else
4090 options &= ~Opt_scrollTtyKeypress; 4148 CLR_OPTION (Opt_scrollTtyKeypress);
4091 break; 4149 break;
4092 case 1047: /* secondary screen w/ clearing last */ 4150 case 1047: /* secondary screen w/ clearing last */
4093 if (options & Opt_secondaryScreen) 4151 if (OPTION (Opt_secondaryScreen))
4094 if (current_screen != PRIMARY) 4152 if (current_screen != PRIMARY)
4095 scr_erase_screen (2); 4153 scr_erase_screen (2);
4096 scr_change_screen (state); 4154 scr_change_screen (state);
4097 break; 4155 break;
4098 case 1049: /* secondary screen w/ clearing first */ 4156 case 1049: /* secondary screen w/ clearing first */
4099 scr_change_screen (state); 4157 scr_change_screen (state);
4100 if (options & Opt_secondaryScreen) 4158 if (OPTION (Opt_secondaryScreen))
4101 if (current_screen != PRIMARY) 4159 if (current_screen != PRIMARY)
4102 scr_erase_screen (2); 4160 scr_erase_screen (2);
4103 break; 4161 break;
4104 default: 4162 default:
4105 break; 4163 break;
… …
4255 case 106: 4313 case 106:
4256 case 107: 4314 case 107:
4257 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4315 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4258 break; 4316 break;
4259#endif 4317#endif
4260
4261 } 4318 }
4262 } 4319 }
4263} 4320}
4264/*}}} */ 4321/*}}} */
4265 4322
… …
4346 } 4403 }
4347 4404
4348 memmove (v_buffer, v_buffer + written, v_buflen); 4405 memmove (v_buffer, v_buffer + written, v_buflen);
4349 } 4406 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4407 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this... 4408 pty_ev.set (EVENT_READ);
4352 destroy ();
4353} 4409}
4354 4410
4355/*----------------------- end-of-file (C source) -----------------------*/ 4411/*----------------------- end-of-file (C source) -----------------------*/
4356 4412

Diff Legend

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