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.368 by root, Sun Nov 25 08:38:26 2007 UTC vs.
Revision 1.482 by sf-exg, Thu Apr 7 12:19:40 2011 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-2006 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.
… …
161 162
162void 163void
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 + hey 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 {
… …
220 ch = *chr++; 225 ch = *chr++;
221 226
222 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
225# if !UNICODE3 230# if !UNICODE_3
226 if (ch >= 0x10000) 231 if (ch >= 0x10000)
227 ch = 0xfffd; 232 ch = 0xfffd;
228# endif 233# endif
229 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
230 235
… …
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
… …
278 } 285 }
279 286
280 iso14755buf = 0; 287 iso14755buf = 0;
281} 288}
282 289
283int 290static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
285{ 292{
286 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
289 { 296 {
290 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
291 298
… …
297 304
298 return -1; 305 return -1;
299} 306}
300#endif 307#endif
301 308
309static inline KeySym
310translate_keypad (KeySym keysym, bool kp)
311{
312#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin
328 };
329
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
331 {
332 unsigned int index = keysym - XK_KP_Home;
333 keysym = kp ? keypadtrans[index] : XK_Home + index;
334 }
335 else if (keysym == XK_KP_Insert)
336 keysym = kp ? XK_KP_0 : XK_Insert;
337# ifndef NO_DELETE_KEY
338 else if (keysym == XK_KP_Delete)
339 keysym = kp ? XK_KP_Decimal : XK_Delete;
340# endif
341#endif
342 return keysym;
343}
344
345static inline int
346map_function_key (KeySym keysym)
347{
348 int param = 0;
349
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
351 {
352 param = 11 + keysym - XK_F1;
353 if (keysym >= XK_F17)
354 param += 4;
355 else if (keysym >= XK_F15)
356 param += 3;
357 else if (keysym >= XK_F11)
358 param += 2;
359 else if (keysym >= XK_F6)
360 param += 1;
361 }
362 else
363 switch (keysym)
364 {
365 case XK_Find:
366 param = 1;
367 break;
368 case XK_Insert:
369 param = 2;
370 break;
371#ifdef DXK_Remove
372 case DXK_Remove:
373#endif
374 case XK_Execute:
375 param = 3;
376 break;
377 case XK_Select:
378 param = 4;
379 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior:
382 param = 5;
383 break;
384 case XK_Next:
385 param = 6;
386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
393#endif
394 case XK_Help:
395 param = 28;
396 break;
397 case XK_Menu:
398 param = 29;
399 break;
400 }
401 return param;
402}
403
302void 404void
303rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
304{ 406{
305 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 408 KeySym keysym;
308 int valid_keysym; 409 int valid_keysym;
309 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
310 411
311#if ISO_14755 412#if ISO_14755
… …
320 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
321 */ 422 */
322 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
325
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331 426
332 kbuf[0] = 0; 427 kbuf[0] = 0;
333 428
334#ifdef USE_XIM 429#ifdef USE_XIM
335 if (Input_Context) 430 if (Input_Context)
… …
410#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 507#else
413 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
414#endif 509#endif
510 max_it (lnsppg, 1);
511
415 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
416 { 513 {
417 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
418 return; 515 return;
419 } 516 }
… …
484 } 581 }
485 } 582 }
486 583
487#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 585 // ISO 14755 support
489 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 587 {
491 int hv; 588 int hv;
492 589
493 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 621 scr_overlay_off ();
525# endif 622# endif
526 iso14755buf = 0; 623 iso14755buf = 0;
527 } 624 }
528 } 625 }
626 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
532 { 630 {
533 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 632# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 644 }
547#endif 645#endif
548 646
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
551 { 658 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 659#ifndef NO_BACKSPACE_KEY
553 newlen = 1; 660 case XK_BackSpace:
554#ifdef XK_KP_Home 661 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 662 {
556 XK_KP_7, // XK_KP_Home 663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 664 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 665 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 }; 666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
689 newlen = 0;
690 }
691 break;
571 692
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
573 { 773 {
574 unsigned int index = keysym - XK_KP_Home; 774 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 775 if (param > 0)
776 sprintf (kbuf,"\033[%d~", param);
777 else
778 newlen = 0;
576 } 779 }
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; 780 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 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
794 785
795 /* 786 /*
796 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
797 */ 788 */
798#ifdef META8_OPTION 789#ifdef META8_OPTION
… …
898 commit_iso14755 (); 889 commit_iso14755 ();
899 890
900 return; 891 return;
901 } 892 }
902 893
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 895 if (i[0] == keysym)
905 { 896 {
906 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 898 commit_iso14755 ();
908 899
… …
945 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
947#endif 938#endif
948} 939}
949 940
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 941void
984rxvt_term::flush () 942rxvt_term::flush ()
985{ 943{
986 flush_ev.stop (); 944 flush_ev.stop ();
987 945
988#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_BG_PIXMAP
989 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
990 { 948 {
991// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
992 scr_touch (false); 950 scr_touch (false);
993 } 951 }
994#endif 952#endif
995 953
996 if (want_refresh) 954 if (want_refresh)
… …
1032 } 990 }
1033 while (row < end_row); 991 while (row < end_row);
1034 } 992 }
1035 993
1036 scr_refresh (); 994 scr_refresh ();
1037 scrollbar_show (1); 995 scrollBar.show (1);
1038#ifdef USE_XIM 996#ifdef USE_XIM
1039 IMSendSpot (); 997 IMSendSpot ();
1040#endif 998#endif
1041 } 999 }
1042 1000
1043 display->flush (); 1001 display->flush ();
1044} 1002}
1045 1003
1004/* checks whether a refresh is requested and starts the refresh timer */
1046void 1005void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1006rxvt_term::refresh_check ()
1048{ 1007{
1049 make_current (); 1008 if (want_refresh && !flush_ev.is_active ())
1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050 1010
1051 display->flush (); 1011 display->flush ();
1052
1053 if (want_refresh && !flush_ev.active)
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1055} 1012}
1056 1013
1057void 1014void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1015rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1016{
… …
1067void 1024void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1025rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1026{
1070 hidden_cursor = !hidden_cursor; 1027 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1028 want_refresh = 1;
1029 refresh_check ();
1072} 1030}
1073#endif 1031#endif
1074 1032
1075#ifdef TEXT_BLINK 1033#ifdef TEXT_BLINK
1076void 1034void
… …
1078{ 1036{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1037 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1038 {
1081 hidden_text = !hidden_text; 1039 hidden_text = !hidden_text;
1082 want_refresh = 1; 1040 want_refresh = 1;
1041 refresh_check ();
1083 } 1042 }
1084}
1085#endif
1086
1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1088void
1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1090{
1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
1093 want_refresh = 1;
1094 else 1043 else
1095 w.stop (); 1044 w.stop ();
1096} 1045}
1097#endif 1046#endif
1098 1047
1048#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1049void
1050rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1051{
1052 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1053 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1054 {
1055 want_refresh = 1;
1056 refresh_check ();
1057 }
1058 else
1059 w.stop ();
1060}
1061#endif
1062
1099#ifdef SELECTION_SCROLLING 1063#ifdef SELECTION_SCROLLING
1100void 1064void
1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1102{ 1066{
1103 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1067 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1104 { 1068 {
1105 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1069 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1106 want_refresh = 1; 1070 want_refresh = 1;
1071 refresh_check ();
1107 } 1072 }
1108 else 1073 else
1109 w.stop (); 1074 w.stop ();
1110} 1075}
1111#endif 1076#endif
1112 1077
1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1078#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1114void 1079void
1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1080rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1116{ 1081{
1117 if (mouse_slip_wheel_speed == 0 1082 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1119 : scr_page (UP, mouse_slip_wheel_speed))
1120 { 1083 {
1121 if (view_start == top_row || view_start == 0)
1122 mouse_slip_wheel_speed = 0;
1123
1124 want_refresh = 1; 1084 want_refresh = 1;
1085 refresh_check ();
1086 }
1087
1088 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1125 } 1089 {
1126 else 1090 mouse_slip_wheel_speed = 0;
1127 w.stop (); 1091 w.stop ();
1092 }
1128} 1093}
1129#endif 1094#endif
1130 1095
1131#if LINUX_YIELD_HACK 1096#if LINUX_YIELD_HACK
1132static struct event_handler 1097static struct event_handler
… …
1137 { 1102 {
1138 // this should really be sched_yield(), but the linux guys thought 1103 // this should really be sched_yield(), but the linux guys thought
1139 // that giving a process calling sched_yield () less cpu time than 1104 // that giving a process calling sched_yield () less cpu time than
1140 // ones with high nice levels is a useful thing to do. It surely is is 1105 // ones with high nice levels is a useful thing to do. It surely is is
1141 // allowed by the sus... as is returning ENOSYS. 1106 // allowed by the sus... as is returning ENOSYS.
1107 // since the linux guys additionally thought that breaking the only
1108 // known workaround against their unusable sched_yield hack is cool,
1109 // we just nanosleep a bit and hope for the best.
1142 1110
1143 struct timespec ts = { 0, 0 }; 1111 struct timespec ts = { 0, 1000 };
1144 nanosleep (&ts, 0); 1112 nanosleep (&ts, 0);
1145 1113
1146 w.stop (); 1114 w.stop ();
1147 } 1115 }
1148 1116
… …
1151 { 1119 {
1152 } 1120 }
1153} event_handler; 1121} event_handler;
1154#endif 1122#endif
1155 1123
1124/* make sure all the cmd data is at beginning of cmdbuf */
1125void
1126rxvt_term::cmdbuf_reify ()
1127{
1128 if (cmdbuf_ptr == cmdbuf_base)
1129 return;
1130
1131 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1132
1133 memmove (cmdbuf_base, cmdbuf_ptr, used);
1134 cmdbuf_ptr = cmdbuf_base;
1135 cmdbuf_endp = cmdbuf_ptr + used;
1136
1137}
1138
1139#if defined (KEYSYM_RESOURCE)
1140void
1141rxvt_term::cmdbuf_append (const char *str, size_t count)
1142{
1143 cmdbuf_reify ();
1144
1145 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1146
1147 if (count > avail)
1148 return;
1149
1150 memcpy (cmdbuf_endp, str, count);
1151 cmdbuf_endp += count;
1152
1153 cmd_parse ();
1154}
1155#endif
1156
1156bool 1157bool
1157rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1158{ 1159{
1159 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 cmdbuf_reify ();
1160 1161
1161 if (CBUFSIZ == n) 1162 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1162 { 1163
1163 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1164 if (!avail)
1164 n = 0;
1165 } 1165 {
1166 1166 // normally this indicates a "too long" command sequence - just drop the data we have
1167 memmove (cmdbuf_base, cmdbuf_ptr, n);
1168 cmdbuf_ptr = cmdbuf_base; 1167 cmdbuf_ptr = cmdbuf_base;
1169 cmdbuf_endp = cmdbuf_ptr + n; 1168 cmdbuf_endp = cmdbuf_ptr;
1169 avail = CBUFSIZ;
1170 }
1170 1171
1171 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1172 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1172 1173
1173 if (r > 0) 1174 if (r > 0)
1174 { 1175 {
1175 cmdbuf_endp += r; 1176 cmdbuf_endp += r;
1176 return true; 1177 return true;
… …
1198{ 1199{
1199 make_current (); 1200 make_current ();
1200 1201
1201 if (revents & ev::READ) 1202 if (revents & ev::READ)
1202 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1203 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1204 if (cmd_parse ()) 1205 cmd_parse ();
1205 break;
1206 1206
1207 if (revents & ev::WRITE) 1207 if (revents & ev::WRITE)
1208 pty_write (); 1208 pty_write ();
1209
1210 refresh_check ();
1209} 1211}
1210 1212
1211void 1213void
1212rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1213{ 1215{
… …
1249{ 1251{
1250 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1251 int x, y; 1253 int x, y;
1252 int code = 32; 1254 int code = 32;
1253 1255
1254 x = Pixel2Col (ev.x); 1256 x = Pixel2Col (ev.x) + 1;
1255 y = Pixel2Row (ev.y); 1257 y = Pixel2Row (ev.y) + 1;
1258
1256 if (ev.type == MotionNotify) 1259 if (ev.type == MotionNotify)
1257 { 1260 {
1258 if (x == mouse_row && y == mouse_col) 1261 if (x == mouse_row && y == mouse_col)
1259 return; 1262 return;
1263
1260 mouse_row = x; 1264 mouse_row = x;
1261 mouse_col = y; 1265 mouse_col = y;
1262 code += 32; 1266 code += 32;
1263 } 1267 }
1264 1268
… …
1267 else 1271 else
1268 { 1272 {
1269 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1270 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1271 if (button_number >= 3) 1275 if (button_number >= 3)
1272 button_number += (64 - 3); 1276 button_number += 64 - 3;
1273 } 1277 }
1274 1278
1275 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1276 { 1280 {
1277 /* 1281 /*
… …
1309 fputc ('A', stderr); 1313 fputc ('A', stderr);
1310 if (key_state & 32) 1314 if (key_state & 32)
1311 fputc ('2', stderr); 1315 fputc ('2', stderr);
1312 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1313 button_number, 1317 button_number,
1314 x + 1, 1318 x,
1315 y + 1); 1319 y);
1316#endif 1320#endif
1317 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1318 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1319 (code + button_number + key_state), 1336 code + button_number + key_state,
1320 (32 + x + 1), 1337 32 + x,
1321 (32 + y + 1)); 1338 32 + y);
1322} 1339}
1323 1340
1324/*{{{ process an X event */ 1341/*{{{ process an X event */
1325void 1342void
1326rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1428 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1429 focus_out (); 1446 focus_out ();
1430 break; 1447 break;
1431 1448
1432 case ConfigureNotify: 1449 case ConfigureNotify:
1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435 szHint.width, szHint.height); */
1436 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent)
1437 { 1451 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1453 ;
1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ())
1458 {
1459 int x, y;
1460 if (ev.xconfigure.send_event)
1461 {
1462 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y;
1464 }
1465 else
1466 get_window_origin (x, y);
1467
1468 if (bg_set_position (x, y)
1469 || !(bg_flags & BG_IS_VALID))
1470 moved = true;
1471 }
1472#endif
1440 1473
1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1442 { 1475 {
1443 seen_resize = 1; 1476 seen_resize = 1;
1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1445 } 1478 }
1446 else 1479 else
1447 { 1480 {
1448#ifdef HAVE_BG_PIXMAP 1481#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ()) 1482 if (moved)
1483 {
1484 if (mapped)
1450 update_background (); 1485 update_background ();
1486 else
1487 bg_invalidate ();
1488 }
1451#endif 1489#endif
1452 } 1490 }
1491
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1493 }
1455 break; 1494 break;
1456 1495
1457 case PropertyNotify: 1496 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462
1463 break; 1498 break;
1464 1499
1465 case SelectionClear: 1500 case SelectionClear:
1466 selection_clear (); 1501 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break;
1468
1469 case SelectionNotify:
1470 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1472 break; 1502 break;
1473 1503
1474 case SelectionRequest: 1504 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1476 break; 1506 break;
1477 1507
1478 case MapNotify: 1508 case MapNotify:
1509#ifdef HAVE_BG_PIXMAP
1510 /* This is needed specifically to fix the case of no window manager or a
1511 * non-reparenting window manager. In those cases we never get first
1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1513 * care of multiplicity of ConfigureNotify events arriving while WM does
1514 * reparenting.
1515 * We should not render background immediately, as there could be several
1516 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1517 * by scheduling background redraw as soon as we can, but giving a short
1518 * bit of time for ConfigureNotifies to arrive.
1519 * We should render background PRIOR to drawing any text, but AFTER all
1520 * of ConfigureNotifys for the best results.
1521 */
1522 if (!(bg_flags & BG_IS_VALID))
1523 update_background_ev.start (0.025);
1524#endif
1479 mapped = 1; 1525 mapped = 1;
1480#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1481 text_blink_ev.start (TEXT_BLINK_INTERVAL); 1527 text_blink_ev.start ();
1482#endif 1528#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1530 break;
1485 1531
1486 case UnmapNotify: 1532 case UnmapNotify:
… …
1496 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1497 { 1543 {
1498 do 1544 do
1499 { 1545 {
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1502 } 1548 }
1503 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1504 1550
1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1506 1552
1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 { 1554 {
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1511 } 1557 }
1558
1512 want_refresh = 1; 1559 want_refresh = 1;
1513 } 1560 }
1514 else 1561 else
1515 { 1562 {
1516 XEvent unused_event; 1563 XEvent unused_event;
… …
1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1519 ; 1566 ;
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1568 ;
1522 1569
1523 if (isScrollbarWindow (ev.xany.window)) 1570 if (scrollBar.state && ev.xany.window == scrollBar.win)
1524 { 1571 {
1525 scrollBar.setIdle (); 1572 scrollBar.state = STATE_IDLE;
1526 scrollbar_show (0); 1573 scrollBar.show (0);
1527 } 1574 }
1528 } 1575 }
1529 break; 1576 break;
1530 1577
1531 case MotionNotify: 1578 case MotionNotify:
… …
1577 int dist; 1624 int dist;
1578 1625
1579 /* don't clobber the current delay if we are 1626 /* don't clobber the current delay if we are
1580 * already in the middle of scrolling. 1627 * already in the middle of scrolling.
1581 */ 1628 */
1582 if (!sel_scroll_ev.active) 1629 if (!sel_scroll_ev.is_active ())
1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1630 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1584 1631
1585 /* save the event params so we can highlight 1632 /* save the event params so we can highlight
1586 * the selection in the pending-scroll loop 1633 * the selection in the pending-scroll loop
1587 */ 1634 */
… …
1610 else 1657 else
1611 { 1658 {
1612 /* we are within the text window, so we 1659 /* we are within the text window, so we
1613 * shouldn't be scrolling 1660 * shouldn't be scrolling
1614 */ 1661 */
1615 if (sel_scroll_ev.active)
1616 sel_scroll_ev.stop(); 1662 sel_scroll_ev.stop();
1617 } 1663 }
1618#endif 1664#endif
1619#ifdef MOUSE_THRESHOLD 1665#ifdef MOUSE_THRESHOLD
1620 } 1666 }
1621#endif 1667#endif
1622 } 1668 }
1623 } 1669 }
1624 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1670 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1625 { 1671 {
1626 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1627 MotionNotify, &ev)) 1673 MotionNotify, &ev))
1628 ; 1674 ;
1629 1675
… …
1631 &unused_root, &unused_child, 1677 &unused_root, &unused_child,
1632 &unused_root_x, &unused_root_y, 1678 &unused_root_x, &unused_root_y,
1633 &ev.xbutton.x, &ev.xbutton.y, 1679 &ev.xbutton.x, &ev.xbutton.y,
1634 &unused_mask); 1680 &unused_mask);
1635 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1636 scrollbar_size ()); 1682 scrollBar.size ());
1637 want_refresh = 1; 1683 want_refresh = 1;
1638 scrollbar_show (1); 1684 scrollBar.show (1);
1639 } 1685 }
1640 break; 1686 break;
1641 } 1687 }
1642 1688
1643#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
… …
1664 1710
1665 if (ev.type == KeyPress && hidden_pointer == 0) 1711 if (ev.type == KeyPress && hidden_pointer == 0)
1666 pointer_blank (); 1712 pointer_blank ();
1667 } 1713 }
1668#endif 1714#endif
1715
1716 refresh_check ();
1669} 1717}
1718
1719#if ENABLE_FRILLS
1720void
1721rxvt_term::set_urgency (bool enable)
1722{
1723 if (enable == urgency_hint)
1724 return;
1725
1726 if (XWMHints *h = XGetWMHints (dpy, parent))
1727 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent, h);
1730 urgency_hint = enable;
1731 }
1732}
1733#endif
1670 1734
1671void 1735void
1672rxvt_term::focus_in () 1736rxvt_term::focus_in ()
1673{ 1737{
1674 if (!focus) 1738 if (!focus)
1675 { 1739 {
1676 focus = 1; 1740 focus = 1;
1677 want_refresh = 1; 1741 want_refresh = 1;
1678 1742
1679 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1680
1681#if USE_XIM 1743#if USE_XIM
1682 if (Input_Context != NULL) 1744 if (Input_Context != NULL)
1683 { 1745 {
1684 IMSetPosition (); 1746 IMSetPosition ();
1685 XSetICFocus (Input_Context); 1747 XSetICFocus (Input_Context);
1686 } 1748 }
1687#endif 1749#endif
1688#if CURSOR_BLINK 1750#if CURSOR_BLINK
1689 if (option (Opt_cursorBlink)) 1751 if (option (Opt_cursorBlink))
1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1752 cursor_blink_ev.again ();
1691#endif 1753#endif
1692#if OFF_FOCUS_FADING 1754#if OFF_FOCUS_FADING
1693 if (rs[Rs_fade]) 1755 if (rs[Rs_fade])
1694 { 1756 {
1695 pix_colors = pix_colors_focused; 1757 pix_colors = pix_colors_focused;
1696 scr_recolour (); 1758 scr_recolour ();
1697 } 1759 }
1698#endif 1760#endif
1699#if ENABLE_FRILLS 1761#if ENABLE_FRILLS
1700 if (option (Opt_urgentOnBell)) 1762 if (option (Opt_urgentOnBell))
1701 { 1763 set_urgency (0);
1702 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1703 {
1704 h->flags &= ~XUrgencyHint;
1705 XSetWMHints (dpy, parent[0], h);
1706 }
1707 }
1708#endif 1764#endif
1765
1766 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1709 } 1767 }
1710} 1768}
1711 1769
1712void 1770void
1713rxvt_term::focus_out () 1771rxvt_term::focus_out ()
… …
1715 if (focus) 1773 if (focus)
1716 { 1774 {
1717 focus = 0; 1775 focus = 0;
1718 want_refresh = 1; 1776 want_refresh = 1;
1719 1777
1720 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1778#if ENABLE_FRILLS
1721 1779 if (option (Opt_urgentOnBell))
1780 set_urgency (0);
1781#endif
1722#if ENABLE_FRILLS || ISO_14755 1782#if ENABLE_FRILLS || ISO_14755
1723 if (iso14755buf) 1783 if (iso14755buf)
1724 { 1784 {
1725 iso14755buf = 0; 1785 iso14755buf = 0;
1726# if ISO_14755 1786# if ISO_14755
… …
1743 { 1803 {
1744 pix_colors = pix_colors_unfocused; 1804 pix_colors = pix_colors_unfocused;
1745 scr_recolour (); 1805 scr_recolour ();
1746 } 1806 }
1747#endif 1807#endif
1808
1809 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1748 } 1810 }
1749} 1811}
1750 1812
1751void 1813void
1752rxvt_term::update_fade_color (unsigned int idx) 1814rxvt_term::update_fade_color (unsigned int idx)
… …
1780 * use the property to determine the pixmap. We use it later on. 1842 * use the property to determine the pixmap. We use it later on.
1781 */ 1843 */
1782 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1784 { 1846 {
1785 bgPixmap.set_root_pixmap (); 1847 bg_set_root_pixmap ();
1786 update_background (); 1848 update_background ();
1787 } 1849 }
1850
1788 break; 1851 break;
1789 } 1852 }
1790# endif 1853# endif
1854
1855 refresh_check ();
1791} 1856}
1792#endif 1857#endif
1793 1858
1794void 1859void
1795rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
… …
1826 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1827 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1828#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1829 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1830 { 1895 {
1831 /* same button, within alloted time */ 1896 /* same button, within allowed time */
1832 MEvent.clicks++; 1897 MEvent.clicks++;
1833 1898
1834 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1835 { 1900 {
1836 /* only report double clicks */ 1901 /* only report double clicks */
… …
1908 } 1973 }
1909 1974
1910 /* 1975 /*
1911 * Scrollbar window processing of button press 1976 * Scrollbar window processing of button press
1912 */ 1977 */
1913 if (isScrollbarWindow (ev.window)) 1978 if (scrollBar.state && ev.window == scrollBar.win)
1914 { 1979 {
1915 scrollBar.setIdle (); 1980 page_dirn direction = NO_DIR;
1981
1982 if (scrollBar.upButton (ev.y))
1983 direction = UP; /* up */
1984 else if (scrollBar.dnButton (ev.y))
1985 direction = DN; /* down */
1986
1987 scrollBar.state = STATE_IDLE;
1916 /* 1988 /*
1917 * Rxvt-style scrollbar: 1989 * Rxvt-style scrollbar:
1918 * move up if mouse is above slider 1990 * move up if mouse is above slider
1919 * move dn if mouse is below slider 1991 * move dn if mouse is below slider
1920 * 1992 *
… …
1929 /* 2001 /*
1930 * Mouse report disabled scrollbar: 2002 * Mouse report disabled scrollbar:
1931 * arrow buttons - send up/down 2003 * arrow buttons - send up/down
1932 * click on scrollbar - send pageup/down 2004 * click on scrollbar - send pageup/down
1933 */ 2005 */
1934 if ((scrollBar.style == R_SB_NEXT 2006 if (direction == UP)
1935 && scrollbarnext_upButton (ev.y))
1936 || (scrollBar.style == R_SB_RXVT
1937 && scrollbarrxvt_upButton (ev.y)))
1938 tt_printf ("\033[A"); 2007 tt_printf ("\033[A");
1939 else if ((scrollBar.style == R_SB_NEXT 2008 else if (direction == DN)
1940 && scrollbarnext_dnButton (ev.y))
1941 || (scrollBar.style == R_SB_RXVT
1942 && scrollbarrxvt_dnButton (ev.y)))
1943 tt_printf ("\033[B"); 2009 tt_printf ("\033[B");
1944 else 2010 else
1945 switch (ev.button) 2011 switch (ev.button)
1946 { 2012 {
1947 case Button2: 2013 case Button2:
… …
1955 break; 2021 break;
1956 } 2022 }
1957 } 2023 }
1958 else 2024 else
1959#endif /* NO_SCROLLBAR_REPORT */ 2025#endif /* NO_SCROLLBAR_REPORT */
1960
1961 {
1962 char upordown = 0;
1963
1964 if (scrollBar.style == R_SB_NEXT)
1965 { 2026 {
1966 if (scrollbarnext_upButton (ev.y)) 2027 if (direction != NO_DIR)
1967 upordown = -1; /* up */
1968 else if (scrollbarnext_dnButton (ev.y))
1969 upordown = 1; /* down */
1970 }
1971 else if (scrollBar.style == R_SB_RXVT)
1972 {
1973 if (scrollbarrxvt_upButton (ev.y))
1974 upordown = -1; /* up */
1975 else if (scrollbarrxvt_dnButton (ev.y))
1976 upordown = 1; /* down */
1977 }
1978 if (upordown)
1979 { 2028 {
1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2029#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2030 if (!cont_scroll_ev.is_active ())
1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2031 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1982#endif 2032#endif
1983 if (scr_page (upordown < 0 ? UP : DN, 1)) 2033 if (scr_page (direction, 1))
1984 { 2034 {
1985 if (upordown < 0) 2035 if (direction == UP)
1986 scrollBar.setUp (); 2036 scrollBar.state = STATE_UP;
1987 else 2037 else
1988 scrollBar.setDn (); 2038 scrollBar.state = STATE_DOWN;
1989 } 2039 }
1990 } 2040 }
1991 else 2041 else
1992 switch (ev.button) 2042 switch (ev.button)
1993 { 2043 {
1994 case Button2: 2044 case Button2:
1995 switch (scrollbar_align) 2045 switch (scrollBar.align)
1996 { 2046 {
1997 case R_SB_ALIGN_TOP: 2047 case R_SB_ALIGN_TOP:
1998 csrO = 0; 2048 csrO = 0;
1999 break; 2049 break;
2000 case R_SB_ALIGN_CENTRE: 2050 case R_SB_ALIGN_CENTRE:
… …
2006 } 2056 }
2007 2057
2008 if (scrollBar.style == R_SB_XTERM 2058 if (scrollBar.style == R_SB_XTERM
2009 || scrollbar_above_slider (ev.y) 2059 || scrollbar_above_slider (ev.y)
2010 || scrollbar_below_slider (ev.y)) 2060 || scrollbar_below_slider (ev.y))
2011 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2012 2062
2013 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2014 break; 2064 break;
2015 2065
2016 case Button1: 2066 case Button1:
2017 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2067 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2018 csrO = ev.y - scrollBar.top; 2068 csrO = ev.y - scrollBar.top;
2019 /* FALLTHROUGH */ 2069 /* FALLTHROUGH */
2020 2070
2021 case Button3: 2071 case Button3:
2022 if (scrollBar.style != R_SB_XTERM) 2072 if (scrollBar.style != R_SB_XTERM)
… …
2032 scr_page (DN, nrow - 1); 2082 scr_page (DN, nrow - 1);
2033# else 2083# else
2034 scr_page (DN, nrow / 4); 2084 scr_page (DN, nrow / 4);
2035# endif 2085# endif
2036 else 2086 else
2037 scrollBar.setMotion (); 2087 scrollBar.state = STATE_MOTION;
2038 } 2088 }
2039 else 2089 else
2040 { 2090 {
2041 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
2042 (nrow 2092 (nrow
2043 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
2044 / scrollbar_size ())); 2094 / scrollBar.size ()));
2045 } 2095 }
2046 2096
2047 break; 2097 break;
2048 } 2098 }
2049 } 2099 }
… …
2059 2109
2060 csrO = 0; /* reset csr Offset */ 2110 csrO = 0; /* reset csr Offset */
2061 if (!bypass_keystate) 2111 if (!bypass_keystate)
2062 reportmode = !! (priv_modes & PrivMode_mouse_report); 2112 reportmode = !! (priv_modes & PrivMode_mouse_report);
2063 2113
2064 if (scrollbar_isUpDn ()) 2114 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2065 { 2115 {
2066 scrollBar.setIdle (); 2116 scrollBar.state = STATE_IDLE;
2067 scrollbar_show (0); 2117 scrollBar.show (0);
2068 } 2118 }
2069 2119
2070#ifdef SELECTION_SCROLLING 2120#ifdef SELECTION_SCROLLING
2071 if (sel_scroll_ev.active)
2072 sel_scroll_ev.stop(); 2121 sel_scroll_ev.stop();
2073#endif 2122#endif
2074 2123
2075 if (ev.window == vt) 2124 if (ev.window == vt)
2076 { 2125 {
2077 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2126 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2123 selection_make (ev.time); 2172 selection_make (ev.time);
2124 break; 2173 break;
2125 2174
2126 case Button2: 2175 case Button2:
2127 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2176 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2128 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2129 break; 2178 break;
2130 2179
2131#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2132 case Button4: 2181 case Button4:
2133 case Button5: 2182 case Button5:
… …
2149 { 2198 {
2150 mouse_slip_wheel_speed += v ? -1 : 1; 2199 mouse_slip_wheel_speed += v ? -1 : 1;
2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2200 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2201 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2153 2202
2203 if (!slip_wheel_ev.is_active ())
2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2204 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2155 } 2205 }
2156 else 2206 else
2207# endif
2157 { 2208 {
2158# endif
2159 scr_page (v, i); 2209 scr_page (v, i);
2160 scrollbar_show (1); 2210 scrollBar.show (1);
2161# ifdef MOUSE_SLIP_WHEELING
2162 } 2211 }
2163# endif
2164 } 2212 }
2165 break; 2213 break;
2166#endif 2214#endif
2167 } 2215 }
2168 } 2216 }
2169} 2217}
2170 2218
2171/*}}} */ 2219/*}}} */
2172 2220
2173bool 2221void
2174rxvt_term::cmd_parse () 2222rxvt_term::cmd_parse ()
2175{ 2223{
2176 bool flag = false;
2177 wchar_t ch = NOCHAR; 2224 wchar_t ch = NOCHAR;
2178 char *seq_begin; // remember start of esc-sequence here 2225 char *seq_begin; // remember start of esc-sequence here
2179 2226
2180 for (;;) 2227 for (;;)
2181 { 2228 {
2182 if (ch == NOCHAR) 2229 if (expect_false (ch == NOCHAR))
2183 { 2230 {
2184 seq_begin = cmdbuf_ptr; 2231 seq_begin = cmdbuf_ptr;
2185 ch = next_char (); 2232 ch = next_char ();
2186 2233
2187 if (ch == NOCHAR) 2234 if (ch == NOCHAR)
2188 break; 2235 break;
2189 } 2236 }
2190 2237
2191 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2238 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2192 { 2239 {
2193 if (!seen_input) 2240 if (expect_false (!seen_input))
2194 { 2241 {
2195 seen_input = 1; 2242 seen_input = 1;
2196 // many badly-written programs (e.g. jed) contain a race condition: 2243 // many badly-written programs (e.g. jed) contain a race condition:
2197 // they first read the screensize and then install a SIGWINCH handler. 2244 // they first read the screensize and then install a SIGWINCH handler.
2198 // some window managers resize the window early, and these programs 2245 // some window managers resize the window early, and these programs
… …
2211 wchar_t *str = buf; 2258 wchar_t *str = buf;
2212 wchar_t *eol = str + min (ncol, UBUFSIZ); 2259 wchar_t *eol = str + min (ncol, UBUFSIZ);
2213 2260
2214 for (;;) 2261 for (;;)
2215 { 2262 {
2216 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2263 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2217 break; 2264 break;
2218 2265
2219 *str++ = ch; 2266 *str++ = ch;
2220 2267
2221 if (ch == C0_LF || str >= eol) 2268 if (expect_false (ch == C0_LF || str >= eol))
2222 { 2269 {
2223 if (ch == C0_LF) 2270 if (ch == C0_LF)
2224 nlines++; 2271 nlines++;
2225 2272
2226 refresh_count++; 2273 refresh_count++;
… …
2275 * What the heck we'll cheat and only refresh less than every page-full. 2322 * What the heck we'll cheat and only refresh less than every page-full.
2276 * if skipScroll is enabled. 2323 * if skipScroll is enabled.
2277 */ 2324 */
2278 if (refreshnow) 2325 if (refreshnow)
2279 { 2326 {
2280 flag = true;
2281 scr_refresh (); 2327 scr_refresh ();
2282 want_refresh = 1; 2328 want_refresh = 1;
2283 } 2329 }
2284
2285 } 2330 }
2286 else 2331 else
2287 { 2332 {
2288 try 2333 try
2289 { 2334 {
… …
2297 } 2342 }
2298 2343
2299 ch = NOCHAR; 2344 ch = NOCHAR;
2300 } 2345 }
2301 } 2346 }
2302
2303 return flag;
2304} 2347}
2305 2348
2306// read the next character 2349// read the next character
2307wchar_t 2350wchar_t
2308rxvt_term::next_char () NOTHROW 2351rxvt_term::next_char () NOTHROW
2309{ 2352{
2310 while (cmdbuf_ptr < cmdbuf_endp) 2353 while (cmdbuf_ptr < cmdbuf_endp)
2311 { 2354 {
2312 // assume 7-bit to be ascii ALWAYS 2355 // assume 7-bit to be ascii ALWAYS
2313 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2314 return *cmdbuf_ptr++; 2357 return *cmdbuf_ptr++;
2315 2358
2316 wchar_t wc; 2359 wchar_t wc;
2317 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2360 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2318 2361
… …
2322 cmdbuf_ptr = cmdbuf_endp; 2365 cmdbuf_ptr = cmdbuf_endp;
2323 break; 2366 break;
2324 } 2367 }
2325 2368
2326 if (len == (size_t)-1) 2369 if (len == (size_t)-1)
2370 {
2371 mbstate.reset (); // reset now undefined conversion state
2327 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2372 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2373 }
2328 2374
2329 // assume wchar == unicode 2375 // assume wchar == unicode
2330 cmdbuf_ptr += len; 2376 cmdbuf_ptr += len;
2331 return wc & UNICODE_MASK; 2377 return wc & UNICODE_MASK;
2332 } 2378 }
… …
2376/*----------------------------------------------------------------------*/ 2422/*----------------------------------------------------------------------*/
2377#ifdef PRINTPIPE 2423#ifdef PRINTPIPE
2378FILE * 2424FILE *
2379rxvt_term::popen_printer () 2425rxvt_term::popen_printer ()
2380{ 2426{
2381 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2427 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2382 2428
2383 if (stream == NULL) 2429 if (stream == NULL)
2384 rxvt_warn ("can't open printer pipe, not printing.\n"); 2430 rxvt_warn ("can't open printer pipe, not printing.\n");
2385 2431
2386 return stream; 2432 return stream;
… …
2397 * simulate attached vt100 printer 2443 * simulate attached vt100 printer
2398 */ 2444 */
2399void 2445void
2400rxvt_term::process_print_pipe () 2446rxvt_term::process_print_pipe ()
2401{ 2447{
2402 int done; 2448 FILE *fd = popen_printer ();
2403 FILE *fd;
2404 2449
2405 if ((fd = popen_printer ()) == NULL) 2450 if (!fd)
2406 return; 2451 return;
2407 2452
2408 /* 2453 /*
2409 * Send all input to the printer until either ESC[4i or ESC[?4i 2454 * Send all input to the printer until either ESC[4i or ESC[?4i
2410 * is received. 2455 * is received.
2411 */ 2456 */
2412 for (done = 0; !done;) 2457 for (int done = 0; !done; )
2413 { 2458 {
2414 unsigned char buf[8]; 2459 unsigned char buf[8];
2415 unicode_t ch; 2460 unicode_t ch;
2416 unsigned int i, len; 2461 unsigned int i, len;
2417 2462
… …
2562 break; 2607 break;
2563 case 'Z': /* identify the terminal type */ 2608 case 'Z': /* identify the terminal type */
2564 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2609 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2565 break; 2610 break;
2566 case '<': /* turn off VT52 mode */ 2611 case '<': /* turn off VT52 mode */
2567 PrivMode (0, PrivMode_vt52); 2612 set_privmode (PrivMode_vt52, 0);
2568 break; 2613 break;
2569 case 'F': /* use special graphics character set */ 2614 case 'F': /* use special graphics character set */
2570 case 'G': /* use regular character set */ 2615 case 'G': /* use regular character set */
2571 /* unimplemented */ 2616 /* unimplemented */
2572 break; 2617 break;
… …
2626 scr_forwardindex (); 2671 scr_forwardindex ();
2627 break; 2672 break;
2628#endif 2673#endif
2629 case '=': 2674 case '=':
2630 case '>': 2675 case '>':
2631 PrivMode ((ch == '='), PrivMode_aplKP); 2676 set_privmode (PrivMode_aplKP, ch == '=');
2632 break; 2677 break;
2633 2678
2634 case C1_40: 2679 case C1_40:
2635 cmd_getc (); 2680 cmd_getc ();
2636 break; 2681 break;
… …
2640 2685
2641 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
2642 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
2643 { 2688 {
2644 wchar_t nlcr[] = { C0_LF, C0_CR }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
2645 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2646 } 2691 }
2647 break; 2692 break;
2648 2693
2649 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
2650 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
2651 process_graphics (); 2696 // used by original rxvt for rob nations own graphics mode
2697 if (cmd_getc () == 'Q')
2698 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2652 break; 2699 break;
2653 2700
2654 /* 8.3.63: CHARACTER TABULATION SET */ 2701 /* 8.3.63: CHARACTER TABULATION SET */
2655 case C1_HTS: /* ESC H */ 2702 case C1_HTS: /* ESC H */
2656 scr_set_tab (1); 2703 scr_set_tab (1);
… …
2675 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2722 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2676 case C1_SCI: /* ESC Z */ 2723 case C1_SCI: /* ESC Z */
2677 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2724 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2678 break; /* steal obsolete ESC [ c */ 2725 break; /* steal obsolete ESC [ c */
2679 2726
2680 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2727 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2681 case C1_CSI: /* ESC [ */ 2728 case C1_CSI: /* ESC [ */
2682 process_csi_seq (); 2729 process_csi_seq ();
2683 break; 2730 break;
2684 2731
2685 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2732 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2686 case C1_OSC: /* ESC ] */ 2733 case C1_OSC: /* ESC ] */
2687 process_osc_seq (); 2734 process_osc_seq ();
2688 break; 2735 break;
2689 2736
2690 /* 8.3.106: RESET TO INITIAL STATE */ 2737 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2691 case 'c': 2738 case 'c':
2692 mbstate.reset (); 2739 mbstate.reset ();
2693 scr_poweron (); 2740 scr_poweron ();
2694 scrollbar_show (1); 2741 scrollBar.show (1);
2695 break; 2742 break;
2696 2743
2697 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2744 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2698 case 'n': 2745 case 'n':
2699 scr_charset_choose (2); 2746 scr_charset_choose (2);
… …
2719 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2766 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2720 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2767 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2721 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2768 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2722}; 2769};
2723 2770
2724#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2771#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2725 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2772 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2726 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2773 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2727#define get_byte_array_bit(array, bit) \ 2774#define get_byte_array_bit(array, bit) \
2728 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2775 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2729 2776
2730const unsigned char csi_defaults[] = 2777static const unsigned char csi_defaults[] =
2731 { 2778 {
2732 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2779 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2733 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2780 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2734 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2781 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2735 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2782 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2750 2797
2751 nargs = 0; 2798 nargs = 0;
2752 2799
2753 priv = 0; 2800 priv = 0;
2754 ch = cmd_getc (); 2801 ch = cmd_getc ();
2755 if (ch >= '<' && ch <= '?') 2802 if ((ch >= '<' && ch <= '?') || ch == '!')
2803 {
2756 { /* '<' '=' '>' '?' */ 2804 /* '<' '=' '>' '?' '!' */
2757 priv = ch; 2805 priv = ch;
2758 ch = cmd_getc (); 2806 ch = cmd_getc ();
2759 } 2807 }
2760 2808
2761 /* read any numerical arguments */ 2809 /* read any numerical arguments */
… …
2810 // versions. 2858 // versions.
2811 // 2859 //
2812 tt_printf ("\033[>%d;95;0c", 'U'); 2860 tt_printf ("\033[>%d;95;0c", 'U');
2813 } 2861 }
2814 break; 2862 break;
2863
2815 case '?': 2864 case '?':
2816 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2865 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2817 process_terminal_mode (ch, priv, nargs, arg); 2866 process_terminal_mode (ch, priv, nargs, arg);
2818 break; 2867 break;
2868
2869 case '!':
2870 if (ch == CSI_70)
2871 {
2872 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2873 scr_soft_reset ();
2874
2875 static const int pm_h[] = { 7, 25 };
2876 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2877
2878 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2879 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2819 } 2880 }
2881 break;
2882 }
2883
2820 return; 2884 return;
2821 } 2885 }
2822 2886
2823 switch (ch) 2887 switch (ch)
2824 { 2888 {
… …
3058 { 3122 {
3059 /* 3123 /*
3060 * commands 3124 * commands
3061 */ 3125 */
3062 case 1: /* deiconify window */ 3126 case 1: /* deiconify window */
3063 XMapWindow (dpy, parent[0]); 3127 XMapWindow (dpy, parent);
3064 break; 3128 break;
3065 case 2: /* iconify window */ 3129 case 2: /* iconify window */
3066 XIconifyWindow (dpy, parent[0], display->screen); 3130 XIconifyWindow (dpy, parent, display->screen);
3067 break; 3131 break;
3068 case 3: /* set position (pixels) */ 3132 case 3: /* set position (pixels) */
3069 XMoveWindow (dpy, parent[0], args[1], args[2]); 3133 XMoveWindow (dpy, parent, args[1], args[2]);
3070 break; 3134 break;
3071 case 4: /* set size (pixels) */ 3135 case 4: /* set size (pixels) */
3072 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3136 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3073 break; 3137 break;
3074 case 5: /* raise window */ 3138 case 5: /* raise window */
3075 XRaiseWindow (dpy, parent[0]); 3139 XRaiseWindow (dpy, parent);
3076 break; 3140 break;
3077 case 6: /* lower window */ 3141 case 6: /* lower window */
3078 XLowerWindow (dpy, parent[0]); 3142 XLowerWindow (dpy, parent);
3079 break; 3143 break;
3080 case 7: /* refresh window */ 3144 case 7: /* refresh window */
3081 scr_touch (true); 3145 scr_touch (true);
3082 break; 3146 break;
3083 case 8: /* set size (chars) */ 3147 case 8: /* set size (chars) */
… …
3094 3158
3095 /* 3159 /*
3096 * reports - some output format copied from XTerm 3160 * reports - some output format copied from XTerm
3097 */ 3161 */
3098 case 11: /* report window state */ 3162 case 11: /* report window state */
3099 XGetWindowAttributes (dpy, parent[0], &wattr); 3163 XGetWindowAttributes (dpy, parent, &wattr);
3100 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3164 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3101 break; 3165 break;
3102 case 13: /* report window position */ 3166 case 13: /* report window position */
3103 XGetWindowAttributes (dpy, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent, &wattr);
3104 XTranslateCoordinates (dpy, parent[0], wattr.root, 3168 XTranslateCoordinates (dpy, parent, wattr.root,
3105 -wattr.border_width, -wattr.border_width, 3169 -wattr.border_width, -wattr.border_width,
3106 &x, &y, &wdummy); 3170 &x, &y, &wdummy);
3107 tt_printf ("\033[3;%d;%dt", x, y); 3171 tt_printf ("\033[3;%d;%dt", x, y);
3108 break; 3172 break;
3109 case 14: /* report window size (pixels) */ 3173 case 14: /* report window size (pixels) */
3110 XGetWindowAttributes (dpy, parent[0], &wattr); 3174 XGetWindowAttributes (dpy, parent, &wattr);
3111 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3175 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3112 break; 3176 break;
3113 case 18: /* report text area size (chars) */ 3177 case 18: /* report text area size (chars) */
3114 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3178 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3115 break; 3179 break;
… …
3117 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3181 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3118 break; 3182 break;
3119 case 20: /* report icon label */ 3183 case 20: /* report icon label */
3120 { 3184 {
3121 char *s; 3185 char *s;
3122 XGetIconName (dpy, parent[0], &s); 3186 XGetIconName (dpy, parent, &s);
3123 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3187 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3124 XFree (s); 3188 XFree (s);
3125 } 3189 }
3126 break; 3190 break;
3127 case 21: /* report window title */ 3191 case 21: /* report window title */
3128 { 3192 {
3129 char *s; 3193 char *s;
3130 XFetchName (dpy, parent[0], &s); 3194 XFetchName (dpy, parent, &s);
3131 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3132 XFree (s); 3196 XFree (s);
3133 } 3197 }
3134 break; 3198 break;
3135 } 3199 }
… …
3191 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3255 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3192 */ 3256 */
3193void 3257void
3194rxvt_term::process_dcs_seq () 3258rxvt_term::process_dcs_seq ()
3195{ 3259{
3196 char *s;
3197 unicode_t eh;
3198
3199 /* 3260 /*
3200 * Not handled yet 3261 * Not handled yet
3201 */ 3262 */
3263
3264 unicode_t eh;
3202 s = get_to_st (eh); 3265 char *s = get_to_st (eh);
3203 if (s) 3266 if (s)
3204 free (s); 3267 free (s);
3205 3268
3206 return; 3269 return;
3207} 3270}
… …
3211 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3274 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3212 */ 3275 */
3213void 3276void
3214rxvt_term::process_osc_seq () 3277rxvt_term::process_osc_seq ()
3215{ 3278{
3216 unicode_t ch, eh;
3217 int arg; 3279 int arg;
3218 3280
3219 ch = cmd_getc (); 3281 unicode_t ch = cmd_getc ();
3220 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3282 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3221 arg = arg * 10 + (ch - '0'); 3283 arg = arg * 10 + (ch - '0');
3222 3284
3223 if (ch == ';') 3285 if (ch == ';')
3224 { 3286 {
3287 unicode_t eh;
3225 char *s = get_to_st (eh); 3288 char *s = get_to_st (eh);
3226 3289
3227 if (s) 3290 if (s)
3228 { 3291 {
3229 process_xterm_seq (arg, s, eh); 3292 process_xterm_seq (arg, s, eh);
… …
3253 3316
3254/* 3317/*
3255 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3318 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3256 */ 3319 */
3257void 3320void
3258rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3321rxvt_term::process_xterm_seq (int op, char *str, char resp)
3259{ 3322{
3260 int color; 3323 int color;
3261 char *buf, *name; 3324 char *buf, *name;
3262 bool query = str[0] == '?' && !str[1]; 3325 bool query = str[0] == '?' && !str[1];
3263 int saveop = op; 3326 int saveop = op;
… …
3290 unsigned long bytes_after; 3353 unsigned long bytes_after;
3291 unsigned char *value = 0; 3354 unsigned char *value = 0;
3292 const char *str = ""; 3355 const char *str = "";
3293 3356
3294 if (prop 3357 if (prop
3295 && XGetWindowProperty (dpy, parent[0], 3358 && XGetWindowProperty (dpy, parent,
3296 prop, 0, 1<<16, 0, AnyPropertyType, 3359 prop, 0, 1<<16, 0, AnyPropertyType,
3297 &actual_type, &actual_format, 3360 &actual_type, &actual_format,
3298 &nitems, &bytes_after, &value) == Success 3361 &nitems, &bytes_after, &value) == Success
3299 && actual_type != None 3362 && actual_type != None
3300 && actual_format == 8) 3363 && actual_format == 8)
… …
3304 3367
3305 XFree (value); 3368 XFree (value);
3306 } 3369 }
3307 else 3370 else
3308 { 3371 {
3309 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3372 char *eq = strchr (str, '=');
3310 3373
3311 if (eq) 3374 if (eq)
3312 { 3375 {
3313 *eq = 0; 3376 *eq = 0;
3314 set_utf8_property (display->atom (str), eq + 1); 3377 set_utf8_property (display->atom (str), eq + 1);
3315 } 3378 }
3316 else 3379 else
3317 XDeleteProperty (dpy, parent[0], 3380 XDeleteProperty (dpy, parent,
3318 display->atom (str)); 3381 display->atom (str));
3319 } 3382 }
3320 break; 3383 break;
3321 3384
3322 case XTerm_Color: 3385 case XTerm_Color:
… …
3335 *buf++ = '\0'; 3398 *buf++ = '\0';
3336 3399
3337 process_color_seq (op, color, name, resp); 3400 process_color_seq (op, color, name, resp);
3338 } 3401 }
3339 break; 3402 break;
3403 case Rxvt_restoreFG:
3340 case XTerm_Color00: 3404 case XTerm_Color00:
3341 process_color_seq (op, Color_fg, str, resp); 3405 process_color_seq (op, Color_fg, str, resp);
3342 break; 3406 break;
3407 case Rxvt_restoreBG:
3343 case XTerm_Color01: 3408 case XTerm_Color01:
3344 process_color_seq (op, Color_bg, str, resp); 3409 process_color_seq (op, Color_bg, str, resp);
3345 break; 3410 break;
3346#ifndef NO_CURSORCOLOR 3411#ifndef NO_CURSORCOLOR
3347 case XTerm_Color_cursor: 3412 case XTerm_Color_cursor:
… …
3352 process_color_seq (op, Color_pointer_fg, str, resp); 3417 process_color_seq (op, Color_pointer_fg, str, resp);
3353 break; 3418 break;
3354 case XTerm_Color_pointer_bg: 3419 case XTerm_Color_pointer_bg:
3355 process_color_seq (op, Color_pointer_bg, str, resp); 3420 process_color_seq (op, Color_pointer_bg, str, resp);
3356 break; 3421 break;
3422#ifdef OPTION_HC
3423 case XTerm_Color_HC:
3424 process_color_seq (op, Color_HC, str, resp);
3425 break;
3426 case XTerm_Color_HTC:
3427 process_color_seq (op, Color_HTC, str, resp);
3428 break;
3429#endif
3357#ifndef NO_BOLD_UNDERLINE_REVERSE 3430#ifndef NO_BOLD_UNDERLINE_REVERSE
3358 case XTerm_Color_RV:
3359 process_color_seq (op, Color_RV, str, resp);
3360 break;
3361 case Rxvt_Color_BD:
3362 case URxvt_Color_BD: 3431 case URxvt_Color_BD:
3363 process_color_seq (op, Color_BD, str, resp); 3432 process_color_seq (op, Color_BD, str, resp);
3364 break; 3433 break;
3365 case Rxvt_Color_UL:
3366 case URxvt_Color_UL: 3434 case URxvt_Color_UL:
3367 process_color_seq (op, Color_UL, str, resp); 3435 process_color_seq (op, Color_UL, str, resp);
3368 break; 3436 break;
3369 case URxvt_Color_IT: 3437 case URxvt_Color_IT:
3370 process_color_seq (op, Color_IT, str, resp); 3438 process_color_seq (op, Color_IT, str, resp);
3371 break; 3439 break;
3372#endif 3440#endif
3441 case URxvt_Color_border:
3442 process_color_seq (op, Color_border, str, resp);
3443 break;
3373#if ENABLE_TRANSPARENCY 3444#if ENABLE_TRANSPARENCY
3374 case URxvt_Color_tint: 3445 case URxvt_Color_tint:
3375 process_color_seq (op, Color_tint, str, resp); 3446 process_color_seq (op, Color_tint, str, resp);
3376 { 3447 {
3377 bool changed = false; 3448 bool changed = false;
3449
3378 if (ISSET_PIXCOLOR (Color_tint)) 3450 if (ISSET_PIXCOLOR (Color_tint))
3379 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3451 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3380 else 3452
3381 changed = bgPixmap.unset_tint ();
3382 if (changed) 3453 if (changed)
3383 update_background (); 3454 update_background ();
3384 } 3455 }
3385 3456
3386 break; 3457 break;
… …
3390 case Rxvt_Pixmap: 3461 case Rxvt_Pixmap:
3391 if (!strcmp (str, "?")) 3462 if (!strcmp (str, "?"))
3392 { 3463 {
3393 char str[256]; 3464 char str[256];
3394 3465
3395 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3466 sprintf (str, "[%dx%d+%d+%d]",
3396 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3467 min (h_scale, 32767), min (v_scale, 32767),
3397 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3468 min (h_align, 32767), min (v_align, 32767));
3398 process_xterm_seq (XTerm_title, str, CHAR_ST); 3469 process_xterm_seq (XTerm_title, str, CHAR_ST);
3399 } 3470 }
3400 else 3471 else
3401 { 3472 {
3402 int changed = 0; 3473 int changed = 0;
3403 3474
3404 if (*str != ';') 3475 if (*str != ';')
3405 { 3476 {
3406 /* reset to default scaling :*/
3407 bgPixmap.unset_geometry ();
3408 if (bgPixmap.set_file (str)) /* change pixmap */ 3477 if (bg_set_file (str)) /* change pixmap */
3478 {
3409 changed++; 3479 changed++;
3410 str = strchr (str, ';'); 3480 str = strchr (str, ';');
3411 if (str == NULL) 3481 if (str == NULL)
3412 bgPixmap.set_defaultGeometry (); 3482 bg_set_default_geometry ();
3483 else
3484 bg_set_geometry (str+1);
3485 }
3413 } 3486 }
3414 while (str) 3487 else
3415 { 3488 {
3416 str++; 3489 str++;
3417 if (bgPixmap.set_geometry (str)) 3490 if (bg_set_geometry (str, true))
3418 changed++; 3491 changed++;
3419 str = strchr (str, ';');
3420 } 3492 }
3493
3421 if (changed) 3494 if (changed)
3495 {
3496 if (bg_window_position_sensitive ())
3497 {
3498 int x, y;
3499 get_window_origin (x, y);
3500 bg_set_position (x, y);
3501 }
3422 update_background (); 3502 update_background ();
3503 }
3423 } 3504 }
3424 break; 3505 break;
3425#endif 3506#endif
3426
3427 case Rxvt_restoreFG:
3428 set_window_color (Color_fg, str);
3429 break;
3430 case Rxvt_restoreBG:
3431 set_window_color (Color_bg, str);
3432 break;
3433 3507
3434 case XTerm_logfile: 3508 case XTerm_logfile:
3435 // TODO, when secure mode? 3509 // TODO, when secure mode?
3436 break; 3510 break;
3437 3511
… …
3504 break; 3578 break;
3505#endif 3579#endif
3506 3580
3507#if ENABLE_PERL 3581#if ENABLE_PERL
3508 case URxvt_perl: 3582 case URxvt_perl:
3509 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3583 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3510 ; // no responses yet
3511 break; 3584 break;
3512#endif 3585#endif
3513 } 3586 }
3514} 3587}
3515/*----------------------------------------------------------------------*/ 3588/*----------------------------------------------------------------------*/
… …
3538 { 3611 {
3539 if (mode == 'r') 3612 if (mode == 'r')
3540 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3613 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3541 else 3614 else
3542 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3615 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3543 PrivMode (state, bit); 3616
3617 set_privmode (bit, state);
3544 } 3618 }
3545 3619
3546 return state; 3620 return state;
3547} 3621}
3548 3622
… …
3556 static const struct 3630 static const struct
3557 { 3631 {
3558 const int argval; 3632 const int argval;
3559 const unsigned long bit; 3633 const unsigned long bit;
3560 } argtopriv[] = { 3634 } argtopriv[] = {
3561 { 1, PrivMode_aplCUR }, 3635 { 1, PrivMode_aplCUR }, // DECCKM
3562 { 2, PrivMode_vt52 }, 3636 { 2, PrivMode_vt52 },
3563 { 3, PrivMode_132 }, 3637 { 3, PrivMode_132 }, // DECCOLM
3564 { 4, PrivMode_smoothScroll }, 3638 { 4, PrivMode_smoothScroll }, // DECSCLM
3565 { 5, PrivMode_rVideo }, 3639 { 5, PrivMode_rVideo }, // DECSCNM
3566 { 6, PrivMode_relOrigin }, 3640 { 6, PrivMode_relOrigin }, // DECOM
3567 { 7, PrivMode_Autowrap }, 3641 { 7, PrivMode_Autowrap }, // DECAWM
3568 // 8, bi-directional support mode 3642 // 8, auto-repeat keys // DECARM
3569 { 9, PrivMode_MouseX10 }, 3643 { 9, PrivMode_MouseX10 },
3570 // 18, 19 printing-related 3644 // 18 end FF to printer after print screen
3645 // 19 Print screen prints full screen/scroll region
3571 { 25, PrivMode_VisibleCursor }, 3646 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3572#ifdef scrollBar_esc 3647#ifdef scrollBar_esc
3573 { scrollBar_esc, PrivMode_scrollBar }, 3648 { scrollBar_esc, PrivMode_scrollBar },
3574#endif 3649#endif
3575 { 35, PrivMode_ShiftKeys }, // rxvt extension 3650 { 35, PrivMode_ShiftKeys }, // rxvt extension
3651 // 38, tektronix mode // DECTEK
3576 { 40, PrivMode_132OK }, 3652 { 40, PrivMode_132OK },
3577 // 41 xterm more fixes NYI 3653 // 41 xterm more fixes NYI
3578 // 45 margin bell NYI 3654 // 45 margin bell NYI
3579 // 46 start logging 3655 // 46 start logging
3580 { 47, PrivMode_Screen }, 3656 { 47, PrivMode_Screen },
3581 { 66, PrivMode_aplKP }, 3657 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3582#ifndef NO_BACKSPACE_KEY 3658#ifndef NO_BACKSPACE_KEY
3583 { 67, PrivMode_BackSpace }, 3659 { 67, PrivMode_BackSpace }, // DECBKM
3584#endif 3660#endif
3585 { 1000, PrivMode_MouseX11 }, 3661 { 1000, PrivMode_MouseX11 },
3586 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3587 { 1002, PrivMode_MouseBtnEvent }, 3662 { 1002, PrivMode_MouseBtnEvent },
3588 { 1003, PrivMode_MouseAnyEvent }, 3663 { 1003, PrivMode_MouseAnyEvent },
3664#if ENABLE_FRILLS
3665 { 1005, PrivMode_ExtModeMouse },
3666#endif
3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3667 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3590 { 1011, PrivMode_Keypress }, // rxvt extension 3668 { 1011, PrivMode_Keypress }, // rxvt extension
3669#if ENABLE_FRILLS
3670 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3671#endif
3591 // 1035 enable modifiers for alt, numlock NYI 3672 // 1035 enable modifiers for alt, numlock NYI
3592 // 1036 send ESC for meta keys NYI 3673 // 1036 send ESC for meta keys NYI
3593 // 1037 send DEL for keypad delete NYI 3674 // 1037 send DEL for keypad delete NYI
3594 { 1047, PrivMode_Screen }, 3675 { 1047, PrivMode_Screen },
3595 // 1048 save and restore cursor 3676 // 1048 save and restore cursor, implemented in code
3596 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3677 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3597 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3678 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3679 { 2004, PrivMode_BracketPaste },
3598 }; 3680 };
3599 3681
3600 if (nargs == 0) 3682 if (nargs == 0)
3601 return; 3683 return;
3602 3684
… …
3609 for (i = 0; i < nargs; i++) 3691 for (i = 0; i < nargs; i++)
3610 { 3692 {
3611 state = -1; 3693 state = -1;
3612 3694
3613 /* basic handling */ 3695 /* basic handling */
3614 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3696 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3615 if (argtopriv[j].argval == arg[i]) 3697 if (argtopriv[j].argval == arg[i])
3616 { 3698 {
3617 state = privcases (mode, argtopriv[j].bit); 3699 state = privcases (mode, argtopriv[j].bit);
3618 break; 3700 break;
3619 } 3701 }
… …
3627 3709
3628 scr_touch (true); 3710 scr_touch (true);
3629 break; 3711 break;
3630#endif 3712#endif
3631 case 1048: /* alternative cursor save */ 3713 case 1048: /* alternative cursor save */
3632 case 1049:
3633 if (option (Opt_secondaryScreen)) 3714 if (option (Opt_secondaryScreen))
3634 if (mode == 0) 3715 if (mode == 0)
3635 scr_cursor (RESTORE); 3716 scr_cursor (RESTORE);
3636 else if (mode == 1) 3717 else if (mode == 1)
3637 scr_cursor (SAVE); 3718 scr_cursor (SAVE);
… …
3646 case 2: /* VT52 mode */ 3727 case 2: /* VT52 mode */
3647 /* oddball mode. should be set regardless of set/reset 3728 /* oddball mode. should be set regardless of set/reset
3648 * parameter. Return from VT52 mode with an ESC < from 3729 * parameter. Return from VT52 mode with an ESC < from
3649 * within VT52 mode 3730 * within VT52 mode
3650 */ 3731 */
3651 PrivMode (1, PrivMode_vt52); 3732 set_privmode (PrivMode_vt52, 1);
3652 break; 3733 break;
3653 case 3: /* 80/132 */ 3734 case 3: /* 80/132 */
3654 if (priv_modes & PrivMode_132OK) 3735 if (priv_modes & PrivMode_132OK)
3655 set_widthheight (((state ? 132 : 80) * fwidth), height); 3736 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3656 break; 3737 break;
3657 case 4: /* smooth scrolling */ 3738 case 4: /* smooth scrolling */
3658 set_option (Opt_jumpScroll, !state); 3739 set_option (Opt_jumpScroll, !state);
3659 break; 3740 break;
3660 case 5: /* reverse video */ 3741 case 5: /* reverse video */
… …
3671 if (state) /* orthogonal */ 3752 if (state) /* orthogonal */
3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3753 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3673 break; 3754 break;
3674#ifdef scrollBar_esc 3755#ifdef scrollBar_esc
3675 case scrollBar_esc: 3756 case scrollBar_esc:
3676 if (scrollbar_mapping (state)) 3757 if (scrollBar.map (state))
3677 { 3758 {
3678 resize_all_windows (0, 0, 0); 3759 resize_all_windows (0, 0, 0);
3679 scr_touch (true); 3760 scr_touch (true);
3680 } 3761 }
3681 break; 3762 break;
… …
3692 /* case 67: - backspace key */ 3773 /* case 67: - backspace key */
3693 case 1000: /* X11 mouse reporting */ 3774 case 1000: /* X11 mouse reporting */
3694 if (state) /* orthogonal */ 3775 if (state) /* orthogonal */
3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3776 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3696 break; 3777 break;
3697#if 0
3698 case 1001:
3699 break; /* X11 mouse highlighting */
3700#endif
3701 case 1002: 3778 case 1002:
3702 case 1003: 3779 case 1003:
3703 if (state) 3780 if (state)
3704 { 3781 {
3705 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3782 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3706 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3783 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3784 mouse_row = mouse_col = 0;
3707 vt_emask_mouse = PointerMotionMask; 3785 vt_emask_mouse = PointerMotionMask;
3708 } 3786 }
3709 else 3787 else
3710 vt_emask_mouse = NoEventMask; 3788 vt_emask_mouse = NoEventMask;
3789
3711 vt_select_input (); 3790 vt_select_input ();
3712 break; 3791 break;
3713 case 1010: /* scroll to bottom on TTY output inhibit */ 3792 case 1010: /* scroll to bottom on TTY output inhibit */
3714 set_option (Opt_scrollTtyOutput, !state); 3793 set_option (Opt_scrollTtyOutput, !state);
3715 break; 3794 break;
3716 case 1011: /* scroll to bottom on key press */ 3795 case 1011: /* scroll to bottom on key press */
3717 set_option (Opt_scrollTtyKeypress, state); 3796 set_option (Opt_scrollTtyKeypress, state);
3718 break; 3797 break;
3719 case 1047: /* secondary screen w/ clearing last */ 3798 case 1047: /* secondary screen w/ clearing last */
3720 if (option (Opt_secondaryScreen)) 3799 if (option (Opt_secondaryScreen))
3721 if (current_screen != PRIMARY) 3800 if (!state)
3722 scr_erase_screen (2); 3801 scr_erase_screen (2);
3802
3723 scr_change_screen (state); 3803 scr_change_screen (state);
3724 break; 3804 break;
3725 case 1049: /* secondary screen w/ clearing first */ 3805 case 1049: /* secondary screen w/ clearing first */
3806 if (option (Opt_secondaryScreen))
3807 if (state)
3808 scr_cursor (SAVE);
3809
3726 scr_change_screen (state); 3810 scr_change_screen (state);
3811
3727 if (option (Opt_secondaryScreen)) 3812 if (option (Opt_secondaryScreen))
3728 if (current_screen != PRIMARY) 3813 if (state)
3729 scr_erase_screen (2); 3814 scr_erase_screen (2);
3815 else
3816 scr_cursor (RESTORE);
3730 break; 3817 break;
3731 default: 3818 default:
3732 break; 3819 break;
3733 } 3820 }
3734 } 3821 }
… …
3887 } 3974 }
3888 } 3975 }
3889} 3976}
3890/*}}} */ 3977/*}}} */
3891 3978
3892/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3893void
3894rxvt_term::process_graphics ()
3895{
3896 unicode_t ch, cmd = cmd_getc ();
3897
3898 if (cmd == 'Q')
3899 { /* query graphics */
3900 tt_printf ("\033G0\012"); /* no graphics */
3901 return;
3902 }
3903 /* swallow other graphics sequences until terminating ':' */
3904 do
3905 ch = cmd_getc ();
3906 while (ch != ':');
3907}
3908/*}}} */
3909
3910/* ------------------------------------------------------------------------- */ 3979/* ------------------------------------------------------------------------- */
3911 3980
3912/* 3981/*
3913 * Send printf () formatted output to the command. 3982 * Send printf () formatted output to the command.
3914 * Only use for small amounts of data. 3983 * Only use for small amounts of data.
… …
3927 3996
3928/* ---------------------------------------------------------------------- */ 3997/* ---------------------------------------------------------------------- */
3929/* Write data to the pty as typed by the user, pasted with the mouse, 3998/* Write data to the pty as typed by the user, pasted with the mouse,
3930 * or generated by us in response to a query ESC sequence. 3999 * or generated by us in response to a query ESC sequence.
3931 */ 4000 */
3932const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4001static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3933 4002
3934void 4003void
3935rxvt_term::tt_write (const char *data, unsigned int len) 4004rxvt_term::tt_write (const char *data, unsigned int len)
3936{ 4005{
3937 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4006 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3942 4011
3943 if (v_buflen == 0) 4012 if (v_buflen == 0)
3944 { 4013 {
3945 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4014 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3946 4015
4016 max_it (written, 0);
4017
3947 if ((unsigned int)written == len) 4018 if (written == len)
3948 return; 4019 return;
3949 4020
3950 data += written; 4021 data += written;
3951 len -= written; 4022 len -= written;
3952 } 4023 }
3953 4024
3954 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4025 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3955 4026
3956 memcpy (v_buffer + v_buflen, data, len); 4027 memcpy (v_buffer + v_buflen, data, len);
3957 v_buflen += len; 4028 v_buflen += len;
3958 4029
3959 pty_ev.set (ev::READ | ev::WRITE); 4030 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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