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.354 by sasha, Wed Sep 12 21:06:08 2007 UTC vs.
Revision 1.549 by root, Sun May 11 06:38:39 2014 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
130 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
131#endif 132#endif
132 0, 133 0,
133}; 134};
134 135
135void 136void ecb_cold
136rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
137{ 138{
138 x = Pixel2Col (x); 139 x = Pixel2Col (x);
139 y = Pixel2Row (y); 140 y = Pixel2Row (y);
140 141
… …
148 149
149 text_t t = l.t[x]; 150 text_t t = l.t[x];
150 151
151 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
152 { 153 {
153 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
154 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
155 break; 156 break;
156 } 157 }
157 158
158 x--; 159 x--;
159 } 160 }
160} 161}
161 162
162void 163void ecb_cold
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
183 181
184 alloc = 0; 182 alloc = 0;
185 chr = &ch2; 183 chr = &ch2;
186 len = 1; 184 len = 1;
187 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
188 189
189 char attr[80]; // plenty 190 char attr[80]; // plenty
190 191
191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r, 193 (int)r,
… …
196 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
201 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
202 210
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
205 212
206 if (y >= 0) 213 if (y >= 0)
207 { 214 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 216 x = 0;
210 } 217 }
211 218
212 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
213 222
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 224
216 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
217 { 226 {
218 char buf[9]; 227 char buf[9];
219 228
220 ch = *chr++; 229 ch = *chr++;
221 230
222 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
224 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
225# if !UNICODE3 234# if !UNICODE_3
226 if (ch >= 0x10000) 235 if (ch >= 0x10000)
227 ch = 0xfffd; 236 ch = 0xfffd;
228# endif 237# endif
229 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
230 239
231 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
233 } 242 }
234 243
235// { 244// {
236// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
239// } 248// }
240 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
241 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
242
243 free (fname); 253 free (fname[i]);
254 }
244 255
245# if ENABLE_COMBINING 256# if ENABLE_COMBINING
246 if (alloc) 257 if (alloc)
247 delete [] alloc; 258 delete [] alloc;
248# endif 259# endif
249} 260}
250#endif 261#endif
251 262
252void 263void ecb_cold
253rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
254{ 265{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 267
260 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
261 { 269 {
262 char mb[16]; 270 char mb[MB_LEN_MAX];
263 int len; 271 int len;
264 272
265 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
268 else 276 else
269 { 277 {
270 mb[0] = ch[0]; 278 mb[0] = ch;
271 len = 1; 279 len = 1;
272 } 280 }
273 281
274 if (len > 0) 282 if (len > 0)
275 tt_write (mb, len); 283 tt_write (mb, len);
… …
278 } 286 }
279 287
280 iso14755buf = 0; 288 iso14755buf = 0;
281} 289}
282 290
283int 291static int ecb_cold
284rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
285{ 293{
286 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
289 { 297 {
290 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
291 299
… …
297 305
298 return -1; 306 return -1;
299} 307}
300#endif 308#endif
301 309
302void 310static inline KeySym ecb_cold
311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin
329 };
330
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
332 {
333 unsigned int index = keysym - XK_KP_Home;
334 keysym = kp ? keypadtrans[index] : XK_Home + index;
335 }
336 else if (keysym == XK_KP_Insert)
337 keysym = kp ? XK_KP_0 : XK_Insert;
338# ifndef NO_DELETE_KEY
339 else if (keysym == XK_KP_Delete)
340 keysym = kp ? XK_KP_Decimal : XK_Delete;
341# endif
342#endif
343 return keysym;
344}
345
346static inline int ecb_cold
347map_function_key (KeySym keysym)
348{
349 int param = 0;
350
351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
352 {
353 param = 11 + keysym - XK_F1;
354 if (keysym >= XK_F17)
355 param += 4;
356 else if (keysym >= XK_F15)
357 param += 3;
358 else if (keysym >= XK_F11)
359 param += 2;
360 else if (keysym >= XK_F6)
361 param += 1;
362 }
363 else
364 switch (keysym)
365 {
366 case XK_Find:
367 param = 1;
368 break;
369 case XK_Insert:
370 param = 2;
371 break;
372#ifdef DXK_Remove
373 case DXK_Remove:
374#endif
375 case XK_Execute:
376 param = 3;
377 break;
378 case XK_Select:
379 param = 4;
380 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior:
383 param = 5;
384 break;
385 case XK_Next:
386 param = 6;
387 break;
388 case XK_Home:
389 param = 7;
390 break;
391 case XK_End:
392 param = 8;
393 break;
394#endif
395 case XK_Help:
396 param = 28;
397 break;
398 case XK_Menu:
399 param = 29;
400 break;
401 }
402 return param;
403}
404
405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
414void ecb_cold
303rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
304{ 416{
305 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 418 KeySym keysym;
308 int valid_keysym; 419 int valid_keysym;
309 char kbuf[KBUFSZ]; 420 char rkbuf[KBUFSZ + 1];
421 char *kbuf = rkbuf + 1;
310 422
311#if ISO_14755 423#if ISO_14755
312 if (iso14755buf & ISO_14755_52) 424 if (iso14755buf & ISO_14755_52)
313 return; 425 return;
314#endif 426#endif
… …
321 */ 433 */
322 shft = ev.state & ShiftMask; 434 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 435 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 436 meta = ev.state & ModMetaMask;
325 437
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331
332 kbuf[0] = 0; 438 kbuf[0] = 0;
333 439
334#ifdef USE_XIM 440#if USE_XIM
335 if (Input_Context) 441 if (Input_Context)
336 { 442 {
337 Status status_return; 443 Status status_return;
338 444
339#if 0 445#if 0
… …
390 valid_keysym = keysym != NoSymbol; 496 valid_keysym = keysym != NoSymbol;
391 } 497 }
392 498
393 if (valid_keysym) 499 if (valid_keysym)
394 { 500 {
501 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
502 {
503 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
504 unsigned int newlen = 1;
505
506 if (ev.state & ModNumLockMask)
507 kp = false;
508
509 keysym = translate_keypad (keysym, kp);
510
511 switch (keysym)
512 {
513#ifndef NO_BACKSPACE_KEY
514 case XK_BackSpace:
515 if (priv_modes & PrivMode_HaveBackSpace)
516 {
517 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
518 ^ !!ctrl) ? '\b' : '\177';
519 kbuf[1] = '\0';
520 }
521 else
522 strcpy (kbuf, rs[Rs_backspace_key]);
523 break;
524#endif
525#ifndef NO_DELETE_KEY
526 case XK_Delete:
527 strcpy (kbuf, rs[Rs_delete_key]);
528 break;
529#endif
530 case XK_Tab:
531 if (shft)
532 strcpy (kbuf, "\033[Z");
533 else
534 {
535#ifdef CTRL_TAB_MAKES_META
536 if (ctrl)
537 meta = 1;
538#endif
539#ifdef MOD4_TAB_MAKES_META
540 if (ev.state & Mod4Mask)
541 meta = 1;
542#endif
543 newlen = 0;
544 }
545 break;
546
547 case XK_Up: /* "\033[A" */
548 case XK_Down: /* "\033[B" */
549 case XK_Right: /* "\033[C" */
550 case XK_Left: /* "\033[D" */
551 strcpy (kbuf, "\033[Z");
552 kbuf[2] = "DACB"[keysym - XK_Left];
553 /* do Shift first */
554 if (shft)
555 kbuf[2] = "dacb"[keysym - XK_Left];
556 else if (ctrl)
557 {
558 kbuf[1] = 'O';
559 kbuf[2] = "dacb"[keysym - XK_Left];
560 }
561 else if (priv_modes & PrivMode_aplCUR)
562 kbuf[1] = 'O';
563 break;
564
565 case XK_KP_Enter:
566 /* allow shift to override */
567 if (kp)
568 {
569 strcpy (kbuf, "\033OM");
570 break;
571 }
572
573 /* FALLTHROUGH */
574
575 case XK_Return:
576 if (priv_modes & PrivMode_LFNL)
577 {
578 kbuf[0] = '\015';
579 kbuf[1] = '\012';
580 kbuf[2] = '\0';
581 }
582 else
583 {
584 kbuf[0] = '\015';
585 kbuf[1] = '\0';
586 }
587 break;
588
589 case XK_KP_F1: /* "\033OP" */
590 case XK_KP_F2: /* "\033OQ" */
591 case XK_KP_F3: /* "\033OR" */
592 case XK_KP_F4: /* "\033OS" */
593 strcpy (kbuf, "\033OP");
594 kbuf[2] += (keysym - XK_KP_F1);
595 break;
596
597 case XK_KP_Multiply: /* "\033Oj" : "*" */
598 case XK_KP_Add: /* "\033Ok" : "+" */
599 case XK_KP_Separator: /* "\033Ol" : "," */
600 case XK_KP_Subtract: /* "\033Om" : "-" */
601 case XK_KP_Decimal: /* "\033On" : "." */
602 case XK_KP_Divide: /* "\033Oo" : "/" */
603 case XK_KP_0: /* "\033Op" : "0" */
604 case XK_KP_1: /* "\033Oq" : "1" */
605 case XK_KP_2: /* "\033Or" : "2" */
606 case XK_KP_3: /* "\033Os" : "3" */
607 case XK_KP_4: /* "\033Ot" : "4" */
608 case XK_KP_5: /* "\033Ou" : "5" */
609 case XK_KP_6: /* "\033Ov" : "6" */
610 case XK_KP_7: /* "\033Ow" : "7" */
611 case XK_KP_8: /* "\033Ox" : "8" */
612 case XK_KP_9: /* "\033Oy" : "9" */
613 /* allow shift to override */
614 if (kp)
615 {
616 strcpy (kbuf, "\033Oj");
617 kbuf[2] += (keysym - XK_KP_Multiply);
618 }
619 else
620 {
621 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
622 kbuf[1] = '\0';
623 }
624 break;
625
626 default:
627 {
628 int param = map_function_key (keysym);
629 if (param > 0)
630 sprintf (kbuf,"\033[%d~", param);
631 else
632 newlen = 0;
633 }
634 break;
635 }
636
637 if (newlen)
638 len = strlen (kbuf);
639
640 if (len > 0)
641 {
642 /*
643 * pass Shift/Control indicators for function keys ending with `~'
644 *
645 * eg,
646 * Prior = "ESC[5~"
647 * Shift+Prior = "ESC[5$"
648 * Ctrl+Prior = "ESC[5^"
649 * Ctrl+Shift+Prior = "ESC[5@"
650 */
651 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
652 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
653
654 /*
655 * Pass meta for all function keys, if 'meta' option set
656 */
657#ifdef META8_OPTION
658 if (meta && (meta_char == 0x80))
659 kbuf[len - 1] |= 0x80;
660#endif
661 }
662
663 }
664 else if (ctrl && keysym == XK_minus)
665 {
666 len = 1;
667 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
668 }
669 else if (keysym == XK_ISO_Left_Tab)
670 {
671 strcpy (kbuf, "\033[Z");
672 len = 3;
673 }
674 else
675 {
676#ifdef META8_OPTION
677 /* set 8-bit on */
678 if (meta && (meta_char == 0x80))
679 {
680 char *ch;
681
682 for (ch = kbuf; ch < kbuf + len; ch++)
683 *ch |= 0x80;
684
685 meta = 0;
686 }
687#endif
688 /* nil */ ;
689 }
690 }
691
692 /* escape prefix */
693 if (len && meta
694#ifdef META8_OPTION
695 && meta_char == C0_ESC
696#endif
697 )
698 {
699 *--kbuf = C0_ESC;
700 len++;
701 }
702
703 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
704 return;
705
706 if (valid_keysym)
707 {
395#ifdef KEYSYM_RESOURCE 708#ifdef KEYSYM_RESOURCE
396 if (keyboard->dispatch (this, keysym, ev.state)) 709 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
397 return; 710 return;
398#endif 711#endif
399 712
400 if (saveLines) 713 if (saveLines)
401 { 714 {
… …
410#ifdef PAGING_CONTEXT_LINES 723#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 724 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 725#else
413 lnsppg = nrow * 4 / 5; 726 lnsppg = nrow * 4 / 5;
414#endif 727#endif
728 max_it (lnsppg, 1);
729
415 if (keysym == XK_Prior) 730 if (keysym == XK_Prior)
416 { 731 {
417 scr_page (UP, lnsppg); 732 scr_page (lnsppg);
418 return; 733 return;
419 } 734 }
420 else if (keysym == XK_Next) 735 else if (keysym == XK_Next)
421 { 736 {
422 scr_page (DN, lnsppg); 737 scr_page (-lnsppg);
423 return; 738 return;
424 } 739 }
425 } 740 }
426#ifdef SCROLL_ON_UPDOWN_KEYS 741#ifdef SCROLL_ON_UPDOWN_KEYS
427 if (IS_SCROLL_MOD) 742 if (IS_SCROLL_MOD)
428 { 743 {
429 if (keysym == XK_Up) 744 if (keysym == XK_Up)
430 { 745 {
431 scr_page (UP, 1); 746 scr_page (1);
432 return; 747 return;
433 } 748 }
434 else if (keysym == XK_Down) 749 else if (keysym == XK_Down)
435 { 750 {
436 scr_page (DN, 1); 751 scr_page (-1);
437 return; 752 return;
438 } 753 }
439 } 754 }
440#endif 755#endif
441#ifdef SCROLL_ON_HOMEEND_KEYS 756#ifdef SCROLL_ON_HOMEEND_KEYS
442 if (IS_SCROLL_MOD) 757 if (IS_SCROLL_MOD)
443 { 758 {
444 if (keysym == XK_Home) 759 if (keysym == XK_Home)
445 { 760 {
446 scr_move_to (0, 1); 761 scr_changeview (top_row);
447 return; 762 return;
448 } 763 }
449 else if (keysym == XK_End) 764 else if (keysym == XK_End)
450 { 765 {
451 scr_move_to (1, 1); 766 scr_changeview (0);
452 return; 767 return;
453 } 768 }
454 } 769 }
455#endif 770#endif
456 } 771 }
… …
472 selection_request (ev.time); 787 selection_request (ev.time);
473 return; 788 return;
474#if TODO 789#if TODO
475 /* rxvt extras */ 790 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 791 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 792 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 793 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 794 return;
482#endif 795#endif
483 } 796 }
484 } 797 }
485 } 798 }
486 799
800 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
801 {
802 if (keysym == XK_v)
803 selection_request (ev.time, Sel_Clipboard);
804 else if (selection.len > 0)
805 {
806 free (selection.clip_text);
807 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
808 selection.clip_len = selection.len;
809 selection_grab (CurrentTime, true);
810 }
811
812 return;
813 }
814
487#if ENABLE_FRILLS || ISO_14755 815#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 816 // ISO 14755 support
489 if (shft && ctrl) 817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 818 {
491 int hv; 819 int hv;
492 820
493 if (iso14755buf & ISO_14755_51 821 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 822 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 852 scr_overlay_off ();
525# endif 853# endif
526 iso14755buf = 0; 854 iso14755buf = 0;
527 } 855 }
528 } 856 }
857 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 858 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 859 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 860 if (!(iso14755buf & ISO_14755_STARTED))
532 { 861 {
533 iso14755buf |= ISO_14755_STARTED; 862 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 863# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 864 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
543 { 872 {
544 scr_printscreen (ctrl | shft); 873 scr_printscreen (ctrl | shft);
545 return; 874 return;
546 } 875 }
547#endif 876#endif
548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1;
554 switch (keysym)
555 {
556#ifndef NO_BACKSPACE_KEY
557 case XK_BackSpace:
558 if (priv_modes & PrivMode_HaveBackSpace)
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else
565 strcpy (kbuf, rs[Rs_backspace_key]);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, rs[Rs_delete_key]);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if (kp)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if (kp)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if (kp)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if (kp)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if (kp)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if (kp)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0;
840 break;
841 }
842
843 if (newlen)
844 len = strlen (kbuf);
845 }
846
847 /*
848 * Pass meta for all function keys, if 'meta' option set
849 */
850#ifdef META8_OPTION
851 if (meta && (meta_char == 0x80) && len > 0)
852 kbuf[len - 1] |= 0x80;
853#endif
854
855 }
856 else if (ctrl && keysym == XK_minus)
857 {
858 len = 1;
859 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
860 }
861 else if (keysym == XK_ISO_Left_Tab)
862 {
863 strcpy (kbuf, "\033[Z");
864 len = 3;
865 }
866 else
867 {
868#ifdef META8_OPTION
869 /* set 8-bit on */
870 if (meta && (meta_char == 0x80))
871 {
872 char *ch;
873
874 for (ch = kbuf; ch < kbuf + len; ch++)
875 *ch |= 0x80;
876
877 meta = 0;
878 }
879#endif
880 /* nil */ ;
881 }
882 } 877 }
883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886 878
887 if (len <= 0) 879 if (len <= 0)
888 return; /* not mapped */ 880 return; /* not mapped */
889 881
890 if (option (Opt_scrollTtyKeypress))
891 if (view_start)
892 {
893 view_start = 0;
894 want_refresh = 1;
895 }
896
897 /*
898 * these modifications only affect the static keybuffer
899 * pass Shift/Control indicators for function keys ending with `~'
900 *
901 * eg,
902 * Prior = "ESC[5~"
903 * Shift+Prior = "ESC[5$"
904 * Ctrl+Prior = "ESC[5^"
905 * Ctrl+Shift+Prior = "ESC[5@"
906 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
907 */
908 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
909 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
910
911 /* escape prefix */
912 if (meta
913#ifdef META8_OPTION
914 && meta_char == C0_ESC
915#endif
916 )
917 {
918 const char ch = C0_ESC;
919 tt_write (&ch, 1);
920 }
921
922 tt_write (kbuf, (unsigned int)len); 882 tt_write_user_input (kbuf, (unsigned int)len);
923} 883}
924 884
925void 885void ecb_cold
926rxvt_term::key_release (XKeyEvent &ev) 886rxvt_term::key_release (XKeyEvent &ev)
927{ 887{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 888#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym; 889 KeySym keysym;
930 890
… …
950 commit_iso14755 (); 910 commit_iso14755 ();
951 911
952 return; 912 return;
953 } 913 }
954 914
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 915 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 916 if (i[0] == keysym)
957 { 917 {
958 iso14755buf = ISO_14755_51 | i[1]; 918 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 919 commit_iso14755 ();
960 920
… …
997 else if (keysym == XK_Control_L || keysym == XK_Control_R) 957 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0; 958 mouse_slip_wheel_speed = 0;
999#endif 959#endif
1000} 960}
1001 961
1002#if defined (KEYSYM_RESOURCE)
1003unsigned int
1004rxvt_term::cmd_write (const char *str, unsigned int count)
1005{
1006 unsigned int n, s;
1007
1008 n = cmdbuf_ptr - cmdbuf_base;
1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1010
1011 if (n > 0 && s < count)
1012 {
1013 memmove (cmdbuf_base, cmdbuf_ptr,
1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1015 cmdbuf_ptr = cmdbuf_base;
1016 cmdbuf_endp -= n;
1017 s += n;
1018 }
1019
1020 if (count > s)
1021 {
1022 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1023 count = s;
1024 }
1025
1026 for (; count--;)
1027 *cmdbuf_endp++ = *str++;
1028
1029 cmd_parse ();
1030
1031 return 0;
1032}
1033#endif
1034
1035void 962void
1036rxvt_term::flush () 963rxvt_term::flush ()
1037{ 964{
1038 flush_ev.stop (); 965 flush_ev.stop ();
966
967#ifdef HAVE_IMG
968 if (bg_flags & BG_NEEDS_REFRESH)
969 {
970 bg_flags &= ~BG_NEEDS_REFRESH;
971 scr_touch (false);
972 }
973#endif
1039 974
1040 if (want_refresh) 975 if (want_refresh)
1041 { 976 {
1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 977 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043 { 978 {
… …
1076 } 1011 }
1077 while (row < end_row); 1012 while (row < end_row);
1078 } 1013 }
1079 1014
1080 scr_refresh (); 1015 scr_refresh ();
1081 scrollbar_show (1); 1016 scrollBar.show (1);
1082#ifdef USE_XIM 1017#if USE_XIM
1083 IMSendSpot (); 1018 im_send_spot ();
1084#endif 1019#endif
1085 } 1020 }
1086 1021
1087 display->flush (); 1022 display->flush ();
1088} 1023}
1089 1024
1025/* checks whether a refresh is requested and starts the refresh timer */
1090void 1026void
1091rxvt_term::check_cb (check_watcher &w) 1027rxvt_term::refresh_check ()
1092{ 1028{
1093 make_current (); 1029 if (want_refresh && !flush_ev.is_active ())
1030 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1094 1031
1095 display->flush (); 1032 display->flush ();
1096
1097 if (want_refresh && !flush_ev.active)
1098 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1099} 1033}
1100 1034
1101void 1035void
1102rxvt_term::flush_cb (time_watcher &w) 1036rxvt_term::flush_cb (ev::timer &w, int revents)
1103{ 1037{
1104 make_current (); 1038 make_current ();
1105 1039
1106 refresh_count = 0; 1040 refresh_count = 0;
1107 flush (); 1041 flush ();
1108} 1042}
1109 1043
1110#ifdef CURSOR_BLINK 1044#ifdef CURSOR_BLINK
1111void 1045void
1046rxvt_term::cursor_blink_reset ()
1047{
1048 if (hidden_cursor)
1049 {
1050 hidden_cursor = 0;
1051 want_refresh = 1;
1052 }
1053
1054 if (option (Opt_cursorBlink))
1055 cursor_blink_ev.again ();
1056 else
1057 cursor_blink_ev.stop ();
1058}
1059
1060void
1112rxvt_term::cursor_blink_cb (time_watcher &w) 1061rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1113{ 1062{
1114 hidden_cursor = !hidden_cursor; 1063 hidden_cursor = !hidden_cursor;
1115 want_refresh = 1; 1064 want_refresh = 1;
1116 1065 refresh_check ();
1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
1118} 1066}
1119#endif 1067#endif
1120 1068
1121#ifdef TEXT_BLINK 1069#ifdef TEXT_BLINK
1122void 1070void
1123rxvt_term::text_blink_cb (time_watcher &w) 1071rxvt_term::text_blink_cb (ev::timer &w, int revents)
1124{ 1072{
1125 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1073 if (scr_refresh_rend (RS_Blink, RS_Blink))
1126 { 1074 {
1127 hidden_text = !hidden_text; 1075 hidden_text = !hidden_text;
1128 want_refresh = 1; 1076 want_refresh = 1;
1129 w.start (w.at + TEXT_BLINK_INTERVAL); 1077 refresh_check ();
1130 } 1078 }
1079 else
1080 w.stop ();
1131} 1081}
1132#endif 1082#endif
1133 1083
1134#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1084#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1135void 1085void
1136rxvt_term::cont_scroll_cb (time_watcher &w) 1086rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1137{ 1087{
1138 if ((scrollbar_isUp() || scrollbar_isDn()) && 1088 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1139 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1089 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1140 { 1090 {
1141 want_refresh = 1; 1091 want_refresh = 1;
1142 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1092 refresh_check ();
1143 } 1093 }
1094 else
1095 w.stop ();
1144} 1096}
1145#endif 1097#endif
1146 1098
1147#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1148void 1100void
1149rxvt_term::sel_scroll_cb (time_watcher &w) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1150{ 1102{
1151 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_lines))
1152 { 1104 {
1153 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1154 want_refresh = 1; 1106 want_refresh = 1;
1155 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1107 refresh_check ();
1156 } 1108 }
1109 else
1110 w.stop ();
1157} 1111}
1158#endif 1112#endif
1159 1113
1160#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1114#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1161void 1115void
1162rxvt_term::slip_wheel_cb (time_watcher &w) 1116rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1163{ 1117{
1164 if (mouse_slip_wheel_speed == 0 1118 if (scr_page (mouse_slip_wheel_speed))
1165 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1166 : scr_page (UP, mouse_slip_wheel_speed))
1167 { 1119 {
1168 if (view_start == top_row || view_start == 0)
1169 mouse_slip_wheel_speed = 0;
1170
1171 want_refresh = 1; 1120 want_refresh = 1;
1172 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1121 refresh_check ();
1122 }
1123
1124 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1125 {
1126 mouse_slip_wheel_speed = 0;
1127 w.stop ();
1173 } 1128 }
1174} 1129}
1175#endif 1130#endif
1176 1131
1177#if LINUX_YIELD_HACK 1132#if LINUX_YIELD_HACK
1178static struct event_handler 1133static struct event_handler
1179{ 1134{
1180 check_watcher yield_ev; 1135 ev::prepare yield_ev;
1181 1136
1182 void yield_cb (check_watcher &w) 1137 void yield_cb (ev::prepare &w, int revents)
1183 { 1138 {
1184 // this should really be sched_yield(), but the linux guys thought 1139 // this should really be sched_yield(), but the linux guys thought
1185 // that giving a process calling sched_yield () less cpu time than 1140 // that giving a process calling sched_yield () less cpu time than
1186 // ones with high nice levels is a useful thing to do. It surely is is 1141 // ones with high nice levels is a useful thing to do. It surely is is
1187 // allowed by the sus... as is returning ENOSYS. 1142 // allowed by the sus... as is returning ENOSYS.
1143 // since the linux guys additionally thought that breaking the only
1144 // known workaround against their unusable sched_yield hack is cool,
1145 // we just nanosleep a bit and hope for the best.
1188 1146
1189 struct timespec ts = { 0, 0 }; 1147 struct timespec ts = { 0, 1000 };
1190 nanosleep (&ts, 0); 1148 nanosleep (&ts, 0);
1191 1149
1192 w.stop (); 1150 w.stop ();
1193 } 1151 }
1194 1152
… …
1197 { 1155 {
1198 } 1156 }
1199} event_handler; 1157} event_handler;
1200#endif 1158#endif
1201 1159
1160/* make sure all the cmd data is at beginning of cmdbuf */
1161void
1162rxvt_term::cmdbuf_reify ()
1163{
1164 if (cmdbuf_ptr == cmdbuf_base)
1165 return;
1166
1167 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1168
1169 memmove (cmdbuf_base, cmdbuf_ptr, used);
1170 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + used;
1172
1173}
1174
1175#if defined (KEYSYM_RESOURCE)
1176void
1177rxvt_term::cmdbuf_append (const char *str, size_t count)
1178{
1179 cmdbuf_reify ();
1180
1181 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1182
1183 if (count > avail)
1184 return;
1185
1186 memcpy (cmdbuf_endp, str, count);
1187 cmdbuf_endp += count;
1188
1189 cmd_parse ();
1190}
1191#endif
1192
1202bool 1193bool
1203rxvt_term::pty_fill () 1194rxvt_term::pty_fill ()
1204{ 1195{
1205 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1196 cmdbuf_reify ();
1206 1197
1207 if (CBUFSIZ == n) 1198 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1208 { 1199
1209 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1200 if (!avail)
1210 n = 0;
1211 } 1201 {
1212 1202 // normally this indicates a "too long" command sequence - just drop the data we have
1213 memmove (cmdbuf_base, cmdbuf_ptr, n);
1214 cmdbuf_ptr = cmdbuf_base; 1203 cmdbuf_ptr = cmdbuf_base;
1215 cmdbuf_endp = cmdbuf_ptr + n; 1204 cmdbuf_endp = cmdbuf_ptr;
1205 avail = CBUFSIZ;
1206 }
1216 1207
1217 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1208 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1218 1209
1219 if (r > 0) 1210 if (r > 0)
1220 { 1211 {
1221 cmdbuf_endp += r; 1212 cmdbuf_endp += r;
1222 return true; 1213 return true;
… …
1238 1229
1239 return false; 1230 return false;
1240} 1231}
1241 1232
1242void 1233void
1243rxvt_term::pty_cb (io_watcher &w, short revents) 1234rxvt_term::pty_cb (ev::io &w, int revents)
1244{ 1235{
1245 make_current (); 1236 make_current ();
1246 1237
1247 if (revents & EVENT_READ) 1238 if (revents & ev::READ)
1248 // loop, but don't allow a single term to monopolize us 1239 // loop, but don't allow a single term to monopolize us
1249 while (pty_fill ()) 1240 for (int i = CBUFCNT; i-- && pty_fill (); )
1250 if (cmd_parse ()) 1241 cmd_parse ();
1251 break;
1252 1242
1253 if (revents & EVENT_WRITE) 1243 if (revents & ev::WRITE)
1254 pty_write (); 1244 pty_write ();
1255}
1256 1245
1257void 1246 refresh_check ();
1247}
1248
1249void ecb_cold
1258rxvt_term::pointer_unblank () 1250rxvt_term::pointer_unblank ()
1259{ 1251{
1260 XDefineCursor (dpy, vt, TermWin_cursor); 1252 XDefineCursor (dpy, vt, TermWin_cursor);
1261 recolour_cursor (); 1253 recolour_cursor ();
1262 1254
1263#ifdef POINTER_BLANK 1255#ifdef POINTER_BLANK
1264 hidden_pointer = 0; 1256 hidden_pointer = 0;
1265 1257
1266 if (option (Opt_pointerBlank)) 1258 if (option (Opt_pointerBlank))
1267 pointer_ev.start (NOW + pointerBlankDelay); 1259 pointer_ev.start (pointerBlankDelay);
1268#endif 1260#endif
1269} 1261}
1270 1262
1271#ifdef POINTER_BLANK 1263#ifdef POINTER_BLANK
1272void 1264void ecb_cold
1273rxvt_term::pointer_blank () 1265rxvt_term::pointer_blank ()
1274{ 1266{
1275 if (!option (Opt_pointerBlank)) 1267 if (!option (Opt_pointerBlank))
1276 return; 1268 return;
1277 1269
… …
1279 XFlush (dpy); 1271 XFlush (dpy);
1280 1272
1281 hidden_pointer = 1; 1273 hidden_pointer = 1;
1282} 1274}
1283 1275
1284void 1276void ecb_cold
1285rxvt_term::pointer_cb (time_watcher &w) 1277rxvt_term::pointer_cb (ev::timer &w, int revents)
1286{ 1278{
1287 make_current (); 1279 make_current ();
1288 1280
1289 pointer_blank (); 1281 pointer_blank ();
1290} 1282}
… …
1293void 1285void
1294rxvt_term::mouse_report (XButtonEvent &ev) 1286rxvt_term::mouse_report (XButtonEvent &ev)
1295{ 1287{
1296 int button_number, key_state = 0; 1288 int button_number, key_state = 0;
1297 int x, y; 1289 int x, y;
1290 int code = 32;
1298 1291
1299 x = ev.x; 1292 x = Pixel2Col (ev.x) + 1;
1300 y = ev.y; 1293 y = Pixel2Row (ev.y) + 1;
1301 pixel_position (&x, &y); 1294
1295 if (ev.type == MotionNotify)
1296 {
1297 if (x == mouse_row && y == mouse_col)
1298 return;
1299
1300 mouse_row = x;
1301 mouse_col = y;
1302 code += 32;
1303 }
1302 1304
1303 if (MEvent.button == AnyButton) 1305 if (MEvent.button == AnyButton)
1304 button_number = 3; 1306 button_number = 3;
1305 else 1307 else
1306 { 1308 {
1307 button_number = MEvent.button - Button1; 1309 button_number = MEvent.button - Button1;
1308 /* add 0x3D for wheel events, like xterm does */ 1310 /* add 0x3D for wheel events, like xterm does */
1309 if (button_number >= 3) 1311 if (button_number >= 3)
1310 button_number += (64 - 3); 1312 button_number += 64 - 3;
1311 } 1313 }
1312 1314
1313 if (priv_modes & PrivMode_MouseX10) 1315 if (priv_modes & PrivMode_MouseX10)
1314 { 1316 {
1315 /* 1317 /*
… …
1347 fputc ('A', stderr); 1349 fputc ('A', stderr);
1348 if (key_state & 32) 1350 if (key_state & 32)
1349 fputc ('2', stderr); 1351 fputc ('2', stderr);
1350 fprintf (stderr, "]: <%d>, %d/%d\n", 1352 fprintf (stderr, "]: <%d>, %d/%d\n",
1351 button_number, 1353 button_number,
1352 x + 1, 1354 x,
1353 y + 1); 1355 y);
1354#endif 1356#endif
1355 1357
1358#if ENABLE_FRILLS
1359 if (priv_modes & PrivMode_ExtMouseRight)
1360 tt_printf ("\033[%d;%d;%dM",
1361 code + button_number + key_state,
1362 x,
1363 y);
1364 else if (priv_modes & PrivMode_ExtModeMouse)
1365 tt_printf ("\033[M%c%lc%lc",
1366 code + button_number + key_state,
1367 wint_t (32 + x),
1368 wint_t (32 + y));
1369 else
1370#endif
1356 tt_printf ("\033[M%c%c%c", 1371 tt_printf ("\033[M%c%c%c",
1357 (32 + button_number + key_state), 1372 code + button_number + key_state,
1358 (32 + x + 1), 1373 32 + x,
1359 (32 + y + 1)); 1374 32 + y);
1360} 1375}
1361 1376
1362/*{{{ process an X event */ 1377/*{{{ process an X event */
1363void 1378void ecb_hot
1364rxvt_term::x_cb (XEvent &ev) 1379rxvt_term::x_cb (XEvent &ev)
1365{ 1380{
1366 make_current (); 1381 make_current ();
1367 1382
1368 dLocal (Display *, dpy); 1383 dLocal (Display *, dpy);
… …
1466 && ev.xfocus.mode != NotifyGrab) 1481 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1482 focus_out ();
1468 break; 1483 break;
1469 1484
1470 case ConfigureNotify: 1485 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/
1474 if (ev.xconfigure.window == parent[0]) 1486 if (ev.xconfigure.window == parent)
1475 { 1487 {
1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1488 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1477 ; 1489 ;
1490
1491 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1492
1493 bool moved = false;
1494#ifdef HAVE_BG_PIXMAP
1495 if (bg_window_position_sensitive ())
1496 {
1497 want_position_change = true;
1498 if (bg_img == 0)
1499 moved = true;
1500 }
1501#endif
1502
1503 if (want_position_change)
1504 {
1505 int x, y;
1506
1507 if (ev.xconfigure.send_event)
1508 {
1509 x = ev.xconfigure.x;
1510 y = ev.xconfigure.y;
1511 }
1512 else
1513 get_window_origin (x, y);
1514
1515 if (x != parent_x || y != parent_y)
1516 {
1517 parent_x = x;
1518 parent_y = y;
1519 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1520 moved = true;
1521 }
1522 }
1478 1523
1479 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1524 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1480 { 1525 {
1481 seen_resize = 1; 1526 seen_resize = 1;
1482 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1527 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1483 } 1528 }
1484 else 1529 else
1485 { 1530 {
1486#ifdef HAVE_BG_PIXMAP 1531#ifdef HAVE_BG_PIXMAP
1487 if (bgPixmap.window_position_sensitive ()) 1532 if (moved)
1488 update_background (); 1533 update_background ();
1489#endif 1534#endif
1490 } 1535 }
1536
1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1537 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1492 } 1538 }
1493 break; 1539 break;
1494 1540
1495 case PropertyNotify: 1541 case PropertyNotify:
1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1542 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1498 && ev.xproperty.state == PropertyNewValue)
1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1500
1501 break; 1543 break;
1502 1544
1503 case SelectionClear: 1545 case SelectionClear:
1504 selection_clear (); 1546 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1505 break;
1506
1507 case SelectionNotify:
1508 if (selection_wait == Sel_normal)
1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1510 break; 1547 break;
1511 1548
1512 case SelectionRequest: 1549 case SelectionRequest:
1513 selection_send (ev.xselectionrequest); 1550 selection_send (ev.xselectionrequest);
1514 break; 1551 break;
1515 1552
1516 case MapNotify: 1553 case MapNotify:
1554#ifdef HAVE_BG_PIXMAP
1555 // This is needed at startup for the case of no window manager
1556 // or a non-reparenting window manager and also because we
1557 // defer bg image updates if the window is not mapped. The
1558 // short delay is to optimize for multiple ConfigureNotify
1559 // events at startup when the window manager reparents the
1560 // window, so as to perform the computation after we have
1561 // received all of them.
1562 if (bg_img == 0)
1563 update_background_ev.start (0.025);
1564#endif
1517 mapped = 1; 1565 mapped = 1;
1518#ifdef TEXT_BLINK 1566#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1567 text_blink_ev.start ();
1520#endif 1568#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1569 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break; 1570 break;
1523 1571
1524 case UnmapNotify: 1572 case UnmapNotify:
… …
1532 case GraphicsExpose: 1580 case GraphicsExpose:
1533 case Expose: 1581 case Expose:
1534 if (ev.xany.window == vt) 1582 if (ev.xany.window == vt)
1535 { 1583 {
1536 do 1584 do
1585 {
1537 scr_expose (ev.xexpose.x, ev.xexpose.y, 1586 scr_expose (ev.xexpose.x, ev.xexpose.y,
1538 ev.xexpose.width, ev.xexpose.height, False); 1587 ev.xexpose.width, ev.xexpose.height, false);
1588 }
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1589 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540 1590
1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1591 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542 1592
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1593 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1594 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1595 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1596 ev.xexpose.width, ev.xexpose.height, false);
1597 }
1546 1598
1547 want_refresh = 1; 1599 want_refresh = 1;
1548 } 1600 }
1549 else 1601 else
1550 { 1602 {
… …
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1605 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1554 ; 1606 ;
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1607 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1556 ; 1608 ;
1557 1609
1558 if (isScrollbarWindow (ev.xany.window)) 1610 if (scrollBar.state && ev.xany.window == scrollBar.win)
1559 { 1611 {
1560 scrollBar.setIdle (); 1612 scrollBar.state = SB_STATE_IDLE;
1561 scrollbar_show (0); 1613 scrollBar.show (0);
1562 } 1614 }
1563 } 1615 }
1564 break; 1616 break;
1565 1617
1566 case MotionNotify: 1618 case MotionNotify:
1567#ifdef POINTER_BLANK 1619#ifdef POINTER_BLANK
1568 if (hidden_pointer) 1620 if (hidden_pointer)
1569 pointer_unblank (); 1621 pointer_unblank ();
1570#endif 1622#endif
1623 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1624 || priv_modes & PrivMode_MouseAnyEvent)
1625 mouse_report (ev.xbutton);
1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1626 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1572 break; 1627 break;
1573 1628
1574 if (ev.xany.window == vt) 1629 if (ev.xany.window == vt)
1575 { 1630 {
… …
1604 1659
1605#ifdef SELECTION_SCROLLING 1660#ifdef SELECTION_SCROLLING
1606 if (ev.xbutton.y < int_bwidth 1661 if (ev.xbutton.y < int_bwidth
1607 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1662 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1608 { 1663 {
1664 page_dirn scroll_selection_dir;
1609 int dist; 1665 int dist;
1610 1666
1611 /* don't clobber the current delay if we are 1667 /* don't clobber the current delay if we are
1612 * already in the middle of scrolling. 1668 * already in the middle of scrolling.
1613 */ 1669 */
1614 if (!sel_scroll_ev.active) 1670 if (!sel_scroll_ev.is_active ())
1615 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1671 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1616 1672
1617 /* save the event params so we can highlight 1673 /* save the event params so we can highlight
1618 * the selection in the pending-scroll loop 1674 * the selection in the pending-scroll loop
1619 */ 1675 */
1620 selection_save_x = ev.xbutton.x; 1676 selection_save_x = ev.xbutton.x;
… …
1628 dist = int_bwidth - ev.xbutton.y; 1684 dist = int_bwidth - ev.xbutton.y;
1629 } 1685 }
1630 else 1686 else
1631 { 1687 {
1632 scroll_selection_dir = DN; 1688 scroll_selection_dir = DN;
1633 dist = ev.xbutton.y - (int_bwidth + height); 1689 dist = ev.xbutton.y - (int_bwidth + vt_height);
1634 } 1690 }
1635 1691
1636 scroll_selection_lines = Pixel2Height (dist) 1692 scroll_selection_lines = Pixel2Height (dist)
1637 / SELECTION_SCROLL_LINE_SPEEDUP 1693 / SELECTION_SCROLL_LINE_SPEEDUP
1638 + 1; 1694 + 1;
1639 min_it (scroll_selection_lines, 1695 min_it (scroll_selection_lines,
1640 SELECTION_SCROLL_MAX_LINES); 1696 SELECTION_SCROLL_MAX_LINES);
1697 scroll_selection_lines *= scroll_selection_dir;
1641 } 1698 }
1642 else 1699 else
1643 { 1700 {
1644 /* we are within the text window, so we 1701 /* we are within the text window, so we
1645 * shouldn't be scrolling 1702 * shouldn't be scrolling
1646 */ 1703 */
1647 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 1704 sel_scroll_ev.stop();
1649 } 1705 }
1650#endif 1706#endif
1651#ifdef MOUSE_THRESHOLD 1707#ifdef MOUSE_THRESHOLD
1652 } 1708 }
1653#endif 1709#endif
1654 } 1710 }
1655 } 1711 }
1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1712 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1713 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1714 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1715 MotionNotify, &ev))
1660 ; 1716 ;
1661 1717
1662 XQueryPointer (dpy, scrollBar.win, 1718 XQueryPointer (dpy, scrollBar.win,
1663 &unused_root, &unused_child, 1719 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1720 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1721 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1722 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1723 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1724 scrollBar.size ());
1669 want_refresh = 1; 1725 want_refresh = 1;
1670 scrollbar_show (1); 1726 scrollBar.show (1);
1671 } 1727 }
1672 break; 1728 break;
1673 } 1729 }
1674 1730
1675#if defined(CURSOR_BLINK) 1731#if defined(CURSOR_BLINK)
1676 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1732 if (ev.type == KeyPress)
1677 { 1733 cursor_blink_reset ();
1678 if (hidden_cursor)
1679 {
1680 hidden_cursor = 0;
1681 want_refresh = 1;
1682 }
1683
1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1685 }
1686#endif 1734#endif
1687 1735
1688#if defined(POINTER_BLANK) 1736#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1737 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1690 { 1738 {
… …
1696 1744
1697 if (ev.type == KeyPress && hidden_pointer == 0) 1745 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank (); 1746 pointer_blank ();
1699 } 1747 }
1700#endif 1748#endif
1701}
1702 1749
1703void 1750 refresh_check ();
1751}
1752
1753#if ENABLE_FRILLS
1754void ecb_cold
1755rxvt_term::set_urgency (bool enable)
1756{
1757 if (enable == urgency_hint)
1758 return;
1759
1760 if (XWMHints *h = XGetWMHints (dpy, parent))
1761 {
1762 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1763 XSetWMHints (dpy, parent, h);
1764 urgency_hint = enable;
1765 XFree (h);
1766 }
1767}
1768#endif
1769
1770void ecb_cold
1704rxvt_term::focus_in () 1771rxvt_term::focus_in ()
1705{ 1772{
1706 if (!focus) 1773 if (!focus)
1707 { 1774 {
1708 focus = 1; 1775 focus = 1;
1709 want_refresh = 1; 1776 want_refresh = 1;
1710 1777
1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1712
1713#if USE_XIM 1778#if USE_XIM
1714 if (Input_Context != NULL) 1779 if (Input_Context != NULL)
1715 { 1780 {
1716 IMSetPosition (); 1781 im_set_position ();
1717 XSetICFocus (Input_Context); 1782 XSetICFocus (Input_Context);
1718 } 1783 }
1719#endif 1784#endif
1720#if CURSOR_BLINK 1785#if CURSOR_BLINK
1721 if (option (Opt_cursorBlink)) 1786 if (option (Opt_cursorBlink))
1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1787 cursor_blink_ev.again ();
1723#endif 1788#endif
1724#if OFF_FOCUS_FADING 1789#if OFF_FOCUS_FADING
1725 if (rs[Rs_fade]) 1790 if (rs[Rs_fade])
1726 { 1791 {
1727 pix_colors = pix_colors_focused; 1792 pix_colors = pix_colors_focused;
1728 scr_recolour (); 1793 scr_recolour ();
1729 } 1794 }
1730#endif 1795#endif
1731#if ENABLE_FRILLS 1796#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell)) 1797 if (option (Opt_urgentOnBell))
1733 { 1798 set_urgency (0);
1734 XWMHints *h;
1735
1736 h = XGetWMHints(dpy, parent[0]);
1737 if (h != NULL)
1738 {
1739 h->flags &= ~XUrgencyHint;
1740 XSetWMHints(dpy, parent[0], h);
1741 }
1742 }
1743#endif 1799#endif
1744 }
1745}
1746 1800
1747void 1801 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1802 }
1803}
1804
1805void ecb_cold
1748rxvt_term::focus_out () 1806rxvt_term::focus_out ()
1749{ 1807{
1750 if (focus) 1808 if (focus)
1751 { 1809 {
1752 focus = 0; 1810 focus = 0;
1753 want_refresh = 1; 1811 want_refresh = 1;
1754 1812
1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1813#if ENABLE_FRILLS
1756 1814 if (option (Opt_urgentOnBell))
1815 set_urgency (0);
1816#endif
1757#if ENABLE_FRILLS || ISO_14755 1817#if ENABLE_FRILLS || ISO_14755
1758 if (iso14755buf) 1818 if (iso14755buf)
1759 { 1819 {
1760 iso14755buf = 0; 1820 iso14755buf = 0;
1761# if ISO_14755 1821# if ISO_14755
… …
1768 XUnsetICFocus (Input_Context); 1828 XUnsetICFocus (Input_Context);
1769#endif 1829#endif
1770#if CURSOR_BLINK 1830#if CURSOR_BLINK
1771 if (option (Opt_cursorBlink)) 1831 if (option (Opt_cursorBlink))
1772 cursor_blink_ev.stop (); 1832 cursor_blink_ev.stop ();
1833
1773 hidden_cursor = 0; 1834 hidden_cursor = 0;
1774#endif 1835#endif
1775#if OFF_FOCUS_FADING 1836#if OFF_FOCUS_FADING
1776 if (rs[Rs_fade]) 1837 if (rs[Rs_fade])
1777 { 1838 {
1778 pix_colors = pix_colors_unfocused; 1839 pix_colors = pix_colors_unfocused;
1779 scr_recolour (); 1840 scr_recolour ();
1780 } 1841 }
1781#endif 1842#endif
1782 }
1783}
1784 1843
1785void 1844 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1845 }
1846}
1847
1848void ecb_cold
1786rxvt_term::update_fade_color (unsigned int idx) 1849rxvt_term::update_fade_color (unsigned int idx)
1787{ 1850{
1788#if OFF_FOCUS_FADING 1851#if OFF_FOCUS_FADING
1789 if (rs[Rs_fade]) 1852 if (rs[Rs_fade])
1790 { 1853 {
… …
1793 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1856 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1794 } 1857 }
1795#endif 1858#endif
1796} 1859}
1797 1860
1798#if ENABLE_TRANSPARENCY || ENABLE_PERL 1861#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1799void 1862void ecb_hot
1800rxvt_term::rootwin_cb (XEvent &ev) 1863rxvt_term::rootwin_cb (XEvent &ev)
1801{ 1864{
1802 make_current (); 1865 make_current ();
1803 1866
1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1867 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1868 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1806 return; 1869 return;
1807 1870
1808# if ENABLE_TRANSPARENCY
1809 switch (ev.type) 1871 switch (ev.type)
1810 { 1872 {
1811 case PropertyNotify: 1873 case PropertyNotify:
1812 /* 1874 /*
1813 * if user used some Esetroot compatible prog to set the root bg, 1875 * if user used some Esetroot compatible prog to set the root bg,
1814 * use the property to determine the pixmap. We use it later on. 1876 * use the property to determine the pixmap. We use it later on.
1815 */ 1877 */
1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1878 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1879 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1818 { 1880 {
1819 bgPixmap.set_root_pixmap (); 1881#if BG_IMAGE_FROM_ROOT
1882 if (option (Opt_transparent))
1883 {
1884 rxvt_img::new_from_root (this)->replace (root_img);
1820 update_background (); 1885 update_background ();
1886 }
1887#endif
1888 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1821 } 1889 }
1890
1822 break; 1891 break;
1823 } 1892 }
1824# endif 1893
1894 refresh_check ();
1825} 1895}
1826#endif 1896#endif
1827 1897
1828void 1898void
1829rxvt_term::button_press (XButtonEvent &ev) 1899rxvt_term::button_press (XButtonEvent &ev)
… …
1860 /* save the xbutton state (for ButtonRelease) */ 1930 /* save the xbutton state (for ButtonRelease) */
1861 MEvent.state = ev.state; 1931 MEvent.state = ev.state;
1862#ifdef MOUSE_REPORT_DOUBLECLICK 1932#ifdef MOUSE_REPORT_DOUBLECLICK
1863 if (ev.button == MEvent.button && clickintime) 1933 if (ev.button == MEvent.button && clickintime)
1864 { 1934 {
1865 /* same button, within alloted time */ 1935 /* same button, within allowed time */
1866 MEvent.clicks++; 1936 MEvent.clicks++;
1867 1937
1868 if (MEvent.clicks > 1) 1938 if (MEvent.clicks > 1)
1869 { 1939 {
1870 /* only report double clicks */ 1940 /* only report double clicks */
… …
1884 mouse_report (ev); 1954 mouse_report (ev);
1885 } 1955 }
1886#else 1956#else
1887 MEvent.button = ev.button; 1957 MEvent.button = ev.button;
1888 mouse_report (ev); 1958 mouse_report (ev);
1889#endif /* MOUSE_REPORT_DOUBLECLICK */ 1959#endif /* MOUSE_REPORT_DOUBLECLICK */
1890 1960
1891 } 1961 }
1892 else 1962 else
1893 { 1963 {
1894 if (ev.button != MEvent.button) 1964 if (ev.button != MEvent.button)
… …
1942 } 2012 }
1943 2013
1944 /* 2014 /*
1945 * Scrollbar window processing of button press 2015 * Scrollbar window processing of button press
1946 */ 2016 */
1947 if (isScrollbarWindow (ev.window)) 2017 if (scrollBar.state && ev.window == scrollBar.win)
1948 { 2018 {
1949 scrollBar.setIdle (); 2019 page_dirn direction = NO_DIR;
2020
2021 if (scrollBar.upButton (ev.y))
2022 direction = UP; /* up */
2023 else if (scrollBar.dnButton (ev.y))
2024 direction = DN; /* down */
2025
2026 scrollBar.state = SB_STATE_IDLE;
1950 /* 2027 /*
1951 * Rxvt-style scrollbar: 2028 * Rxvt-style scrollbar:
1952 * move up if mouse is above slider 2029 * move up if mouse is above slider
1953 * move dn if mouse is below slider 2030 * move dn if mouse is below slider
1954 * 2031 *
… …
1963 /* 2040 /*
1964 * Mouse report disabled scrollbar: 2041 * Mouse report disabled scrollbar:
1965 * arrow buttons - send up/down 2042 * arrow buttons - send up/down
1966 * click on scrollbar - send pageup/down 2043 * click on scrollbar - send pageup/down
1967 */ 2044 */
1968 if ((scrollBar.style == R_SB_NEXT 2045 if (direction == UP)
1969 && scrollbarnext_upButton (ev.y))
1970 || (scrollBar.style == R_SB_RXVT
1971 && scrollbarrxvt_upButton (ev.y)))
1972 tt_printf ("\033[A"); 2046 tt_printf ("\033[A");
1973 else if ((scrollBar.style == R_SB_NEXT 2047 else if (direction == DN)
1974 && scrollbarnext_dnButton (ev.y))
1975 || (scrollBar.style == R_SB_RXVT
1976 && scrollbarrxvt_dnButton (ev.y)))
1977 tt_printf ("\033[B"); 2048 tt_printf ("\033[B");
1978 else 2049 else
1979 switch (ev.button) 2050 switch (ev.button)
1980 { 2051 {
1981 case Button2: 2052 case Button2:
… …
1988 tt_printf ("\033[5~"); 2059 tt_printf ("\033[5~");
1989 break; 2060 break;
1990 } 2061 }
1991 } 2062 }
1992 else 2063 else
1993#endif /* NO_SCROLLBAR_REPORT */ 2064#endif /* NO_SCROLLBAR_REPORT */
1994
1995 {
1996 char upordown = 0;
1997
1998 if (scrollBar.style == R_SB_NEXT)
1999 { 2065 {
2000 if (scrollbarnext_upButton (ev.y)) 2066 if (direction != NO_DIR)
2001 upordown = -1; /* up */
2002 else if (scrollbarnext_dnButton (ev.y))
2003 upordown = 1; /* down */
2004 }
2005 else if (scrollBar.style == R_SB_RXVT)
2006 {
2007 if (scrollbarrxvt_upButton (ev.y))
2008 upordown = -1; /* up */
2009 else if (scrollbarrxvt_dnButton (ev.y))
2010 upordown = 1; /* down */
2011 }
2012 if (upordown)
2013 { 2067 {
2014#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2068#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2069 if (!cont_scroll_ev.is_active ())
2015 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2070 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2016#endif 2071#endif
2017 if (scr_page (upordown < 0 ? UP : DN, 1)) 2072 if (scr_page (direction, 1))
2018 { 2073 {
2019 if (upordown < 0) 2074 if (direction == UP)
2020 scrollBar.setUp (); 2075 scrollBar.state = SB_STATE_UP;
2021 else 2076 else
2022 scrollBar.setDn (); 2077 scrollBar.state = SB_STATE_DOWN;
2023 } 2078 }
2024 } 2079 }
2025 else 2080 else
2026 switch (ev.button) 2081 switch (ev.button)
2027 { 2082 {
2028 case Button2: 2083 case Button2:
2029 switch (scrollbar_align) 2084 switch (scrollBar.align)
2030 { 2085 {
2031 case R_SB_ALIGN_TOP: 2086 case SB_ALIGN_TOP:
2032 csrO = 0; 2087 csrO = 0;
2033 break; 2088 break;
2034 case R_SB_ALIGN_CENTRE: 2089 case SB_ALIGN_CENTRE:
2035 csrO = (scrollBar.bot - scrollBar.top) / 2; 2090 csrO = (scrollBar.bot - scrollBar.top) / 2;
2036 break; 2091 break;
2037 case R_SB_ALIGN_BOTTOM: 2092 case SB_ALIGN_BOTTOM:
2038 csrO = scrollBar.bot - scrollBar.top; 2093 csrO = scrollBar.bot - scrollBar.top;
2039 break; 2094 break;
2040 } 2095 }
2041 2096
2042 if (scrollBar.style == R_SB_XTERM 2097 if (scrollBar.style == SB_STYLE_XTERM
2043 || scrollbar_above_slider (ev.y) 2098 || scrollBar.above_slider (ev.y)
2044 || scrollbar_below_slider (ev.y)) 2099 || scrollBar.below_slider (ev.y))
2045 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2100 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2046 2101
2047 scrollBar.setMotion (); 2102 scrollBar.state = SB_STATE_MOTION;
2048 break; 2103 break;
2049 2104
2050 case Button1: 2105 case Button1:
2051 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2106 if (scrollBar.align == SB_ALIGN_CENTRE)
2052 csrO = ev.y - scrollBar.top; 2107 csrO = ev.y - scrollBar.top;
2053 /* FALLTHROUGH */ 2108 /* FALLTHROUGH */
2054 2109
2055 case Button3: 2110 case Button3:
2056 if (scrollBar.style != R_SB_XTERM) 2111 if (scrollBar.style != SB_STYLE_XTERM)
2057 { 2112 {
2058 if (scrollbar_above_slider (ev.y)) 2113 if (scrollBar.above_slider (ev.y))
2059# ifdef RXVT_SCROLL_FULL 2114# ifdef RXVT_SCROLL_FULL
2060 scr_page (UP, nrow - 1); 2115 scr_page (UP, nrow - 1);
2061# else 2116# else
2062 scr_page (UP, nrow / 4); 2117 scr_page (UP, nrow / 4);
2063# endif 2118# endif
2064 else if (scrollbar_below_slider (ev.y)) 2119 else if (scrollBar.below_slider (ev.y))
2065# ifdef RXVT_SCROLL_FULL 2120# ifdef RXVT_SCROLL_FULL
2066 scr_page (DN, nrow - 1); 2121 scr_page (DN, nrow - 1);
2067# else 2122# else
2068 scr_page (DN, nrow / 4); 2123 scr_page (DN, nrow / 4);
2069# endif 2124# endif
2070 else 2125 else
2071 scrollBar.setMotion (); 2126 scrollBar.state = SB_STATE_MOTION;
2072 } 2127 }
2073 else 2128 else
2074 { 2129 {
2075 scr_page ((ev.button == Button1 ? DN : UP), 2130 scr_page ((ev.button == Button1 ? DN : UP),
2076 (nrow 2131 (nrow
2077 * scrollbar_position (ev.y) 2132 * scrollBar.position (ev.y)
2078 / scrollbar_size ())); 2133 / scrollBar.size ()));
2079 } 2134 }
2080 2135
2081 break; 2136 break;
2082 } 2137 }
2083 } 2138 }
… …
2093 2148
2094 csrO = 0; /* reset csr Offset */ 2149 csrO = 0; /* reset csr Offset */
2095 if (!bypass_keystate) 2150 if (!bypass_keystate)
2096 reportmode = !! (priv_modes & PrivMode_mouse_report); 2151 reportmode = !! (priv_modes & PrivMode_mouse_report);
2097 2152
2098 if (scrollbar_isUpDn ()) 2153 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2099 { 2154 {
2100 scrollBar.setIdle (); 2155 scrollBar.state = SB_STATE_IDLE;
2101 scrollbar_show (0); 2156 scrollBar.show (0);
2102 } 2157 }
2103 2158
2104#ifdef SELECTION_SCROLLING 2159#ifdef SELECTION_SCROLLING
2105 if (sel_scroll_ev.active)
2106 sel_scroll_ev.stop(); 2160 sel_scroll_ev.stop();
2107#endif 2161#endif
2108 2162
2109 if (ev.window == vt) 2163 if (ev.window == vt)
2110 { 2164 {
2111 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2165 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2135 mouse_report (ev); 2189 mouse_report (ev);
2136 } 2190 }
2137#else /* MOUSE_REPORT_DOUBLECLICK */ 2191#else /* MOUSE_REPORT_DOUBLECLICK */
2138 MEvent.button = AnyButton; 2192 MEvent.button = AnyButton;
2139 mouse_report (ev); 2193 mouse_report (ev);
2140#endif /* MOUSE_REPORT_DOUBLECLICK */ 2194#endif /* MOUSE_REPORT_DOUBLECLICK */
2141 return; 2195 return;
2142 } 2196 }
2143 2197
2144 /* 2198 /*
2145 * dumb hack to compensate for the failure of click-and-drag 2199 * dumb hack to compensate for the failure of click-and-drag
… …
2156 case Button3: 2210 case Button3:
2157 selection_make (ev.time); 2211 selection_make (ev.time);
2158 break; 2212 break;
2159 2213
2160 case Button2: 2214 case Button2:
2161 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2215 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2162 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2216 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2163 break; 2217 break;
2164 2218
2165#ifdef MOUSE_WHEEL 2219#ifdef MOUSE_WHEEL
2166 case Button4: 2220 case Button4:
2167 case Button5: 2221 case Button5:
2168 { 2222 {
2169 int i; 2223 int lines;
2170 page_dirn v; 2224 page_dirn dirn;
2171 2225
2172 v = ev.button == Button4 ? UP : DN; 2226 dirn = ev.button == Button4 ? UP : DN;
2173 2227
2174 if (ev.state & ShiftMask) 2228 if (ev.state & ShiftMask)
2175 i = 1; 2229 lines = 1;
2176 else if (option (Opt_mouseWheelScrollPage)) 2230 else if (option (Opt_mouseWheelScrollPage))
2177 i = nrow - 1; 2231 lines = nrow - 1;
2178 else 2232 else
2179 i = 5; 2233 lines = 5;
2180 2234
2181# ifdef MOUSE_SLIP_WHEELING 2235# ifdef MOUSE_SLIP_WHEELING
2182 if (ev.state & ControlMask) 2236 if (ev.state & ControlMask)
2183 { 2237 {
2184 mouse_slip_wheel_speed += v ? -1 : 1; 2238 mouse_slip_wheel_speed += dirn;
2185 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2239 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2186 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2187 2240
2188 if (slip_wheel_ev.at < NOW) 2241 if (!slip_wheel_ev.is_active ())
2189 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2242 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2190
2191 slip_wheel_ev.start ();
2192 } 2243 }
2193 else 2244 else
2245# endif
2194 { 2246 {
2195# endif
2196 scr_page (v, i); 2247 scr_page (dirn, lines);
2197 scrollbar_show (1); 2248 scrollBar.show (1);
2198# ifdef MOUSE_SLIP_WHEELING
2199 } 2249 }
2200# endif
2201 } 2250 }
2202 break; 2251 break;
2203#endif 2252#endif
2204 } 2253 }
2205 } 2254 }
2206} 2255}
2207 2256
2208/*}}} */ 2257/*}}} */
2209 2258
2210bool 2259void ecb_hot
2211rxvt_term::cmd_parse () 2260rxvt_term::cmd_parse ()
2212{ 2261{
2213 bool flag = false;
2214 wchar_t ch = NOCHAR; 2262 wchar_t ch = NOCHAR;
2215 char *seq_begin; // remember start of esc-sequence here 2263 char *seq_begin; // remember start of esc-sequence here
2216 2264
2217 for (;;) 2265 for (;;)
2218 { 2266 {
2219 if (ch == NOCHAR) 2267 if (ecb_unlikely (ch == NOCHAR))
2220 { 2268 {
2221 seq_begin = cmdbuf_ptr; 2269 seq_begin = cmdbuf_ptr;
2222 ch = next_char (); 2270 ch = next_char ();
2223 2271
2224 if (ch == NOCHAR) 2272 if (ch == NOCHAR)
2225 break; 2273 break;
2226 } 2274 }
2227 2275
2228 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2276 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2229 { 2277 {
2230 if (!seen_input) 2278 if (ecb_unlikely (!seen_input))
2231 { 2279 {
2232 seen_input = 1; 2280 seen_input = 1;
2233 // many badly-written programs (e.g. jed) contain a race condition: 2281 // many badly-written programs (e.g. jed) contain a race condition:
2234 // they first read the screensize and then install a SIGWINCH handler. 2282 // they first read the screensize and then install a SIGWINCH handler.
2235 // some window managers resize the window early, and these programs 2283 // some window managers resize the window early, and these programs
… …
2248 wchar_t *str = buf; 2296 wchar_t *str = buf;
2249 wchar_t *eol = str + min (ncol, UBUFSIZ); 2297 wchar_t *eol = str + min (ncol, UBUFSIZ);
2250 2298
2251 for (;;) 2299 for (;;)
2252 { 2300 {
2253 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2301 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2254 break; 2302 break;
2255 2303
2256 *str++ = ch; 2304 *str++ = ch;
2257 2305
2258 if (ch == C0_LF || str >= eol) 2306 if (ecb_unlikely (ch == C0_LF || str >= eol))
2259 { 2307 {
2260 if (ch == C0_LF) 2308 if (ch == C0_LF)
2261 nlines++; 2309 nlines++;
2262 2310
2263 refresh_count++; 2311 refresh_count++;
2264 2312
2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2313 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2266 { 2314 {
2267 refresh_count = 0; 2315 refresh_count = 0;
2268 2316
2269 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2317 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2270 { 2318 {
2271 refreshnow = true; 2319 refreshnow = true;
2272 ch = NOCHAR; 2320 ch = NOCHAR;
2273 break; 2321 break;
2274 } 2322 }
… …
2312 * What the heck we'll cheat and only refresh less than every page-full. 2360 * What the heck we'll cheat and only refresh less than every page-full.
2313 * if skipScroll is enabled. 2361 * if skipScroll is enabled.
2314 */ 2362 */
2315 if (refreshnow) 2363 if (refreshnow)
2316 { 2364 {
2317 flag = true;
2318 scr_refresh (); 2365 scr_refresh ();
2319 want_refresh = 1; 2366 want_refresh = 1;
2320 } 2367 }
2321
2322 } 2368 }
2323 else 2369 else
2324 { 2370 {
2325 try 2371 try
2326 { 2372 {
… …
2334 } 2380 }
2335 2381
2336 ch = NOCHAR; 2382 ch = NOCHAR;
2337 } 2383 }
2338 } 2384 }
2339
2340 return flag;
2341} 2385}
2342 2386
2343// read the next character 2387// read the next character
2344wchar_t 2388wchar_t ecb_hot
2345rxvt_term::next_char () NOTHROW 2389rxvt_term::next_char () NOTHROW
2346{ 2390{
2347 while (cmdbuf_ptr < cmdbuf_endp) 2391 while (cmdbuf_ptr < cmdbuf_endp)
2348 { 2392 {
2349 // assume 7-bit to be ascii ALWAYS 2393 // assume 7-bit to be ascii ALWAYS
2350 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2394 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2351 return *cmdbuf_ptr++; 2395 return *cmdbuf_ptr++;
2352 2396
2353 wchar_t wc; 2397 wchar_t wc;
2354 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2398 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2355 2399
… …
2359 cmdbuf_ptr = cmdbuf_endp; 2403 cmdbuf_ptr = cmdbuf_endp;
2360 break; 2404 break;
2361 } 2405 }
2362 2406
2363 if (len == (size_t)-1) 2407 if (len == (size_t)-1)
2408 {
2409 mbstate.reset (); // reset now undefined conversion state
2410 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2411 // in which case we "erroneously" return the next byte which might be valid.
2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2412 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2413 }
2365 2414
2366 // assume wchar == unicode 2415 // assume wchar == unicode
2367 cmdbuf_ptr += len; 2416 cmdbuf_ptr += len;
2368 return wc & UNICODE_MASK; 2417 return wc & UNICODE_MASK;
2369 } 2418 }
2370 2419
2371 return NOCHAR; 2420 return NOCHAR;
2372} 2421}
2373 2422
2374// read the next octet 2423// read the next octet
2375uint32_t 2424uint32_t ecb_hot
2376rxvt_term::next_octet () NOTHROW 2425rxvt_term::next_octet () NOTHROW
2377{ 2426{
2378 return cmdbuf_ptr < cmdbuf_endp 2427 return cmdbuf_ptr < cmdbuf_endp
2379 ? (unsigned char)*cmdbuf_ptr++ 2428 ? (unsigned char)*cmdbuf_ptr++
2380 : NOCHAR; 2429 : NOCHAR;
2381} 2430}
2382 2431
2383static class out_of_input out_of_input; 2432static class out_of_input out_of_input;
2384 2433
2385/* rxvt_cmd_getc () - Return next input character */ 2434wchar_t ecb_hot
2386/*
2387 * Return the next input character after first passing any keyboard input
2388 * to the command.
2389 */
2390wchar_t
2391rxvt_term::cmd_getc () THROW ((class out_of_input)) 2435rxvt_term::cmd_getc () THROW ((class out_of_input))
2392{ 2436{
2393 wchar_t c = next_char (); 2437 wchar_t c = next_char ();
2394 2438
2395 if (c == NOCHAR) 2439 if (c == NOCHAR)
2396 throw out_of_input; 2440 throw out_of_input;
2397 2441
2398 return c; 2442 return c;
2399} 2443}
2400 2444
2401uint32_t 2445uint32_t ecb_hot
2402rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2446rxvt_term::cmd_get8 () THROW ((class out_of_input))
2403{ 2447{
2404 uint32_t c = next_octet (); 2448 uint32_t c = next_octet ();
2405 2449
2406 if (c == NOCHAR) 2450 if (c == NOCHAR)
… …
2410} 2454}
2411 2455
2412/*{{{ print pipe */ 2456/*{{{ print pipe */
2413/*----------------------------------------------------------------------*/ 2457/*----------------------------------------------------------------------*/
2414#ifdef PRINTPIPE 2458#ifdef PRINTPIPE
2415FILE * 2459FILE * ecb_cold
2416rxvt_term::popen_printer () 2460rxvt_term::popen_printer ()
2417{ 2461{
2418 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2462 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2419 2463
2420 if (stream == NULL) 2464 if (stream == NULL)
2421 rxvt_warn ("can't open printer pipe, not printing.\n"); 2465 rxvt_warn ("can't open printer pipe, not printing.\n");
2422 2466
2423 return stream; 2467 return stream;
2424} 2468}
2425 2469
2426int 2470int ecb_cold
2427rxvt_term::pclose_printer (FILE *stream) 2471rxvt_term::pclose_printer (FILE *stream)
2428{ 2472{
2429 fflush (stream); 2473 fflush (stream);
2430 return pclose (stream); 2474 return pclose (stream);
2431} 2475}
2432 2476
2433/* 2477/*
2434 * simulate attached vt100 printer 2478 * simulate attached vt100 printer
2435 */ 2479 */
2436void 2480void ecb_cold
2437rxvt_term::process_print_pipe () 2481rxvt_term::process_print_pipe ()
2438{ 2482{
2439 int done; 2483 FILE *fd = popen_printer ();
2440 FILE *fd;
2441 2484
2442 if ((fd = popen_printer ()) == NULL) 2485 if (!fd)
2443 return; 2486 return;
2444 2487
2445 /* 2488 /*
2446 * Send all input to the printer until either ESC[4i or ESC[?4i 2489 * Send all input to the printer until either ESC[4i or ESC[?4i
2447 * is received. 2490 * is received.
2448 */ 2491 */
2449 for (done = 0; !done;) 2492 for (int done = 0; !done; )
2450 { 2493 {
2451 unsigned char buf[8]; 2494 unsigned char buf[8];
2452 unicode_t ch; 2495 unicode_t ch;
2453 unsigned int i, len; 2496 unsigned int i, len;
2454 2497
… …
2485 } 2528 }
2486 } 2529 }
2487 2530
2488 pclose_printer (fd); 2531 pclose_printer (fd);
2489} 2532}
2490#endif /* PRINTPIPE */ 2533#endif /* PRINTPIPE */
2491/*}}} */ 2534/*}}} */
2492 2535
2493/* *INDENT-OFF* */
2494enum { 2536enum {
2495 C1_40 = 0x40, 2537 C1_40 = 0x40,
2496 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2538 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2497 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2539 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2498 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2540 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2499 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2541 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2500}; 2542};
2501/* *INDENT-ON* */
2502 2543
2503/*{{{ process non-printing single characters */ 2544/*{{{ process non-printing single characters */
2504void 2545void ecb_hot
2505rxvt_term::process_nonprinting (unicode_t ch) 2546rxvt_term::process_nonprinting (unicode_t ch)
2506{ 2547{
2507 switch (ch) 2548 switch (ch)
2508 { 2549 {
2509 case C0_ESC: 2550 case C0_ESC:
… …
2555} 2596}
2556/*}}} */ 2597/*}}} */
2557 2598
2558 2599
2559/*{{{ process VT52 escape sequences */ 2600/*{{{ process VT52 escape sequences */
2560void 2601void ecb_cold
2561rxvt_term::process_escape_vt52 (unicode_t ch) 2602rxvt_term::process_escape_vt52 (unicode_t ch)
2562{ 2603{
2563 int row, col; 2604 int row, col;
2564 2605
2565 switch (ch) 2606 switch (ch)
… …
2599 break; 2640 break;
2600 case 'Z': /* identify the terminal type */ 2641 case 'Z': /* identify the terminal type */
2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2642 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2602 break; 2643 break;
2603 case '<': /* turn off VT52 mode */ 2644 case '<': /* turn off VT52 mode */
2604 PrivMode (0, PrivMode_vt52); 2645 priv_modes &= ~PrivMode_vt52;
2605 break; 2646 break;
2606 case 'F': /* use special graphics character set */ 2647 case 'F': /* use special graphics character set */
2607 case 'G': /* use regular character set */ 2648 case 'G': /* use regular character set */
2608 /* unimplemented */ 2649 /* unimplemented */
2609 break; 2650 break;
… …
2615} 2656}
2616/*}}} */ 2657/*}}} */
2617 2658
2618 2659
2619/*{{{ process escape sequences */ 2660/*{{{ process escape sequences */
2620void 2661void ecb_hot
2621rxvt_term::process_escape_seq () 2662rxvt_term::process_escape_seq ()
2622{ 2663{
2623 unicode_t ch = cmd_getc (); 2664 unicode_t ch = cmd_getc ();
2624 2665
2625 if (priv_modes & PrivMode_vt52) 2666 if (priv_modes & PrivMode_vt52)
… …
2628 return; 2669 return;
2629 } 2670 }
2630 2671
2631 switch (ch) 2672 switch (ch)
2632 { 2673 {
2633 /* case 1: do_tek_mode (); break; */
2634 case '#': 2674 case '#':
2635 if (cmd_getc () == '8') 2675 if (cmd_getc () == '8')
2636 scr_E (); 2676 scr_E ();
2637 break; 2677 break;
2638 case '(': 2678 case '(':
… …
2661#if !ENABLE_MINIMAL 2701#if !ENABLE_MINIMAL
2662 case '9': 2702 case '9':
2663 scr_forwardindex (); 2703 scr_forwardindex ();
2664 break; 2704 break;
2665#endif 2705#endif
2706 // DECPAM/DECPNM
2666 case '=': 2707 case '=':
2708 priv_modes |= PrivMode_aplKP;
2709 break;
2667 case '>': 2710 case '>':
2668 PrivMode ((ch == '='), PrivMode_aplKP); 2711 priv_modes &= ~PrivMode_aplKP;
2669 break; 2712 break;
2670 2713
2671 case C1_40: 2714 case C1_40:
2672 cmd_getc (); 2715 cmd_getc ();
2673 break; 2716 break;
… …
2677 2720
2678 /* 8.3.87: NEXT LINE */ 2721 /* 8.3.87: NEXT LINE */
2679 case C1_NEL: /* ESC E */ 2722 case C1_NEL: /* ESC E */
2680 { 2723 {
2681 wchar_t nlcr[] = { C0_LF, C0_CR }; 2724 wchar_t nlcr[] = { C0_LF, C0_CR };
2682 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2725 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2683 } 2726 }
2684 break; 2727 break;
2685 2728
2686 /* kidnapped escape sequence: Should be 8.3.48 */ 2729 /* kidnapped escape sequence: Should be 8.3.48 */
2687 case C1_ESA: /* ESC G */ 2730 case C1_ESA: /* ESC G */
2688 process_graphics (); 2731 // used by original rxvt for rob nations own graphics mode
2732 if (cmd_getc () == 'Q')
2733 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2689 break; 2734 break;
2690 2735
2691 /* 8.3.63: CHARACTER TABULATION SET */ 2736 /* 8.3.63: CHARACTER TABULATION SET */
2692 case C1_HTS: /* ESC H */ 2737 case C1_HTS: /* ESC H */
2693 scr_set_tab (1); 2738 scr_set_tab (1);
… …
2697 case C1_RI: /* ESC M */ 2742 case C1_RI: /* ESC M */
2698 scr_index (DN); 2743 scr_index (DN);
2699 break; 2744 break;
2700 2745
2701 /* 8.3.142: SINGLE-SHIFT TWO */ 2746 /* 8.3.142: SINGLE-SHIFT TWO */
2702 /*case C1_SS2: scr_single_shift (2); break; */ 2747 /* case C1_SS2: break; */
2703 2748
2704 /* 8.3.143: SINGLE-SHIFT THREE */ 2749 /* 8.3.143: SINGLE-SHIFT THREE */
2705 /*case C1_SS3: scr_single_shift (3); break; */ 2750 /* case C1_SS3: break; */
2706 2751
2707 /* 8.3.27: DEVICE CONTROL STRING */ 2752 /* 8.3.27: DEVICE CONTROL STRING */
2708 case C1_DCS: /* ESC P */ 2753 case C1_DCS: /* ESC P */
2709 process_dcs_seq (); 2754 process_dcs_seq ();
2710 break; 2755 break;
… …
2712 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2757 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2713 case C1_SCI: /* ESC Z */ 2758 case C1_SCI: /* ESC Z */
2714 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2759 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2715 break; /* steal obsolete ESC [ c */ 2760 break; /* steal obsolete ESC [ c */
2716 2761
2717 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2762 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2718 case C1_CSI: /* ESC [ */ 2763 case C1_CSI: /* ESC [ */
2719 process_csi_seq (); 2764 process_csi_seq ();
2720 break; 2765 break;
2721 2766
2722 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2767 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2723 case C1_OSC: /* ESC ] */ 2768 case C1_OSC: /* ESC ] */
2724 process_osc_seq (); 2769 process_osc_seq ();
2725 break; 2770 break;
2726 2771
2727 /* 8.3.106: RESET TO INITIAL STATE */ 2772 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2728 case 'c': 2773 case 'c':
2729 mbstate.reset (); 2774 mbstate.reset ();
2730 scr_poweron (); 2775 scr_poweron ();
2731 scrollbar_show (1); 2776 scrollBar.show (1);
2732 break; 2777 break;
2733 2778
2734 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2779 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2735 case 'n': 2780 case 'n':
2736 scr_charset_choose (2); 2781 scr_charset_choose (2);
… …
2743 } 2788 }
2744} 2789}
2745/*}}} */ 2790/*}}} */
2746 2791
2747/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2792/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2748/* *INDENT-OFF* */
2749enum { 2793enum {
2750 CSI_ICH = 0x40, 2794 CSI_ICH = 0x40,
2751 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2795 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2752 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2796 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2753 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2797 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2756 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2800 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2757 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2801 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2758 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2802 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2759}; 2803};
2760 2804
2761#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2805#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2762 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2806 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2763 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2807 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2764#define get_byte_array_bit(array, bit) \ 2808#define get_byte_array_bit(array, bit) \
2765 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2809 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2766 2810
2767const unsigned char csi_defaults[] = 2811static const unsigned char csi_defaults[] =
2768 { 2812 {
2769 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2813 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2770 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2814 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2771 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2815 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2772 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2816 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2773 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2817 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2774 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2818 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2775 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2819 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2776 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2820 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2777 }; 2821 };
2778/* *INDENT-ON* */
2779 2822
2780void 2823void ecb_hot
2781rxvt_term::process_csi_seq () 2824rxvt_term::process_csi_seq ()
2782{ 2825{
2783 unicode_t ch, priv, i; 2826 unicode_t ch, priv, prev_ch, i;
2784 unsigned int nargs, p; 2827 unsigned int nargs, p;
2785 int n, ndef; 2828 int n, ndef;
2786 int arg[ESC_ARGS] = { }; 2829 int arg[ESC_ARGS] = { };
2787 2830
2788 nargs = 0; 2831 nargs = 0;
2789 2832
2790 priv = 0; 2833 priv = 0;
2791 ch = cmd_getc (); 2834 ch = cmd_getc ();
2792 if (ch >= '<' && ch <= '?') 2835 if ((ch >= '<' && ch <= '?') || ch == '!')
2836 {
2793 { /* '<' '=' '>' '?' */ 2837 /* '<' '=' '>' '?' '!' */
2794 priv = ch; 2838 priv = ch;
2795 ch = cmd_getc (); 2839 ch = cmd_getc ();
2796 } 2840 }
2797 2841
2842 prev_ch = 0;
2798 /* read any numerical arguments */ 2843 /* read any numerical arguments */
2799 for (n = -1; ch < CSI_ICH; ) 2844 for (n = -1; ch < CSI_ICH; )
2800 { 2845 {
2801 if (isdigit (ch)) 2846 if (isdigit (ch))
2802 { 2847 {
… …
2812 n = -1; 2857 n = -1;
2813 } 2858 }
2814 else if (IS_CONTROL (ch)) 2859 else if (IS_CONTROL (ch))
2815 process_nonprinting (ch); 2860 process_nonprinting (ch);
2816 2861
2862 prev_ch = ch;
2817 ch = cmd_getc (); 2863 ch = cmd_getc ();
2818 } 2864 }
2819 2865
2820 if (ch > CSI_7F) 2866 if (ch > CSI_7F)
2821 return; 2867 return;
… …
2841 { 2887 {
2842 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2888 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2843 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2889 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2844 // 2890 //
2845 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2891 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2846 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2892 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2847 // that we do not support xterm mouse reporting (should be 95 when we do). 2893 // versions.
2848 // 2894 //
2849 tt_printf ("\033[>%d;94;0c", 'U'); 2895 tt_printf ("\033[>%d;95;0c", 'U');
2850 } 2896 }
2851 break; 2897 break;
2898
2852 case '?': 2899 case '?':
2853 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2900 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2854 process_terminal_mode (ch, priv, nargs, arg); 2901 process_terminal_mode (ch, priv, nargs, arg);
2855 break; 2902 break;
2903
2904 case '!':
2905 if (ch == CSI_70)
2906 {
2907 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2908 scr_soft_reset ();
2909
2910 static const int pm_h[] = { 7, 25 };
2911 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2912
2913 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2914 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2856 } 2915 }
2916 break;
2917 }
2918
2857 return; 2919 return;
2858 } 2920 }
2859 2921
2860 switch (ch) 2922 switch (ch)
2861 { 2923 {
… …
2875 } 2937 }
2876 break; 2938 break;
2877#endif 2939#endif
2878 2940
2879 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2941 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2880 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2942 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2881 arg[0] = -arg[0]; 2943 arg[0] = -arg[0];
2882 /* FALLTHROUGH */ 2944 /* FALLTHROUGH */
2883 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2945 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2884 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2946 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2885 scr_gotorc (arg[0], 0, RELATIVE); 2947 scr_gotorc (arg[0], 0, RELATIVE);
2886 break; 2948 break;
2887 2949
2888 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2950 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2889 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2951 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3039 scr_insert_mode (1); 3101 scr_insert_mode (1);
3040 else if (arg[0] == 20) 3102 else if (arg[0] == 20)
3041 priv_modes |= PrivMode_LFNL; 3103 priv_modes |= PrivMode_LFNL;
3042 break; 3104 break;
3043 3105
3106 case CSI_71: // DESCUSR: set cursor style
3107 if (prev_ch == ' ')
3108 set_cursor_style (arg[0]);
3109 break;
3110
3044 /* 3111 /*
3045 * PRIVATE USE beyond this point. All CSI_7? sequences here 3112 * PRIVATE USE beyond this point. All CSI_7? sequences here
3046 */ 3113 */
3047 case CSI_72: /* DECSTBM: set top and bottom margins */ 3114 case CSI_72: /* DECSTBM: set top and bottom margins */
3048 if (nargs == 1) 3115 if (nargs == 1)
… …
3076 } 3143 }
3077} 3144}
3078/*}}} */ 3145/*}}} */
3079 3146
3080#if !ENABLE_MINIMAL 3147#if !ENABLE_MINIMAL
3081/* ARGSUSED */
3082void 3148void
3083rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3149rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3084{ 3150{
3085 int x, y; 3151 int x, y;
3086 XWindowAttributes wattr; 3152 XWindowAttributes wattr;
… …
3095 { 3161 {
3096 /* 3162 /*
3097 * commands 3163 * commands
3098 */ 3164 */
3099 case 1: /* deiconify window */ 3165 case 1: /* deiconify window */
3100 XMapWindow (dpy, parent[0]); 3166 XMapWindow (dpy, parent);
3101 break; 3167 break;
3102 case 2: /* iconify window */ 3168 case 2: /* iconify window */
3103 XIconifyWindow (dpy, parent[0], display->screen); 3169 XIconifyWindow (dpy, parent, display->screen);
3104 break; 3170 break;
3105 case 3: /* set position (pixels) */ 3171 case 3: /* set position (pixels) */
3106 XMoveWindow (dpy, parent[0], args[1], args[2]); 3172 XMoveWindow (dpy, parent, args[1], args[2]);
3107 break; 3173 break;
3108 case 4: /* set size (pixels) */ 3174 case 4: /* set size (pixels) */
3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3175 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3110 break; 3176 break;
3111 case 5: /* raise window */ 3177 case 5: /* raise window */
3112 XRaiseWindow (dpy, parent[0]); 3178 XRaiseWindow (dpy, parent);
3113 break; 3179 break;
3114 case 6: /* lower window */ 3180 case 6: /* lower window */
3115 XLowerWindow (dpy, parent[0]); 3181 XLowerWindow (dpy, parent);
3116 break; 3182 break;
3117 case 7: /* refresh window */ 3183 case 7: /* refresh window */
3118 scr_touch (true); 3184 scr_touch (true);
3119 break; 3185 break;
3120 case 8: /* set size (chars) */ 3186 case 8: /* set size (chars) */
… …
3123 break; 3189 break;
3124 3190
3125 //case 9: NYI, TODO, restore maximized window or maximize window 3191 //case 9: NYI, TODO, restore maximized window or maximize window
3126 default: 3192 default:
3127 if (args[0] >= 24) /* set height (chars) */ 3193 if (args[0] >= 24) /* set height (chars) */
3128 set_widthheight ((unsigned int)width, 3194 set_widthheight ((unsigned int)vt_width,
3129 (unsigned int) (args[1] * fheight)); 3195 (unsigned int) (args[1] * fheight));
3130 break; 3196 break;
3131 3197
3132 /* 3198 /*
3133 * reports - some output format copied from XTerm 3199 * reports - some output format copied from XTerm
3134 */ 3200 */
3135 case 11: /* report window state */ 3201 case 11: /* report window state */
3136 XGetWindowAttributes (dpy, parent[0], &wattr); 3202 XGetWindowAttributes (dpy, parent, &wattr);
3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3203 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3138 break; 3204 break;
3139 case 13: /* report window position */ 3205 case 13: /* report window position */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3206 XGetWindowAttributes (dpy, parent, &wattr);
3141 XTranslateCoordinates (dpy, parent[0], wattr.root, 3207 XTranslateCoordinates (dpy, parent, wattr.root,
3142 -wattr.border_width, -wattr.border_width, 3208 -wattr.border_width, -wattr.border_width,
3143 &x, &y, &wdummy); 3209 &x, &y, &wdummy);
3144 tt_printf ("\033[3;%d;%dt", x, y); 3210 tt_printf ("\033[3;%d;%dt", x, y);
3145 break; 3211 break;
3146 case 14: /* report window size (pixels) */ 3212 case 14: /* report window size (pixels) */
3147 XGetWindowAttributes (dpy, parent[0], &wattr); 3213 XGetWindowAttributes (dpy, parent, &wattr);
3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3214 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3149 break; 3215 break;
3150 case 18: /* report text area size (chars) */ 3216 case 18: /* report text area size (chars) */
3151 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3217 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3152 break; 3218 break;
… …
3154 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3220 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3155 break; 3221 break;
3156 case 20: /* report icon label */ 3222 case 20: /* report icon label */
3157 { 3223 {
3158 char *s; 3224 char *s;
3159 XGetIconName (dpy, parent[0], &s); 3225 XGetIconName (dpy, parent, &s);
3160 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3226 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3161 XFree (s); 3227 XFree (s);
3162 } 3228 }
3163 break; 3229 break;
3164 case 21: /* report window title */ 3230 case 21: /* report window title */
3165 { 3231 {
3166 char *s; 3232 char *s;
3167 XFetchName (dpy, parent[0], &s); 3233 XFetchName (dpy, parent, &s);
3168 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3234 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3169 XFree (s); 3235 XFree (s);
3170 } 3236 }
3171 break; 3237 break;
3172 } 3238 }
… …
3182rxvt_term::get_to_st (unicode_t &ends_how) 3248rxvt_term::get_to_st (unicode_t &ends_how)
3183{ 3249{
3184 unicode_t ch; 3250 unicode_t ch;
3185 bool seen_esc = false; 3251 bool seen_esc = false;
3186 unsigned int n = 0; 3252 unsigned int n = 0;
3187 wchar_t string[STRING_MAX]; 3253 wchar_t string[CBUFSIZ];
3188 3254
3189 while ((ch = cmd_getc ()) != NOCHAR) 3255 while ((ch = cmd_getc ()) != NOCHAR)
3190 { 3256 {
3191 if (seen_esc) 3257 if (seen_esc)
3192 { 3258 {
… …
3207 else if (ch < 0x20) 3273 else if (ch < 0x20)
3208 return NULL; /* other control character - exit */ 3274 return NULL; /* other control character - exit */
3209 3275
3210 seen_esc = false; 3276 seen_esc = false;
3211 3277
3212 if (n >= STRING_MAX - 1) 3278 if (n >= sizeof (string) - 1)
3213 // stop at some sane length 3279 // stop at some sane length
3214 return NULL; 3280 return NULL;
3215 3281
3216 string[n++] = ch; 3282 string[n++] = ch;
3217 } 3283 }
… …
3228 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3294 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3229 */ 3295 */
3230void 3296void
3231rxvt_term::process_dcs_seq () 3297rxvt_term::process_dcs_seq ()
3232{ 3298{
3233 char *s;
3234 unicode_t eh;
3235
3236 /* 3299 /*
3237 * Not handled yet 3300 * Not handled yet
3238 */ 3301 */
3302
3303 unicode_t eh;
3239 s = get_to_st (eh); 3304 char *s = get_to_st (eh);
3240 if (s) 3305 if (s)
3241 free (s); 3306 free (s);
3242 3307
3243 return; 3308 return;
3244} 3309}
… …
3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3313 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3249 */ 3314 */
3250void 3315void
3251rxvt_term::process_osc_seq () 3316rxvt_term::process_osc_seq ()
3252{ 3317{
3253 unicode_t ch, eh;
3254 int arg; 3318 int arg;
3255 3319
3256 ch = cmd_getc (); 3320 unicode_t ch = cmd_getc ();
3257 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3321 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3258 arg = arg * 10 + (ch - '0'); 3322 arg = arg * 10 + (ch - '0');
3259 3323
3260 if (ch == ';') 3324 if (ch == ';')
3261 { 3325 {
3326 unicode_t eh;
3262 char *s = get_to_st (eh); 3327 char *s = get_to_st (eh);
3263 3328
3264 if (s) 3329 if (s)
3265 { 3330 {
3266 process_xterm_seq (arg, s, eh); 3331 process_xterm_seq (arg, s, eh);
… …
3290 3355
3291/* 3356/*
3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3357 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3293 */ 3358 */
3294void 3359void
3295rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3360rxvt_term::process_xterm_seq (int op, char *str, char resp)
3296{ 3361{
3297 int color; 3362 int color;
3298 char *buf, *name; 3363 char *buf, *name;
3299 bool query = str[0] == '?' && !str[1]; 3364 bool query = str[0] == '?' && !str[1];
3300 int saveop = op; 3365 int saveop = op;
… …
3327 unsigned long bytes_after; 3392 unsigned long bytes_after;
3328 unsigned char *value = 0; 3393 unsigned char *value = 0;
3329 const char *str = ""; 3394 const char *str = "";
3330 3395
3331 if (prop 3396 if (prop
3332 && XGetWindowProperty (dpy, parent[0], 3397 && XGetWindowProperty (dpy, parent,
3333 prop, 0, 1<<16, 0, AnyPropertyType, 3398 prop, 0, 1<<16, 0, AnyPropertyType,
3334 &actual_type, &actual_format, 3399 &actual_type, &actual_format,
3335 &nitems, &bytes_after, &value) == Success 3400 &nitems, &bytes_after, &value) == Success
3336 && actual_type != None 3401 && actual_type != None
3337 && actual_format == 8) 3402 && actual_format == 8)
3338 str = (const char *)(value); 3403 str = (const char *)(value);
3339 3404
3340 tt_printf ("\033]%d;%s%c", op, str, resp); 3405 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3341 3406
3342 XFree (value); 3407 XFree (value);
3343 } 3408 }
3344 else 3409 else
3345 { 3410 {
3346 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3411 char *eq = strchr (str, '=');
3347 3412
3348 if (eq) 3413 if (eq)
3349 { 3414 {
3350 *eq = 0; 3415 *eq = 0;
3351 set_utf8_property (display->atom (str), eq + 1); 3416 set_utf8_property (display->atom (str), eq + 1);
3352 } 3417 }
3353 else 3418 else
3354 XDeleteProperty (dpy, parent[0], 3419 XDeleteProperty (dpy, parent,
3355 display->atom (str)); 3420 display->atom (str));
3356 } 3421 }
3357 break; 3422 break;
3358 3423
3359 case XTerm_Color: 3424 case XTerm_Color:
… …
3372 *buf++ = '\0'; 3437 *buf++ = '\0';
3373 3438
3374 process_color_seq (op, color, name, resp); 3439 process_color_seq (op, color, name, resp);
3375 } 3440 }
3376 break; 3441 break;
3442 case Rxvt_restoreFG:
3377 case XTerm_Color00: 3443 case XTerm_Color00:
3378 process_color_seq (op, Color_fg, str, resp); 3444 process_color_seq (op, Color_fg, str, resp);
3379 break; 3445 break;
3446 case Rxvt_restoreBG:
3380 case XTerm_Color01: 3447 case XTerm_Color01:
3381 process_color_seq (op, Color_bg, str, resp); 3448 process_color_seq (op, Color_bg, str, resp);
3382 break; 3449 break;
3383#ifndef NO_CURSORCOLOR 3450#ifndef NO_CURSORCOLOR
3384 case XTerm_Color_cursor: 3451 case XTerm_Color_cursor:
… …
3389 process_color_seq (op, Color_pointer_fg, str, resp); 3456 process_color_seq (op, Color_pointer_fg, str, resp);
3390 break; 3457 break;
3391 case XTerm_Color_pointer_bg: 3458 case XTerm_Color_pointer_bg:
3392 process_color_seq (op, Color_pointer_bg, str, resp); 3459 process_color_seq (op, Color_pointer_bg, str, resp);
3393 break; 3460 break;
3461#ifdef OPTION_HC
3462 case XTerm_Color_HC:
3463 process_color_seq (op, Color_HC, str, resp);
3464 break;
3465 case XTerm_Color_HTC:
3466 process_color_seq (op, Color_HTC, str, resp);
3467 break;
3468#endif
3394#ifndef NO_BOLD_UNDERLINE_REVERSE 3469#ifndef NO_BOLD_UNDERLINE_REVERSE
3395 case XTerm_Color_RV:
3396 process_color_seq (op, Color_RV, str, resp);
3397 break;
3398 case Rxvt_Color_BD:
3399 case URxvt_Color_BD: 3470 case URxvt_Color_BD:
3400 process_color_seq (op, Color_BD, str, resp); 3471 process_color_seq (op, Color_BD, str, resp);
3401 break; 3472 break;
3402 case Rxvt_Color_UL:
3403 case URxvt_Color_UL: 3473 case URxvt_Color_UL:
3404 process_color_seq (op, Color_UL, str, resp); 3474 process_color_seq (op, Color_UL, str, resp);
3405 break; 3475 break;
3406 case URxvt_Color_IT: 3476 case URxvt_Color_IT:
3407 process_color_seq (op, Color_IT, str, resp); 3477 process_color_seq (op, Color_IT, str, resp);
3408 break; 3478 break;
3409#endif 3479#endif
3410#if ENABLE_TRANSPARENCY 3480 case URxvt_Color_border:
3481 process_color_seq (op, Color_border, str, resp);
3482 break;
3483
3484#if BG_IMAGE_FROM_ROOT
3411 case URxvt_Color_tint: 3485 case URxvt_Color_tint:
3412 process_color_seq (op, Color_tint, str, resp); 3486 process_color_seq (op, Color_tint, str, resp);
3413 { 3487 {
3414 bool changed = false; 3488 bool changed = false;
3489
3415 if (ISSET_PIXCOLOR (Color_tint)) 3490 if (ISSET_PIXCOLOR (Color_tint))
3416 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3491 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3417 else 3492
3418 changed = bgPixmap.unset_tint ();
3419 if (changed) 3493 if (changed)
3420 update_background (); 3494 update_background ();
3421 } 3495 }
3422 3496
3423 break; 3497 break;
… …
3426#if BG_IMAGE_FROM_FILE 3500#if BG_IMAGE_FROM_FILE
3427 case Rxvt_Pixmap: 3501 case Rxvt_Pixmap:
3428 if (!strcmp (str, "?")) 3502 if (!strcmp (str, "?"))
3429 { 3503 {
3430 char str[256]; 3504 char str[256];
3505 int h_scale = fimage.h_scale;
3506 int v_scale = fimage.v_scale;
3507 int h_align = fimage.h_align;
3508 int v_align = fimage.v_align;
3431 3509
3432 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3510 sprintf (str, "[%dx%d+%d+%d]",
3433 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3511 h_scale, v_scale,
3434 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3512 h_align, v_align);
3435 process_xterm_seq (XTerm_title, str, CHAR_ST); 3513 process_xterm_seq (XTerm_title, str, CHAR_ST);
3436 } 3514 }
3437 else 3515 else
3438 { 3516 {
3439 int changed = 0; 3517 bool changed = false;
3440 3518
3441 if (*str != ';') 3519 if (*str != ';')
3442 { 3520 {
3443 /* reset to default scaling :*/ 3521 try
3444 bgPixmap.unset_geometry (); 3522 {
3445 if (bgPixmap.set_file (str)) /* change pixmap */ 3523 fimage.set_file_geometry (this, str);
3446 changed++; 3524 changed = true;
3447 str = strchr (str, ';'); 3525 }
3448 if (str == NULL) 3526 catch (const class rxvt_failure_exception &e)
3449 bgPixmap.set_defaultGeometry (); 3527 {
3528 }
3450 } 3529 }
3451 while (str) 3530 else
3452 { 3531 {
3453 str++; 3532 str++;
3454 if (bgPixmap.set_geometry (str)) 3533 if (fimage.set_geometry (str, true))
3455 changed++; 3534 changed = true;
3456 str = strchr (str, ';');
3457 } 3535 }
3536
3458 if (changed) 3537 if (changed)
3538 {
3539 if (bg_window_position_sensitive ())
3540 {
3541 int x, y;
3542 get_window_origin (x, y);
3543 parent_x = x;
3544 parent_y = y;
3545 }
3459 update_background (); 3546 update_background ();
3547 }
3460 } 3548 }
3461 break; 3549 break;
3462#endif 3550#endif
3463
3464 case Rxvt_restoreFG:
3465 set_window_color (Color_fg, str);
3466 break;
3467 case Rxvt_restoreBG:
3468 set_window_color (Color_bg, str);
3469 break;
3470 3551
3471 case XTerm_logfile: 3552 case XTerm_logfile:
3472 // TODO, when secure mode? 3553 // TODO, when secure mode?
3473 break; 3554 break;
3474 3555
… …
3541 break; 3622 break;
3542#endif 3623#endif
3543 3624
3544#if ENABLE_PERL 3625#if ENABLE_PERL
3545 case URxvt_perl: 3626 case URxvt_perl:
3546 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3627 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3547 ; // no responses yet
3548 break; 3628 break;
3549#endif 3629#endif
3550 } 3630 }
3551} 3631}
3552/*----------------------------------------------------------------------*/ 3632/*----------------------------------------------------------------------*/
… …
3559 * 's' = save 3639 * 's' = save
3560 * 'r' = restore 3640 * 'r' = restore
3561 * 't' = toggle 3641 * 't' = toggle
3562 * so no need for fancy checking 3642 * so no need for fancy checking
3563 */ 3643 */
3564int 3644int ecb_cold
3565rxvt_term::privcases (int mode, unsigned long bit) 3645rxvt_term::privcases (int mode, unsigned long bit)
3566{ 3646{
3567 int state; 3647 int state;
3568 3648
3569 if (mode == 's') 3649 if (mode == 's')
3570 { 3650 {
3571 SavedModes |= (priv_modes & bit); 3651 if (priv_modes & bit)
3652 SavedModes |= bit;
3653 else
3654 SavedModes &= ~bit;
3572 return -1; 3655 return -1;
3573 } 3656 }
3574 else 3657 else
3575 { 3658 {
3576 if (mode == 'r') 3659 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3660 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3661 else
3579 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3662 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3663
3664 if (state)
3665 priv_modes |= bit;
3666 else
3667 priv_modes &= ~bit;
3581 } 3668 }
3582 3669
3583 return state; 3670 return state;
3584} 3671}
3585 3672
3586/* we're not using priv _yet_ */ 3673/* we're not using priv _yet_ */
3587void 3674void
3588rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3675rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3589{ 3676{
3590 unsigned int i, j; 3677 unsigned int i, j;
3591 int state; 3678 int state;
3592 3679
3593 static const struct 3680 static const struct
3594 { 3681 {
3595 const int argval; 3682 const int argval;
3596 const unsigned long bit; 3683 const unsigned long bit;
3597 } argtopriv[] = { 3684 } argtopriv[] = {
3598 { 1, PrivMode_aplCUR }, 3685 { 1, PrivMode_aplCUR }, // DECCKM
3599 { 2, PrivMode_vt52 }, 3686 { 2, PrivMode_vt52 }, // DECANM
3600 { 3, PrivMode_132 }, 3687 { 3, PrivMode_132 }, // DECCOLM
3601 { 4, PrivMode_smoothScroll }, 3688 { 4, PrivMode_smoothScroll }, // DECSCLM
3602 { 5, PrivMode_rVideo }, 3689 { 5, PrivMode_rVideo }, // DECSCNM
3603 { 6, PrivMode_relOrigin }, 3690 { 6, PrivMode_relOrigin }, // DECOM
3604 { 7, PrivMode_Autowrap }, 3691 { 7, PrivMode_Autowrap }, // DECAWM
3605 // 8, bi-directional support mode 3692 // 8, auto-repeat keys // DECARM
3606 { 9, PrivMode_MouseX10 }, 3693 { 9, PrivMode_MouseX10 },
3607 // 18, 19 printing-related 3694 // 18 end FF to printer after print screen
3695 // 19 Print screen prints full screen/scroll region
3608 { 25, PrivMode_VisibleCursor }, 3696 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3609#ifdef scrollBar_esc 3697#ifdef scrollBar_esc
3610 { scrollBar_esc, PrivMode_scrollBar }, 3698 { scrollBar_esc, PrivMode_scrollBar },
3611#endif 3699#endif
3612 { 35, PrivMode_ShiftKeys }, // rxvt extension 3700 { 35, PrivMode_ShiftKeys }, // rxvt extension
3701 // 38, tektronix mode // DECTEK
3613 { 40, PrivMode_132OK }, 3702 { 40, PrivMode_132OK },
3614 // 41 xterm more fixes NYI 3703 // 41 xterm more fixes NYI
3615 // 45 margin bell NYI 3704 // 45 margin bell NYI
3616 // 46 start logging 3705 // 46 start logging
3617 { 47, PrivMode_Screen }, 3706 { 47, PrivMode_Screen },
3618 { 66, PrivMode_aplKP }, 3707 { 66, PrivMode_aplKP }, // DECNKM
3619#ifndef NO_BACKSPACE_KEY 3708#ifndef NO_BACKSPACE_KEY
3620 { 67, PrivMode_BackSpace }, 3709 { 67, PrivMode_BackSpace }, // DECBKM
3621#endif 3710#endif
3622 { 1000, PrivMode_MouseX11 }, 3711 { 1000, PrivMode_MouseX11 },
3623 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3712 { 1002, PrivMode_MouseBtnEvent },
3624 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3713 { 1003, PrivMode_MouseAnyEvent },
3625 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3714#if ENABLE_FRILLS
3715 { 1005, PrivMode_ExtModeMouse },
3716#endif
3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3717 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3627 { 1011, PrivMode_Keypress }, // rxvt extension 3718 { 1011, PrivMode_Keypress }, // rxvt extension
3719#if ENABLE_FRILLS
3720 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3721#endif
3628 // 1035 enable modifiers for alt, numlock NYI 3722 // 1035 enable modifiers for alt, numlock NYI
3629 // 1036 send ESC for meta keys NYI 3723 // 1036 send ESC for meta keys NYI
3630 // 1037 send DEL for keypad delete NYI 3724 // 1037 send DEL for keypad delete NYI
3631 { 1047, PrivMode_Screen }, 3725 { 1047, PrivMode_Screen },
3632 // 1048 save and restore cursor 3726 // 1048 save and restore cursor, implemented in code
3633 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3727 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3728 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3729 { 2004, PrivMode_BracketPaste },
3635 }; 3730 };
3636 3731
3637 if (nargs == 0) 3732 if (nargs == 0)
3638 return; 3733 return;
3639 3734
… …
3646 for (i = 0; i < nargs; i++) 3741 for (i = 0; i < nargs; i++)
3647 { 3742 {
3648 state = -1; 3743 state = -1;
3649 3744
3650 /* basic handling */ 3745 /* basic handling */
3651 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3746 for (j = 0; j < ecb_array_length (argtopriv); j++)
3652 if (argtopriv[j].argval == arg[i]) 3747 if (argtopriv[j].argval == arg[i])
3653 { 3748 {
3654 state = privcases (mode, argtopriv[j].bit); 3749 state = privcases (mode, argtopriv[j].bit);
3655 break; 3750 break;
3656 } 3751 }
… …
3664 3759
3665 scr_touch (true); 3760 scr_touch (true);
3666 break; 3761 break;
3667#endif 3762#endif
3668 case 1048: /* alternative cursor save */ 3763 case 1048: /* alternative cursor save */
3669 case 1049:
3670 if (option (Opt_secondaryScreen)) 3764 if (option (Opt_secondaryScreen))
3671 if (mode == 0) 3765 if (mode == 0)
3672 scr_cursor (RESTORE); 3766 scr_cursor (RESTORE);
3673 else if (mode == 1) 3767 else if (mode == 1)
3674 scr_cursor (SAVE); 3768 scr_cursor (SAVE);
… …
3683 case 2: /* VT52 mode */ 3777 case 2: /* VT52 mode */
3684 /* oddball mode. should be set regardless of set/reset 3778 /* oddball mode. should be set regardless of set/reset
3685 * parameter. Return from VT52 mode with an ESC < from 3779 * parameter. Return from VT52 mode with an ESC < from
3686 * within VT52 mode 3780 * within VT52 mode
3687 */ 3781 */
3688 PrivMode (1, PrivMode_vt52); 3782 priv_modes |= PrivMode_vt52;
3689 break; 3783 break;
3690 case 3: /* 80/132 */ 3784 case 3: /* 80/132 */
3691 if (priv_modes & PrivMode_132OK) 3785 if (priv_modes & PrivMode_132OK)
3692 set_widthheight (((state ? 132 : 80) * fwidth), height); 3786 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3693 break; 3787 break;
3694 case 4: /* smooth scrolling */ 3788 case 4: /* smooth scrolling */
3695 set_option (Opt_jumpScroll, !state); 3789 set_option (Opt_jumpScroll, !state);
3696 break; 3790 break;
3697 case 5: /* reverse video */ 3791 case 5: /* reverse video */
… …
3704 scr_autowrap (state); 3798 scr_autowrap (state);
3705 break; 3799 break;
3706 /* case 8: - auto repeat, can't do on a per window basis */ 3800 /* case 8: - auto repeat, can't do on a per window basis */
3707 case 9: /* X10 mouse reporting */ 3801 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 3802 if (state) /* orthogonal */
3709 priv_modes &= ~PrivMode_MouseX11; 3803 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3710 break; 3804 break;
3711#ifdef scrollBar_esc 3805#ifdef scrollBar_esc
3712 case scrollBar_esc: 3806 case scrollBar_esc:
3713 if (scrollbar_mapping (state)) 3807 scrollBar.map (state);
3714 {
3715 resize_all_windows (0, 0, 0); 3808 resize_all_windows (0, 0, 0);
3716 scr_touch (true); 3809 scr_touch (true);
3717 }
3718 break; 3810 break;
3719#endif 3811#endif
3720 case 25: /* visible/invisible cursor */ 3812 case 25: /* visible/invisible cursor */
3721 scr_cursor_visible (state); 3813 scr_cursor_visible (state);
3722 break; 3814 break;
… …
3727 break; 3819 break;
3728 /* case 66: - application key pad */ 3820 /* case 66: - application key pad */
3729 /* case 67: - backspace key */ 3821 /* case 67: - backspace key */
3730 case 1000: /* X11 mouse reporting */ 3822 case 1000: /* X11 mouse reporting */
3731 if (state) /* orthogonal */ 3823 if (state) /* orthogonal */
3732 priv_modes &= ~PrivMode_MouseX10; 3824 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3733 break; 3825 break;
3734#if 0
3735 case 1001: 3826 case 1002:
3736 break; /* X11 mouse highlighting */ 3827 case 1003:
3737#endif 3828 if (state)
3829 {
3830 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3831 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3832 mouse_row = mouse_col = 0;
3833 vt_emask_mouse = PointerMotionMask;
3834 }
3835 else
3836 vt_emask_mouse = NoEventMask;
3837
3838 vt_select_input ();
3839 break;
3738 case 1010: /* scroll to bottom on TTY output inhibit */ 3840 case 1010: /* scroll to bottom on TTY output inhibit */
3739 set_option (Opt_scrollTtyOutput, !state); 3841 set_option (Opt_scrollTtyOutput, !state);
3740 break; 3842 break;
3741 case 1011: /* scroll to bottom on key press */ 3843 case 1011: /* scroll to bottom on key press */
3742 set_option (Opt_scrollTtyKeypress, state); 3844 set_option (Opt_scrollTtyKeypress, state);
3743 break; 3845 break;
3744 case 1047: /* secondary screen w/ clearing last */ 3846 case 1047: /* secondary screen w/ clearing last */
3745 if (option (Opt_secondaryScreen)) 3847 if (option (Opt_secondaryScreen))
3746 if (current_screen != PRIMARY) 3848 if (!state)
3747 scr_erase_screen (2); 3849 scr_erase_screen (2);
3850
3748 scr_change_screen (state); 3851 scr_change_screen (state);
3749 break; 3852 break;
3750 case 1049: /* secondary screen w/ clearing first */ 3853 case 1049: /* secondary screen w/ clearing first */
3854 if (option (Opt_secondaryScreen))
3855 if (state)
3856 scr_cursor (SAVE);
3857
3751 scr_change_screen (state); 3858 scr_change_screen (state);
3859
3752 if (option (Opt_secondaryScreen)) 3860 if (option (Opt_secondaryScreen))
3753 if (current_screen != PRIMARY) 3861 if (state)
3754 scr_erase_screen (2); 3862 scr_erase_screen (2);
3863 else
3864 scr_cursor (RESTORE);
3755 break; 3865 break;
3756 default: 3866 default:
3757 break; 3867 break;
3758 } 3868 }
3759 } 3869 }
3760} 3870}
3761/*}}} */ 3871/*}}} */
3762 3872
3763/*{{{ process sgr sequences */ 3873/*{{{ process sgr sequences */
3764void 3874void ecb_hot
3765rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3875rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3766{ 3876{
3767 unsigned int i; 3877 unsigned int i;
3768 short rendset; 3878 short rendset;
3769 int rendstyle; 3879 int rendstyle;
… …
3910 break; 4020 break;
3911#endif 4021#endif
3912 } 4022 }
3913 } 4023 }
3914} 4024}
4025
4026void
4027rxvt_term::set_cursor_style (int style)
4028{
4029 if (!IN_RANGE_INC (style, 0, 4))
4030 return;
4031
4032 set_option (Opt_cursorUnderline, style >= 3);
4033
4034#ifdef CURSOR_BLINK
4035 set_option (Opt_cursorBlink, !style || (style & 1));
4036 cursor_blink_reset ();
4037#endif
4038
4039 want_refresh = 1;
4040}
3915/*}}} */ 4041/*}}} */
3916 4042
3917/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3918void
3919rxvt_term::process_graphics ()
3920{
3921 unicode_t ch, cmd = cmd_getc ();
3922
3923 if (cmd == 'Q')
3924 { /* query graphics */
3925 tt_printf ("\033G0\012"); /* no graphics */
3926 return;
3927 }
3928 /* swallow other graphics sequences until terminating ':' */
3929 do
3930 ch = cmd_getc ();
3931 while (ch != ':');
3932}
3933/*}}} */
3934
3935/* ------------------------------------------------------------------------- */ 4043/* ---------------------------------------------------------------------- */
4044/* Write data to the pty as typed by the user, pasted with the mouse,
4045 * or generated by us in response to a query ESC sequence.
4046 */
3936 4047
3937/* 4048/*
3938 * Send printf () formatted output to the command. 4049 * Send printf () formatted output to the command.
3939 * Only use for small amounts of data. 4050 * Only use for small amounts of data.
3940 */ 4051 */
… …
3948 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4059 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3949 va_end (arg_ptr); 4060 va_end (arg_ptr);
3950 tt_write (buf, strlen (buf)); 4061 tt_write (buf, strlen (buf));
3951} 4062}
3952 4063
3953/* ---------------------------------------------------------------------- */
3954/* Write data to the pty as typed by the user, pasted with the mouse, 4064/* Write data to the pty as typed by the user. */
3955 * or generated by us in response to a query ESC sequence. 4065void
3956 */ 4066rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3957const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4067{
4068 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4069 return;
4070
4071 if (option (Opt_scrollTtyKeypress))
4072 if (view_start)
4073 {
4074 view_start = 0;
4075 want_refresh = 1;
4076 }
4077
4078 tt_write_ (data, len);
4079}
3958 4080
3959void 4081void
3960rxvt_term::tt_write (const char *data, unsigned int len) 4082rxvt_term::tt_write (const char *data, unsigned int len)
3961{ 4083{
3962 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4084 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3963 return; 4085 return;
3964 4086
4087 tt_write_ (data, len);
4088}
4089
4090static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4091
4092void
4093rxvt_term::tt_write_ (const char *data, unsigned int len)
4094{
3965 if (pty->pty < 0) 4095 if (pty->pty < 0)
3966 return; 4096 return;
3967 4097
3968 if (v_buflen == 0) 4098 if (v_buflen == 0)
3969 { 4099 {
3970 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4100 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3971 4101
4102 max_it (written, 0);
4103
3972 if ((unsigned int)written == len) 4104 if (written == len)
3973 return; 4105 return;
3974 4106
3975 data += written; 4107 data += written;
3976 len -= written; 4108 len -= written;
3977 } 4109 }
3978 4110
3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4111 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3980 4112
3981 memcpy (v_buffer + v_buflen, data, len); 4113 memcpy (v_buffer + v_buflen, data, len);
3982 v_buflen += len; 4114 v_buflen += len;
3983 4115
3984 pty_ev.set (EVENT_READ | EVENT_WRITE); 4116 pty_ev.set (ev::READ | ev::WRITE);
3985} 4117}
3986 4118
3987void rxvt_term::pty_write () 4119void rxvt_term::pty_write ()
3988{ 4120{
3989 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4121 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
3994 4126
3995 if (v_buflen == 0) 4127 if (v_buflen == 0)
3996 { 4128 {
3997 free (v_buffer); 4129 free (v_buffer);
3998 v_buffer = 0; 4130 v_buffer = 0;
3999 v_buflen = 0;
4000 4131
4001 pty_ev.set (EVENT_READ); 4132 pty_ev.set (ev::READ);
4002 return; 4133 return;
4003 } 4134 }
4004 4135
4005 memmove (v_buffer, v_buffer + written, v_buflen); 4136 memmove (v_buffer, v_buffer + written, v_buflen);
4006 } 4137 }
4007 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4138 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4008 pty_ev.set (EVENT_READ); 4139 pty_ev.set (ev::READ);
4009} 4140}
4010 4141
4011/*----------------------- end-of-file (C source) -----------------------*/ 4142/*----------------------- end-of-file (C source) -----------------------*/
4012 4143

Diff Legend

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