… | |
… | |
54 | # include "keyboard.h" |
54 | # include "keyboard.h" |
55 | #endif |
55 | #endif |
56 | |
56 | |
57 | #include <csignal> |
57 | #include <csignal> |
58 | |
58 | |
|
|
59 | #define HAVE_SCHED_YIELD 1 //D//TODO//FIXME |
|
|
60 | #if HAVE_SCHED_YIELD |
|
|
61 | # include <sched.h> |
|
|
62 | #endif |
|
|
63 | |
59 | /*----------------------------------------------------------------------*/ |
64 | /*----------------------------------------------------------------------*/ |
60 | |
65 | |
61 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
66 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
62 | |
67 | |
63 | // exception thrown when the command parser runs out of input data |
68 | // exception thrown when the command parser runs out of input data |
… | |
… | |
135 | rxvt_term::iso14755_54 (int x, int y) |
140 | rxvt_term::iso14755_54 (int x, int y) |
136 | { |
141 | { |
137 | x = Pixel2Col (x); |
142 | x = Pixel2Col (x); |
138 | y = Pixel2Row (y); |
143 | y = Pixel2Row (y); |
139 | |
144 | |
140 | if (x < 0 || x >= TermWin.ncol |
145 | if (!IN_RANGE_EXC (x, 0, ncol) |
141 | || y < 0 || y >= TermWin.nrow) |
146 | || !IN_RANGE_EXC (y, 0, nrow)) |
142 | return; |
147 | return; |
143 | |
148 | |
144 | for (;;) |
149 | for (;;) |
145 | { |
150 | { |
146 | text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; |
151 | const line_t &l = ROW(y - view_start); |
|
|
152 | |
|
|
153 | text_t t = l.t[x]; |
147 | |
154 | |
148 | if (t != NOCHAR || !x) |
155 | if (t != NOCHAR || !x) |
149 | { |
156 | { |
150 | iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], |
157 | iso14755_51 (l.t[x], l.r[x], x, y); |
151 | screen.rend[y + TermWin.saveLines - TermWin.view_start][x]); |
|
|
152 | iso14755buf = ISO_14755_54; |
158 | iso14755buf = ISO_14755_54; |
153 | break; |
159 | break; |
154 | } |
160 | } |
155 | |
161 | |
156 | x--; |
162 | x--; |
157 | } |
163 | } |
158 | |
|
|
159 | } |
164 | } |
160 | #endif |
|
|
161 | |
165 | |
162 | #if ENABLE_OVERLAY |
|
|
163 | void |
166 | void |
164 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r) |
167 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) |
165 | { |
168 | { |
166 | rxvt_fontset *fs = FONTSET (r); |
169 | rxvt_fontset *fs = FONTSET (r); |
167 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
170 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
168 | wchar_t *chr, *alloc, ch2, *fname; |
171 | wchar_t *chr, *alloc, ch2, *fname; |
169 | int len; |
172 | int len; |
170 | |
173 | |
171 | fname = rxvt_utf8towcs (f->name); |
174 | fname = rxvt_utf8towcs (f->name); |
172 | |
175 | |
173 | #if ENABLE_COMBINING |
176 | # if ENABLE_COMBINING |
174 | if (IS_COMPOSE (ch)) |
177 | if (IS_COMPOSE (ch)) |
175 | { |
178 | { |
176 | len = rxvt_composite.expand (ch, 0); |
179 | len = rxvt_composite.expand (ch, 0); |
177 | alloc = chr = new wchar_t[len]; |
180 | alloc = chr = new wchar_t[len]; |
178 | rxvt_composite.expand (ch, chr); |
181 | rxvt_composite.expand (ch, chr); |
179 | } |
182 | } |
180 | else |
183 | else |
181 | #endif |
184 | # endif |
182 | { |
185 | { |
183 | ch2 = ch; |
186 | ch2 = ch; |
184 | |
187 | |
185 | alloc = 0; |
188 | alloc = 0; |
186 | chr = &ch2; |
189 | chr = &ch2; |
187 | len = 1; |
190 | len = 1; |
188 | } |
191 | } |
189 | |
192 | |
|
|
193 | char attr[80]; // plenty |
|
|
194 | |
|
|
195 | sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", |
|
|
196 | (int)r, |
|
|
197 | fgcolor_of (r), bgcolor_of (r), |
|
|
198 | r & RS_Bold ? " bold" : "", |
|
|
199 | r & RS_Italic ? " italic" : "", |
|
|
200 | r & RS_Blink ? " blink" : "", |
|
|
201 | r & RS_RVid ? " rvid" : "", |
|
|
202 | r & RS_Uline ? " uline" : "", |
|
|
203 | r & RS_Careful ? " careful" : ""); |
|
|
204 | |
190 | int width = wcswidth (fname, wcslen (fname)); |
205 | int width = wcswidth (fname, wcslen (fname)); |
191 | |
206 | |
192 | scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); |
207 | max_it (width, 8+5); // for char + hey |
|
|
208 | max_it (width, strlen (attr)); |
|
|
209 | |
|
|
210 | if (y >= 0) |
|
|
211 | { |
|
|
212 | y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; |
|
|
213 | x = 0; |
|
|
214 | } |
|
|
215 | |
|
|
216 | scr_overlay_new (x, y, width, len + 2); |
193 | |
217 | |
194 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
218 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
195 | |
219 | |
196 | for (int y = 0; y < len; y++) |
220 | for (int y = 0; y < len; y++) |
197 | { |
221 | { |
… | |
… | |
200 | ch = *chr++; |
224 | ch = *chr++; |
201 | |
225 | |
202 | sprintf (buf, "%8x", ch); |
226 | sprintf (buf, "%8x", ch); |
203 | scr_overlay_set (0, y, buf); |
227 | scr_overlay_set (0, y, buf); |
204 | scr_overlay_set (9, y, '='); |
228 | scr_overlay_set (9, y, '='); |
205 | #if !UNICODE3 |
229 | # if !UNICODE3 |
206 | if (ch >= 0x10000) |
230 | if (ch >= 0x10000) |
207 | ch = 0xfffd; |
231 | ch = 0xfffd; |
208 | #endif |
232 | # endif |
209 | scr_overlay_set (11, y, ch, r); |
233 | scr_overlay_set (11, y, ch, r); |
210 | scr_overlay_set (12, y, NOCHAR, r); |
234 | scr_overlay_set (12, y, NOCHAR, r); |
211 | } |
235 | } |
212 | |
236 | |
|
|
237 | scr_overlay_set (0, len , attr); |
213 | scr_overlay_set (0, len, fname); |
238 | scr_overlay_set (0, len + 1, fname); |
214 | |
239 | |
215 | free (fname); |
240 | free (fname); |
216 | |
241 | |
217 | #if ENABLE_COMBINING |
242 | # if ENABLE_COMBINING |
218 | if (alloc) |
243 | if (alloc) |
219 | delete [] alloc; |
244 | delete [] alloc; |
220 | #endif |
245 | # endif |
221 | } |
246 | } |
222 | #endif |
247 | #endif |
223 | |
248 | |
224 | void |
249 | void |
225 | rxvt_term::commit_iso14755 () |
250 | rxvt_term::commit_iso14755 () |
… | |
… | |
366 | #ifdef KEYSYM_RESOURCE |
391 | #ifdef KEYSYM_RESOURCE |
367 | if (keyboard->dispatch (this, keysym, ev.state)) |
392 | if (keyboard->dispatch (this, keysym, ev.state)) |
368 | return; |
393 | return; |
369 | #endif |
394 | #endif |
370 | |
395 | |
371 | if (TermWin.saveLines) |
396 | if (saveLines) |
372 | { |
397 | { |
373 | #ifdef UNSHIFTED_SCROLLKEYS |
398 | #ifdef UNSHIFTED_SCROLLKEYS |
374 | if (!ctrl && !meta) |
399 | if (!ctrl && !meta) |
375 | #else |
400 | #else |
376 | if (IS_SCROLL_MOD) |
401 | if (IS_SCROLL_MOD) |
377 | #endif |
402 | #endif |
378 | { |
403 | { |
379 | int lnsppg; |
404 | int lnsppg; |
380 | |
405 | |
381 | #ifdef PAGING_CONTEXT_LINES |
406 | #ifdef PAGING_CONTEXT_LINES |
382 | lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; |
407 | lnsppg = nrow - PAGING_CONTEXT_LINES; |
383 | #else |
408 | #else |
384 | lnsppg = TermWin.nrow * 4 / 5; |
409 | lnsppg = nrow * 4 / 5; |
385 | #endif |
410 | #endif |
386 | if (keysym == XK_Prior) |
411 | if (keysym == XK_Prior) |
387 | { |
412 | { |
388 | scr_page (UP, lnsppg); |
413 | scr_page (UP, lnsppg); |
389 | return; |
414 | return; |
… | |
… | |
844 | } |
869 | } |
845 | |
870 | |
846 | if (len <= 0) |
871 | if (len <= 0) |
847 | return; /* not mapped */ |
872 | return; /* not mapped */ |
848 | |
873 | |
849 | if (options & Opt_scrollTtyKeypress) |
874 | if (OPTION (Opt_scrollTtyKeypress)) |
850 | if (TermWin.view_start) |
875 | if (view_start) |
851 | { |
876 | { |
852 | TermWin.view_start = 0; |
877 | view_start = 0; |
853 | want_refresh = 1; |
878 | want_refresh = 1; |
854 | } |
879 | } |
855 | |
880 | |
856 | /* |
881 | /* |
857 | * these modifications only affect the static keybuffer |
882 | * these modifications only affect the static keybuffer |
… | |
… | |
1034 | { |
1059 | { |
1035 | if (mouse_slip_wheel_speed == 0 |
1060 | if (mouse_slip_wheel_speed == 0 |
1036 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1061 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1037 | : scr_page (UP, mouse_slip_wheel_speed)) |
1062 | : scr_page (UP, mouse_slip_wheel_speed)) |
1038 | { |
1063 | { |
1039 | if (TermWin.view_start == TermWin.nscrolled || |
1064 | if (view_start == nsaved || |
1040 | TermWin.view_start == 0) |
1065 | view_start == 0) |
1041 | mouse_slip_wheel_speed = 0; |
1066 | mouse_slip_wheel_speed = 0; |
1042 | |
1067 | |
1043 | refresh_type |= SMOOTH_REFRESH; |
1068 | refresh_type |= SMOOTH_REFRESH; |
1044 | want_refresh = 1; |
1069 | want_refresh = 1; |
1045 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1070 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
… | |
… | |
1060 | |
1085 | |
1061 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1086 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1062 | cmdbuf_ptr = cmdbuf_base; |
1087 | cmdbuf_ptr = cmdbuf_base; |
1063 | cmdbuf_endp = cmdbuf_ptr + n; |
1088 | cmdbuf_endp = cmdbuf_ptr + n; |
1064 | |
1089 | |
1065 | n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1090 | ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1066 | |
1091 | |
1067 | if (n > 0) |
1092 | if (r > 0) |
1068 | { |
1093 | { |
1069 | cmdbuf_endp += n; |
1094 | cmdbuf_endp += r; |
1070 | return true; |
1095 | return true; |
1071 | } |
1096 | } |
1072 | else if (n < 0 && errno != EAGAIN) |
1097 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
|
|
1098 | { |
|
|
1099 | #if HAVE_SCHED_YIELD |
|
|
1100 | sched_yield (); |
|
|
1101 | #endif |
|
|
1102 | } |
|
|
1103 | else |
|
|
1104 | { |
|
|
1105 | pty_ev.stop (); |
|
|
1106 | |
|
|
1107 | if (!OPTION (Opt_hold)) |
1073 | destroy (); |
1108 | destroy (); |
|
|
1109 | } |
1074 | |
1110 | |
1075 | return false; |
1111 | return false; |
1076 | } |
1112 | } |
1077 | |
1113 | |
1078 | void |
1114 | void |
… | |
… | |
1092 | } |
1128 | } |
1093 | |
1129 | |
1094 | void |
1130 | void |
1095 | rxvt_term::pointer_unblank () |
1131 | rxvt_term::pointer_unblank () |
1096 | { |
1132 | { |
1097 | XDefineCursor (display->display, TermWin.vt, TermWin_cursor); |
1133 | XDefineCursor (display->display, vt, TermWin_cursor); |
1098 | recolour_cursor (); |
1134 | recolour_cursor (); |
1099 | |
1135 | |
1100 | #ifdef POINTER_BLANK |
1136 | #ifdef POINTER_BLANK |
1101 | hidden_pointer = 0; |
1137 | hidden_pointer = 0; |
1102 | |
1138 | |
1103 | if (options & Opt_pointerBlank) |
1139 | if (OPTION (Opt_pointerBlank)) |
1104 | pointer_ev.start (NOW + pointerBlankDelay); |
1140 | pointer_ev.start (NOW + pointerBlankDelay); |
1105 | #endif |
1141 | #endif |
1106 | } |
1142 | } |
1107 | |
1143 | |
1108 | #ifdef POINTER_BLANK |
1144 | #ifdef POINTER_BLANK |
1109 | void |
1145 | void |
1110 | rxvt_term::pointer_blank () |
1146 | rxvt_term::pointer_blank () |
1111 | { |
1147 | { |
1112 | if (! (options & Opt_pointerBlank)) |
1148 | if (! OPTION (Opt_pointerBlank)) |
1113 | return; |
1149 | return; |
1114 | |
1150 | |
1115 | XDefineCursor (display->display, TermWin.vt, display->blank_cursor); |
1151 | XDefineCursor (display->display, vt, display->blank_cursor); |
1116 | XFlush (display->display); |
1152 | XFlush (display->display); |
1117 | |
1153 | |
1118 | hidden_pointer = 1; |
1154 | hidden_pointer = 1; |
1119 | } |
1155 | } |
1120 | |
1156 | |
… | |
… | |
1215 | |
1251 | |
1216 | SET_R (this); |
1252 | SET_R (this); |
1217 | SET_LOCALE (locale); |
1253 | SET_LOCALE (locale); |
1218 | |
1254 | |
1219 | #if defined(CURSOR_BLINK) |
1255 | #if defined(CURSOR_BLINK) |
1220 | if ((options & Opt_cursorBlink) && ev.type == KeyPress) |
1256 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
1221 | { |
1257 | { |
1222 | if (hidden_cursor) |
1258 | if (hidden_cursor) |
1223 | { |
1259 | { |
1224 | hidden_cursor = 0; |
1260 | hidden_cursor = 0; |
1225 | want_refresh = 1; |
1261 | want_refresh = 1; |
… | |
… | |
1228 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1264 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1229 | } |
1265 | } |
1230 | #endif |
1266 | #endif |
1231 | |
1267 | |
1232 | #if defined(POINTER_BLANK) |
1268 | #if defined(POINTER_BLANK) |
1233 | if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) |
1269 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
1234 | { |
1270 | { |
1235 | if (ev.type == MotionNotify |
1271 | if (ev.type == MotionNotify |
1236 | || ev.type == ButtonPress |
1272 | || ev.type == ButtonPress |
1237 | || ev.type == ButtonRelease) |
1273 | || ev.type == ButtonRelease) |
1238 | if (hidden_pointer) |
1274 | if (hidden_pointer) |
… | |
… | |
1422 | case FocusOut: |
1458 | case FocusOut: |
1423 | focus_out (); |
1459 | focus_out (); |
1424 | break; |
1460 | break; |
1425 | |
1461 | |
1426 | case ConfigureNotify: |
1462 | case ConfigureNotify: |
1427 | if (ev.xconfigure.window == TermWin.parent[0]) |
1463 | if (ev.xconfigure.window == parent[0]) |
1428 | { |
1464 | { |
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)); |
1465 | while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) |
|
|
1466 | ; |
1438 | |
1467 | |
1439 | if (szHint.width != width || szHint.height != height) |
1468 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1440 | { |
1469 | { |
1441 | seen_resize = 1; |
1470 | seen_resize = 1; |
1442 | resize_all_windows (width, height, 1); |
1471 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1443 | } |
1472 | } |
1444 | |
1473 | |
1445 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1474 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1446 | if (options & Opt_transparent) |
1475 | if (OPTION (Opt_transparent)) |
1447 | check_our_parents (); |
1476 | check_our_parents (); |
1448 | #endif |
1477 | #endif |
1449 | } |
1478 | } |
1450 | break; |
1479 | break; |
1451 | |
1480 | |
… | |
… | |
1468 | case SelectionRequest: |
1497 | case SelectionRequest: |
1469 | selection_send (ev.xselectionrequest); |
1498 | selection_send (ev.xselectionrequest); |
1470 | break; |
1499 | break; |
1471 | |
1500 | |
1472 | case UnmapNotify: |
1501 | case UnmapNotify: |
1473 | TermWin.mapped = 0; |
1502 | mapped = 0; |
1474 | #ifdef TEXT_BLINK |
1503 | #ifdef TEXT_BLINK |
1475 | text_blink_ev.stop (); |
1504 | text_blink_ev.stop (); |
1476 | #endif |
1505 | #endif |
1477 | break; |
1506 | break; |
1478 | |
1507 | |
1479 | case MapNotify: |
1508 | case MapNotify: |
1480 | TermWin.mapped = 1; |
1509 | mapped = 1; |
1481 | #ifdef TEXT_BLINK |
1510 | #ifdef TEXT_BLINK |
1482 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
1511 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
1483 | #endif |
1512 | #endif |
1484 | break; |
1513 | break; |
1485 | |
1514 | |
… | |
… | |
1489 | break; |
1518 | break; |
1490 | #endif /* TRANSPARENT */ |
1519 | #endif /* TRANSPARENT */ |
1491 | |
1520 | |
1492 | case GraphicsExpose: |
1521 | case GraphicsExpose: |
1493 | case Expose: |
1522 | case Expose: |
1494 | if (ev.xany.window == TermWin.vt) |
1523 | if (ev.xany.window == vt) |
1495 | { |
1524 | { |
1496 | do |
1525 | do |
1497 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1526 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1498 | ev.xexpose.width, ev.xexpose.height, False); |
1527 | ev.xexpose.width, ev.xexpose.height, False); |
1499 | while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); |
1528 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); |
1500 | |
1529 | |
1501 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1530 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1502 | |
1531 | |
1503 | while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) |
1532 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1504 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1533 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1505 | ev.xexpose.width, ev.xexpose.height, False); |
1534 | ev.xexpose.width, ev.xexpose.height, False); |
1506 | |
1535 | |
1507 | scr_refresh (refresh_type); |
1536 | scr_refresh (refresh_type); |
1508 | } |
1537 | } |
… | |
… | |
1524 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
1553 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
1525 | menubar_expose (); |
1554 | menubar_expose (); |
1526 | #endif |
1555 | #endif |
1527 | |
1556 | |
1528 | #ifdef TRANSPARENT |
1557 | #ifdef TRANSPARENT |
1529 | if (am_transparent && ev.xany.window == TermWin.parent[0]) |
1558 | if (am_transparent && ev.xany.window == parent[0]) |
1530 | XClearWindow (disp, ev.xany.window); |
1559 | XClearWindow (disp, ev.xany.window); |
1531 | #endif |
1560 | #endif |
1532 | } |
1561 | } |
1533 | break; |
1562 | break; |
1534 | |
1563 | |
… | |
… | |
1545 | } |
1574 | } |
1546 | #endif |
1575 | #endif |
1547 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1576 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1548 | break; |
1577 | break; |
1549 | |
1578 | |
1550 | if (ev.xany.window == TermWin.vt) |
1579 | if (ev.xany.window == vt) |
1551 | { |
1580 | { |
1552 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1581 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1553 | { |
1582 | { |
1554 | while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) |
1583 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1555 | ; |
1584 | ; |
1556 | |
1585 | |
1557 | XQueryPointer (disp, TermWin.vt, |
1586 | XQueryPointer (disp, vt, |
1558 | &unused_root, &unused_child, |
1587 | &unused_root, &unused_child, |
1559 | &unused_root_x, &unused_root_y, |
1588 | &unused_root_x, &unused_root_y, |
1560 | &ev.xbutton.x, &ev.xbutton.y, |
1589 | &ev.xbutton.x, &ev.xbutton.y, |
1561 | &ev.xbutton.state); |
1590 | &ev.xbutton.state); |
1562 | #ifdef MOUSE_THRESHOLD |
1591 | #ifdef MOUSE_THRESHOLD |
… | |
… | |
1574 | #endif |
1603 | #endif |
1575 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1604 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1576 | ev.xbutton.state & Button3Mask ? 2 : 0); |
1605 | ev.xbutton.state & Button3Mask ? 2 : 0); |
1577 | |
1606 | |
1578 | #ifdef SELECTION_SCROLLING |
1607 | #ifdef SELECTION_SCROLLING |
1579 | if (ev.xbutton.y < TermWin.int_bwidth |
1608 | if (ev.xbutton.y < int_bwidth |
1580 | || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) |
1609 | || Pixel2Row (ev.xbutton.y) > (nrow-1)) |
1581 | { |
1610 | { |
1582 | int dist; |
1611 | int dist; |
1583 | |
1612 | |
1584 | /* don't clobber the current delay if we are |
1613 | /* don't clobber the current delay if we are |
1585 | * already in the middle of scrolling. |
1614 | * already in the middle of scrolling. |
… | |
… | |
1593 | selection_save_x = ev.xbutton.x; |
1622 | selection_save_x = ev.xbutton.x; |
1594 | selection_save_y = ev.xbutton.y; |
1623 | selection_save_y = ev.xbutton.y; |
1595 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1624 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1596 | |
1625 | |
1597 | /* calc number of lines to scroll */ |
1626 | /* calc number of lines to scroll */ |
1598 | if (ev.xbutton.y < TermWin.int_bwidth) |
1627 | if (ev.xbutton.y < int_bwidth) |
1599 | { |
1628 | { |
1600 | scroll_selection_dir = UP; |
1629 | scroll_selection_dir = UP; |
1601 | dist = TermWin.int_bwidth - ev.xbutton.y; |
1630 | dist = int_bwidth - ev.xbutton.y; |
1602 | } |
1631 | } |
1603 | else |
1632 | else |
1604 | { |
1633 | { |
1605 | scroll_selection_dir = DN; |
1634 | scroll_selection_dir = DN; |
1606 | dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); |
1635 | dist = ev.xbutton.y - (int_bwidth + height); |
1607 | } |
1636 | } |
1608 | |
1637 | |
1609 | scroll_selection_lines = Pixel2Height (dist) |
1638 | scroll_selection_lines = Pixel2Height (dist) |
1610 | / SELECTION_SCROLL_LINE_SPEEDUP |
1639 | / SELECTION_SCROLL_LINE_SPEEDUP |
1611 | + 1; |
1640 | + 1; |
1612 | MIN_IT (scroll_selection_lines, |
1641 | min_it (scroll_selection_lines, |
1613 | SELECTION_SCROLL_MAX_LINES); |
1642 | SELECTION_SCROLL_MAX_LINES); |
1614 | } |
1643 | } |
1615 | else |
1644 | else |
1616 | { |
1645 | { |
1617 | /* we are within the text window, so we |
1646 | /* we are within the text window, so we |
… | |
… | |
1648 | } |
1677 | } |
1649 | |
1678 | |
1650 | void |
1679 | void |
1651 | rxvt_term::focus_in () |
1680 | rxvt_term::focus_in () |
1652 | { |
1681 | { |
1653 | if (!TermWin.focus) |
1682 | if (!focus) |
1654 | { |
1683 | { |
1655 | TermWin.focus = 1; |
1684 | focus = 1; |
1656 | want_refresh = 1; |
1685 | want_refresh = 1; |
1657 | #ifdef USE_XIM |
1686 | #if USE_XIM |
1658 | if (Input_Context != NULL) |
1687 | if (Input_Context != NULL) |
1659 | { |
1688 | { |
1660 | IMSetStatusPosition (); |
1689 | IMSetStatusPosition (); |
1661 | XSetICFocus (Input_Context); |
1690 | XSetICFocus (Input_Context); |
1662 | } |
1691 | } |
1663 | #endif |
1692 | #endif |
1664 | #ifdef CURSOR_BLINK |
1693 | #if CURSOR_BLINK |
1665 | if (options & Opt_cursorBlink) |
1694 | if (OPTION (Opt_cursorBlink)) |
1666 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1695 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1667 | #endif |
1696 | #endif |
1668 | #ifdef OFF_FOCUS_FADING |
1697 | #if OFF_FOCUS_FADING |
1669 | if (rs[Rs_fade]) |
1698 | if (rs[Rs_fade]) |
1670 | { |
1699 | { |
1671 | pix_colors = pix_colors_focused; |
1700 | pix_colors = pix_colors_focused; |
1672 | scr_recolour (); |
1701 | scr_recolour (); |
1673 | } |
1702 | } |
… | |
… | |
1676 | } |
1705 | } |
1677 | |
1706 | |
1678 | void |
1707 | void |
1679 | rxvt_term::focus_out () |
1708 | rxvt_term::focus_out () |
1680 | { |
1709 | { |
1681 | if (TermWin.focus) |
1710 | if (focus) |
1682 | { |
1711 | { |
1683 | TermWin.focus = 0; |
1712 | focus = 0; |
1684 | want_refresh = 1; |
1713 | want_refresh = 1; |
1685 | |
1714 | |
1686 | #if ENABLE_FRILLS || ISO_14755 |
1715 | #if ENABLE_FRILLS || ISO_14755 |
1687 | iso14755buf = 0; |
1716 | iso14755buf = 0; |
1688 | #endif |
1717 | #endif |
1689 | #if ENABLE_OVERLAY |
1718 | #if ENABLE_OVERLAY |
1690 | scr_overlay_off (); |
1719 | scr_overlay_off (); |
1691 | #endif |
1720 | #endif |
1692 | #ifdef USE_XIM |
1721 | #if USE_XIM |
1693 | if (Input_Context != NULL) |
1722 | if (Input_Context != NULL) |
1694 | XUnsetICFocus (Input_Context); |
1723 | XUnsetICFocus (Input_Context); |
1695 | #endif |
1724 | #endif |
1696 | #ifdef CURSOR_BLINK |
1725 | #if CURSOR_BLINK |
1697 | if (options & Opt_cursorBlink) |
1726 | if (OPTION (Opt_cursorBlink)) |
1698 | cursor_blink_ev.stop (); |
1727 | cursor_blink_ev.stop (); |
1699 | hidden_cursor = 0; |
1728 | hidden_cursor = 0; |
1700 | #endif |
1729 | #endif |
1701 | #ifdef OFF_FOCUS_FADING |
1730 | #if OFF_FOCUS_FADING |
1702 | if (rs[Rs_fade]) |
1731 | if (rs[Rs_fade]) |
1703 | { |
1732 | { |
1704 | pix_colors = pix_colors_unfocused; |
1733 | pix_colors = pix_colors_unfocused; |
1705 | scr_recolour (); |
1734 | scr_recolour (); |
1706 | } |
1735 | } |
… | |
… | |
1726 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1755 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1727 | return; |
1756 | return; |
1728 | |
1757 | |
1729 | /* FALLTHROUGH */ |
1758 | /* FALLTHROUGH */ |
1730 | case ReparentNotify: |
1759 | case ReparentNotify: |
1731 | if ((options & Opt_transparent) && check_our_parents () && am_transparent) |
1760 | if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) |
1732 | want_refresh = want_full_refresh = 1; |
1761 | want_refresh = want_full_refresh = 1; |
1733 | break; |
1762 | break; |
1734 | } |
1763 | } |
1735 | } |
1764 | } |
1736 | #endif |
1765 | #endif |
… | |
… | |
1745 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1774 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1746 | |
1775 | |
1747 | /* |
1776 | /* |
1748 | * VT window processing of button press |
1777 | * VT window processing of button press |
1749 | */ |
1778 | */ |
1750 | if (ev.window == TermWin.vt) |
1779 | if (ev.window == vt) |
1751 | { |
1780 | { |
1752 | #if ISO_14755 |
1781 | #if ISO_14755 |
1753 | // 5.4 |
1782 | // 5.4 |
1754 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1783 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1755 | { |
1784 | { |
… | |
… | |
1960 | case Button3: |
1989 | case Button3: |
1961 | if (scrollBar.style != R_SB_XTERM) |
1990 | if (scrollBar.style != R_SB_XTERM) |
1962 | { |
1991 | { |
1963 | if (scrollbar_above_slider (ev.y)) |
1992 | if (scrollbar_above_slider (ev.y)) |
1964 | # ifdef RXVT_SCROLL_FULL |
1993 | # ifdef RXVT_SCROLL_FULL |
1965 | scr_page (UP, TermWin.nrow - 1); |
1994 | scr_page (UP, nrow - 1); |
1966 | # else |
1995 | # else |
1967 | scr_page (UP, TermWin.nrow / 4); |
1996 | scr_page (UP, nrow / 4); |
1968 | # endif |
1997 | # endif |
1969 | else if (scrollbar_below_slider (ev.y)) |
1998 | else if (scrollbar_below_slider (ev.y)) |
1970 | # ifdef RXVT_SCROLL_FULL |
1999 | # ifdef RXVT_SCROLL_FULL |
1971 | scr_page (DN, TermWin.nrow - 1); |
2000 | scr_page (DN, nrow - 1); |
1972 | # else |
2001 | # else |
1973 | scr_page (DN, TermWin.nrow / 4); |
2002 | scr_page (DN, nrow / 4); |
1974 | # endif |
2003 | # endif |
1975 | else |
2004 | else |
1976 | scrollBar.setMotion (); |
2005 | scrollBar.setMotion (); |
1977 | } |
2006 | } |
1978 | else |
2007 | else |
1979 | { |
2008 | { |
1980 | scr_page ((ev.button == Button1 ? DN : UP), |
2009 | scr_page ((ev.button == Button1 ? DN : UP), |
1981 | (TermWin.nrow |
2010 | (nrow |
1982 | * scrollbar_position (ev.y) |
2011 | * scrollbar_position (ev.y) |
1983 | / scrollbar_size ())); |
2012 | / scrollbar_size ())); |
1984 | } |
2013 | } |
1985 | |
2014 | |
1986 | break; |
2015 | break; |
… | |
… | |
2018 | #ifdef SELECTION_SCROLLING |
2047 | #ifdef SELECTION_SCROLLING |
2019 | if (sel_scroll_ev.active) |
2048 | if (sel_scroll_ev.active) |
2020 | sel_scroll_ev.stop(); |
2049 | sel_scroll_ev.stop(); |
2021 | #endif |
2050 | #endif |
2022 | |
2051 | |
2023 | if (ev.window == TermWin.vt) |
2052 | if (ev.window == vt) |
2024 | { |
2053 | { |
2025 | #if ISO_14755 |
2054 | #if ISO_14755 |
2026 | // 5.4 |
2055 | // 5.4 |
2027 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2056 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2028 | return; |
2057 | return; |
… | |
… | |
2078 | |
2107 | |
2079 | v = ev.button == Button4 ? UP : DN; |
2108 | v = ev.button == Button4 ? UP : DN; |
2080 | |
2109 | |
2081 | if (ev.state & ShiftMask) |
2110 | if (ev.state & ShiftMask) |
2082 | i = 1; |
2111 | i = 1; |
2083 | else if (options & Opt_mouseWheelScrollPage) |
2112 | else if (OPTION (Opt_mouseWheelScrollPage)) |
2084 | i = TermWin.nrow - 1; |
2113 | i = nrow - 1; |
2085 | else |
2114 | else |
2086 | i = 5; |
2115 | i = 5; |
2087 | |
2116 | |
2088 | # ifdef MOUSE_SLIP_WHEELING |
2117 | # ifdef MOUSE_SLIP_WHEELING |
2089 | if (ev.state & ControlMask) |
2118 | if (ev.state & ControlMask) |
2090 | { |
2119 | { |
2091 | mouse_slip_wheel_speed += v ? -1 : 1; |
2120 | mouse_slip_wheel_speed += v ? -1 : 1; |
2092 | if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; |
2121 | if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; |
2093 | if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; |
2122 | if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; |
2094 | |
2123 | |
2095 | if (slip_wheel_ev.at < NOW) |
2124 | if (slip_wheel_ev.at < NOW) |
2096 | slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; |
2125 | slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; |
2097 | |
2126 | |
2098 | slip_wheel_ev.start (); |
2127 | slip_wheel_ev.start (); |
… | |
… | |
2374 | XWindowAttributes wattr, wrootattr; |
2403 | XWindowAttributes wattr, wrootattr; |
2375 | dDisp; |
2404 | dDisp; |
2376 | |
2405 | |
2377 | pchanged = 0; |
2406 | pchanged = 0; |
2378 | |
2407 | |
2379 | if (!(options & Opt_transparent)) |
2408 | if (!OPTION (Opt_transparent)) |
2380 | return pchanged; /* Don't try any more */ |
2409 | return pchanged; /* Don't try any more */ |
2381 | |
2410 | |
2382 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2411 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2383 | rootdepth = wrootattr.depth; |
2412 | rootdepth = wrootattr.depth; |
2384 | |
2413 | |
2385 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
2414 | XGetWindowAttributes (disp, parent[0], &wattr); |
2386 | |
2415 | |
2387 | if (rootdepth != wattr.depth) |
2416 | if (rootdepth != wattr.depth) |
2388 | { |
2417 | { |
2389 | if (am_transparent) |
2418 | if (am_transparent) |
2390 | { |
2419 | { |
2391 | pchanged = 1; |
2420 | pchanged = 1; |
2392 | XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); |
2421 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2393 | am_transparent = am_pixmap_trans = 0; |
2422 | am_transparent = am_pixmap_trans = 0; |
2394 | } |
2423 | } |
2395 | |
2424 | |
2396 | return pchanged; /* Don't try any more */ |
2425 | return pchanged; /* Don't try any more */ |
2397 | } |
2426 | } |
… | |
… | |
2438 | Window cr; |
2467 | Window cr; |
2439 | XImage *image; |
2468 | XImage *image; |
2440 | GC gc; |
2469 | GC gc; |
2441 | XGCValues gcvalue; |
2470 | XGCValues gcvalue; |
2442 | |
2471 | |
2443 | XTranslateCoordinates (disp, TermWin.parent[0], display->root, |
2472 | XTranslateCoordinates (disp, parent[0], display->root, |
2444 | 0, 0, &sx, &sy, &cr); |
2473 | 0, 0, &sx, &sy, &cr); |
2445 | nw = (unsigned int)szHint.width; |
2474 | nw = (unsigned int)szHint.width; |
2446 | nh = (unsigned int)szHint.height; |
2475 | nh = (unsigned int)szHint.height; |
2447 | nx = ny = 0; |
2476 | nx = ny = 0; |
2448 | |
2477 | |
… | |
… | |
2458 | nh += sy; |
2487 | nh += sy; |
2459 | ny = -sy; |
2488 | ny = -sy; |
2460 | sy = 0; |
2489 | sy = 0; |
2461 | } |
2490 | } |
2462 | |
2491 | |
2463 | MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); |
2492 | min_it (nw, (unsigned int) (wrootattr.width - sx)); |
2464 | MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); |
2493 | min_it (nh, (unsigned int) (wrootattr.height - sy)); |
2465 | |
2494 | |
2466 | XSync (disp, False); |
2495 | XSync (disp, False); |
2467 | allowedxerror = -1; |
2496 | allowedxerror = -1; |
2468 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2497 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2469 | |
2498 | |
… | |
… | |
2474 | if (image == NULL) |
2503 | if (image == NULL) |
2475 | { |
2504 | { |
2476 | if (am_transparent && am_pixmap_trans) |
2505 | if (am_transparent && am_pixmap_trans) |
2477 | { |
2506 | { |
2478 | pchanged = 1; |
2507 | pchanged = 1; |
2479 | if (TermWin.pixmap != None) |
2508 | if (pixmap != None) |
2480 | { |
2509 | { |
2481 | XFreePixmap (disp, TermWin.pixmap); |
2510 | XFreePixmap (disp, pixmap); |
2482 | TermWin.pixmap = None; |
2511 | pixmap = None; |
2483 | } |
2512 | } |
2484 | } |
2513 | } |
2485 | |
2514 | |
2486 | am_pixmap_trans = 0; |
2515 | am_pixmap_trans = 0; |
2487 | } |
2516 | } |
2488 | else |
2517 | else |
2489 | { |
2518 | { |
2490 | if (TermWin.pixmap != None) |
2519 | if (pixmap != None) |
2491 | XFreePixmap (disp, TermWin.pixmap); |
2520 | XFreePixmap (disp, pixmap); |
2492 | |
2521 | |
2493 | #if TINTING |
2522 | #if TINTING |
2494 | if (ISSET_PIXCOLOR (Color_tint)) |
2523 | if (ISSET_PIXCOLOR (Color_tint)) |
2495 | { |
2524 | { |
2496 | unsigned short rm, gm, bm; |
2525 | unsigned short rm, gm, bm; |
… | |
… | |
2500 | |
2529 | |
2501 | ShadeXImage (display, image, shade, rm, gm, bm); |
2530 | ShadeXImage (display, image, shade, rm, gm, bm); |
2502 | } |
2531 | } |
2503 | #endif |
2532 | #endif |
2504 | |
2533 | |
2505 | TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, |
2534 | pixmap = XCreatePixmap (disp, vt, |
2506 | szHint.width, szHint.height, image->depth); |
2535 | szHint.width, szHint.height, image->depth); |
2507 | gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); |
2536 | gc = XCreateGC (disp, vt, 0UL, &gcvalue); |
2508 | XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, |
2537 | XPutImage (disp, pixmap, gc, image, 0, 0, |
2509 | nx, ny, image->width, image->height); |
2538 | nx, ny, image->width, image->height); |
2510 | XFreeGC (disp, gc); |
2539 | XFreeGC (disp, gc); |
2511 | XDestroyImage (image); |
2540 | XDestroyImage (image); |
2512 | XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); |
2541 | XSetWindowBackgroundPixmap (disp, parent[0], pixmap); |
2513 | XClearWindow (disp, TermWin.parent[0]); |
2542 | XClearWindow (disp, parent[0]); |
2514 | |
2543 | |
2515 | if (!am_transparent || !am_pixmap_trans) |
2544 | if (!am_transparent || !am_pixmap_trans) |
2516 | pchanged = 1; |
2545 | pchanged = 1; |
2517 | |
2546 | |
2518 | am_transparent = am_pixmap_trans = 1; |
2547 | am_transparent = am_pixmap_trans = 1; |
2519 | } |
2548 | } |
2520 | } |
2549 | } |
2521 | |
2550 | |
2522 | if (am_pixmap_trans) |
2551 | if (am_pixmap_trans) |
2523 | XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); |
2552 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2524 | else |
2553 | else |
2525 | { |
2554 | { |
2526 | unsigned int n; |
2555 | unsigned int n; |
2527 | /* |
2556 | /* |
2528 | * InheritPixmap transparency |
2557 | * InheritPixmap transparency |
2529 | */ |
2558 | */ |
2530 | for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2559 | for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2531 | { |
2560 | { |
2532 | oldp = TermWin.parent[i]; |
2561 | oldp = parent[i]; |
2533 | XQueryTree (disp, TermWin.parent[i - 1], &root, |
2562 | XQueryTree (disp, parent[i - 1], &root, |
2534 | &TermWin.parent[i], &list, &n); |
2563 | &parent[i], &list, &n); |
2535 | XFree (list); |
2564 | XFree (list); |
2536 | |
2565 | |
2537 | if (TermWin.parent[i] == display->root) |
2566 | if (parent[i] == display->root) |
2538 | { |
2567 | { |
2539 | if (oldp != None) |
2568 | if (oldp != None) |
2540 | pchanged = 1; |
2569 | pchanged = 1; |
2541 | |
2570 | |
2542 | break; |
2571 | break; |
2543 | } |
2572 | } |
2544 | |
2573 | |
2545 | if (oldp != TermWin.parent[i]) |
2574 | if (oldp != parent[i]) |
2546 | pchanged = 1; |
2575 | pchanged = 1; |
2547 | } |
2576 | } |
2548 | |
2577 | |
2549 | n = 0; |
2578 | n = 0; |
2550 | |
2579 | |
2551 | if (pchanged) |
2580 | if (pchanged) |
2552 | { |
2581 | { |
2553 | for (; n < (unsigned int)i; n++) |
2582 | for (; n < (unsigned int)i; n++) |
2554 | { |
2583 | { |
2555 | XGetWindowAttributes (disp, TermWin.parent[n], &wattr); |
2584 | XGetWindowAttributes (disp, parent[n], &wattr); |
2556 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2585 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2557 | { |
2586 | { |
2558 | n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; |
2587 | n = (int) (sizeof (parent) / sizeof (Window)) + 1; |
2559 | break; |
2588 | break; |
2560 | } |
2589 | } |
2561 | } |
2590 | } |
2562 | } |
2591 | } |
2563 | |
2592 | |
2564 | if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) |
2593 | if (n > (int) (sizeof (parent) / sizeof (parent[0]))) |
2565 | { |
2594 | { |
2566 | XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); |
2595 | XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); |
2567 | XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); |
2596 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2568 | am_transparent = 0; |
2597 | am_transparent = 0; |
2569 | /* XXX: also turn off Opt_transparent? */ |
2598 | /* XXX: also turn off Opt_transparent? */ |
2570 | } |
2599 | } |
2571 | else |
2600 | else |
2572 | { |
2601 | { |
… | |
… | |
2575 | * needed for fvwm2.2.2 (and before?) */ |
2604 | * needed for fvwm2.2.2 (and before?) */ |
2576 | sleep (1); |
2605 | sleep (1); |
2577 | #endif |
2606 | #endif |
2578 | for (n = 0; n < (unsigned int)i; n++) |
2607 | for (n = 0; n < (unsigned int)i; n++) |
2579 | { |
2608 | { |
2580 | XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); |
2609 | XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); |
2581 | XClearWindow (disp, TermWin.parent[n]); |
2610 | XClearWindow (disp, parent[n]); |
2582 | } |
2611 | } |
2583 | |
2612 | |
2584 | XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); |
2613 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2585 | am_transparent = 1; |
2614 | am_transparent = 1; |
2586 | } |
2615 | } |
2587 | |
2616 | |
2588 | for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2617 | for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2589 | TermWin.parent[i] = None; |
2618 | parent[i] = None; |
2590 | } |
2619 | } |
2591 | |
2620 | |
2592 | if (scrollBar.win) |
2621 | if (scrollBar.win) |
2593 | { |
2622 | { |
2594 | XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); |
2623 | XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); |
… | |
… | |
2646 | /* Read a text string from the input buffer */ |
2675 | /* Read a text string from the input buffer */ |
2647 | unicode_t buf[UBUFSIZ]; |
2676 | unicode_t buf[UBUFSIZ]; |
2648 | bool refreshnow = false; |
2677 | bool refreshnow = false; |
2649 | int nlines = 0; |
2678 | int nlines = 0; |
2650 | unicode_t *str = buf; |
2679 | unicode_t *str = buf; |
|
|
2680 | unicode_t *eol = str + min (ncol, UBUFSIZ); |
2651 | |
2681 | |
2652 | for (;;) |
2682 | for (;;) |
2653 | { |
2683 | { |
2654 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2684 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2655 | break; |
2685 | break; |
2656 | |
2686 | |
2657 | *str++ = ch; |
2687 | *str++ = ch; |
2658 | |
2688 | |
2659 | if (ch == C0_LF) |
2689 | if (ch == C0_LF || str >= eol) |
2660 | { |
2690 | { |
|
|
2691 | if (ch == C0_LF) |
2661 | nlines++; |
2692 | nlines++; |
|
|
2693 | |
2662 | refresh_count++; |
2694 | refresh_count++; |
2663 | |
2695 | |
2664 | if (!(options & Opt_jumpScroll) |
2696 | if (!OPTION (Opt_jumpScroll) |
2665 | || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) |
2697 | || (refresh_count >= refresh_limit * (nrow - 1))) |
2666 | { |
2698 | { |
2667 | refreshnow = true; |
2699 | refreshnow = true; |
2668 | ch = NOCHAR; |
2700 | ch = NOCHAR; |
2669 | break; |
2701 | break; |
2670 | } |
2702 | } |
2671 | |
2703 | |
2672 | // scr_add_lines only works for nlines <= TermWin.nrow - 1. |
2704 | // scr_add_lines only works for nlines <= nrow - 1. |
2673 | if (nlines >= TermWin.nrow - 1) |
2705 | if (nlines >= nrow - 1) |
2674 | { |
2706 | { |
2675 | scr_add_lines (buf, nlines, str - buf); |
2707 | scr_add_lines (buf, nlines, str - buf); |
2676 | nlines = 0; |
2708 | nlines = 0; |
2677 | str = buf; |
2709 | str = buf; |
|
|
2710 | eol = str + min (ncol, UBUFSIZ); |
2678 | } |
2711 | } |
2679 | } |
|
|
2680 | |
2712 | |
2681 | if (str >= buf + UBUFSIZ) |
2713 | if (str >= eol) |
2682 | { |
2714 | { |
|
|
2715 | if (eol >= buf + UBUFSIZ) |
|
|
2716 | { |
2683 | ch = NOCHAR; |
2717 | ch = NOCHAR; |
2684 | break; |
2718 | break; |
|
|
2719 | } |
|
|
2720 | else |
|
|
2721 | eol = min (eol + ncol, buf + UBUFSIZ); |
|
|
2722 | } |
|
|
2723 | |
2685 | } |
2724 | } |
2686 | |
2725 | |
2687 | seq_begin = cmdbuf_ptr; |
2726 | seq_begin = cmdbuf_ptr; |
2688 | ch = next_char (); |
2727 | ch = next_char (); |
2689 | } |
2728 | } |
… | |
… | |
2696 | * the number of pages between refreshes is refresh_limit, which |
2735 | * the number of pages between refreshes is refresh_limit, which |
2697 | * is incremented here because we must be doing flat-out scrolling. |
2736 | * is incremented here because we must be doing flat-out scrolling. |
2698 | */ |
2737 | */ |
2699 | if (refreshnow) |
2738 | if (refreshnow) |
2700 | { |
2739 | { |
2701 | if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2740 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2702 | refresh_limit++; |
2741 | refresh_limit++; |
2703 | else |
2742 | else |
2704 | { |
2743 | { |
2705 | flag = true; |
2744 | flag = true; |
2706 | scr_refresh (refresh_type); |
2745 | scr_refresh (refresh_type); |
… | |
… | |
3348 | |
3387 | |
3349 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
3388 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
3350 | arg[0] = -arg[0]; |
3389 | arg[0] = -arg[0]; |
3351 | /* FALLTHROUGH */ |
3390 | /* FALLTHROUGH */ |
3352 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3391 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3353 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); |
3392 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3354 | break; |
3393 | break; |
3355 | |
3394 | |
3356 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3395 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3357 | tt_write ((const unsigned char *)VT100_ANS, |
3396 | tt_write ((const unsigned char *)VT100_ANS, |
3358 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
3397 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
… | |
… | |
3370 | break; |
3409 | break; |
3371 | case 6: /* CPR requested */ |
3410 | case 6: /* CPR requested */ |
3372 | scr_report_position (); |
3411 | scr_report_position (); |
3373 | break; |
3412 | break; |
3374 | case 7: /* unofficial extension */ |
3413 | case 7: /* unofficial extension */ |
3375 | if (options & Opt_insecure) |
3414 | if (OPTION (Opt_insecure)) |
3376 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3415 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3377 | break; |
3416 | break; |
3378 | case 8: /* unofficial extension */ |
3417 | case 8: /* unofficial extension */ |
3379 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3418 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3380 | break; |
3419 | break; |
… | |
… | |
3483 | { |
3522 | { |
3484 | /* |
3523 | /* |
3485 | * commands |
3524 | * commands |
3486 | */ |
3525 | */ |
3487 | case 1: /* deiconify window */ |
3526 | case 1: /* deiconify window */ |
3488 | XMapWindow (disp, TermWin.parent[0]); |
3527 | XMapWindow (disp, parent[0]); |
3489 | break; |
3528 | break; |
3490 | case 2: /* iconify window */ |
3529 | case 2: /* iconify window */ |
3491 | XIconifyWindow (disp, TermWin.parent[0], display->screen); |
3530 | XIconifyWindow (disp, parent[0], display->screen); |
3492 | break; |
3531 | break; |
3493 | case 3: /* set position (pixels) */ |
3532 | case 3: /* set position (pixels) */ |
3494 | XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); |
3533 | XMoveWindow (disp, parent[0], args[1], args[2]); |
3495 | break; |
3534 | break; |
3496 | case 4: /* set size (pixels) */ |
3535 | case 4: /* set size (pixels) */ |
3497 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3536 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3498 | break; |
3537 | break; |
3499 | case 5: /* raise window */ |
3538 | case 5: /* raise window */ |
3500 | XRaiseWindow (disp, TermWin.parent[0]); |
3539 | XRaiseWindow (disp, parent[0]); |
3501 | break; |
3540 | break; |
3502 | case 6: /* lower window */ |
3541 | case 6: /* lower window */ |
3503 | XLowerWindow (disp, TermWin.parent[0]); |
3542 | XLowerWindow (disp, parent[0]); |
3504 | break; |
3543 | break; |
3505 | case 7: /* refresh window */ |
3544 | case 7: /* refresh window */ |
3506 | scr_touch (true); |
3545 | scr_touch (true); |
3507 | break; |
3546 | break; |
3508 | case 8: /* set size (chars) */ |
3547 | case 8: /* set size (chars) */ |
3509 | set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), |
3548 | set_widthheight ((unsigned int) (args[2] * fwidth), |
3510 | (unsigned int) (args[1] * TermWin.fheight)); |
3549 | (unsigned int) (args[1] * fheight)); |
3511 | break; |
3550 | break; |
3512 | |
3551 | |
3513 | //case 9: NYI, TODO, restore maximized window or maximize window |
3552 | //case 9: NYI, TODO, restore maximized window or maximize window |
3514 | default: |
3553 | default: |
3515 | if (args[0] >= 24) /* set height (chars) */ |
3554 | if (args[0] >= 24) /* set height (chars) */ |
3516 | set_widthheight ((unsigned int)TermWin.width, |
3555 | set_widthheight ((unsigned int)width, |
3517 | (unsigned int) (args[1] * TermWin.fheight)); |
3556 | (unsigned int) (args[1] * fheight)); |
3518 | break; |
3557 | break; |
3519 | |
3558 | |
3520 | |
3559 | |
3521 | /* |
3560 | /* |
3522 | * reports - some output format copied from XTerm |
3561 | * reports - some output format copied from XTerm |
3523 | */ |
3562 | */ |
3524 | case 11: /* report window state */ |
3563 | case 11: /* report window state */ |
3525 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3564 | XGetWindowAttributes (disp, parent[0], &wattr); |
3526 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3565 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3527 | break; |
3566 | break; |
3528 | case 13: /* report window position */ |
3567 | case 13: /* report window position */ |
3529 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3568 | XGetWindowAttributes (disp, parent[0], &wattr); |
3530 | XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, |
3569 | XTranslateCoordinates (disp, parent[0], wattr.root, |
3531 | -wattr.border_width, -wattr.border_width, |
3570 | -wattr.border_width, -wattr.border_width, |
3532 | &x, &y, &wdummy); |
3571 | &x, &y, &wdummy); |
3533 | tt_printf ("\033[3;%d;%dt", x, y); |
3572 | tt_printf ("\033[3;%d;%dt", x, y); |
3534 | break; |
3573 | break; |
3535 | case 14: /* report window size (pixels) */ |
3574 | case 14: /* report window size (pixels) */ |
3536 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3575 | XGetWindowAttributes (disp, parent[0], &wattr); |
3537 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3576 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3538 | break; |
3577 | break; |
3539 | case 18: /* report text area size (chars) */ |
3578 | case 18: /* report text area size (chars) */ |
3540 | tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); |
3579 | tt_printf ("\033[8;%d;%dt", nrow, ncol); |
3541 | break; |
3580 | break; |
3542 | case 19: /* report window size (chars) */ |
3581 | case 19: /* report window size (chars) */ |
3543 | tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); |
3582 | tt_printf ("\033[9;%d;%dt", nrow, ncol); |
3544 | break; |
3583 | break; |
3545 | case 20: /* report icon label */ |
3584 | case 20: /* report icon label */ |
3546 | { |
3585 | { |
3547 | char *s; |
3586 | char *s; |
3548 | XGetIconName (disp, TermWin.parent[0], &s); |
3587 | XGetIconName (disp, parent[0], &s); |
3549 | tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3588 | tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3550 | XFree (s); |
3589 | XFree (s); |
3551 | } |
3590 | } |
3552 | break; |
3591 | break; |
3553 | case 21: /* report window title */ |
3592 | case 21: /* report window title */ |
3554 | { |
3593 | { |
3555 | char *s; |
3594 | char *s; |
3556 | XFetchName (disp, TermWin.parent[0], &s); |
3595 | XFetchName (disp, parent[0], &s); |
3557 | tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3596 | tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3558 | XFree (s); |
3597 | XFree (s); |
3559 | } |
3598 | } |
3560 | break; |
3599 | break; |
3561 | } |
3600 | } |
3562 | } |
3601 | } |
… | |
… | |
3707 | unsigned long bytes_after; |
3746 | unsigned long bytes_after; |
3708 | unsigned char *value = 0; |
3747 | unsigned char *value = 0; |
3709 | const char *str = ""; |
3748 | const char *str = ""; |
3710 | |
3749 | |
3711 | if (prop |
3750 | if (prop |
3712 | && XGetWindowProperty (disp, TermWin.parent[0], |
3751 | && XGetWindowProperty (disp, parent[0], |
3713 | prop, 0, 1<<16, 0, AnyPropertyType, |
3752 | prop, 0, 1<<16, 0, AnyPropertyType, |
3714 | &actual_type, &actual_format, |
3753 | &actual_type, &actual_format, |
3715 | &nitems, &bytes_after, &value) == Success |
3754 | &nitems, &bytes_after, &value) == Success |
3716 | && actual_type != None |
3755 | && actual_type != None |
3717 | && actual_format == 8) |
3756 | && actual_format == 8) |
… | |
… | |
3729 | { |
3768 | { |
3730 | *eq = 0; |
3769 | *eq = 0; |
3731 | set_utf8_property (display->atom (str), eq + 1); |
3770 | set_utf8_property (display->atom (str), eq + 1); |
3732 | } |
3771 | } |
3733 | else |
3772 | else |
3734 | XDeleteProperty (disp, TermWin.parent[0], |
3773 | XDeleteProperty (disp, parent[0], |
3735 | display->atom (str)); |
3774 | display->atom (str)); |
3736 | } |
3775 | } |
3737 | break; |
3776 | break; |
3738 | |
3777 | |
3739 | case XTerm_Color: |
3778 | case XTerm_Color: |
… | |
… | |
3838 | // TODO, when secure mode? |
3877 | // TODO, when secure mode? |
3839 | break; |
3878 | break; |
3840 | |
3879 | |
3841 | #ifdef MENUBAR |
3880 | #ifdef MENUBAR |
3842 | case URxvt_Menu: |
3881 | case URxvt_Menu: |
3843 | if (options & Opt_insecure) |
3882 | if (OPTION (Opt_insecure)) |
3844 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3883 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3845 | break; |
3884 | break; |
3846 | #endif |
3885 | #endif |
3847 | #if 0 |
3886 | #if 0 |
3848 | case XTerm_dumpscreen: /* no error notices */ |
3887 | case XTerm_dumpscreen: /* no error notices */ |
… | |
… | |
3864 | case URxvt_italicFont: |
3903 | case URxvt_italicFont: |
3865 | case URxvt_boldItalicFont: |
3904 | case URxvt_boldItalicFont: |
3866 | #endif |
3905 | #endif |
3867 | if (query) |
3906 | if (query) |
3868 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3907 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3869 | (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc |
3908 | OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc |
3870 | ? TermWin.fontset[op - URxvt_font]->fontdesc : "", |
3909 | ? fontset[op - URxvt_font]->fontdesc : "", |
3871 | resp); |
3910 | resp); |
3872 | else |
3911 | else |
3873 | { |
3912 | { |
3874 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3913 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3875 | |
3914 | |
… | |
… | |
3880 | break; |
3919 | break; |
3881 | |
3920 | |
3882 | #if ENABLE_FRILLS |
3921 | #if ENABLE_FRILLS |
3883 | case URxvt_locale: |
3922 | case URxvt_locale: |
3884 | if (query) |
3923 | if (query) |
3885 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); |
3924 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3886 | else |
3925 | else |
3887 | { |
3926 | { |
3888 | set_locale (str); |
3927 | set_locale (str); |
3889 | pty.set_utf8_mode (enc_utf8); |
3928 | pty.set_utf8_mode (enc_utf8); |
3890 | init_xlocale (); |
3929 | init_xlocale (); |
… | |
… | |
4018 | } |
4057 | } |
4019 | |
4058 | |
4020 | /* extra handling for values with state unkept */ |
4059 | /* extra handling for values with state unkept */ |
4021 | switch (arg[i]) |
4060 | switch (arg[i]) |
4022 | { |
4061 | { |
|
|
4062 | #if ENABLE_STYLES |
|
|
4063 | case 1021: |
|
|
4064 | if (mode) |
|
|
4065 | SET_OPTION (Opt_intensityStyles); |
|
|
4066 | else |
|
|
4067 | CLR_OPTION (Opt_intensityStyles); |
|
|
4068 | |
|
|
4069 | want_refresh = 1; |
|
|
4070 | want_full_refresh = 1; |
|
|
4071 | break; |
|
|
4072 | #endif |
4023 | case 1048: /* alternative cursor save */ |
4073 | case 1048: /* alternative cursor save */ |
4024 | case 1049: |
4074 | case 1049: |
4025 | if (options & Opt_secondaryScreen) |
4075 | if (OPTION (Opt_secondaryScreen)) |
4026 | if (mode == 0) |
4076 | if (mode == 0) |
4027 | scr_cursor (RESTORE); |
4077 | scr_cursor (RESTORE); |
4028 | else if (mode == 1) |
4078 | else if (mode == 1) |
4029 | scr_cursor (SAVE); |
4079 | scr_cursor (SAVE); |
4030 | break; |
4080 | break; |
… | |
… | |
4042 | */ |
4092 | */ |
4043 | PrivMode (1, PrivMode_vt52); |
4093 | PrivMode (1, PrivMode_vt52); |
4044 | break; |
4094 | break; |
4045 | case 3: /* 80/132 */ |
4095 | case 3: /* 80/132 */ |
4046 | if (priv_modes & PrivMode_132OK) |
4096 | if (priv_modes & PrivMode_132OK) |
4047 | set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); |
4097 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4048 | break; |
4098 | break; |
4049 | case 4: /* smooth scrolling */ |
4099 | case 4: /* smooth scrolling */ |
4050 | if (state) |
4100 | if (!state) |
4051 | options &= ~Opt_jumpScroll; |
4101 | SET_OPTION (Opt_jumpScroll); |
4052 | else |
4102 | else |
4053 | options |= Opt_jumpScroll; |
4103 | CLR_OPTION (Opt_jumpScroll); |
4054 | break; |
4104 | break; |
4055 | case 5: /* reverse video */ |
4105 | case 5: /* reverse video */ |
4056 | scr_rvideo_mode (state); |
4106 | scr_rvideo_mode (state); |
4057 | break; |
4107 | break; |
4058 | case 6: /* relative/absolute origins */ |
4108 | case 6: /* relative/absolute origins */ |
… | |
… | |
4099 | #if 0 |
4149 | #if 0 |
4100 | case 1001: |
4150 | case 1001: |
4101 | break; /* X11 mouse highlighting */ |
4151 | break; /* X11 mouse highlighting */ |
4102 | #endif |
4152 | #endif |
4103 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4153 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4104 | if (state) |
4154 | if (!state) |
4105 | options &= ~Opt_scrollTtyOutput; |
4155 | SET_OPTION (Opt_scrollTtyOutput); |
4106 | else |
4156 | else |
4107 | options |= Opt_scrollTtyOutput; |
4157 | CLR_OPTION (Opt_scrollTtyOutput); |
4108 | break; |
4158 | break; |
4109 | case 1011: /* scroll to bottom on key press */ |
4159 | case 1011: /* scroll to bottom on key press */ |
4110 | if (state) |
4160 | if (state) |
4111 | options |= Opt_scrollTtyKeypress; |
4161 | SET_OPTION (Opt_scrollTtyKeypress); |
4112 | else |
4162 | else |
4113 | options &= ~Opt_scrollTtyKeypress; |
4163 | CLR_OPTION (Opt_scrollTtyKeypress); |
4114 | break; |
4164 | break; |
4115 | case 1047: /* secondary screen w/ clearing last */ |
4165 | case 1047: /* secondary screen w/ clearing last */ |
4116 | if (options & Opt_secondaryScreen) |
4166 | if (OPTION (Opt_secondaryScreen)) |
4117 | if (current_screen != PRIMARY) |
4167 | if (current_screen != PRIMARY) |
4118 | scr_erase_screen (2); |
4168 | scr_erase_screen (2); |
4119 | scr_change_screen (state); |
4169 | scr_change_screen (state); |
4120 | break; |
4170 | break; |
4121 | case 1049: /* secondary screen w/ clearing first */ |
4171 | case 1049: /* secondary screen w/ clearing first */ |
4122 | scr_change_screen (state); |
4172 | scr_change_screen (state); |
4123 | if (options & Opt_secondaryScreen) |
4173 | if (OPTION (Opt_secondaryScreen)) |
4124 | if (current_screen != PRIMARY) |
4174 | if (current_screen != PRIMARY) |
4125 | scr_erase_screen (2); |
4175 | scr_erase_screen (2); |
4126 | break; |
4176 | break; |
4127 | default: |
4177 | default: |
4128 | break; |
4178 | break; |
… | |
… | |
4278 | case 106: |
4328 | case 106: |
4279 | case 107: |
4329 | case 107: |
4280 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
4330 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
4281 | break; |
4331 | break; |
4282 | #endif |
4332 | #endif |
4283 | |
|
|
4284 | } |
4333 | } |
4285 | } |
4334 | } |
4286 | } |
4335 | } |
4287 | /*}}} */ |
4336 | /*}}} */ |
4288 | |
4337 | |
… | |
… | |
4369 | } |
4418 | } |
4370 | |
4419 | |
4371 | memmove (v_buffer, v_buffer + written, v_buflen); |
4420 | memmove (v_buffer, v_buffer + written, v_buflen); |
4372 | } |
4421 | } |
4373 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
4422 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
4374 | // original code just ignores this... |
4423 | pty_ev.set (EVENT_READ); |
4375 | destroy (); |
|
|
4376 | } |
4424 | } |
4377 | |
4425 | |
4378 | /*----------------------- end-of-file (C source) -----------------------*/ |
4426 | /*----------------------- end-of-file (C source) -----------------------*/ |
4379 | |
4427 | |