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.218 by root, Sat Dec 31 16:40:28 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 160#endif
161 161
162void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{
162#if ENABLE_OVERLAY 165#if ENABLE_OVERLAY
163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 169 int len;
170 170
171 fname = rxvt_utf8towcs (f->name);
172
171#if ENABLE_COMBINING 173# if ENABLE_COMBINING
172 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
173 { 175 {
174 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
177 } 179 }
178 else 180 else
179#endif 181# endif
180 { 182 {
181 ch2 = ch; 183 ch2 = ch;
182 184
183 alloc = 0; 185 alloc = 0;
184 chr = &ch2; 186 chr = &ch2;
185 len = 1; 187 len = 1;
186 } 188 }
187 189
188 int width = strlen (f->name); 190 char attr[80]; // plenty
189 191
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
191 214
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 216
194 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
195 { 218 {
… …
198 ch = *chr++; 221 ch = *chr++;
199 222
200 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
203#if !UNICODE3 226# if !UNICODE3
204 if (ch >= 0x10000) 227 if (ch >= 0x10000)
205 ch = 0xfffd; 228 ch = 0xfffd;
206#endif 229# endif
207 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r); 231 scr_overlay_set (12, y, NOCHAR, r);
209 } 232 }
210 233
234 scr_overlay_set (0, len , attr);
211 scr_overlay_set (0, len, f->name); 235 scr_overlay_set (0, len + 1, fname);
212 236
237 free (fname);
238
213#if ENABLE_COMBINING 239# if ENABLE_COMBINING
214 if (alloc) 240 if (alloc)
215 delete [] alloc; 241 delete [] alloc;
216#endif 242# endif
217}
218#endif 243#endif
244}
219 245
220void 246void
221rxvt_term::commit_iso14755 () 247rxvt_term::commit_iso14755 ()
222{ 248{
223 wchar_t ch[2]; 249 wchar_t ch[2];
… …
316 342
317 // the XOpenIM manpage lies about hardcoding the locale 343 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 344 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 345 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 346 SET_LOCALE (rs[Rs_imLocale]);
347
321 // assume wchar_t == unicode or better 348 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 349 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 350 KBUFSZ, &keysym, &status_return);
351
324 if (rs[Rs_imLocale]) 352 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 353 SET_LOCALE (locale);
326 354
327 if (status_return == XLookupChars 355 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 356 || status_return == XLookupBoth)
… …
360#ifdef KEYSYM_RESOURCE 388#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 389 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 390 return;
363#endif 391#endif
364 392
365 if (TermWin.saveLines) 393 if (saveLines)
366 { 394 {
367#ifdef UNSHIFTED_SCROLLKEYS 395#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 396 if (!ctrl && !meta)
369#else 397#else
370 if (IS_SCROLL_MOD) 398 if (IS_SCROLL_MOD)
371#endif 399#endif
372 { 400 {
373 int lnsppg; 401 int lnsppg;
374 402
375#ifdef PAGING_CONTEXT_LINES 403#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 404 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 405#else
378 lnsppg = TermWin.nrow * 4 / 5; 406 lnsppg = nrow * 4 / 5;
379#endif 407#endif
380 if (keysym == XK_Prior) 408 if (keysym == XK_Prior)
381 { 409 {
382 scr_page (UP, lnsppg); 410 scr_page (UP, lnsppg);
383 return; 411 return;
… …
839 867
840 if (len <= 0) 868 if (len <= 0)
841 return; /* not mapped */ 869 return; /* not mapped */
842 870
843 if (options & Opt_scrollTtyKeypress) 871 if (options & Opt_scrollTtyKeypress)
844 if (TermWin.view_start) 872 if (view_start)
845 { 873 {
846 TermWin.view_start = 0; 874 view_start = 0;
847 want_refresh = 1; 875 want_refresh = 1;
848 } 876 }
849 877
850 /* 878 /*
851 * these modifications only affect the static keybuffer 879 * these modifications only affect the static keybuffer
… …
1028{ 1056{
1029 if (mouse_slip_wheel_speed == 0 1057 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1058 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1059 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1060 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1061 if (view_start == nsaved ||
1034 TermWin.view_start == 0) 1062 view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1063 mouse_slip_wheel_speed = 0;
1036 1064
1037 refresh_type |= SMOOTH_REFRESH; 1065 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1066 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1067 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1061 if (n > 0) 1089 if (n > 0)
1062 { 1090 {
1063 cmdbuf_endp += n; 1091 cmdbuf_endp += n;
1064 return true; 1092 return true;
1065 } 1093 }
1066 else if (n < 0 && errno != EAGAIN) 1094 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1095 {
1096 pty_ev.stop ();
1097
1098 if (!(options & Opt_hold))
1067 destroy (); 1099 destroy ();
1100 }
1068 1101
1069 return false; 1102 return false;
1070} 1103}
1071 1104
1072void 1105void
… …
1086} 1119}
1087 1120
1088void 1121void
1089rxvt_term::pointer_unblank () 1122rxvt_term::pointer_unblank ()
1090{ 1123{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1124 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1125 recolour_cursor ();
1093 1126
1094#ifdef POINTER_BLANK 1127#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1128 hidden_pointer = 0;
1096 1129
… …
1104rxvt_term::pointer_blank () 1137rxvt_term::pointer_blank ()
1105{ 1138{
1106 if (! (options & Opt_pointerBlank)) 1139 if (! (options & Opt_pointerBlank))
1107 return; 1140 return;
1108 1141
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1142 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1143 XFlush (display->display);
1111 1144
1112 hidden_pointer = 1; 1145 hidden_pointer = 1;
1113} 1146}
1114 1147
… …
1330 button_release (ev.xbutton); 1363 button_release (ev.xbutton);
1331 break; 1364 break;
1332 1365
1333 case ClientMessage: 1366 case ClientMessage:
1334 if (ev.xclient.format == 32 1367 if (ev.xclient.format == 32
1368 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1369 {
1335 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1370 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1336 destroy (); 1371 destroy ();
1372#if ENABLE_EWMH
1373 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1374 XSendEvent (disp, ev.xclient.window = display->root,
1375 False, SubstructureRedirectMask | SubstructureNotifyMask,
1376 &ev);
1377#endif
1378 }
1379#if ENABLE_XEMBED
1380 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1381 {
1382 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1383 focus_in ();
1384 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1385 focus_out ();
1386 }
1387#endif
1337#ifdef OFFIX_DND 1388#ifdef OFFIX_DND
1338 /* OffiX Dnd (drag 'n' drop) protocol */ 1389 /* OffiX Dnd (drag 'n' drop) protocol */
1339 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1390 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1340 && (ev.xclient.data.l[0] == DndFile 1391 && (ev.xclient.data.l[0] == DndFile
1341 || ev.xclient.data.l[0] == DndDir 1392 || ev.xclient.data.l[0] == DndDir
1342 || ev.xclient.data.l[0] == DndLink)) 1393 || ev.xclient.data.l[0] == DndLink))
1343 { 1394 {
1344 /* Get Dnd data */ 1395 /* Get Dnd data */
1345 Atom ActualType; 1396 Atom ActualType;
1346 int ActualFormat; 1397 int ActualFormat;
1347 unsigned char *data; 1398 unsigned char *data;
… …
1390 break; 1441 break;
1391 } 1442 }
1392 break; 1443 break;
1393 1444
1394 case FocusIn: 1445 case FocusIn:
1395 if (!TermWin.focus) 1446 focus_in ();
1447 break;
1448
1449 case FocusOut:
1450 focus_out ();
1451 break;
1452
1453 case ConfigureNotify:
1454 if (ev.xconfigure.window == parent[0])
1396 { 1455 {
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)); 1456 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1457 ;
1464 1458
1465 if (szHint.width != width || szHint.height != height) 1459 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1460 {
1467 seen_resize = 1; 1461 seen_resize = 1;
1468 resize_all_windows (width, height, 1); 1462 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1463 }
1470 1464
1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1465#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1472 if (options & Opt_transparent) 1466 if (options & Opt_transparent)
1473 check_our_parents (); 1467 check_our_parents ();
… …
1494 case SelectionRequest: 1488 case SelectionRequest:
1495 selection_send (ev.xselectionrequest); 1489 selection_send (ev.xselectionrequest);
1496 break; 1490 break;
1497 1491
1498 case UnmapNotify: 1492 case UnmapNotify:
1499 TermWin.mapped = 0; 1493 mapped = 0;
1500#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1501 text_blink_ev.stop (); 1495 text_blink_ev.stop ();
1502#endif 1496#endif
1503 break; 1497 break;
1504 1498
1505 case MapNotify: 1499 case MapNotify:
1506 TermWin.mapped = 1; 1500 mapped = 1;
1507#ifdef TEXT_BLINK 1501#ifdef TEXT_BLINK
1508 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1502 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1509#endif 1503#endif
1510 break; 1504 break;
1511 1505
… …
1515 break; 1509 break;
1516#endif /* TRANSPARENT */ 1510#endif /* TRANSPARENT */
1517 1511
1518 case GraphicsExpose: 1512 case GraphicsExpose:
1519 case Expose: 1513 case Expose:
1520 if (ev.xany.window == TermWin.vt) 1514 if (ev.xany.window == vt)
1521 { 1515 {
1522 do 1516 do
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1517 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1518 ev.xexpose.width, ev.xexpose.height, False);
1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1519 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1526 1520
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1522
1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1523 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1532 1526
1533 scr_refresh (refresh_type); 1527 scr_refresh (refresh_type);
1534 } 1528 }
… …
1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1544 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1551 menubar_expose (); 1545 menubar_expose ();
1552#endif 1546#endif
1553 1547
1554#ifdef TRANSPARENT 1548#ifdef TRANSPARENT
1555 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1549 if (am_transparent && ev.xany.window == parent[0])
1556 XClearWindow (disp, ev.xany.window); 1550 XClearWindow (disp, ev.xany.window);
1557#endif 1551#endif
1558 } 1552 }
1559 break; 1553 break;
1560 1554
… …
1571 } 1565 }
1572#endif 1566#endif
1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1574 break; 1568 break;
1575 1569
1576 if (ev.xany.window == TermWin.vt) 1570 if (ev.xany.window == vt)
1577 { 1571 {
1578 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1572 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1573 {
1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1574 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1581 ; 1575 ;
1582 1576
1583 XQueryPointer (disp, TermWin.vt, 1577 XQueryPointer (disp, vt,
1584 &unused_root, &unused_child, 1578 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1579 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1580 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1581 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1582#ifdef MOUSE_THRESHOLD
… …
1600#endif 1594#endif
1601 selection_extend (ev.xbutton.x, ev.xbutton.y, 1595 selection_extend (ev.xbutton.x, ev.xbutton.y,
1602 ev.xbutton.state & Button3Mask ? 2 : 0); 1596 ev.xbutton.state & Button3Mask ? 2 : 0);
1603 1597
1604#ifdef SELECTION_SCROLLING 1598#ifdef SELECTION_SCROLLING
1605 if (ev.xbutton.y < TermWin.int_bwidth 1599 if (ev.xbutton.y < int_bwidth
1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1600 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1607 { 1601 {
1608 int dist; 1602 int dist;
1609 1603
1610 /* don't clobber the current delay if we are 1604 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1605 * already in the middle of scrolling.
… …
1619 selection_save_x = ev.xbutton.x; 1613 selection_save_x = ev.xbutton.x;
1620 selection_save_y = ev.xbutton.y; 1614 selection_save_y = ev.xbutton.y;
1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1615 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1622 1616
1623 /* calc number of lines to scroll */ 1617 /* calc number of lines to scroll */
1624 if (ev.xbutton.y < TermWin.int_bwidth) 1618 if (ev.xbutton.y < int_bwidth)
1625 { 1619 {
1626 scroll_selection_dir = UP; 1620 scroll_selection_dir = UP;
1627 dist = TermWin.int_bwidth - ev.xbutton.y; 1621 dist = int_bwidth - ev.xbutton.y;
1628 } 1622 }
1629 else 1623 else
1630 { 1624 {
1631 scroll_selection_dir = DN; 1625 scroll_selection_dir = DN;
1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1626 dist = ev.xbutton.y - (int_bwidth + height);
1633 } 1627 }
1634 1628
1635 scroll_selection_lines = Pixel2Height (dist) 1629 scroll_selection_lines = Pixel2Height (dist)
1636 / SELECTION_SCROLL_LINE_SPEEDUP 1630 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1; 1631 + 1;
1638 MIN_IT (scroll_selection_lines, 1632 min_it (scroll_selection_lines,
1639 SELECTION_SCROLL_MAX_LINES); 1633 SELECTION_SCROLL_MAX_LINES);
1640 } 1634 }
1641 else 1635 else
1642 { 1636 {
1643 /* we are within the text window, so we 1637 /* we are within the text window, so we
… …
1671 } 1665 }
1672 break; 1666 break;
1673 } 1667 }
1674} 1668}
1675 1669
1670void
1671rxvt_term::focus_in ()
1672{
1673 if (!focus)
1674 {
1675 focus = 1;
1676 want_refresh = 1;
1677#if USE_XIM
1678 if (Input_Context != NULL)
1679 {
1680 IMSetStatusPosition ();
1681 XSetICFocus (Input_Context);
1682 }
1683#endif
1684#if CURSOR_BLINK
1685 if (options & Opt_cursorBlink)
1686 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1687#endif
1688#if OFF_FOCUS_FADING
1689 if (rs[Rs_fade])
1690 {
1691 pix_colors = pix_colors_focused;
1692 scr_recolour ();
1693 }
1694#endif
1695 }
1696}
1697
1698void
1699rxvt_term::focus_out ()
1700{
1701 if (focus)
1702 {
1703 focus = 0;
1704 want_refresh = 1;
1705
1706#if ENABLE_FRILLS || ISO_14755
1707 iso14755buf = 0;
1708#endif
1709#if ENABLE_OVERLAY
1710 scr_overlay_off ();
1711#endif
1712#if USE_XIM
1713 if (Input_Context != NULL)
1714 XUnsetICFocus (Input_Context);
1715#endif
1716#if CURSOR_BLINK
1717 if (options & Opt_cursorBlink)
1718 cursor_blink_ev.stop ();
1719 hidden_cursor = 0;
1720#endif
1721#if OFF_FOCUS_FADING
1722 if (rs[Rs_fade])
1723 {
1724 pix_colors = pix_colors_unfocused;
1725 scr_recolour ();
1726 }
1727#endif
1728 }
1729}
1730
1676#if TRANSPARENT 1731#if TRANSPARENT
1677void 1732void
1678rxvt_term::rootwin_cb (XEvent &ev) 1733rxvt_term::rootwin_cb (XEvent &ev)
1679{ 1734{
1680 SET_R (this); 1735 SET_R (this);
… …
1710 reportmode = !! (priv_modes & PrivMode_mouse_report); 1765 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711 1766
1712 /* 1767 /*
1713 * VT window processing of button press 1768 * VT window processing of button press
1714 */ 1769 */
1715 if (ev.window == TermWin.vt) 1770 if (ev.window == vt)
1716 { 1771 {
1717#if ISO_14755 1772#if ISO_14755
1718 // 5.4 1773 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1774 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 { 1775 {
… …
1925 case Button3: 1980 case Button3:
1926 if (scrollBar.style != R_SB_XTERM) 1981 if (scrollBar.style != R_SB_XTERM)
1927 { 1982 {
1928 if (scrollbar_above_slider (ev.y)) 1983 if (scrollbar_above_slider (ev.y))
1929# ifdef RXVT_SCROLL_FULL 1984# ifdef RXVT_SCROLL_FULL
1930 scr_page (UP, TermWin.nrow - 1); 1985 scr_page (UP, nrow - 1);
1931# else 1986# else
1932 scr_page (UP, TermWin.nrow / 4); 1987 scr_page (UP, nrow / 4);
1933# endif 1988# endif
1934 else if (scrollbar_below_slider (ev.y)) 1989 else if (scrollbar_below_slider (ev.y))
1935# ifdef RXVT_SCROLL_FULL 1990# ifdef RXVT_SCROLL_FULL
1936 scr_page (DN, TermWin.nrow - 1); 1991 scr_page (DN, nrow - 1);
1937# else 1992# else
1938 scr_page (DN, TermWin.nrow / 4); 1993 scr_page (DN, nrow / 4);
1939# endif 1994# endif
1940 else 1995 else
1941 scrollBar.setMotion (); 1996 scrollBar.setMotion ();
1942 } 1997 }
1943 else 1998 else
1944 { 1999 {
1945 scr_page ((ev.button == Button1 ? DN : UP), 2000 scr_page ((ev.button == Button1 ? DN : UP),
1946 (TermWin.nrow 2001 (nrow
1947 * scrollbar_position (ev.y) 2002 * scrollbar_position (ev.y)
1948 / scrollbar_size ())); 2003 / scrollbar_size ()));
1949 } 2004 }
1950 2005
1951 break; 2006 break;
… …
1983#ifdef SELECTION_SCROLLING 2038#ifdef SELECTION_SCROLLING
1984 if (sel_scroll_ev.active) 2039 if (sel_scroll_ev.active)
1985 sel_scroll_ev.stop(); 2040 sel_scroll_ev.stop();
1986#endif 2041#endif
1987 2042
1988 if (ev.window == TermWin.vt) 2043 if (ev.window == vt)
1989 { 2044 {
1990#if ISO_14755 2045#if ISO_14755
1991 // 5.4 2046 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2047 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return; 2048 return;
… …
2044 v = ev.button == Button4 ? UP : DN; 2099 v = ev.button == Button4 ? UP : DN;
2045 2100
2046 if (ev.state & ShiftMask) 2101 if (ev.state & ShiftMask)
2047 i = 1; 2102 i = 1;
2048 else if (options & Opt_mouseWheelScrollPage) 2103 else if (options & Opt_mouseWheelScrollPage)
2049 i = TermWin.nrow - 1; 2104 i = nrow - 1;
2050 else 2105 else
2051 i = 5; 2106 i = 5;
2052 2107
2053# ifdef MOUSE_SLIP_WHEELING 2108# ifdef MOUSE_SLIP_WHEELING
2054 if (ev.state & ControlMask) 2109 if (ev.state & ControlMask)
2055 { 2110 {
2056 mouse_slip_wheel_speed += v ? -1 : 1; 2111 mouse_slip_wheel_speed += v ? -1 : 1;
2057 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2112 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; 2113 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2059 2114
2060 if (slip_wheel_ev.at < NOW) 2115 if (slip_wheel_ev.at < NOW)
2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2116 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062 2117
2063 slip_wheel_ev.start (); 2118 slip_wheel_ev.start ();
… …
2345 return pchanged; /* Don't try any more */ 2400 return pchanged; /* Don't try any more */
2346 2401
2347 XGetWindowAttributes (disp, display->root, &wrootattr); 2402 XGetWindowAttributes (disp, display->root, &wrootattr);
2348 rootdepth = wrootattr.depth; 2403 rootdepth = wrootattr.depth;
2349 2404
2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2405 XGetWindowAttributes (disp, parent[0], &wattr);
2351 2406
2352 if (rootdepth != wattr.depth) 2407 if (rootdepth != wattr.depth)
2353 { 2408 {
2354 if (am_transparent) 2409 if (am_transparent)
2355 { 2410 {
2356 pchanged = 1; 2411 pchanged = 1;
2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2412 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2358 am_transparent = am_pixmap_trans = 0; 2413 am_transparent = am_pixmap_trans = 0;
2359 } 2414 }
2360 2415
2361 return pchanged; /* Don't try any more */ 2416 return pchanged; /* Don't try any more */
2362 } 2417 }
… …
2403 Window cr; 2458 Window cr;
2404 XImage *image; 2459 XImage *image;
2405 GC gc; 2460 GC gc;
2406 XGCValues gcvalue; 2461 XGCValues gcvalue;
2407 2462
2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2463 XTranslateCoordinates (disp, parent[0], display->root,
2409 0, 0, &sx, &sy, &cr); 2464 0, 0, &sx, &sy, &cr);
2410 nw = (unsigned int)szHint.width; 2465 nw = (unsigned int)szHint.width;
2411 nh = (unsigned int)szHint.height; 2466 nh = (unsigned int)szHint.height;
2412 nx = ny = 0; 2467 nx = ny = 0;
2413 2468
… …
2423 nh += sy; 2478 nh += sy;
2424 ny = -sy; 2479 ny = -sy;
2425 sy = 0; 2480 sy = 0;
2426 } 2481 }
2427 2482
2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2483 min_it (nw, (unsigned int) (wrootattr.width - sx));
2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2484 min_it (nh, (unsigned int) (wrootattr.height - sy));
2430 2485
2431 XSync (disp, False); 2486 XSync (disp, False);
2432 allowedxerror = -1; 2487 allowedxerror = -1;
2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2488 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2434 2489
… …
2439 if (image == NULL) 2494 if (image == NULL)
2440 { 2495 {
2441 if (am_transparent && am_pixmap_trans) 2496 if (am_transparent && am_pixmap_trans)
2442 { 2497 {
2443 pchanged = 1; 2498 pchanged = 1;
2444 if (TermWin.pixmap != None) 2499 if (pixmap != None)
2445 { 2500 {
2446 XFreePixmap (disp, TermWin.pixmap); 2501 XFreePixmap (disp, pixmap);
2447 TermWin.pixmap = None; 2502 pixmap = None;
2448 } 2503 }
2449 } 2504 }
2450 2505
2451 am_pixmap_trans = 0; 2506 am_pixmap_trans = 0;
2452 } 2507 }
2453 else 2508 else
2454 { 2509 {
2455 if (TermWin.pixmap != None) 2510 if (pixmap != None)
2456 XFreePixmap (disp, TermWin.pixmap); 2511 XFreePixmap (disp, pixmap);
2457 2512
2458#if TINTING 2513#if TINTING
2459 if (ISSET_PIXCOLOR (Color_tint)) 2514 if (ISSET_PIXCOLOR (Color_tint))
2460 { 2515 {
2461 unsigned short rm, gm, bm; 2516 unsigned short rm, gm, bm;
… …
2465 2520
2466 ShadeXImage (display, image, shade, rm, gm, bm); 2521 ShadeXImage (display, image, shade, rm, gm, bm);
2467 } 2522 }
2468#endif 2523#endif
2469 2524
2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2525 pixmap = XCreatePixmap (disp, vt,
2471 szHint.width, szHint.height, image->depth); 2526 szHint.width, szHint.height, image->depth);
2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2527 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2528 XPutImage (disp, pixmap, gc, image, 0, 0,
2474 nx, ny, image->width, image->height); 2529 nx, ny, image->width, image->height);
2475 XFreeGC (disp, gc); 2530 XFreeGC (disp, gc);
2476 XDestroyImage (image); 2531 XDestroyImage (image);
2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2532 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2478 XClearWindow (disp, TermWin.parent[0]); 2533 XClearWindow (disp, parent[0]);
2479 2534
2480 if (!am_transparent || !am_pixmap_trans) 2535 if (!am_transparent || !am_pixmap_trans)
2481 pchanged = 1; 2536 pchanged = 1;
2482 2537
2483 am_transparent = am_pixmap_trans = 1; 2538 am_transparent = am_pixmap_trans = 1;
2484 } 2539 }
2485 } 2540 }
2486 2541
2487 if (am_pixmap_trans) 2542 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2543 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2489 else 2544 else
2490 { 2545 {
2491 unsigned int n; 2546 unsigned int n;
2492 /* 2547 /*
2493 * InheritPixmap transparency 2548 * InheritPixmap transparency
2494 */ 2549 */
2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2550 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2496 { 2551 {
2497 oldp = TermWin.parent[i]; 2552 oldp = parent[i];
2498 XQueryTree (disp, TermWin.parent[i - 1], &root, 2553 XQueryTree (disp, parent[i - 1], &root,
2499 &TermWin.parent[i], &list, &n); 2554 &parent[i], &list, &n);
2500 XFree (list); 2555 XFree (list);
2501 2556
2502 if (TermWin.parent[i] == display->root) 2557 if (parent[i] == display->root)
2503 { 2558 {
2504 if (oldp != None) 2559 if (oldp != None)
2505 pchanged = 1; 2560 pchanged = 1;
2506 2561
2507 break; 2562 break;
2508 } 2563 }
2509 2564
2510 if (oldp != TermWin.parent[i]) 2565 if (oldp != parent[i])
2511 pchanged = 1; 2566 pchanged = 1;
2512 } 2567 }
2513 2568
2514 n = 0; 2569 n = 0;
2515 2570
2516 if (pchanged) 2571 if (pchanged)
2517 { 2572 {
2518 for (; n < (unsigned int)i; n++) 2573 for (; n < (unsigned int)i; n++)
2519 { 2574 {
2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2575 XGetWindowAttributes (disp, parent[n], &wattr);
2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2576 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2522 { 2577 {
2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2578 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2524 break; 2579 break;
2525 } 2580 }
2526 } 2581 }
2527 } 2582 }
2528 2583
2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2584 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2530 { 2585 {
2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2586 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2587 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2533 am_transparent = 0; 2588 am_transparent = 0;
2534 /* XXX: also turn off Opt_transparent? */ 2589 /* XXX: also turn off Opt_transparent? */
2535 } 2590 }
2536 else 2591 else
2537 { 2592 {
… …
2540 * needed for fvwm2.2.2 (and before?) */ 2595 * needed for fvwm2.2.2 (and before?) */
2541 sleep (1); 2596 sleep (1);
2542#endif 2597#endif
2543 for (n = 0; n < (unsigned int)i; n++) 2598 for (n = 0; n < (unsigned int)i; n++)
2544 { 2599 {
2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2600 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2546 XClearWindow (disp, TermWin.parent[n]); 2601 XClearWindow (disp, parent[n]);
2547 } 2602 }
2548 2603
2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2604 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2550 am_transparent = 1; 2605 am_transparent = 1;
2551 } 2606 }
2552 2607
2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2608 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 TermWin.parent[i] = None; 2609 parent[i] = None;
2555 } 2610 }
2556 2611
2557 if (scrollBar.win) 2612 if (scrollBar.win)
2558 { 2613 {
2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2614 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2602 // some window managers resize the window early, and these programs 2657 // some window managers resize the window early, and these programs
2603 // then sometimes get the size wrong. 2658 // then sometimes get the size wrong.
2604 // unfortunately other programs are even more buggy and dislike 2659 // unfortunately other programs are even more buggy and dislike
2605 // being sent SIGWINCH, so only do it when we were in fact being 2660 // being sent SIGWINCH, so only do it when we were in fact being
2606 // resized. 2661 // resized.
2607 if (seen_resize) 2662 if (seen_resize && cmd_pid)
2608 kill (-cmd_pid, SIGWINCH); 2663 kill (-cmd_pid, SIGWINCH);
2609 } 2664 }
2610 2665
2611 /* Read a text string from the input buffer */ 2666 /* Read a text string from the input buffer */
2612 unicode_t buf[UBUFSIZ]; 2667 unicode_t buf[UBUFSIZ];
2613 bool refreshnow = false; 2668 bool refreshnow = false;
2614 int nlines = 0; 2669 int nlines = 0;
2615 unicode_t *str = buf; 2670 unicode_t *str = buf;
2671 unicode_t *eol = str + min (ncol, UBUFSIZ);
2616 2672
2617 for (;;) 2673 for (;;)
2618 { 2674 {
2619 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2675 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2620 break; 2676 break;
2621 2677
2622 *str++ = ch; 2678 *str++ = ch;
2623 2679
2624 if (ch == C0_LF) 2680 if (ch == C0_LF || str >= eol)
2625 { 2681 {
2682 if (ch == C0_LF)
2626 nlines++; 2683 nlines++;
2684
2627 refresh_count++; 2685 refresh_count++;
2628 2686
2629 if (!(options & Opt_jumpScroll) 2687 if (!(options & Opt_jumpScroll)
2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2688 || (refresh_count >= refresh_limit * (nrow - 1)))
2631 { 2689 {
2632 refreshnow = true; 2690 refreshnow = true;
2633 ch = NOCHAR; 2691 ch = NOCHAR;
2634 break; 2692 break;
2635 } 2693 }
2636 2694
2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2695 // scr_add_lines only works for nlines <= nrow - 1.
2638 if (nlines >= TermWin.nrow - 1) 2696 if (nlines >= nrow - 1)
2639 { 2697 {
2640 scr_add_lines (buf, nlines, str - buf); 2698 scr_add_lines (buf, nlines, str - buf);
2641 nlines = 0; 2699 nlines = 0;
2642 str = buf; 2700 str = buf;
2701 eol = str + min (ncol, UBUFSIZ);
2643 } 2702 }
2644 }
2645 2703
2646 if (str >= buf + UBUFSIZ) 2704 if (str >= eol)
2647 { 2705 {
2706 if (eol >= buf + UBUFSIZ)
2707 {
2648 ch = NOCHAR; 2708 ch = NOCHAR;
2649 break; 2709 break;
2710 }
2711 else
2712 eol = min (eol + ncol, buf + UBUFSIZ);
2713 }
2714
2650 } 2715 }
2651 2716
2652 seq_begin = cmdbuf_ptr; 2717 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2718 ch = next_char ();
2654 } 2719 }
… …
3313 3378
3314 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3379 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3315 arg[0] = -arg[0]; 3380 arg[0] = -arg[0];
3316 /* FALLTHROUGH */ 3381 /* FALLTHROUGH */
3317 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3382 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3383 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3319 break; 3384 break;
3320 3385
3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3386 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3322 tt_write ((const unsigned char *)VT100_ANS, 3387 tt_write ((const unsigned char *)VT100_ANS,
3323 (unsigned int) (sizeof (VT100_ANS) - 1)); 3388 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3448 { 3513 {
3449 /* 3514 /*
3450 * commands 3515 * commands
3451 */ 3516 */
3452 case 1: /* deiconify window */ 3517 case 1: /* deiconify window */
3453 XMapWindow (disp, TermWin.parent[0]); 3518 XMapWindow (disp, parent[0]);
3454 break; 3519 break;
3455 case 2: /* iconify window */ 3520 case 2: /* iconify window */
3456 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3521 XIconifyWindow (disp, parent[0], display->screen);
3457 break; 3522 break;
3458 case 3: /* set position (pixels) */ 3523 case 3: /* set position (pixels) */
3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3524 XMoveWindow (disp, parent[0], args[1], args[2]);
3460 break; 3525 break;
3461 case 4: /* set size (pixels) */ 3526 case 4: /* set size (pixels) */
3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3527 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3463 break; 3528 break;
3464 case 5: /* raise window */ 3529 case 5: /* raise window */
3465 XRaiseWindow (disp, TermWin.parent[0]); 3530 XRaiseWindow (disp, parent[0]);
3466 break; 3531 break;
3467 case 6: /* lower window */ 3532 case 6: /* lower window */
3468 XLowerWindow (disp, TermWin.parent[0]); 3533 XLowerWindow (disp, parent[0]);
3469 break; 3534 break;
3470 case 7: /* refresh window */ 3535 case 7: /* refresh window */
3471 scr_touch (true); 3536 scr_touch (true);
3472 break; 3537 break;
3473 case 8: /* set size (chars) */ 3538 case 8: /* set size (chars) */
3474 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3539 set_widthheight ((unsigned int) (args[2] * fwidth),
3475 (unsigned int) (args[1] * TermWin.fheight)); 3540 (unsigned int) (args[1] * fheight));
3476 break; 3541 break;
3477 3542
3478 //case 9: NYI, TODO, restore maximized window or maximize window 3543 //case 9: NYI, TODO, restore maximized window or maximize window
3479 default: 3544 default:
3480 if (args[0] >= 24) /* set height (chars) */ 3545 if (args[0] >= 24) /* set height (chars) */
3481 set_widthheight ((unsigned int)TermWin.width, 3546 set_widthheight ((unsigned int)width,
3482 (unsigned int) (args[1] * TermWin.fheight)); 3547 (unsigned int) (args[1] * fheight));
3483 break; 3548 break;
3484 3549
3485 3550
3486 /* 3551 /*
3487 * reports - some output format copied from XTerm 3552 * reports - some output format copied from XTerm
3488 */ 3553 */
3489 case 11: /* report window state */ 3554 case 11: /* report window state */
3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3555 XGetWindowAttributes (disp, parent[0], &wattr);
3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3556 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3492 break; 3557 break;
3493 case 13: /* report window position */ 3558 case 13: /* report window position */
3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3559 XGetWindowAttributes (disp, parent[0], &wattr);
3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3560 XTranslateCoordinates (disp, parent[0], wattr.root,
3496 -wattr.border_width, -wattr.border_width, 3561 -wattr.border_width, -wattr.border_width,
3497 &x, &y, &wdummy); 3562 &x, &y, &wdummy);
3498 tt_printf ("\033[3;%d;%dt", x, y); 3563 tt_printf ("\033[3;%d;%dt", x, y);
3499 break; 3564 break;
3500 case 14: /* report window size (pixels) */ 3565 case 14: /* report window size (pixels) */
3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3566 XGetWindowAttributes (disp, parent[0], &wattr);
3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3567 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3503 break; 3568 break;
3504 case 18: /* report text area size (chars) */ 3569 case 18: /* report text area size (chars) */
3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3570 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3506 break; 3571 break;
3507 case 19: /* report window size (chars) */ 3572 case 19: /* report window size (chars) */
3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3573 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3509 break; 3574 break;
3510 case 20: /* report icon label */ 3575 case 20: /* report icon label */
3511 { 3576 {
3512 char *s; 3577 char *s;
3513 XGetIconName (disp, TermWin.parent[0], &s); 3578 XGetIconName (disp, parent[0], &s);
3514 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3579 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3515 XFree (s); 3580 XFree (s);
3516 } 3581 }
3517 break; 3582 break;
3518 case 21: /* report window title */ 3583 case 21: /* report window title */
3519 { 3584 {
3520 char *s; 3585 char *s;
3521 XFetchName (disp, TermWin.parent[0], &s); 3586 XFetchName (disp, parent[0], &s);
3522 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3587 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3523 XFree (s); 3588 XFree (s);
3524 } 3589 }
3525 break; 3590 break;
3526 } 3591 }
… …
3559 else if (ch < 0x20) 3624 else if (ch < 0x20)
3560 return NULL; /* other control character - exit */ 3625 return NULL; /* other control character - exit */
3561 3626
3562 seen_esc = false; 3627 seen_esc = false;
3563 3628
3564 if (n >= sizeof (string) - 1) 3629 if (n >= STRING_MAX - 1)
3565 // stop at some sane length 3630 // stop at some sane length
3566 return NULL; 3631 return NULL;
3567 3632
3568 if (ch == C0_SYN) 3633 if (ch == C0_SYN)
3569 string[n++] = cmd_get8 (); 3634 string[n++] = cmd_get8 ();
… …
3637 set_window_color (color, str); 3702 set_window_color (color, str);
3638} 3703}
3639 3704
3640/* 3705/*
3641 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3706 * 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 */ 3707 */
3665void 3708void
3666rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3709rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3667{ 3710{
3668 int changed = 0; 3711 int changed = 0;
… …
3694 unsigned long bytes_after; 3737 unsigned long bytes_after;
3695 unsigned char *value = 0; 3738 unsigned char *value = 0;
3696 const char *str = ""; 3739 const char *str = "";
3697 3740
3698 if (prop 3741 if (prop
3699 && XGetWindowProperty (disp, TermWin.parent[0], 3742 && XGetWindowProperty (disp, parent[0],
3700 prop, 0, 1<<16, 0, AnyPropertyType, 3743 prop, 0, 1<<16, 0, AnyPropertyType,
3701 &actual_type, &actual_format, 3744 &actual_type, &actual_format,
3702 &nitems, &bytes_after, &value) == Success 3745 &nitems, &bytes_after, &value) == Success
3703 && actual_type != None 3746 && actual_type != None
3704 && actual_format == 8) 3747 && actual_format == 8)
… …
3716 { 3759 {
3717 *eq = 0; 3760 *eq = 0;
3718 set_utf8_property (display->atom (str), eq + 1); 3761 set_utf8_property (display->atom (str), eq + 1);
3719 } 3762 }
3720 else 3763 else
3721 XDeleteProperty (disp, TermWin.parent[0], 3764 XDeleteProperty (disp, parent[0],
3722 display->atom (str)); 3765 display->atom (str));
3723 } 3766 }
3724 break; 3767 break;
3725 3768
3726 case XTerm_Color: 3769 case XTerm_Color:
… …
3767 break; 3810 break;
3768#ifndef NO_BOLD_UNDERLINE_REVERSE 3811#ifndef NO_BOLD_UNDERLINE_REVERSE
3769 case XTerm_Color_BD: 3812 case XTerm_Color_BD:
3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3813 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3771 break; 3814 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3774 break;
3775 case XTerm_Color_UL: 3815 case XTerm_Color_UL:
3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3816 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3777 break; 3817 break;
3778 case XTerm_Color_RV: 3818 case XTerm_Color_RV:
3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3819 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3780 break; 3820 break;
3821 case URxvt_Color_IT:
3822 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3823 break;
3781#endif 3824#endif
3782#if TRANSPARENT && TINTING 3825#if TRANSPARENT && TINTING
3783 case XTerm_Color_tint: 3826 case URxvt_Color_tint:
3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3827 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3785 check_our_parents (); 3828 check_our_parents ();
3786 if (am_transparent) 3829 if (am_transparent)
3787 want_full_refresh = want_refresh = 1; 3830 want_full_refresh = want_refresh = 1;
3788 break; 3831 break;
3789#endif 3832#endif
… …
3823 3866
3824 case XTerm_logfile: 3867 case XTerm_logfile:
3825 // TODO, when secure mode? 3868 // TODO, when secure mode?
3826 break; 3869 break;
3827 3870
3871#ifdef MENUBAR
3872 case URxvt_Menu:
3873 if (options & Opt_insecure)
3874 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3875 break;
3876#endif
3877#if 0
3878 case XTerm_dumpscreen: /* no error notices */
3879 {
3880 int fd;
3881 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3882 {
3883 scr_dump (fd);
3884 close (fd);
3885 }
3886 }
3887 break;
3888#endif
3828 case XTerm_font: 3889 case XTerm_font:
3829 op = URxvt_font; 3890 op = URxvt_font;
3830 case URxvt_font: 3891 case URxvt_font:
3831#if ENABLE_STYLES 3892#if ENABLE_STYLES
3832 case URxvt_boldFont: 3893 case URxvt_boldFont:
3833 case URxvt_italicFont: 3894 case URxvt_italicFont:
3834 case URxvt_boldItalicFont: 3895 case URxvt_boldItalicFont:
3835#endif 3896#endif
3836 if (query) 3897 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", saveop, 3898 tt_printf ("\33]%d;%-.250s%c", saveop,
3838 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3899 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3839 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3900 ? fontset[op - URxvt_font]->fontdesc : "",
3840 resp); 3901 resp);
3841 else 3902 else
3842 { 3903 {
3843 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3904 const char *&res = rs[Rs_font + (op - URxvt_font)];
3844 3905
… …
3847 set_fonts (); 3908 set_fonts ();
3848 } 3909 }
3849 break; 3910 break;
3850 3911
3851#if ENABLE_FRILLS 3912#if ENABLE_FRILLS
3852 case XTerm_locale: 3913 case URxvt_locale:
3853 if (query) 3914 if (query)
3854 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3915 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3855 else 3916 else
3856 { 3917 {
3857 set_locale (str); 3918 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8); 3919 pty.set_utf8_mode (enc_utf8);
3859# ifdef USE_XIM
3860 im_cb (); 3920 init_xlocale ();
3861# endif
3862 } 3921 }
3863 break; 3922 break;
3864#endif
3865 3923
3866#ifdef MENUBAR 3924 case URxvt_view_up:
3867 case XTerm_Menu: 3925 case URxvt_view_down:
3868 if (options & Opt_insecure) 3926 int lines = atoi (str);
3869 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3927
3870 break; 3928 if (lines)
3871#endif 3929 scr_page (op == URxvt_view_up ? UP : DN, lines);
3872#if 0
3873 case XTerm_dumpscreen: /* no error notices */
3874 { 3930 else
3875 int fd;
3876 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3877 { 3931 {
3878 scr_dump (fd); 3932 scr_erase_savelines ();
3879 close (fd);
3880 } 3933 }
3881 } 3934
3882 break; 3935 break;
3883#endif 3936#endif
3884 } 3937 }
3885} 3938}
3886/*----------------------------------------------------------------------*/ 3939/*----------------------------------------------------------------------*/
… …
4019 */ 4072 */
4020 PrivMode (1, PrivMode_vt52); 4073 PrivMode (1, PrivMode_vt52);
4021 break; 4074 break;
4022 case 3: /* 80/132 */ 4075 case 3: /* 80/132 */
4023 if (priv_modes & PrivMode_132OK) 4076 if (priv_modes & PrivMode_132OK)
4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4077 set_widthheight (((state ? 132 : 80) * fwidth), height);
4025 break; 4078 break;
4026 case 4: /* smooth scrolling */ 4079 case 4: /* smooth scrolling */
4027 if (state) 4080 if (state)
4028 options &= ~Opt_jumpScroll; 4081 options &= ~Opt_jumpScroll;
4029 else 4082 else
… …
4346 } 4399 }
4347 4400
4348 memmove (v_buffer, v_buffer + written, v_buflen); 4401 memmove (v_buffer, v_buffer + written, v_buflen);
4349 } 4402 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4403 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this... 4404 pty_ev.set (EVENT_READ);
4352 destroy ();
4353} 4405}
4354 4406
4355/*----------------------- end-of-file (C source) -----------------------*/ 4407/*----------------------- end-of-file (C source) -----------------------*/
4356 4408

Diff Legend

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