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.203 by root, Sat Jun 18 09:02:37 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, *fname; 166 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 167 int len;
170 168
171 fname = rxvt_utf8towcs (f->name); 169 fname = rxvt_utf8towcs (f->name);
172 170
173#if ENABLE_COMBINING 171# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 172 if (IS_COMPOSE (ch))
175 { 173 {
176 len = rxvt_composite.expand (ch, 0); 174 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 175 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 176 rxvt_composite.expand (ch, chr);
179 } 177 }
180 else 178 else
181#endif 179# endif
182 { 180 {
183 ch2 = ch; 181 ch2 = ch;
184 182
185 alloc = 0; 183 alloc = 0;
186 chr = &ch2; 184 chr = &ch2;
187 len = 1; 185 len = 1;
188 } 186 }
189 187
188 char attr[80]; // plenty
189
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
190 int width = wcswidth (fname, wcslen (fname)); 200 int width = wcswidth (fname, wcslen (fname));
191 201
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 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);
193 212
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 213 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 214
196 for (int y = 0; y < len; y++) 215 for (int y = 0; y < len; y++)
197 { 216 {
… …
200 ch = *chr++; 219 ch = *chr++;
201 220
202 sprintf (buf, "%8x", ch); 221 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 222 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 223 scr_overlay_set (9, y, '=');
205#if !UNICODE3 224# if !UNICODE3
206 if (ch >= 0x10000) 225 if (ch >= 0x10000)
207 ch = 0xfffd; 226 ch = 0xfffd;
208#endif 227# endif
209 scr_overlay_set (11, y, ch, r); 228 scr_overlay_set (11, y, ch, r);
210 scr_overlay_set (12, y, NOCHAR, r); 229 scr_overlay_set (12, y, NOCHAR, r);
211 } 230 }
212 231
232 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 233 scr_overlay_set (0, len + 1, fname);
214 234
215 free (fname); 235 free (fname);
216 236
217#if ENABLE_COMBINING 237# if ENABLE_COMBINING
218 if (alloc) 238 if (alloc)
219 delete [] alloc; 239 delete [] alloc;
220#endif 240# endif
221} 241}
222#endif 242#endif
223 243
224void 244void
225rxvt_term::commit_iso14755 () 245rxvt_term::commit_iso14755 ()
… …
366#ifdef KEYSYM_RESOURCE 386#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state)) 387 if (keyboard->dispatch (this, keysym, ev.state))
368 return; 388 return;
369#endif 389#endif
370 390
371 if (TermWin.saveLines) 391 if (saveLines)
372 { 392 {
373#ifdef UNSHIFTED_SCROLLKEYS 393#ifdef UNSHIFTED_SCROLLKEYS
374 if (!ctrl && !meta) 394 if (!ctrl && !meta)
375#else 395#else
376 if (IS_SCROLL_MOD) 396 if (IS_SCROLL_MOD)
377#endif 397#endif
378 { 398 {
379 int lnsppg; 399 int lnsppg;
380 400
381#ifdef PAGING_CONTEXT_LINES 401#ifdef PAGING_CONTEXT_LINES
382 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 402 lnsppg = nrow - PAGING_CONTEXT_LINES;
383#else 403#else
384 lnsppg = TermWin.nrow * 4 / 5; 404 lnsppg = nrow * 4 / 5;
385#endif 405#endif
386 if (keysym == XK_Prior) 406 if (keysym == XK_Prior)
387 { 407 {
388 scr_page (UP, lnsppg); 408 scr_page (UP, lnsppg);
389 return; 409 return;
… …
844 } 864 }
845 865
846 if (len <= 0) 866 if (len <= 0)
847 return; /* not mapped */ 867 return; /* not mapped */
848 868
849 if (options & Opt_scrollTtyKeypress) 869 if (OPTION (Opt_scrollTtyKeypress))
850 if (TermWin.view_start) 870 if (view_start)
851 { 871 {
852 TermWin.view_start = 0; 872 view_start = 0;
853 want_refresh = 1; 873 want_refresh = 1;
854 } 874 }
855 875
856 /* 876 /*
857 * these modifications only affect the static keybuffer 877 * these modifications only affect the static keybuffer
… …
1034{ 1054{
1035 if (mouse_slip_wheel_speed == 0 1055 if (mouse_slip_wheel_speed == 0
1036 || 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)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1057 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1058 {
1039 if (TermWin.view_start == TermWin.nscrolled || 1059 if (view_start == nsaved ||
1040 TermWin.view_start == 0) 1060 view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1061 mouse_slip_wheel_speed = 0;
1042 1062
1043 refresh_type |= SMOOTH_REFRESH; 1063 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1064 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1067 if (n > 0) 1087 if (n > 0)
1068 { 1088 {
1069 cmdbuf_endp += n; 1089 cmdbuf_endp += n;
1070 return true; 1090 return true;
1071 } 1091 }
1072 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))
1073 destroy (); 1097 destroy ();
1098 }
1074 1099
1075 return false; 1100 return false;
1076} 1101}
1077 1102
1078void 1103void
… …
1092} 1117}
1093 1118
1094void 1119void
1095rxvt_term::pointer_unblank () 1120rxvt_term::pointer_unblank ()
1096{ 1121{
1097 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1122 XDefineCursor (display->display, vt, TermWin_cursor);
1098 recolour_cursor (); 1123 recolour_cursor ();
1099 1124
1100#ifdef POINTER_BLANK 1125#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1126 hidden_pointer = 0;
1102 1127
1103 if (options & Opt_pointerBlank) 1128 if (OPTION (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1129 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1130#endif
1106} 1131}
1107 1132
1108#ifdef POINTER_BLANK 1133#ifdef POINTER_BLANK
1109void 1134void
1110rxvt_term::pointer_blank () 1135rxvt_term::pointer_blank ()
1111{ 1136{
1112 if (! (options & Opt_pointerBlank)) 1137 if (! OPTION (Opt_pointerBlank))
1113 return; 1138 return;
1114 1139
1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1140 XDefineCursor (display->display, vt, display->blank_cursor);
1116 XFlush (display->display); 1141 XFlush (display->display);
1117 1142
1118 hidden_pointer = 1; 1143 hidden_pointer = 1;
1119} 1144}
1120 1145
… …
1215 1240
1216 SET_R (this); 1241 SET_R (this);
1217 SET_LOCALE (locale); 1242 SET_LOCALE (locale);
1218 1243
1219#if defined(CURSOR_BLINK) 1244#if defined(CURSOR_BLINK)
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1245 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1221 { 1246 {
1222 if (hidden_cursor) 1247 if (hidden_cursor)
1223 { 1248 {
1224 hidden_cursor = 0; 1249 hidden_cursor = 0;
1225 want_refresh = 1; 1250 want_refresh = 1;
… …
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1253 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1229 } 1254 }
1230#endif 1255#endif
1231 1256
1232#if defined(POINTER_BLANK) 1257#if defined(POINTER_BLANK)
1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1258 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1234 { 1259 {
1235 if (ev.type == MotionNotify 1260 if (ev.type == MotionNotify
1236 || ev.type == ButtonPress 1261 || ev.type == ButtonPress
1237 || ev.type == ButtonRelease) 1262 || ev.type == ButtonRelease)
1238 if (hidden_pointer) 1263 if (hidden_pointer)
… …
1422 case FocusOut: 1447 case FocusOut:
1423 focus_out (); 1448 focus_out ();
1424 break; 1449 break;
1425 1450
1426 case ConfigureNotify: 1451 case ConfigureNotify:
1427 if (ev.xconfigure.window == TermWin.parent[0]) 1452 if (ev.xconfigure.window == parent[0])
1428 { 1453 {
1429 int height, width;
1430
1431 do
1432 { /* Wrap lots of configures into one */
1433 width = ev.xconfigure.width;
1434 height = ev.xconfigure.height;
1435 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1436 }
1437 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1454 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1455 ;
1438 1456
1439 if (szHint.width != width || szHint.height != height) 1457 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1440 { 1458 {
1441 seen_resize = 1; 1459 seen_resize = 1;
1442 resize_all_windows (width, height, 1); 1460 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1443 } 1461 }
1444 1462
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1463#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent) 1464 if (OPTION (Opt_transparent))
1447 check_our_parents (); 1465 check_our_parents ();
1448#endif 1466#endif
1449 } 1467 }
1450 break; 1468 break;
1451 1469
… …
1468 case SelectionRequest: 1486 case SelectionRequest:
1469 selection_send (ev.xselectionrequest); 1487 selection_send (ev.xselectionrequest);
1470 break; 1488 break;
1471 1489
1472 case UnmapNotify: 1490 case UnmapNotify:
1473 TermWin.mapped = 0; 1491 mapped = 0;
1474#ifdef TEXT_BLINK 1492#ifdef TEXT_BLINK
1475 text_blink_ev.stop (); 1493 text_blink_ev.stop ();
1476#endif 1494#endif
1477 break; 1495 break;
1478 1496
1479 case MapNotify: 1497 case MapNotify:
1480 TermWin.mapped = 1; 1498 mapped = 1;
1481#ifdef TEXT_BLINK 1499#ifdef TEXT_BLINK
1482 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1500 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1483#endif 1501#endif
1484 break; 1502 break;
1485 1503
… …
1489 break; 1507 break;
1490#endif /* TRANSPARENT */ 1508#endif /* TRANSPARENT */
1491 1509
1492 case GraphicsExpose: 1510 case GraphicsExpose:
1493 case Expose: 1511 case Expose:
1494 if (ev.xany.window == TermWin.vt) 1512 if (ev.xany.window == vt)
1495 { 1513 {
1496 do 1514 do
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1515 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1516 ev.xexpose.width, ev.xexpose.height, False);
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1500 1518
1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1502 1520
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1521 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1504 scr_expose (ev.xexpose.x, ev.xexpose.y, 1522 scr_expose (ev.xexpose.x, ev.xexpose.y,
1505 ev.xexpose.width, ev.xexpose.height, False); 1523 ev.xexpose.width, ev.xexpose.height, False);
1506 1524
1507 scr_refresh (refresh_type); 1525 scr_refresh (refresh_type);
1508 } 1526 }
… …
1524 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1542 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1525 menubar_expose (); 1543 menubar_expose ();
1526#endif 1544#endif
1527 1545
1528#ifdef TRANSPARENT 1546#ifdef TRANSPARENT
1529 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1547 if (am_transparent && ev.xany.window == parent[0])
1530 XClearWindow (disp, ev.xany.window); 1548 XClearWindow (disp, ev.xany.window);
1531#endif 1549#endif
1532 } 1550 }
1533 break; 1551 break;
1534 1552
… …
1545 } 1563 }
1546#endif 1564#endif
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break; 1566 break;
1549 1567
1550 if (ev.xany.window == TermWin.vt) 1568 if (ev.xany.window == vt)
1551 { 1569 {
1552 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1570 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1571 {
1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1572 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1555 ; 1573 ;
1556 1574
1557 XQueryPointer (disp, TermWin.vt, 1575 XQueryPointer (disp, vt,
1558 &unused_root, &unused_child, 1576 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1577 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1578 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1579 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1580#ifdef MOUSE_THRESHOLD
… …
1574#endif 1592#endif
1575 selection_extend (ev.xbutton.x, ev.xbutton.y, 1593 selection_extend (ev.xbutton.x, ev.xbutton.y,
1576 ev.xbutton.state & Button3Mask ? 2 : 0); 1594 ev.xbutton.state & Button3Mask ? 2 : 0);
1577 1595
1578#ifdef SELECTION_SCROLLING 1596#ifdef SELECTION_SCROLLING
1579 if (ev.xbutton.y < TermWin.int_bwidth 1597 if (ev.xbutton.y < int_bwidth
1580 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1598 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1581 { 1599 {
1582 int dist; 1600 int dist;
1583 1601
1584 /* don't clobber the current delay if we are 1602 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1603 * already in the middle of scrolling.
… …
1593 selection_save_x = ev.xbutton.x; 1611 selection_save_x = ev.xbutton.x;
1594 selection_save_y = ev.xbutton.y; 1612 selection_save_y = ev.xbutton.y;
1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1613 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1596 1614
1597 /* calc number of lines to scroll */ 1615 /* calc number of lines to scroll */
1598 if (ev.xbutton.y < TermWin.int_bwidth) 1616 if (ev.xbutton.y < int_bwidth)
1599 { 1617 {
1600 scroll_selection_dir = UP; 1618 scroll_selection_dir = UP;
1601 dist = TermWin.int_bwidth - ev.xbutton.y; 1619 dist = int_bwidth - ev.xbutton.y;
1602 } 1620 }
1603 else 1621 else
1604 { 1622 {
1605 scroll_selection_dir = DN; 1623 scroll_selection_dir = DN;
1606 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1624 dist = ev.xbutton.y - (int_bwidth + height);
1607 } 1625 }
1608 1626
1609 scroll_selection_lines = Pixel2Height (dist) 1627 scroll_selection_lines = Pixel2Height (dist)
1610 / SELECTION_SCROLL_LINE_SPEEDUP 1628 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1; 1629 + 1;
1612 MIN_IT (scroll_selection_lines, 1630 min_it (scroll_selection_lines,
1613 SELECTION_SCROLL_MAX_LINES); 1631 SELECTION_SCROLL_MAX_LINES);
1614 } 1632 }
1615 else 1633 else
1616 { 1634 {
1617 /* we are within the text window, so we 1635 /* we are within the text window, so we
… …
1648} 1666}
1649 1667
1650void 1668void
1651rxvt_term::focus_in () 1669rxvt_term::focus_in ()
1652{ 1670{
1653 if (!TermWin.focus) 1671 if (!focus)
1654 { 1672 {
1655 TermWin.focus = 1; 1673 focus = 1;
1656 want_refresh = 1; 1674 want_refresh = 1;
1657#ifdef USE_XIM 1675#if USE_XIM
1658 if (Input_Context != NULL) 1676 if (Input_Context != NULL)
1659 { 1677 {
1660 IMSetStatusPosition (); 1678 IMSetStatusPosition ();
1661 XSetICFocus (Input_Context); 1679 XSetICFocus (Input_Context);
1662 } 1680 }
1663#endif 1681#endif
1664#ifdef CURSOR_BLINK 1682#if CURSOR_BLINK
1665 if (options & Opt_cursorBlink) 1683 if (OPTION (Opt_cursorBlink))
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1684 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1667#endif 1685#endif
1668#ifdef OFF_FOCUS_FADING 1686#if OFF_FOCUS_FADING
1669 if (rs[Rs_fade]) 1687 if (rs[Rs_fade])
1670 { 1688 {
1671 pix_colors = pix_colors_focused; 1689 pix_colors = pix_colors_focused;
1672 scr_recolour (); 1690 scr_recolour ();
1673 } 1691 }
… …
1676} 1694}
1677 1695
1678void 1696void
1679rxvt_term::focus_out () 1697rxvt_term::focus_out ()
1680{ 1698{
1681 if (TermWin.focus) 1699 if (focus)
1682 { 1700 {
1683 TermWin.focus = 0; 1701 focus = 0;
1684 want_refresh = 1; 1702 want_refresh = 1;
1685 1703
1686#if ENABLE_FRILLS || ISO_14755 1704#if ENABLE_FRILLS || ISO_14755
1687 iso14755buf = 0; 1705 iso14755buf = 0;
1688#endif 1706#endif
1689#if ENABLE_OVERLAY 1707#if ENABLE_OVERLAY
1690 scr_overlay_off (); 1708 scr_overlay_off ();
1691#endif 1709#endif
1692#ifdef USE_XIM 1710#if USE_XIM
1693 if (Input_Context != NULL) 1711 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context); 1712 XUnsetICFocus (Input_Context);
1695#endif 1713#endif
1696#ifdef CURSOR_BLINK 1714#if CURSOR_BLINK
1697 if (options & Opt_cursorBlink) 1715 if (OPTION (Opt_cursorBlink))
1698 cursor_blink_ev.stop (); 1716 cursor_blink_ev.stop ();
1699 hidden_cursor = 0; 1717 hidden_cursor = 0;
1700#endif 1718#endif
1701#ifdef OFF_FOCUS_FADING 1719#if OFF_FOCUS_FADING
1702 if (rs[Rs_fade]) 1720 if (rs[Rs_fade])
1703 { 1721 {
1704 pix_colors = pix_colors_unfocused; 1722 pix_colors = pix_colors_unfocused;
1705 scr_recolour (); 1723 scr_recolour ();
1706 } 1724 }
… …
1726 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1744 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1727 return; 1745 return;
1728 1746
1729 /* FALLTHROUGH */ 1747 /* FALLTHROUGH */
1730 case ReparentNotify: 1748 case ReparentNotify:
1731 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1749 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1732 want_refresh = want_full_refresh = 1; 1750 want_refresh = want_full_refresh = 1;
1733 break; 1751 break;
1734 } 1752 }
1735} 1753}
1736#endif 1754#endif
… …
1745 reportmode = !! (priv_modes & PrivMode_mouse_report); 1763 reportmode = !! (priv_modes & PrivMode_mouse_report);
1746 1764
1747 /* 1765 /*
1748 * VT window processing of button press 1766 * VT window processing of button press
1749 */ 1767 */
1750 if (ev.window == TermWin.vt) 1768 if (ev.window == vt)
1751 { 1769 {
1752#if ISO_14755 1770#if ISO_14755
1753 // 5.4 1771 // 5.4
1754 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1772 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1755 { 1773 {
… …
1960 case Button3: 1978 case Button3:
1961 if (scrollBar.style != R_SB_XTERM) 1979 if (scrollBar.style != R_SB_XTERM)
1962 { 1980 {
1963 if (scrollbar_above_slider (ev.y)) 1981 if (scrollbar_above_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 1982# ifdef RXVT_SCROLL_FULL
1965 scr_page (UP, TermWin.nrow - 1); 1983 scr_page (UP, nrow - 1);
1966# else 1984# else
1967 scr_page (UP, TermWin.nrow / 4); 1985 scr_page (UP, nrow / 4);
1968# endif 1986# endif
1969 else if (scrollbar_below_slider (ev.y)) 1987 else if (scrollbar_below_slider (ev.y))
1970# ifdef RXVT_SCROLL_FULL 1988# ifdef RXVT_SCROLL_FULL
1971 scr_page (DN, TermWin.nrow - 1); 1989 scr_page (DN, nrow - 1);
1972# else 1990# else
1973 scr_page (DN, TermWin.nrow / 4); 1991 scr_page (DN, nrow / 4);
1974# endif 1992# endif
1975 else 1993 else
1976 scrollBar.setMotion (); 1994 scrollBar.setMotion ();
1977 } 1995 }
1978 else 1996 else
1979 { 1997 {
1980 scr_page ((ev.button == Button1 ? DN : UP), 1998 scr_page ((ev.button == Button1 ? DN : UP),
1981 (TermWin.nrow 1999 (nrow
1982 * scrollbar_position (ev.y) 2000 * scrollbar_position (ev.y)
1983 / scrollbar_size ())); 2001 / scrollbar_size ()));
1984 } 2002 }
1985 2003
1986 break; 2004 break;
… …
2018#ifdef SELECTION_SCROLLING 2036#ifdef SELECTION_SCROLLING
2019 if (sel_scroll_ev.active) 2037 if (sel_scroll_ev.active)
2020 sel_scroll_ev.stop(); 2038 sel_scroll_ev.stop();
2021#endif 2039#endif
2022 2040
2023 if (ev.window == TermWin.vt) 2041 if (ev.window == vt)
2024 { 2042 {
2025#if ISO_14755 2043#if ISO_14755
2026 // 5.4 2044 // 5.4
2027 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2045 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2028 return; 2046 return;
… …
2078 2096
2079 v = ev.button == Button4 ? UP : DN; 2097 v = ev.button == Button4 ? UP : DN;
2080 2098
2081 if (ev.state & ShiftMask) 2099 if (ev.state & ShiftMask)
2082 i = 1; 2100 i = 1;
2083 else if (options & Opt_mouseWheelScrollPage) 2101 else if (OPTION (Opt_mouseWheelScrollPage))
2084 i = TermWin.nrow - 1; 2102 i = nrow - 1;
2085 else 2103 else
2086 i = 5; 2104 i = 5;
2087 2105
2088# ifdef MOUSE_SLIP_WHEELING 2106# ifdef MOUSE_SLIP_WHEELING
2089 if (ev.state & ControlMask) 2107 if (ev.state & ControlMask)
2090 { 2108 {
2091 mouse_slip_wheel_speed += v ? -1 : 1; 2109 mouse_slip_wheel_speed += v ? -1 : 1;
2092 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;
2093 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;
2094 2112
2095 if (slip_wheel_ev.at < NOW) 2113 if (slip_wheel_ev.at < NOW)
2096 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2114 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2097 2115
2098 slip_wheel_ev.start (); 2116 slip_wheel_ev.start ();
… …
2374 XWindowAttributes wattr, wrootattr; 2392 XWindowAttributes wattr, wrootattr;
2375 dDisp; 2393 dDisp;
2376 2394
2377 pchanged = 0; 2395 pchanged = 0;
2378 2396
2379 if (!(options & Opt_transparent)) 2397 if (!OPTION (Opt_transparent))
2380 return pchanged; /* Don't try any more */ 2398 return pchanged; /* Don't try any more */
2381 2399
2382 XGetWindowAttributes (disp, display->root, &wrootattr); 2400 XGetWindowAttributes (disp, display->root, &wrootattr);
2383 rootdepth = wrootattr.depth; 2401 rootdepth = wrootattr.depth;
2384 2402
2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2403 XGetWindowAttributes (disp, parent[0], &wattr);
2386 2404
2387 if (rootdepth != wattr.depth) 2405 if (rootdepth != wattr.depth)
2388 { 2406 {
2389 if (am_transparent) 2407 if (am_transparent)
2390 { 2408 {
2391 pchanged = 1; 2409 pchanged = 1;
2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2410 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2393 am_transparent = am_pixmap_trans = 0; 2411 am_transparent = am_pixmap_trans = 0;
2394 } 2412 }
2395 2413
2396 return pchanged; /* Don't try any more */ 2414 return pchanged; /* Don't try any more */
2397 } 2415 }
… …
2438 Window cr; 2456 Window cr;
2439 XImage *image; 2457 XImage *image;
2440 GC gc; 2458 GC gc;
2441 XGCValues gcvalue; 2459 XGCValues gcvalue;
2442 2460
2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2461 XTranslateCoordinates (disp, parent[0], display->root,
2444 0, 0, &sx, &sy, &cr); 2462 0, 0, &sx, &sy, &cr);
2445 nw = (unsigned int)szHint.width; 2463 nw = (unsigned int)szHint.width;
2446 nh = (unsigned int)szHint.height; 2464 nh = (unsigned int)szHint.height;
2447 nx = ny = 0; 2465 nx = ny = 0;
2448 2466
… …
2458 nh += sy; 2476 nh += sy;
2459 ny = -sy; 2477 ny = -sy;
2460 sy = 0; 2478 sy = 0;
2461 } 2479 }
2462 2480
2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2481 min_it (nw, (unsigned int) (wrootattr.width - sx));
2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2482 min_it (nh, (unsigned int) (wrootattr.height - sy));
2465 2483
2466 XSync (disp, False); 2484 XSync (disp, False);
2467 allowedxerror = -1; 2485 allowedxerror = -1;
2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2486 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2469 2487
… …
2474 if (image == NULL) 2492 if (image == NULL)
2475 { 2493 {
2476 if (am_transparent && am_pixmap_trans) 2494 if (am_transparent && am_pixmap_trans)
2477 { 2495 {
2478 pchanged = 1; 2496 pchanged = 1;
2479 if (TermWin.pixmap != None) 2497 if (pixmap != None)
2480 { 2498 {
2481 XFreePixmap (disp, TermWin.pixmap); 2499 XFreePixmap (disp, pixmap);
2482 TermWin.pixmap = None; 2500 pixmap = None;
2483 } 2501 }
2484 } 2502 }
2485 2503
2486 am_pixmap_trans = 0; 2504 am_pixmap_trans = 0;
2487 } 2505 }
2488 else 2506 else
2489 { 2507 {
2490 if (TermWin.pixmap != None) 2508 if (pixmap != None)
2491 XFreePixmap (disp, TermWin.pixmap); 2509 XFreePixmap (disp, pixmap);
2492 2510
2493#if TINTING 2511#if TINTING
2494 if (ISSET_PIXCOLOR (Color_tint)) 2512 if (ISSET_PIXCOLOR (Color_tint))
2495 { 2513 {
2496 unsigned short rm, gm, bm; 2514 unsigned short rm, gm, bm;
… …
2500 2518
2501 ShadeXImage (display, image, shade, rm, gm, bm); 2519 ShadeXImage (display, image, shade, rm, gm, bm);
2502 } 2520 }
2503#endif 2521#endif
2504 2522
2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2523 pixmap = XCreatePixmap (disp, vt,
2506 szHint.width, szHint.height, image->depth); 2524 szHint.width, szHint.height, image->depth);
2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2525 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2526 XPutImage (disp, pixmap, gc, image, 0, 0,
2509 nx, ny, image->width, image->height); 2527 nx, ny, image->width, image->height);
2510 XFreeGC (disp, gc); 2528 XFreeGC (disp, gc);
2511 XDestroyImage (image); 2529 XDestroyImage (image);
2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2530 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2513 XClearWindow (disp, TermWin.parent[0]); 2531 XClearWindow (disp, parent[0]);
2514 2532
2515 if (!am_transparent || !am_pixmap_trans) 2533 if (!am_transparent || !am_pixmap_trans)
2516 pchanged = 1; 2534 pchanged = 1;
2517 2535
2518 am_transparent = am_pixmap_trans = 1; 2536 am_transparent = am_pixmap_trans = 1;
2519 } 2537 }
2520 } 2538 }
2521 2539
2522 if (am_pixmap_trans) 2540 if (am_pixmap_trans)
2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2541 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2524 else 2542 else
2525 { 2543 {
2526 unsigned int n; 2544 unsigned int n;
2527 /* 2545 /*
2528 * InheritPixmap transparency 2546 * InheritPixmap transparency
2529 */ 2547 */
2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2548 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2531 { 2549 {
2532 oldp = TermWin.parent[i]; 2550 oldp = parent[i];
2533 XQueryTree (disp, TermWin.parent[i - 1], &root, 2551 XQueryTree (disp, parent[i - 1], &root,
2534 &TermWin.parent[i], &list, &n); 2552 &parent[i], &list, &n);
2535 XFree (list); 2553 XFree (list);
2536 2554
2537 if (TermWin.parent[i] == display->root) 2555 if (parent[i] == display->root)
2538 { 2556 {
2539 if (oldp != None) 2557 if (oldp != None)
2540 pchanged = 1; 2558 pchanged = 1;
2541 2559
2542 break; 2560 break;
2543 } 2561 }
2544 2562
2545 if (oldp != TermWin.parent[i]) 2563 if (oldp != parent[i])
2546 pchanged = 1; 2564 pchanged = 1;
2547 } 2565 }
2548 2566
2549 n = 0; 2567 n = 0;
2550 2568
2551 if (pchanged) 2569 if (pchanged)
2552 { 2570 {
2553 for (; n < (unsigned int)i; n++) 2571 for (; n < (unsigned int)i; n++)
2554 { 2572 {
2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2573 XGetWindowAttributes (disp, parent[n], &wattr);
2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2574 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2557 { 2575 {
2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2576 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2559 break; 2577 break;
2560 } 2578 }
2561 } 2579 }
2562 } 2580 }
2563 2581
2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2582 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2565 { 2583 {
2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2584 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2585 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2568 am_transparent = 0; 2586 am_transparent = 0;
2569 /* XXX: also turn off Opt_transparent? */ 2587 /* XXX: also turn off Opt_transparent? */
2570 } 2588 }
2571 else 2589 else
2572 { 2590 {
… …
2575 * needed for fvwm2.2.2 (and before?) */ 2593 * needed for fvwm2.2.2 (and before?) */
2576 sleep (1); 2594 sleep (1);
2577#endif 2595#endif
2578 for (n = 0; n < (unsigned int)i; n++) 2596 for (n = 0; n < (unsigned int)i; n++)
2579 { 2597 {
2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2598 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2581 XClearWindow (disp, TermWin.parent[n]); 2599 XClearWindow (disp, parent[n]);
2582 } 2600 }
2583 2601
2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2602 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 am_transparent = 1; 2603 am_transparent = 1;
2586 } 2604 }
2587 2605
2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2606 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 TermWin.parent[i] = None; 2607 parent[i] = None;
2590 } 2608 }
2591 2609
2592 if (scrollBar.win) 2610 if (scrollBar.win)
2593 { 2611 {
2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2612 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2646 /* Read a text string from the input buffer */ 2664 /* Read a text string from the input buffer */
2647 unicode_t buf[UBUFSIZ]; 2665 unicode_t buf[UBUFSIZ];
2648 bool refreshnow = false; 2666 bool refreshnow = false;
2649 int nlines = 0; 2667 int nlines = 0;
2650 unicode_t *str = buf; 2668 unicode_t *str = buf;
2669 unicode_t *eol = str + min (ncol, UBUFSIZ);
2651 2670
2652 for (;;) 2671 for (;;)
2653 { 2672 {
2654 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))
2655 break; 2674 break;
2656 2675
2657 *str++ = ch; 2676 *str++ = ch;
2658 2677
2659 if (ch == C0_LF) 2678 if (ch == C0_LF || str >= eol)
2660 { 2679 {
2680 if (ch == C0_LF)
2661 nlines++; 2681 nlines++;
2682
2662 refresh_count++; 2683 refresh_count++;
2663 2684
2664 if (!(options & Opt_jumpScroll) 2685 if (!OPTION (Opt_jumpScroll)
2665 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2686 || (refresh_count >= refresh_limit * (nrow - 1)))
2666 { 2687 {
2667 refreshnow = true; 2688 refreshnow = true;
2668 ch = NOCHAR; 2689 ch = NOCHAR;
2669 break; 2690 break;
2670 } 2691 }
2671 2692
2672 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2693 // scr_add_lines only works for nlines <= nrow - 1.
2673 if (nlines >= TermWin.nrow - 1) 2694 if (nlines >= nrow - 1)
2674 { 2695 {
2675 scr_add_lines (buf, nlines, str - buf); 2696 scr_add_lines (buf, nlines, str - buf);
2676 nlines = 0; 2697 nlines = 0;
2677 str = buf; 2698 str = buf;
2699 eol = str + min (ncol, UBUFSIZ);
2678 } 2700 }
2679 }
2680 2701
2681 if (str >= buf + UBUFSIZ) 2702 if (str >= eol)
2682 { 2703 {
2704 if (eol >= buf + UBUFSIZ)
2705 {
2683 ch = NOCHAR; 2706 ch = NOCHAR;
2684 break; 2707 break;
2708 }
2709 else
2710 eol = min (eol + ncol, buf + UBUFSIZ);
2711 }
2712
2685 } 2713 }
2686 2714
2687 seq_begin = cmdbuf_ptr; 2715 seq_begin = cmdbuf_ptr;
2688 ch = next_char (); 2716 ch = next_char ();
2689 } 2717 }
… …
2696 * the number of pages between refreshes is refresh_limit, which 2724 * the number of pages between refreshes is refresh_limit, which
2697 * is incremented here because we must be doing flat-out scrolling. 2725 * is incremented here because we must be doing flat-out scrolling.
2698 */ 2726 */
2699 if (refreshnow) 2727 if (refreshnow)
2700 { 2728 {
2701 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2729 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2702 refresh_limit++; 2730 refresh_limit++;
2703 else 2731 else
2704 { 2732 {
2705 flag = true; 2733 flag = true;
2706 scr_refresh (refresh_type); 2734 scr_refresh (refresh_type);
… …
3348 3376
3349 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3377 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3350 arg[0] = -arg[0]; 3378 arg[0] = -arg[0];
3351 /* FALLTHROUGH */ 3379 /* FALLTHROUGH */
3352 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3380 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3353 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3381 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3354 break; 3382 break;
3355 3383
3356 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3384 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3357 tt_write ((const unsigned char *)VT100_ANS, 3385 tt_write ((const unsigned char *)VT100_ANS,
3358 (unsigned int) (sizeof (VT100_ANS) - 1)); 3386 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3370 break; 3398 break;
3371 case 6: /* CPR requested */ 3399 case 6: /* CPR requested */
3372 scr_report_position (); 3400 scr_report_position ();
3373 break; 3401 break;
3374 case 7: /* unofficial extension */ 3402 case 7: /* unofficial extension */
3375 if (options & Opt_insecure) 3403 if (OPTION (Opt_insecure))
3376 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3404 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3377 break; 3405 break;
3378 case 8: /* unofficial extension */ 3406 case 8: /* unofficial extension */
3379 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3407 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3380 break; 3408 break;
… …
3483 { 3511 {
3484 /* 3512 /*
3485 * commands 3513 * commands
3486 */ 3514 */
3487 case 1: /* deiconify window */ 3515 case 1: /* deiconify window */
3488 XMapWindow (disp, TermWin.parent[0]); 3516 XMapWindow (disp, parent[0]);
3489 break; 3517 break;
3490 case 2: /* iconify window */ 3518 case 2: /* iconify window */
3491 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3519 XIconifyWindow (disp, parent[0], display->screen);
3492 break; 3520 break;
3493 case 3: /* set position (pixels) */ 3521 case 3: /* set position (pixels) */
3494 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3522 XMoveWindow (disp, parent[0], args[1], args[2]);
3495 break; 3523 break;
3496 case 4: /* set size (pixels) */ 3524 case 4: /* set size (pixels) */
3497 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3525 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3498 break; 3526 break;
3499 case 5: /* raise window */ 3527 case 5: /* raise window */
3500 XRaiseWindow (disp, TermWin.parent[0]); 3528 XRaiseWindow (disp, parent[0]);
3501 break; 3529 break;
3502 case 6: /* lower window */ 3530 case 6: /* lower window */
3503 XLowerWindow (disp, TermWin.parent[0]); 3531 XLowerWindow (disp, parent[0]);
3504 break; 3532 break;
3505 case 7: /* refresh window */ 3533 case 7: /* refresh window */
3506 scr_touch (true); 3534 scr_touch (true);
3507 break; 3535 break;
3508 case 8: /* set size (chars) */ 3536 case 8: /* set size (chars) */
3509 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3537 set_widthheight ((unsigned int) (args[2] * fwidth),
3510 (unsigned int) (args[1] * TermWin.fheight)); 3538 (unsigned int) (args[1] * fheight));
3511 break; 3539 break;
3512 3540
3513 //case 9: NYI, TODO, restore maximized window or maximize window 3541 //case 9: NYI, TODO, restore maximized window or maximize window
3514 default: 3542 default:
3515 if (args[0] >= 24) /* set height (chars) */ 3543 if (args[0] >= 24) /* set height (chars) */
3516 set_widthheight ((unsigned int)TermWin.width, 3544 set_widthheight ((unsigned int)width,
3517 (unsigned int) (args[1] * TermWin.fheight)); 3545 (unsigned int) (args[1] * fheight));
3518 break; 3546 break;
3519 3547
3520 3548
3521 /* 3549 /*
3522 * reports - some output format copied from XTerm 3550 * reports - some output format copied from XTerm
3523 */ 3551 */
3524 case 11: /* report window state */ 3552 case 11: /* report window state */
3525 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3553 XGetWindowAttributes (disp, parent[0], &wattr);
3526 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3554 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3527 break; 3555 break;
3528 case 13: /* report window position */ 3556 case 13: /* report window position */
3529 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3557 XGetWindowAttributes (disp, parent[0], &wattr);
3530 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3558 XTranslateCoordinates (disp, parent[0], wattr.root,
3531 -wattr.border_width, -wattr.border_width, 3559 -wattr.border_width, -wattr.border_width,
3532 &x, &y, &wdummy); 3560 &x, &y, &wdummy);
3533 tt_printf ("\033[3;%d;%dt", x, y); 3561 tt_printf ("\033[3;%d;%dt", x, y);
3534 break; 3562 break;
3535 case 14: /* report window size (pixels) */ 3563 case 14: /* report window size (pixels) */
3536 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3564 XGetWindowAttributes (disp, parent[0], &wattr);
3537 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3565 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3538 break; 3566 break;
3539 case 18: /* report text area size (chars) */ 3567 case 18: /* report text area size (chars) */
3540 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3568 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3541 break; 3569 break;
3542 case 19: /* report window size (chars) */ 3570 case 19: /* report window size (chars) */
3543 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3571 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3544 break; 3572 break;
3545 case 20: /* report icon label */ 3573 case 20: /* report icon label */
3546 { 3574 {
3547 char *s; 3575 char *s;
3548 XGetIconName (disp, TermWin.parent[0], &s); 3576 XGetIconName (disp, parent[0], &s);
3549 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 */
3550 XFree (s); 3578 XFree (s);
3551 } 3579 }
3552 break; 3580 break;
3553 case 21: /* report window title */ 3581 case 21: /* report window title */
3554 { 3582 {
3555 char *s; 3583 char *s;
3556 XFetchName (disp, TermWin.parent[0], &s); 3584 XFetchName (disp, parent[0], &s);
3557 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 */
3558 XFree (s); 3586 XFree (s);
3559 } 3587 }
3560 break; 3588 break;
3561 } 3589 }
3562} 3590}
… …
3707 unsigned long bytes_after; 3735 unsigned long bytes_after;
3708 unsigned char *value = 0; 3736 unsigned char *value = 0;
3709 const char *str = ""; 3737 const char *str = "";
3710 3738
3711 if (prop 3739 if (prop
3712 && XGetWindowProperty (disp, TermWin.parent[0], 3740 && XGetWindowProperty (disp, parent[0],
3713 prop, 0, 1<<16, 0, AnyPropertyType, 3741 prop, 0, 1<<16, 0, AnyPropertyType,
3714 &actual_type, &actual_format, 3742 &actual_type, &actual_format,
3715 &nitems, &bytes_after, &value) == Success 3743 &nitems, &bytes_after, &value) == Success
3716 && actual_type != None 3744 && actual_type != None
3717 && actual_format == 8) 3745 && actual_format == 8)
… …
3729 { 3757 {
3730 *eq = 0; 3758 *eq = 0;
3731 set_utf8_property (display->atom (str), eq + 1); 3759 set_utf8_property (display->atom (str), eq + 1);
3732 } 3760 }
3733 else 3761 else
3734 XDeleteProperty (disp, TermWin.parent[0], 3762 XDeleteProperty (disp, parent[0],
3735 display->atom (str)); 3763 display->atom (str));
3736 } 3764 }
3737 break; 3765 break;
3738 3766
3739 case XTerm_Color: 3767 case XTerm_Color:
… …
3838 // TODO, when secure mode? 3866 // TODO, when secure mode?
3839 break; 3867 break;
3840 3868
3841#ifdef MENUBAR 3869#ifdef MENUBAR
3842 case URxvt_Menu: 3870 case URxvt_Menu:
3843 if (options & Opt_insecure) 3871 if (OPTION (Opt_insecure))
3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3872 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3845 break; 3873 break;
3846#endif 3874#endif
3847#if 0 3875#if 0
3848 case XTerm_dumpscreen: /* no error notices */ 3876 case XTerm_dumpscreen: /* no error notices */
… …
3864 case URxvt_italicFont: 3892 case URxvt_italicFont:
3865 case URxvt_boldItalicFont: 3893 case URxvt_boldItalicFont:
3866#endif 3894#endif
3867 if (query) 3895 if (query)
3868 tt_printf ("\33]%d;%-.250s%c", saveop, 3896 tt_printf ("\33]%d;%-.250s%c", saveop,
3869 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3897 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3870 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3898 ? fontset[op - URxvt_font]->fontdesc : "",
3871 resp); 3899 resp);
3872 else 3900 else
3873 { 3901 {
3874 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3902 const char *&res = rs[Rs_font + (op - URxvt_font)];
3875 3903
… …
3880 break; 3908 break;
3881 3909
3882#if ENABLE_FRILLS 3910#if ENABLE_FRILLS
3883 case URxvt_locale: 3911 case URxvt_locale:
3884 if (query) 3912 if (query)
3885 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3913 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3886 else 3914 else
3887 { 3915 {
3888 set_locale (str); 3916 set_locale (str);
3889 pty.set_utf8_mode (enc_utf8); 3917 pty.set_utf8_mode (enc_utf8);
3890 init_xlocale (); 3918 init_xlocale ();
… …
4018 } 4046 }
4019 4047
4020 /* extra handling for values with state unkept */ 4048 /* extra handling for values with state unkept */
4021 switch (arg[i]) 4049 switch (arg[i])
4022 { 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
4023 case 1048: /* alternative cursor save */ 4058 case 1048: /* alternative cursor save */
4024 case 1049: 4059 case 1049:
4025 if (options & Opt_secondaryScreen) 4060 if (OPTION (Opt_secondaryScreen))
4026 if (mode == 0) 4061 if (mode == 0)
4027 scr_cursor (RESTORE); 4062 scr_cursor (RESTORE);
4028 else if (mode == 1) 4063 else if (mode == 1)
4029 scr_cursor (SAVE); 4064 scr_cursor (SAVE);
4030 break; 4065 break;
… …
4042 */ 4077 */
4043 PrivMode (1, PrivMode_vt52); 4078 PrivMode (1, PrivMode_vt52);
4044 break; 4079 break;
4045 case 3: /* 80/132 */ 4080 case 3: /* 80/132 */
4046 if (priv_modes & PrivMode_132OK) 4081 if (priv_modes & PrivMode_132OK)
4047 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4082 set_widthheight (((state ? 132 : 80) * fwidth), height);
4048 break; 4083 break;
4049 case 4: /* smooth scrolling */ 4084 case 4: /* smooth scrolling */
4050 if (state) 4085 if (!state)
4051 options &= ~Opt_jumpScroll; 4086 SET_OPTION (Opt_jumpScroll);
4052 else 4087 else
4053 options |= Opt_jumpScroll; 4088 CLR_OPTION (Opt_jumpScroll);
4054 break; 4089 break;
4055 case 5: /* reverse video */ 4090 case 5: /* reverse video */
4056 scr_rvideo_mode (state); 4091 scr_rvideo_mode (state);
4057 break; 4092 break;
4058 case 6: /* relative/absolute origins */ 4093 case 6: /* relative/absolute origins */
… …
4099#if 0 4134#if 0
4100 case 1001: 4135 case 1001:
4101 break; /* X11 mouse highlighting */ 4136 break; /* X11 mouse highlighting */
4102#endif 4137#endif
4103 case 1010: /* scroll to bottom on TTY output inhibit */ 4138 case 1010: /* scroll to bottom on TTY output inhibit */
4104 if (state) 4139 if (!state)
4105 options &= ~Opt_scrollTtyOutput; 4140 SET_OPTION (Opt_scrollTtyOutput);
4106 else 4141 else
4107 options |= Opt_scrollTtyOutput; 4142 CLR_OPTION (Opt_scrollTtyOutput);
4108 break; 4143 break;
4109 case 1011: /* scroll to bottom on key press */ 4144 case 1011: /* scroll to bottom on key press */
4110 if (state) 4145 if (state)
4111 options |= Opt_scrollTtyKeypress; 4146 SET_OPTION (Opt_scrollTtyKeypress);
4112 else 4147 else
4113 options &= ~Opt_scrollTtyKeypress; 4148 CLR_OPTION (Opt_scrollTtyKeypress);
4114 break; 4149 break;
4115 case 1047: /* secondary screen w/ clearing last */ 4150 case 1047: /* secondary screen w/ clearing last */
4116 if (options & Opt_secondaryScreen) 4151 if (OPTION (Opt_secondaryScreen))
4117 if (current_screen != PRIMARY) 4152 if (current_screen != PRIMARY)
4118 scr_erase_screen (2); 4153 scr_erase_screen (2);
4119 scr_change_screen (state); 4154 scr_change_screen (state);
4120 break; 4155 break;
4121 case 1049: /* secondary screen w/ clearing first */ 4156 case 1049: /* secondary screen w/ clearing first */
4122 scr_change_screen (state); 4157 scr_change_screen (state);
4123 if (options & Opt_secondaryScreen) 4158 if (OPTION (Opt_secondaryScreen))
4124 if (current_screen != PRIMARY) 4159 if (current_screen != PRIMARY)
4125 scr_erase_screen (2); 4160 scr_erase_screen (2);
4126 break; 4161 break;
4127 default: 4162 default:
4128 break; 4163 break;
… …
4278 case 106: 4313 case 106:
4279 case 107: 4314 case 107:
4280 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4315 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4281 break; 4316 break;
4282#endif 4317#endif
4283
4284 } 4318 }
4285 } 4319 }
4286} 4320}
4287/*}}} */ 4321/*}}} */
4288 4322
… …
4369 } 4403 }
4370 4404
4371 memmove (v_buffer, v_buffer + written, v_buflen); 4405 memmove (v_buffer, v_buffer + written, v_buflen);
4372 } 4406 }
4373 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4407 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4374 // original code just ignores this... 4408 pty_ev.set (EVENT_READ);
4375 destroy ();
4376} 4409}
4377 4410
4378/*----------------------- end-of-file (C source) -----------------------*/ 4411/*----------------------- end-of-file (C source) -----------------------*/
4379 4412

Diff Legend

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