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.204 by root, Wed Jul 13 02:47:02 2005 UTC vs.
Revision 1.234 by root, Wed Jan 4 04:42:45 2006 UTC

… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
52 58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
… …
135rxvt_term::iso14755_54 (int x, int y) 141rxvt_term::iso14755_54 (int x, int y)
136{ 142{
137 x = Pixel2Col (x); 143 x = Pixel2Col (x);
138 y = Pixel2Row (y); 144 y = Pixel2Row (y);
139 145
140 if (x < 0 || x >= TermWin.ncol 146 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 147 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 148 return;
143 149
144 for (;;) 150 for (;;)
145 { 151 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 152 const line_t &l = ROW(y - view_start);
153
154 text_t t = l.t[x];
147 155
148 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
149 { 157 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 158 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; 159 iso14755buf = ISO_14755_54;
153 break; 160 break;
154 } 161 }
155 162
156 x--; 163 x--;
157 } 164 }
158
159} 165}
160#endif
161 166
162#if ENABLE_OVERLAY
163void 167void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 169{
166 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 172 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 173 int len;
170 174
171 fname = rxvt_utf8towcs (f->name); 175 fname = rxvt_utf8towcs (f->name);
172 176
173#if ENABLE_COMBINING 177# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
175 { 179 {
176 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
179 } 183 }
180 else 184 else
181#endif 185# endif
182 { 186 {
183 ch2 = ch; 187 ch2 = ch;
184 188
185 alloc = 0; 189 alloc = 0;
186 chr = &ch2; 190 chr = &ch2;
187 len = 1; 191 len = 1;
188 } 192 }
189 193
194 char attr[80]; // plenty
195
196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
190 int width = wcswidth (fname, wcslen (fname)); 206 int width = wcswidth (fname, wcslen (fname));
191 207
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
217 scr_overlay_new (x, y, width, len + 2);
193 218
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 220
196 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
197 { 222 {
… …
200 ch = *chr++; 225 ch = *chr++;
201 226
202 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
205#if !UNICODE3 230# if !UNICODE3
206 if (ch >= 0x10000) 231 if (ch >= 0x10000)
207 ch = 0xfffd; 232 ch = 0xfffd;
208#endif 233# endif
209 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
210 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
211 } 236 }
212 237
238 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 239 scr_overlay_set (0, len + 1, fname);
214 240
215 free (fname); 241 free (fname);
216 242
217#if ENABLE_COMBINING 243# if ENABLE_COMBINING
218 if (alloc) 244 if (alloc)
219 delete [] alloc; 245 delete [] alloc;
220#endif 246# endif
221} 247}
222#endif 248#endif
223 249
224void 250void
225rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
242 mb[0] = ch[0]; 268 mb[0] = ch[0];
243 len = 1; 269 len = 1;
244 } 270 }
245 271
246 if (len > 0) 272 if (len > 0)
247 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
248 else 274 else
249 scr_bell (); 275 scr_bell ();
250 } 276 }
251 277
252 iso14755buf = 0; 278 iso14755buf = 0;
… …
280 KeySym keysym; 306 KeySym keysym;
281#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
282 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
283#endif 309#endif
284 int valid_keysym; 310 int valid_keysym;
285 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
286 312
287 /* 313 /*
288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
289 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
290 * 316 *
… …
308 Status status_return; 334 Status status_return;
309 335
310#if 0 336#if 0
311#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
312 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
313 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
314 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
315 else 341 else
316#endif 342#endif
317#endif 343#endif
318 { 344 {
… …
355 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
356 } 382 }
357 else 383 else
358#endif 384#endif
359 { 385 {
360 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
361 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
362 } 388 }
363 389
364 if (valid_keysym) 390 if (valid_keysym)
365 { 391 {
366#ifdef KEYSYM_RESOURCE 392#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state)) 393 if (keyboard->dispatch (this, keysym, ev.state))
368 return; 394 return;
369#endif 395#endif
370 396
371 if (TermWin.saveLines) 397 if (saveLines)
372 { 398 {
373#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
374 if (!ctrl && !meta) 400 if (!ctrl && !meta)
375#else 401#else
376 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
377#endif 403#endif
378 { 404 {
379 int lnsppg; 405 int lnsppg;
380 406
381#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
382 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
383#else 409#else
384 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
385#endif 411#endif
386 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
387 { 413 {
388 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
389 return; 415 return;
… …
829 { 855 {
830#ifdef META8_OPTION 856#ifdef META8_OPTION
831 /* set 8-bit on */ 857 /* set 8-bit on */
832 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
833 { 859 {
834 unsigned char *ch; 860 char *ch;
835 861
836 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
837 *ch |= 0x80; 863 *ch |= 0x80;
838 864
839 meta = 0; 865 meta = 0;
… …
844 } 870 }
845 871
846 if (len <= 0) 872 if (len <= 0)
847 return; /* not mapped */ 873 return; /* not mapped */
848 874
849 if (options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
850 if (TermWin.view_start) 876 if (view_start)
851 { 877 {
852 TermWin.view_start = 0; 878 view_start = 0;
853 want_refresh = 1; 879 want_refresh = 1;
854 } 880 }
855 881
856 /* 882 /*
857 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
… …
872#ifdef META8_OPTION 898#ifdef META8_OPTION
873 && meta_char == C0_ESC 899 && meta_char == C0_ESC
874#endif 900#endif
875 ) 901 )
876 { 902 {
877 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
878 tt_write (&ch, 1); 904 tt_write (&ch, 1);
879 } 905 }
880 906
881#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
882 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
894 920
895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
897/* attempt to `write' count to the input buffer */ 923/* attempt to `write' count to the input buffer */
898unsigned int 924unsigned int
899rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 925rxvt_term::cmd_write (const char *str, unsigned int count)
900{ 926{
901 unsigned int n, s; 927 unsigned int n, s;
902 928
903 n = cmdbuf_ptr - cmdbuf_base; 929 n = cmdbuf_ptr - cmdbuf_base;
904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 930 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
960 SET_LOCALE (locale); 986 SET_LOCALE (locale);
961 987
962 display->flush (); 988 display->flush ();
963 989
964 if (want_refresh && !flush_ev.active) 990 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01); 991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
966} 992}
967 993
968void 994void
969rxvt_term::flush_cb (time_watcher &w) 995rxvt_term::flush_cb (time_watcher &w)
970{ 996{
… …
1034{ 1060{
1035 if (mouse_slip_wheel_speed == 0 1061 if (mouse_slip_wheel_speed == 0
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1062 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1063 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1064 {
1039 if (TermWin.view_start == TermWin.nscrolled || 1065 if (view_start == nsaved ||
1040 TermWin.view_start == 0) 1066 view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1067 mouse_slip_wheel_speed = 0;
1042 1068
1043 refresh_type |= SMOOTH_REFRESH; 1069 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1070 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1046 } 1072 }
1047} 1073}
1048#endif 1074#endif
1049 1075
1076#if HAVE_SCHED_YIELD
1077static struct event_handler
1078{
1079 check_watcher cw_yield;
1080
1081 void yield (check_watcher &w)
1082 {
1083 sched_yield ();
1084 w.stop ();
1085 }
1086
1087 event_handler ()
1088 : cw_yield (this, &event_handler::yield)
1089 {
1090 }
1091} event_handler;
1092#endif
1093
1050bool 1094bool
1051rxvt_term::pty_fill () 1095rxvt_term::pty_fill ()
1052{ 1096{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1097 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1098
1055 if (CBUFSIZ == n) 1099 if (CBUFSIZ == n)
1056 { 1100 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1101 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1102 n = 0;
1059 } 1103 }
1060 1104
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1105 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1106 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1107 cmdbuf_endp = cmdbuf_ptr + n;
1064 1108
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1066 1110
1067 if (n > 0) 1111 if (r > 0)
1068 { 1112 {
1069 cmdbuf_endp += n; 1113 cmdbuf_endp += r;
1070 return true; 1114 return true;
1071 } 1115 }
1072 else if (n < 0 && errno != EAGAIN) 1116 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1117 {
1118#if HAVE_SCHED_YIELD
1119 if (display->is_local)
1120 event_handler.cw_yield.start ();
1121#endif
1122 }
1123 else
1124 {
1125 pty_ev.stop ();
1126
1127 if (!OPTION (Opt_hold))
1073 destroy (); 1128 destroy ();
1129 }
1074 1130
1075 return false; 1131 return false;
1076} 1132}
1077 1133
1078void 1134void
… …
1092} 1148}
1093 1149
1094void 1150void
1095rxvt_term::pointer_unblank () 1151rxvt_term::pointer_unblank ()
1096{ 1152{
1097 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1153 XDefineCursor (display->display, vt, TermWin_cursor);
1098 recolour_cursor (); 1154 recolour_cursor ();
1099 1155
1100#ifdef POINTER_BLANK 1156#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1157 hidden_pointer = 0;
1102 1158
1103 if (options & Opt_pointerBlank) 1159 if (OPTION (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1160 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1161#endif
1106} 1162}
1107 1163
1108#ifdef POINTER_BLANK 1164#ifdef POINTER_BLANK
1109void 1165void
1110rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
1111{ 1167{
1112 if (! (options & Opt_pointerBlank)) 1168 if (! OPTION (Opt_pointerBlank))
1113 return; 1169 return;
1114 1170
1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1171 XDefineCursor (display->display, vt, display->blank_cursor);
1116 XFlush (display->display); 1172 XFlush (display->display);
1117 1173
1118 hidden_pointer = 1; 1174 hidden_pointer = 1;
1119} 1175}
1120 1176
… …
1215 1271
1216 SET_R (this); 1272 SET_R (this);
1217 SET_LOCALE (locale); 1273 SET_LOCALE (locale);
1218 1274
1219#if defined(CURSOR_BLINK) 1275#if defined(CURSOR_BLINK)
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1221 { 1277 {
1222 if (hidden_cursor) 1278 if (hidden_cursor)
1223 { 1279 {
1224 hidden_cursor = 0; 1280 hidden_cursor = 0;
1225 want_refresh = 1; 1281 want_refresh = 1;
… …
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1229 } 1285 }
1230#endif 1286#endif
1231 1287
1232#if defined(POINTER_BLANK) 1288#if defined(POINTER_BLANK)
1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1234 { 1290 {
1235 if (ev.type == MotionNotify 1291 if (ev.type == MotionNotify
1236 || ev.type == ButtonPress 1292 || ev.type == ButtonPress
1237 || ev.type == ButtonRelease) 1293 || ev.type == ButtonRelease)
1238 if (hidden_pointer) 1294 if (hidden_pointer)
… …
1422 case FocusOut: 1478 case FocusOut:
1423 focus_out (); 1479 focus_out ();
1424 break; 1480 break;
1425 1481
1426 case ConfigureNotify: 1482 case ConfigureNotify:
1427 if (ev.xconfigure.window == TermWin.parent[0]) 1483 if (ev.xconfigure.window == parent[0])
1428 { 1484 {
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)); 1485 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1486 ;
1438 1487
1439 if (szHint.width != width || szHint.height != height) 1488 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1440 { 1489 {
1441 seen_resize = 1; 1490 seen_resize = 1;
1442 resize_all_windows (width, height, 1); 1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1443 } 1492 }
1444 1493
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1494#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent) 1495 if (OPTION (Opt_transparent))
1447 check_our_parents (); 1496 check_our_parents ();
1448#endif 1497#endif
1449 } 1498 }
1450 break; 1499 break;
1451 1500
… …
1468 case SelectionRequest: 1517 case SelectionRequest:
1469 selection_send (ev.xselectionrequest); 1518 selection_send (ev.xselectionrequest);
1470 break; 1519 break;
1471 1520
1472 case UnmapNotify: 1521 case UnmapNotify:
1473 TermWin.mapped = 0; 1522 mapped = 0;
1474#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1475 text_blink_ev.stop (); 1524 text_blink_ev.stop ();
1476#endif 1525#endif
1477 break; 1526 break;
1478 1527
1479 case MapNotify: 1528 case MapNotify:
1480 TermWin.mapped = 1; 1529 mapped = 1;
1481#ifdef TEXT_BLINK 1530#ifdef TEXT_BLINK
1482 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1483#endif 1532#endif
1484 break; 1533 break;
1485 1534
… …
1489 break; 1538 break;
1490#endif /* TRANSPARENT */ 1539#endif /* TRANSPARENT */
1491 1540
1492 case GraphicsExpose: 1541 case GraphicsExpose:
1493 case Expose: 1542 case Expose:
1494 if (ev.xany.window == TermWin.vt) 1543 if (ev.xany.window == vt)
1495 { 1544 {
1496 do 1545 do
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1548 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1500 1549
1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1502 1551
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1504 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1505 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1506 1555
1507 scr_refresh (refresh_type); 1556 scr_refresh (refresh_type);
1508 } 1557 }
… …
1524 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1525 menubar_expose (); 1574 menubar_expose ();
1526#endif 1575#endif
1527 1576
1528#ifdef TRANSPARENT 1577#ifdef TRANSPARENT
1529 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1578 if (am_transparent && ev.xany.window == parent[0])
1530 XClearWindow (disp, ev.xany.window); 1579 XClearWindow (disp, ev.xany.window);
1531#endif 1580#endif
1532 } 1581 }
1533 break; 1582 break;
1534 1583
… …
1545 } 1594 }
1546#endif 1595#endif
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break; 1597 break;
1549 1598
1550 if (ev.xany.window == TermWin.vt) 1599 if (ev.xany.window == vt)
1551 { 1600 {
1552 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1601 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1602 {
1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1555 ; 1604 ;
1556 1605
1557 XQueryPointer (disp, TermWin.vt, 1606 XQueryPointer (disp, vt,
1558 &unused_root, &unused_child, 1607 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1608 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1609 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1610 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1611#ifdef MOUSE_THRESHOLD
… …
1574#endif 1623#endif
1575 selection_extend (ev.xbutton.x, ev.xbutton.y, 1624 selection_extend (ev.xbutton.x, ev.xbutton.y,
1576 ev.xbutton.state & Button3Mask ? 2 : 0); 1625 ev.xbutton.state & Button3Mask ? 2 : 0);
1577 1626
1578#ifdef SELECTION_SCROLLING 1627#ifdef SELECTION_SCROLLING
1579 if (ev.xbutton.y < TermWin.int_bwidth 1628 if (ev.xbutton.y < int_bwidth
1580 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1629 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1581 { 1630 {
1582 int dist; 1631 int dist;
1583 1632
1584 /* don't clobber the current delay if we are 1633 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1634 * already in the middle of scrolling.
… …
1593 selection_save_x = ev.xbutton.x; 1642 selection_save_x = ev.xbutton.x;
1594 selection_save_y = ev.xbutton.y; 1643 selection_save_y = ev.xbutton.y;
1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1644 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1596 1645
1597 /* calc number of lines to scroll */ 1646 /* calc number of lines to scroll */
1598 if (ev.xbutton.y < TermWin.int_bwidth) 1647 if (ev.xbutton.y < int_bwidth)
1599 { 1648 {
1600 scroll_selection_dir = UP; 1649 scroll_selection_dir = UP;
1601 dist = TermWin.int_bwidth - ev.xbutton.y; 1650 dist = int_bwidth - ev.xbutton.y;
1602 } 1651 }
1603 else 1652 else
1604 { 1653 {
1605 scroll_selection_dir = DN; 1654 scroll_selection_dir = DN;
1606 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1655 dist = ev.xbutton.y - (int_bwidth + height);
1607 } 1656 }
1608 1657
1609 scroll_selection_lines = Pixel2Height (dist) 1658 scroll_selection_lines = Pixel2Height (dist)
1610 / SELECTION_SCROLL_LINE_SPEEDUP 1659 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1; 1660 + 1;
1612 MIN_IT (scroll_selection_lines, 1661 min_it (scroll_selection_lines,
1613 SELECTION_SCROLL_MAX_LINES); 1662 SELECTION_SCROLL_MAX_LINES);
1614 } 1663 }
1615 else 1664 else
1616 { 1665 {
1617 /* we are within the text window, so we 1666 /* we are within the text window, so we
… …
1648} 1697}
1649 1698
1650void 1699void
1651rxvt_term::focus_in () 1700rxvt_term::focus_in ()
1652{ 1701{
1653 if (!TermWin.focus) 1702 if (!focus)
1654 { 1703 {
1655 TermWin.focus = 1; 1704 focus = 1;
1656 want_refresh = 1; 1705 want_refresh = 1;
1706
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708
1657#ifdef USE_XIM 1709#if USE_XIM
1658 if (Input_Context != NULL) 1710 if (Input_Context != NULL)
1659 { 1711 {
1660 IMSetStatusPosition (); 1712 IMSetStatusPosition ();
1661 XSetICFocus (Input_Context); 1713 XSetICFocus (Input_Context);
1662 } 1714 }
1663#endif 1715#endif
1664#ifdef CURSOR_BLINK 1716#if CURSOR_BLINK
1665 if (options & Opt_cursorBlink) 1717 if (OPTION (Opt_cursorBlink))
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1667#endif 1719#endif
1668#ifdef OFF_FOCUS_FADING 1720#if OFF_FOCUS_FADING
1669 if (rs[Rs_fade]) 1721 if (rs[Rs_fade])
1670 { 1722 {
1671 pix_colors = pix_colors_focused; 1723 pix_colors = pix_colors_focused;
1672 scr_recolour (); 1724 scr_recolour ();
1673 } 1725 }
… …
1676} 1728}
1677 1729
1678void 1730void
1679rxvt_term::focus_out () 1731rxvt_term::focus_out ()
1680{ 1732{
1681 if (TermWin.focus) 1733 if (focus)
1682 { 1734 {
1683 TermWin.focus = 0; 1735 focus = 0;
1684 want_refresh = 1; 1736 want_refresh = 1;
1685 1737
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739
1686#if ENABLE_FRILLS || ISO_14755 1740#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf)
1742 {
1687 iso14755buf = 0; 1743 iso14755buf = 0;
1688#endif
1689#if ENABLE_OVERLAY 1744# if ENABLE_OVERLAY
1690 scr_overlay_off (); 1745 scr_overlay_off ();
1691#endif 1746# endif
1747 }
1748#endif
1692#ifdef USE_XIM 1749#if USE_XIM
1693 if (Input_Context != NULL) 1750 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context); 1751 XUnsetICFocus (Input_Context);
1695#endif 1752#endif
1696#ifdef CURSOR_BLINK 1753#if CURSOR_BLINK
1697 if (options & Opt_cursorBlink) 1754 if (OPTION (Opt_cursorBlink))
1698 cursor_blink_ev.stop (); 1755 cursor_blink_ev.stop ();
1699 hidden_cursor = 0; 1756 hidden_cursor = 0;
1700#endif 1757#endif
1701#ifdef OFF_FOCUS_FADING 1758#if OFF_FOCUS_FADING
1702 if (rs[Rs_fade]) 1759 if (rs[Rs_fade])
1703 { 1760 {
1704 pix_colors = pix_colors_unfocused; 1761 pix_colors = pix_colors_unfocused;
1705 scr_recolour (); 1762 scr_recolour ();
1706 } 1763 }
… …
1726 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1783 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1727 return; 1784 return;
1728 1785
1729 /* FALLTHROUGH */ 1786 /* FALLTHROUGH */
1730 case ReparentNotify: 1787 case ReparentNotify:
1731 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1788 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1732 want_refresh = want_full_refresh = 1; 1789 want_refresh = want_full_refresh = 1;
1733 break; 1790 break;
1734 } 1791 }
1735} 1792}
1736#endif 1793#endif
… …
1739rxvt_term::button_press (XButtonEvent &ev) 1796rxvt_term::button_press (XButtonEvent &ev)
1740{ 1797{
1741 int reportmode = 0, clickintime; 1798 int reportmode = 0, clickintime;
1742 1799
1743 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1800 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1801
1744 if (!bypass_keystate) 1802 if (!bypass_keystate)
1745 reportmode = !! (priv_modes & PrivMode_mouse_report); 1803 reportmode = !! (priv_modes & PrivMode_mouse_report);
1746 1804
1747 /* 1805 /*
1748 * VT window processing of button press 1806 * VT window processing of button press
1749 */ 1807 */
1750 if (ev.window == TermWin.vt) 1808 if (ev.window == vt)
1751 { 1809 {
1752#if ISO_14755 1810#if ISO_14755
1753 // 5.4 1811 // 5.4
1754 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1755 { 1813 {
… …
1797 else 1855 else
1798 { 1856 {
1799 if (ev.button != MEvent.button) 1857 if (ev.button != MEvent.button)
1800 MEvent.clicks = 0; 1858 MEvent.clicks = 0;
1801 1859
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1802 switch (ev.button) 1861 switch (ev.button)
1803 { 1862 {
1804 case Button1: 1863 case Button1:
1805 /* allow meta + click to select rectangular areas */ 1864 /* allow meta + click to select rectangular areas */
1806 /* should be done in screen.C */ 1865 /* should be done in screen.C */
1807#if ENABLE_FRILLS 1866#if ENABLE_FRILLS
1808 selection.rect = !!(ev.state & ModMetaMask); 1867 selection.rect = !!(ev.state & ModMetaMask);
1809#else 1868#else
1810 selection.rect = false; 1869 selection.rect = false;
1811#endif 1870#endif
1812 1871
1813 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1814 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1815 { 1874 {
1816 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1817 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1818 else 1877 else
1819 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
1820 } 1879 }
1821 else 1880 else
1822 { 1881 {
1823 if (MEvent.button == Button1 && clickintime) 1882 if (MEvent.button == Button1 && clickintime)
1824 MEvent.clicks++; 1883 MEvent.clicks++;
1825 else 1884 else
1826 MEvent.clicks = 1; 1885 MEvent.clicks = 1;
1827 1886
1828 selection_click (MEvent.clicks, ev.x, ev.y); 1887 selection_click (MEvent.clicks, ev.x, ev.y);
1829 } 1888 }
1830 1889
1831 MEvent.button = Button1; 1890 MEvent.button = Button1;
1832 break; 1891 break;
1833 1892
1834 case Button3: 1893 case Button3:
1835 if (MEvent.button == Button3 && clickintime) 1894 if (MEvent.button == Button3 && clickintime)
1836 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1837 else 1896 else
1838 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
1839 1898
1840 MEvent.button = Button3; 1899 MEvent.button = Button3;
1841 break; 1900 break;
1842 } 1901 }
1843 } 1902 }
1844 1903
1845 MEvent.time = ev.time; 1904 MEvent.time = ev.time;
1846 return; 1905 return;
1847 } 1906 }
1848 1907
… …
1960 case Button3: 2019 case Button3:
1961 if (scrollBar.style != R_SB_XTERM) 2020 if (scrollBar.style != R_SB_XTERM)
1962 { 2021 {
1963 if (scrollbar_above_slider (ev.y)) 2022 if (scrollbar_above_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 2023# ifdef RXVT_SCROLL_FULL
1965 scr_page (UP, TermWin.nrow - 1); 2024 scr_page (UP, nrow - 1);
1966# else 2025# else
1967 scr_page (UP, TermWin.nrow / 4); 2026 scr_page (UP, nrow / 4);
1968# endif 2027# endif
1969 else if (scrollbar_below_slider (ev.y)) 2028 else if (scrollbar_below_slider (ev.y))
1970# ifdef RXVT_SCROLL_FULL 2029# ifdef RXVT_SCROLL_FULL
1971 scr_page (DN, TermWin.nrow - 1); 2030 scr_page (DN, nrow - 1);
1972# else 2031# else
1973 scr_page (DN, TermWin.nrow / 4); 2032 scr_page (DN, nrow / 4);
1974# endif 2033# endif
1975 else 2034 else
1976 scrollBar.setMotion (); 2035 scrollBar.setMotion ();
1977 } 2036 }
1978 else 2037 else
1979 { 2038 {
1980 scr_page ((ev.button == Button1 ? DN : UP), 2039 scr_page ((ev.button == Button1 ? DN : UP),
1981 (TermWin.nrow 2040 (nrow
1982 * scrollbar_position (ev.y) 2041 * scrollbar_position (ev.y)
1983 / scrollbar_size ())); 2042 / scrollbar_size ()));
1984 } 2043 }
1985 2044
1986 break; 2045 break;
… …
2018#ifdef SELECTION_SCROLLING 2077#ifdef SELECTION_SCROLLING
2019 if (sel_scroll_ev.active) 2078 if (sel_scroll_ev.active)
2020 sel_scroll_ev.stop(); 2079 sel_scroll_ev.stop();
2021#endif 2080#endif
2022 2081
2023 if (ev.window == TermWin.vt) 2082 if (ev.window == vt)
2024 { 2083 {
2025#if ISO_14755 2084#if ISO_14755
2026 // 5.4 2085 // 5.4
2027 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2028 return; 2087 return;
… …
2078 2137
2079 v = ev.button == Button4 ? UP : DN; 2138 v = ev.button == Button4 ? UP : DN;
2080 2139
2081 if (ev.state & ShiftMask) 2140 if (ev.state & ShiftMask)
2082 i = 1; 2141 i = 1;
2083 else if (options & Opt_mouseWheelScrollPage) 2142 else if (OPTION (Opt_mouseWheelScrollPage))
2084 i = TermWin.nrow - 1; 2143 i = nrow - 1;
2085 else 2144 else
2086 i = 5; 2145 i = 5;
2087 2146
2088# ifdef MOUSE_SLIP_WHEELING 2147# ifdef MOUSE_SLIP_WHEELING
2089 if (ev.state & ControlMask) 2148 if (ev.state & ControlMask)
2090 { 2149 {
2091 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
2092 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2151 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; 2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2094 2153
2095 if (slip_wheel_ev.at < NOW) 2154 if (slip_wheel_ev.at < NOW)
2096 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2155 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2097 2156
2098 slip_wheel_ev.start (); 2157 slip_wheel_ev.start ();
… …
2374 XWindowAttributes wattr, wrootattr; 2433 XWindowAttributes wattr, wrootattr;
2375 dDisp; 2434 dDisp;
2376 2435
2377 pchanged = 0; 2436 pchanged = 0;
2378 2437
2379 if (!(options & Opt_transparent)) 2438 if (!OPTION (Opt_transparent))
2380 return pchanged; /* Don't try any more */ 2439 return pchanged; /* Don't try any more */
2381 2440
2382 XGetWindowAttributes (disp, display->root, &wrootattr); 2441 XGetWindowAttributes (disp, display->root, &wrootattr);
2383 rootdepth = wrootattr.depth; 2442 rootdepth = wrootattr.depth;
2384 2443
2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2444 XGetWindowAttributes (disp, parent[0], &wattr);
2386 2445
2387 if (rootdepth != wattr.depth) 2446 if (rootdepth != wattr.depth)
2388 { 2447 {
2389 if (am_transparent) 2448 if (am_transparent)
2390 { 2449 {
2391 pchanged = 1; 2450 pchanged = 1;
2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2451 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2393 am_transparent = am_pixmap_trans = 0; 2452 am_transparent = am_pixmap_trans = 0;
2394 } 2453 }
2395 2454
2396 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
2397 } 2456 }
… …
2438 Window cr; 2497 Window cr;
2439 XImage *image; 2498 XImage *image;
2440 GC gc; 2499 GC gc;
2441 XGCValues gcvalue; 2500 XGCValues gcvalue;
2442 2501
2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2502 XTranslateCoordinates (disp, parent[0], display->root,
2444 0, 0, &sx, &sy, &cr); 2503 0, 0, &sx, &sy, &cr);
2445 nw = (unsigned int)szHint.width; 2504 nw = (unsigned int)szHint.width;
2446 nh = (unsigned int)szHint.height; 2505 nh = (unsigned int)szHint.height;
2447 nx = ny = 0; 2506 nx = ny = 0;
2448 2507
… …
2458 nh += sy; 2517 nh += sy;
2459 ny = -sy; 2518 ny = -sy;
2460 sy = 0; 2519 sy = 0;
2461 } 2520 }
2462 2521
2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2522 min_it (nw, (unsigned int) (wrootattr.width - sx));
2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2523 min_it (nh, (unsigned int) (wrootattr.height - sy));
2465 2524
2466 XSync (disp, False); 2525 XSync (disp, False);
2467 allowedxerror = -1; 2526 allowedxerror = -1;
2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2527 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2469 2528
… …
2474 if (image == NULL) 2533 if (image == NULL)
2475 { 2534 {
2476 if (am_transparent && am_pixmap_trans) 2535 if (am_transparent && am_pixmap_trans)
2477 { 2536 {
2478 pchanged = 1; 2537 pchanged = 1;
2479 if (TermWin.pixmap != None) 2538 if (pixmap != None)
2480 { 2539 {
2481 XFreePixmap (disp, TermWin.pixmap); 2540 XFreePixmap (disp, pixmap);
2482 TermWin.pixmap = None; 2541 pixmap = None;
2483 } 2542 }
2484 } 2543 }
2485 2544
2486 am_pixmap_trans = 0; 2545 am_pixmap_trans = 0;
2487 } 2546 }
2488 else 2547 else
2489 { 2548 {
2490 if (TermWin.pixmap != None) 2549 if (pixmap != None)
2491 XFreePixmap (disp, TermWin.pixmap); 2550 XFreePixmap (disp, pixmap);
2492 2551
2493#if TINTING 2552#if TINTING
2494 if (ISSET_PIXCOLOR (Color_tint)) 2553 if (ISSET_PIXCOLOR (Color_tint))
2495 { 2554 {
2496 unsigned short rm, gm, bm; 2555 unsigned short rm, gm, bm;
… …
2500 2559
2501 ShadeXImage (display, image, shade, rm, gm, bm); 2560 ShadeXImage (display, image, shade, rm, gm, bm);
2502 } 2561 }
2503#endif 2562#endif
2504 2563
2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2564 pixmap = XCreatePixmap (disp, vt,
2506 szHint.width, szHint.height, image->depth); 2565 szHint.width, szHint.height, image->depth);
2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2566 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2567 XPutImage (disp, pixmap, gc, image, 0, 0,
2509 nx, ny, image->width, image->height); 2568 nx, ny, image->width, image->height);
2510 XFreeGC (disp, gc); 2569 XFreeGC (disp, gc);
2511 XDestroyImage (image); 2570 XDestroyImage (image);
2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2571 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2513 XClearWindow (disp, TermWin.parent[0]); 2572 XClearWindow (disp, parent[0]);
2514 2573
2515 if (!am_transparent || !am_pixmap_trans) 2574 if (!am_transparent || !am_pixmap_trans)
2516 pchanged = 1; 2575 pchanged = 1;
2517 2576
2518 am_transparent = am_pixmap_trans = 1; 2577 am_transparent = am_pixmap_trans = 1;
2519 } 2578 }
2520 } 2579 }
2521 2580
2522 if (am_pixmap_trans) 2581 if (am_pixmap_trans)
2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2524 else 2583 else
2525 { 2584 {
2526 unsigned int n; 2585 unsigned int n;
2527 /* 2586 /*
2528 * InheritPixmap transparency 2587 * InheritPixmap transparency
2529 */ 2588 */
2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2589 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2531 { 2590 {
2532 oldp = TermWin.parent[i]; 2591 oldp = parent[i];
2533 XQueryTree (disp, TermWin.parent[i - 1], &root, 2592 XQueryTree (disp, parent[i - 1], &root,
2534 &TermWin.parent[i], &list, &n); 2593 &parent[i], &list, &n);
2535 XFree (list); 2594 XFree (list);
2536 2595
2537 if (TermWin.parent[i] == display->root) 2596 if (parent[i] == display->root)
2538 { 2597 {
2539 if (oldp != None) 2598 if (oldp != None)
2540 pchanged = 1; 2599 pchanged = 1;
2541 2600
2542 break; 2601 break;
2543 } 2602 }
2544 2603
2545 if (oldp != TermWin.parent[i]) 2604 if (oldp != parent[i])
2546 pchanged = 1; 2605 pchanged = 1;
2547 } 2606 }
2548 2607
2549 n = 0; 2608 n = 0;
2550 2609
2551 if (pchanged) 2610 if (pchanged)
2552 { 2611 {
2553 for (; n < (unsigned int)i; n++) 2612 for (; n < (unsigned int)i; n++)
2554 { 2613 {
2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2614 XGetWindowAttributes (disp, parent[n], &wattr);
2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2615 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2557 { 2616 {
2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2617 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2559 break; 2618 break;
2560 } 2619 }
2561 } 2620 }
2562 } 2621 }
2563 2622
2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2623 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2565 { 2624 {
2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2625 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2626 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2568 am_transparent = 0; 2627 am_transparent = 0;
2569 /* XXX: also turn off Opt_transparent? */ 2628 /* XXX: also turn off Opt_transparent? */
2570 } 2629 }
2571 else 2630 else
2572 { 2631 {
… …
2575 * needed for fvwm2.2.2 (and before?) */ 2634 * needed for fvwm2.2.2 (and before?) */
2576 sleep (1); 2635 sleep (1);
2577#endif 2636#endif
2578 for (n = 0; n < (unsigned int)i; n++) 2637 for (n = 0; n < (unsigned int)i; n++)
2579 { 2638 {
2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2581 XClearWindow (disp, TermWin.parent[n]); 2640 XClearWindow (disp, parent[n]);
2582 } 2641 }
2583 2642
2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 am_transparent = 1; 2644 am_transparent = 1;
2586 } 2645 }
2587 2646
2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 TermWin.parent[i] = None; 2648 parent[i] = None;
2590 } 2649 }
2591 2650
2592 if (scrollBar.win) 2651 if (scrollBar.win)
2593 { 2652 {
2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2612bool 2671bool
2613rxvt_term::cmd_parse () 2672rxvt_term::cmd_parse ()
2614{ 2673{
2615 bool flag = false; 2674 bool flag = false;
2616 unicode_t ch = NOCHAR; 2675 unicode_t ch = NOCHAR;
2617 unsigned char *seq_begin; // remember start of esc-sequence here 2676 char *seq_begin; // remember start of esc-sequence here
2618 2677
2619 for (;;) 2678 for (;;)
2620 { 2679 {
2621 if (ch == NOCHAR) 2680 if (ch == NOCHAR)
2622 { 2681 {
… …
2646 /* Read a text string from the input buffer */ 2705 /* Read a text string from the input buffer */
2647 unicode_t buf[UBUFSIZ]; 2706 unicode_t buf[UBUFSIZ];
2648 bool refreshnow = false; 2707 bool refreshnow = false;
2649 int nlines = 0; 2708 int nlines = 0;
2650 unicode_t *str = buf; 2709 unicode_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ); 2710 unicode_t *eol = str + min (ncol, UBUFSIZ);
2652 2711
2653 for (;;) 2712 for (;;)
2654 { 2713 {
2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2656 break; 2715 break;
2657 2716
2658 *str++ = ch; 2717 *str++ = ch;
2659 2718
2660 if (ch == C0_LF || str >= eol) 2719 if (ch == C0_LF || str >= eol)
2661 { 2720 {
2721 if (ch == C0_LF)
2662 nlines++; 2722 nlines++;
2723
2663 refresh_count++; 2724 refresh_count++;
2664 2725
2665 if (!(options & Opt_jumpScroll) 2726 if (!OPTION (Opt_jumpScroll)
2666 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2667 { 2728 {
2668 refreshnow = true; 2729 refreshnow = true;
2730 refresh_count = 0;
2669 ch = NOCHAR; 2731 ch = NOCHAR;
2670 break; 2732 break;
2671 } 2733 }
2672 2734
2673 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2735 // scr_add_lines only works for nlines <= nrow - 1.
2674 if (nlines >= TermWin.nrow - 1) 2736 if (nlines >= nrow - 1)
2675 { 2737 {
2676 scr_add_lines (buf, nlines, str - buf); 2738 scr_add_lines (buf, nlines, str - buf);
2677 nlines = 0; 2739 nlines = 0;
2678 str = buf; 2740 str = buf;
2679 eol = str + min (TermWin.ncol, UBUFSIZ); 2741 eol = str + min (ncol, UBUFSIZ);
2680 } 2742 }
2681 2743
2682 if (str >= eol) 2744 if (str >= eol)
2683 { 2745 {
2684 if (eol >= buf + UBUFSIZ) 2746 if (eol >= buf + UBUFSIZ)
2685 { 2747 {
2686 ch = NOCHAR; 2748 ch = NOCHAR;
2687 break; 2749 break;
2688 } 2750 }
2689 else 2751 else
2690 eol = min (eol + TermWin.ncol, buf + UBUFSIZ); 2752 eol = min (eol + ncol, buf + UBUFSIZ);
2691 } 2753 }
2692 2754
2693 } 2755 }
2694 2756
2695 seq_begin = cmdbuf_ptr; 2757 seq_begin = cmdbuf_ptr;
… …
2704 * the number of pages between refreshes is refresh_limit, which 2766 * the number of pages between refreshes is refresh_limit, which
2705 * is incremented here because we must be doing flat-out scrolling. 2767 * is incremented here because we must be doing flat-out scrolling.
2706 */ 2768 */
2707 if (refreshnow) 2769 if (refreshnow)
2708 { 2770 {
2709 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2771 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2710 refresh_limit++; 2772 refresh_limit++;
2711 else 2773 else
2712 { 2774 {
2713 flag = true; 2775 flag = true;
2714 scr_refresh (refresh_type); 2776 scr_refresh (refresh_type);
2777 flush_ev.stop ();
2715 } 2778 }
2716 } 2779 }
2717 2780
2718 } 2781 }
2719 else 2782 else
… …
2750rxvt_term::next_char () 2813rxvt_term::next_char ()
2751{ 2814{
2752 while (cmdbuf_ptr < cmdbuf_endp) 2815 while (cmdbuf_ptr < cmdbuf_endp)
2753 { 2816 {
2754 // assume 7-bit to be ascii ALWAYS 2817 // assume 7-bit to be ascii ALWAYS
2755 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2818 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2756 return *cmdbuf_ptr++; 2819 return *cmdbuf_ptr++;
2757 2820
2758 wchar_t wc; 2821 wchar_t wc;
2759 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2822 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2760 2823
2761 if (len == (size_t)-2) 2824 if (len == (size_t)-2)
2762 { 2825 {
2763 // the mbstate stores incomplete sequences. didn't know this :/ 2826 // the mbstate stores incomplete sequences. didn't know this :/
2764 cmdbuf_ptr = cmdbuf_endp; 2827 cmdbuf_ptr = cmdbuf_endp;
… …
2903 case C0_ESC: 2966 case C0_ESC:
2904 process_escape_seq (); 2967 process_escape_seq ();
2905 break; 2968 break;
2906 case C0_ENQ: /* terminal Status */ 2969 case C0_ENQ: /* terminal Status */
2907 if (rs[Rs_answerbackstring]) 2970 if (rs[Rs_answerbackstring])
2908 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2971 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2909 (unsigned int)strlen (rs[Rs_answerbackstring]));
2910 else 2972 else
2911 tt_write ((unsigned char *)VT100_ANS, 2973 tt_write (VT100_ANS, strlen (VT100_ANS));
2912 (unsigned int)strlen (VT100_ANS));
2913 break; 2974 break;
2914 case C0_BEL: /* bell */ 2975 case C0_BEL: /* bell */
2915 scr_bell (); 2976 scr_bell ();
2916 break; 2977 break;
2917 case C0_BS: /* backspace */ 2978 case C0_BS: /* backspace */
… …
3105 process_dcs_seq (); 3166 process_dcs_seq ();
3106 break; 3167 break;
3107 3168
3108 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3169 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3109 case C1_SCI: /* ESC Z */ 3170 case C1_SCI: /* ESC Z */
3110 tt_write ((const unsigned char *)ESCZ_ANSWER, 3171 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3111 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3112 break; /* steal obsolete ESC [ c */ 3172 break; /* steal obsolete ESC [ c */
3113 3173
3114 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3174 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3115 case C1_CSI: /* ESC [ */ 3175 case C1_CSI: /* ESC [ */
3116 process_csi_seq (); 3176 process_csi_seq ();
… …
3356 3416
3357 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3417 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3358 arg[0] = -arg[0]; 3418 arg[0] = -arg[0];
3359 /* FALLTHROUGH */ 3419 /* FALLTHROUGH */
3360 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3361 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3362 break; 3422 break;
3363 3423
3364 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3365 tt_write ((const unsigned char *)VT100_ANS, 3425 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3366 (unsigned int) (sizeof (VT100_ANS) - 1));
3367 break; 3426 break;
3368 3427
3369 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3428 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3370 process_sgr_mode (nargs, arg); 3429 process_sgr_mode (nargs, arg);
3371 break; 3430 break;
… …
3378 break; 3437 break;
3379 case 6: /* CPR requested */ 3438 case 6: /* CPR requested */
3380 scr_report_position (); 3439 scr_report_position ();
3381 break; 3440 break;
3382 case 7: /* unofficial extension */ 3441 case 7: /* unofficial extension */
3383 if (options & Opt_insecure) 3442 if (OPTION (Opt_insecure))
3384 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3443 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3385 break; 3444 break;
3386 case 8: /* unofficial extension */ 3445 case 8: /* unofficial extension */
3387 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3446 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3388 break; 3447 break;
… …
3491 { 3550 {
3492 /* 3551 /*
3493 * commands 3552 * commands
3494 */ 3553 */
3495 case 1: /* deiconify window */ 3554 case 1: /* deiconify window */
3496 XMapWindow (disp, TermWin.parent[0]); 3555 XMapWindow (disp, parent[0]);
3497 break; 3556 break;
3498 case 2: /* iconify window */ 3557 case 2: /* iconify window */
3499 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3558 XIconifyWindow (disp, parent[0], display->screen);
3500 break; 3559 break;
3501 case 3: /* set position (pixels) */ 3560 case 3: /* set position (pixels) */
3502 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3561 XMoveWindow (disp, parent[0], args[1], args[2]);
3503 break; 3562 break;
3504 case 4: /* set size (pixels) */ 3563 case 4: /* set size (pixels) */
3505 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3506 break; 3565 break;
3507 case 5: /* raise window */ 3566 case 5: /* raise window */
3508 XRaiseWindow (disp, TermWin.parent[0]); 3567 XRaiseWindow (disp, parent[0]);
3509 break; 3568 break;
3510 case 6: /* lower window */ 3569 case 6: /* lower window */
3511 XLowerWindow (disp, TermWin.parent[0]); 3570 XLowerWindow (disp, parent[0]);
3512 break; 3571 break;
3513 case 7: /* refresh window */ 3572 case 7: /* refresh window */
3514 scr_touch (true); 3573 scr_touch (true);
3515 break; 3574 break;
3516 case 8: /* set size (chars) */ 3575 case 8: /* set size (chars) */
3517 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3576 set_widthheight ((unsigned int) (args[2] * fwidth),
3518 (unsigned int) (args[1] * TermWin.fheight)); 3577 (unsigned int) (args[1] * fheight));
3519 break; 3578 break;
3520 3579
3521 //case 9: NYI, TODO, restore maximized window or maximize window 3580 //case 9: NYI, TODO, restore maximized window or maximize window
3522 default: 3581 default:
3523 if (args[0] >= 24) /* set height (chars) */ 3582 if (args[0] >= 24) /* set height (chars) */
3524 set_widthheight ((unsigned int)TermWin.width, 3583 set_widthheight ((unsigned int)width,
3525 (unsigned int) (args[1] * TermWin.fheight)); 3584 (unsigned int) (args[1] * fheight));
3526 break; 3585 break;
3527 3586
3528 3587
3529 /* 3588 /*
3530 * reports - some output format copied from XTerm 3589 * reports - some output format copied from XTerm
3531 */ 3590 */
3532 case 11: /* report window state */ 3591 case 11: /* report window state */
3533 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3592 XGetWindowAttributes (disp, parent[0], &wattr);
3534 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3593 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3535 break; 3594 break;
3536 case 13: /* report window position */ 3595 case 13: /* report window position */
3537 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3596 XGetWindowAttributes (disp, parent[0], &wattr);
3538 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3597 XTranslateCoordinates (disp, parent[0], wattr.root,
3539 -wattr.border_width, -wattr.border_width, 3598 -wattr.border_width, -wattr.border_width,
3540 &x, &y, &wdummy); 3599 &x, &y, &wdummy);
3541 tt_printf ("\033[3;%d;%dt", x, y); 3600 tt_printf ("\033[3;%d;%dt", x, y);
3542 break; 3601 break;
3543 case 14: /* report window size (pixels) */ 3602 case 14: /* report window size (pixels) */
3544 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3603 XGetWindowAttributes (disp, parent[0], &wattr);
3545 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3604 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3546 break; 3605 break;
3547 case 18: /* report text area size (chars) */ 3606 case 18: /* report text area size (chars) */
3548 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3607 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3549 break; 3608 break;
3550 case 19: /* report window size (chars) */ 3609 case 19: /* report window size (chars) */
3551 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3610 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3552 break; 3611 break;
3553 case 20: /* report icon label */ 3612 case 20: /* report icon label */
3554 { 3613 {
3555 char *s; 3614 char *s;
3556 XGetIconName (disp, TermWin.parent[0], &s); 3615 XGetIconName (disp, parent[0], &s);
3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3558 XFree (s); 3617 XFree (s);
3559 } 3618 }
3560 break; 3619 break;
3561 case 21: /* report window title */ 3620 case 21: /* report window title */
3562 { 3621 {
3563 char *s; 3622 char *s;
3564 XFetchName (disp, TermWin.parent[0], &s); 3623 XFetchName (disp, parent[0], &s);
3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3624 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3566 XFree (s); 3625 XFree (s);
3567 } 3626 }
3568 break; 3627 break;
3569 } 3628 }
3570} 3629}
… …
3573/*----------------------------------------------------------------------*/ 3632/*----------------------------------------------------------------------*/
3574/* 3633/*
3575 * get input up until STRING TERMINATOR (or BEL) 3634 * get input up until STRING TERMINATOR (or BEL)
3576 * ends_how is terminator used. returned input must be free()'d 3635 * ends_how is terminator used. returned input must be free()'d
3577 */ 3636 */
3578unsigned char * 3637char *
3579rxvt_term::get_to_st (unicode_t &ends_how) 3638rxvt_term::get_to_st (unicode_t &ends_how)
3580{ 3639{
3581 unicode_t ch; 3640 unicode_t ch;
3582 bool seen_esc = false; 3641 bool seen_esc = false;
3583 unsigned int n = 0; 3642 unsigned int n = 0;
… …
3616 3675
3617 string[n++] = '\0'; 3676 string[n++] = '\0';
3618 3677
3619 ends_how = (ch == 0x5c ? C0_ESC : ch); 3678 ends_how = (ch == 0x5c ? C0_ESC : ch);
3620 3679
3621 return (unsigned char *)rxvt_wcstombs (string); 3680 return rxvt_wcstombs (string);
3622} 3681}
3623 3682
3624/*----------------------------------------------------------------------*/ 3683/*----------------------------------------------------------------------*/
3625/* 3684/*
3626 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3685 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3627 */ 3686 */
3628void 3687void
3629rxvt_term::process_dcs_seq () 3688rxvt_term::process_dcs_seq ()
3630{ 3689{
3631 unsigned char *s; 3690 char *s;
3632 unicode_t eh; 3691 unicode_t eh;
3633 3692
3634 /* 3693 /*
3635 * Not handled yet 3694 * Not handled yet
3636 */ 3695 */
… …
3655 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3714 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3656 arg = arg * 10 + (ch - '0'); 3715 arg = arg * 10 + (ch - '0');
3657 3716
3658 if (ch == ';') 3717 if (ch == ';')
3659 { 3718 {
3660 unsigned char *s = get_to_st (eh); 3719 char *s = get_to_st (eh);
3661 3720
3662 if (s) 3721 if (s)
3663 { 3722 {
3664 process_xterm_seq (arg, (char *)s, eh); 3723 process_xterm_seq (arg, s, eh);
3665 free (s); 3724 free (s);
3666 } 3725 }
3667 } 3726 }
3668} 3727}
3669 3728
3670void 3729void
3671rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3730rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3672{ 3731{
3673 if (str[0] == '?' && !str[1]) 3732 if (str[0] == '?' && !str[1])
3674 { 3733 {
3675 unsigned short r, g, b; 3734 unsigned short r, g, b;
3676 pix_colors_focused[color].get (display, r, g, b); 3735 pix_colors_focused[color].get (display, r, g, b);
… …
3682 3741
3683/* 3742/*
3684 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3685 */ 3744 */
3686void 3745void
3687rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3746rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3688{ 3747{
3689 int changed = 0; 3748 int changed = 0;
3690 int color; 3749 int color;
3691 char *buf, *name; 3750 char *buf, *name;
3692 bool query = str[0] == '?' && !str[1]; 3751 bool query = str[0] == '?' && !str[1];
… …
3715 unsigned long bytes_after; 3774 unsigned long bytes_after;
3716 unsigned char *value = 0; 3775 unsigned char *value = 0;
3717 const char *str = ""; 3776 const char *str = "";
3718 3777
3719 if (prop 3778 if (prop
3720 && XGetWindowProperty (disp, TermWin.parent[0], 3779 && XGetWindowProperty (disp, parent[0],
3721 prop, 0, 1<<16, 0, AnyPropertyType, 3780 prop, 0, 1<<16, 0, AnyPropertyType,
3722 &actual_type, &actual_format, 3781 &actual_type, &actual_format,
3723 &nitems, &bytes_after, &value) == Success 3782 &nitems, &bytes_after, &value) == Success
3724 && actual_type != None 3783 && actual_type != None
3725 && actual_format == 8) 3784 && actual_format == 8)
… …
3737 { 3796 {
3738 *eq = 0; 3797 *eq = 0;
3739 set_utf8_property (display->atom (str), eq + 1); 3798 set_utf8_property (display->atom (str), eq + 1);
3740 } 3799 }
3741 else 3800 else
3742 XDeleteProperty (disp, TermWin.parent[0], 3801 XDeleteProperty (disp, parent[0],
3743 display->atom (str)); 3802 display->atom (str));
3744 } 3803 }
3745 break; 3804 break;
3746 3805
3747 case XTerm_Color: 3806 case XTerm_Color:
… …
3846 // TODO, when secure mode? 3905 // TODO, when secure mode?
3847 break; 3906 break;
3848 3907
3849#ifdef MENUBAR 3908#ifdef MENUBAR
3850 case URxvt_Menu: 3909 case URxvt_Menu:
3851 if (options & Opt_insecure) 3910 if (OPTION (Opt_insecure))
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3853 break; 3912 break;
3854#endif 3913#endif
3855#if 0 3914#if 0
3856 case XTerm_dumpscreen: /* no error notices */ 3915 case XTerm_dumpscreen: /* no error notices */
… …
3872 case URxvt_italicFont: 3931 case URxvt_italicFont:
3873 case URxvt_boldItalicFont: 3932 case URxvt_boldItalicFont:
3874#endif 3933#endif
3875 if (query) 3934 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", saveop, 3935 tt_printf ("\33]%d;%-.250s%c", saveop,
3877 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3936 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3878 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3937 ? fontset[op - URxvt_font]->fontdesc : "",
3879 resp); 3938 resp);
3880 else 3939 else
3881 { 3940 {
3882 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3941 const char *&res = rs[Rs_font + (op - URxvt_font)];
3883 3942
… …
3888 break; 3947 break;
3889 3948
3890#if ENABLE_FRILLS 3949#if ENABLE_FRILLS
3891 case URxvt_locale: 3950 case URxvt_locale:
3892 if (query) 3951 if (query)
3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3952 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3894 else 3953 else
3895 { 3954 {
3896 set_locale (str); 3955 set_locale (str);
3897 pty.set_utf8_mode (enc_utf8); 3956 pty.set_utf8_mode (enc_utf8);
3898 init_xlocale (); 3957 init_xlocale ();
3899 } 3958 }
3900 break; 3959 break;
3901 3960
3902 case URxvt_view_up: 3961 case URxvt_view_up:
3903 case URxvt_view_down: 3962 case URxvt_view_down:
3963 {
3904 int lines = atoi (str); 3964 int lines = atoi (str);
3905 3965
3906 if (lines) 3966 if (lines)
3907 scr_page (op == URxvt_view_up ? UP : DN, lines); 3967 scr_page (op == URxvt_view_up ? UP : DN, lines);
3908 else 3968 else
3909 {
3910 scr_erase_savelines (); 3969 scr_erase_savelines ();
3911 } 3970 }
3912 3971
3972 break;
3973#endif
3974
3975#if ENABLE_PERL
3976 case URxvt_perl:
3977 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3978 ; // no responses yet
3913 break; 3979 break;
3914#endif 3980#endif
3915 } 3981 }
3916} 3982}
3917/*----------------------------------------------------------------------*/ 3983/*----------------------------------------------------------------------*/
… …
4026 } 4092 }
4027 4093
4028 /* extra handling for values with state unkept */ 4094 /* extra handling for values with state unkept */
4029 switch (arg[i]) 4095 switch (arg[i])
4030 { 4096 {
4097#if ENABLE_STYLES
4098 case 1021:
4099 if (mode)
4100 SET_OPTION (Opt_intensityStyles);
4101 else
4102 CLR_OPTION (Opt_intensityStyles);
4103
4104 scr_touch (true);
4105 break;
4106#endif
4031 case 1048: /* alternative cursor save */ 4107 case 1048: /* alternative cursor save */
4032 case 1049: 4108 case 1049:
4033 if (options & Opt_secondaryScreen) 4109 if (OPTION (Opt_secondaryScreen))
4034 if (mode == 0) 4110 if (mode == 0)
4035 scr_cursor (RESTORE); 4111 scr_cursor (RESTORE);
4036 else if (mode == 1) 4112 else if (mode == 1)
4037 scr_cursor (SAVE); 4113 scr_cursor (SAVE);
4038 break; 4114 break;
… …
4050 */ 4126 */
4051 PrivMode (1, PrivMode_vt52); 4127 PrivMode (1, PrivMode_vt52);
4052 break; 4128 break;
4053 case 3: /* 80/132 */ 4129 case 3: /* 80/132 */
4054 if (priv_modes & PrivMode_132OK) 4130 if (priv_modes & PrivMode_132OK)
4055 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4131 set_widthheight (((state ? 132 : 80) * fwidth), height);
4056 break; 4132 break;
4057 case 4: /* smooth scrolling */ 4133 case 4: /* smooth scrolling */
4058 if (state) 4134 if (!state)
4059 options &= ~Opt_jumpScroll; 4135 SET_OPTION (Opt_jumpScroll);
4060 else 4136 else
4061 options |= Opt_jumpScroll; 4137 CLR_OPTION (Opt_jumpScroll);
4062 break; 4138 break;
4063 case 5: /* reverse video */ 4139 case 5: /* reverse video */
4064 scr_rvideo_mode (state); 4140 scr_rvideo_mode (state);
4065 break; 4141 break;
4066 case 6: /* relative/absolute origins */ 4142 case 6: /* relative/absolute origins */
… …
4107#if 0 4183#if 0
4108 case 1001: 4184 case 1001:
4109 break; /* X11 mouse highlighting */ 4185 break; /* X11 mouse highlighting */
4110#endif 4186#endif
4111 case 1010: /* scroll to bottom on TTY output inhibit */ 4187 case 1010: /* scroll to bottom on TTY output inhibit */
4112 if (state) 4188 if (!state)
4113 options &= ~Opt_scrollTtyOutput; 4189 SET_OPTION (Opt_scrollTtyOutput);
4114 else 4190 else
4115 options |= Opt_scrollTtyOutput; 4191 CLR_OPTION (Opt_scrollTtyOutput);
4116 break; 4192 break;
4117 case 1011: /* scroll to bottom on key press */ 4193 case 1011: /* scroll to bottom on key press */
4118 if (state) 4194 if (state)
4119 options |= Opt_scrollTtyKeypress; 4195 SET_OPTION (Opt_scrollTtyKeypress);
4120 else 4196 else
4121 options &= ~Opt_scrollTtyKeypress; 4197 CLR_OPTION (Opt_scrollTtyKeypress);
4122 break; 4198 break;
4123 case 1047: /* secondary screen w/ clearing last */ 4199 case 1047: /* secondary screen w/ clearing last */
4124 if (options & Opt_secondaryScreen) 4200 if (OPTION (Opt_secondaryScreen))
4125 if (current_screen != PRIMARY) 4201 if (current_screen != PRIMARY)
4126 scr_erase_screen (2); 4202 scr_erase_screen (2);
4127 scr_change_screen (state); 4203 scr_change_screen (state);
4128 break; 4204 break;
4129 case 1049: /* secondary screen w/ clearing first */ 4205 case 1049: /* secondary screen w/ clearing first */
4130 scr_change_screen (state); 4206 scr_change_screen (state);
4131 if (options & Opt_secondaryScreen) 4207 if (OPTION (Opt_secondaryScreen))
4132 if (current_screen != PRIMARY) 4208 if (current_screen != PRIMARY)
4133 scr_erase_screen (2); 4209 scr_erase_screen (2);
4134 break; 4210 break;
4135 default: 4211 default:
4136 break; 4212 break;
… …
4286 case 106: 4362 case 106:
4287 case 107: 4363 case 107:
4288 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4364 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4289 break; 4365 break;
4290#endif 4366#endif
4291
4292 } 4367 }
4293 } 4368 }
4294} 4369}
4295/*}}} */ 4370/*}}} */
4296 4371
… …
4320 */ 4395 */
4321void 4396void
4322rxvt_term::tt_printf (const char *fmt,...) 4397rxvt_term::tt_printf (const char *fmt,...)
4323{ 4398{
4324 va_list arg_ptr; 4399 va_list arg_ptr;
4325 unsigned char buf[256]; 4400 char buf[256];
4326 4401
4327 va_start (arg_ptr, fmt); 4402 va_start (arg_ptr, fmt);
4328 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4403 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4329 va_end (arg_ptr); 4404 va_end (arg_ptr);
4330 tt_write (buf, strlen (buf)); 4405 tt_write (buf, strlen (buf));
… …
4335 * or generated by us in response to a query ESC sequence. 4410 * or generated by us in response to a query ESC sequence.
4336 */ 4411 */
4337const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4412const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4338 4413
4339void 4414void
4340rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4415rxvt_term::tt_write (const char *data, unsigned int len)
4341{ 4416{
4342 if (v_buflen == 0) 4417 if (v_buflen == 0)
4343 { 4418 {
4344 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4419 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4345 4420
… …
4348 4423
4349 data += written; 4424 data += written;
4350 len -= written; 4425 len -= written;
4351 } 4426 }
4352 4427
4353 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4428 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4354 4429
4355 memcpy (v_buffer + v_buflen, data, len); 4430 memcpy (v_buffer + v_buflen, data, len);
4356 v_buflen += len; 4431 v_buflen += len;
4357 4432
4358 pty_ev.set (EVENT_READ | EVENT_WRITE); 4433 pty_ev.set (EVENT_READ | EVENT_WRITE);
… …
4377 } 4452 }
4378 4453
4379 memmove (v_buffer, v_buffer + written, v_buflen); 4454 memmove (v_buffer, v_buffer + written, v_buflen);
4380 } 4455 }
4381 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4456 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4382 // original code just ignores this... 4457 pty_ev.set (EVENT_READ);
4383 destroy ();
4384} 4458}
4385 4459
4386/*----------------------- end-of-file (C source) -----------------------*/ 4460/*----------------------- end-of-file (C source) -----------------------*/
4387 4461

Diff Legend

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