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