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.400 by ayin, Mon Jan 28 12:54:47 2008 UTC vs.
Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC

… …
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-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * 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
34 * 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
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_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)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
250} 256}
251#endif 257#endif
252 258
253void 259void ecb_cold
254rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
255{ 261{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 263
261 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
262 { 265 {
263 char mb[16]; 266 char mb[MB_LEN_MAX];
264 int len; 267 int len;
265 268
266 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
269 else 272 else
270 { 273 {
271 mb[0] = ch[0]; 274 mb[0] = ch;
272 len = 1; 275 len = 1;
273 } 276 }
274 277
275 if (len > 0) 278 if (len > 0)
276 tt_write (mb, len); 279 tt_write (mb, len);
… …
279 } 282 }
280 283
281 iso14755buf = 0; 284 iso14755buf = 0;
282} 285}
283 286
284int 287static int ecb_cold
285rxvt_term::hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
286{ 289{
287 // check wether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
290 { 293 {
291 KeySym k = XLookupKeysym (&ev, index); 294 KeySym k = XLookupKeysym (&ev, index);
292 295
… …
298 301
299 return -1; 302 return -1;
300} 303}
301#endif 304#endif
302 305
303void 306static inline KeySym ecb_cold
307translate_keypad (KeySym keysym, bool kp)
308{
309#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home
312 XK_KP_4, // XK_KP_Left
313 XK_KP_8, // XK_KP_Up
314 XK_KP_6, // XK_KP_Right
315 XK_KP_2, // XK_KP_Down
316# ifndef UNSHIFTED_SCROLLKEYS
317 XK_KP_9, // XK_KP_Prior
318 XK_KP_3, // XK_KP_Next
319# else
320 XK_Prior,
321 XK_Next,
322# endif
323 XK_KP_1, // XK_KP_End
324 XK_KP_5, // XK_KP_Begin
325 };
326
327 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
328 {
329 unsigned int index = keysym - XK_KP_Home;
330 keysym = kp ? keypadtrans[index] : XK_Home + index;
331 }
332 else if (keysym == XK_KP_Insert)
333 keysym = kp ? XK_KP_0 : XK_Insert;
334# ifndef NO_DELETE_KEY
335 else if (keysym == XK_KP_Delete)
336 keysym = kp ? XK_KP_Decimal : XK_Delete;
337# endif
338#endif
339 return keysym;
340}
341
342static inline int ecb_cold
343map_function_key (KeySym keysym)
344{
345 int param = 0;
346
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
348 {
349 param = 11 + keysym - XK_F1;
350 if (keysym >= XK_F17)
351 param += 4;
352 else if (keysym >= XK_F15)
353 param += 3;
354 else if (keysym >= XK_F11)
355 param += 2;
356 else if (keysym >= XK_F6)
357 param += 1;
358 }
359 else
360 switch (keysym)
361 {
362 case XK_Find:
363 param = 1;
364 break;
365 case XK_Insert:
366 param = 2;
367 break;
368#ifdef DXK_Remove
369 case DXK_Remove:
370#endif
371 case XK_Execute:
372 param = 3;
373 break;
374 case XK_Select:
375 param = 4;
376 break;
377#ifndef UNSHIFTED_SCROLLKEYS
378 case XK_Prior:
379 param = 5;
380 break;
381 case XK_Next:
382 param = 6;
383 break;
384 case XK_Home:
385 param = 7;
386 break;
387 case XK_End:
388 param = 8;
389 break;
390#endif
391 case XK_Help:
392 param = 28;
393 break;
394 case XK_Menu:
395 param = 29;
396 break;
397 }
398 return param;
399}
400
401void ecb_cold
304rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
305{ 403{
306 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 405 KeySym keysym;
309 int valid_keysym; 406 int valid_keysym;
310 char kbuf[KBUFSZ]; 407 char kbuf[KBUFSZ];
311 408
312#if ISO_14755 409#if ISO_14755
… …
322 */ 419 */
323 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
326 423
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332
333 kbuf[0] = 0; 424 kbuf[0] = 0;
334 425
335#ifdef USE_XIM 426#if USE_XIM
336 if (Input_Context) 427 if (Input_Context)
337 { 428 {
338 Status status_return; 429 Status status_return;
339 430
340#if 0 431#if 0
… …
411#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 504#else
414 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
415#endif 506#endif
507 max_it (lnsppg, 1);
508
416 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
417 { 510 {
418 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
419 return; 512 return;
420 } 513 }
… …
473 selection_request (ev.time); 566 selection_request (ev.time);
474 return; 567 return;
475#if TODO 568#if TODO
476 /* rxvt extras */ 569 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 571 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 573 return;
483#endif 574#endif
484 } 575 }
485 } 576 }
486 } 577 }
487 578
488#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 580 // ISO 14755 support
490 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 582 {
492 int hv; 583 int hv;
493 584
494 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
525 scr_overlay_off (); 616 scr_overlay_off ();
526# endif 617# endif
527 iso14755buf = 0; 618 iso14755buf = 0;
528 } 619 }
529 } 620 }
621 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
533 { 625 {
534 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
535# if ISO_14755 627# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
547 } 639 }
548#endif 640#endif
549 641
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 643 {
644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
645 unsigned int newlen = 1;
646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
552 { 653 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 654#ifndef NO_BACKSPACE_KEY
554 newlen = 1; 655 case XK_BackSpace:
555#ifdef XK_KP_Home 656 if (priv_modes & PrivMode_HaveBackSpace)
556 static const KeySym keypadtrans[] = { 657 {
557 XK_KP_7, // XK_KP_Home 658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
558 XK_KP_4, // XK_KP_Left 659 ^ !!ctrl) ? '\b' : '\177';
559 XK_KP_8, // XK_KP_Up 660 kbuf[1] = '\0';
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 }; 661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
684 newlen = 0;
685 }
686 break;
572 687
573 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
574 { 768 {
575 unsigned int index = keysym - XK_KP_Home; 769 int param = map_function_key (keysym);
576 keysym = kp ? keypadtrans[index] : XK_Home + index; 770 if (param > 0)
771 sprintf (kbuf,"\033[%d~", param);
772 else
773 newlen = 0;
577 } 774 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
585 switch (keysym)
586 {
587#ifndef NO_BACKSPACE_KEY
588 case XK_BackSpace:
589 if (priv_modes & PrivMode_HaveBackSpace)
590 {
591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
592 ^ !!ctrl) ? '\b' : '\177';
593 kbuf[1] = '\0';
594 }
595 else
596 strcpy (kbuf, rs[Rs_backspace_key]);
597 break; 775 break;
598#endif
599#ifndef NO_DELETE_KEY
600 case XK_Delete:
601 strcpy (kbuf, rs[Rs_delete_key]);
602 break;
603#endif
604 case XK_Tab:
605 if (shft)
606 strcpy (kbuf, "\033[Z");
607 else
608 {
609#ifdef CTRL_TAB_MAKES_META
610 if (ctrl)
611 meta = 1;
612#endif
613#ifdef MOD4_TAB_MAKES_META
614 if (ev.state & Mod4Mask)
615 meta = 1;
616#endif
617 newlen = 0;
618 }
619 break;
620
621 case XK_Up: /* "\033[A" */
622 case XK_Down: /* "\033[B" */
623 case XK_Right: /* "\033[C" */
624 case XK_Left: /* "\033[D" */
625 strcpy (kbuf, "\033[Z");
626 kbuf[2] = "DACB"[keysym - XK_Left];
627 /* do Shift first */
628 if (shft)
629 kbuf[2] = "dacb"[keysym - XK_Left];
630 else if (ctrl)
631 {
632 kbuf[1] = 'O';
633 kbuf[2] = "dacb"[keysym - XK_Left];
634 }
635 else if (priv_modes & PrivMode_aplCUR)
636 kbuf[1] = 'O';
637 break;
638
639#ifndef UNSHIFTED_SCROLLKEYS
640 case XK_Prior:
641 strcpy (kbuf, "\033[5~");
642 break;
643 case XK_Next:
644 strcpy (kbuf, "\033[6~");
645 break;
646#endif
647 case XK_KP_Enter:
648 /* allow shift to override */
649 if (kp)
650 {
651 strcpy (kbuf, "\033OM");
652 break;
653 }
654
655 /* FALLTHROUGH */
656
657 case XK_Return:
658 if (priv_modes & PrivMode_LFNL)
659 {
660 kbuf[0] = '\015';
661 kbuf[1] = '\012';
662 kbuf[2] = '\0';
663 }
664 else
665 {
666 kbuf[0] = '\015';
667 kbuf[1] = '\0';
668 }
669 break;
670
671 case XK_KP_F1: /* "\033OP" */
672 case XK_KP_F2: /* "\033OQ" */
673 case XK_KP_F3: /* "\033OR" */
674 case XK_KP_F4: /* "\033OS" */
675 strcpy (kbuf, "\033OP");
676 kbuf[2] += (keysym - XK_KP_F1);
677 break;
678
679 case XK_KP_Multiply: /* "\033Oj" : "*" */
680 case XK_KP_Add: /* "\033Ok" : "+" */
681 case XK_KP_Separator: /* "\033Ol" : "," */
682 case XK_KP_Subtract: /* "\033Om" : "-" */
683 case XK_KP_Decimal: /* "\033On" : "." */
684 case XK_KP_Divide: /* "\033Oo" : "/" */
685 case XK_KP_0: /* "\033Op" : "0" */
686 case XK_KP_1: /* "\033Oq" : "1" */
687 case XK_KP_2: /* "\033Or" : "2" */
688 case XK_KP_3: /* "\033Os" : "3" */
689 case XK_KP_4: /* "\033Ot" : "4" */
690 case XK_KP_5: /* "\033Ou" : "5" */
691 case XK_KP_6: /* "\033Ov" : "6" */
692 case XK_KP_7: /* "\033Ow" : "7" */
693 case XK_KP_8: /* "\033Ox" : "8" */
694 case XK_KP_9: /* "\033Oy" : "9" */
695 /* allow shift to override */
696 if (kp)
697 {
698 strcpy (kbuf, "\033Oj");
699 kbuf[2] += (keysym - XK_KP_Multiply);
700 }
701 else
702 {
703 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
704 kbuf[1] = '\0';
705 }
706 break;
707
708 case XK_Find:
709 strcpy (kbuf, "\033[1~");
710 break;
711
712 case XK_Insert:
713 strcpy (kbuf, "\033[2~");
714 break;
715#ifdef DXK_Remove /* support for DEC remove like key */
716 case DXK_Remove:
717 /* FALLTHROUGH */
718#endif
719 case XK_Execute:
720 strcpy (kbuf, "\033[3~");
721 break;
722 case XK_Select:
723 strcpy (kbuf, "\033[4~");
724 break;
725 case XK_End:
726 strcpy (kbuf, KS_END);
727 break;
728 case XK_Home:
729 strcpy (kbuf, KS_HOME);
730 break;
731
732#define FKEY(n, fkey) \
733 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
734
735 case XK_F1: /* "\033[11~" */
736 case XK_F2: /* "\033[12~" */
737 case XK_F3: /* "\033[13~" */
738 case XK_F4: /* "\033[14~" */
739 case XK_F5: /* "\033[15~" */
740 FKEY (11, XK_F1);
741 break;
742 case XK_F6: /* "\033[17~" */
743 case XK_F7: /* "\033[18~" */
744 case XK_F8: /* "\033[19~" */
745 case XK_F9: /* "\033[20~" */
746 case XK_F10: /* "\033[21~" */
747 FKEY (17, XK_F6);
748 break;
749 case XK_F11: /* "\033[23~" */
750 case XK_F12: /* "\033[24~" */
751 case XK_F13: /* "\033[25~" */
752 case XK_F14: /* "\033[26~" */
753 FKEY (23, XK_F11);
754 break;
755 case XK_F15: /* "\033[28~" */
756 case XK_F16: /* "\033[29~" */
757 FKEY (28, XK_F15);
758 break;
759 case XK_Help: /* "\033[28~" */
760 FKEY (28, XK_Help);
761 break;
762 case XK_Menu: /* "\033[29~" */
763 FKEY (29, XK_Menu);
764 break;
765 case XK_F17: /* "\033[31~" */
766 case XK_F18: /* "\033[32~" */
767 case XK_F19: /* "\033[33~" */
768 case XK_F20: /* "\033[34~" */
769 case XK_F21: /* "\033[35~" */
770 case XK_F22: /* "\033[36~" */
771 case XK_F23: /* "\033[37~" */
772 case XK_F24: /* "\033[38~" */
773 case XK_F25: /* "\033[39~" */
774 case XK_F26: /* "\033[40~" */
775 case XK_F27: /* "\033[41~" */
776 case XK_F28: /* "\033[42~" */
777 case XK_F29: /* "\033[43~" */
778 case XK_F30: /* "\033[44~" */
779 case XK_F31: /* "\033[45~" */
780 case XK_F32: /* "\033[46~" */
781 case XK_F33: /* "\033[47~" */
782 case XK_F34: /* "\033[48~" */
783 case XK_F35: /* "\033[49~" */
784 FKEY (31, XK_F17);
785 break;
786#undef FKEY
787 default:
788 newlen = 0;
789 break;
790 }
791
792 if (newlen)
793 len = strlen (kbuf);
794 } 776 }
795 777
778 if (newlen)
779 len = strlen (kbuf);
780
781 if (len > 0)
782 {
796 /* 783 /*
784 * pass Shift/Control indicators for function keys ending with `~'
785 *
786 * eg,
787 * Prior = "ESC[5~"
788 * Shift+Prior = "ESC[5$"
789 * Ctrl+Prior = "ESC[5^"
790 * Ctrl+Shift+Prior = "ESC[5@"
791 */
792 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
793 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795 /*
797 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
798 */ 797 */
799#ifdef META8_OPTION 798#ifdef META8_OPTION
800 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
801 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
802#endif 801#endif
802 }
803 803
804 } 804 }
805 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
806 { 806 {
807 len = 1; 807 len = 1;
… …
841 { 841 {
842 view_start = 0; 842 view_start = 0;
843 want_refresh = 1; 843 want_refresh = 1;
844 } 844 }
845 845
846 /*
847 * these modifications only affect the static keybuffer
848 * pass Shift/Control indicators for function keys ending with `~'
849 *
850 * eg,
851 * Prior = "ESC[5~"
852 * Shift+Prior = "ESC[5$"
853 * Ctrl+Prior = "ESC[5^"
854 * Ctrl+Shift+Prior = "ESC[5@"
855 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
856 */
857 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
858 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
859
860 /* escape prefix */ 846 /* escape prefix */
861 if (meta 847 if (meta
862#ifdef META8_OPTION 848#ifdef META8_OPTION
863 && meta_char == C0_ESC 849 && meta_char == C0_ESC
864#endif 850#endif
… …
869 } 855 }
870 856
871 tt_write (kbuf, (unsigned int)len); 857 tt_write (kbuf, (unsigned int)len);
872} 858}
873 859
874void 860void ecb_cold
875rxvt_term::key_release (XKeyEvent &ev) 861rxvt_term::key_release (XKeyEvent &ev)
876{ 862{
877#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 863#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
878 KeySym keysym; 864 KeySym keysym;
879 865
… …
899 commit_iso14755 (); 885 commit_iso14755 ();
900 886
901 return; 887 return;
902 } 888 }
903 889
904 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 890 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
905 if (i[0] == keysym) 891 if (i[0] == keysym)
906 { 892 {
907 iso14755buf = ISO_14755_51 | i[1]; 893 iso14755buf = ISO_14755_51 | i[1];
908 commit_iso14755 (); 894 commit_iso14755 ();
909 895
… …
946 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
947 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
948#endif 934#endif
949} 935}
950 936
951#if defined (KEYSYM_RESOURCE)
952unsigned int
953rxvt_term::cmd_write (const char *str, unsigned int count)
954{
955 unsigned int n, s;
956
957 n = cmdbuf_ptr - cmdbuf_base;
958 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
959
960 if (n > 0 && s < count)
961 {
962 memmove (cmdbuf_base, cmdbuf_ptr,
963 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
964 cmdbuf_ptr = cmdbuf_base;
965 cmdbuf_endp -= n;
966 s += n;
967 }
968
969 if (count > s)
970 {
971 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
972 count = s;
973 }
974
975 for (; count--;)
976 *cmdbuf_endp++ = *str++;
977
978 cmd_parse ();
979
980 return 0;
981}
982#endif
983
984void 937void
985rxvt_term::flush () 938rxvt_term::flush ()
986{ 939{
987 flush_ev.stop (); 940 flush_ev.stop ();
988 941
989#ifdef HAVE_BG_PIXMAP 942#ifdef HAVE_BG_PIXMAP
990 if (bgPixmap.check_clearChanged ()) 943 if (bg_flags & BG_NEEDS_REFRESH)
991 { 944 {
992// scr_clear (true); This needs to be researched further! 945 bg_flags &= ~BG_NEEDS_REFRESH;
993 scr_touch (false); 946 scr_touch (false);
994 } 947 }
995#endif 948#endif
996 949
997 if (want_refresh) 950 if (want_refresh)
… …
1033 } 986 }
1034 while (row < end_row); 987 while (row < end_row);
1035 } 988 }
1036 989
1037 scr_refresh (); 990 scr_refresh ();
1038 scrollbar_show (1); 991 scrollBar.show (1);
1039#ifdef USE_XIM 992#if USE_XIM
1040 IMSendSpot (); 993 im_send_spot ();
1041#endif 994#endif
1042 } 995 }
1043 996
1044 display->flush (); 997 display->flush ();
1045} 998}
1046 999
1047/* checks wether a refresh is requested and starts the refresh timer */ 1000/* checks whether a refresh is requested and starts the refresh timer */
1048void 1001void
1049rxvt_term::refresh_check () 1002rxvt_term::refresh_check ()
1050{ 1003{
1051 if (want_refresh && !flush_ev.is_active ()) 1004 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1005 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1062 refresh_count = 0; 1015 refresh_count = 0;
1063 flush (); 1016 flush ();
1064} 1017}
1065 1018
1066#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1020void
1021rxvt_term::cursor_blink_reset ()
1022{
1023 if (hidden_cursor)
1024 {
1025 hidden_cursor = 0;
1026 want_refresh = 1;
1027 }
1028
1029 if (option (Opt_cursorBlink))
1030 cursor_blink_ev.again ();
1031 else
1032 cursor_blink_ev.stop ();
1033}
1034
1067void 1035void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1037{
1070 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1039 want_refresh = 1;
… …
1090 1058
1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092void 1060void
1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094{ 1062{
1095 if ((scrollbar_isUp () || scrollbar_isDn ()) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1096 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1097 { 1065 {
1098 want_refresh = 1; 1066 want_refresh = 1;
1099 refresh_check (); 1067 refresh_check ();
1100 } 1068 }
1101 else 1069 else
… …
1145 { 1113 {
1146 // this should really be sched_yield(), but the linux guys thought 1114 // this should really be sched_yield(), but the linux guys thought
1147 // that giving a process calling sched_yield () less cpu time than 1115 // that giving a process calling sched_yield () less cpu time than
1148 // ones with high nice levels is a useful thing to do. It surely is is 1116 // ones with high nice levels is a useful thing to do. It surely is is
1149 // allowed by the sus... as is returning ENOSYS. 1117 // allowed by the sus... as is returning ENOSYS.
1118 // since the linux guys additionally thought that breaking the only
1119 // known workaround against their unusable sched_yield hack is cool,
1120 // we just nanosleep a bit and hope for the best.
1150 1121
1151 struct timespec ts = { 0, 0 }; 1122 struct timespec ts = { 0, 1000 };
1152 nanosleep (&ts, 0); 1123 nanosleep (&ts, 0);
1153 1124
1154 w.stop (); 1125 w.stop ();
1155 } 1126 }
1156 1127
… …
1159 { 1130 {
1160 } 1131 }
1161} event_handler; 1132} event_handler;
1162#endif 1133#endif
1163 1134
1135/* make sure all the cmd data is at beginning of cmdbuf */
1136void
1137rxvt_term::cmdbuf_reify ()
1138{
1139 if (cmdbuf_ptr == cmdbuf_base)
1140 return;
1141
1142 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1143
1144 memmove (cmdbuf_base, cmdbuf_ptr, used);
1145 cmdbuf_ptr = cmdbuf_base;
1146 cmdbuf_endp = cmdbuf_ptr + used;
1147
1148}
1149
1150#if defined (KEYSYM_RESOURCE)
1151void
1152rxvt_term::cmdbuf_append (const char *str, size_t count)
1153{
1154 cmdbuf_reify ();
1155
1156 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1157
1158 if (count > avail)
1159 return;
1160
1161 memcpy (cmdbuf_endp, str, count);
1162 cmdbuf_endp += count;
1163
1164 cmd_parse ();
1165}
1166#endif
1167
1164bool 1168bool
1165rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1166{ 1170{
1167 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1168 1172
1169 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1170 { 1174
1171 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1172 n = 0;
1173 } 1176 {
1174 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1175 memmove (cmdbuf_base, cmdbuf_ptr, n);
1176 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1177 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1178 1182
1179 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1180 1184
1181 if (r > 0) 1185 if (r > 0)
1182 { 1186 {
1183 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1184 return true; 1188 return true;
… …
1206{ 1210{
1207 make_current (); 1211 make_current ();
1208 1212
1209 if (revents & ev::READ) 1213 if (revents & ev::READ)
1210 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1211 while (pty_fill ()) 1215 for (int i = CBUFCNT; i-- && pty_fill (); )
1212 if (cmd_parse ()) 1216 cmd_parse ();
1213 break;
1214 1217
1215 if (revents & ev::WRITE) 1218 if (revents & ev::WRITE)
1216 pty_write (); 1219 pty_write ();
1217 1220
1218 refresh_check (); 1221 refresh_check ();
1219} 1222}
1220 1223
1221void 1224void ecb_cold
1222rxvt_term::pointer_unblank () 1225rxvt_term::pointer_unblank ()
1223{ 1226{
1224 XDefineCursor (dpy, vt, TermWin_cursor); 1227 XDefineCursor (dpy, vt, TermWin_cursor);
1225 recolour_cursor (); 1228 recolour_cursor ();
1226 1229
… …
1231 pointer_ev.start (pointerBlankDelay); 1234 pointer_ev.start (pointerBlankDelay);
1232#endif 1235#endif
1233} 1236}
1234 1237
1235#ifdef POINTER_BLANK 1238#ifdef POINTER_BLANK
1236void 1239void ecb_cold
1237rxvt_term::pointer_blank () 1240rxvt_term::pointer_blank ()
1238{ 1241{
1239 if (!option (Opt_pointerBlank)) 1242 if (!option (Opt_pointerBlank))
1240 return; 1243 return;
1241 1244
… …
1243 XFlush (dpy); 1246 XFlush (dpy);
1244 1247
1245 hidden_pointer = 1; 1248 hidden_pointer = 1;
1246} 1249}
1247 1250
1248void 1251void ecb_cold
1249rxvt_term::pointer_cb (ev::timer &w, int revents) 1252rxvt_term::pointer_cb (ev::timer &w, int revents)
1250{ 1253{
1251 make_current (); 1254 make_current ();
1252 1255
1253 pointer_blank (); 1256 pointer_blank ();
… …
1259{ 1262{
1260 int button_number, key_state = 0; 1263 int button_number, key_state = 0;
1261 int x, y; 1264 int x, y;
1262 int code = 32; 1265 int code = 32;
1263 1266
1264 x = Pixel2Col (ev.x); 1267 x = Pixel2Col (ev.x) + 1;
1265 y = Pixel2Row (ev.y); 1268 y = Pixel2Row (ev.y) + 1;
1269
1266 if (ev.type == MotionNotify) 1270 if (ev.type == MotionNotify)
1267 { 1271 {
1268 if (x == mouse_row && y == mouse_col) 1272 if (x == mouse_row && y == mouse_col)
1269 return; 1273 return;
1274
1270 mouse_row = x; 1275 mouse_row = x;
1271 mouse_col = y; 1276 mouse_col = y;
1272 code += 32; 1277 code += 32;
1273 } 1278 }
1274 1279
… …
1277 else 1282 else
1278 { 1283 {
1279 button_number = MEvent.button - Button1; 1284 button_number = MEvent.button - Button1;
1280 /* add 0x3D for wheel events, like xterm does */ 1285 /* add 0x3D for wheel events, like xterm does */
1281 if (button_number >= 3) 1286 if (button_number >= 3)
1282 button_number += (64 - 3); 1287 button_number += 64 - 3;
1283 } 1288 }
1284 1289
1285 if (priv_modes & PrivMode_MouseX10) 1290 if (priv_modes & PrivMode_MouseX10)
1286 { 1291 {
1287 /* 1292 /*
… …
1319 fputc ('A', stderr); 1324 fputc ('A', stderr);
1320 if (key_state & 32) 1325 if (key_state & 32)
1321 fputc ('2', stderr); 1326 fputc ('2', stderr);
1322 fprintf (stderr, "]: <%d>, %d/%d\n", 1327 fprintf (stderr, "]: <%d>, %d/%d\n",
1323 button_number, 1328 button_number,
1324 x + 1, 1329 x,
1325 y + 1); 1330 y);
1326#endif 1331#endif
1327 1332
1333#if ENABLE_FRILLS
1334 if (priv_modes & PrivMode_ExtMouseRight)
1335 tt_printf ("\033[%d;%d;%dM",
1336 code + button_number + key_state,
1337 x,
1338 y);
1339 else if (priv_modes & PrivMode_ExtModeMouse)
1340 tt_printf ("\033[M%c%lc%lc",
1341 code + button_number + key_state,
1342 wint_t (32 + x),
1343 wint_t (32 + y));
1344 else
1345#endif
1328 tt_printf ("\033[M%c%c%c", 1346 tt_printf ("\033[M%c%c%c",
1329 (code + button_number + key_state), 1347 code + button_number + key_state,
1330 (32 + x + 1), 1348 32 + x,
1331 (32 + y + 1)); 1349 32 + y);
1332} 1350}
1333 1351
1334/*{{{ process an X event */ 1352/*{{{ process an X event */
1335void 1353void ecb_hot
1336rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
1337{ 1355{
1338 make_current (); 1356 make_current ();
1339 1357
1340 dLocal (Display *, dpy); 1358 dLocal (Display *, dpy);
… …
1438 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1439 focus_out (); 1457 focus_out ();
1440 break; 1458 break;
1441 1459
1442 case ConfigureNotify: 1460 case ConfigureNotify:
1443 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height);*/
1446 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1447 { 1462 {
1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449 ; 1464 ;
1465
1466 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1467
1468#ifdef HAVE_BG_PIXMAP
1469 if (bg_window_position_sensitive ())
1470 want_position_change = true;
1471#endif
1472
1473 bool moved = false;
1474
1475 if (want_position_change)
1476 {
1477 int x, y;
1478
1479 if (ev.xconfigure.send_event)
1480 {
1481 x = ev.xconfigure.x;
1482 y = ev.xconfigure.y;
1483 }
1484 else
1485 get_window_origin (x, y);
1486
1487 if (x != parent_x || y != parent_y)
1488 {
1489 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1490 parent_x = x;
1491 parent_y = y;
1492 }
1493
1494 if (bg_set_position (x, y)
1495 || !(bg_flags & BG_IS_VALID))
1496 moved = true;
1497 }
1450 1498
1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1499 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1452 { 1500 {
1453 seen_resize = 1; 1501 seen_resize = 1;
1454 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1502 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1455 } 1503 }
1456 else 1504 else
1457 { 1505 {
1458#ifdef HAVE_BG_PIXMAP 1506#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ())
1460 {
1461 if (mapped) 1507 if (moved)
1462 update_background (); 1508 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1466#endif 1509#endif
1467 } 1510 }
1468 1511
1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1470 } 1513 }
1471 break; 1514 break;
1472 1515
1473 case PropertyNotify: 1516 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1517 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1475 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1476 && ev.xproperty.state == PropertyNewValue)
1477 selection_property (ev.xproperty.window, ev.xproperty.atom);
1478
1479 break; 1518 break;
1480 1519
1481 case SelectionClear: 1520 case SelectionClear:
1482 selection_clear (); 1521 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1483 break;
1484
1485 case SelectionNotify:
1486 if (selection_wait == Sel_normal)
1487 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1488 break; 1522 break;
1489 1523
1490 case SelectionRequest: 1524 case SelectionRequest:
1491 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1492 break; 1526 break;
1493 1527
1494 case MapNotify: 1528 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP 1529#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a 1530 /* This is needed specifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first 1531 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1532 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does 1533 * care of multiplicity of ConfigureNotify events arriving while WM does
1500 * reparenting. 1534 * reparenting.
1501 * We should not render background immidiately, as there could be several 1535 * We should not render background immediately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1536 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short 1537 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive. 1538 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all 1539 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results. 1540 * of ConfigureNotifys for the best results.
1507 */ 1541 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1542 if (!(bg_flags & BG_IS_VALID))
1509 update_background_ev.start (0.025); 1543 update_background_ev.start (0.025);
1510#endif 1544#endif
1511 mapped = 1; 1545 mapped = 1;
1512#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1513 text_blink_ev.start (); 1547 text_blink_ev.start ();
… …
1528 if (ev.xany.window == vt) 1562 if (ev.xany.window == vt)
1529 { 1563 {
1530 do 1564 do
1531 { 1565 {
1532 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1533 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, false);
1534 } 1568 }
1535 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1569 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1536 1570
1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1538 1572
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540 { 1574 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, false);
1543 } 1577 }
1544 1578
1545 want_refresh = 1; 1579 want_refresh = 1;
1546 } 1580 }
1547 else 1581 else
… …
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1587 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1554 ; 1588 ;
1555 1589
1556 if (scrollBar.state && ev.xany.window == scrollBar.win) 1590 if (scrollBar.state && ev.xany.window == scrollBar.win)
1557 { 1591 {
1558 scrollBar.setIdle (); 1592 scrollBar.state = SB_STATE_IDLE;
1559 scrollbar_show (0); 1593 scrollBar.show (0);
1560 } 1594 }
1561 } 1595 }
1562 break; 1596 break;
1563 1597
1564 case MotionNotify: 1598 case MotionNotify:
… …
1629 dist = int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1630 } 1664 }
1631 else 1665 else
1632 { 1666 {
1633 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1634 dist = ev.xbutton.y - (int_bwidth + height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1635 } 1669 }
1636 1670
1637 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1638 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1639 + 1; 1673 + 1;
… …
1651#ifdef MOUSE_THRESHOLD 1685#ifdef MOUSE_THRESHOLD
1652 } 1686 }
1653#endif 1687#endif
1654 } 1688 }
1655 } 1689 }
1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1691 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1660 ; 1694 ;
1661 1695
1662 XQueryPointer (dpy, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1663 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1700 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1702 scrollBar.size ());
1669 want_refresh = 1; 1703 want_refresh = 1;
1670 scrollbar_show (1); 1704 scrollBar.show (1);
1671 } 1705 }
1672 break; 1706 break;
1673 } 1707 }
1674 1708
1675#if defined(CURSOR_BLINK) 1709#if defined(CURSOR_BLINK)
1676 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1710 if (ev.type == KeyPress)
1677 {
1678 if (hidden_cursor)
1679 {
1680 hidden_cursor = 0;
1681 want_refresh = 1;
1682 }
1683
1684 cursor_blink_ev.again (); 1711 cursor_blink_reset ();
1685 }
1686#endif 1712#endif
1687 1713
1688#if defined(POINTER_BLANK) 1714#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1690 { 1716 {
… …
1700#endif 1726#endif
1701 1727
1702 refresh_check (); 1728 refresh_check ();
1703} 1729}
1704 1730
1705void 1731#if ENABLE_FRILLS
1732void ecb_cold
1733rxvt_term::set_urgency (bool enable)
1734{
1735 if (enable == urgency_hint)
1736 return;
1737
1738 if (XWMHints *h = XGetWMHints (dpy, parent))
1739 {
1740 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1741 XSetWMHints (dpy, parent, h);
1742 urgency_hint = enable;
1743 XFree (h);
1744 }
1745}
1746#endif
1747
1748void ecb_cold
1706rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1707{ 1750{
1708 if (!focus) 1751 if (!focus)
1709 { 1752 {
1710 focus = 1; 1753 focus = 1;
1711 want_refresh = 1; 1754 want_refresh = 1;
1712 1755
1713 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714
1715#if USE_XIM 1756#if USE_XIM
1716 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1717 { 1758 {
1718 IMSetPosition (); 1759 im_set_position ();
1719 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1720 } 1761 }
1721#endif 1762#endif
1722#if CURSOR_BLINK 1763#if CURSOR_BLINK
1723 if (option (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
… …
1730 scr_recolour (); 1771 scr_recolour ();
1731 } 1772 }
1732#endif 1773#endif
1733#if ENABLE_FRILLS 1774#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell)) 1775 if (option (Opt_urgentOnBell))
1735 { 1776 set_urgency (0);
1736 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737 {
1738 h->flags &= ~XUrgencyHint;
1739 XSetWMHints (dpy, parent[0], h);
1740 }
1741 }
1742#endif 1777#endif
1743 }
1744}
1745 1778
1746void 1779 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1780 }
1781}
1782
1783void ecb_cold
1747rxvt_term::focus_out () 1784rxvt_term::focus_out ()
1748{ 1785{
1749 if (focus) 1786 if (focus)
1750 { 1787 {
1751 focus = 0; 1788 focus = 0;
1752 want_refresh = 1; 1789 want_refresh = 1;
1753 1790
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1791#if ENABLE_FRILLS
1755 1792 if (option (Opt_urgentOnBell))
1793 set_urgency (0);
1794#endif
1756#if ENABLE_FRILLS || ISO_14755 1795#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf) 1796 if (iso14755buf)
1758 { 1797 {
1759 iso14755buf = 0; 1798 iso14755buf = 0;
1760# if ISO_14755 1799# if ISO_14755
… …
1777 { 1816 {
1778 pix_colors = pix_colors_unfocused; 1817 pix_colors = pix_colors_unfocused;
1779 scr_recolour (); 1818 scr_recolour ();
1780 } 1819 }
1781#endif 1820#endif
1782 }
1783}
1784 1821
1785void 1822 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1823 }
1824}
1825
1826void ecb_cold
1786rxvt_term::update_fade_color (unsigned int idx) 1827rxvt_term::update_fade_color (unsigned int idx)
1787{ 1828{
1788#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1789 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1790 { 1831 {
… …
1794 } 1835 }
1795#endif 1836#endif
1796} 1837}
1797 1838
1798#if ENABLE_TRANSPARENCY || ENABLE_PERL 1839#if ENABLE_TRANSPARENCY || ENABLE_PERL
1799void 1840void ecb_hot
1800rxvt_term::rootwin_cb (XEvent &ev) 1841rxvt_term::rootwin_cb (XEvent &ev)
1801{ 1842{
1802 make_current (); 1843 make_current ();
1803 1844
1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1845 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
… …
1814 * use the property to determine the pixmap. We use it later on. 1855 * use the property to determine the pixmap. We use it later on.
1815 */ 1856 */
1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1857 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1858 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1818 { 1859 {
1819 bgPixmap.set_root_pixmap (); 1860 bg_set_root_pixmap ();
1820 update_background (); 1861 update_background ();
1821 } 1862 }
1822 1863
1823 break; 1864 break;
1824 } 1865 }
… …
1863 /* save the xbutton state (for ButtonRelease) */ 1904 /* save the xbutton state (for ButtonRelease) */
1864 MEvent.state = ev.state; 1905 MEvent.state = ev.state;
1865#ifdef MOUSE_REPORT_DOUBLECLICK 1906#ifdef MOUSE_REPORT_DOUBLECLICK
1866 if (ev.button == MEvent.button && clickintime) 1907 if (ev.button == MEvent.button && clickintime)
1867 { 1908 {
1868 /* same button, within alloted time */ 1909 /* same button, within allowed time */
1869 MEvent.clicks++; 1910 MEvent.clicks++;
1870 1911
1871 if (MEvent.clicks > 1) 1912 if (MEvent.clicks > 1)
1872 { 1913 {
1873 /* only report double clicks */ 1914 /* only report double clicks */
… …
1947 /* 1988 /*
1948 * Scrollbar window processing of button press 1989 * Scrollbar window processing of button press
1949 */ 1990 */
1950 if (scrollBar.state && ev.window == scrollBar.win) 1991 if (scrollBar.state && ev.window == scrollBar.win)
1951 { 1992 {
1952 int upordown = 0; 1993 page_dirn direction = NO_DIR;
1953 1994
1954 if (scrollBar.upButton (ev.y)) 1995 if (scrollBar.upButton (ev.y))
1955 upordown = -1; /* up */ 1996 direction = UP; /* up */
1956 else if (scrollBar.dnButton (ev.y)) 1997 else if (scrollBar.dnButton (ev.y))
1957 upordown = 1; /* down */ 1998 direction = DN; /* down */
1958 1999
1959 scrollBar.setIdle (); 2000 scrollBar.state = SB_STATE_IDLE;
1960 /* 2001 /*
1961 * Rxvt-style scrollbar: 2002 * Rxvt-style scrollbar:
1962 * move up if mouse is above slider 2003 * move up if mouse is above slider
1963 * move dn if mouse is below slider 2004 * move dn if mouse is below slider
1964 * 2005 *
… …
1973 /* 2014 /*
1974 * Mouse report disabled scrollbar: 2015 * Mouse report disabled scrollbar:
1975 * arrow buttons - send up/down 2016 * arrow buttons - send up/down
1976 * click on scrollbar - send pageup/down 2017 * click on scrollbar - send pageup/down
1977 */ 2018 */
1978 if (upordown < 0) 2019 if (direction == UP)
1979 tt_printf ("\033[A"); 2020 tt_printf ("\033[A");
1980 else if (upordown > 0) 2021 else if (direction == DN)
1981 tt_printf ("\033[B"); 2022 tt_printf ("\033[B");
1982 else 2023 else
1983 switch (ev.button) 2024 switch (ev.button)
1984 { 2025 {
1985 case Button2: 2026 case Button2:
… …
1993 break; 2034 break;
1994 } 2035 }
1995 } 2036 }
1996 else 2037 else
1997#endif /* NO_SCROLLBAR_REPORT */ 2038#endif /* NO_SCROLLBAR_REPORT */
1998
1999 { 2039 {
2000 if (upordown) 2040 if (direction != NO_DIR)
2001 { 2041 {
2002#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2042#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2003 if (!cont_scroll_ev.is_active ()) 2043 if (!cont_scroll_ev.is_active ())
2004 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2044 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2005#endif 2045#endif
2006 if (scr_page (upordown < 0 ? UP : DN, 1)) 2046 if (scr_page (direction, 1))
2007 { 2047 {
2008 if (upordown < 0) 2048 if (direction == UP)
2009 scrollBar.setUp (); 2049 scrollBar.state = SB_STATE_UP;
2010 else 2050 else
2011 scrollBar.setDn (); 2051 scrollBar.state = SB_STATE_DOWN;
2012 } 2052 }
2013 } 2053 }
2014 else 2054 else
2015 switch (ev.button) 2055 switch (ev.button)
2016 { 2056 {
2017 case Button2: 2057 case Button2:
2018 switch (scrollBar.align) 2058 switch (scrollBar.align)
2019 { 2059 {
2020 case R_SB_ALIGN_TOP: 2060 case SB_ALIGN_TOP:
2021 csrO = 0; 2061 csrO = 0;
2022 break; 2062 break;
2023 case R_SB_ALIGN_CENTRE: 2063 case SB_ALIGN_CENTRE:
2024 csrO = (scrollBar.bot - scrollBar.top) / 2; 2064 csrO = (scrollBar.bot - scrollBar.top) / 2;
2025 break; 2065 break;
2026 case R_SB_ALIGN_BOTTOM: 2066 case SB_ALIGN_BOTTOM:
2027 csrO = scrollBar.bot - scrollBar.top; 2067 csrO = scrollBar.bot - scrollBar.top;
2028 break; 2068 break;
2029 } 2069 }
2030 2070
2031 if (scrollBar.style == R_SB_XTERM 2071 if (scrollBar.style == SB_STYLE_XTERM
2032 || scrollbar_above_slider (ev.y) 2072 || scrollBar.above_slider (ev.y)
2033 || scrollbar_below_slider (ev.y)) 2073 || scrollBar.below_slider (ev.y))
2034 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2074 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2035 2075
2036 scrollBar.setMotion (); 2076 scrollBar.state = SB_STATE_MOTION;
2037 break; 2077 break;
2038 2078
2039 case Button1: 2079 case Button1:
2040 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2080 if (scrollBar.align == SB_ALIGN_CENTRE)
2041 csrO = ev.y - scrollBar.top; 2081 csrO = ev.y - scrollBar.top;
2042 /* FALLTHROUGH */ 2082 /* FALLTHROUGH */
2043 2083
2044 case Button3: 2084 case Button3:
2045 if (scrollBar.style != R_SB_XTERM) 2085 if (scrollBar.style != SB_STYLE_XTERM)
2046 { 2086 {
2047 if (scrollbar_above_slider (ev.y)) 2087 if (scrollBar.above_slider (ev.y))
2048# ifdef RXVT_SCROLL_FULL 2088# ifdef RXVT_SCROLL_FULL
2049 scr_page (UP, nrow - 1); 2089 scr_page (UP, nrow - 1);
2050# else 2090# else
2051 scr_page (UP, nrow / 4); 2091 scr_page (UP, nrow / 4);
2052# endif 2092# endif
2053 else if (scrollbar_below_slider (ev.y)) 2093 else if (scrollBar.below_slider (ev.y))
2054# ifdef RXVT_SCROLL_FULL 2094# ifdef RXVT_SCROLL_FULL
2055 scr_page (DN, nrow - 1); 2095 scr_page (DN, nrow - 1);
2056# else 2096# else
2057 scr_page (DN, nrow / 4); 2097 scr_page (DN, nrow / 4);
2058# endif 2098# endif
2059 else 2099 else
2060 scrollBar.setMotion (); 2100 scrollBar.state = SB_STATE_MOTION;
2061 } 2101 }
2062 else 2102 else
2063 { 2103 {
2064 scr_page ((ev.button == Button1 ? DN : UP), 2104 scr_page ((ev.button == Button1 ? DN : UP),
2065 (nrow 2105 (nrow
2066 * scrollbar_position (ev.y) 2106 * scrollBar.position (ev.y)
2067 / scrollbar_size ())); 2107 / scrollBar.size ()));
2068 } 2108 }
2069 2109
2070 break; 2110 break;
2071 } 2111 }
2072 } 2112 }
… …
2082 2122
2083 csrO = 0; /* reset csr Offset */ 2123 csrO = 0; /* reset csr Offset */
2084 if (!bypass_keystate) 2124 if (!bypass_keystate)
2085 reportmode = !! (priv_modes & PrivMode_mouse_report); 2125 reportmode = !! (priv_modes & PrivMode_mouse_report);
2086 2126
2087 if (scrollbar_isUpDn ()) 2127 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2088 { 2128 {
2089 scrollBar.setIdle (); 2129 scrollBar.state = SB_STATE_IDLE;
2090 scrollbar_show (0); 2130 scrollBar.show (0);
2091 } 2131 }
2092 2132
2093#ifdef SELECTION_SCROLLING 2133#ifdef SELECTION_SCROLLING
2094 sel_scroll_ev.stop(); 2134 sel_scroll_ev.stop();
2095#endif 2135#endif
… …
2144 case Button3: 2184 case Button3:
2145 selection_make (ev.time); 2185 selection_make (ev.time);
2146 break; 2186 break;
2147 2187
2148 case Button2: 2188 case Button2:
2149 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2189 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2150 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2190 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2151 break; 2191 break;
2152 2192
2153#ifdef MOUSE_WHEEL 2193#ifdef MOUSE_WHEEL
2154 case Button4: 2194 case Button4:
2155 case Button5: 2195 case Button5:
… …
2178 } 2218 }
2179 else 2219 else
2180# endif 2220# endif
2181 { 2221 {
2182 scr_page (v, i); 2222 scr_page (v, i);
2183 scrollbar_show (1); 2223 scrollBar.show (1);
2184 } 2224 }
2185 } 2225 }
2186 break; 2226 break;
2187#endif 2227#endif
2188 } 2228 }
2189 } 2229 }
2190} 2230}
2191 2231
2192/*}}} */ 2232/*}}} */
2193 2233
2194bool 2234void ecb_hot
2195rxvt_term::cmd_parse () 2235rxvt_term::cmd_parse ()
2196{ 2236{
2197 bool flag = false;
2198 wchar_t ch = NOCHAR; 2237 wchar_t ch = NOCHAR;
2199 char *seq_begin; // remember start of esc-sequence here 2238 char *seq_begin; // remember start of esc-sequence here
2200 2239
2201 for (;;) 2240 for (;;)
2202 { 2241 {
2203 if (ch == NOCHAR) 2242 if (ecb_unlikely (ch == NOCHAR))
2204 { 2243 {
2205 seq_begin = cmdbuf_ptr; 2244 seq_begin = cmdbuf_ptr;
2206 ch = next_char (); 2245 ch = next_char ();
2207 2246
2208 if (ch == NOCHAR) 2247 if (ch == NOCHAR)
2209 break; 2248 break;
2210 } 2249 }
2211 2250
2212 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2251 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2213 { 2252 {
2214 if (!seen_input) 2253 if (ecb_unlikely (!seen_input))
2215 { 2254 {
2216 seen_input = 1; 2255 seen_input = 1;
2217 // many badly-written programs (e.g. jed) contain a race condition: 2256 // many badly-written programs (e.g. jed) contain a race condition:
2218 // they first read the screensize and then install a SIGWINCH handler. 2257 // they first read the screensize and then install a SIGWINCH handler.
2219 // some window managers resize the window early, and these programs 2258 // some window managers resize the window early, and these programs
… …
2232 wchar_t *str = buf; 2271 wchar_t *str = buf;
2233 wchar_t *eol = str + min (ncol, UBUFSIZ); 2272 wchar_t *eol = str + min (ncol, UBUFSIZ);
2234 2273
2235 for (;;) 2274 for (;;)
2236 { 2275 {
2237 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2276 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2238 break; 2277 break;
2239 2278
2240 *str++ = ch; 2279 *str++ = ch;
2241 2280
2242 if (ch == C0_LF || str >= eol) 2281 if (ecb_unlikely (ch == C0_LF || str >= eol))
2243 { 2282 {
2244 if (ch == C0_LF) 2283 if (ch == C0_LF)
2245 nlines++; 2284 nlines++;
2246 2285
2247 refresh_count++; 2286 refresh_count++;
… …
2296 * What the heck we'll cheat and only refresh less than every page-full. 2335 * What the heck we'll cheat and only refresh less than every page-full.
2297 * if skipScroll is enabled. 2336 * if skipScroll is enabled.
2298 */ 2337 */
2299 if (refreshnow) 2338 if (refreshnow)
2300 { 2339 {
2301 flag = true;
2302 scr_refresh (); 2340 scr_refresh ();
2303 want_refresh = 1; 2341 want_refresh = 1;
2304 } 2342 }
2305
2306 } 2343 }
2307 else 2344 else
2308 { 2345 {
2309 try 2346 try
2310 { 2347 {
… …
2318 } 2355 }
2319 2356
2320 ch = NOCHAR; 2357 ch = NOCHAR;
2321 } 2358 }
2322 } 2359 }
2323
2324 return flag;
2325} 2360}
2326 2361
2327// read the next character 2362// read the next character
2328wchar_t 2363wchar_t ecb_hot
2329rxvt_term::next_char () NOTHROW 2364rxvt_term::next_char () NOTHROW
2330{ 2365{
2331 while (cmdbuf_ptr < cmdbuf_endp) 2366 while (cmdbuf_ptr < cmdbuf_endp)
2332 { 2367 {
2333 // assume 7-bit to be ascii ALWAYS 2368 // assume 7-bit to be ascii ALWAYS
2334 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2369 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2335 return *cmdbuf_ptr++; 2370 return *cmdbuf_ptr++;
2336 2371
2337 wchar_t wc; 2372 wchar_t wc;
2338 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2373 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2339 2374
… …
2343 cmdbuf_ptr = cmdbuf_endp; 2378 cmdbuf_ptr = cmdbuf_endp;
2344 break; 2379 break;
2345 } 2380 }
2346 2381
2347 if (len == (size_t)-1) 2382 if (len == (size_t)-1)
2383 {
2384 mbstate.reset (); // reset now undefined conversion state
2348 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2385 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2386 }
2349 2387
2350 // assume wchar == unicode 2388 // assume wchar == unicode
2351 cmdbuf_ptr += len; 2389 cmdbuf_ptr += len;
2352 return wc & UNICODE_MASK; 2390 return wc & UNICODE_MASK;
2353 } 2391 }
2354 2392
2355 return NOCHAR; 2393 return NOCHAR;
2356} 2394}
2357 2395
2358// read the next octet 2396// read the next octet
2359uint32_t 2397uint32_t ecb_hot
2360rxvt_term::next_octet () NOTHROW 2398rxvt_term::next_octet () NOTHROW
2361{ 2399{
2362 return cmdbuf_ptr < cmdbuf_endp 2400 return cmdbuf_ptr < cmdbuf_endp
2363 ? (unsigned char)*cmdbuf_ptr++ 2401 ? (unsigned char)*cmdbuf_ptr++
2364 : NOCHAR; 2402 : NOCHAR;
2365} 2403}
2366 2404
2367static class out_of_input out_of_input; 2405static class out_of_input out_of_input;
2368 2406
2369/* rxvt_cmd_getc () - Return next input character */ 2407wchar_t ecb_hot
2370/*
2371 * Return the next input character after first passing any keyboard input
2372 * to the command.
2373 */
2374wchar_t
2375rxvt_term::cmd_getc () THROW ((class out_of_input)) 2408rxvt_term::cmd_getc () THROW ((class out_of_input))
2376{ 2409{
2377 wchar_t c = next_char (); 2410 wchar_t c = next_char ();
2378 2411
2379 if (c == NOCHAR) 2412 if (c == NOCHAR)
2380 throw out_of_input; 2413 throw out_of_input;
2381 2414
2382 return c; 2415 return c;
2383} 2416}
2384 2417
2385uint32_t 2418uint32_t ecb_hot
2386rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2419rxvt_term::cmd_get8 () THROW ((class out_of_input))
2387{ 2420{
2388 uint32_t c = next_octet (); 2421 uint32_t c = next_octet ();
2389 2422
2390 if (c == NOCHAR) 2423 if (c == NOCHAR)
… …
2394} 2427}
2395 2428
2396/*{{{ print pipe */ 2429/*{{{ print pipe */
2397/*----------------------------------------------------------------------*/ 2430/*----------------------------------------------------------------------*/
2398#ifdef PRINTPIPE 2431#ifdef PRINTPIPE
2399FILE * 2432FILE * ecb_cold
2400rxvt_term::popen_printer () 2433rxvt_term::popen_printer ()
2401{ 2434{
2402 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2435 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2403 2436
2404 if (stream == NULL) 2437 if (stream == NULL)
2405 rxvt_warn ("can't open printer pipe, not printing.\n"); 2438 rxvt_warn ("can't open printer pipe, not printing.\n");
2406 2439
2407 return stream; 2440 return stream;
2408} 2441}
2409 2442
2410int 2443int ecb_cold
2411rxvt_term::pclose_printer (FILE *stream) 2444rxvt_term::pclose_printer (FILE *stream)
2412{ 2445{
2413 fflush (stream); 2446 fflush (stream);
2414 return pclose (stream); 2447 return pclose (stream);
2415} 2448}
2416 2449
2417/* 2450/*
2418 * simulate attached vt100 printer 2451 * simulate attached vt100 printer
2419 */ 2452 */
2420void 2453void ecb_cold
2421rxvt_term::process_print_pipe () 2454rxvt_term::process_print_pipe ()
2422{ 2455{
2423 int done; 2456 FILE *fd = popen_printer ();
2424 FILE *fd;
2425 2457
2426 if ((fd = popen_printer ()) == NULL) 2458 if (!fd)
2427 return; 2459 return;
2428 2460
2429 /* 2461 /*
2430 * Send all input to the printer until either ESC[4i or ESC[?4i 2462 * Send all input to the printer until either ESC[4i or ESC[?4i
2431 * is received. 2463 * is received.
2432 */ 2464 */
2433 for (done = 0; !done;) 2465 for (int done = 0; !done; )
2434 { 2466 {
2435 unsigned char buf[8]; 2467 unsigned char buf[8];
2436 unicode_t ch; 2468 unicode_t ch;
2437 unsigned int i, len; 2469 unsigned int i, len;
2438 2470
… …
2472 pclose_printer (fd); 2504 pclose_printer (fd);
2473} 2505}
2474#endif /* PRINTPIPE */ 2506#endif /* PRINTPIPE */
2475/*}}} */ 2507/*}}} */
2476 2508
2477/* *INDENT-OFF* */
2478enum { 2509enum {
2479 C1_40 = 0x40, 2510 C1_40 = 0x40,
2480 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2511 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2481 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2512 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2482 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2513 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2483 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2514 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2484}; 2515};
2485/* *INDENT-ON* */
2486 2516
2487/*{{{ process non-printing single characters */ 2517/*{{{ process non-printing single characters */
2488void 2518void ecb_hot
2489rxvt_term::process_nonprinting (unicode_t ch) 2519rxvt_term::process_nonprinting (unicode_t ch)
2490{ 2520{
2491 switch (ch) 2521 switch (ch)
2492 { 2522 {
2493 case C0_ESC: 2523 case C0_ESC:
… …
2539} 2569}
2540/*}}} */ 2570/*}}} */
2541 2571
2542 2572
2543/*{{{ process VT52 escape sequences */ 2573/*{{{ process VT52 escape sequences */
2544void 2574void ecb_cold
2545rxvt_term::process_escape_vt52 (unicode_t ch) 2575rxvt_term::process_escape_vt52 (unicode_t ch)
2546{ 2576{
2547 int row, col; 2577 int row, col;
2548 2578
2549 switch (ch) 2579 switch (ch)
… …
2583 break; 2613 break;
2584 case 'Z': /* identify the terminal type */ 2614 case 'Z': /* identify the terminal type */
2585 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2615 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2586 break; 2616 break;
2587 case '<': /* turn off VT52 mode */ 2617 case '<': /* turn off VT52 mode */
2588 PrivMode (0, PrivMode_vt52); 2618 priv_modes &= ~PrivMode_vt52;
2589 break; 2619 break;
2590 case 'F': /* use special graphics character set */ 2620 case 'F': /* use special graphics character set */
2591 case 'G': /* use regular character set */ 2621 case 'G': /* use regular character set */
2592 /* unimplemented */ 2622 /* unimplemented */
2593 break; 2623 break;
… …
2599} 2629}
2600/*}}} */ 2630/*}}} */
2601 2631
2602 2632
2603/*{{{ process escape sequences */ 2633/*{{{ process escape sequences */
2604void 2634void ecb_hot
2605rxvt_term::process_escape_seq () 2635rxvt_term::process_escape_seq ()
2606{ 2636{
2607 unicode_t ch = cmd_getc (); 2637 unicode_t ch = cmd_getc ();
2608 2638
2609 if (priv_modes & PrivMode_vt52) 2639 if (priv_modes & PrivMode_vt52)
… …
2612 return; 2642 return;
2613 } 2643 }
2614 2644
2615 switch (ch) 2645 switch (ch)
2616 { 2646 {
2617 /* case 1: do_tek_mode (); break; */
2618 case '#': 2647 case '#':
2619 if (cmd_getc () == '8') 2648 if (cmd_getc () == '8')
2620 scr_E (); 2649 scr_E ();
2621 break; 2650 break;
2622 case '(': 2651 case '(':
… …
2645#if !ENABLE_MINIMAL 2674#if !ENABLE_MINIMAL
2646 case '9': 2675 case '9':
2647 scr_forwardindex (); 2676 scr_forwardindex ();
2648 break; 2677 break;
2649#endif 2678#endif
2679 // DECPAM/DECPNM
2650 case '=': 2680 case '=':
2681 priv_modes |= PrivMode_aplKP;
2682 break;
2651 case '>': 2683 case '>':
2652 PrivMode ((ch == '='), PrivMode_aplKP); 2684 priv_modes &= ~PrivMode_aplKP;
2653 break; 2685 break;
2654 2686
2655 case C1_40: 2687 case C1_40:
2656 cmd_getc (); 2688 cmd_getc ();
2657 break; 2689 break;
… …
2661 2693
2662 /* 8.3.87: NEXT LINE */ 2694 /* 8.3.87: NEXT LINE */
2663 case C1_NEL: /* ESC E */ 2695 case C1_NEL: /* ESC E */
2664 { 2696 {
2665 wchar_t nlcr[] = { C0_LF, C0_CR }; 2697 wchar_t nlcr[] = { C0_LF, C0_CR };
2666 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2698 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2667 } 2699 }
2668 break; 2700 break;
2669 2701
2670 /* kidnapped escape sequence: Should be 8.3.48 */ 2702 /* kidnapped escape sequence: Should be 8.3.48 */
2671 case C1_ESA: /* ESC G */ 2703 case C1_ESA: /* ESC G */
2672 process_graphics (); 2704 // used by original rxvt for rob nations own graphics mode
2705 if (cmd_getc () == 'Q')
2706 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2673 break; 2707 break;
2674 2708
2675 /* 8.3.63: CHARACTER TABULATION SET */ 2709 /* 8.3.63: CHARACTER TABULATION SET */
2676 case C1_HTS: /* ESC H */ 2710 case C1_HTS: /* ESC H */
2677 scr_set_tab (1); 2711 scr_set_tab (1);
… …
2681 case C1_RI: /* ESC M */ 2715 case C1_RI: /* ESC M */
2682 scr_index (DN); 2716 scr_index (DN);
2683 break; 2717 break;
2684 2718
2685 /* 8.3.142: SINGLE-SHIFT TWO */ 2719 /* 8.3.142: SINGLE-SHIFT TWO */
2686 /*case C1_SS2: scr_single_shift (2); break; */ 2720 /* case C1_SS2: break; */
2687 2721
2688 /* 8.3.143: SINGLE-SHIFT THREE */ 2722 /* 8.3.143: SINGLE-SHIFT THREE */
2689 /*case C1_SS3: scr_single_shift (3); break; */ 2723 /* case C1_SS3: break; */
2690 2724
2691 /* 8.3.27: DEVICE CONTROL STRING */ 2725 /* 8.3.27: DEVICE CONTROL STRING */
2692 case C1_DCS: /* ESC P */ 2726 case C1_DCS: /* ESC P */
2693 process_dcs_seq (); 2727 process_dcs_seq ();
2694 break; 2728 break;
… …
2696 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2697 case C1_SCI: /* ESC Z */ 2731 case C1_SCI: /* ESC Z */
2698 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2699 break; /* steal obsolete ESC [ c */ 2733 break; /* steal obsolete ESC [ c */
2700 2734
2701 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2702 case C1_CSI: /* ESC [ */ 2736 case C1_CSI: /* ESC [ */
2703 process_csi_seq (); 2737 process_csi_seq ();
2704 break; 2738 break;
2705 2739
2706 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2740 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2707 case C1_OSC: /* ESC ] */ 2741 case C1_OSC: /* ESC ] */
2708 process_osc_seq (); 2742 process_osc_seq ();
2709 break; 2743 break;
2710 2744
2711 /* 8.3.106: RESET TO INITIAL STATE */ 2745 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2712 case 'c': 2746 case 'c':
2713 mbstate.reset (); 2747 mbstate.reset ();
2714 scr_poweron (); 2748 scr_poweron ();
2715 scrollbar_show (1); 2749 scrollBar.show (1);
2716 break; 2750 break;
2717 2751
2718 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2752 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2719 case 'n': 2753 case 'n':
2720 scr_charset_choose (2); 2754 scr_charset_choose (2);
… …
2727 } 2761 }
2728} 2762}
2729/*}}} */ 2763/*}}} */
2730 2764
2731/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2765/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2732/* *INDENT-OFF* */
2733enum { 2766enum {
2734 CSI_ICH = 0x40, 2767 CSI_ICH = 0x40,
2735 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2768 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2736 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2769 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2737 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2770 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2740 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2773 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2741 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2774 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2742 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2775 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2743}; 2776};
2744 2777
2745#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2778#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2746 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2779 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2747 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2780 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2748#define get_byte_array_bit(array, bit) \ 2781#define get_byte_array_bit(array, bit) \
2749 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2782 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2750 2783
2751const unsigned char csi_defaults[] = 2784static const unsigned char csi_defaults[] =
2752 { 2785 {
2753 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2786 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2754 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2787 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2755 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2788 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2756 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2789 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2757 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2790 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2758 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2791 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2759 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2792 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2760 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2793 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2761 }; 2794 };
2762/* *INDENT-ON* */
2763 2795
2764void 2796void ecb_hot
2765rxvt_term::process_csi_seq () 2797rxvt_term::process_csi_seq ()
2766{ 2798{
2767 unicode_t ch, priv, i; 2799 unicode_t ch, priv, i;
2768 unsigned int nargs, p; 2800 unsigned int nargs, p;
2769 int n, ndef; 2801 int n, ndef;
… …
2771 2803
2772 nargs = 0; 2804 nargs = 0;
2773 2805
2774 priv = 0; 2806 priv = 0;
2775 ch = cmd_getc (); 2807 ch = cmd_getc ();
2776 if (ch >= '<' && ch <= '?') 2808 if ((ch >= '<' && ch <= '?') || ch == '!')
2777 { 2809 {
2778 /* '<' '=' '>' '?' */ 2810 /* '<' '=' '>' '?' '!' */
2779 priv = ch; 2811 priv = ch;
2780 ch = cmd_getc (); 2812 ch = cmd_getc ();
2781 } 2813 }
2782 2814
2783 /* read any numerical arguments */ 2815 /* read any numerical arguments */
… …
2837 2869
2838 case '?': 2870 case '?':
2839 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2871 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2840 process_terminal_mode (ch, priv, nargs, arg); 2872 process_terminal_mode (ch, priv, nargs, arg);
2841 break; 2873 break;
2874
2875 case '!':
2876 if (ch == CSI_70)
2877 {
2878 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2879 scr_soft_reset ();
2880
2881 static const int pm_h[] = { 7, 25 };
2882 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2883
2884 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2885 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2842 } 2886 }
2887 break;
2888 }
2889
2843 return; 2890 return;
2844 } 2891 }
2845 2892
2846 switch (ch) 2893 switch (ch)
2847 { 2894 {
… …
2861 } 2908 }
2862 break; 2909 break;
2863#endif 2910#endif
2864 2911
2865 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2912 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2866 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2913 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2867 arg[0] = -arg[0]; 2914 arg[0] = -arg[0];
2868 /* FALLTHROUGH */ 2915 /* FALLTHROUGH */
2869 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2916 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2870 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2917 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2871 scr_gotorc (arg[0], 0, RELATIVE); 2918 scr_gotorc (arg[0], 0, RELATIVE);
2872 break; 2919 break;
2873 2920
2874 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2921 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2875 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2922 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3062 } 3109 }
3063} 3110}
3064/*}}} */ 3111/*}}} */
3065 3112
3066#if !ENABLE_MINIMAL 3113#if !ENABLE_MINIMAL
3067/* ARGSUSED */
3068void 3114void
3069rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3115rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3070{ 3116{
3071 int x, y; 3117 int x, y;
3072 XWindowAttributes wattr; 3118 XWindowAttributes wattr;
… …
3081 { 3127 {
3082 /* 3128 /*
3083 * commands 3129 * commands
3084 */ 3130 */
3085 case 1: /* deiconify window */ 3131 case 1: /* deiconify window */
3086 XMapWindow (dpy, parent[0]); 3132 XMapWindow (dpy, parent);
3087 break; 3133 break;
3088 case 2: /* iconify window */ 3134 case 2: /* iconify window */
3089 XIconifyWindow (dpy, parent[0], display->screen); 3135 XIconifyWindow (dpy, parent, display->screen);
3090 break; 3136 break;
3091 case 3: /* set position (pixels) */ 3137 case 3: /* set position (pixels) */
3092 XMoveWindow (dpy, parent[0], args[1], args[2]); 3138 XMoveWindow (dpy, parent, args[1], args[2]);
3093 break; 3139 break;
3094 case 4: /* set size (pixels) */ 3140 case 4: /* set size (pixels) */
3095 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3141 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3096 break; 3142 break;
3097 case 5: /* raise window */ 3143 case 5: /* raise window */
3098 XRaiseWindow (dpy, parent[0]); 3144 XRaiseWindow (dpy, parent);
3099 break; 3145 break;
3100 case 6: /* lower window */ 3146 case 6: /* lower window */
3101 XLowerWindow (dpy, parent[0]); 3147 XLowerWindow (dpy, parent);
3102 break; 3148 break;
3103 case 7: /* refresh window */ 3149 case 7: /* refresh window */
3104 scr_touch (true); 3150 scr_touch (true);
3105 break; 3151 break;
3106 case 8: /* set size (chars) */ 3152 case 8: /* set size (chars) */
… …
3109 break; 3155 break;
3110 3156
3111 //case 9: NYI, TODO, restore maximized window or maximize window 3157 //case 9: NYI, TODO, restore maximized window or maximize window
3112 default: 3158 default:
3113 if (args[0] >= 24) /* set height (chars) */ 3159 if (args[0] >= 24) /* set height (chars) */
3114 set_widthheight ((unsigned int)width, 3160 set_widthheight ((unsigned int)vt_width,
3115 (unsigned int) (args[1] * fheight)); 3161 (unsigned int) (args[1] * fheight));
3116 break; 3162 break;
3117 3163
3118 /* 3164 /*
3119 * reports - some output format copied from XTerm 3165 * reports - some output format copied from XTerm
3120 */ 3166 */
3121 case 11: /* report window state */ 3167 case 11: /* report window state */
3122 XGetWindowAttributes (dpy, parent[0], &wattr); 3168 XGetWindowAttributes (dpy, parent, &wattr);
3123 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3169 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3124 break; 3170 break;
3125 case 13: /* report window position */ 3171 case 13: /* report window position */
3126 XGetWindowAttributes (dpy, parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent, &wattr);
3127 XTranslateCoordinates (dpy, parent[0], wattr.root, 3173 XTranslateCoordinates (dpy, parent, wattr.root,
3128 -wattr.border_width, -wattr.border_width, 3174 -wattr.border_width, -wattr.border_width,
3129 &x, &y, &wdummy); 3175 &x, &y, &wdummy);
3130 tt_printf ("\033[3;%d;%dt", x, y); 3176 tt_printf ("\033[3;%d;%dt", x, y);
3131 break; 3177 break;
3132 case 14: /* report window size (pixels) */ 3178 case 14: /* report window size (pixels) */
3133 XGetWindowAttributes (dpy, parent[0], &wattr); 3179 XGetWindowAttributes (dpy, parent, &wattr);
3134 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3180 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3135 break; 3181 break;
3136 case 18: /* report text area size (chars) */ 3182 case 18: /* report text area size (chars) */
3137 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3183 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3138 break; 3184 break;
… …
3140 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3186 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3141 break; 3187 break;
3142 case 20: /* report icon label */ 3188 case 20: /* report icon label */
3143 { 3189 {
3144 char *s; 3190 char *s;
3145 XGetIconName (dpy, parent[0], &s); 3191 XGetIconName (dpy, parent, &s);
3146 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3192 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3147 XFree (s); 3193 XFree (s);
3148 } 3194 }
3149 break; 3195 break;
3150 case 21: /* report window title */ 3196 case 21: /* report window title */
3151 { 3197 {
3152 char *s; 3198 char *s;
3153 XFetchName (dpy, parent[0], &s); 3199 XFetchName (dpy, parent, &s);
3154 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3200 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3155 XFree (s); 3201 XFree (s);
3156 } 3202 }
3157 break; 3203 break;
3158 } 3204 }
… …
3214 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3260 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3215 */ 3261 */
3216void 3262void
3217rxvt_term::process_dcs_seq () 3263rxvt_term::process_dcs_seq ()
3218{ 3264{
3219 char *s;
3220 unicode_t eh;
3221
3222 /* 3265 /*
3223 * Not handled yet 3266 * Not handled yet
3224 */ 3267 */
3268
3269 unicode_t eh;
3225 s = get_to_st (eh); 3270 char *s = get_to_st (eh);
3226 if (s) 3271 if (s)
3227 free (s); 3272 free (s);
3228 3273
3229 return; 3274 return;
3230} 3275}
… …
3234 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3279 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3235 */ 3280 */
3236void 3281void
3237rxvt_term::process_osc_seq () 3282rxvt_term::process_osc_seq ()
3238{ 3283{
3239 unicode_t ch, eh;
3240 int arg; 3284 int arg;
3241 3285
3242 ch = cmd_getc (); 3286 unicode_t ch = cmd_getc ();
3243 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3287 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3244 arg = arg * 10 + (ch - '0'); 3288 arg = arg * 10 + (ch - '0');
3245 3289
3246 if (ch == ';') 3290 if (ch == ';')
3247 { 3291 {
3292 unicode_t eh;
3248 char *s = get_to_st (eh); 3293 char *s = get_to_st (eh);
3249 3294
3250 if (s) 3295 if (s)
3251 { 3296 {
3252 process_xterm_seq (arg, s, eh); 3297 process_xterm_seq (arg, s, eh);
… …
3276 3321
3277/* 3322/*
3278 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3323 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3279 */ 3324 */
3280void 3325void
3281rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3326rxvt_term::process_xterm_seq (int op, char *str, char resp)
3282{ 3327{
3283 int color; 3328 int color;
3284 char *buf, *name; 3329 char *buf, *name;
3285 bool query = str[0] == '?' && !str[1]; 3330 bool query = str[0] == '?' && !str[1];
3286 int saveop = op; 3331 int saveop = op;
… …
3313 unsigned long bytes_after; 3358 unsigned long bytes_after;
3314 unsigned char *value = 0; 3359 unsigned char *value = 0;
3315 const char *str = ""; 3360 const char *str = "";
3316 3361
3317 if (prop 3362 if (prop
3318 && XGetWindowProperty (dpy, parent[0], 3363 && XGetWindowProperty (dpy, parent,
3319 prop, 0, 1<<16, 0, AnyPropertyType, 3364 prop, 0, 1<<16, 0, AnyPropertyType,
3320 &actual_type, &actual_format, 3365 &actual_type, &actual_format,
3321 &nitems, &bytes_after, &value) == Success 3366 &nitems, &bytes_after, &value) == Success
3322 && actual_type != None 3367 && actual_type != None
3323 && actual_format == 8) 3368 && actual_format == 8)
… …
3327 3372
3328 XFree (value); 3373 XFree (value);
3329 } 3374 }
3330 else 3375 else
3331 { 3376 {
3332 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3377 char *eq = strchr (str, '=');
3333 3378
3334 if (eq) 3379 if (eq)
3335 { 3380 {
3336 *eq = 0; 3381 *eq = 0;
3337 set_utf8_property (display->atom (str), eq + 1); 3382 set_utf8_property (display->atom (str), eq + 1);
3338 } 3383 }
3339 else 3384 else
3340 XDeleteProperty (dpy, parent[0], 3385 XDeleteProperty (dpy, parent,
3341 display->atom (str)); 3386 display->atom (str));
3342 } 3387 }
3343 break; 3388 break;
3344 3389
3345 case XTerm_Color: 3390 case XTerm_Color:
… …
3377 process_color_seq (op, Color_pointer_fg, str, resp); 3422 process_color_seq (op, Color_pointer_fg, str, resp);
3378 break; 3423 break;
3379 case XTerm_Color_pointer_bg: 3424 case XTerm_Color_pointer_bg:
3380 process_color_seq (op, Color_pointer_bg, str, resp); 3425 process_color_seq (op, Color_pointer_bg, str, resp);
3381 break; 3426 break;
3427#ifdef OPTION_HC
3428 case XTerm_Color_HC:
3429 process_color_seq (op, Color_HC, str, resp);
3430 break;
3431 case XTerm_Color_HTC:
3432 process_color_seq (op, Color_HTC, str, resp);
3433 break;
3434#endif
3382#ifndef NO_BOLD_UNDERLINE_REVERSE 3435#ifndef NO_BOLD_UNDERLINE_REVERSE
3383 case XTerm_Color_RV:
3384 process_color_seq (op, Color_RV, str, resp);
3385 break;
3386 case Rxvt_Color_BD:
3387 case URxvt_Color_BD: 3436 case URxvt_Color_BD:
3388 process_color_seq (op, Color_BD, str, resp); 3437 process_color_seq (op, Color_BD, str, resp);
3389 break; 3438 break;
3390 case Rxvt_Color_UL:
3391 case URxvt_Color_UL: 3439 case URxvt_Color_UL:
3392 process_color_seq (op, Color_UL, str, resp); 3440 process_color_seq (op, Color_UL, str, resp);
3393 break; 3441 break;
3394 case URxvt_Color_IT: 3442 case URxvt_Color_IT:
3395 process_color_seq (op, Color_IT, str, resp); 3443 process_color_seq (op, Color_IT, str, resp);
3396 break; 3444 break;
3397#endif 3445#endif
3446 case URxvt_Color_border:
3447 process_color_seq (op, Color_border, str, resp);
3448 break;
3398#if ENABLE_TRANSPARENCY 3449#if ENABLE_TRANSPARENCY
3399 case URxvt_Color_tint: 3450 case URxvt_Color_tint:
3400 process_color_seq (op, Color_tint, str, resp); 3451 process_color_seq (op, Color_tint, str, resp);
3401 { 3452 {
3402 bool changed = false; 3453 bool changed = false;
3403 3454
3404 if (ISSET_PIXCOLOR (Color_tint)) 3455 if (ISSET_PIXCOLOR (Color_tint))
3405 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3456 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3406 else
3407 changed = bgPixmap.unset_tint ();
3408 3457
3409 if (changed) 3458 if (changed)
3410 update_background (); 3459 update_background ();
3411 } 3460 }
3412 3461
… …
3416#if BG_IMAGE_FROM_FILE 3465#if BG_IMAGE_FROM_FILE
3417 case Rxvt_Pixmap: 3466 case Rxvt_Pixmap:
3418 if (!strcmp (str, "?")) 3467 if (!strcmp (str, "?"))
3419 { 3468 {
3420 char str[256]; 3469 char str[256];
3470 int h_scale = 0, v_scale = 0;
3471 int h_align = 0, v_align = 0;
3472 if (image_vec.size () > 0)
3473 {
3474 h_scale = image_vec[0].h_scale;
3475 v_scale = image_vec[0].v_scale;
3476 h_align = image_vec[0].h_align;
3477 v_align = image_vec[0].v_align;
3478 }
3421 3479
3422 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3480 sprintf (str, "[%dx%d+%d+%d]",
3423 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3481 h_scale, v_scale,
3424 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3482 h_align, v_align);
3425 process_xterm_seq (XTerm_title, str, CHAR_ST); 3483 process_xterm_seq (XTerm_title, str, CHAR_ST);
3426 } 3484 }
3427 else 3485 else
3428 { 3486 {
3429 int changed = 0; 3487 bool changed = false;
3430 3488
3431 if (*str != ';') 3489 if (*str != ';')
3432 { 3490 {
3433 /* reset to default scaling :*/ 3491 if (image_vec.size () > 0)
3434 bgPixmap.unset_geometry (); 3492 changed = image_vec[0].set_file_geometry (str);
3435 if (bgPixmap.set_file (str)) /* change pixmap */ 3493 else
3494 {
3495 rxvt_image *image = new_image ();
3496 if (!image->set_file_geometry (str))
3497 image_vec.pop_back ();
3498 else
3436 changed++; 3499 changed = true;
3437 str = strchr (str, ';'); 3500 }
3438 if (str == NULL)
3439 bgPixmap.set_defaultGeometry ();
3440 } 3501 }
3441 3502 else
3442 while (str)
3443 { 3503 {
3444 str++; 3504 str++;
3445 if (bgPixmap.set_geometry (str)) 3505 if (image_vec.size () > 0)
3446 changed++; 3506 changed = image_vec[0].set_geometry (str, true);
3447 str = strchr (str, ';');
3448 } 3507 }
3449 3508
3450 if (changed) 3509 if (changed)
3510 {
3511 if (bg_window_position_sensitive ())
3512 {
3513 int x, y;
3514 get_window_origin (x, y);
3515 bg_set_position (x, y);
3516 }
3451 update_background (); 3517 update_background ();
3518 }
3452 } 3519 }
3453 break; 3520 break;
3454#endif 3521#endif
3455 3522
3456 case XTerm_logfile: 3523 case XTerm_logfile:
… …
3526 break; 3593 break;
3527#endif 3594#endif
3528 3595
3529#if ENABLE_PERL 3596#if ENABLE_PERL
3530 case URxvt_perl: 3597 case URxvt_perl:
3531 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3598 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3532 ; // no responses yet
3533 break; 3599 break;
3534#endif 3600#endif
3535 } 3601 }
3536} 3602}
3537/*----------------------------------------------------------------------*/ 3603/*----------------------------------------------------------------------*/
… …
3544 * 's' = save 3610 * 's' = save
3545 * 'r' = restore 3611 * 'r' = restore
3546 * 't' = toggle 3612 * 't' = toggle
3547 * so no need for fancy checking 3613 * so no need for fancy checking
3548 */ 3614 */
3549int 3615int ecb_cold
3550rxvt_term::privcases (int mode, unsigned long bit) 3616rxvt_term::privcases (int mode, unsigned long bit)
3551{ 3617{
3552 int state; 3618 int state;
3553 3619
3554 if (mode == 's') 3620 if (mode == 's')
3555 { 3621 {
3556 SavedModes |= (priv_modes & bit); 3622 if (priv_modes & bit)
3623 SavedModes |= bit;
3624 else
3625 SavedModes &= ~bit;
3557 return -1; 3626 return -1;
3558 } 3627 }
3559 else 3628 else
3560 { 3629 {
3561 if (mode == 'r') 3630 if (mode == 'r')
3562 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3631 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3563 else 3632 else
3564 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3633 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3565 PrivMode (state, bit); 3634
3635 if (state)
3636 priv_modes |= bit;
3637 else
3638 priv_modes &= ~bit;
3566 } 3639 }
3567 3640
3568 return state; 3641 return state;
3569} 3642}
3570 3643
3571/* we're not using priv _yet_ */ 3644/* we're not using priv _yet_ */
3572void 3645void
3573rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3646rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3574{ 3647{
3575 unsigned int i, j; 3648 unsigned int i, j;
3576 int state; 3649 int state;
3577 3650
3578 static const struct 3651 static const struct
3579 { 3652 {
3580 const int argval; 3653 const int argval;
3581 const unsigned long bit; 3654 const unsigned long bit;
3582 } argtopriv[] = { 3655 } argtopriv[] = {
3583 { 1, PrivMode_aplCUR }, 3656 { 1, PrivMode_aplCUR }, // DECCKM
3584 { 2, PrivMode_vt52 }, 3657 { 2, PrivMode_vt52 }, // DECANM
3585 { 3, PrivMode_132 }, 3658 { 3, PrivMode_132 }, // DECCOLM
3586 { 4, PrivMode_smoothScroll }, 3659 { 4, PrivMode_smoothScroll }, // DECSCLM
3587 { 5, PrivMode_rVideo }, 3660 { 5, PrivMode_rVideo }, // DECSCNM
3588 { 6, PrivMode_relOrigin }, 3661 { 6, PrivMode_relOrigin }, // DECOM
3589 { 7, PrivMode_Autowrap }, 3662 { 7, PrivMode_Autowrap }, // DECAWM
3590 // 8, bi-directional support mode 3663 // 8, auto-repeat keys // DECARM
3591 { 9, PrivMode_MouseX10 }, 3664 { 9, PrivMode_MouseX10 },
3592 // 18, 19 printing-related 3665 // 18 end FF to printer after print screen
3666 // 19 Print screen prints full screen/scroll region
3593 { 25, PrivMode_VisibleCursor }, 3667 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3594#ifdef scrollBar_esc 3668#ifdef scrollBar_esc
3595 { scrollBar_esc, PrivMode_scrollBar }, 3669 { scrollBar_esc, PrivMode_scrollBar },
3596#endif 3670#endif
3597 { 35, PrivMode_ShiftKeys }, // rxvt extension 3671 { 35, PrivMode_ShiftKeys }, // rxvt extension
3672 // 38, tektronix mode // DECTEK
3598 { 40, PrivMode_132OK }, 3673 { 40, PrivMode_132OK },
3599 // 41 xterm more fixes NYI 3674 // 41 xterm more fixes NYI
3600 // 45 margin bell NYI 3675 // 45 margin bell NYI
3601 // 46 start logging 3676 // 46 start logging
3602 { 47, PrivMode_Screen }, 3677 { 47, PrivMode_Screen },
3603 { 66, PrivMode_aplKP }, 3678 { 66, PrivMode_aplKP }, // DECNKM
3604#ifndef NO_BACKSPACE_KEY 3679#ifndef NO_BACKSPACE_KEY
3605 { 67, PrivMode_BackSpace }, 3680 { 67, PrivMode_BackSpace }, // DECBKM
3606#endif 3681#endif
3607 { 1000, PrivMode_MouseX11 }, 3682 { 1000, PrivMode_MouseX11 },
3608 { 1002, PrivMode_MouseBtnEvent }, 3683 { 1002, PrivMode_MouseBtnEvent },
3609 { 1003, PrivMode_MouseAnyEvent }, 3684 { 1003, PrivMode_MouseAnyEvent },
3685#if ENABLE_FRILLS
3686 { 1005, PrivMode_ExtModeMouse },
3687#endif
3610 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3688 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3611 { 1011, PrivMode_Keypress }, // rxvt extension 3689 { 1011, PrivMode_Keypress }, // rxvt extension
3690#if ENABLE_FRILLS
3691 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3692#endif
3612 // 1035 enable modifiers for alt, numlock NYI 3693 // 1035 enable modifiers for alt, numlock NYI
3613 // 1036 send ESC for meta keys NYI 3694 // 1036 send ESC for meta keys NYI
3614 // 1037 send DEL for keypad delete NYI 3695 // 1037 send DEL for keypad delete NYI
3615 { 1047, PrivMode_Screen }, 3696 { 1047, PrivMode_Screen },
3616 // 1048 save and restore cursor 3697 // 1048 save and restore cursor, implemented in code
3617 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3698 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3618 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3699 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3619 { 2004, PrivMode_BracketPaste }, 3700 { 2004, PrivMode_BracketPaste },
3620 }; 3701 };
3621 3702
… …
3631 for (i = 0; i < nargs; i++) 3712 for (i = 0; i < nargs; i++)
3632 { 3713 {
3633 state = -1; 3714 state = -1;
3634 3715
3635 /* basic handling */ 3716 /* basic handling */
3636 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3717 for (j = 0; j < ecb_array_length (argtopriv); j++)
3637 if (argtopriv[j].argval == arg[i]) 3718 if (argtopriv[j].argval == arg[i])
3638 { 3719 {
3639 state = privcases (mode, argtopriv[j].bit); 3720 state = privcases (mode, argtopriv[j].bit);
3640 break; 3721 break;
3641 } 3722 }
… …
3649 3730
3650 scr_touch (true); 3731 scr_touch (true);
3651 break; 3732 break;
3652#endif 3733#endif
3653 case 1048: /* alternative cursor save */ 3734 case 1048: /* alternative cursor save */
3654 case 1049:
3655 if (option (Opt_secondaryScreen)) 3735 if (option (Opt_secondaryScreen))
3656 if (mode == 0) 3736 if (mode == 0)
3657 scr_cursor (RESTORE); 3737 scr_cursor (RESTORE);
3658 else if (mode == 1) 3738 else if (mode == 1)
3659 scr_cursor (SAVE); 3739 scr_cursor (SAVE);
… …
3668 case 2: /* VT52 mode */ 3748 case 2: /* VT52 mode */
3669 /* oddball mode. should be set regardless of set/reset 3749 /* oddball mode. should be set regardless of set/reset
3670 * parameter. Return from VT52 mode with an ESC < from 3750 * parameter. Return from VT52 mode with an ESC < from
3671 * within VT52 mode 3751 * within VT52 mode
3672 */ 3752 */
3673 PrivMode (1, PrivMode_vt52); 3753 priv_modes |= PrivMode_vt52;
3674 break; 3754 break;
3675 case 3: /* 80/132 */ 3755 case 3: /* 80/132 */
3676 if (priv_modes & PrivMode_132OK) 3756 if (priv_modes & PrivMode_132OK)
3677 {
3678 scr_poweron ();
3679 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3757 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3680 }
3681 break; 3758 break;
3682 case 4: /* smooth scrolling */ 3759 case 4: /* smooth scrolling */
3683 set_option (Opt_jumpScroll, !state); 3760 set_option (Opt_jumpScroll, !state);
3684 break; 3761 break;
3685 case 5: /* reverse video */ 3762 case 5: /* reverse video */
… …
3696 if (state) /* orthogonal */ 3773 if (state) /* orthogonal */
3697 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3774 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3698 break; 3775 break;
3699#ifdef scrollBar_esc 3776#ifdef scrollBar_esc
3700 case scrollBar_esc: 3777 case scrollBar_esc:
3701 if (scrollbar_mapping (state)) 3778 scrollBar.map (state);
3702 {
3703 resize_all_windows (0, 0, 0); 3779 resize_all_windows (0, 0, 0);
3704 scr_touch (true); 3780 scr_touch (true);
3705 }
3706 break; 3781 break;
3707#endif 3782#endif
3708 case 25: /* visible/invisible cursor */ 3783 case 25: /* visible/invisible cursor */
3709 scr_cursor_visible (state); 3784 scr_cursor_visible (state);
3710 break; 3785 break;
… …
3723 case 1003: 3798 case 1003:
3724 if (state) 3799 if (state)
3725 { 3800 {
3726 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3801 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3727 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3802 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3803 mouse_row = mouse_col = 0;
3728 vt_emask_mouse = PointerMotionMask; 3804 vt_emask_mouse = PointerMotionMask;
3729 } 3805 }
3730 else 3806 else
3731 vt_emask_mouse = NoEventMask; 3807 vt_emask_mouse = NoEventMask;
3808
3732 vt_select_input (); 3809 vt_select_input ();
3733 break; 3810 break;
3734 case 1010: /* scroll to bottom on TTY output inhibit */ 3811 case 1010: /* scroll to bottom on TTY output inhibit */
3735 set_option (Opt_scrollTtyOutput, !state); 3812 set_option (Opt_scrollTtyOutput, !state);
3736 break; 3813 break;
3737 case 1011: /* scroll to bottom on key press */ 3814 case 1011: /* scroll to bottom on key press */
3738 set_option (Opt_scrollTtyKeypress, state); 3815 set_option (Opt_scrollTtyKeypress, state);
3739 break; 3816 break;
3740 case 1047: /* secondary screen w/ clearing last */ 3817 case 1047: /* secondary screen w/ clearing last */
3741 if (option (Opt_secondaryScreen)) 3818 if (option (Opt_secondaryScreen))
3742 if (current_screen != PRIMARY) 3819 if (!state)
3743 scr_erase_screen (2); 3820 scr_erase_screen (2);
3821
3744 scr_change_screen (state); 3822 scr_change_screen (state);
3745 break; 3823 break;
3746 case 1049: /* secondary screen w/ clearing first */ 3824 case 1049: /* secondary screen w/ clearing first */
3825 if (option (Opt_secondaryScreen))
3826 if (state)
3827 scr_cursor (SAVE);
3828
3747 scr_change_screen (state); 3829 scr_change_screen (state);
3830
3748 if (option (Opt_secondaryScreen)) 3831 if (option (Opt_secondaryScreen))
3749 if (current_screen != PRIMARY) 3832 if (state)
3750 scr_erase_screen (2); 3833 scr_erase_screen (2);
3834 else
3835 scr_cursor (RESTORE);
3751 break; 3836 break;
3752 default: 3837 default:
3753 break; 3838 break;
3754 } 3839 }
3755 } 3840 }
3756} 3841}
3757/*}}} */ 3842/*}}} */
3758 3843
3759/*{{{ process sgr sequences */ 3844/*{{{ process sgr sequences */
3760void 3845void ecb_hot
3761rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3846rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3762{ 3847{
3763 unsigned int i; 3848 unsigned int i;
3764 short rendset; 3849 short rendset;
3765 int rendstyle; 3850 int rendstyle;
… …
3908 } 3993 }
3909 } 3994 }
3910} 3995}
3911/*}}} */ 3996/*}}} */
3912 3997
3913/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3914void
3915rxvt_term::process_graphics ()
3916{
3917 unicode_t ch, cmd = cmd_getc ();
3918
3919 if (cmd == 'Q')
3920 {
3921 /* query graphics */
3922 tt_printf ("\033G0\012"); /* no graphics */
3923 return;
3924 }
3925 /* swallow other graphics sequences until terminating ':' */
3926 do
3927 ch = cmd_getc ();
3928 while (ch != ':');
3929}
3930/*}}} */
3931
3932/* ------------------------------------------------------------------------- */ 3998/* ------------------------------------------------------------------------- */
3933 3999
3934/* 4000/*
3935 * Send printf () formatted output to the command. 4001 * Send printf () formatted output to the command.
3936 * Only use for small amounts of data. 4002 * Only use for small amounts of data.
… …
3949 4015
3950/* ---------------------------------------------------------------------- */ 4016/* ---------------------------------------------------------------------- */
3951/* Write data to the pty as typed by the user, pasted with the mouse, 4017/* Write data to the pty as typed by the user, pasted with the mouse,
3952 * or generated by us in response to a query ESC sequence. 4018 * or generated by us in response to a query ESC sequence.
3953 */ 4019 */
3954const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4020static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3955 4021
3956void 4022void
3957rxvt_term::tt_write (const char *data, unsigned int len) 4023rxvt_term::tt_write (const char *data, unsigned int len)
3958{ 4024{
3959 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4025 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3964 4030
3965 if (v_buflen == 0) 4031 if (v_buflen == 0)
3966 { 4032 {
3967 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4033 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3968 4034
4035 max_it (written, 0);
4036
3969 if ((unsigned int)written == len) 4037 if (written == len)
3970 return; 4038 return;
3971 4039
3972 data += written; 4040 data += written;
3973 len -= written; 4041 len -= written;
3974 } 4042 }
3975 4043
3976 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4044 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3977 4045
3978 memcpy (v_buffer + v_buflen, data, len); 4046 memcpy (v_buffer + v_buflen, data, len);
3979 v_buflen += len; 4047 v_buflen += len;
3980 4048
3981 pty_ev.set (ev::READ | ev::WRITE); 4049 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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