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.353 by sasha, Wed Sep 12 19:51:41 2007 UTC vs.
Revision 1.485 by sf-exg, Fri Apr 29 13:08:24 2011 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
161 162
162void 163void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
196 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
200 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
201 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
202 207
203 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
205 210
206 if (y >= 0) 211 if (y >= 0)
207 { 212 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 214 x = 0;
210 } 215 }
211 216
212 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
213 218
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 220
216 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
217 { 222 {
… …
220 ch = *chr++; 225 ch = *chr++;
221 226
222 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
225# if !UNICODE3 230# if !UNICODE_3
226 if (ch >= 0x10000) 231 if (ch >= 0x10000)
227 ch = 0xfffd; 232 ch = 0xfffd;
228# endif 233# endif
229 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
230 235
… …
236// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
239// } 244// }
240 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
241 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
242
243 free (fname); 249 free (fname[i]);
250 }
244 251
245# if ENABLE_COMBINING 252# if ENABLE_COMBINING
246 if (alloc) 253 if (alloc)
247 delete [] alloc; 254 delete [] alloc;
248# endif 255# endif
… …
278 } 285 }
279 286
280 iso14755buf = 0; 287 iso14755buf = 0;
281} 288}
282 289
283int 290static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
285{ 292{
286 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
289 { 296 {
290 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
291 298
… …
297 304
298 return -1; 305 return -1;
299} 306}
300#endif 307#endif
301 308
309static inline KeySym
310translate_keypad (KeySym keysym, bool kp)
311{
312#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin
328 };
329
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
331 {
332 unsigned int index = keysym - XK_KP_Home;
333 keysym = kp ? keypadtrans[index] : XK_Home + index;
334 }
335 else if (keysym == XK_KP_Insert)
336 keysym = kp ? XK_KP_0 : XK_Insert;
337# ifndef NO_DELETE_KEY
338 else if (keysym == XK_KP_Delete)
339 keysym = kp ? XK_KP_Decimal : XK_Delete;
340# endif
341#endif
342 return keysym;
343}
344
345static inline int
346map_function_key (KeySym keysym)
347{
348 int param = 0;
349
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
351 {
352 param = 11 + keysym - XK_F1;
353 if (keysym >= XK_F17)
354 param += 4;
355 else if (keysym >= XK_F15)
356 param += 3;
357 else if (keysym >= XK_F11)
358 param += 2;
359 else if (keysym >= XK_F6)
360 param += 1;
361 }
362 else
363 switch (keysym)
364 {
365 case XK_Find:
366 param = 1;
367 break;
368 case XK_Insert:
369 param = 2;
370 break;
371#ifdef DXK_Remove
372 case DXK_Remove:
373#endif
374 case XK_Execute:
375 param = 3;
376 break;
377 case XK_Select:
378 param = 4;
379 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior:
382 param = 5;
383 break;
384 case XK_Next:
385 param = 6;
386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
393#endif
394 case XK_Help:
395 param = 28;
396 break;
397 case XK_Menu:
398 param = 29;
399 break;
400 }
401 return param;
402}
403
302void 404void
303rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
304{ 406{
305 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 408 KeySym keysym;
308 int valid_keysym; 409 int valid_keysym;
309 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
310 411
311#if ISO_14755 412#if ISO_14755
… …
320 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
321 */ 422 */
322 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
325
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331 426
332 kbuf[0] = 0; 427 kbuf[0] = 0;
333 428
334#ifdef USE_XIM 429#ifdef USE_XIM
335 if (Input_Context) 430 if (Input_Context)
… …
410#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 507#else
413 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
414#endif 509#endif
510 max_it (lnsppg, 1);
511
415 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
416 { 513 {
417 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
418 return; 515 return;
419 } 516 }
… …
472 selection_request (ev.time); 569 selection_request (ev.time);
473 return; 570 return;
474#if TODO 571#if TODO
475 /* rxvt extras */ 572 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 573 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 574 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 575 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 576 return;
482#endif 577#endif
483 } 578 }
484 } 579 }
485 } 580 }
486 581
487#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 583 // ISO 14755 support
489 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 585 {
491 int hv; 586 int hv;
492 587
493 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 619 scr_overlay_off ();
525# endif 620# endif
526 iso14755buf = 0; 621 iso14755buf = 0;
527 } 622 }
528 } 623 }
624 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
532 { 628 {
533 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 630# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 642 }
547#endif 643#endif
548 644
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 646 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1;
649
650 if (ev.state & ModNumLockMask)
651 kp = false;
652
653 keysym = translate_keypad (keysym, kp);
654
655 switch (keysym)
551 { 656 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 657#ifndef NO_BACKSPACE_KEY
658 case XK_BackSpace:
659 if (priv_modes & PrivMode_HaveBackSpace)
660 {
661 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
662 ^ !!ctrl) ? '\b' : '\177';
663 kbuf[1] = '\0';
664 }
665 else
666 strcpy (kbuf, rs[Rs_backspace_key]);
667 break;
668#endif
669#ifndef NO_DELETE_KEY
670 case XK_Delete:
671 strcpy (kbuf, rs[Rs_delete_key]);
672 break;
673#endif
674 case XK_Tab:
675 if (shft)
676 strcpy (kbuf, "\033[Z");
677 else
678 {
679#ifdef CTRL_TAB_MAKES_META
680 if (ctrl)
681 meta = 1;
682#endif
683#ifdef MOD4_TAB_MAKES_META
684 if (ev.state & Mod4Mask)
685 meta = 1;
686#endif
553 newlen = 1; 687 newlen = 0;
554 switch (keysym) 688 }
689 break;
690
691 case XK_Up: /* "\033[A" */
692 case XK_Down: /* "\033[B" */
693 case XK_Right: /* "\033[C" */
694 case XK_Left: /* "\033[D" */
695 strcpy (kbuf, "\033[Z");
696 kbuf[2] = "DACB"[keysym - XK_Left];
697 /* do Shift first */
698 if (shft)
699 kbuf[2] = "dacb"[keysym - XK_Left];
700 else if (ctrl)
701 {
702 kbuf[1] = 'O';
703 kbuf[2] = "dacb"[keysym - XK_Left];
704 }
705 else if (priv_modes & PrivMode_aplCUR)
706 kbuf[1] = 'O';
707 break;
708
709 case XK_KP_Enter:
710 /* allow shift to override */
711 if (kp)
712 {
713 strcpy (kbuf, "\033OM");
714 break;
715 }
716
717 /* FALLTHROUGH */
718
719 case XK_Return:
720 if (priv_modes & PrivMode_LFNL)
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\012';
724 kbuf[2] = '\0';
725 }
726 else
727 {
728 kbuf[0] = '\015';
729 kbuf[1] = '\0';
730 }
731 break;
732
733 case XK_KP_F1: /* "\033OP" */
734 case XK_KP_F2: /* "\033OQ" */
735 case XK_KP_F3: /* "\033OR" */
736 case XK_KP_F4: /* "\033OS" */
737 strcpy (kbuf, "\033OP");
738 kbuf[2] += (keysym - XK_KP_F1);
739 break;
740
741 case XK_KP_Multiply: /* "\033Oj" : "*" */
742 case XK_KP_Add: /* "\033Ok" : "+" */
743 case XK_KP_Separator: /* "\033Ol" : "," */
744 case XK_KP_Subtract: /* "\033Om" : "-" */
745 case XK_KP_Decimal: /* "\033On" : "." */
746 case XK_KP_Divide: /* "\033Oo" : "/" */
747 case XK_KP_0: /* "\033Op" : "0" */
748 case XK_KP_1: /* "\033Oq" : "1" */
749 case XK_KP_2: /* "\033Or" : "2" */
750 case XK_KP_3: /* "\033Os" : "3" */
751 case XK_KP_4: /* "\033Ot" : "4" */
752 case XK_KP_5: /* "\033Ou" : "5" */
753 case XK_KP_6: /* "\033Ov" : "6" */
754 case XK_KP_7: /* "\033Ow" : "7" */
755 case XK_KP_8: /* "\033Ox" : "8" */
756 case XK_KP_9: /* "\033Oy" : "9" */
757 /* allow shift to override */
758 if (kp)
759 {
760 strcpy (kbuf, "\033Oj");
761 kbuf[2] += (keysym - XK_KP_Multiply);
762 }
763 else
764 {
765 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
766 kbuf[1] = '\0';
767 }
768 break;
769
770 default:
555 { 771 {
556#ifndef NO_BACKSPACE_KEY 772 int param = map_function_key (keysym);
557 case XK_BackSpace: 773 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace) 774 sprintf (kbuf,"\033[%d~", param);
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else 775 else
565 strcpy (kbuf, rs[Rs_backspace_key]);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, rs[Rs_delete_key]);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if (kp)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if (kp)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if (kp)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if (kp)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if (kp)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if (kp)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0; 776 newlen = 0;
840 break;
841 } 777 }
842 778 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 779 }
780
781 if (newlen)
782 len = strlen (kbuf);
846 783
847 /* 784 /*
848 * Pass meta for all function keys, if 'meta' option set 785 * Pass meta for all function keys, if 'meta' option set
849 */ 786 */
850#ifdef META8_OPTION 787#ifdef META8_OPTION
… …
950 commit_iso14755 (); 887 commit_iso14755 ();
951 888
952 return; 889 return;
953 } 890 }
954 891
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 892 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 893 if (i[0] == keysym)
957 { 894 {
958 iso14755buf = ISO_14755_51 | i[1]; 895 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 896 commit_iso14755 ();
960 897
… …
997 else if (keysym == XK_Control_L || keysym == XK_Control_R) 934 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0; 935 mouse_slip_wheel_speed = 0;
999#endif 936#endif
1000} 937}
1001 938
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 939void
1036rxvt_term::flush () 940rxvt_term::flush ()
1037{ 941{
1038 flush_ev.stop (); 942 flush_ev.stop ();
943
944#ifdef HAVE_BG_PIXMAP
945 if (bg_flags & BG_NEEDS_REFRESH)
946 {
947 bg_flags &= ~BG_NEEDS_REFRESH;
948 scr_touch (false);
949 }
950#endif
1039 951
1040 if (want_refresh) 952 if (want_refresh)
1041 { 953 {
1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 954 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043 { 955 {
… …
1076 } 988 }
1077 while (row < end_row); 989 while (row < end_row);
1078 } 990 }
1079 991
1080 scr_refresh (); 992 scr_refresh ();
1081 scrollbar_show (1); 993 scrollBar.show (1);
1082#ifdef USE_XIM 994#ifdef USE_XIM
1083 IMSendSpot (); 995 IMSendSpot ();
1084#endif 996#endif
1085 } 997 }
1086 998
1087 display->flush (); 999 display->flush ();
1088} 1000}
1089 1001
1002/* checks whether a refresh is requested and starts the refresh timer */
1090void 1003void
1091rxvt_term::check_cb (check_watcher &w) 1004rxvt_term::refresh_check ()
1092{ 1005{
1093 make_current (); 1006 if (want_refresh && !flush_ev.is_active ())
1007 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1094 1008
1095 display->flush (); 1009 display->flush ();
1096
1097 if (want_refresh && !flush_ev.active)
1098 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1099} 1010}
1100 1011
1101void 1012void
1102rxvt_term::flush_cb (time_watcher &w) 1013rxvt_term::flush_cb (ev::timer &w, int revents)
1103{ 1014{
1104 make_current (); 1015 make_current ();
1105 1016
1106 refresh_count = 0; 1017 refresh_count = 0;
1107 flush (); 1018 flush ();
1108} 1019}
1109 1020
1110#ifdef CURSOR_BLINK 1021#ifdef CURSOR_BLINK
1111void 1022void
1112rxvt_term::cursor_blink_cb (time_watcher &w) 1023rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1113{ 1024{
1114 hidden_cursor = !hidden_cursor; 1025 hidden_cursor = !hidden_cursor;
1115 want_refresh = 1; 1026 want_refresh = 1;
1116 1027 refresh_check ();
1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
1118} 1028}
1119#endif 1029#endif
1120 1030
1121#ifdef TEXT_BLINK 1031#ifdef TEXT_BLINK
1122void 1032void
1123rxvt_term::text_blink_cb (time_watcher &w) 1033rxvt_term::text_blink_cb (ev::timer &w, int revents)
1124{ 1034{
1125 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1035 if (scr_refresh_rend (RS_Blink, RS_Blink))
1126 { 1036 {
1127 hidden_text = !hidden_text; 1037 hidden_text = !hidden_text;
1128 want_refresh = 1; 1038 want_refresh = 1;
1129 w.start (w.at + TEXT_BLINK_INTERVAL); 1039 refresh_check ();
1130 } 1040 }
1041 else
1042 w.stop ();
1131} 1043}
1132#endif 1044#endif
1133 1045
1134#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1046#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1135void 1047void
1136rxvt_term::cont_scroll_cb (time_watcher &w) 1048rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1137{ 1049{
1138 if ((scrollbar_isUp() || scrollbar_isDn()) && 1050 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1139 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1051 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1140 { 1052 {
1141 want_refresh = 1; 1053 want_refresh = 1;
1142 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1054 refresh_check ();
1143 } 1055 }
1056 else
1057 w.stop ();
1144} 1058}
1145#endif 1059#endif
1146 1060
1147#ifdef SELECTION_SCROLLING 1061#ifdef SELECTION_SCROLLING
1148void 1062void
1149rxvt_term::sel_scroll_cb (time_watcher &w) 1063rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1150{ 1064{
1151 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1065 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1152 { 1066 {
1153 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1067 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1154 want_refresh = 1; 1068 want_refresh = 1;
1155 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1069 refresh_check ();
1156 } 1070 }
1071 else
1072 w.stop ();
1157} 1073}
1158#endif 1074#endif
1159 1075
1160#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1161void 1077void
1162rxvt_term::slip_wheel_cb (time_watcher &w) 1078rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1163{ 1079{
1164 if (mouse_slip_wheel_speed == 0 1080 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1165 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1166 : scr_page (UP, mouse_slip_wheel_speed))
1167 { 1081 {
1168 if (view_start == top_row || view_start == 0)
1169 mouse_slip_wheel_speed = 0;
1170
1171 want_refresh = 1; 1082 want_refresh = 1;
1172 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1083 refresh_check ();
1084 }
1085
1086 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1087 {
1088 mouse_slip_wheel_speed = 0;
1089 w.stop ();
1173 } 1090 }
1174} 1091}
1175#endif 1092#endif
1176 1093
1177#if LINUX_YIELD_HACK 1094#if LINUX_YIELD_HACK
1178static struct event_handler 1095static struct event_handler
1179{ 1096{
1180 check_watcher yield_ev; 1097 ev::prepare yield_ev;
1181 1098
1182 void yield_cb (check_watcher &w) 1099 void yield_cb (ev::prepare &w, int revents)
1183 { 1100 {
1184 // this should really be sched_yield(), but the linux guys thought 1101 // this should really be sched_yield(), but the linux guys thought
1185 // that giving a process calling sched_yield () less cpu time than 1102 // that giving a process calling sched_yield () less cpu time than
1186 // ones with high nice levels is a useful thing to do. It surely is is 1103 // ones with high nice levels is a useful thing to do. It surely is is
1187 // allowed by the sus... as is returning ENOSYS. 1104 // allowed by the sus... as is returning ENOSYS.
1105 // since the linux guys additionally thought that breaking the only
1106 // known workaround against their unusable sched_yield hack is cool,
1107 // we just nanosleep a bit and hope for the best.
1188 1108
1189 struct timespec ts = { 0, 0 }; 1109 struct timespec ts = { 0, 1000 };
1190 nanosleep (&ts, 0); 1110 nanosleep (&ts, 0);
1191 1111
1192 w.stop (); 1112 w.stop ();
1193 } 1113 }
1194 1114
… …
1197 { 1117 {
1198 } 1118 }
1199} event_handler; 1119} event_handler;
1200#endif 1120#endif
1201 1121
1122/* make sure all the cmd data is at beginning of cmdbuf */
1123void
1124rxvt_term::cmdbuf_reify ()
1125{
1126 if (cmdbuf_ptr == cmdbuf_base)
1127 return;
1128
1129 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1130
1131 memmove (cmdbuf_base, cmdbuf_ptr, used);
1132 cmdbuf_ptr = cmdbuf_base;
1133 cmdbuf_endp = cmdbuf_ptr + used;
1134
1135}
1136
1137#if defined (KEYSYM_RESOURCE)
1138void
1139rxvt_term::cmdbuf_append (const char *str, size_t count)
1140{
1141 cmdbuf_reify ();
1142
1143 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1144
1145 if (count > avail)
1146 return;
1147
1148 memcpy (cmdbuf_endp, str, count);
1149 cmdbuf_endp += count;
1150
1151 cmd_parse ();
1152}
1153#endif
1154
1202bool 1155bool
1203rxvt_term::pty_fill () 1156rxvt_term::pty_fill ()
1204{ 1157{
1205 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1158 cmdbuf_reify ();
1206 1159
1207 if (CBUFSIZ == n) 1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1208 { 1161
1209 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1162 if (!avail)
1210 n = 0;
1211 } 1163 {
1212 1164 // normally this indicates a "too long" command sequence - just drop the data we have
1213 memmove (cmdbuf_base, cmdbuf_ptr, n);
1214 cmdbuf_ptr = cmdbuf_base; 1165 cmdbuf_ptr = cmdbuf_base;
1215 cmdbuf_endp = cmdbuf_ptr + n; 1166 cmdbuf_endp = cmdbuf_ptr;
1167 avail = CBUFSIZ;
1168 }
1216 1169
1217 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1218 1171
1219 if (r > 0) 1172 if (r > 0)
1220 { 1173 {
1221 cmdbuf_endp += r; 1174 cmdbuf_endp += r;
1222 return true; 1175 return true;
… …
1238 1191
1239 return false; 1192 return false;
1240} 1193}
1241 1194
1242void 1195void
1243rxvt_term::pty_cb (io_watcher &w, short revents) 1196rxvt_term::pty_cb (ev::io &w, int revents)
1244{ 1197{
1245 make_current (); 1198 make_current ();
1246 1199
1247 if (revents & EVENT_READ) 1200 if (revents & ev::READ)
1248 // loop, but don't allow a single term to monopolize us 1201 // loop, but don't allow a single term to monopolize us
1249 while (pty_fill ()) 1202 for (int i = CBUFCNT; i-- && pty_fill (); )
1250 if (cmd_parse ()) 1203 cmd_parse ();
1251 break;
1252 1204
1253 if (revents & EVENT_WRITE) 1205 if (revents & ev::WRITE)
1254 pty_write (); 1206 pty_write ();
1207
1208 refresh_check ();
1255} 1209}
1256 1210
1257void 1211void
1258rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
1259{ 1213{
… …
1262 1216
1263#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1264 hidden_pointer = 0; 1218 hidden_pointer = 0;
1265 1219
1266 if (option (Opt_pointerBlank)) 1220 if (option (Opt_pointerBlank))
1267 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1268#endif 1222#endif
1269} 1223}
1270 1224
1271#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1272void 1226void
… …
1280 1234
1281 hidden_pointer = 1; 1235 hidden_pointer = 1;
1282} 1236}
1283 1237
1284void 1238void
1285rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1286{ 1240{
1287 make_current (); 1241 make_current ();
1288 1242
1289 pointer_blank (); 1243 pointer_blank ();
1290} 1244}
… …
1293void 1247void
1294rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
1295{ 1249{
1296 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1297 int x, y; 1251 int x, y;
1252 int code = 32;
1298 1253
1299 x = ev.x; 1254 x = Pixel2Col (ev.x) + 1;
1300 y = ev.y; 1255 y = Pixel2Row (ev.y) + 1;
1301 pixel_position (&x, &y); 1256
1257 if (ev.type == MotionNotify)
1258 {
1259 if (x == mouse_row && y == mouse_col)
1260 return;
1261
1262 mouse_row = x;
1263 mouse_col = y;
1264 code += 32;
1265 }
1302 1266
1303 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1304 button_number = 3; 1268 button_number = 3;
1305 else 1269 else
1306 { 1270 {
1307 button_number = MEvent.button - Button1; 1271 button_number = MEvent.button - Button1;
1308 /* add 0x3D for wheel events, like xterm does */ 1272 /* add 0x3D for wheel events, like xterm does */
1309 if (button_number >= 3) 1273 if (button_number >= 3)
1310 button_number += (64 - 3); 1274 button_number += 64 - 3;
1311 } 1275 }
1312 1276
1313 if (priv_modes & PrivMode_MouseX10) 1277 if (priv_modes & PrivMode_MouseX10)
1314 { 1278 {
1315 /* 1279 /*
… …
1347 fputc ('A', stderr); 1311 fputc ('A', stderr);
1348 if (key_state & 32) 1312 if (key_state & 32)
1349 fputc ('2', stderr); 1313 fputc ('2', stderr);
1350 fprintf (stderr, "]: <%d>, %d/%d\n", 1314 fprintf (stderr, "]: <%d>, %d/%d\n",
1351 button_number, 1315 button_number,
1352 x + 1, 1316 x,
1353 y + 1); 1317 y);
1354#endif 1318#endif
1355 1319
1320#if ENABLE_FRILLS
1321 if (priv_modes & PrivMode_ExtMouseRight)
1322 tt_printf ("\033[%d;%d;%dM",
1323 code + button_number + key_state,
1324 x,
1325 y);
1326 else if (priv_modes & PrivMode_ExtModeMouse)
1327 tt_printf ("\033[M%c%lc%lc",
1328 code + button_number + key_state,
1329 wint_t (32 + x),
1330 wint_t (32 + y));
1331 else
1332#endif
1356 tt_printf ("\033[M%c%c%c", 1333 tt_printf ("\033[M%c%c%c",
1357 (32 + button_number + key_state), 1334 code + button_number + key_state,
1358 (32 + x + 1), 1335 32 + x,
1359 (32 + y + 1)); 1336 32 + y);
1360} 1337}
1361 1338
1362/*{{{ process an X event */ 1339/*{{{ process an X event */
1363void 1340void
1364rxvt_term::x_cb (XEvent &ev) 1341rxvt_term::x_cb (XEvent &ev)
… …
1466 && ev.xfocus.mode != NotifyGrab) 1443 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1444 focus_out ();
1468 break; 1445 break;
1469 1446
1470 case ConfigureNotify: 1447 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/
1474 if (ev.xconfigure.window == parent[0]) 1448 if (ev.xconfigure.window == parent)
1475 { 1449 {
1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1477 ; 1451 ;
1452
1453#ifdef HAVE_BG_PIXMAP
1454 bool moved = false;
1455 if (bg_window_position_sensitive ())
1456 {
1457 int x, y;
1458 if (ev.xconfigure.send_event)
1459 {
1460 x = ev.xconfigure.x;
1461 y = ev.xconfigure.y;
1462 }
1463 else
1464 get_window_origin (x, y);
1465
1466 if (bg_set_position (x, y)
1467 || !(bg_flags & BG_IS_VALID))
1468 moved = true;
1469 }
1470#endif
1478 1471
1479 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1472 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1480 { 1473 {
1481 seen_resize = 1; 1474 seen_resize = 1;
1482 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1475 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1483 } 1476 }
1484 else 1477 else
1485 { 1478 {
1486#ifdef HAVE_BG_PIXMAP 1479#ifdef HAVE_BG_PIXMAP
1487 if (bgPixmap.window_position_sensitive ()) 1480 if (moved)
1481 {
1482 if (mapped)
1488 update_background (); 1483 update_background ();
1484 else
1485 bg_invalidate ();
1486 }
1489#endif 1487#endif
1490 } 1488 }
1489
1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1492 } 1491 }
1493 break; 1492 break;
1494 1493
1495 case PropertyNotify: 1494 case PropertyNotify:
1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1495 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1498 && ev.xproperty.state == PropertyNewValue)
1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1500
1501 break; 1496 break;
1502 1497
1503 case SelectionClear: 1498 case SelectionClear:
1504 selection_clear (); 1499 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1505 break;
1506
1507 case SelectionNotify:
1508 if (selection_wait == Sel_normal)
1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1510 break; 1500 break;
1511 1501
1512 case SelectionRequest: 1502 case SelectionRequest:
1513 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1514 break; 1504 break;
1515 1505
1516 case MapNotify: 1506 case MapNotify:
1507#ifdef HAVE_BG_PIXMAP
1508 /* This is needed specifically to fix the case of no window manager or a
1509 * non-reparenting window manager. In those cases we never get first
1510 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1511 * care of multiplicity of ConfigureNotify events arriving while WM does
1512 * reparenting.
1513 * We should not render background immediately, as there could be several
1514 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1515 * by scheduling background redraw as soon as we can, but giving a short
1516 * bit of time for ConfigureNotifies to arrive.
1517 * We should render background PRIOR to drawing any text, but AFTER all
1518 * of ConfigureNotifys for the best results.
1519 */
1520 if (!(bg_flags & BG_IS_VALID))
1521 update_background_ev.start (0.025);
1522#endif
1517 mapped = 1; 1523 mapped = 1;
1518#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1525 text_blink_ev.start ();
1520#endif 1526#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break; 1528 break;
1523 1529
1524 case UnmapNotify: 1530 case UnmapNotify:
… …
1532 case GraphicsExpose: 1538 case GraphicsExpose:
1533 case Expose: 1539 case Expose:
1534 if (ev.xany.window == vt) 1540 if (ev.xany.window == vt)
1535 { 1541 {
1536 do 1542 do
1543 {
1537 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1538 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, false);
1546 }
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540 1548
1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542 1550
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1552 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1555 }
1546 1556
1547 want_refresh = 1; 1557 want_refresh = 1;
1548 } 1558 }
1549 else 1559 else
1550 { 1560 {
… …
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1554 ; 1564 ;
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1556 ; 1566 ;
1557 1567
1558 if (isScrollbarWindow (ev.xany.window)) 1568 if (scrollBar.state && ev.xany.window == scrollBar.win)
1559 { 1569 {
1560 scrollBar.setIdle (); 1570 scrollBar.state = STATE_IDLE;
1561 scrollbar_show (0); 1571 scrollBar.show (0);
1562 } 1572 }
1563 } 1573 }
1564 break; 1574 break;
1565 1575
1566 case MotionNotify: 1576 case MotionNotify:
1567#ifdef POINTER_BLANK 1577#ifdef POINTER_BLANK
1568 if (hidden_pointer) 1578 if (hidden_pointer)
1569 pointer_unblank (); 1579 pointer_unblank ();
1570#endif 1580#endif
1581 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1582 || priv_modes & PrivMode_MouseAnyEvent)
1583 mouse_report (ev.xbutton);
1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1572 break; 1585 break;
1573 1586
1574 if (ev.xany.window == vt) 1587 if (ev.xany.window == vt)
1575 { 1588 {
… …
1609 int dist; 1622 int dist;
1610 1623
1611 /* don't clobber the current delay if we are 1624 /* don't clobber the current delay if we are
1612 * already in the middle of scrolling. 1625 * already in the middle of scrolling.
1613 */ 1626 */
1614 if (!sel_scroll_ev.active) 1627 if (!sel_scroll_ev.is_active ())
1615 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1628 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1616 1629
1617 /* save the event params so we can highlight 1630 /* save the event params so we can highlight
1618 * the selection in the pending-scroll loop 1631 * the selection in the pending-scroll loop
1619 */ 1632 */
1620 selection_save_x = ev.xbutton.x; 1633 selection_save_x = ev.xbutton.x;
… …
1642 else 1655 else
1643 { 1656 {
1644 /* we are within the text window, so we 1657 /* we are within the text window, so we
1645 * shouldn't be scrolling 1658 * shouldn't be scrolling
1646 */ 1659 */
1647 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 1660 sel_scroll_ev.stop();
1649 } 1661 }
1650#endif 1662#endif
1651#ifdef MOUSE_THRESHOLD 1663#ifdef MOUSE_THRESHOLD
1652 } 1664 }
1653#endif 1665#endif
1654 } 1666 }
1655 } 1667 }
1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1668 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1669 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1671 MotionNotify, &ev))
1660 ; 1672 ;
1661 1673
… …
1663 &unused_root, &unused_child, 1675 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1677 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1678 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1680 scrollBar.size ());
1669 want_refresh = 1; 1681 want_refresh = 1;
1670 scrollbar_show (1); 1682 scrollBar.show (1);
1671 } 1683 }
1672 break; 1684 break;
1673 } 1685 }
1674 1686
1675#if defined(CURSOR_BLINK) 1687#if defined(CURSOR_BLINK)
… …
1679 { 1691 {
1680 hidden_cursor = 0; 1692 hidden_cursor = 0;
1681 want_refresh = 1; 1693 want_refresh = 1;
1682 } 1694 }
1683 1695
1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1696 cursor_blink_ev.again ();
1685 } 1697 }
1686#endif 1698#endif
1687 1699
1688#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1696 1708
1697 if (ev.type == KeyPress && hidden_pointer == 0) 1709 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank (); 1710 pointer_blank ();
1699 } 1711 }
1700#endif 1712#endif
1713
1714 refresh_check ();
1701} 1715}
1716
1717#if ENABLE_FRILLS
1718void
1719rxvt_term::set_urgency (bool enable)
1720{
1721 if (enable == urgency_hint)
1722 return;
1723
1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1725 {
1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727 XSetWMHints (dpy, parent, h);
1728 urgency_hint = enable;
1729 }
1730}
1731#endif
1702 1732
1703void 1733void
1704rxvt_term::focus_in () 1734rxvt_term::focus_in ()
1705{ 1735{
1706 if (!focus) 1736 if (!focus)
1707 { 1737 {
1708 focus = 1; 1738 focus = 1;
1709 want_refresh = 1; 1739 want_refresh = 1;
1710 1740
1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1712
1713#if USE_XIM 1741#if USE_XIM
1714 if (Input_Context != NULL) 1742 if (Input_Context != NULL)
1715 { 1743 {
1716 IMSetPosition (); 1744 IMSetPosition ();
1717 XSetICFocus (Input_Context); 1745 XSetICFocus (Input_Context);
1718 } 1746 }
1719#endif 1747#endif
1720#if CURSOR_BLINK 1748#if CURSOR_BLINK
1721 if (option (Opt_cursorBlink)) 1749 if (option (Opt_cursorBlink))
1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1750 cursor_blink_ev.again ();
1723#endif 1751#endif
1724#if OFF_FOCUS_FADING 1752#if OFF_FOCUS_FADING
1725 if (rs[Rs_fade]) 1753 if (rs[Rs_fade])
1726 { 1754 {
1727 pix_colors = pix_colors_focused; 1755 pix_colors = pix_colors_focused;
1728 scr_recolour (); 1756 scr_recolour ();
1729 } 1757 }
1730#endif 1758#endif
1731#if ENABLE_FRILLS 1759#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell)) 1760 if (option (Opt_urgentOnBell))
1733 { 1761 set_urgency (0);
1734 XWMHints *h;
1735
1736 h = XGetWMHints(dpy, parent[0]);
1737 if (h != NULL)
1738 {
1739 h->flags &= ~XUrgencyHint;
1740 XSetWMHints(dpy, parent[0], h);
1741 }
1742 }
1743#endif 1762#endif
1763
1764 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1744 } 1765 }
1745} 1766}
1746 1767
1747void 1768void
1748rxvt_term::focus_out () 1769rxvt_term::focus_out ()
… …
1750 if (focus) 1771 if (focus)
1751 { 1772 {
1752 focus = 0; 1773 focus = 0;
1753 want_refresh = 1; 1774 want_refresh = 1;
1754 1775
1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1776#if ENABLE_FRILLS
1756 1777 if (option (Opt_urgentOnBell))
1778 set_urgency (0);
1779#endif
1757#if ENABLE_FRILLS || ISO_14755 1780#if ENABLE_FRILLS || ISO_14755
1758 if (iso14755buf) 1781 if (iso14755buf)
1759 { 1782 {
1760 iso14755buf = 0; 1783 iso14755buf = 0;
1761# if ISO_14755 1784# if ISO_14755
… …
1768 XUnsetICFocus (Input_Context); 1791 XUnsetICFocus (Input_Context);
1769#endif 1792#endif
1770#if CURSOR_BLINK 1793#if CURSOR_BLINK
1771 if (option (Opt_cursorBlink)) 1794 if (option (Opt_cursorBlink))
1772 cursor_blink_ev.stop (); 1795 cursor_blink_ev.stop ();
1796
1773 hidden_cursor = 0; 1797 hidden_cursor = 0;
1774#endif 1798#endif
1775#if OFF_FOCUS_FADING 1799#if OFF_FOCUS_FADING
1776 if (rs[Rs_fade]) 1800 if (rs[Rs_fade])
1777 { 1801 {
1778 pix_colors = pix_colors_unfocused; 1802 pix_colors = pix_colors_unfocused;
1779 scr_recolour (); 1803 scr_recolour ();
1780 } 1804 }
1781#endif 1805#endif
1806
1807 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1782 } 1808 }
1783} 1809}
1784 1810
1785void 1811void
1786rxvt_term::update_fade_color (unsigned int idx) 1812rxvt_term::update_fade_color (unsigned int idx)
… …
1814 * use the property to determine the pixmap. We use it later on. 1840 * use the property to determine the pixmap. We use it later on.
1815 */ 1841 */
1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1842 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1843 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1818 { 1844 {
1819 bgPixmap.set_root_pixmap (); 1845 bg_set_root_pixmap ();
1820 update_background (); 1846 update_background ();
1821 } 1847 }
1848
1822 break; 1849 break;
1823 } 1850 }
1824# endif 1851# endif
1852
1853 refresh_check ();
1825} 1854}
1826#endif 1855#endif
1827 1856
1828void 1857void
1829rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
… …
1860 /* save the xbutton state (for ButtonRelease) */ 1889 /* save the xbutton state (for ButtonRelease) */
1861 MEvent.state = ev.state; 1890 MEvent.state = ev.state;
1862#ifdef MOUSE_REPORT_DOUBLECLICK 1891#ifdef MOUSE_REPORT_DOUBLECLICK
1863 if (ev.button == MEvent.button && clickintime) 1892 if (ev.button == MEvent.button && clickintime)
1864 { 1893 {
1865 /* same button, within alloted time */ 1894 /* same button, within allowed time */
1866 MEvent.clicks++; 1895 MEvent.clicks++;
1867 1896
1868 if (MEvent.clicks > 1) 1897 if (MEvent.clicks > 1)
1869 { 1898 {
1870 /* only report double clicks */ 1899 /* only report double clicks */
… …
1884 mouse_report (ev); 1913 mouse_report (ev);
1885 } 1914 }
1886#else 1915#else
1887 MEvent.button = ev.button; 1916 MEvent.button = ev.button;
1888 mouse_report (ev); 1917 mouse_report (ev);
1889#endif /* MOUSE_REPORT_DOUBLECLICK */ 1918#endif /* MOUSE_REPORT_DOUBLECLICK */
1890 1919
1891 } 1920 }
1892 else 1921 else
1893 { 1922 {
1894 if (ev.button != MEvent.button) 1923 if (ev.button != MEvent.button)
… …
1942 } 1971 }
1943 1972
1944 /* 1973 /*
1945 * Scrollbar window processing of button press 1974 * Scrollbar window processing of button press
1946 */ 1975 */
1947 if (isScrollbarWindow (ev.window)) 1976 if (scrollBar.state && ev.window == scrollBar.win)
1948 { 1977 {
1949 scrollBar.setIdle (); 1978 page_dirn direction = NO_DIR;
1979
1980 if (scrollBar.upButton (ev.y))
1981 direction = UP; /* up */
1982 else if (scrollBar.dnButton (ev.y))
1983 direction = DN; /* down */
1984
1985 scrollBar.state = STATE_IDLE;
1950 /* 1986 /*
1951 * Rxvt-style scrollbar: 1987 * Rxvt-style scrollbar:
1952 * move up if mouse is above slider 1988 * move up if mouse is above slider
1953 * move dn if mouse is below slider 1989 * move dn if mouse is below slider
1954 * 1990 *
… …
1963 /* 1999 /*
1964 * Mouse report disabled scrollbar: 2000 * Mouse report disabled scrollbar:
1965 * arrow buttons - send up/down 2001 * arrow buttons - send up/down
1966 * click on scrollbar - send pageup/down 2002 * click on scrollbar - send pageup/down
1967 */ 2003 */
1968 if ((scrollBar.style == R_SB_NEXT 2004 if (direction == UP)
1969 && scrollbarnext_upButton (ev.y))
1970 || (scrollBar.style == R_SB_RXVT
1971 && scrollbarrxvt_upButton (ev.y)))
1972 tt_printf ("\033[A"); 2005 tt_printf ("\033[A");
1973 else if ((scrollBar.style == R_SB_NEXT 2006 else if (direction == DN)
1974 && scrollbarnext_dnButton (ev.y))
1975 || (scrollBar.style == R_SB_RXVT
1976 && scrollbarrxvt_dnButton (ev.y)))
1977 tt_printf ("\033[B"); 2007 tt_printf ("\033[B");
1978 else 2008 else
1979 switch (ev.button) 2009 switch (ev.button)
1980 { 2010 {
1981 case Button2: 2011 case Button2:
… …
1988 tt_printf ("\033[5~"); 2018 tt_printf ("\033[5~");
1989 break; 2019 break;
1990 } 2020 }
1991 } 2021 }
1992 else 2022 else
1993#endif /* NO_SCROLLBAR_REPORT */ 2023#endif /* NO_SCROLLBAR_REPORT */
1994
1995 {
1996 char upordown = 0;
1997
1998 if (scrollBar.style == R_SB_NEXT)
1999 { 2024 {
2000 if (scrollbarnext_upButton (ev.y)) 2025 if (direction != NO_DIR)
2001 upordown = -1; /* up */
2002 else if (scrollbarnext_dnButton (ev.y))
2003 upordown = 1; /* down */
2004 }
2005 else if (scrollBar.style == R_SB_RXVT)
2006 {
2007 if (scrollbarrxvt_upButton (ev.y))
2008 upordown = -1; /* up */
2009 else if (scrollbarrxvt_dnButton (ev.y))
2010 upordown = 1; /* down */
2011 }
2012 if (upordown)
2013 { 2026 {
2014#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2028 if (!cont_scroll_ev.is_active ())
2015 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2029 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2016#endif 2030#endif
2017 if (scr_page (upordown < 0 ? UP : DN, 1)) 2031 if (scr_page (direction, 1))
2018 { 2032 {
2019 if (upordown < 0) 2033 if (direction == UP)
2020 scrollBar.setUp (); 2034 scrollBar.state = STATE_UP;
2021 else 2035 else
2022 scrollBar.setDn (); 2036 scrollBar.state = STATE_DOWN;
2023 } 2037 }
2024 } 2038 }
2025 else 2039 else
2026 switch (ev.button) 2040 switch (ev.button)
2027 { 2041 {
2028 case Button2: 2042 case Button2:
2029 switch (scrollbar_align) 2043 switch (scrollBar.align)
2030 { 2044 {
2031 case R_SB_ALIGN_TOP: 2045 case R_SB_ALIGN_TOP:
2032 csrO = 0; 2046 csrO = 0;
2033 break; 2047 break;
2034 case R_SB_ALIGN_CENTRE: 2048 case R_SB_ALIGN_CENTRE:
… …
2040 } 2054 }
2041 2055
2042 if (scrollBar.style == R_SB_XTERM 2056 if (scrollBar.style == R_SB_XTERM
2043 || scrollbar_above_slider (ev.y) 2057 || scrollbar_above_slider (ev.y)
2044 || scrollbar_below_slider (ev.y)) 2058 || scrollbar_below_slider (ev.y))
2045 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2046 2060
2047 scrollBar.setMotion (); 2061 scrollBar.state = STATE_MOTION;
2048 break; 2062 break;
2049 2063
2050 case Button1: 2064 case Button1:
2051 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2065 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2052 csrO = ev.y - scrollBar.top; 2066 csrO = ev.y - scrollBar.top;
2053 /* FALLTHROUGH */ 2067 /* FALLTHROUGH */
2054 2068
2055 case Button3: 2069 case Button3:
2056 if (scrollBar.style != R_SB_XTERM) 2070 if (scrollBar.style != R_SB_XTERM)
… …
2066 scr_page (DN, nrow - 1); 2080 scr_page (DN, nrow - 1);
2067# else 2081# else
2068 scr_page (DN, nrow / 4); 2082 scr_page (DN, nrow / 4);
2069# endif 2083# endif
2070 else 2084 else
2071 scrollBar.setMotion (); 2085 scrollBar.state = STATE_MOTION;
2072 } 2086 }
2073 else 2087 else
2074 { 2088 {
2075 scr_page ((ev.button == Button1 ? DN : UP), 2089 scr_page ((ev.button == Button1 ? DN : UP),
2076 (nrow 2090 (nrow
2077 * scrollbar_position (ev.y) 2091 * scrollbar_position (ev.y)
2078 / scrollbar_size ())); 2092 / scrollBar.size ()));
2079 } 2093 }
2080 2094
2081 break; 2095 break;
2082 } 2096 }
2083 } 2097 }
… …
2093 2107
2094 csrO = 0; /* reset csr Offset */ 2108 csrO = 0; /* reset csr Offset */
2095 if (!bypass_keystate) 2109 if (!bypass_keystate)
2096 reportmode = !! (priv_modes & PrivMode_mouse_report); 2110 reportmode = !! (priv_modes & PrivMode_mouse_report);
2097 2111
2098 if (scrollbar_isUpDn ()) 2112 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2099 { 2113 {
2100 scrollBar.setIdle (); 2114 scrollBar.state = STATE_IDLE;
2101 scrollbar_show (0); 2115 scrollBar.show (0);
2102 } 2116 }
2103 2117
2104#ifdef SELECTION_SCROLLING 2118#ifdef SELECTION_SCROLLING
2105 if (sel_scroll_ev.active)
2106 sel_scroll_ev.stop(); 2119 sel_scroll_ev.stop();
2107#endif 2120#endif
2108 2121
2109 if (ev.window == vt) 2122 if (ev.window == vt)
2110 { 2123 {
2111 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2124 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2135 mouse_report (ev); 2148 mouse_report (ev);
2136 } 2149 }
2137#else /* MOUSE_REPORT_DOUBLECLICK */ 2150#else /* MOUSE_REPORT_DOUBLECLICK */
2138 MEvent.button = AnyButton; 2151 MEvent.button = AnyButton;
2139 mouse_report (ev); 2152 mouse_report (ev);
2140#endif /* MOUSE_REPORT_DOUBLECLICK */ 2153#endif /* MOUSE_REPORT_DOUBLECLICK */
2141 return; 2154 return;
2142 } 2155 }
2143 2156
2144 /* 2157 /*
2145 * dumb hack to compensate for the failure of click-and-drag 2158 * dumb hack to compensate for the failure of click-and-drag
… …
2157 selection_make (ev.time); 2170 selection_make (ev.time);
2158 break; 2171 break;
2159 2172
2160 case Button2: 2173 case Button2:
2161 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2174 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2162 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2175 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2163 break; 2176 break;
2164 2177
2165#ifdef MOUSE_WHEEL 2178#ifdef MOUSE_WHEEL
2166 case Button4: 2179 case Button4:
2167 case Button5: 2180 case Button5:
… …
2183 { 2196 {
2184 mouse_slip_wheel_speed += v ? -1 : 1; 2197 mouse_slip_wheel_speed += v ? -1 : 1;
2185 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2198 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2186 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2199 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2187 2200
2188 if (slip_wheel_ev.at < NOW) 2201 if (!slip_wheel_ev.is_active ())
2189 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2202 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2190
2191 slip_wheel_ev.start ();
2192 } 2203 }
2193 else 2204 else
2205# endif
2194 { 2206 {
2195# endif
2196 scr_page (v, i); 2207 scr_page (v, i);
2197 scrollbar_show (1); 2208 scrollBar.show (1);
2198# ifdef MOUSE_SLIP_WHEELING
2199 } 2209 }
2200# endif
2201 } 2210 }
2202 break; 2211 break;
2203#endif 2212#endif
2204 } 2213 }
2205 } 2214 }
2206} 2215}
2207 2216
2208/*}}} */ 2217/*}}} */
2209 2218
2210bool 2219void
2211rxvt_term::cmd_parse () 2220rxvt_term::cmd_parse ()
2212{ 2221{
2213 bool flag = false;
2214 wchar_t ch = NOCHAR; 2222 wchar_t ch = NOCHAR;
2215 char *seq_begin; // remember start of esc-sequence here 2223 char *seq_begin; // remember start of esc-sequence here
2216 2224
2217 for (;;) 2225 for (;;)
2218 { 2226 {
2219 if (ch == NOCHAR) 2227 if (expect_false (ch == NOCHAR))
2220 { 2228 {
2221 seq_begin = cmdbuf_ptr; 2229 seq_begin = cmdbuf_ptr;
2222 ch = next_char (); 2230 ch = next_char ();
2223 2231
2224 if (ch == NOCHAR) 2232 if (ch == NOCHAR)
2225 break; 2233 break;
2226 } 2234 }
2227 2235
2228 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2236 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2229 { 2237 {
2230 if (!seen_input) 2238 if (expect_false (!seen_input))
2231 { 2239 {
2232 seen_input = 1; 2240 seen_input = 1;
2233 // many badly-written programs (e.g. jed) contain a race condition: 2241 // many badly-written programs (e.g. jed) contain a race condition:
2234 // they first read the screensize and then install a SIGWINCH handler. 2242 // they first read the screensize and then install a SIGWINCH handler.
2235 // some window managers resize the window early, and these programs 2243 // some window managers resize the window early, and these programs
… …
2248 wchar_t *str = buf; 2256 wchar_t *str = buf;
2249 wchar_t *eol = str + min (ncol, UBUFSIZ); 2257 wchar_t *eol = str + min (ncol, UBUFSIZ);
2250 2258
2251 for (;;) 2259 for (;;)
2252 { 2260 {
2253 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2261 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2254 break; 2262 break;
2255 2263
2256 *str++ = ch; 2264 *str++ = ch;
2257 2265
2258 if (ch == C0_LF || str >= eol) 2266 if (expect_false (ch == C0_LF || str >= eol))
2259 { 2267 {
2260 if (ch == C0_LF) 2268 if (ch == C0_LF)
2261 nlines++; 2269 nlines++;
2262 2270
2263 refresh_count++; 2271 refresh_count++;
2264 2272
2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2273 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2266 { 2274 {
2267 refresh_count = 0; 2275 refresh_count = 0;
2268 2276
2269 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2277 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2270 { 2278 {
2271 refreshnow = true; 2279 refreshnow = true;
2272 ch = NOCHAR; 2280 ch = NOCHAR;
2273 break; 2281 break;
2274 } 2282 }
… …
2312 * What the heck we'll cheat and only refresh less than every page-full. 2320 * What the heck we'll cheat and only refresh less than every page-full.
2313 * if skipScroll is enabled. 2321 * if skipScroll is enabled.
2314 */ 2322 */
2315 if (refreshnow) 2323 if (refreshnow)
2316 { 2324 {
2317 flag = true;
2318 scr_refresh (); 2325 scr_refresh ();
2319 want_refresh = 1; 2326 want_refresh = 1;
2320 } 2327 }
2321
2322 } 2328 }
2323 else 2329 else
2324 { 2330 {
2325 try 2331 try
2326 { 2332 {
… …
2334 } 2340 }
2335 2341
2336 ch = NOCHAR; 2342 ch = NOCHAR;
2337 } 2343 }
2338 } 2344 }
2339
2340 return flag;
2341} 2345}
2342 2346
2343// read the next character 2347// read the next character
2344wchar_t 2348wchar_t
2345rxvt_term::next_char () NOTHROW 2349rxvt_term::next_char () NOTHROW
2346{ 2350{
2347 while (cmdbuf_ptr < cmdbuf_endp) 2351 while (cmdbuf_ptr < cmdbuf_endp)
2348 { 2352 {
2349 // assume 7-bit to be ascii ALWAYS 2353 // assume 7-bit to be ascii ALWAYS
2350 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2354 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2351 return *cmdbuf_ptr++; 2355 return *cmdbuf_ptr++;
2352 2356
2353 wchar_t wc; 2357 wchar_t wc;
2354 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2358 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2355 2359
… …
2359 cmdbuf_ptr = cmdbuf_endp; 2363 cmdbuf_ptr = cmdbuf_endp;
2360 break; 2364 break;
2361 } 2365 }
2362 2366
2363 if (len == (size_t)-1) 2367 if (len == (size_t)-1)
2368 {
2369 mbstate.reset (); // reset now undefined conversion state
2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2370 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2371 }
2365 2372
2366 // assume wchar == unicode 2373 // assume wchar == unicode
2367 cmdbuf_ptr += len; 2374 cmdbuf_ptr += len;
2368 return wc & UNICODE_MASK; 2375 return wc & UNICODE_MASK;
2369 } 2376 }
… …
2380 : NOCHAR; 2387 : NOCHAR;
2381} 2388}
2382 2389
2383static class out_of_input out_of_input; 2390static class out_of_input out_of_input;
2384 2391
2385/* rxvt_cmd_getc () - Return next input character */
2386/*
2387 * Return the next input character after first passing any keyboard input
2388 * to the command.
2389 */
2390wchar_t 2392wchar_t
2391rxvt_term::cmd_getc () THROW ((class out_of_input)) 2393rxvt_term::cmd_getc () THROW ((class out_of_input))
2392{ 2394{
2393 wchar_t c = next_char (); 2395 wchar_t c = next_char ();
2394 2396
… …
2413/*----------------------------------------------------------------------*/ 2415/*----------------------------------------------------------------------*/
2414#ifdef PRINTPIPE 2416#ifdef PRINTPIPE
2415FILE * 2417FILE *
2416rxvt_term::popen_printer () 2418rxvt_term::popen_printer ()
2417{ 2419{
2418 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2420 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2419 2421
2420 if (stream == NULL) 2422 if (stream == NULL)
2421 rxvt_warn ("can't open printer pipe, not printing.\n"); 2423 rxvt_warn ("can't open printer pipe, not printing.\n");
2422 2424
2423 return stream; 2425 return stream;
… …
2434 * simulate attached vt100 printer 2436 * simulate attached vt100 printer
2435 */ 2437 */
2436void 2438void
2437rxvt_term::process_print_pipe () 2439rxvt_term::process_print_pipe ()
2438{ 2440{
2439 int done; 2441 FILE *fd = popen_printer ();
2440 FILE *fd;
2441 2442
2442 if ((fd = popen_printer ()) == NULL) 2443 if (!fd)
2443 return; 2444 return;
2444 2445
2445 /* 2446 /*
2446 * Send all input to the printer until either ESC[4i or ESC[?4i 2447 * Send all input to the printer until either ESC[4i or ESC[?4i
2447 * is received. 2448 * is received.
2448 */ 2449 */
2449 for (done = 0; !done;) 2450 for (int done = 0; !done; )
2450 { 2451 {
2451 unsigned char buf[8]; 2452 unsigned char buf[8];
2452 unicode_t ch; 2453 unicode_t ch;
2453 unsigned int i, len; 2454 unsigned int i, len;
2454 2455
… …
2485 } 2486 }
2486 } 2487 }
2487 2488
2488 pclose_printer (fd); 2489 pclose_printer (fd);
2489} 2490}
2490#endif /* PRINTPIPE */ 2491#endif /* PRINTPIPE */
2491/*}}} */ 2492/*}}} */
2492 2493
2493/* *INDENT-OFF* */
2494enum { 2494enum {
2495 C1_40 = 0x40, 2495 C1_40 = 0x40,
2496 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2496 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2497 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2497 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2498 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2498 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2499 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2499 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2500}; 2500};
2501/* *INDENT-ON* */
2502 2501
2503/*{{{ process non-printing single characters */ 2502/*{{{ process non-printing single characters */
2504void 2503void
2505rxvt_term::process_nonprinting (unicode_t ch) 2504rxvt_term::process_nonprinting (unicode_t ch)
2506{ 2505{
… …
2599 break; 2598 break;
2600 case 'Z': /* identify the terminal type */ 2599 case 'Z': /* identify the terminal type */
2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2600 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2602 break; 2601 break;
2603 case '<': /* turn off VT52 mode */ 2602 case '<': /* turn off VT52 mode */
2604 PrivMode (0, PrivMode_vt52); 2603 set_privmode (PrivMode_vt52, 0);
2605 break; 2604 break;
2606 case 'F': /* use special graphics character set */ 2605 case 'F': /* use special graphics character set */
2607 case 'G': /* use regular character set */ 2606 case 'G': /* use regular character set */
2608 /* unimplemented */ 2607 /* unimplemented */
2609 break; 2608 break;
… …
2663 scr_forwardindex (); 2662 scr_forwardindex ();
2664 break; 2663 break;
2665#endif 2664#endif
2666 case '=': 2665 case '=':
2667 case '>': 2666 case '>':
2668 PrivMode ((ch == '='), PrivMode_aplKP); 2667 set_privmode (PrivMode_aplKP, ch == '=');
2669 break; 2668 break;
2670 2669
2671 case C1_40: 2670 case C1_40:
2672 cmd_getc (); 2671 cmd_getc ();
2673 break; 2672 break;
… …
2677 2676
2678 /* 8.3.87: NEXT LINE */ 2677 /* 8.3.87: NEXT LINE */
2679 case C1_NEL: /* ESC E */ 2678 case C1_NEL: /* ESC E */
2680 { 2679 {
2681 wchar_t nlcr[] = { C0_LF, C0_CR }; 2680 wchar_t nlcr[] = { C0_LF, C0_CR };
2682 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2681 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2683 } 2682 }
2684 break; 2683 break;
2685 2684
2686 /* kidnapped escape sequence: Should be 8.3.48 */ 2685 /* kidnapped escape sequence: Should be 8.3.48 */
2687 case C1_ESA: /* ESC G */ 2686 case C1_ESA: /* ESC G */
2688 process_graphics (); 2687 // used by original rxvt for rob nations own graphics mode
2688 if (cmd_getc () == 'Q')
2689 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2689 break; 2690 break;
2690 2691
2691 /* 8.3.63: CHARACTER TABULATION SET */ 2692 /* 8.3.63: CHARACTER TABULATION SET */
2692 case C1_HTS: /* ESC H */ 2693 case C1_HTS: /* ESC H */
2693 scr_set_tab (1); 2694 scr_set_tab (1);
… …
2712 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2713 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2713 case C1_SCI: /* ESC Z */ 2714 case C1_SCI: /* ESC Z */
2714 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2715 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2715 break; /* steal obsolete ESC [ c */ 2716 break; /* steal obsolete ESC [ c */
2716 2717
2717 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2718 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2718 case C1_CSI: /* ESC [ */ 2719 case C1_CSI: /* ESC [ */
2719 process_csi_seq (); 2720 process_csi_seq ();
2720 break; 2721 break;
2721 2722
2722 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2723 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2723 case C1_OSC: /* ESC ] */ 2724 case C1_OSC: /* ESC ] */
2724 process_osc_seq (); 2725 process_osc_seq ();
2725 break; 2726 break;
2726 2727
2727 /* 8.3.106: RESET TO INITIAL STATE */ 2728 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2728 case 'c': 2729 case 'c':
2729 mbstate.reset (); 2730 mbstate.reset ();
2730 scr_poweron (); 2731 scr_poweron ();
2731 scrollbar_show (1); 2732 scrollBar.show (1);
2732 break; 2733 break;
2733 2734
2734 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2735 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2735 case 'n': 2736 case 'n':
2736 scr_charset_choose (2); 2737 scr_charset_choose (2);
… …
2743 } 2744 }
2744} 2745}
2745/*}}} */ 2746/*}}} */
2746 2747
2747/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2748/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2748/* *INDENT-OFF* */
2749enum { 2749enum {
2750 CSI_ICH = 0x40, 2750 CSI_ICH = 0x40,
2751 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2751 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2752 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2752 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2753 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2753 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2756 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2756 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2757 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2757 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2758 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2758 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2759}; 2759};
2760 2760
2761#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2761#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2762 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2762 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2763 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2763 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2764#define get_byte_array_bit(array, bit) \ 2764#define get_byte_array_bit(array, bit) \
2765 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2765 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2766 2766
2767const unsigned char csi_defaults[] = 2767static const unsigned char csi_defaults[] =
2768 { 2768 {
2769 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2769 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2770 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2770 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2771 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2771 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2772 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2772 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2773 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2773 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2774 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2774 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2775 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2775 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2776 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2776 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2777 }; 2777 };
2778/* *INDENT-ON* */
2779 2778
2780void 2779void
2781rxvt_term::process_csi_seq () 2780rxvt_term::process_csi_seq ()
2782{ 2781{
2783 unicode_t ch, priv, i; 2782 unicode_t ch, priv, i;
… …
2787 2786
2788 nargs = 0; 2787 nargs = 0;
2789 2788
2790 priv = 0; 2789 priv = 0;
2791 ch = cmd_getc (); 2790 ch = cmd_getc ();
2792 if (ch >= '<' && ch <= '?') 2791 if ((ch >= '<' && ch <= '?') || ch == '!')
2792 {
2793 { /* '<' '=' '>' '?' */ 2793 /* '<' '=' '>' '?' '!' */
2794 priv = ch; 2794 priv = ch;
2795 ch = cmd_getc (); 2795 ch = cmd_getc ();
2796 } 2796 }
2797 2797
2798 /* read any numerical arguments */ 2798 /* read any numerical arguments */
… …
2841 { 2841 {
2842 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2842 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2843 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2843 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2844 // 2844 //
2845 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2845 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2846 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2846 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2847 // that we do not support xterm mouse reporting (should be 95 when we do). 2847 // versions.
2848 // 2848 //
2849 tt_printf ("\033[>%d;94;0c", 'U'); 2849 tt_printf ("\033[>%d;95;0c", 'U');
2850 } 2850 }
2851 break; 2851 break;
2852
2852 case '?': 2853 case '?':
2853 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2854 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2854 process_terminal_mode (ch, priv, nargs, arg); 2855 process_terminal_mode (ch, priv, nargs, arg);
2855 break; 2856 break;
2857
2858 case '!':
2859 if (ch == CSI_70)
2860 {
2861 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2862 scr_soft_reset ();
2863
2864 static const int pm_h[] = { 7, 25 };
2865 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2866
2867 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2868 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2856 } 2869 }
2870 break;
2871 }
2872
2857 return; 2873 return;
2858 } 2874 }
2859 2875
2860 switch (ch) 2876 switch (ch)
2861 { 2877 {
… …
3076 } 3092 }
3077} 3093}
3078/*}}} */ 3094/*}}} */
3079 3095
3080#if !ENABLE_MINIMAL 3096#if !ENABLE_MINIMAL
3081/* ARGSUSED */
3082void 3097void
3083rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3098rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3084{ 3099{
3085 int x, y; 3100 int x, y;
3086 XWindowAttributes wattr; 3101 XWindowAttributes wattr;
… …
3095 { 3110 {
3096 /* 3111 /*
3097 * commands 3112 * commands
3098 */ 3113 */
3099 case 1: /* deiconify window */ 3114 case 1: /* deiconify window */
3100 XMapWindow (dpy, parent[0]); 3115 XMapWindow (dpy, parent);
3101 break; 3116 break;
3102 case 2: /* iconify window */ 3117 case 2: /* iconify window */
3103 XIconifyWindow (dpy, parent[0], display->screen); 3118 XIconifyWindow (dpy, parent, display->screen);
3104 break; 3119 break;
3105 case 3: /* set position (pixels) */ 3120 case 3: /* set position (pixels) */
3106 XMoveWindow (dpy, parent[0], args[1], args[2]); 3121 XMoveWindow (dpy, parent, args[1], args[2]);
3107 break; 3122 break;
3108 case 4: /* set size (pixels) */ 3123 case 4: /* set size (pixels) */
3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3124 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3110 break; 3125 break;
3111 case 5: /* raise window */ 3126 case 5: /* raise window */
3112 XRaiseWindow (dpy, parent[0]); 3127 XRaiseWindow (dpy, parent);
3113 break; 3128 break;
3114 case 6: /* lower window */ 3129 case 6: /* lower window */
3115 XLowerWindow (dpy, parent[0]); 3130 XLowerWindow (dpy, parent);
3116 break; 3131 break;
3117 case 7: /* refresh window */ 3132 case 7: /* refresh window */
3118 scr_touch (true); 3133 scr_touch (true);
3119 break; 3134 break;
3120 case 8: /* set size (chars) */ 3135 case 8: /* set size (chars) */
… …
3131 3146
3132 /* 3147 /*
3133 * reports - some output format copied from XTerm 3148 * reports - some output format copied from XTerm
3134 */ 3149 */
3135 case 11: /* report window state */ 3150 case 11: /* report window state */
3136 XGetWindowAttributes (dpy, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3152 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3138 break; 3153 break;
3139 case 13: /* report window position */ 3154 case 13: /* report window position */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent, &wattr);
3141 XTranslateCoordinates (dpy, parent[0], wattr.root, 3156 XTranslateCoordinates (dpy, parent, wattr.root,
3142 -wattr.border_width, -wattr.border_width, 3157 -wattr.border_width, -wattr.border_width,
3143 &x, &y, &wdummy); 3158 &x, &y, &wdummy);
3144 tt_printf ("\033[3;%d;%dt", x, y); 3159 tt_printf ("\033[3;%d;%dt", x, y);
3145 break; 3160 break;
3146 case 14: /* report window size (pixels) */ 3161 case 14: /* report window size (pixels) */
3147 XGetWindowAttributes (dpy, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent, &wattr);
3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3163 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3149 break; 3164 break;
3150 case 18: /* report text area size (chars) */ 3165 case 18: /* report text area size (chars) */
3151 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3152 break; 3167 break;
… …
3154 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3155 break; 3170 break;
3156 case 20: /* report icon label */ 3171 case 20: /* report icon label */
3157 { 3172 {
3158 char *s; 3173 char *s;
3159 XGetIconName (dpy, parent[0], &s); 3174 XGetIconName (dpy, parent, &s);
3160 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3161 XFree (s); 3176 XFree (s);
3162 } 3177 }
3163 break; 3178 break;
3164 case 21: /* report window title */ 3179 case 21: /* report window title */
3165 { 3180 {
3166 char *s; 3181 char *s;
3167 XFetchName (dpy, parent[0], &s); 3182 XFetchName (dpy, parent, &s);
3168 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3169 XFree (s); 3184 XFree (s);
3170 } 3185 }
3171 break; 3186 break;
3172 } 3187 }
… …
3228 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3243 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3229 */ 3244 */
3230void 3245void
3231rxvt_term::process_dcs_seq () 3246rxvt_term::process_dcs_seq ()
3232{ 3247{
3233 char *s;
3234 unicode_t eh;
3235
3236 /* 3248 /*
3237 * Not handled yet 3249 * Not handled yet
3238 */ 3250 */
3251
3252 unicode_t eh;
3239 s = get_to_st (eh); 3253 char *s = get_to_st (eh);
3240 if (s) 3254 if (s)
3241 free (s); 3255 free (s);
3242 3256
3243 return; 3257 return;
3244} 3258}
… …
3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3262 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3249 */ 3263 */
3250void 3264void
3251rxvt_term::process_osc_seq () 3265rxvt_term::process_osc_seq ()
3252{ 3266{
3253 unicode_t ch, eh;
3254 int arg; 3267 int arg;
3255 3268
3256 ch = cmd_getc (); 3269 unicode_t ch = cmd_getc ();
3257 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3270 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3258 arg = arg * 10 + (ch - '0'); 3271 arg = arg * 10 + (ch - '0');
3259 3272
3260 if (ch == ';') 3273 if (ch == ';')
3261 { 3274 {
3275 unicode_t eh;
3262 char *s = get_to_st (eh); 3276 char *s = get_to_st (eh);
3263 3277
3264 if (s) 3278 if (s)
3265 { 3279 {
3266 process_xterm_seq (arg, s, eh); 3280 process_xterm_seq (arg, s, eh);
… …
3290 3304
3291/* 3305/*
3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3306 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3293 */ 3307 */
3294void 3308void
3295rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3309rxvt_term::process_xterm_seq (int op, char *str, char resp)
3296{ 3310{
3297 int color; 3311 int color;
3298 char *buf, *name; 3312 char *buf, *name;
3299 bool query = str[0] == '?' && !str[1]; 3313 bool query = str[0] == '?' && !str[1];
3300 int saveop = op; 3314 int saveop = op;
… …
3327 unsigned long bytes_after; 3341 unsigned long bytes_after;
3328 unsigned char *value = 0; 3342 unsigned char *value = 0;
3329 const char *str = ""; 3343 const char *str = "";
3330 3344
3331 if (prop 3345 if (prop
3332 && XGetWindowProperty (dpy, parent[0], 3346 && XGetWindowProperty (dpy, parent,
3333 prop, 0, 1<<16, 0, AnyPropertyType, 3347 prop, 0, 1<<16, 0, AnyPropertyType,
3334 &actual_type, &actual_format, 3348 &actual_type, &actual_format,
3335 &nitems, &bytes_after, &value) == Success 3349 &nitems, &bytes_after, &value) == Success
3336 && actual_type != None 3350 && actual_type != None
3337 && actual_format == 8) 3351 && actual_format == 8)
… …
3341 3355
3342 XFree (value); 3356 XFree (value);
3343 } 3357 }
3344 else 3358 else
3345 { 3359 {
3346 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3360 char *eq = strchr (str, '=');
3347 3361
3348 if (eq) 3362 if (eq)
3349 { 3363 {
3350 *eq = 0; 3364 *eq = 0;
3351 set_utf8_property (display->atom (str), eq + 1); 3365 set_utf8_property (display->atom (str), eq + 1);
3352 } 3366 }
3353 else 3367 else
3354 XDeleteProperty (dpy, parent[0], 3368 XDeleteProperty (dpy, parent,
3355 display->atom (str)); 3369 display->atom (str));
3356 } 3370 }
3357 break; 3371 break;
3358 3372
3359 case XTerm_Color: 3373 case XTerm_Color:
… …
3372 *buf++ = '\0'; 3386 *buf++ = '\0';
3373 3387
3374 process_color_seq (op, color, name, resp); 3388 process_color_seq (op, color, name, resp);
3375 } 3389 }
3376 break; 3390 break;
3391 case Rxvt_restoreFG:
3377 case XTerm_Color00: 3392 case XTerm_Color00:
3378 process_color_seq (op, Color_fg, str, resp); 3393 process_color_seq (op, Color_fg, str, resp);
3379 break; 3394 break;
3395 case Rxvt_restoreBG:
3380 case XTerm_Color01: 3396 case XTerm_Color01:
3381 process_color_seq (op, Color_bg, str, resp); 3397 process_color_seq (op, Color_bg, str, resp);
3382 break; 3398 break;
3383#ifndef NO_CURSORCOLOR 3399#ifndef NO_CURSORCOLOR
3384 case XTerm_Color_cursor: 3400 case XTerm_Color_cursor:
… …
3389 process_color_seq (op, Color_pointer_fg, str, resp); 3405 process_color_seq (op, Color_pointer_fg, str, resp);
3390 break; 3406 break;
3391 case XTerm_Color_pointer_bg: 3407 case XTerm_Color_pointer_bg:
3392 process_color_seq (op, Color_pointer_bg, str, resp); 3408 process_color_seq (op, Color_pointer_bg, str, resp);
3393 break; 3409 break;
3410#ifdef OPTION_HC
3411 case XTerm_Color_HC:
3412 process_color_seq (op, Color_HC, str, resp);
3413 break;
3414 case XTerm_Color_HTC:
3415 process_color_seq (op, Color_HTC, str, resp);
3416 break;
3417#endif
3394#ifndef NO_BOLD_UNDERLINE_REVERSE 3418#ifndef NO_BOLD_UNDERLINE_REVERSE
3395 case XTerm_Color_RV:
3396 process_color_seq (op, Color_RV, str, resp);
3397 break;
3398 case Rxvt_Color_BD:
3399 case URxvt_Color_BD: 3419 case URxvt_Color_BD:
3400 process_color_seq (op, Color_BD, str, resp); 3420 process_color_seq (op, Color_BD, str, resp);
3401 break; 3421 break;
3402 case Rxvt_Color_UL:
3403 case URxvt_Color_UL: 3422 case URxvt_Color_UL:
3404 process_color_seq (op, Color_UL, str, resp); 3423 process_color_seq (op, Color_UL, str, resp);
3405 break; 3424 break;
3406 case URxvt_Color_IT: 3425 case URxvt_Color_IT:
3407 process_color_seq (op, Color_IT, str, resp); 3426 process_color_seq (op, Color_IT, str, resp);
3408 break; 3427 break;
3409#endif 3428#endif
3429 case URxvt_Color_border:
3430 process_color_seq (op, Color_border, str, resp);
3431 break;
3410#if ENABLE_TRANSPARENCY 3432#if ENABLE_TRANSPARENCY
3411 case URxvt_Color_tint: 3433 case URxvt_Color_tint:
3412 process_color_seq (op, Color_tint, str, resp); 3434 process_color_seq (op, Color_tint, str, resp);
3413 { 3435 {
3414 bool changed = false; 3436 bool changed = false;
3437
3415 if (ISSET_PIXCOLOR (Color_tint)) 3438 if (ISSET_PIXCOLOR (Color_tint))
3416 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3439 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3417 else 3440
3418 changed = bgPixmap.unset_tint ();
3419 if (changed) 3441 if (changed)
3420 update_background (); 3442 update_background ();
3421 } 3443 }
3422 3444
3423 break; 3445 break;
3424#endif 3446#endif
3425 3447
3426#if XPM_BACKGROUND 3448#if BG_IMAGE_FROM_FILE
3427 case Rxvt_Pixmap: 3449 case Rxvt_Pixmap:
3428 if (!strcmp (str, "?")) 3450 if (!strcmp (str, "?"))
3429 { 3451 {
3430 char str[256]; 3452 char str[256];
3431 3453
3432 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3454 sprintf (str, "[%dx%d+%d+%d]",
3433 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3455 min (h_scale, 32767), min (v_scale, 32767),
3434 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3456 min (h_align, 32767), min (v_align, 32767));
3435 process_xterm_seq (XTerm_title, str, CHAR_ST); 3457 process_xterm_seq (XTerm_title, str, CHAR_ST);
3436 } 3458 }
3437 else 3459 else
3438 { 3460 {
3439 int changed = 0; 3461 int changed = 0;
3440 3462
3441 if (*str != ';') 3463 if (*str != ';')
3442 { 3464 {
3443 /* reset to default scaling :*/
3444 bgPixmap.unset_geometry ();
3445 if (bgPixmap.set_file (str)) /* change pixmap */ 3465 if (bg_set_file (str)) /* change pixmap */
3466 {
3446 changed++; 3467 changed++;
3447 str = strchr (str, ';'); 3468 str = strchr (str, ';');
3448 if (str == NULL) 3469 if (str == NULL)
3449 bgPixmap.set_defaultGeometry (); 3470 bg_set_default_geometry ();
3471 else
3472 bg_set_geometry (str+1);
3473 }
3450 } 3474 }
3451 while (str) 3475 else
3452 { 3476 {
3453 str++; 3477 str++;
3454 if (bgPixmap.set_geometry (str)) 3478 if (bg_set_geometry (str, true))
3455 changed++; 3479 changed++;
3456 str = strchr (str, ';');
3457 } 3480 }
3481
3458 if (changed) 3482 if (changed)
3483 {
3484 if (bg_window_position_sensitive ())
3485 {
3486 int x, y;
3487 get_window_origin (x, y);
3488 bg_set_position (x, y);
3489 }
3459 update_background (); 3490 update_background ();
3491 }
3460 } 3492 }
3461 break; 3493 break;
3462#endif 3494#endif
3463
3464 case Rxvt_restoreFG:
3465 set_window_color (Color_fg, str);
3466 break;
3467 case Rxvt_restoreBG:
3468 set_window_color (Color_bg, str);
3469 break;
3470 3495
3471 case XTerm_logfile: 3496 case XTerm_logfile:
3472 // TODO, when secure mode? 3497 // TODO, when secure mode?
3473 break; 3498 break;
3474 3499
… …
3541 break; 3566 break;
3542#endif 3567#endif
3543 3568
3544#if ENABLE_PERL 3569#if ENABLE_PERL
3545 case URxvt_perl: 3570 case URxvt_perl:
3546 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3571 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3547 ; // no responses yet
3548 break; 3572 break;
3549#endif 3573#endif
3550 } 3574 }
3551} 3575}
3552/*----------------------------------------------------------------------*/ 3576/*----------------------------------------------------------------------*/
… …
3575 { 3599 {
3576 if (mode == 'r') 3600 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3601 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3602 else
3579 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3603 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3604
3605 set_privmode (bit, state);
3581 } 3606 }
3582 3607
3583 return state; 3608 return state;
3584} 3609}
3585 3610
… …
3593 static const struct 3618 static const struct
3594 { 3619 {
3595 const int argval; 3620 const int argval;
3596 const unsigned long bit; 3621 const unsigned long bit;
3597 } argtopriv[] = { 3622 } argtopriv[] = {
3598 { 1, PrivMode_aplCUR }, 3623 { 1, PrivMode_aplCUR }, // DECCKM
3599 { 2, PrivMode_vt52 }, 3624 { 2, PrivMode_vt52 },
3600 { 3, PrivMode_132 }, 3625 { 3, PrivMode_132 }, // DECCOLM
3601 { 4, PrivMode_smoothScroll }, 3626 { 4, PrivMode_smoothScroll }, // DECSCLM
3602 { 5, PrivMode_rVideo }, 3627 { 5, PrivMode_rVideo }, // DECSCNM
3603 { 6, PrivMode_relOrigin }, 3628 { 6, PrivMode_relOrigin }, // DECOM
3604 { 7, PrivMode_Autowrap }, 3629 { 7, PrivMode_Autowrap }, // DECAWM
3605 // 8, bi-directional support mode 3630 // 8, auto-repeat keys // DECARM
3606 { 9, PrivMode_MouseX10 }, 3631 { 9, PrivMode_MouseX10 },
3607 // 18, 19 printing-related 3632 // 18 end FF to printer after print screen
3633 // 19 Print screen prints full screen/scroll region
3608 { 25, PrivMode_VisibleCursor }, 3634 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3609#ifdef scrollBar_esc 3635#ifdef scrollBar_esc
3610 { scrollBar_esc, PrivMode_scrollBar }, 3636 { scrollBar_esc, PrivMode_scrollBar },
3611#endif 3637#endif
3612 { 35, PrivMode_ShiftKeys }, // rxvt extension 3638 { 35, PrivMode_ShiftKeys }, // rxvt extension
3639 // 38, tektronix mode // DECTEK
3613 { 40, PrivMode_132OK }, 3640 { 40, PrivMode_132OK },
3614 // 41 xterm more fixes NYI 3641 // 41 xterm more fixes NYI
3615 // 45 margin bell NYI 3642 // 45 margin bell NYI
3616 // 46 start logging 3643 // 46 start logging
3617 { 47, PrivMode_Screen }, 3644 { 47, PrivMode_Screen },
3618 { 66, PrivMode_aplKP }, 3645 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3619#ifndef NO_BACKSPACE_KEY 3646#ifndef NO_BACKSPACE_KEY
3620 { 67, PrivMode_BackSpace }, 3647 { 67, PrivMode_BackSpace }, // DECBKM
3621#endif 3648#endif
3622 { 1000, PrivMode_MouseX11 }, 3649 { 1000, PrivMode_MouseX11 },
3623 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3650 { 1002, PrivMode_MouseBtnEvent },
3624 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3651 { 1003, PrivMode_MouseAnyEvent },
3625 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3652#if ENABLE_FRILLS
3653 { 1005, PrivMode_ExtModeMouse },
3654#endif
3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3655 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3627 { 1011, PrivMode_Keypress }, // rxvt extension 3656 { 1011, PrivMode_Keypress }, // rxvt extension
3657#if ENABLE_FRILLS
3658 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3659#endif
3628 // 1035 enable modifiers for alt, numlock NYI 3660 // 1035 enable modifiers for alt, numlock NYI
3629 // 1036 send ESC for meta keys NYI 3661 // 1036 send ESC for meta keys NYI
3630 // 1037 send DEL for keypad delete NYI 3662 // 1037 send DEL for keypad delete NYI
3631 { 1047, PrivMode_Screen }, 3663 { 1047, PrivMode_Screen },
3632 // 1048 save and restore cursor 3664 // 1048 save and restore cursor, implemented in code
3633 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3665 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3666 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3667 { 2004, PrivMode_BracketPaste },
3635 }; 3668 };
3636 3669
3637 if (nargs == 0) 3670 if (nargs == 0)
3638 return; 3671 return;
3639 3672
… …
3646 for (i = 0; i < nargs; i++) 3679 for (i = 0; i < nargs; i++)
3647 { 3680 {
3648 state = -1; 3681 state = -1;
3649 3682
3650 /* basic handling */ 3683 /* basic handling */
3651 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3684 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3652 if (argtopriv[j].argval == arg[i]) 3685 if (argtopriv[j].argval == arg[i])
3653 { 3686 {
3654 state = privcases (mode, argtopriv[j].bit); 3687 state = privcases (mode, argtopriv[j].bit);
3655 break; 3688 break;
3656 } 3689 }
… …
3664 3697
3665 scr_touch (true); 3698 scr_touch (true);
3666 break; 3699 break;
3667#endif 3700#endif
3668 case 1048: /* alternative cursor save */ 3701 case 1048: /* alternative cursor save */
3669 case 1049:
3670 if (option (Opt_secondaryScreen)) 3702 if (option (Opt_secondaryScreen))
3671 if (mode == 0) 3703 if (mode == 0)
3672 scr_cursor (RESTORE); 3704 scr_cursor (RESTORE);
3673 else if (mode == 1) 3705 else if (mode == 1)
3674 scr_cursor (SAVE); 3706 scr_cursor (SAVE);
… …
3683 case 2: /* VT52 mode */ 3715 case 2: /* VT52 mode */
3684 /* oddball mode. should be set regardless of set/reset 3716 /* oddball mode. should be set regardless of set/reset
3685 * parameter. Return from VT52 mode with an ESC < from 3717 * parameter. Return from VT52 mode with an ESC < from
3686 * within VT52 mode 3718 * within VT52 mode
3687 */ 3719 */
3688 PrivMode (1, PrivMode_vt52); 3720 set_privmode (PrivMode_vt52, 1);
3689 break; 3721 break;
3690 case 3: /* 80/132 */ 3722 case 3: /* 80/132 */
3691 if (priv_modes & PrivMode_132OK) 3723 if (priv_modes & PrivMode_132OK)
3692 set_widthheight (((state ? 132 : 80) * fwidth), height); 3724 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3693 break; 3725 break;
3694 case 4: /* smooth scrolling */ 3726 case 4: /* smooth scrolling */
3695 set_option (Opt_jumpScroll, !state); 3727 set_option (Opt_jumpScroll, !state);
3696 break; 3728 break;
3697 case 5: /* reverse video */ 3729 case 5: /* reverse video */
… …
3704 scr_autowrap (state); 3736 scr_autowrap (state);
3705 break; 3737 break;
3706 /* case 8: - auto repeat, can't do on a per window basis */ 3738 /* case 8: - auto repeat, can't do on a per window basis */
3707 case 9: /* X10 mouse reporting */ 3739 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 3740 if (state) /* orthogonal */
3709 priv_modes &= ~PrivMode_MouseX11; 3741 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3710 break; 3742 break;
3711#ifdef scrollBar_esc 3743#ifdef scrollBar_esc
3712 case scrollBar_esc: 3744 case scrollBar_esc:
3713 if (scrollbar_mapping (state)) 3745 if (scrollBar.map (state))
3714 { 3746 {
3715 resize_all_windows (0, 0, 0); 3747 resize_all_windows (0, 0, 0);
3716 scr_touch (true); 3748 scr_touch (true);
3717 } 3749 }
3718 break; 3750 break;
… …
3727 break; 3759 break;
3728 /* case 66: - application key pad */ 3760 /* case 66: - application key pad */
3729 /* case 67: - backspace key */ 3761 /* case 67: - backspace key */
3730 case 1000: /* X11 mouse reporting */ 3762 case 1000: /* X11 mouse reporting */
3731 if (state) /* orthogonal */ 3763 if (state) /* orthogonal */
3732 priv_modes &= ~PrivMode_MouseX10; 3764 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3733 break; 3765 break;
3734#if 0
3735 case 1001: 3766 case 1002:
3736 break; /* X11 mouse highlighting */ 3767 case 1003:
3737#endif 3768 if (state)
3769 {
3770 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3771 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3772 mouse_row = mouse_col = 0;
3773 vt_emask_mouse = PointerMotionMask;
3774 }
3775 else
3776 vt_emask_mouse = NoEventMask;
3777
3778 vt_select_input ();
3779 break;
3738 case 1010: /* scroll to bottom on TTY output inhibit */ 3780 case 1010: /* scroll to bottom on TTY output inhibit */
3739 set_option (Opt_scrollTtyOutput, !state); 3781 set_option (Opt_scrollTtyOutput, !state);
3740 break; 3782 break;
3741 case 1011: /* scroll to bottom on key press */ 3783 case 1011: /* scroll to bottom on key press */
3742 set_option (Opt_scrollTtyKeypress, state); 3784 set_option (Opt_scrollTtyKeypress, state);
3743 break; 3785 break;
3744 case 1047: /* secondary screen w/ clearing last */ 3786 case 1047: /* secondary screen w/ clearing last */
3745 if (option (Opt_secondaryScreen)) 3787 if (option (Opt_secondaryScreen))
3746 if (current_screen != PRIMARY) 3788 if (!state)
3747 scr_erase_screen (2); 3789 scr_erase_screen (2);
3790
3748 scr_change_screen (state); 3791 scr_change_screen (state);
3749 break; 3792 break;
3750 case 1049: /* secondary screen w/ clearing first */ 3793 case 1049: /* secondary screen w/ clearing first */
3794 if (option (Opt_secondaryScreen))
3795 if (state)
3796 scr_cursor (SAVE);
3797
3751 scr_change_screen (state); 3798 scr_change_screen (state);
3799
3752 if (option (Opt_secondaryScreen)) 3800 if (option (Opt_secondaryScreen))
3753 if (current_screen != PRIMARY) 3801 if (state)
3754 scr_erase_screen (2); 3802 scr_erase_screen (2);
3803 else
3804 scr_cursor (RESTORE);
3755 break; 3805 break;
3756 default: 3806 default:
3757 break; 3807 break;
3758 } 3808 }
3759 } 3809 }
… …
3912 } 3962 }
3913 } 3963 }
3914} 3964}
3915/*}}} */ 3965/*}}} */
3916 3966
3917/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3918void
3919rxvt_term::process_graphics ()
3920{
3921 unicode_t ch, cmd = cmd_getc ();
3922
3923 if (cmd == 'Q')
3924 { /* query graphics */
3925 tt_printf ("\033G0\012"); /* no graphics */
3926 return;
3927 }
3928 /* swallow other graphics sequences until terminating ':' */
3929 do
3930 ch = cmd_getc ();
3931 while (ch != ':');
3932}
3933/*}}} */
3934
3935/* ------------------------------------------------------------------------- */ 3967/* ------------------------------------------------------------------------- */
3936 3968
3937/* 3969/*
3938 * Send printf () formatted output to the command. 3970 * Send printf () formatted output to the command.
3939 * Only use for small amounts of data. 3971 * Only use for small amounts of data.
… …
3952 3984
3953/* ---------------------------------------------------------------------- */ 3985/* ---------------------------------------------------------------------- */
3954/* Write data to the pty as typed by the user, pasted with the mouse, 3986/* Write data to the pty as typed by the user, pasted with the mouse,
3955 * or generated by us in response to a query ESC sequence. 3987 * or generated by us in response to a query ESC sequence.
3956 */ 3988 */
3957const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3989static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3958 3990
3959void 3991void
3960rxvt_term::tt_write (const char *data, unsigned int len) 3992rxvt_term::tt_write (const char *data, unsigned int len)
3961{ 3993{
3962 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3994 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3967 3999
3968 if (v_buflen == 0) 4000 if (v_buflen == 0)
3969 { 4001 {
3970 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4002 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3971 4003
4004 max_it (written, 0);
4005
3972 if ((unsigned int)written == len) 4006 if (written == len)
3973 return; 4007 return;
3974 4008
3975 data += written; 4009 data += written;
3976 len -= written; 4010 len -= written;
3977 } 4011 }
3978 4012
3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4013 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3980 4014
3981 memcpy (v_buffer + v_buflen, data, len); 4015 memcpy (v_buffer + v_buflen, data, len);
3982 v_buflen += len; 4016 v_buflen += len;
3983 4017
3984 pty_ev.set (EVENT_READ | EVENT_WRITE); 4018 pty_ev.set (ev::READ | ev::WRITE);
3985} 4019}
3986 4020
3987void rxvt_term::pty_write () 4021void rxvt_term::pty_write ()
3988{ 4022{
3989 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4023 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
3994 4028
3995 if (v_buflen == 0) 4029 if (v_buflen == 0)
3996 { 4030 {
3997 free (v_buffer); 4031 free (v_buffer);
3998 v_buffer = 0; 4032 v_buffer = 0;
3999 v_buflen = 0;
4000 4033
4001 pty_ev.set (EVENT_READ); 4034 pty_ev.set (ev::READ);
4002 return; 4035 return;
4003 } 4036 }
4004 4037
4005 memmove (v_buffer, v_buffer + written, v_buflen); 4038 memmove (v_buffer, v_buffer + written, v_buflen);
4006 } 4039 }
4007 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4040 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4008 pty_ev.set (EVENT_READ); 4041 pty_ev.set (ev::READ);
4009} 4042}
4010 4043
4011/*----------------------- end-of-file (C source) -----------------------*/ 4044/*----------------------- end-of-file (C source) -----------------------*/
4012 4045

Diff Legend

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