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.345 by sasha, Mon Aug 13 22:41:34 2007 UTC vs.
Revision 1.483 by sf-exg, Tue Apr 26 16:19:45 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.
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
221 ch = *chr++; 225 ch = *chr++;
222 226
223 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
226# if !UNICODE3 230# if !UNICODE_3
227 if (ch >= 0x10000) 231 if (ch >= 0x10000)
228 ch = 0xfffd; 232 ch = 0xfffd;
229# endif 233# endif
230 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
231 235
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
279 } 285 }
280 286
281 iso14755buf = 0; 287 iso14755buf = 0;
282} 288}
283 289
284int 290static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
298 304
299 return -1; 305 return -1;
300} 306}
301#endif 307#endif
302 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
303void 404void
304rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
305{ 406{
306 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 408 KeySym keysym;
309 int valid_keysym; 409 int valid_keysym;
310 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
311 411
312#if ISO_14755 412#if ISO_14755
… …
321 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
322 */ 422 */
323 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
326
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332 426
333 kbuf[0] = 0; 427 kbuf[0] = 0;
334 428
335#ifdef USE_XIM 429#ifdef USE_XIM
336 if (Input_Context) 430 if (Input_Context)
… …
411#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 507#else
414 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
415#endif 509#endif
510 max_it (lnsppg, 1);
511
416 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
417 { 513 {
418 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
419 return; 515 return;
420 } 516 }
… …
485 } 581 }
486 } 582 }
487 583
488#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 585 // ISO 14755 support
490 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 587 {
492 int hv; 588 int hv;
493 589
494 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
525 scr_overlay_off (); 621 scr_overlay_off ();
526# endif 622# endif
527 iso14755buf = 0; 623 iso14755buf = 0;
528 } 624 }
529 } 625 }
626 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
533 { 630 {
534 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
535# if ISO_14755 632# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
547 } 644 }
548#endif 645#endif
549 646
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 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)
552 { 658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
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
553 newlen = 1; 689 newlen = 0;
554 switch (keysym) 690 }
691 break;
692
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:
555 { 773 {
556#ifndef NO_BACKSPACE_KEY 774 int param = map_function_key (keysym);
557 case XK_BackSpace: 775 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace) 776 sprintf (kbuf,"\033[%d~", param);
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else 777 else
565 strcpy (kbuf, key_backspace);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, key_delete);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0; 778 newlen = 0;
840 break;
841 } 779 }
842 780 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
846 785
847 /* 786 /*
848 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
849 */ 788 */
850#ifdef META8_OPTION 789#ifdef META8_OPTION
… …
950 commit_iso14755 (); 889 commit_iso14755 ();
951 890
952 return; 891 return;
953 } 892 }
954 893
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 895 if (i[0] == keysym)
957 { 896 {
958 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 898 commit_iso14755 ();
960 899
… …
997 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
999#endif 938#endif
1000} 939}
1001 940
1002#if defined (KEYSYM_RESOURCE)
1003unsigned int
1004rxvt_term::cmd_write (const char *str, unsigned int count)
1005{
1006 unsigned int n, s;
1007
1008 n = cmdbuf_ptr - cmdbuf_base;
1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1010
1011 if (n > 0 && s < count)
1012 {
1013 memmove (cmdbuf_base, cmdbuf_ptr,
1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1015 cmdbuf_ptr = cmdbuf_base;
1016 cmdbuf_endp -= n;
1017 s += n;
1018 }
1019
1020 if (count > s)
1021 {
1022 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1023 count = s;
1024 }
1025
1026 for (; count--;)
1027 *cmdbuf_endp++ = *str++;
1028
1029 cmd_parse ();
1030
1031 return 0;
1032}
1033#endif
1034
1035void 941void
1036rxvt_term::flush () 942rxvt_term::flush ()
1037{ 943{
1038 flush_ev.stop (); 944 flush_ev.stop ();
1039 945
1040#ifdef ENABLE_TRANSPARENCY 946#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 947 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 948 {
1043 want_full_refresh = 0; 949 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_clear ();
1045 scr_touch (false); 950 scr_touch (false);
1046 } 951 }
1047#endif 952#endif
1048 953
1049 if (want_refresh) 954 if (want_refresh)
… …
1085 } 990 }
1086 while (row < end_row); 991 while (row < end_row);
1087 } 992 }
1088 993
1089 scr_refresh (); 994 scr_refresh ();
1090 scrollbar_show (1); 995 scrollBar.show (1);
1091#ifdef USE_XIM 996#ifdef USE_XIM
1092 IMSendSpot (); 997 IMSendSpot ();
1093#endif 998#endif
1094 } 999 }
1095 1000
1096 display->flush (); 1001 display->flush ();
1097} 1002}
1098 1003
1004/* checks whether a refresh is requested and starts the refresh timer */
1099void 1005void
1100rxvt_term::check_cb (check_watcher &w) 1006rxvt_term::refresh_check ()
1101{ 1007{
1102 make_current (); 1008 if (want_refresh && !flush_ev.is_active ())
1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1103 1010
1104 display->flush (); 1011 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108} 1012}
1109 1013
1110void 1014void
1111rxvt_term::flush_cb (time_watcher &w) 1015rxvt_term::flush_cb (ev::timer &w, int revents)
1112{ 1016{
1113 make_current (); 1017 make_current ();
1114 1018
1115 refresh_count = 0; 1019 refresh_count = 0;
1116 flush (); 1020 flush ();
1117} 1021}
1118 1022
1119#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1120void 1024void
1121rxvt_term::cursor_blink_cb (time_watcher &w) 1025rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122{ 1026{
1123 hidden_cursor = !hidden_cursor; 1027 hidden_cursor = !hidden_cursor;
1124 want_refresh = 1; 1028 want_refresh = 1;
1125 1029 refresh_check ();
1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1127} 1030}
1128#endif 1031#endif
1129 1032
1130#ifdef TEXT_BLINK 1033#ifdef TEXT_BLINK
1131void 1034void
1132rxvt_term::text_blink_cb (time_watcher &w) 1035rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133{ 1036{
1134 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1037 if (scr_refresh_rend (RS_Blink, RS_Blink))
1135 { 1038 {
1136 hidden_text = !hidden_text; 1039 hidden_text = !hidden_text;
1137 want_refresh = 1; 1040 want_refresh = 1;
1138 w.start (w.at + TEXT_BLINK_INTERVAL); 1041 refresh_check ();
1139 } 1042 }
1043 else
1044 w.stop ();
1140} 1045}
1141#endif 1046#endif
1142 1047
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1048#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void 1049void
1145rxvt_term::cont_scroll_cb (time_watcher &w) 1050rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146{ 1051{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) && 1052 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1148 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1053 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1149 { 1054 {
1150 want_refresh = 1; 1055 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1056 refresh_check ();
1152 } 1057 }
1058 else
1059 w.stop ();
1153} 1060}
1154#endif 1061#endif
1155 1062
1156#ifdef SELECTION_SCROLLING 1063#ifdef SELECTION_SCROLLING
1157void 1064void
1158rxvt_term::sel_scroll_cb (time_watcher &w) 1065rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159{ 1066{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1067 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161 { 1068 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1069 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1; 1070 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 refresh_check ();
1165 } 1072 }
1073 else
1074 w.stop ();
1166} 1075}
1167#endif 1076#endif
1168 1077
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1078#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void 1079void
1171rxvt_term::slip_wheel_cb (time_watcher &w) 1080rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172{ 1081{
1173 if (mouse_slip_wheel_speed == 0 1082 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175 : scr_page (UP, mouse_slip_wheel_speed))
1176 { 1083 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1; 1084 want_refresh = 1;
1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1085 refresh_check ();
1086 }
1087
1088 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1089 {
1090 mouse_slip_wheel_speed = 0;
1091 w.stop ();
1182 } 1092 }
1183} 1093}
1184#endif 1094#endif
1185 1095
1186#if LINUX_YIELD_HACK 1096#if LINUX_YIELD_HACK
1187static struct event_handler 1097static struct event_handler
1188{ 1098{
1189 check_watcher yield_ev; 1099 ev::prepare yield_ev;
1190 1100
1191 void yield_cb (check_watcher &w) 1101 void yield_cb (ev::prepare &w, int revents)
1192 { 1102 {
1193 // this should really be sched_yield(), but the linux guys thought 1103 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than 1104 // that giving a process calling sched_yield () less cpu time than
1195 // 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
1196 // 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.
1197 1110
1198 struct timespec ts = { 0, 0 }; 1111 struct timespec ts = { 0, 1000 };
1199 nanosleep (&ts, 0); 1112 nanosleep (&ts, 0);
1200 1113
1201 w.stop (); 1114 w.stop ();
1202 } 1115 }
1203 1116
… …
1206 { 1119 {
1207 } 1120 }
1208} event_handler; 1121} event_handler;
1209#endif 1122#endif
1210 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
1211bool 1157bool
1212rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1213{ 1159{
1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 cmdbuf_reify ();
1215 1161
1216 if (CBUFSIZ == n) 1162 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1217 { 1163
1218 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1164 if (!avail)
1219 n = 0;
1220 } 1165 {
1221 1166 // normally this indicates a "too long" command sequence - just drop the data we have
1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1223 cmdbuf_ptr = cmdbuf_base; 1167 cmdbuf_ptr = cmdbuf_base;
1224 cmdbuf_endp = cmdbuf_ptr + n; 1168 cmdbuf_endp = cmdbuf_ptr;
1169 avail = CBUFSIZ;
1170 }
1225 1171
1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1172 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1227 1173
1228 if (r > 0) 1174 if (r > 0)
1229 { 1175 {
1230 cmdbuf_endp += r; 1176 cmdbuf_endp += r;
1231 return true; 1177 return true;
… …
1247 1193
1248 return false; 1194 return false;
1249} 1195}
1250 1196
1251void 1197void
1252rxvt_term::pty_cb (io_watcher &w, short revents) 1198rxvt_term::pty_cb (ev::io &w, int revents)
1253{ 1199{
1254 make_current (); 1200 make_current ();
1255 1201
1256 if (revents & EVENT_READ) 1202 if (revents & ev::READ)
1257 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1259 if (cmd_parse ()) 1205 cmd_parse ();
1260 break;
1261 1206
1262 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1263 pty_write (); 1208 pty_write ();
1209
1210 refresh_check ();
1264} 1211}
1265 1212
1266void 1213void
1267rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1268{ 1215{
… …
1271 1218
1272#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1273 hidden_pointer = 0; 1220 hidden_pointer = 0;
1274 1221
1275 if (option (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1277#endif 1224#endif
1278} 1225}
1279 1226
1280#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1281void 1228void
… …
1289 1236
1290 hidden_pointer = 1; 1237 hidden_pointer = 1;
1291} 1238}
1292 1239
1293void 1240void
1294rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1295{ 1242{
1296 make_current (); 1243 make_current ();
1297 1244
1298 pointer_blank (); 1245 pointer_blank ();
1299} 1246}
… …
1302void 1249void
1303rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1304{ 1251{
1305 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1306 int x, y; 1253 int x, y;
1254 int code = 32;
1307 1255
1308 x = ev.x; 1256 x = Pixel2Col (ev.x) + 1;
1309 y = ev.y; 1257 y = Pixel2Row (ev.y) + 1;
1310 pixel_position (&x, &y); 1258
1259 if (ev.type == MotionNotify)
1260 {
1261 if (x == mouse_row && y == mouse_col)
1262 return;
1263
1264 mouse_row = x;
1265 mouse_col = y;
1266 code += 32;
1267 }
1311 1268
1312 if (MEvent.button == AnyButton) 1269 if (MEvent.button == AnyButton)
1313 button_number = 3; 1270 button_number = 3;
1314 else 1271 else
1315 { 1272 {
1316 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1317 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1318 if (button_number >= 3) 1275 if (button_number >= 3)
1319 button_number += (64 - 3); 1276 button_number += 64 - 3;
1320 } 1277 }
1321 1278
1322 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1323 { 1280 {
1324 /* 1281 /*
… …
1356 fputc ('A', stderr); 1313 fputc ('A', stderr);
1357 if (key_state & 32) 1314 if (key_state & 32)
1358 fputc ('2', stderr); 1315 fputc ('2', stderr);
1359 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1360 button_number, 1317 button_number,
1361 x + 1, 1318 x,
1362 y + 1); 1319 y);
1363#endif 1320#endif
1364 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
1365 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1336 code + button_number + key_state,
1367 (32 + x + 1), 1337 32 + x,
1368 (32 + y + 1)); 1338 32 + y);
1369} 1339}
1370 1340
1371/*{{{ process an X event */ 1341/*{{{ process an X event */
1372void 1342void
1373rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1475 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1476 focus_out (); 1446 focus_out ();
1477 break; 1447 break;
1478 1448
1479 case ConfigureNotify: 1449 case ConfigureNotify:
1480 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent)
1481 { 1451 {
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 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
1484 1473
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1475 {
1487 seen_resize = 1; 1476 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND 1478 }
1490 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */ 1479 else
1491 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ()) 1480 {
1481#ifdef HAVE_BG_PIXMAP
1482 if (moved)
1492 { 1483 {
1493 bgPixmap.render (); 1484 if (mapped)
1494 scr_touch (true); 1485 update_background ();
1486 else
1487 bg_invalidate ();
1495 } 1488 }
1496#endif 1489#endif
1497 } 1490 }
1498 1491
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500
1501#ifdef ENABLE_TRANSPARENCY
1502 if (option (Opt_transparent))
1503 bgPixmap.render ();
1504#endif
1505 } 1493 }
1506 break; 1494 break;
1507 1495
1508 case PropertyNotify: 1496 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1510 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1511 && ev.xproperty.state == PropertyNewValue)
1512 selection_property (ev.xproperty.window, ev.xproperty.atom);
1513
1514 break; 1498 break;
1515 1499
1516 case SelectionClear: 1500 case SelectionClear:
1517 selection_clear (); 1501 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1518 break;
1519
1520 case SelectionNotify:
1521 if (selection_wait == Sel_normal)
1522 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1523 break; 1502 break;
1524 1503
1525 case SelectionRequest: 1504 case SelectionRequest:
1526 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1527 break; 1506 break;
1528 1507
1529 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
1530 mapped = 1; 1525 mapped = 1;
1531#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1532 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1527 text_blink_ev.start ();
1533#endif 1528#endif
1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1535 break; 1530 break;
1536 1531
1537 case UnmapNotify: 1532 case UnmapNotify:
… …
1539#ifdef TEXT_BLINK 1534#ifdef TEXT_BLINK
1540 text_blink_ev.stop (); 1535 text_blink_ev.stop ();
1541#endif 1536#endif
1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1543 break; 1538 break;
1544
1545#ifdef ENABLE_TRANSPARENCY
1546 case ReparentNotify:
1547 rootwin_cb (ev);
1548 break;
1549#endif /* ENABLE_TRANSPARENCY */
1550 1539
1551 case GraphicsExpose: 1540 case GraphicsExpose:
1552 case Expose: 1541 case Expose:
1553 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1554 { 1543 {
1555 do 1544 do
1545 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1548 }
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1559 1550
1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1561 1552
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1554 {
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1557 }
1565 1558
1566 want_refresh = 1; 1559 want_refresh = 1;
1567 } 1560 }
1568 else 1561 else
1569 { 1562 {
… …
1572 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1573 ; 1566 ;
1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1575 ; 1568 ;
1576 1569
1577 if (isScrollbarWindow (ev.xany.window)) 1570 if (scrollBar.state && ev.xany.window == scrollBar.win)
1578 { 1571 {
1579 scrollBar.setIdle (); 1572 scrollBar.state = STATE_IDLE;
1580 scrollbar_show (0); 1573 scrollBar.show (0);
1581 } 1574 }
1582 } 1575 }
1583 break; 1576 break;
1584 1577
1585 case MotionNotify: 1578 case MotionNotify:
1586#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1587 if (hidden_pointer) 1580 if (hidden_pointer)
1588 pointer_unblank (); 1581 pointer_unblank ();
1589#endif 1582#endif
1583 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1584 || priv_modes & PrivMode_MouseAnyEvent)
1585 mouse_report (ev.xbutton);
1590 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1586 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1591 break; 1587 break;
1592 1588
1593 if (ev.xany.window == vt) 1589 if (ev.xany.window == vt)
1594 { 1590 {
… …
1628 int dist; 1624 int dist;
1629 1625
1630 /* don't clobber the current delay if we are 1626 /* don't clobber the current delay if we are
1631 * already in the middle of scrolling. 1627 * already in the middle of scrolling.
1632 */ 1628 */
1633 if (!sel_scroll_ev.active) 1629 if (!sel_scroll_ev.is_active ())
1634 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1630 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1635 1631
1636 /* save the event params so we can highlight 1632 /* save the event params so we can highlight
1637 * the selection in the pending-scroll loop 1633 * the selection in the pending-scroll loop
1638 */ 1634 */
1639 selection_save_x = ev.xbutton.x; 1635 selection_save_x = ev.xbutton.x;
… …
1661 else 1657 else
1662 { 1658 {
1663 /* we are within the text window, so we 1659 /* we are within the text window, so we
1664 * shouldn't be scrolling 1660 * shouldn't be scrolling
1665 */ 1661 */
1666 if (sel_scroll_ev.active)
1667 sel_scroll_ev.stop(); 1662 sel_scroll_ev.stop();
1668 } 1663 }
1669#endif 1664#endif
1670#ifdef MOUSE_THRESHOLD 1665#ifdef MOUSE_THRESHOLD
1671 } 1666 }
1672#endif 1667#endif
1673 } 1668 }
1674 } 1669 }
1675 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1670 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1676 { 1671 {
1677 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1678 MotionNotify, &ev)) 1673 MotionNotify, &ev))
1679 ; 1674 ;
1680 1675
… …
1682 &unused_root, &unused_child, 1677 &unused_root, &unused_child,
1683 &unused_root_x, &unused_root_y, 1678 &unused_root_x, &unused_root_y,
1684 &ev.xbutton.x, &ev.xbutton.y, 1679 &ev.xbutton.x, &ev.xbutton.y,
1685 &unused_mask); 1680 &unused_mask);
1686 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1687 scrollbar_size ()); 1682 scrollBar.size ());
1688 want_refresh = 1; 1683 want_refresh = 1;
1689 scrollbar_show (1); 1684 scrollBar.show (1);
1690 } 1685 }
1691 break; 1686 break;
1692 } 1687 }
1693 1688
1694#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
… …
1698 { 1693 {
1699 hidden_cursor = 0; 1694 hidden_cursor = 0;
1700 want_refresh = 1; 1695 want_refresh = 1;
1701 } 1696 }
1702 1697
1703 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1698 cursor_blink_ev.again ();
1704 } 1699 }
1705#endif 1700#endif
1706 1701
1707#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1708 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1715 1710
1716 if (ev.type == KeyPress && hidden_pointer == 0) 1711 if (ev.type == KeyPress && hidden_pointer == 0)
1717 pointer_blank (); 1712 pointer_blank ();
1718 } 1713 }
1719#endif 1714#endif
1715
1716 refresh_check ();
1720} 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
1721 1734
1722void 1735void
1723rxvt_term::focus_in () 1736rxvt_term::focus_in ()
1724{ 1737{
1725 if (!focus) 1738 if (!focus)
1726 { 1739 {
1727 focus = 1; 1740 focus = 1;
1728 want_refresh = 1; 1741 want_refresh = 1;
1729 1742
1730 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1731
1732#if USE_XIM 1743#if USE_XIM
1733 if (Input_Context != NULL) 1744 if (Input_Context != NULL)
1734 { 1745 {
1735 IMSetPosition (); 1746 IMSetPosition ();
1736 XSetICFocus (Input_Context); 1747 XSetICFocus (Input_Context);
1737 } 1748 }
1738#endif 1749#endif
1739#if CURSOR_BLINK 1750#if CURSOR_BLINK
1740 if (option (Opt_cursorBlink)) 1751 if (option (Opt_cursorBlink))
1741 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1752 cursor_blink_ev.again ();
1742#endif 1753#endif
1743#if OFF_FOCUS_FADING 1754#if OFF_FOCUS_FADING
1744 if (rs[Rs_fade]) 1755 if (rs[Rs_fade])
1745 { 1756 {
1746 pix_colors = pix_colors_focused; 1757 pix_colors = pix_colors_focused;
1747 scr_recolour (); 1758 scr_recolour ();
1748 } 1759 }
1749#endif 1760#endif
1750#if ENABLE_FRILLS 1761#if ENABLE_FRILLS
1751 if (option (Opt_urgentOnBell)) 1762 if (option (Opt_urgentOnBell))
1752 { 1763 set_urgency (0);
1753 XWMHints *h;
1754
1755 h = XGetWMHints(dpy, parent[0]);
1756 if (h != NULL)
1757 {
1758 h->flags &= ~XUrgencyHint;
1759 XSetWMHints(dpy, parent[0], h);
1760 }
1761 }
1762#endif 1764#endif
1765
1766 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1763 } 1767 }
1764} 1768}
1765 1769
1766void 1770void
1767rxvt_term::focus_out () 1771rxvt_term::focus_out ()
… …
1769 if (focus) 1773 if (focus)
1770 { 1774 {
1771 focus = 0; 1775 focus = 0;
1772 want_refresh = 1; 1776 want_refresh = 1;
1773 1777
1774 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1778#if ENABLE_FRILLS
1775 1779 if (option (Opt_urgentOnBell))
1780 set_urgency (0);
1781#endif
1776#if ENABLE_FRILLS || ISO_14755 1782#if ENABLE_FRILLS || ISO_14755
1777 if (iso14755buf) 1783 if (iso14755buf)
1778 { 1784 {
1779 iso14755buf = 0; 1785 iso14755buf = 0;
1780# if ISO_14755 1786# if ISO_14755
… …
1787 XUnsetICFocus (Input_Context); 1793 XUnsetICFocus (Input_Context);
1788#endif 1794#endif
1789#if CURSOR_BLINK 1795#if CURSOR_BLINK
1790 if (option (Opt_cursorBlink)) 1796 if (option (Opt_cursorBlink))
1791 cursor_blink_ev.stop (); 1797 cursor_blink_ev.stop ();
1798
1792 hidden_cursor = 0; 1799 hidden_cursor = 0;
1793#endif 1800#endif
1794#if OFF_FOCUS_FADING 1801#if OFF_FOCUS_FADING
1795 if (rs[Rs_fade]) 1802 if (rs[Rs_fade])
1796 { 1803 {
1797 pix_colors = pix_colors_unfocused; 1804 pix_colors = pix_colors_unfocused;
1798 scr_recolour (); 1805 scr_recolour ();
1799 } 1806 }
1800#endif 1807#endif
1808
1809 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1801 } 1810 }
1802} 1811}
1803 1812
1804void 1813void
1805rxvt_term::update_fade_color (unsigned int idx) 1814rxvt_term::update_fade_color (unsigned int idx)
… …
1833 * 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.
1834 */ 1843 */
1835 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1836 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1837 { 1846 {
1838 bgPixmap.set_root_pixmap (); 1847 bg_set_root_pixmap ();
1839 bgPixmap.render (); 1848 update_background ();
1840 } 1849 }
1850
1841 break; 1851 break;
1842 } 1852 }
1843# endif 1853# endif
1854
1855 refresh_check ();
1844} 1856}
1845#endif 1857#endif
1846 1858
1847void 1859void
1848rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
… …
1879 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1880 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1881#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1882 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1883 { 1895 {
1884 /* same button, within alloted time */ 1896 /* same button, within allowed time */
1885 MEvent.clicks++; 1897 MEvent.clicks++;
1886 1898
1887 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1888 { 1900 {
1889 /* only report double clicks */ 1901 /* only report double clicks */
… …
1903 mouse_report (ev); 1915 mouse_report (ev);
1904 } 1916 }
1905#else 1917#else
1906 MEvent.button = ev.button; 1918 MEvent.button = ev.button;
1907 mouse_report (ev); 1919 mouse_report (ev);
1908#endif /* MOUSE_REPORT_DOUBLECLICK */ 1920#endif /* MOUSE_REPORT_DOUBLECLICK */
1909 1921
1910 } 1922 }
1911 else 1923 else
1912 { 1924 {
1913 if (ev.button != MEvent.button) 1925 if (ev.button != MEvent.button)
… …
1961 } 1973 }
1962 1974
1963 /* 1975 /*
1964 * Scrollbar window processing of button press 1976 * Scrollbar window processing of button press
1965 */ 1977 */
1966 if (isScrollbarWindow (ev.window)) 1978 if (scrollBar.state && ev.window == scrollBar.win)
1967 { 1979 {
1968 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;
1969 /* 1988 /*
1970 * Rxvt-style scrollbar: 1989 * Rxvt-style scrollbar:
1971 * move up if mouse is above slider 1990 * move up if mouse is above slider
1972 * move dn if mouse is below slider 1991 * move dn if mouse is below slider
1973 * 1992 *
… …
1982 /* 2001 /*
1983 * Mouse report disabled scrollbar: 2002 * Mouse report disabled scrollbar:
1984 * arrow buttons - send up/down 2003 * arrow buttons - send up/down
1985 * click on scrollbar - send pageup/down 2004 * click on scrollbar - send pageup/down
1986 */ 2005 */
1987 if ((scrollBar.style == R_SB_NEXT 2006 if (direction == UP)
1988 && scrollbarnext_upButton (ev.y))
1989 || (scrollBar.style == R_SB_RXVT
1990 && scrollbarrxvt_upButton (ev.y)))
1991 tt_printf ("\033[A"); 2007 tt_printf ("\033[A");
1992 else if ((scrollBar.style == R_SB_NEXT 2008 else if (direction == DN)
1993 && scrollbarnext_dnButton (ev.y))
1994 || (scrollBar.style == R_SB_RXVT
1995 && scrollbarrxvt_dnButton (ev.y)))
1996 tt_printf ("\033[B"); 2009 tt_printf ("\033[B");
1997 else 2010 else
1998 switch (ev.button) 2011 switch (ev.button)
1999 { 2012 {
2000 case Button2: 2013 case Button2:
… …
2007 tt_printf ("\033[5~"); 2020 tt_printf ("\033[5~");
2008 break; 2021 break;
2009 } 2022 }
2010 } 2023 }
2011 else 2024 else
2012#endif /* NO_SCROLLBAR_REPORT */ 2025#endif /* NO_SCROLLBAR_REPORT */
2013
2014 {
2015 char upordown = 0;
2016
2017 if (scrollBar.style == R_SB_NEXT)
2018 { 2026 {
2019 if (scrollbarnext_upButton (ev.y)) 2027 if (direction != NO_DIR)
2020 upordown = -1; /* up */
2021 else if (scrollbarnext_dnButton (ev.y))
2022 upordown = 1; /* down */
2023 }
2024 else if (scrollBar.style == R_SB_RXVT)
2025 {
2026 if (scrollbarrxvt_upButton (ev.y))
2027 upordown = -1; /* up */
2028 else if (scrollbarrxvt_dnButton (ev.y))
2029 upordown = 1; /* down */
2030 }
2031 if (upordown)
2032 { 2028 {
2033#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2029#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2030 if (!cont_scroll_ev.is_active ())
2034 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2031 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2035#endif 2032#endif
2036 if (scr_page (upordown < 0 ? UP : DN, 1)) 2033 if (scr_page (direction, 1))
2037 { 2034 {
2038 if (upordown < 0) 2035 if (direction == UP)
2039 scrollBar.setUp (); 2036 scrollBar.state = STATE_UP;
2040 else 2037 else
2041 scrollBar.setDn (); 2038 scrollBar.state = STATE_DOWN;
2042 } 2039 }
2043 } 2040 }
2044 else 2041 else
2045 switch (ev.button) 2042 switch (ev.button)
2046 { 2043 {
2047 case Button2: 2044 case Button2:
2048 switch (scrollbar_align) 2045 switch (scrollBar.align)
2049 { 2046 {
2050 case R_SB_ALIGN_TOP: 2047 case R_SB_ALIGN_TOP:
2051 csrO = 0; 2048 csrO = 0;
2052 break; 2049 break;
2053 case R_SB_ALIGN_CENTRE: 2050 case R_SB_ALIGN_CENTRE:
… …
2059 } 2056 }
2060 2057
2061 if (scrollBar.style == R_SB_XTERM 2058 if (scrollBar.style == R_SB_XTERM
2062 || scrollbar_above_slider (ev.y) 2059 || scrollbar_above_slider (ev.y)
2063 || scrollbar_below_slider (ev.y)) 2060 || scrollbar_below_slider (ev.y))
2064 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2065 2062
2066 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2067 break; 2064 break;
2068 2065
2069 case Button1: 2066 case Button1:
2070 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2067 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2071 csrO = ev.y - scrollBar.top; 2068 csrO = ev.y - scrollBar.top;
2072 /* FALLTHROUGH */ 2069 /* FALLTHROUGH */
2073 2070
2074 case Button3: 2071 case Button3:
2075 if (scrollBar.style != R_SB_XTERM) 2072 if (scrollBar.style != R_SB_XTERM)
… …
2085 scr_page (DN, nrow - 1); 2082 scr_page (DN, nrow - 1);
2086# else 2083# else
2087 scr_page (DN, nrow / 4); 2084 scr_page (DN, nrow / 4);
2088# endif 2085# endif
2089 else 2086 else
2090 scrollBar.setMotion (); 2087 scrollBar.state = STATE_MOTION;
2091 } 2088 }
2092 else 2089 else
2093 { 2090 {
2094 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
2095 (nrow 2092 (nrow
2096 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
2097 / scrollbar_size ())); 2094 / scrollBar.size ()));
2098 } 2095 }
2099 2096
2100 break; 2097 break;
2101 } 2098 }
2102 } 2099 }
… …
2112 2109
2113 csrO = 0; /* reset csr Offset */ 2110 csrO = 0; /* reset csr Offset */
2114 if (!bypass_keystate) 2111 if (!bypass_keystate)
2115 reportmode = !! (priv_modes & PrivMode_mouse_report); 2112 reportmode = !! (priv_modes & PrivMode_mouse_report);
2116 2113
2117 if (scrollbar_isUpDn ()) 2114 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2118 { 2115 {
2119 scrollBar.setIdle (); 2116 scrollBar.state = STATE_IDLE;
2120 scrollbar_show (0); 2117 scrollBar.show (0);
2121 } 2118 }
2122 2119
2123#ifdef SELECTION_SCROLLING 2120#ifdef SELECTION_SCROLLING
2124 if (sel_scroll_ev.active)
2125 sel_scroll_ev.stop(); 2121 sel_scroll_ev.stop();
2126#endif 2122#endif
2127 2123
2128 if (ev.window == vt) 2124 if (ev.window == vt)
2129 { 2125 {
2130 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)))
… …
2154 mouse_report (ev); 2150 mouse_report (ev);
2155 } 2151 }
2156#else /* MOUSE_REPORT_DOUBLECLICK */ 2152#else /* MOUSE_REPORT_DOUBLECLICK */
2157 MEvent.button = AnyButton; 2153 MEvent.button = AnyButton;
2158 mouse_report (ev); 2154 mouse_report (ev);
2159#endif /* MOUSE_REPORT_DOUBLECLICK */ 2155#endif /* MOUSE_REPORT_DOUBLECLICK */
2160 return; 2156 return;
2161 } 2157 }
2162 2158
2163 /* 2159 /*
2164 * dumb hack to compensate for the failure of click-and-drag 2160 * dumb hack to compensate for the failure of click-and-drag
… …
2176 selection_make (ev.time); 2172 selection_make (ev.time);
2177 break; 2173 break;
2178 2174
2179 case Button2: 2175 case Button2:
2180 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?
2181 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2182 break; 2178 break;
2183 2179
2184#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2185 case Button4: 2181 case Button4:
2186 case Button5: 2182 case Button5:
… …
2202 { 2198 {
2203 mouse_slip_wheel_speed += v ? -1 : 1; 2199 mouse_slip_wheel_speed += v ? -1 : 1;
2204 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2200 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2205 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2201 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2206 2202
2207 if (slip_wheel_ev.at < NOW) 2203 if (!slip_wheel_ev.is_active ())
2208 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2204 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2209
2210 slip_wheel_ev.start ();
2211 } 2205 }
2212 else 2206 else
2207# endif
2213 { 2208 {
2214# endif
2215 scr_page (v, i); 2209 scr_page (v, i);
2216 scrollbar_show (1); 2210 scrollBar.show (1);
2217# ifdef MOUSE_SLIP_WHEELING
2218 } 2211 }
2219# endif
2220 } 2212 }
2221 break; 2213 break;
2222#endif 2214#endif
2223 } 2215 }
2224 } 2216 }
2225} 2217}
2226 2218
2227/*}}} */ 2219/*}}} */
2228 2220
2229bool 2221void
2230rxvt_term::cmd_parse () 2222rxvt_term::cmd_parse ()
2231{ 2223{
2232 bool flag = false;
2233 wchar_t ch = NOCHAR; 2224 wchar_t ch = NOCHAR;
2234 char *seq_begin; // remember start of esc-sequence here 2225 char *seq_begin; // remember start of esc-sequence here
2235 2226
2236 for (;;) 2227 for (;;)
2237 { 2228 {
2238 if (ch == NOCHAR) 2229 if (expect_false (ch == NOCHAR))
2239 { 2230 {
2240 seq_begin = cmdbuf_ptr; 2231 seq_begin = cmdbuf_ptr;
2241 ch = next_char (); 2232 ch = next_char ();
2242 2233
2243 if (ch == NOCHAR) 2234 if (ch == NOCHAR)
2244 break; 2235 break;
2245 } 2236 }
2246 2237
2247 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))
2248 { 2239 {
2249 if (!seen_input) 2240 if (expect_false (!seen_input))
2250 { 2241 {
2251 seen_input = 1; 2242 seen_input = 1;
2252 // many badly-written programs (e.g. jed) contain a race condition: 2243 // many badly-written programs (e.g. jed) contain a race condition:
2253 // they first read the screensize and then install a SIGWINCH handler. 2244 // they first read the screensize and then install a SIGWINCH handler.
2254 // some window managers resize the window early, and these programs 2245 // some window managers resize the window early, and these programs
… …
2267 wchar_t *str = buf; 2258 wchar_t *str = buf;
2268 wchar_t *eol = str + min (ncol, UBUFSIZ); 2259 wchar_t *eol = str + min (ncol, UBUFSIZ);
2269 2260
2270 for (;;) 2261 for (;;)
2271 { 2262 {
2272 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)))
2273 break; 2264 break;
2274 2265
2275 *str++ = ch; 2266 *str++ = ch;
2276 2267
2277 if (ch == C0_LF || str >= eol) 2268 if (expect_false (ch == C0_LF || str >= eol))
2278 { 2269 {
2279 if (ch == C0_LF) 2270 if (ch == C0_LF)
2280 nlines++; 2271 nlines++;
2281 2272
2282 refresh_count++; 2273 refresh_count++;
2283 2274
2284 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2275 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2285 { 2276 {
2286 refresh_count = 0; 2277 refresh_count = 0;
2287 2278
2288 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2279 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2289 { 2280 {
2290 refreshnow = true; 2281 refreshnow = true;
2291 ch = NOCHAR; 2282 ch = NOCHAR;
2292 break; 2283 break;
2293 } 2284 }
… …
2331 * 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.
2332 * if skipScroll is enabled. 2323 * if skipScroll is enabled.
2333 */ 2324 */
2334 if (refreshnow) 2325 if (refreshnow)
2335 { 2326 {
2336 flag = true;
2337 scr_refresh (); 2327 scr_refresh ();
2338 want_refresh = 1; 2328 want_refresh = 1;
2339 } 2329 }
2340
2341 } 2330 }
2342 else 2331 else
2343 { 2332 {
2344 try 2333 try
2345 { 2334 {
… …
2353 } 2342 }
2354 2343
2355 ch = NOCHAR; 2344 ch = NOCHAR;
2356 } 2345 }
2357 } 2346 }
2358
2359 return flag;
2360} 2347}
2361 2348
2362// read the next character 2349// read the next character
2363wchar_t 2350wchar_t
2364rxvt_term::next_char () NOTHROW 2351rxvt_term::next_char () NOTHROW
2365{ 2352{
2366 while (cmdbuf_ptr < cmdbuf_endp) 2353 while (cmdbuf_ptr < cmdbuf_endp)
2367 { 2354 {
2368 // assume 7-bit to be ascii ALWAYS 2355 // assume 7-bit to be ascii ALWAYS
2369 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2370 return *cmdbuf_ptr++; 2357 return *cmdbuf_ptr++;
2371 2358
2372 wchar_t wc; 2359 wchar_t wc;
2373 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);
2374 2361
… …
2378 cmdbuf_ptr = cmdbuf_endp; 2365 cmdbuf_ptr = cmdbuf_endp;
2379 break; 2366 break;
2380 } 2367 }
2381 2368
2382 if (len == (size_t)-1) 2369 if (len == (size_t)-1)
2370 {
2371 mbstate.reset (); // reset now undefined conversion state
2383 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 }
2384 2374
2385 // assume wchar == unicode 2375 // assume wchar == unicode
2386 cmdbuf_ptr += len; 2376 cmdbuf_ptr += len;
2387 return wc & UNICODE_MASK; 2377 return wc & UNICODE_MASK;
2388 } 2378 }
… …
2399 : NOCHAR; 2389 : NOCHAR;
2400} 2390}
2401 2391
2402static class out_of_input out_of_input; 2392static class out_of_input out_of_input;
2403 2393
2404/* rxvt_cmd_getc () - Return next input character */
2405/*
2406 * Return the next input character after first passing any keyboard input
2407 * to the command.
2408 */
2409wchar_t 2394wchar_t
2410rxvt_term::cmd_getc () THROW ((class out_of_input)) 2395rxvt_term::cmd_getc () THROW ((class out_of_input))
2411{ 2396{
2412 wchar_t c = next_char (); 2397 wchar_t c = next_char ();
2413 2398
… …
2432/*----------------------------------------------------------------------*/ 2417/*----------------------------------------------------------------------*/
2433#ifdef PRINTPIPE 2418#ifdef PRINTPIPE
2434FILE * 2419FILE *
2435rxvt_term::popen_printer () 2420rxvt_term::popen_printer ()
2436{ 2421{
2437 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2422 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2438 2423
2439 if (stream == NULL) 2424 if (stream == NULL)
2440 rxvt_warn ("can't open printer pipe, not printing.\n"); 2425 rxvt_warn ("can't open printer pipe, not printing.\n");
2441 2426
2442 return stream; 2427 return stream;
… …
2453 * simulate attached vt100 printer 2438 * simulate attached vt100 printer
2454 */ 2439 */
2455void 2440void
2456rxvt_term::process_print_pipe () 2441rxvt_term::process_print_pipe ()
2457{ 2442{
2458 int done; 2443 FILE *fd = popen_printer ();
2459 FILE *fd;
2460 2444
2461 if ((fd = popen_printer ()) == NULL) 2445 if (!fd)
2462 return; 2446 return;
2463 2447
2464 /* 2448 /*
2465 * Send all input to the printer until either ESC[4i or ESC[?4i 2449 * Send all input to the printer until either ESC[4i or ESC[?4i
2466 * is received. 2450 * is received.
2467 */ 2451 */
2468 for (done = 0; !done;) 2452 for (int done = 0; !done; )
2469 { 2453 {
2470 unsigned char buf[8]; 2454 unsigned char buf[8];
2471 unicode_t ch; 2455 unicode_t ch;
2472 unsigned int i, len; 2456 unsigned int i, len;
2473 2457
… …
2504 } 2488 }
2505 } 2489 }
2506 2490
2507 pclose_printer (fd); 2491 pclose_printer (fd);
2508} 2492}
2509#endif /* PRINTPIPE */ 2493#endif /* PRINTPIPE */
2510/*}}} */ 2494/*}}} */
2511 2495
2512/* *INDENT-OFF* */ 2496/* *INDENT-OFF* */
2513enum { 2497enum {
2514 C1_40 = 0x40, 2498 C1_40 = 0x40,
… …
2618 break; 2602 break;
2619 case 'Z': /* identify the terminal type */ 2603 case 'Z': /* identify the terminal type */
2620 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2604 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2621 break; 2605 break;
2622 case '<': /* turn off VT52 mode */ 2606 case '<': /* turn off VT52 mode */
2623 PrivMode (0, PrivMode_vt52); 2607 set_privmode (PrivMode_vt52, 0);
2624 break; 2608 break;
2625 case 'F': /* use special graphics character set */ 2609 case 'F': /* use special graphics character set */
2626 case 'G': /* use regular character set */ 2610 case 'G': /* use regular character set */
2627 /* unimplemented */ 2611 /* unimplemented */
2628 break; 2612 break;
… …
2682 scr_forwardindex (); 2666 scr_forwardindex ();
2683 break; 2667 break;
2684#endif 2668#endif
2685 case '=': 2669 case '=':
2686 case '>': 2670 case '>':
2687 PrivMode ((ch == '='), PrivMode_aplKP); 2671 set_privmode (PrivMode_aplKP, ch == '=');
2688 break; 2672 break;
2689 2673
2690 case C1_40: 2674 case C1_40:
2691 cmd_getc (); 2675 cmd_getc ();
2692 break; 2676 break;
… …
2696 2680
2697 /* 8.3.87: NEXT LINE */ 2681 /* 8.3.87: NEXT LINE */
2698 case C1_NEL: /* ESC E */ 2682 case C1_NEL: /* ESC E */
2699 { 2683 {
2700 wchar_t nlcr[] = { C0_LF, C0_CR }; 2684 wchar_t nlcr[] = { C0_LF, C0_CR };
2701 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2685 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2702 } 2686 }
2703 break; 2687 break;
2704 2688
2705 /* kidnapped escape sequence: Should be 8.3.48 */ 2689 /* kidnapped escape sequence: Should be 8.3.48 */
2706 case C1_ESA: /* ESC G */ 2690 case C1_ESA: /* ESC G */
2707 process_graphics (); 2691 // used by original rxvt for rob nations own graphics mode
2692 if (cmd_getc () == 'Q')
2693 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2708 break; 2694 break;
2709 2695
2710 /* 8.3.63: CHARACTER TABULATION SET */ 2696 /* 8.3.63: CHARACTER TABULATION SET */
2711 case C1_HTS: /* ESC H */ 2697 case C1_HTS: /* ESC H */
2712 scr_set_tab (1); 2698 scr_set_tab (1);
… …
2731 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2717 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2732 case C1_SCI: /* ESC Z */ 2718 case C1_SCI: /* ESC Z */
2733 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2719 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2734 break; /* steal obsolete ESC [ c */ 2720 break; /* steal obsolete ESC [ c */
2735 2721
2736 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2722 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2737 case C1_CSI: /* ESC [ */ 2723 case C1_CSI: /* ESC [ */
2738 process_csi_seq (); 2724 process_csi_seq ();
2739 break; 2725 break;
2740 2726
2741 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2727 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2742 case C1_OSC: /* ESC ] */ 2728 case C1_OSC: /* ESC ] */
2743 process_osc_seq (); 2729 process_osc_seq ();
2744 break; 2730 break;
2745 2731
2746 /* 8.3.106: RESET TO INITIAL STATE */ 2732 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2747 case 'c': 2733 case 'c':
2748 mbstate.reset (); 2734 mbstate.reset ();
2749 scr_poweron (); 2735 scr_poweron ();
2750 scrollbar_show (1); 2736 scrollBar.show (1);
2751 break; 2737 break;
2752 2738
2753 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2739 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2754 case 'n': 2740 case 'n':
2755 scr_charset_choose (2); 2741 scr_charset_choose (2);
… …
2775 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2761 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2776 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2762 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2777 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2763 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2778}; 2764};
2779 2765
2780#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2766#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2781 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2767 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2782 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2768 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2783#define get_byte_array_bit(array, bit) \ 2769#define get_byte_array_bit(array, bit) \
2784 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2770 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2785 2771
2786const unsigned char csi_defaults[] = 2772static const unsigned char csi_defaults[] =
2787 { 2773 {
2788 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2774 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2789 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2775 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2790 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2776 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2791 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2777 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2800rxvt_term::process_csi_seq () 2786rxvt_term::process_csi_seq ()
2801{ 2787{
2802 unicode_t ch, priv, i; 2788 unicode_t ch, priv, i;
2803 unsigned int nargs, p; 2789 unsigned int nargs, p;
2804 int n, ndef; 2790 int n, ndef;
2805 int arg[ESC_ARGS]; 2791 int arg[ESC_ARGS] = { };
2806 2792
2807 memset (arg, 0, sizeof (arg));
2808 nargs = 0; 2793 nargs = 0;
2809 2794
2810 priv = 0; 2795 priv = 0;
2811 ch = cmd_getc (); 2796 ch = cmd_getc ();
2812 if (ch >= '<' && ch <= '?') 2797 if ((ch >= '<' && ch <= '?') || ch == '!')
2798 {
2813 { /* '<' '=' '>' '?' */ 2799 /* '<' '=' '>' '?' '!' */
2814 priv = ch; 2800 priv = ch;
2815 ch = cmd_getc (); 2801 ch = cmd_getc ();
2816 } 2802 }
2817 2803
2818 /* read any numerical arguments */ 2804 /* read any numerical arguments */
… …
2861 { 2847 {
2862 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2848 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2863 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2849 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2864 // 2850 //
2865 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2851 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2866 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2852 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2867 // that we do not support xterm mouse reporting (should be 95 when we do). 2853 // versions.
2868 // 2854 //
2869 tt_printf ("\033[>%d;94;0c", 'U'); 2855 tt_printf ("\033[>%d;95;0c", 'U');
2870 } 2856 }
2871 break; 2857 break;
2858
2872 case '?': 2859 case '?':
2873 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2860 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2874 process_terminal_mode (ch, priv, nargs, arg); 2861 process_terminal_mode (ch, priv, nargs, arg);
2875 break; 2862 break;
2863
2864 case '!':
2865 if (ch == CSI_70)
2866 {
2867 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2868 scr_soft_reset ();
2869
2870 static const int pm_h[] = { 7, 25 };
2871 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2872
2873 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2874 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2876 } 2875 }
2876 break;
2877 }
2878
2877 return; 2879 return;
2878 } 2880 }
2879 2881
2880 switch (ch) 2882 switch (ch)
2881 { 2883 {
… …
3115 { 3117 {
3116 /* 3118 /*
3117 * commands 3119 * commands
3118 */ 3120 */
3119 case 1: /* deiconify window */ 3121 case 1: /* deiconify window */
3120 XMapWindow (dpy, parent[0]); 3122 XMapWindow (dpy, parent);
3121 break; 3123 break;
3122 case 2: /* iconify window */ 3124 case 2: /* iconify window */
3123 XIconifyWindow (dpy, parent[0], display->screen); 3125 XIconifyWindow (dpy, parent, display->screen);
3124 break; 3126 break;
3125 case 3: /* set position (pixels) */ 3127 case 3: /* set position (pixels) */
3126 XMoveWindow (dpy, parent[0], args[1], args[2]); 3128 XMoveWindow (dpy, parent, args[1], args[2]);
3127 break; 3129 break;
3128 case 4: /* set size (pixels) */ 3130 case 4: /* set size (pixels) */
3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3130 break; 3132 break;
3131 case 5: /* raise window */ 3133 case 5: /* raise window */
3132 XRaiseWindow (dpy, parent[0]); 3134 XRaiseWindow (dpy, parent);
3133 break; 3135 break;
3134 case 6: /* lower window */ 3136 case 6: /* lower window */
3135 XLowerWindow (dpy, parent[0]); 3137 XLowerWindow (dpy, parent);
3136 break; 3138 break;
3137 case 7: /* refresh window */ 3139 case 7: /* refresh window */
3138 scr_touch (true); 3140 scr_touch (true);
3139 break; 3141 break;
3140 case 8: /* set size (chars) */ 3142 case 8: /* set size (chars) */
… …
3151 3153
3152 /* 3154 /*
3153 * reports - some output format copied from XTerm 3155 * reports - some output format copied from XTerm
3154 */ 3156 */
3155 case 11: /* report window state */ 3157 case 11: /* report window state */
3156 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3158 break; 3160 break;
3159 case 13: /* report window position */ 3161 case 13: /* report window position */
3160 XGetWindowAttributes (dpy, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent, &wattr);
3161 XTranslateCoordinates (dpy, parent[0], wattr.root, 3163 XTranslateCoordinates (dpy, parent, wattr.root,
3162 -wattr.border_width, -wattr.border_width, 3164 -wattr.border_width, -wattr.border_width,
3163 &x, &y, &wdummy); 3165 &x, &y, &wdummy);
3164 tt_printf ("\033[3;%d;%dt", x, y); 3166 tt_printf ("\033[3;%d;%dt", x, y);
3165 break; 3167 break;
3166 case 14: /* report window size (pixels) */ 3168 case 14: /* report window size (pixels) */
3167 XGetWindowAttributes (dpy, parent[0], &wattr); 3169 XGetWindowAttributes (dpy, parent, &wattr);
3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3169 break; 3171 break;
3170 case 18: /* report text area size (chars) */ 3172 case 18: /* report text area size (chars) */
3171 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3173 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3172 break; 3174 break;
… …
3174 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3176 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3175 break; 3177 break;
3176 case 20: /* report icon label */ 3178 case 20: /* report icon label */
3177 { 3179 {
3178 char *s; 3180 char *s;
3179 XGetIconName (dpy, parent[0], &s); 3181 XGetIconName (dpy, parent, &s);
3180 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3182 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3181 XFree (s); 3183 XFree (s);
3182 } 3184 }
3183 break; 3185 break;
3184 case 21: /* report window title */ 3186 case 21: /* report window title */
3185 { 3187 {
3186 char *s; 3188 char *s;
3187 XFetchName (dpy, parent[0], &s); 3189 XFetchName (dpy, parent, &s);
3188 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3190 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3189 XFree (s); 3191 XFree (s);
3190 } 3192 }
3191 break; 3193 break;
3192 } 3194 }
… …
3248 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3249 */ 3251 */
3250void 3252void
3251rxvt_term::process_dcs_seq () 3253rxvt_term::process_dcs_seq ()
3252{ 3254{
3253 char *s;
3254 unicode_t eh;
3255
3256 /* 3255 /*
3257 * Not handled yet 3256 * Not handled yet
3258 */ 3257 */
3258
3259 unicode_t eh;
3259 s = get_to_st (eh); 3260 char *s = get_to_st (eh);
3260 if (s) 3261 if (s)
3261 free (s); 3262 free (s);
3262 3263
3263 return; 3264 return;
3264} 3265}
… …
3268 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3269 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3269 */ 3270 */
3270void 3271void
3271rxvt_term::process_osc_seq () 3272rxvt_term::process_osc_seq ()
3272{ 3273{
3273 unicode_t ch, eh;
3274 int arg; 3274 int arg;
3275 3275
3276 ch = cmd_getc (); 3276 unicode_t ch = cmd_getc ();
3277 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3277 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3278 arg = arg * 10 + (ch - '0'); 3278 arg = arg * 10 + (ch - '0');
3279 3279
3280 if (ch == ';') 3280 if (ch == ';')
3281 { 3281 {
3282 unicode_t eh;
3282 char *s = get_to_st (eh); 3283 char *s = get_to_st (eh);
3283 3284
3284 if (s) 3285 if (s)
3285 { 3286 {
3286 process_xterm_seq (arg, s, eh); 3287 process_xterm_seq (arg, s, eh);
… …
3310 3311
3311/* 3312/*
3312 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3313 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3313 */ 3314 */
3314void 3315void
3315rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3316rxvt_term::process_xterm_seq (int op, char *str, char resp)
3316{ 3317{
3317 int color; 3318 int color;
3318 char *buf, *name; 3319 char *buf, *name;
3319 bool query = str[0] == '?' && !str[1]; 3320 bool query = str[0] == '?' && !str[1];
3320 int saveop = op; 3321 int saveop = op;
… …
3347 unsigned long bytes_after; 3348 unsigned long bytes_after;
3348 unsigned char *value = 0; 3349 unsigned char *value = 0;
3349 const char *str = ""; 3350 const char *str = "";
3350 3351
3351 if (prop 3352 if (prop
3352 && XGetWindowProperty (dpy, parent[0], 3353 && XGetWindowProperty (dpy, parent,
3353 prop, 0, 1<<16, 0, AnyPropertyType, 3354 prop, 0, 1<<16, 0, AnyPropertyType,
3354 &actual_type, &actual_format, 3355 &actual_type, &actual_format,
3355 &nitems, &bytes_after, &value) == Success 3356 &nitems, &bytes_after, &value) == Success
3356 && actual_type != None 3357 && actual_type != None
3357 && actual_format == 8) 3358 && actual_format == 8)
… …
3361 3362
3362 XFree (value); 3363 XFree (value);
3363 } 3364 }
3364 else 3365 else
3365 { 3366 {
3366 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3367 char *eq = strchr (str, '=');
3367 3368
3368 if (eq) 3369 if (eq)
3369 { 3370 {
3370 *eq = 0; 3371 *eq = 0;
3371 set_utf8_property (display->atom (str), eq + 1); 3372 set_utf8_property (display->atom (str), eq + 1);
3372 } 3373 }
3373 else 3374 else
3374 XDeleteProperty (dpy, parent[0], 3375 XDeleteProperty (dpy, parent,
3375 display->atom (str)); 3376 display->atom (str));
3376 } 3377 }
3377 break; 3378 break;
3378 3379
3379 case XTerm_Color: 3380 case XTerm_Color:
… …
3392 *buf++ = '\0'; 3393 *buf++ = '\0';
3393 3394
3394 process_color_seq (op, color, name, resp); 3395 process_color_seq (op, color, name, resp);
3395 } 3396 }
3396 break; 3397 break;
3398 case Rxvt_restoreFG:
3397 case XTerm_Color00: 3399 case XTerm_Color00:
3398 process_color_seq (op, Color_fg, str, resp); 3400 process_color_seq (op, Color_fg, str, resp);
3399 break; 3401 break;
3402 case Rxvt_restoreBG:
3400 case XTerm_Color01: 3403 case XTerm_Color01:
3401 process_color_seq (op, Color_bg, str, resp); 3404 process_color_seq (op, Color_bg, str, resp);
3402 break; 3405 break;
3403#ifndef NO_CURSORCOLOR 3406#ifndef NO_CURSORCOLOR
3404 case XTerm_Color_cursor: 3407 case XTerm_Color_cursor:
… …
3409 process_color_seq (op, Color_pointer_fg, str, resp); 3412 process_color_seq (op, Color_pointer_fg, str, resp);
3410 break; 3413 break;
3411 case XTerm_Color_pointer_bg: 3414 case XTerm_Color_pointer_bg:
3412 process_color_seq (op, Color_pointer_bg, str, resp); 3415 process_color_seq (op, Color_pointer_bg, str, resp);
3413 break; 3416 break;
3417#ifdef OPTION_HC
3418 case XTerm_Color_HC:
3419 process_color_seq (op, Color_HC, str, resp);
3420 break;
3421 case XTerm_Color_HTC:
3422 process_color_seq (op, Color_HTC, str, resp);
3423 break;
3424#endif
3414#ifndef NO_BOLD_UNDERLINE_REVERSE 3425#ifndef NO_BOLD_UNDERLINE_REVERSE
3415 case XTerm_Color_RV:
3416 process_color_seq (op, Color_RV, str, resp);
3417 break;
3418 case Rxvt_Color_BD:
3419 case URxvt_Color_BD: 3426 case URxvt_Color_BD:
3420 process_color_seq (op, Color_BD, str, resp); 3427 process_color_seq (op, Color_BD, str, resp);
3421 break; 3428 break;
3422 case Rxvt_Color_UL:
3423 case URxvt_Color_UL: 3429 case URxvt_Color_UL:
3424 process_color_seq (op, Color_UL, str, resp); 3430 process_color_seq (op, Color_UL, str, resp);
3425 break; 3431 break;
3426 case URxvt_Color_IT: 3432 case URxvt_Color_IT:
3427 process_color_seq (op, Color_IT, str, resp); 3433 process_color_seq (op, Color_IT, str, resp);
3428 break; 3434 break;
3429#endif 3435#endif
3436 case URxvt_Color_border:
3437 process_color_seq (op, Color_border, str, resp);
3438 break;
3430#if ENABLE_TRANSPARENCY 3439#if ENABLE_TRANSPARENCY
3431 case URxvt_Color_tint: 3440 case URxvt_Color_tint:
3432 process_color_seq (op, Color_tint, str, resp); 3441 process_color_seq (op, Color_tint, str, resp);
3433 { 3442 {
3434 bool changed = false; 3443 bool changed = false;
3444
3435 if (ISSET_PIXCOLOR (Color_tint)) 3445 if (ISSET_PIXCOLOR (Color_tint))
3436 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3446 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3437 else 3447
3438 changed = bgPixmap.unset_tint ();
3439 if (changed) 3448 if (changed)
3440 bgPixmap.render (); 3449 update_background ();
3441 } 3450 }
3442 3451
3443 break; 3452 break;
3444#endif 3453#endif
3445 3454
3446#if XPM_BACKGROUND 3455#if BG_IMAGE_FROM_FILE
3447 case Rxvt_Pixmap: 3456 case Rxvt_Pixmap:
3448 if (!strcmp (str, "?")) 3457 if (!strcmp (str, "?"))
3449 { 3458 {
3450 char str[256]; 3459 char str[256];
3451 3460
3452 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3461 sprintf (str, "[%dx%d+%d+%d]",
3453 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3462 min (h_scale, 32767), min (v_scale, 32767),
3454 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3463 min (h_align, 32767), min (v_align, 32767));
3455 process_xterm_seq (XTerm_title, str, CHAR_ST); 3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3456 } 3465 }
3457 else 3466 else
3458 { 3467 {
3459 int changed = 0; 3468 int changed = 0;
3460 3469
3461 if (*str != ';') 3470 if (*str != ';')
3462 { 3471 {
3463 /* reset to default scaling :*/
3464 bgPixmap.unset_geometry ();
3465 if (bgPixmap.set_file (str)) /* change pixmap */ 3472 if (bg_set_file (str)) /* change pixmap */
3473 {
3466 changed++; 3474 changed++;
3467 str = strchr (str, ';'); 3475 str = strchr (str, ';');
3468 if (str == NULL) 3476 if (str == NULL)
3469 bgPixmap.set_defaultGeometry (); 3477 bg_set_default_geometry ();
3478 else
3479 bg_set_geometry (str+1);
3480 }
3470 } 3481 }
3471 while (str) 3482 else
3472 { 3483 {
3473 str++; 3484 str++;
3474 if (bgPixmap.set_geometry (str)) 3485 if (bg_set_geometry (str, true))
3475 changed++; 3486 changed++;
3476 str = strchr (str, ';');
3477 } 3487 }
3488
3478 if (changed) 3489 if (changed)
3479 { 3490 {
3480 bgPixmap.render (); 3491 if (bg_window_position_sensitive ())
3481 scr_touch (true); 3492 {
3493 int x, y;
3494 get_window_origin (x, y);
3495 bg_set_position (x, y);
3496 }
3497 update_background ();
3482 } 3498 }
3483 } 3499 }
3484 break; 3500 break;
3485#endif 3501#endif
3486
3487 case Rxvt_restoreFG:
3488 set_window_color (Color_fg, str);
3489 break;
3490 case Rxvt_restoreBG:
3491 set_window_color (Color_bg, str);
3492 break;
3493 3502
3494 case XTerm_logfile: 3503 case XTerm_logfile:
3495 // TODO, when secure mode? 3504 // TODO, when secure mode?
3496 break; 3505 break;
3497 3506
… …
3564 break; 3573 break;
3565#endif 3574#endif
3566 3575
3567#if ENABLE_PERL 3576#if ENABLE_PERL
3568 case URxvt_perl: 3577 case URxvt_perl:
3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3578 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3570 ; // no responses yet
3571 break; 3579 break;
3572#endif 3580#endif
3573 } 3581 }
3574} 3582}
3575/*----------------------------------------------------------------------*/ 3583/*----------------------------------------------------------------------*/
… …
3598 { 3606 {
3599 if (mode == 'r') 3607 if (mode == 'r')
3600 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3601 else 3609 else
3602 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3603 PrivMode (state, bit); 3611
3612 set_privmode (bit, state);
3604 } 3613 }
3605 3614
3606 return state; 3615 return state;
3607} 3616}
3608 3617
… …
3616 static const struct 3625 static const struct
3617 { 3626 {
3618 const int argval; 3627 const int argval;
3619 const unsigned long bit; 3628 const unsigned long bit;
3620 } argtopriv[] = { 3629 } argtopriv[] = {
3621 { 1, PrivMode_aplCUR }, 3630 { 1, PrivMode_aplCUR }, // DECCKM
3622 { 2, PrivMode_vt52 }, 3631 { 2, PrivMode_vt52 },
3623 { 3, PrivMode_132 }, 3632 { 3, PrivMode_132 }, // DECCOLM
3624 { 4, PrivMode_smoothScroll }, 3633 { 4, PrivMode_smoothScroll }, // DECSCLM
3625 { 5, PrivMode_rVideo }, 3634 { 5, PrivMode_rVideo }, // DECSCNM
3626 { 6, PrivMode_relOrigin }, 3635 { 6, PrivMode_relOrigin }, // DECOM
3627 { 7, PrivMode_Autowrap }, 3636 { 7, PrivMode_Autowrap }, // DECAWM
3628 // 8, bi-directional support mode 3637 // 8, auto-repeat keys // DECARM
3629 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3630 // 18, 19 printing-related 3639 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region
3631 { 25, PrivMode_VisibleCursor }, 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3632#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
3633 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
3634#endif 3644#endif
3635 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK
3636 { 40, PrivMode_132OK }, 3647 { 40, PrivMode_132OK },
3637 // 41 xterm more fixes NYI 3648 // 41 xterm more fixes NYI
3638 // 45 margin bell NYI 3649 // 45 margin bell NYI
3639 // 46 start logging 3650 // 46 start logging
3640 { 47, PrivMode_Screen }, 3651 { 47, PrivMode_Screen },
3641 { 66, PrivMode_aplKP }, 3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3642#ifndef NO_BACKSPACE_KEY 3653#ifndef NO_BACKSPACE_KEY
3643 { 67, PrivMode_BackSpace }, 3654 { 67, PrivMode_BackSpace }, // DECBKM
3644#endif 3655#endif
3645 { 1000, PrivMode_MouseX11 }, 3656 { 1000, PrivMode_MouseX11 },
3646 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3657 { 1002, PrivMode_MouseBtnEvent },
3647 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3658 { 1003, PrivMode_MouseAnyEvent },
3648 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3659#if ENABLE_FRILLS
3660 { 1005, PrivMode_ExtModeMouse },
3661#endif
3649 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3662 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3650 { 1011, PrivMode_Keypress }, // rxvt extension 3663 { 1011, PrivMode_Keypress }, // rxvt extension
3664#if ENABLE_FRILLS
3665 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3666#endif
3651 // 1035 enable modifiers for alt, numlock NYI 3667 // 1035 enable modifiers for alt, numlock NYI
3652 // 1036 send ESC for meta keys NYI 3668 // 1036 send ESC for meta keys NYI
3653 // 1037 send DEL for keypad delete NYI 3669 // 1037 send DEL for keypad delete NYI
3654 { 1047, PrivMode_Screen }, 3670 { 1047, PrivMode_Screen },
3655 // 1048 save and restore cursor 3671 // 1048 save and restore cursor, implemented in code
3656 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3672 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3657 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3673 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3674 { 2004, PrivMode_BracketPaste },
3658 }; 3675 };
3659 3676
3660 if (nargs == 0) 3677 if (nargs == 0)
3661 return; 3678 return;
3662 3679
… …
3669 for (i = 0; i < nargs; i++) 3686 for (i = 0; i < nargs; i++)
3670 { 3687 {
3671 state = -1; 3688 state = -1;
3672 3689
3673 /* basic handling */ 3690 /* basic handling */
3674 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3691 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3675 if (argtopriv[j].argval == arg[i]) 3692 if (argtopriv[j].argval == arg[i])
3676 { 3693 {
3677 state = privcases (mode, argtopriv[j].bit); 3694 state = privcases (mode, argtopriv[j].bit);
3678 break; 3695 break;
3679 } 3696 }
… …
3687 3704
3688 scr_touch (true); 3705 scr_touch (true);
3689 break; 3706 break;
3690#endif 3707#endif
3691 case 1048: /* alternative cursor save */ 3708 case 1048: /* alternative cursor save */
3692 case 1049:
3693 if (option (Opt_secondaryScreen)) 3709 if (option (Opt_secondaryScreen))
3694 if (mode == 0) 3710 if (mode == 0)
3695 scr_cursor (RESTORE); 3711 scr_cursor (RESTORE);
3696 else if (mode == 1) 3712 else if (mode == 1)
3697 scr_cursor (SAVE); 3713 scr_cursor (SAVE);
… …
3706 case 2: /* VT52 mode */ 3722 case 2: /* VT52 mode */
3707 /* oddball mode. should be set regardless of set/reset 3723 /* oddball mode. should be set regardless of set/reset
3708 * parameter. Return from VT52 mode with an ESC < from 3724 * parameter. Return from VT52 mode with an ESC < from
3709 * within VT52 mode 3725 * within VT52 mode
3710 */ 3726 */
3711 PrivMode (1, PrivMode_vt52); 3727 set_privmode (PrivMode_vt52, 1);
3712 break; 3728 break;
3713 case 3: /* 80/132 */ 3729 case 3: /* 80/132 */
3714 if (priv_modes & PrivMode_132OK) 3730 if (priv_modes & PrivMode_132OK)
3715 set_widthheight (((state ? 132 : 80) * fwidth), height); 3731 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3716 break; 3732 break;
3717 case 4: /* smooth scrolling */ 3733 case 4: /* smooth scrolling */
3718 set_option (Opt_jumpScroll, !state); 3734 set_option (Opt_jumpScroll, !state);
3719 break; 3735 break;
3720 case 5: /* reverse video */ 3736 case 5: /* reverse video */
… …
3727 scr_autowrap (state); 3743 scr_autowrap (state);
3728 break; 3744 break;
3729 /* case 8: - auto repeat, can't do on a per window basis */ 3745 /* case 8: - auto repeat, can't do on a per window basis */
3730 case 9: /* X10 mouse reporting */ 3746 case 9: /* X10 mouse reporting */
3731 if (state) /* orthogonal */ 3747 if (state) /* orthogonal */
3732 priv_modes &= ~PrivMode_MouseX11; 3748 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3733 break; 3749 break;
3734#ifdef scrollBar_esc 3750#ifdef scrollBar_esc
3735 case scrollBar_esc: 3751 case scrollBar_esc:
3736 if (scrollbar_mapping (state)) 3752 if (scrollBar.map (state))
3737 { 3753 {
3738 resize_all_windows (0, 0, 0); 3754 resize_all_windows (0, 0, 0);
3739 scr_touch (true); 3755 scr_touch (true);
3740 } 3756 }
3741 break; 3757 break;
… …
3750 break; 3766 break;
3751 /* case 66: - application key pad */ 3767 /* case 66: - application key pad */
3752 /* case 67: - backspace key */ 3768 /* case 67: - backspace key */
3753 case 1000: /* X11 mouse reporting */ 3769 case 1000: /* X11 mouse reporting */
3754 if (state) /* orthogonal */ 3770 if (state) /* orthogonal */
3755 priv_modes &= ~PrivMode_MouseX10; 3771 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3756 break; 3772 break;
3757#if 0
3758 case 1001: 3773 case 1002:
3759 break; /* X11 mouse highlighting */ 3774 case 1003:
3760#endif 3775 if (state)
3776 {
3777 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3778 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3779 mouse_row = mouse_col = 0;
3780 vt_emask_mouse = PointerMotionMask;
3781 }
3782 else
3783 vt_emask_mouse = NoEventMask;
3784
3785 vt_select_input ();
3786 break;
3761 case 1010: /* scroll to bottom on TTY output inhibit */ 3787 case 1010: /* scroll to bottom on TTY output inhibit */
3762 set_option (Opt_scrollTtyOutput, !state); 3788 set_option (Opt_scrollTtyOutput, !state);
3763 break; 3789 break;
3764 case 1011: /* scroll to bottom on key press */ 3790 case 1011: /* scroll to bottom on key press */
3765 set_option (Opt_scrollTtyKeypress, state); 3791 set_option (Opt_scrollTtyKeypress, state);
3766 break; 3792 break;
3767 case 1047: /* secondary screen w/ clearing last */ 3793 case 1047: /* secondary screen w/ clearing last */
3768 if (option (Opt_secondaryScreen)) 3794 if (option (Opt_secondaryScreen))
3769 if (current_screen != PRIMARY) 3795 if (!state)
3770 scr_erase_screen (2); 3796 scr_erase_screen (2);
3797
3771 scr_change_screen (state); 3798 scr_change_screen (state);
3772 break; 3799 break;
3773 case 1049: /* secondary screen w/ clearing first */ 3800 case 1049: /* secondary screen w/ clearing first */
3801 if (option (Opt_secondaryScreen))
3802 if (state)
3803 scr_cursor (SAVE);
3804
3774 scr_change_screen (state); 3805 scr_change_screen (state);
3806
3775 if (option (Opt_secondaryScreen)) 3807 if (option (Opt_secondaryScreen))
3776 if (current_screen != PRIMARY) 3808 if (state)
3777 scr_erase_screen (2); 3809 scr_erase_screen (2);
3810 else
3811 scr_cursor (RESTORE);
3778 break; 3812 break;
3779 default: 3813 default:
3780 break; 3814 break;
3781 } 3815 }
3782 } 3816 }
… …
3935 } 3969 }
3936 } 3970 }
3937} 3971}
3938/*}}} */ 3972/*}}} */
3939 3973
3940/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3941void
3942rxvt_term::process_graphics ()
3943{
3944 unicode_t ch, cmd = cmd_getc ();
3945
3946 if (cmd == 'Q')
3947 { /* query graphics */
3948 tt_printf ("\033G0\012"); /* no graphics */
3949 return;
3950 }
3951 /* swallow other graphics sequences until terminating ':' */
3952 do
3953 ch = cmd_getc ();
3954 while (ch != ':');
3955}
3956/*}}} */
3957
3958/* ------------------------------------------------------------------------- */ 3974/* ------------------------------------------------------------------------- */
3959 3975
3960/* 3976/*
3961 * Send printf () formatted output to the command. 3977 * Send printf () formatted output to the command.
3962 * Only use for small amounts of data. 3978 * Only use for small amounts of data.
… …
3975 3991
3976/* ---------------------------------------------------------------------- */ 3992/* ---------------------------------------------------------------------- */
3977/* Write data to the pty as typed by the user, pasted with the mouse, 3993/* Write data to the pty as typed by the user, pasted with the mouse,
3978 * or generated by us in response to a query ESC sequence. 3994 * or generated by us in response to a query ESC sequence.
3979 */ 3995 */
3980const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3996static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3981 3997
3982void 3998void
3983rxvt_term::tt_write (const char *data, unsigned int len) 3999rxvt_term::tt_write (const char *data, unsigned int len)
3984{ 4000{
3985 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4001 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3990 4006
3991 if (v_buflen == 0) 4007 if (v_buflen == 0)
3992 { 4008 {
3993 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4009 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3994 4010
4011 max_it (written, 0);
4012
3995 if ((unsigned int)written == len) 4013 if (written == len)
3996 return; 4014 return;
3997 4015
3998 data += written; 4016 data += written;
3999 len -= written; 4017 len -= written;
4000 } 4018 }
4001 4019
4002 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4020 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4003 4021
4004 memcpy (v_buffer + v_buflen, data, len); 4022 memcpy (v_buffer + v_buflen, data, len);
4005 v_buflen += len; 4023 v_buflen += len;
4006 4024
4007 pty_ev.set (EVENT_READ | EVENT_WRITE); 4025 pty_ev.set (ev::READ | ev::WRITE);
4008} 4026}
4009 4027
4010void rxvt_term::pty_write () 4028void rxvt_term::pty_write ()
4011{ 4029{
4012 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4030 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4017 4035
4018 if (v_buflen == 0) 4036 if (v_buflen == 0)
4019 { 4037 {
4020 free (v_buffer); 4038 free (v_buffer);
4021 v_buffer = 0; 4039 v_buffer = 0;
4022 v_buflen = 0;
4023 4040
4024 pty_ev.set (EVENT_READ); 4041 pty_ev.set (ev::READ);
4025 return; 4042 return;
4026 } 4043 }
4027 4044
4028 memmove (v_buffer, v_buffer + written, v_buflen); 4045 memmove (v_buffer, v_buffer + written, v_buflen);
4029 } 4046 }
4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4047 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4031 pty_ev.set (EVENT_READ); 4048 pty_ev.set (ev::READ);
4032} 4049}
4033 4050
4034/*----------------------- end-of-file (C source) -----------------------*/ 4051/*----------------------- end-of-file (C source) -----------------------*/
4035 4052

Diff Legend

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