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.324 by sasha, Fri Jun 8 20:04:12 2007 UTC vs.
Revision 1.484 by sf-exg, Fri Apr 29 10:10:20 2011 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
221 ch = *chr++; 225 ch = *chr++;
222 226
223 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
226# if !UNICODE3 230# if !UNICODE_3
227 if (ch >= 0x10000) 231 if (ch >= 0x10000)
228 ch = 0xfffd; 232 ch = 0xfffd;
229# endif 233# endif
230 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
231 235
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
279 } 285 }
280 286
281 iso14755buf = 0; 287 iso14755buf = 0;
282} 288}
283 289
284int 290static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
298 304
299 return -1; 305 return -1;
300} 306}
301#endif 307#endif
302 308
309static inline KeySym
310translate_keypad (KeySym keysym, bool kp)
311{
312#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin
328 };
329
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
331 {
332 unsigned int index = keysym - XK_KP_Home;
333 keysym = kp ? keypadtrans[index] : XK_Home + index;
334 }
335 else if (keysym == XK_KP_Insert)
336 keysym = kp ? XK_KP_0 : XK_Insert;
337# ifndef NO_DELETE_KEY
338 else if (keysym == XK_KP_Delete)
339 keysym = kp ? XK_KP_Decimal : XK_Delete;
340# endif
341#endif
342 return keysym;
343}
344
345static inline int
346map_function_key (KeySym keysym)
347{
348 int param = 0;
349
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
351 {
352 param = 11 + keysym - XK_F1;
353 if (keysym >= XK_F17)
354 param += 4;
355 else if (keysym >= XK_F15)
356 param += 3;
357 else if (keysym >= XK_F11)
358 param += 2;
359 else if (keysym >= XK_F6)
360 param += 1;
361 }
362 else
363 switch (keysym)
364 {
365 case XK_Find:
366 param = 1;
367 break;
368 case XK_Insert:
369 param = 2;
370 break;
371#ifdef DXK_Remove
372 case DXK_Remove:
373#endif
374 case XK_Execute:
375 param = 3;
376 break;
377 case XK_Select:
378 param = 4;
379 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior:
382 param = 5;
383 break;
384 case XK_Next:
385 param = 6;
386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
393#endif
394 case XK_Help:
395 param = 28;
396 break;
397 case XK_Menu:
398 param = 29;
399 break;
400 }
401 return param;
402}
403
303void 404void
304rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
305{ 406{
306 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 408 KeySym keysym;
309 int valid_keysym; 409 int valid_keysym;
310 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
311 411
312#if ISO_14755 412#if ISO_14755
… …
321 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
322 */ 422 */
323 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
326
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332 426
333 kbuf[0] = 0; 427 kbuf[0] = 0;
334 428
335#ifdef USE_XIM 429#ifdef USE_XIM
336 if (Input_Context) 430 if (Input_Context)
… …
411#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 507#else
414 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
415#endif 509#endif
510 max_it (lnsppg, 1);
511
416 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
417 { 513 {
418 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
419 return; 515 return;
420 } 516 }
… …
473 selection_request (ev.time); 569 selection_request (ev.time);
474 return; 570 return;
475#if TODO 571#if TODO
476 /* rxvt extras */ 572 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 573 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 574 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 575 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 576 return;
483#endif 577#endif
484 } 578 }
485 } 579 }
486 } 580 }
487 581
488#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 583 // ISO 14755 support
490 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 585 {
492 int hv; 586 int hv;
493 587
494 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
… …
519# endif 613# endif
520 return; 614 return;
521 } 615 }
522 else 616 else
523 { 617 {
524# if ENABLE_OVERLAY 618# if ISO_14755
525 scr_overlay_off (); 619 scr_overlay_off ();
526# endif 620# endif
527 iso14755buf = 0; 621 iso14755buf = 0;
528 } 622 }
529 } 623 }
624 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
533 { 628 {
534 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 630# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 632 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 633# endif
539 } 634 }
540#endif 635#endif
541 636
542#ifdef PRINTPIPE 637#ifdef PRINTPIPE
543 if (keysym == XK_Print) 638 if (keysym == XK_Print)
544 { 639 {
545 scr_printscreen (ctrl | shft); 640 scr_printscreen (ctrl | shft);
546 return; 641 return;
547 } 642 }
548#endif 643#endif
549 644
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 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)
552 { 656 {
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, key_backspace);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, key_delete);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0; 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
… …
934#if ENABLE_FRILLS || ISO_14755 871#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 872 // ISO 14755 support
936 if (iso14755buf) 873 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 874 if (iso14755buf & ISO_14755_52)
938 { 875 {
939# if ENABLE_OVERLAY 876# if ISO_14755
940 scr_overlay_off (); 877 scr_overlay_off ();
941# endif 878# endif
942# if ISO_14755 879# if ISO_14755
943 // iso14755 part 5.2 handling: release time 880 // iso14755 part 5.2 handling: release time
944 // first: controls 881 // first: controls
… …
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
… …
967 904
968 return; 905 return;
969 } 906 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 907 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 908 {
972# if ENABLE_OVERLAY 909# if ISO_14755
973 scr_overlay_off (); 910 scr_overlay_off ();
974# endif 911# endif
975 if (iso14755buf & ISO_14755_51) 912 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 913 commit_iso14755 ();
977#if ISO_14755 914#if ISO_14755
978 else if (iso14755buf & ISO_14755_STARTED) 915 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 { 916 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 917 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981 918
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 919 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 920 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
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 ();
1039 943
1040#ifdef TRANSPARENT 944#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 945 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 946 {
1043 want_full_refresh = 0; 947 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_clear ();
1045 scr_touch (false); 948 scr_touch (false);
1046 } 949 }
1047#endif 950#endif
1048 951
1049 if (want_refresh) 952 if (want_refresh)
… …
1085 } 988 }
1086 while (row < end_row); 989 while (row < end_row);
1087 } 990 }
1088 991
1089 scr_refresh (); 992 scr_refresh ();
1090 scrollbar_show (1); 993 scrollBar.show (1);
1091#ifdef USE_XIM 994#ifdef USE_XIM
1092 IMSendSpot (); 995 IMSendSpot ();
1093#endif 996#endif
1094 } 997 }
1095 998
1096 display->flush (); 999 display->flush ();
1097} 1000}
1098 1001
1002/* checks whether a refresh is requested and starts the refresh timer */
1099void 1003void
1100rxvt_term::check_cb (check_watcher &w) 1004rxvt_term::refresh_check ()
1005{
1006 if (want_refresh && !flush_ev.is_active ())
1007 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1008
1009 display->flush ();
1010}
1011
1012void
1013rxvt_term::flush_cb (ev::timer &w, int revents)
1101{ 1014{
1102 make_current (); 1015 make_current ();
1103 1016
1104 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108}
1109
1110void
1111rxvt_term::flush_cb (time_watcher &w)
1112{
1113 make_current ();
1114
1115 refresh_limit = 1;
1116 refresh_count = 0; 1017 refresh_count = 0;
1117 flush (); 1018 flush ();
1118} 1019}
1119 1020
1120#ifdef CURSOR_BLINK 1021#ifdef CURSOR_BLINK
1121void 1022void
1122rxvt_term::cursor_blink_cb (time_watcher &w) 1023rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1123{ 1024{
1124 hidden_cursor = !hidden_cursor; 1025 hidden_cursor = !hidden_cursor;
1125 want_refresh = 1; 1026 want_refresh = 1;
1126 1027 refresh_check ();
1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1128} 1028}
1129#endif 1029#endif
1130 1030
1131#ifdef TEXT_BLINK 1031#ifdef TEXT_BLINK
1132void 1032void
1133rxvt_term::text_blink_cb (time_watcher &w) 1033rxvt_term::text_blink_cb (ev::timer &w, int revents)
1134{ 1034{
1135 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1035 if (scr_refresh_rend (RS_Blink, RS_Blink))
1136 { 1036 {
1137 hidden_text = !hidden_text; 1037 hidden_text = !hidden_text;
1138 want_refresh = 1; 1038 want_refresh = 1;
1139 w.start (w.at + TEXT_BLINK_INTERVAL); 1039 refresh_check ();
1140 } 1040 }
1041 else
1042 w.stop ();
1141} 1043}
1142#endif 1044#endif
1143 1045
1144#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1046#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145void 1047void
1146rxvt_term::cont_scroll_cb (time_watcher &w) 1048rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1147{ 1049{
1148 if ((scrollbar_isUp() || scrollbar_isDn()) && 1050 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1149 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1051 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1150 { 1052 {
1151 want_refresh = 1; 1053 want_refresh = 1;
1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1054 refresh_check ();
1153 } 1055 }
1056 else
1057 w.stop ();
1154} 1058}
1155#endif 1059#endif
1156 1060
1157#ifdef SELECTION_SCROLLING 1061#ifdef SELECTION_SCROLLING
1158void 1062void
1159rxvt_term::sel_scroll_cb (time_watcher &w) 1063rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1160{ 1064{
1161 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1065 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1162 { 1066 {
1163 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1067 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164 want_refresh = 1; 1068 want_refresh = 1;
1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1069 refresh_check ();
1166 } 1070 }
1071 else
1072 w.stop ();
1167} 1073}
1168#endif 1074#endif
1169 1075
1170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171void 1077void
1172rxvt_term::slip_wheel_cb (time_watcher &w) 1078rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1173{ 1079{
1174 if (mouse_slip_wheel_speed == 0 1080 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1176 : scr_page (UP, mouse_slip_wheel_speed))
1177 { 1081 {
1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
1181 want_refresh = 1; 1082 want_refresh = 1;
1182 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 ();
1183 } 1090 }
1184} 1091}
1185#endif 1092#endif
1186 1093
1187#if LINUX_YIELD_HACK 1094#if LINUX_YIELD_HACK
1188static struct event_handler 1095static struct event_handler
1189{ 1096{
1190 check_watcher yield_ev; 1097 ev::prepare yield_ev;
1191 1098
1192 void yield_cb (check_watcher &w) 1099 void yield_cb (ev::prepare &w, int revents)
1193 { 1100 {
1194 // this should really be sched_yield(), but the linux guys thought 1101 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than 1102 // that giving a process calling sched_yield () less cpu time than
1196 // 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
1197 // 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.
1198 1108
1199 struct timespec ts = { 0, 0 }; 1109 struct timespec ts = { 0, 1000 };
1200 nanosleep (&ts, 0); 1110 nanosleep (&ts, 0);
1201 1111
1202 w.stop (); 1112 w.stop ();
1203 } 1113 }
1204 1114
… …
1207 { 1117 {
1208 } 1118 }
1209} event_handler; 1119} event_handler;
1210#endif 1120#endif
1211 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
1212bool 1155bool
1213rxvt_term::pty_fill () 1156rxvt_term::pty_fill ()
1214{ 1157{
1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1158 cmdbuf_reify ();
1216 1159
1217 if (CBUFSIZ == n) 1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1218 { 1161
1219 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1162 if (!avail)
1220 n = 0;
1221 } 1163 {
1222 1164 // normally this indicates a "too long" command sequence - just drop the data we have
1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1224 cmdbuf_ptr = cmdbuf_base; 1165 cmdbuf_ptr = cmdbuf_base;
1225 cmdbuf_endp = cmdbuf_ptr + n; 1166 cmdbuf_endp = cmdbuf_ptr;
1167 avail = CBUFSIZ;
1168 }
1226 1169
1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1228 1171
1229 if (r > 0) 1172 if (r > 0)
1230 { 1173 {
1231 cmdbuf_endp += r; 1174 cmdbuf_endp += r;
1232 return true; 1175 return true;
… …
1243 pty_ev.stop (); 1186 pty_ev.stop ();
1244 1187
1245 if (!option (Opt_hold)) 1188 if (!option (Opt_hold))
1246 destroy (); 1189 destroy ();
1247 } 1190 }
1248 1191
1249 return false; 1192 return false;
1250} 1193}
1251 1194
1252void 1195void
1253rxvt_term::pty_cb (io_watcher &w, short revents) 1196rxvt_term::pty_cb (ev::io &w, int revents)
1254{ 1197{
1255 make_current (); 1198 make_current ();
1256 1199
1257 if (revents & EVENT_READ) 1200 if (revents & ev::READ)
1258 // loop, but don't allow a single term to monopolize us 1201 // loop, but don't allow a single term to monopolize us
1259 while (pty_fill ()) 1202 for (int i = CBUFCNT; i-- && pty_fill (); )
1260 if (cmd_parse ()) 1203 cmd_parse ();
1261 break;
1262 1204
1263 if (revents & EVENT_WRITE) 1205 if (revents & ev::WRITE)
1264 pty_write (); 1206 pty_write ();
1207
1208 refresh_check ();
1265} 1209}
1266 1210
1267void 1211void
1268rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
1269{ 1213{
… …
1272 1216
1273#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1274 hidden_pointer = 0; 1218 hidden_pointer = 0;
1275 1219
1276 if (option (Opt_pointerBlank)) 1220 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1278#endif 1222#endif
1279} 1223}
1280 1224
1281#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1282void 1226void
… …
1290 1234
1291 hidden_pointer = 1; 1235 hidden_pointer = 1;
1292} 1236}
1293 1237
1294void 1238void
1295rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1296{ 1240{
1297 make_current (); 1241 make_current ();
1298 1242
1299 pointer_blank (); 1243 pointer_blank ();
1300} 1244}
… …
1303void 1247void
1304rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1249{
1306 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1307 int x, y; 1251 int x, y;
1252 int code = 32;
1308 1253
1309 x = ev.x; 1254 x = Pixel2Col (ev.x) + 1;
1310 y = ev.y; 1255 y = Pixel2Row (ev.y) + 1;
1311 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 }
1312 1266
1313 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1314 button_number = 3; 1268 button_number = 3;
1315 else 1269 else
1316 { 1270 {
1317 button_number = MEvent.button - Button1; 1271 button_number = MEvent.button - Button1;
1318 /* add 0x3D for wheel events, like xterm does */ 1272 /* add 0x3D for wheel events, like xterm does */
1319 if (button_number >= 3) 1273 if (button_number >= 3)
1320 button_number += (64 - 3); 1274 button_number += 64 - 3;
1321 } 1275 }
1322 1276
1323 if (priv_modes & PrivMode_MouseX10) 1277 if (priv_modes & PrivMode_MouseX10)
1324 { 1278 {
1325 /* 1279 /*
… …
1357 fputc ('A', stderr); 1311 fputc ('A', stderr);
1358 if (key_state & 32) 1312 if (key_state & 32)
1359 fputc ('2', stderr); 1313 fputc ('2', stderr);
1360 fprintf (stderr, "]: <%d>, %d/%d\n", 1314 fprintf (stderr, "]: <%d>, %d/%d\n",
1361 button_number, 1315 button_number,
1362 x + 1, 1316 x,
1363 y + 1); 1317 y);
1364#endif 1318#endif
1365 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
1366 tt_printf ("\033[M%c%c%c", 1333 tt_printf ("\033[M%c%c%c",
1367 (32 + button_number + key_state), 1334 code + button_number + key_state,
1368 (32 + x + 1), 1335 32 + x,
1369 (32 + y + 1)); 1336 32 + y);
1370} 1337}
1371 1338
1372/*{{{ process an X event */ 1339/*{{{ process an X event */
1373void 1340void
1374rxvt_term::x_cb (XEvent &ev) 1341rxvt_term::x_cb (XEvent &ev)
… …
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1401 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1402 focus_out ();
1436 } 1403 }
1437#endif 1404#endif
1438 } 1405 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1406 break;
1444 1407
1445 /* 1408 /*
1446 * XXX: this is not the _current_ arrangement 1409 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1410 * Here's my conclusion:
… …
1480 && ev.xfocus.mode != NotifyGrab) 1443 && ev.xfocus.mode != NotifyGrab)
1481 focus_out (); 1444 focus_out ();
1482 break; 1445 break;
1483 1446
1484 case ConfigureNotify: 1447 case ConfigureNotify:
1485 if (ev.xconfigure.window == parent[0]) 1448 if (ev.xconfigure.window == parent)
1486 { 1449 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 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
1489 1471
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1472 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1473 {
1492 seen_resize = 1; 1474 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1475 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND 1476 }
1495 if (!option(Opt_transparent) && bgPixmap.auto_resize) 1477 else
1478 {
1479#ifdef HAVE_BG_PIXMAP
1480 if (moved)
1496 { 1481 {
1482 if (mapped)
1483 update_background ();
1497 resize_pixmap (); 1484 else
1498 scr_touch (true); 1485 bg_invalidate ();
1499 } 1486 }
1500#endif 1487#endif
1501 } 1488 }
1502 1489
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1506 if (option (Opt_transparent))
1507 check_our_parents ();
1508#endif
1509 } 1491 }
1510 break; 1492 break;
1511 1493
1512 case PropertyNotify: 1494 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1495 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1515 && ev.xproperty.state == PropertyNewValue)
1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1517
1518 break; 1496 break;
1519 1497
1520 case SelectionClear: 1498 case SelectionClear:
1521 selection_clear (); 1499 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1522 break;
1523
1524 case SelectionNotify:
1525 if (selection_wait == Sel_normal)
1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1527 break; 1500 break;
1528 1501
1529 case SelectionRequest: 1502 case SelectionRequest:
1530 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1531 break; 1504 break;
1532 1505
1533 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
1534 mapped = 1; 1523 mapped = 1;
1535#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1525 text_blink_ev.start ();
1537#endif 1526#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1528 break;
1540 1529
1541 case UnmapNotify: 1530 case UnmapNotify:
… …
1543#ifdef TEXT_BLINK 1532#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1533 text_blink_ev.stop ();
1545#endif 1534#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1535 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1536 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1537
1555 case GraphicsExpose: 1538 case GraphicsExpose:
1556 case Expose: 1539 case Expose:
1557 if (ev.xany.window == vt) 1540 if (ev.xany.window == vt)
1558 { 1541 {
1559 do 1542 do
1543 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, false);
1546 }
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1548
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1550
1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1552 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1555 }
1569 1556
1570 want_refresh = 1; 1557 want_refresh = 1;
1571 } 1558 }
1572 else 1559 else
1573 { 1560 {
… …
1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1577 ; 1564 ;
1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1566 ;
1580 1567
1581 if (isScrollbarWindow (ev.xany.window)) 1568 if (scrollBar.state && ev.xany.window == scrollBar.win)
1582 { 1569 {
1583 scrollBar.setIdle (); 1570 scrollBar.state = STATE_IDLE;
1584 scrollbar_show (0); 1571 scrollBar.show (0);
1585 } 1572 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1590#endif
1591 } 1573 }
1592 break; 1574 break;
1593 1575
1594 case MotionNotify: 1576 case MotionNotify:
1595#ifdef POINTER_BLANK 1577#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1578 if (hidden_pointer)
1597 pointer_unblank (); 1579 pointer_unblank ();
1598#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);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1585 break;
1601 1586
1602 if (ev.xany.window == vt) 1587 if (ev.xany.window == vt)
1603 { 1588 {
… …
1637 int dist; 1622 int dist;
1638 1623
1639 /* don't clobber the current delay if we are 1624 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1625 * already in the middle of scrolling.
1641 */ 1626 */
1642 if (!sel_scroll_ev.active) 1627 if (!sel_scroll_ev.is_active ())
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1628 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1629
1645 /* save the event params so we can highlight 1630 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1631 * the selection in the pending-scroll loop
1647 */ 1632 */
1648 selection_save_x = ev.xbutton.x; 1633 selection_save_x = ev.xbutton.x;
… …
1670 else 1655 else
1671 { 1656 {
1672 /* we are within the text window, so we 1657 /* we are within the text window, so we
1673 * shouldn't be scrolling 1658 * shouldn't be scrolling
1674 */ 1659 */
1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop(); 1660 sel_scroll_ev.stop();
1677 } 1661 }
1678#endif 1662#endif
1679#ifdef MOUSE_THRESHOLD 1663#ifdef MOUSE_THRESHOLD
1680 } 1664 }
1681#endif 1665#endif
1682 } 1666 }
1683 } 1667 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1668 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1685 { 1669 {
1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1687 MotionNotify, &ev)) 1671 MotionNotify, &ev))
1688 ; 1672 ;
1689 1673
… …
1691 &unused_root, &unused_child, 1675 &unused_root, &unused_child,
1692 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1693 &ev.xbutton.x, &ev.xbutton.y, 1677 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1678 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1680 scrollBar.size ());
1697 want_refresh = 1; 1681 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1682 scrollBar.show (1);
1700 } 1683 }
1701 break; 1684 break;
1702 } 1685 }
1703 1686
1704#if defined(CURSOR_BLINK) 1687#if defined(CURSOR_BLINK)
… …
1708 { 1691 {
1709 hidden_cursor = 0; 1692 hidden_cursor = 0;
1710 want_refresh = 1; 1693 want_refresh = 1;
1711 } 1694 }
1712 1695
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1696 cursor_blink_ev.again ();
1714 } 1697 }
1715#endif 1698#endif
1716 1699
1717#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1725 1708
1726 if (ev.type == KeyPress && hidden_pointer == 0) 1709 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank (); 1710 pointer_blank ();
1728 } 1711 }
1729#endif 1712#endif
1713
1714 refresh_check ();
1730} 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
1731 1732
1732void 1733void
1733rxvt_term::focus_in () 1734rxvt_term::focus_in ()
1734{ 1735{
1735 if (!focus) 1736 if (!focus)
1736 { 1737 {
1737 focus = 1; 1738 focus = 1;
1738 want_refresh = 1; 1739 want_refresh = 1;
1739 1740
1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741
1742#if USE_XIM 1741#if USE_XIM
1743 if (Input_Context != NULL) 1742 if (Input_Context != NULL)
1744 { 1743 {
1745 IMSetPosition (); 1744 IMSetPosition ();
1746 XSetICFocus (Input_Context); 1745 XSetICFocus (Input_Context);
1747 } 1746 }
1748#endif 1747#endif
1749#if CURSOR_BLINK 1748#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink)) 1749 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1750 cursor_blink_ev.again ();
1752#endif 1751#endif
1753#if OFF_FOCUS_FADING 1752#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade]) 1753 if (rs[Rs_fade])
1755 { 1754 {
1756 pix_colors = pix_colors_focused; 1755 pix_colors = pix_colors_focused;
1757 scr_recolour (); 1756 scr_recolour ();
1758 } 1757 }
1759#endif 1758#endif
1760#if ENABLE_FRILLS 1759#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell)) 1760 if (option (Opt_urgentOnBell))
1762 { 1761 set_urgency (0);
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1771 }
1772#endif 1762#endif
1763
1764 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1773 } 1765 }
1774} 1766}
1775 1767
1776void 1768void
1777rxvt_term::focus_out () 1769rxvt_term::focus_out ()
… …
1779 if (focus) 1771 if (focus)
1780 { 1772 {
1781 focus = 0; 1773 focus = 0;
1782 want_refresh = 1; 1774 want_refresh = 1;
1783 1775
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1776#if ENABLE_FRILLS
1785 1777 if (option (Opt_urgentOnBell))
1778 set_urgency (0);
1779#endif
1786#if ENABLE_FRILLS || ISO_14755 1780#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf) 1781 if (iso14755buf)
1788 { 1782 {
1789 iso14755buf = 0; 1783 iso14755buf = 0;
1790# if ENABLE_OVERLAY 1784# if ISO_14755
1791 scr_overlay_off (); 1785 scr_overlay_off ();
1792# endif 1786# endif
1793 } 1787 }
1794#endif 1788#endif
1795#if USE_XIM 1789#if USE_XIM
… …
1797 XUnsetICFocus (Input_Context); 1791 XUnsetICFocus (Input_Context);
1798#endif 1792#endif
1799#if CURSOR_BLINK 1793#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink)) 1794 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop (); 1795 cursor_blink_ev.stop ();
1796
1802 hidden_cursor = 0; 1797 hidden_cursor = 0;
1803#endif 1798#endif
1804#if OFF_FOCUS_FADING 1799#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade]) 1800 if (rs[Rs_fade])
1806 { 1801 {
1807 pix_colors = pix_colors_unfocused; 1802 pix_colors = pix_colors_unfocused;
1808 scr_recolour (); 1803 scr_recolour ();
1809 } 1804 }
1810#endif 1805#endif
1806
1807 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1811 } 1808 }
1812} 1809}
1813 1810
1814void 1811void
1815rxvt_term::update_fade_color (unsigned int idx) 1812rxvt_term::update_fade_color (unsigned int idx)
… …
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1819 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 } 1820 }
1824#endif 1821#endif
1825} 1822}
1826 1823
1827#if TRANSPARENT || ENABLE_PERL 1824#if ENABLE_TRANSPARENCY || ENABLE_PERL
1828void 1825void
1829rxvt_term::rootwin_cb (XEvent &ev) 1826rxvt_term::rootwin_cb (XEvent &ev)
1830{ 1827{
1831 make_current (); 1828 make_current ();
1832 1829
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1830 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1831 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return; 1832 return;
1836 1833
1837# if TRANSPARENT 1834# if ENABLE_TRANSPARENCY
1838 switch (ev.type) 1835 switch (ev.type)
1839 { 1836 {
1840 case PropertyNotify: 1837 case PropertyNotify:
1841 /* 1838 /*
1842 * if user used some Esetroot compatible prog to set the root bg, 1839 * if user used some Esetroot compatible prog to set the root bg,
1843 * 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.
1844 */ 1841 */
1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1842 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1843 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847 return; 1844 {
1845 bg_set_root_pixmap ();
1846 update_background ();
1847 }
1848 1848
1849 /* FALLTHROUGH */
1850 case ReparentNotify:
1851 if (option (Opt_transparent))
1852 check_our_parents ();
1853 break; 1849 break;
1854 } 1850 }
1855# endif 1851# endif
1852
1853 refresh_check ();
1856} 1854}
1857#endif 1855#endif
1858 1856
1859void 1857void
1860rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
… …
1891 /* save the xbutton state (for ButtonRelease) */ 1889 /* save the xbutton state (for ButtonRelease) */
1892 MEvent.state = ev.state; 1890 MEvent.state = ev.state;
1893#ifdef MOUSE_REPORT_DOUBLECLICK 1891#ifdef MOUSE_REPORT_DOUBLECLICK
1894 if (ev.button == MEvent.button && clickintime) 1892 if (ev.button == MEvent.button && clickintime)
1895 { 1893 {
1896 /* same button, within alloted time */ 1894 /* same button, within allowed time */
1897 MEvent.clicks++; 1895 MEvent.clicks++;
1898 1896
1899 if (MEvent.clicks > 1) 1897 if (MEvent.clicks > 1)
1900 { 1898 {
1901 /* only report double clicks */ 1899 /* only report double clicks */
… …
1915 mouse_report (ev); 1913 mouse_report (ev);
1916 } 1914 }
1917#else 1915#else
1918 MEvent.button = ev.button; 1916 MEvent.button = ev.button;
1919 mouse_report (ev); 1917 mouse_report (ev);
1920#endif /* MOUSE_REPORT_DOUBLECLICK */ 1918#endif /* MOUSE_REPORT_DOUBLECLICK */
1921 1919
1922 } 1920 }
1923 else 1921 else
1924 { 1922 {
1925 if (ev.button != MEvent.button) 1923 if (ev.button != MEvent.button)
… …
1973 } 1971 }
1974 1972
1975 /* 1973 /*
1976 * Scrollbar window processing of button press 1974 * Scrollbar window processing of button press
1977 */ 1975 */
1978 if (isScrollbarWindow (ev.window)) 1976 if (scrollBar.state && ev.window == scrollBar.win)
1979 { 1977 {
1980 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;
1981 /* 1986 /*
1982 * Rxvt-style scrollbar: 1987 * Rxvt-style scrollbar:
1983 * move up if mouse is above slider 1988 * move up if mouse is above slider
1984 * move dn if mouse is below slider 1989 * move dn if mouse is below slider
1985 * 1990 *
… …
1994 /* 1999 /*
1995 * Mouse report disabled scrollbar: 2000 * Mouse report disabled scrollbar:
1996 * arrow buttons - send up/down 2001 * arrow buttons - send up/down
1997 * click on scrollbar - send pageup/down 2002 * click on scrollbar - send pageup/down
1998 */ 2003 */
1999 if ((scrollBar.style == R_SB_NEXT 2004 if (direction == UP)
2000 && scrollbarnext_upButton (ev.y))
2001 || (scrollBar.style == R_SB_RXVT
2002 && scrollbarrxvt_upButton (ev.y)))
2003 tt_printf ("\033[A"); 2005 tt_printf ("\033[A");
2004 else if ((scrollBar.style == R_SB_NEXT 2006 else if (direction == DN)
2005 && scrollbarnext_dnButton (ev.y))
2006 || (scrollBar.style == R_SB_RXVT
2007 && scrollbarrxvt_dnButton (ev.y)))
2008 tt_printf ("\033[B"); 2007 tt_printf ("\033[B");
2009 else 2008 else
2010 switch (ev.button) 2009 switch (ev.button)
2011 { 2010 {
2012 case Button2: 2011 case Button2:
… …
2019 tt_printf ("\033[5~"); 2018 tt_printf ("\033[5~");
2020 break; 2019 break;
2021 } 2020 }
2022 } 2021 }
2023 else 2022 else
2024#endif /* NO_SCROLLBAR_REPORT */ 2023#endif /* NO_SCROLLBAR_REPORT */
2025
2026 {
2027 char upordown = 0;
2028
2029 if (scrollBar.style == R_SB_NEXT)
2030 { 2024 {
2031 if (scrollbarnext_upButton (ev.y)) 2025 if (direction != NO_DIR)
2032 upordown = -1; /* up */
2033 else if (scrollbarnext_dnButton (ev.y))
2034 upordown = 1; /* down */
2035 }
2036 else if (scrollBar.style == R_SB_RXVT)
2037 {
2038 if (scrollbarrxvt_upButton (ev.y))
2039 upordown = -1; /* up */
2040 else if (scrollbarrxvt_dnButton (ev.y))
2041 upordown = 1; /* down */
2042 }
2043 if (upordown)
2044 { 2026 {
2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2028 if (!cont_scroll_ev.is_active ())
2046 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2029 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2047#endif 2030#endif
2048 if (scr_page (upordown < 0 ? UP : DN, 1)) 2031 if (scr_page (direction, 1))
2049 { 2032 {
2050 if (upordown < 0) 2033 if (direction == UP)
2051 scrollBar.setUp (); 2034 scrollBar.state = STATE_UP;
2052 else 2035 else
2053 scrollBar.setDn (); 2036 scrollBar.state = STATE_DOWN;
2054 } 2037 }
2055 } 2038 }
2056 else 2039 else
2057 switch (ev.button) 2040 switch (ev.button)
2058 { 2041 {
2059 case Button2: 2042 case Button2:
2060 switch (scrollbar_align) 2043 switch (scrollBar.align)
2061 { 2044 {
2062 case R_SB_ALIGN_TOP: 2045 case R_SB_ALIGN_TOP:
2063 csrO = 0; 2046 csrO = 0;
2064 break; 2047 break;
2065 case R_SB_ALIGN_CENTRE: 2048 case R_SB_ALIGN_CENTRE:
… …
2071 } 2054 }
2072 2055
2073 if (scrollBar.style == R_SB_XTERM 2056 if (scrollBar.style == R_SB_XTERM
2074 || scrollbar_above_slider (ev.y) 2057 || scrollbar_above_slider (ev.y)
2075 || scrollbar_below_slider (ev.y)) 2058 || scrollbar_below_slider (ev.y))
2076 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2077 2060
2078 scrollBar.setMotion (); 2061 scrollBar.state = STATE_MOTION;
2079 break; 2062 break;
2080 2063
2081 case Button1: 2064 case Button1:
2082 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2065 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2083 csrO = ev.y - scrollBar.top; 2066 csrO = ev.y - scrollBar.top;
2084 /* FALLTHROUGH */ 2067 /* FALLTHROUGH */
2085 2068
2086 case Button3: 2069 case Button3:
2087 if (scrollBar.style != R_SB_XTERM) 2070 if (scrollBar.style != R_SB_XTERM)
… …
2097 scr_page (DN, nrow - 1); 2080 scr_page (DN, nrow - 1);
2098# else 2081# else
2099 scr_page (DN, nrow / 4); 2082 scr_page (DN, nrow / 4);
2100# endif 2083# endif
2101 else 2084 else
2102 scrollBar.setMotion (); 2085 scrollBar.state = STATE_MOTION;
2103 } 2086 }
2104 else 2087 else
2105 { 2088 {
2106 scr_page ((ev.button == Button1 ? DN : UP), 2089 scr_page ((ev.button == Button1 ? DN : UP),
2107 (nrow 2090 (nrow
2108 * scrollbar_position (ev.y) 2091 * scrollbar_position (ev.y)
2109 / scrollbar_size ())); 2092 / scrollBar.size ()));
2110 } 2093 }
2111 2094
2112 break; 2095 break;
2113 } 2096 }
2114 } 2097 }
… …
2124 2107
2125 csrO = 0; /* reset csr Offset */ 2108 csrO = 0; /* reset csr Offset */
2126 if (!bypass_keystate) 2109 if (!bypass_keystate)
2127 reportmode = !! (priv_modes & PrivMode_mouse_report); 2110 reportmode = !! (priv_modes & PrivMode_mouse_report);
2128 2111
2129 if (scrollbar_isUpDn ()) 2112 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2130 { 2113 {
2131 scrollBar.setIdle (); 2114 scrollBar.state = STATE_IDLE;
2132 scrollbar_show (0); 2115 scrollBar.show (0);
2133 } 2116 }
2134 2117
2135#ifdef SELECTION_SCROLLING 2118#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2119 sel_scroll_ev.stop();
2138#endif 2120#endif
2139 2121
2140 if (ev.window == vt) 2122 if (ev.window == vt)
2141 { 2123 {
2142 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)))
… …
2166 mouse_report (ev); 2148 mouse_report (ev);
2167 } 2149 }
2168#else /* MOUSE_REPORT_DOUBLECLICK */ 2150#else /* MOUSE_REPORT_DOUBLECLICK */
2169 MEvent.button = AnyButton; 2151 MEvent.button = AnyButton;
2170 mouse_report (ev); 2152 mouse_report (ev);
2171#endif /* MOUSE_REPORT_DOUBLECLICK */ 2153#endif /* MOUSE_REPORT_DOUBLECLICK */
2172 return; 2154 return;
2173 } 2155 }
2174 2156
2175 /* 2157 /*
2176 * dumb hack to compensate for the failure of click-and-drag 2158 * dumb hack to compensate for the failure of click-and-drag
… …
2188 selection_make (ev.time); 2170 selection_make (ev.time);
2189 break; 2171 break;
2190 2172
2191 case Button2: 2173 case Button2:
2192 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?
2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2175 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2194 break; 2176 break;
2195 2177
2196#ifdef MOUSE_WHEEL 2178#ifdef MOUSE_WHEEL
2197 case Button4: 2179 case Button4:
2198 case Button5: 2180 case Button5:
… …
2214 { 2196 {
2215 mouse_slip_wheel_speed += v ? -1 : 1; 2197 mouse_slip_wheel_speed += v ? -1 : 1;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2198 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2199 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2200
2219 if (slip_wheel_ev.at < NOW) 2201 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2202 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221
2222 slip_wheel_ev.start ();
2223 } 2203 }
2224 else 2204 else
2205# endif
2225 { 2206 {
2226# endif
2227 scr_page (v, i); 2207 scr_page (v, i);
2228 scrollbar_show (1); 2208 scrollBar.show (1);
2229# ifdef MOUSE_SLIP_WHEELING
2230 } 2209 }
2231# endif
2232 } 2210 }
2233 break; 2211 break;
2234#endif 2212#endif
2235 } 2213 }
2236 } 2214 }
2237} 2215}
2238 2216
2239#ifdef TRANSPARENT
2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2241/* taken from aterm-0.4.2 */
2242
2243typedef uint32_t RUINT32T;
2244
2245void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2246{
2247 int sh_r, sh_g, sh_b;
2248 RUINT32T mask_r, mask_g, mask_b;
2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2252 int i;
2253
2254 Visual *visual = term->visual;
2255
2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2257
2258 /* for convenience */
2259 mask_r = visual->red_mask;
2260 mask_g = visual->green_mask;
2261 mask_b = visual->blue_mask;
2262
2263 /* boring lookup table pre-initialization */
2264 switch (srcImage->bits_per_pixel) {
2265 case 15:
2266 if ((mask_r != 0x7c00) ||
2267 (mask_g != 0x03e0) ||
2268 (mask_b != 0x001f))
2269 return;
2270 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2271 lookup_r = lookup;
2272 lookup_g = lookup+32;
2273 lookup_b = lookup+32+32;
2274 sh_r = 10;
2275 sh_g = 5;
2276 sh_b = 0;
2277 break;
2278 case 16:
2279 if ((mask_r != 0xf800) ||
2280 (mask_g != 0x07e0) ||
2281 (mask_b != 0x001f))
2282 return;
2283 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2284 lookup_r = lookup;
2285 lookup_g = lookup+32;
2286 lookup_b = lookup+32+64;
2287 sh_r = 11;
2288 sh_g = 5;
2289 sh_b = 0;
2290 break;
2291 case 24:
2292 if ((mask_r != 0xff0000) ||
2293 (mask_g != 0x00ff00) ||
2294 (mask_b != 0x0000ff))
2295 return;
2296 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2297 lookup_r = lookup;
2298 lookup_g = lookup+256;
2299 lookup_b = lookup+256+256;
2300 sh_r = 16;
2301 sh_g = 8;
2302 sh_b = 0;
2303 break;
2304 case 32:
2305 if ((mask_r != 0xff0000) ||
2306 (mask_g != 0x00ff00) ||
2307 (mask_b != 0x0000ff))
2308 return;
2309 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2310 lookup_r = lookup;
2311 lookup_g = lookup+256;
2312 lookup_b = lookup+256+256;
2313 sh_r = 16;
2314 sh_g = 8;
2315 sh_b = 0;
2316 break;
2317 default:
2318 return; /* we do not support this color depth */
2319 }
2320
2321 /* prepare limits for color transformation (each channel is handled separately) */
2322 if (shade < 0) {
2323 shade = -shade;
2324 if (shade < 0) shade = 0;
2325 if (shade > 100) shade = 100;
2326
2327 lower_lim_r = 65535-rm;
2328 lower_lim_g = 65535-gm;
2329 lower_lim_b = 65535-bm;
2330
2331 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2332 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2333 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2334
2335 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2336 } else {
2337 if (shade < 0) shade = 0;
2338 if (shade > 100) shade = 100;
2339
2340 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2341
2342 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2343 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2344 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2345 }
2346
2347 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2348 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2349 {
2350 unsigned int tmp;
2351
2352 tmp = lower_lim_r;
2353 lower_lim_r = lower_lim_b;
2354 lower_lim_b = tmp;
2355
2356 tmp = upper_lim_r;
2357 upper_lim_r = upper_lim_b;
2358 upper_lim_b = tmp;
2359 }
2360
2361 /* fill our lookup tables */
2362 for (i = 0; i <= mask_r>>sh_r; i++)
2363 {
2364 RUINT32T tmp;
2365 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2366 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2367 lookup_r[i] = (tmp/65535)<<sh_r;
2368 }
2369 for (i = 0; i <= mask_g>>sh_g; i++)
2370 {
2371 RUINT32T tmp;
2372 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2373 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2374 lookup_g[i] = (tmp/65535)<<sh_g;
2375 }
2376 for (i = 0; i <= mask_b>>sh_b; i++)
2377 {
2378 RUINT32T tmp;
2379 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2380 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2381 lookup_b[i] = (tmp/65535)<<sh_b;
2382 }
2383
2384 /* apply table to input image (replacing colors by newly calculated ones) */
2385 switch (srcImage->bits_per_pixel)
2386 {
2387 case 15:
2388 {
2389 unsigned short *p1, *pf, *p, *pl;
2390 p1 = (unsigned short *) srcImage->data;
2391 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2392 while (p1 < pf)
2393 {
2394 p = p1;
2395 pl = p1 + srcImage->width;
2396 for (; p < pl; p++)
2397 {
2398 *p = lookup_r[(*p & 0x7c00)>>10] |
2399 lookup_g[(*p & 0x03e0)>> 5] |
2400 lookup_b[(*p & 0x001f)];
2401 }
2402 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2403 }
2404 break;
2405 }
2406 case 16:
2407 {
2408 unsigned short *p1, *pf, *p, *pl;
2409 p1 = (unsigned short *) srcImage->data;
2410 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2411 while (p1 < pf)
2412 {
2413 p = p1;
2414 pl = p1 + srcImage->width;
2415 for (; p < pl; p++)
2416 {
2417 *p = lookup_r[(*p & 0xf800)>>11] |
2418 lookup_g[(*p & 0x07e0)>> 5] |
2419 lookup_b[(*p & 0x001f)];
2420 }
2421 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2422 }
2423 break;
2424 }
2425 case 24:
2426 {
2427 unsigned char *p1, *pf, *p, *pl;
2428 p1 = (unsigned char *) srcImage->data;
2429 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2430 while (p1 < pf)
2431 {
2432 p = p1;
2433 pl = p1 + srcImage->width * 3;
2434 for (; p < pl; p += 3)
2435 {
2436 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2437 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2438 p[2] = lookup_r[(p[2] & 0x0000ff)];
2439 }
2440 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2441 }
2442 break;
2443 }
2444 case 32:
2445 {
2446 RUINT32T *p1, *pf, *p, *pl;
2447 p1 = (RUINT32T *) srcImage->data;
2448 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2449
2450 while (p1 < pf)
2451 {
2452 p = p1;
2453 pl = p1 + srcImage->width;
2454 for (; p < pl; p++)
2455 {
2456 *p = lookup_r[(*p & 0xff0000)>>16] |
2457 lookup_g[(*p & 0x00ff00)>> 8] |
2458 lookup_b[(*p & 0x0000ff)] |
2459 (*p & ~0xffffff);
2460 }
2461 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2462 }
2463 break;
2464 }
2465 }
2466
2467 free (lookup);
2468}
2469#endif
2470
2471/*
2472 * Check our parents are still who we think they are.
2473 * Do transparency updates if required
2474 */
2475int
2476rxvt_term::check_our_parents ()
2477{
2478#if TRANSPARENT || ENABLE_PERL
2479 check_our_aprents_ev.stop();
2480 check_our_aprents_ev.start(NOW + 1./3.);
2481#endif
2482 return 0;
2483}
2484
2485void
2486rxvt_term::check_our_parents_cb (time_watcher &w)
2487{
2488 int i, pchanged, aformat, have_pixmap, rootdepth;
2489 unsigned long nitems, bytes_after;
2490 Atom atype;
2491 unsigned char *prop = NULL;
2492 Window root, oldp, *list;
2493 Pixmap rootpixmap = None;
2494 XWindowAttributes wattr, wrootattr;
2495 int sx, sy;
2496 Window cr;
2497
2498 pchanged = 0;
2499
2500 if (!option (Opt_transparent))
2501 return /*pchanged*/; /* Don't try any more */
2502
2503 XGetWindowAttributes (dpy, display->root, &wrootattr);
2504 rootdepth = wrootattr.depth;
2505
2506 XGetWindowAttributes (dpy, parent[0], &wattr);
2507
2508 if (rootdepth != wattr.depth)
2509 {
2510 if (am_transparent)
2511 {
2512 pchanged = 1;
2513 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2514 am_transparent = am_pixmap_trans = 0;
2515 }
2516
2517 return /*pchanged*/; /* Don't try any more */
2518 }
2519
2520 /* Get all X ops out of the queue so that our information is up-to-date. */
2521 XSync (dpy, False);
2522
2523 XTranslateCoordinates (dpy, parent[0], display->root,
2524 0, 0, &sx, &sy, &cr);
2525
2526 /* check if we are outside of the visible part of the virtual screen : */
2527 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
2528 || sx >= wrootattr.width || sy >= wrootattr.height )
2529 return /* 0 */ ;
2530 /*
2531 * Make the frame window set by the window manager have
2532 * the root background. Some window managers put multiple nested frame
2533 * windows for each client, so we have to take care about that.
2534 */
2535 i = (xa[XA_XROOTPMAP_ID]
2536 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2537 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2538 &nitems, &bytes_after, &prop) == Success);
2539
2540 if (!i || prop == NULL)
2541 i = (xa[XA_ESETROOT_PMAP_ID]
2542 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2543 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2544 &nitems, &bytes_after, &prop) == Success);
2545
2546 if (!i || prop == NULL
2547#if TINTING
2548 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
2549#ifdef HAVE_AFTERIMAGE
2550 && original_asim == NULL && rs[Rs_blurradius] == NULL
2551#endif
2552 )
2553#endif
2554 )
2555 have_pixmap = 0;
2556 else
2557 {
2558 have_pixmap = 1;
2559 rootpixmap = *(Pixmap *)prop;
2560 XFree (prop);
2561 }
2562
2563 if (have_pixmap)
2564 {
2565 Bool success = False ;
2566 GC gc;
2567 XGCValues gcvalue;
2568#ifdef HAVE_AFTERIMAGE
2569 {
2570 Pixmap tmp_pmap = None ;
2571 ShadingInfo shade;
2572 ARGB32 tint ;
2573 unsigned int pmap_w = 0, pmap_h = 0;
2574
2575 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))
2576 {
2577 int root_x = 0, root_y = 0;
2578
2579 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580 if (ISSET_PIXCOLOR (Color_tint))
2581 {
2582 rgba c;
2583 pix_colors_focused [Color_tint].get (c);
2584 shade.tintColor.red = c.r;
2585 shade.tintColor.green = c.g;
2586 shade.tintColor.blue = c.b;
2587 }
2588 else
2589 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
2590 tint = shading2tint32( &shade );
2591 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2592 if (GetWinPosition (parent[0], &root_x, &root_y) )
2593 {
2594 ASImageLayer *layers = create_image_layers( 2 );
2595 ASImage *merged_im = NULL;
2596 int back_x, back_y, back_w, back_h;
2597 /* merge_layers does good job at tiling background appropriately,
2598 so all we need is to cut out smallest possible piece : */
2599#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
2600 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
2601 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
2602 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
2603 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
2604 else \
2605 { /* small background - need the whole of it for successfull tiling :*/ \
2606 back_##xy = 0; \
2607 back_##wh = pmap_##wh; \
2608 }}while(0)
2609
2610 MAKE_ROOTPMAP_GEOM(x,w,width);
2611 MAKE_ROOTPMAP_GEOM(y,h,height);
2612
2613 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
2614 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
2615 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
2616 layers[0].clip_width = szHint.width;
2617 layers[0].clip_height = szHint.height;
2618 layers[0].tint = tint;
2619 if (rs[Rs_blurradius] && layers[0].im)
2620 {
2621 double r = atof(rs[Rs_blurradius]);
2622 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
2623 if( tmp )
2624 {
2625 destroy_asimage( &layers[0].im );
2626 layers[0].im = tmp;
2627 }
2628 }
2629 if (original_asim != NULL)
2630 {
2631 int fore_w, fore_h;
2632 layers[1].im = original_asim;
2633 if( bgPixmap.auto_resize )
2634 {
2635 fore_w = szHint.width;
2636 fore_h = szHint.height;
2637 }
2638 else
2639 {
2640 fore_w = bgPixmap.w;
2641 fore_h = bgPixmap.h;
2642 }
2643 if (fore_w != original_asim->width
2644 || fore_h != original_asim->height)
2645 {
2646 layers[1].im = scale_asimage( display->asv,
2647 original_asim,
2648 fore_w, fore_h,
2649 ASA_ASImage, 100,
2650 ASIMAGE_QUALITY_DEFAULT );
2651 }
2652
2653 layers[1].clip_width = szHint.width;
2654 layers[1].clip_height = szHint.height;
2655
2656 if (rs[Rs_blendtype])
2657 {
2658 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
2659 if( layers[1].merge_scanlines == NULL )
2660 layers[1].merge_scanlines = alphablend_scanlines;
2661 }
2662 }
2663 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
2664 szHint.width, szHint.height,
2665 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
2666 if (layers[1].im != original_asim)
2667 destroy_asimage( &(layers[1].im) );
2668 destroy_asimage( &(layers[0].im) );
2669 if (merged_im != NULL)
2670 {
2671 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
2672 destroy_asimage( &merged_im );
2673 }
2674 free( layers );
2675 }
2676 }
2677 if (tmp_pmap != None)
2678 {
2679 success = True;
2680 if (pixmap != None)
2681 XFreePixmap (dpy, pixmap);
2682 pixmap = tmp_pmap;
2683 }
2684 }
2685#else /* HAVE_AFTERIMAGE */
2686 {
2687 /*
2688 * Copy display->root pixmap transparency
2689 */
2690 int nx, ny;
2691 unsigned int nw, nh;
2692 XImage *image;
2693
2694 nw = (unsigned int)szHint.width;
2695 nh = (unsigned int)szHint.height;
2696 nx = ny = 0;
2697
2698 if (sx < 0)
2699 {
2700 nw += sx;
2701 nx = -sx;
2702 sx = 0;
2703 }
2704
2705 if (sy < 0)
2706 {
2707 nh += sy;
2708 ny = -sy;
2709 sy = 0;
2710 }
2711
2712 min_it (nw, (unsigned int) (wrootattr.width - sx));
2713 min_it (nh, (unsigned int) (wrootattr.height - sy));
2714
2715 XSync (dpy, False);
2716 allowedxerror = -1;
2717 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2718
2719 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2720 /* XXX: may need a delay here? */
2721 allowedxerror = 0;
2722 if (image != NULL)
2723 {
2724 if (pixmap != None)
2725 XFreePixmap (dpy, pixmap);
2726
2727#if TINTING
2728 if (ISSET_PIXCOLOR (Color_tint))
2729 {
2730 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2731
2732 rgba c;
2733 pix_colors_focused [Color_tint].get (c);
2734 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2735 }
2736#endif
2737
2738 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2739 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2740 XPutImage (dpy, pixmap, gc, image, 0, 0,
2741 nx, ny, image->width, image->height);
2742 XDestroyImage (image);
2743 success = True ;
2744 }
2745 }
2746#endif /* HAVE_AFTERIMAGE */
2747 if (gc != NULL)
2748 XFreeGC (dpy, gc);
2749
2750 if (!success)
2751 {
2752 if (am_transparent && am_pixmap_trans)
2753 {
2754 pchanged = 1;
2755 if (pixmap != None)
2756 {
2757 XFreePixmap (dpy, pixmap);
2758 pixmap = None;
2759 }
2760 }
2761
2762 am_pixmap_trans = 0;
2763 }
2764 else
2765 {
2766 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2767 XClearWindow (dpy, parent[0]);
2768
2769 if (!am_transparent || !am_pixmap_trans)
2770 pchanged = 1;
2771
2772 am_transparent = am_pixmap_trans = 1;
2773 }
2774 }
2775
2776 if (am_pixmap_trans)
2777 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2778 else
2779 {
2780 unsigned int n;
2781 /*
2782 * InheritPixmap transparency
2783 */
2784 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2785 {
2786 oldp = parent[i];
2787 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2788 XFree (list);
2789
2790 if (parent[i] == display->root)
2791 {
2792 if (oldp != None)
2793 pchanged = 1;
2794
2795 break;
2796 }
2797
2798 if (oldp != parent[i])
2799 pchanged = 1;
2800 }
2801
2802 n = 0;
2803
2804 if (pchanged)
2805 for (; n < (unsigned int)i; n++)
2806 {
2807 XGetWindowAttributes (dpy, parent[n], &wattr);
2808
2809 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2810 {
2811 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2812 break;
2813 }
2814 }
2815
2816 if (n > (sizeof (parent) / sizeof (parent[0])))
2817 {
2818 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2819 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2820 am_transparent = 0;
2821 /* XXX: also turn off Opt_transparent? */
2822 }
2823 else
2824 {
2825 for (n = 0; n < (unsigned int)i; n++)
2826 {
2827 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2828 XClearWindow (dpy, parent[n]);
2829 }
2830
2831 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2832 am_transparent = 1;
2833 }
2834
2835 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2836 parent[i] = None;
2837 }
2838
2839 if (scrollBar.win)
2840 {
2841 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2842 scrollBar.setIdle ();
2843 scrollbar_show (0);
2844 }
2845
2846 if (am_transparent)
2847 {
2848 want_refresh = want_full_refresh = 1;
2849 if (am_pixmap_trans)
2850 flush ();
2851 }
2852
2853// return pchanged;
2854}
2855#endif
2856
2857/*}}} */ 2217/*}}} */
2858 2218
2859bool 2219void
2860rxvt_term::cmd_parse () 2220rxvt_term::cmd_parse ()
2861{ 2221{
2862 bool flag = false;
2863 wchar_t ch = NOCHAR; 2222 wchar_t ch = NOCHAR;
2864 char *seq_begin; // remember start of esc-sequence here 2223 char *seq_begin; // remember start of esc-sequence here
2865 2224
2866 for (;;) 2225 for (;;)
2867 { 2226 {
2868 if (ch == NOCHAR) 2227 if (expect_false (ch == NOCHAR))
2869 { 2228 {
2870 seq_begin = cmdbuf_ptr; 2229 seq_begin = cmdbuf_ptr;
2871 ch = next_char (); 2230 ch = next_char ();
2872 2231
2873 if (ch == NOCHAR) 2232 if (ch == NOCHAR)
2874 break; 2233 break;
2875 } 2234 }
2876 2235
2877 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))
2878 { 2237 {
2879 if (!seen_input) 2238 if (expect_false (!seen_input))
2880 { 2239 {
2881 seen_input = 1; 2240 seen_input = 1;
2882 // many badly-written programs (e.g. jed) contain a race condition: 2241 // many badly-written programs (e.g. jed) contain a race condition:
2883 // they first read the screensize and then install a SIGWINCH handler. 2242 // they first read the screensize and then install a SIGWINCH handler.
2884 // some window managers resize the window early, and these programs 2243 // some window managers resize the window early, and these programs
… …
2897 wchar_t *str = buf; 2256 wchar_t *str = buf;
2898 wchar_t *eol = str + min (ncol, UBUFSIZ); 2257 wchar_t *eol = str + min (ncol, UBUFSIZ);
2899 2258
2900 for (;;) 2259 for (;;)
2901 { 2260 {
2902 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)))
2903 break; 2262 break;
2904 2263
2905 *str++ = ch; 2264 *str++ = ch;
2906 2265
2907 if (ch == C0_LF || str >= eol) 2266 if (expect_false (ch == C0_LF || str >= eol))
2908 { 2267 {
2909 if (ch == C0_LF) 2268 if (ch == C0_LF)
2910 nlines++; 2269 nlines++;
2911 2270
2912 refresh_count++; 2271 refresh_count++;
2913 2272
2914 if (!option (Opt_jumpScroll) 2273 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2915 || (refresh_count >= refresh_limit * (nrow - 1)))
2916 { 2274 {
2917 refreshnow = true;
2918 refresh_count = 0; 2275 refresh_count = 0;
2276
2277 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2278 {
2279 refreshnow = true;
2919 ch = NOCHAR; 2280 ch = NOCHAR;
2920 break; 2281 break;
2282 }
2921 } 2283 }
2922 2284
2923 // scr_add_lines only works for nlines <= nrow - 1. 2285 // scr_add_lines only works for nlines <= nrow - 1.
2924 if (nlines >= nrow - 1) 2286 if (nlines >= nrow - 1)
2925 { 2287 {
… …
2953 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2315 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2954 scr_add_lines (buf, str - buf, nlines); 2316 scr_add_lines (buf, str - buf, nlines);
2955 2317
2956 /* 2318 /*
2957 * If there have been a lot of new lines, then update the screen 2319 * If there have been a lot of new lines, then update the screen
2958 * What the heck I'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.
2959 * the number of pages between refreshes is refresh_limit, which 2321 * if skipScroll is enabled.
2960 * is incremented here because we must be doing flat-out scrolling.
2961 */ 2322 */
2962 if (refreshnow) 2323 if (refreshnow)
2963 { 2324 {
2964 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2965 refresh_limit++;
2966 else
2967 {
2968 flag = true;
2969 //TODO: due to popular request, implement "skipscroll" option here
2970 scr_refresh (); 2325 scr_refresh ();
2971 want_refresh = 1; 2326 want_refresh = 1;
2972 }
2973 } 2327 }
2974
2975 } 2328 }
2976 else 2329 else
2977 { 2330 {
2978 try 2331 try
2979 { 2332 {
… …
2987 } 2340 }
2988 2341
2989 ch = NOCHAR; 2342 ch = NOCHAR;
2990 } 2343 }
2991 } 2344 }
2992
2993 return flag;
2994} 2345}
2995 2346
2996// read the next character 2347// read the next character
2997wchar_t 2348wchar_t
2998rxvt_term::next_char () NOTHROW 2349rxvt_term::next_char () NOTHROW
2999{ 2350{
3000 while (cmdbuf_ptr < cmdbuf_endp) 2351 while (cmdbuf_ptr < cmdbuf_endp)
3001 { 2352 {
3002 // assume 7-bit to be ascii ALWAYS 2353 // assume 7-bit to be ascii ALWAYS
3003 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2354 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
3004 return *cmdbuf_ptr++; 2355 return *cmdbuf_ptr++;
3005 2356
3006 wchar_t wc; 2357 wchar_t wc;
3007 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);
3008 2359
… …
3012 cmdbuf_ptr = cmdbuf_endp; 2363 cmdbuf_ptr = cmdbuf_endp;
3013 break; 2364 break;
3014 } 2365 }
3015 2366
3016 if (len == (size_t)-1) 2367 if (len == (size_t)-1)
2368 {
2369 mbstate.reset (); // reset now undefined conversion state
3017 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 }
3018 2372
3019 // assume wchar == unicode 2373 // assume wchar == unicode
3020 cmdbuf_ptr += len; 2374 cmdbuf_ptr += len;
3021 return wc & UNICODE_MASK; 2375 return wc & UNICODE_MASK;
3022 } 2376 }
… …
3033 : NOCHAR; 2387 : NOCHAR;
3034} 2388}
3035 2389
3036static class out_of_input out_of_input; 2390static class out_of_input out_of_input;
3037 2391
3038/* rxvt_cmd_getc () - Return next input character */
3039/*
3040 * Return the next input character after first passing any keyboard input
3041 * to the command.
3042 */
3043wchar_t 2392wchar_t
3044rxvt_term::cmd_getc () THROW ((class out_of_input)) 2393rxvt_term::cmd_getc () THROW ((class out_of_input))
3045{ 2394{
3046 wchar_t c = next_char (); 2395 wchar_t c = next_char ();
3047 2396
… …
3066/*----------------------------------------------------------------------*/ 2415/*----------------------------------------------------------------------*/
3067#ifdef PRINTPIPE 2416#ifdef PRINTPIPE
3068FILE * 2417FILE *
3069rxvt_term::popen_printer () 2418rxvt_term::popen_printer ()
3070{ 2419{
3071 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2420 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
3072 2421
3073 if (stream == NULL) 2422 if (stream == NULL)
3074 rxvt_warn ("can't open printer pipe, not printing.\n"); 2423 rxvt_warn ("can't open printer pipe, not printing.\n");
3075 2424
3076 return stream; 2425 return stream;
… …
3087 * simulate attached vt100 printer 2436 * simulate attached vt100 printer
3088 */ 2437 */
3089void 2438void
3090rxvt_term::process_print_pipe () 2439rxvt_term::process_print_pipe ()
3091{ 2440{
3092 int done; 2441 FILE *fd = popen_printer ();
3093 FILE *fd;
3094 2442
3095 if ((fd = popen_printer ()) == NULL) 2443 if (!fd)
3096 return; 2444 return;
3097 2445
3098 /* 2446 /*
3099 * 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
3100 * is received. 2448 * is received.
3101 */ 2449 */
3102 for (done = 0; !done;) 2450 for (int done = 0; !done; )
3103 { 2451 {
3104 unsigned char buf[8]; 2452 unsigned char buf[8];
3105 unicode_t ch; 2453 unicode_t ch;
3106 unsigned int i, len; 2454 unsigned int i, len;
3107 2455
… …
3126 { 2474 {
3127 if ((buf[len++] = cmd_getc ()) == 'i') 2475 if ((buf[len++] = cmd_getc ()) == 'i')
3128 break; /* done = 1 */ 2476 break; /* done = 1 */
3129 } 2477 }
3130 } 2478 }
3131 2479
3132 for (i = 0; i < len; i++) 2480 for (i = 0; i < len; i++)
3133 if (putc (buf[i], fd) == EOF) 2481 if (putc (buf[i], fd) == EOF)
3134 { 2482 {
3135 done = 1; 2483 done = 1;
3136 break; 2484 break;
… …
3138 } 2486 }
3139 } 2487 }
3140 2488
3141 pclose_printer (fd); 2489 pclose_printer (fd);
3142} 2490}
3143#endif /* PRINTPIPE */ 2491#endif /* PRINTPIPE */
3144/*}}} */ 2492/*}}} */
3145 2493
3146/* *INDENT-OFF* */ 2494/* *INDENT-OFF* */
3147enum { 2495enum {
3148 C1_40 = 0x40, 2496 C1_40 = 0x40,
… …
3198 process_dcs_seq (); 2546 process_dcs_seq ();
3199 break; 2547 break;
3200 case 0x9b: /* CSI */ 2548 case 0x9b: /* CSI */
3201 process_csi_seq (); 2549 process_csi_seq ();
3202 break; 2550 break;
3203 case 0x9d: /* CSI */ 2551 case 0x9d: /* OSC */
3204 process_osc_seq (); 2552 process_osc_seq ();
3205 break; 2553 break;
3206#endif 2554#endif
3207 } 2555 }
3208} 2556}
… …
3252 break; 2600 break;
3253 case 'Z': /* identify the terminal type */ 2601 case 'Z': /* identify the terminal type */
3254 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2602 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3255 break; 2603 break;
3256 case '<': /* turn off VT52 mode */ 2604 case '<': /* turn off VT52 mode */
3257 PrivMode (0, PrivMode_vt52); 2605 set_privmode (PrivMode_vt52, 0);
3258 break; 2606 break;
3259 case 'F': /* use special graphics character set */ 2607 case 'F': /* use special graphics character set */
3260 case 'G': /* use regular character set */ 2608 case 'G': /* use regular character set */
3261 /* unimplemented */ 2609 /* unimplemented */
3262 break; 2610 break;
… …
3316 scr_forwardindex (); 2664 scr_forwardindex ();
3317 break; 2665 break;
3318#endif 2666#endif
3319 case '=': 2667 case '=':
3320 case '>': 2668 case '>':
3321 PrivMode ((ch == '='), PrivMode_aplKP); 2669 set_privmode (PrivMode_aplKP, ch == '=');
3322 break; 2670 break;
3323 2671
3324 case C1_40: 2672 case C1_40:
3325 cmd_getc (); 2673 cmd_getc ();
3326 break; 2674 break;
… …
3330 2678
3331 /* 8.3.87: NEXT LINE */ 2679 /* 8.3.87: NEXT LINE */
3332 case C1_NEL: /* ESC E */ 2680 case C1_NEL: /* ESC E */
3333 { 2681 {
3334 wchar_t nlcr[] = { C0_LF, C0_CR }; 2682 wchar_t nlcr[] = { C0_LF, C0_CR };
3335 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2683 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
3336 } 2684 }
3337 break; 2685 break;
3338 2686
3339 /* kidnapped escape sequence: Should be 8.3.48 */ 2687 /* kidnapped escape sequence: Should be 8.3.48 */
3340 case C1_ESA: /* ESC G */ 2688 case C1_ESA: /* ESC G */
3341 process_graphics (); 2689 // used by original rxvt for rob nations own graphics mode
2690 if (cmd_getc () == 'Q')
2691 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3342 break; 2692 break;
3343 2693
3344 /* 8.3.63: CHARACTER TABULATION SET */ 2694 /* 8.3.63: CHARACTER TABULATION SET */
3345 case C1_HTS: /* ESC H */ 2695 case C1_HTS: /* ESC H */
3346 scr_set_tab (1); 2696 scr_set_tab (1);
… …
3365 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2715 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3366 case C1_SCI: /* ESC Z */ 2716 case C1_SCI: /* ESC Z */
3367 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2717 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3368 break; /* steal obsolete ESC [ c */ 2718 break; /* steal obsolete ESC [ c */
3369 2719
3370 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2720 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3371 case C1_CSI: /* ESC [ */ 2721 case C1_CSI: /* ESC [ */
3372 process_csi_seq (); 2722 process_csi_seq ();
3373 break; 2723 break;
3374 2724
3375 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2725 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3376 case C1_OSC: /* ESC ] */ 2726 case C1_OSC: /* ESC ] */
3377 process_osc_seq (); 2727 process_osc_seq ();
3378 break; 2728 break;
3379 2729
3380 /* 8.3.106: RESET TO INITIAL STATE */ 2730 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3381 case 'c': 2731 case 'c':
3382 mbstate.reset (); 2732 mbstate.reset ();
3383 scr_poweron (); 2733 scr_poweron ();
3384 scrollbar_show (1); 2734 scrollBar.show (1);
3385 break; 2735 break;
3386 2736
3387 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2737 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3388 case 'n': 2738 case 'n':
3389 scr_charset_choose (2); 2739 scr_charset_choose (2);
… …
3409 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2759 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3410 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2760 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3411 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2761 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3412}; 2762};
3413 2763
3414#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2764#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3415 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3416 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3417#define get_byte_array_bit(array, bit) \ 2767#define get_byte_array_bit(array, bit) \
3418 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2768 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3419 2769
3420const unsigned char csi_defaults[] = 2770static const unsigned char csi_defaults[] =
3421 { 2771 {
3422 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2772 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3423 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2773 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3424 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2774 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3425 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2775 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
3434rxvt_term::process_csi_seq () 2784rxvt_term::process_csi_seq ()
3435{ 2785{
3436 unicode_t ch, priv, i; 2786 unicode_t ch, priv, i;
3437 unsigned int nargs, p; 2787 unsigned int nargs, p;
3438 int n, ndef; 2788 int n, ndef;
3439 int arg[ESC_ARGS]; 2789 int arg[ESC_ARGS] = { };
3440 2790
3441 for (nargs = ESC_ARGS; nargs > 0;) 2791 nargs = 0;
3442 arg[--nargs] = 0;
3443 2792
3444 priv = 0; 2793 priv = 0;
3445 ch = cmd_getc (); 2794 ch = cmd_getc ();
3446 if (ch >= '<' && ch <= '?') 2795 if ((ch >= '<' && ch <= '?') || ch == '!')
2796 {
3447 { /* '<' '=' '>' '?' */ 2797 /* '<' '=' '>' '?' '!' */
3448 priv = ch; 2798 priv = ch;
3449 ch = cmd_getc (); 2799 ch = cmd_getc ();
3450 } 2800 }
3451 2801
3452 /* read any numerical arguments */ 2802 /* read any numerical arguments */
… …
3491 switch (priv) 2841 switch (priv)
3492 { 2842 {
3493 case '>': 2843 case '>':
3494 if (ch == CSI_DA) /* secondary device attributes */ 2844 if (ch == CSI_DA) /* secondary device attributes */
3495 { 2845 {
3496 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2846 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3497 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2847 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3498 // 2848 //
3499 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2849 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3500 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2850 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3501 // that we do not support xterm mouse reporting (should be 95 when we do). 2851 // versions.
3502 // 2852 //
3503 tt_printf ("\033[>%d;94;0c", 'U'); 2853 tt_printf ("\033[>%d;95;0c", 'U');
3504 } 2854 }
3505 break; 2855 break;
2856
3506 case '?': 2857 case '?':
3507 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2858 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3508 process_terminal_mode (ch, priv, nargs, arg); 2859 process_terminal_mode (ch, priv, nargs, arg);
3509 break; 2860 break;
2861
2862 case '!':
2863 if (ch == CSI_70)
2864 {
2865 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2866 scr_soft_reset ();
2867
2868 static const int pm_h[] = { 7, 25 };
2869 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2870
2871 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2872 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
3510 } 2873 }
2874 break;
2875 }
2876
3511 return; 2877 return;
3512 } 2878 }
3513 2879
3514 switch (ch) 2880 switch (ch)
3515 { 2881 {
… …
3749 { 3115 {
3750 /* 3116 /*
3751 * commands 3117 * commands
3752 */ 3118 */
3753 case 1: /* deiconify window */ 3119 case 1: /* deiconify window */
3754 XMapWindow (dpy, parent[0]); 3120 XMapWindow (dpy, parent);
3755 break; 3121 break;
3756 case 2: /* iconify window */ 3122 case 2: /* iconify window */
3757 XIconifyWindow (dpy, parent[0], display->screen); 3123 XIconifyWindow (dpy, parent, display->screen);
3758 break; 3124 break;
3759 case 3: /* set position (pixels) */ 3125 case 3: /* set position (pixels) */
3760 XMoveWindow (dpy, parent[0], args[1], args[2]); 3126 XMoveWindow (dpy, parent, args[1], args[2]);
3761 break; 3127 break;
3762 case 4: /* set size (pixels) */ 3128 case 4: /* set size (pixels) */
3763 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3764 break; 3130 break;
3765 case 5: /* raise window */ 3131 case 5: /* raise window */
3766 XRaiseWindow (dpy, parent[0]); 3132 XRaiseWindow (dpy, parent);
3767 break; 3133 break;
3768 case 6: /* lower window */ 3134 case 6: /* lower window */
3769 XLowerWindow (dpy, parent[0]); 3135 XLowerWindow (dpy, parent);
3770 break; 3136 break;
3771 case 7: /* refresh window */ 3137 case 7: /* refresh window */
3772 scr_touch (true); 3138 scr_touch (true);
3773 break; 3139 break;
3774 case 8: /* set size (chars) */ 3140 case 8: /* set size (chars) */
… …
3785 3151
3786 /* 3152 /*
3787 * reports - some output format copied from XTerm 3153 * reports - some output format copied from XTerm
3788 */ 3154 */
3789 case 11: /* report window state */ 3155 case 11: /* report window state */
3790 XGetWindowAttributes (dpy, parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent, &wattr);
3791 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3792 break; 3158 break;
3793 case 13: /* report window position */ 3159 case 13: /* report window position */
3794 XGetWindowAttributes (dpy, parent[0], &wattr); 3160 XGetWindowAttributes (dpy, parent, &wattr);
3795 XTranslateCoordinates (dpy, parent[0], wattr.root, 3161 XTranslateCoordinates (dpy, parent, wattr.root,
3796 -wattr.border_width, -wattr.border_width, 3162 -wattr.border_width, -wattr.border_width,
3797 &x, &y, &wdummy); 3163 &x, &y, &wdummy);
3798 tt_printf ("\033[3;%d;%dt", x, y); 3164 tt_printf ("\033[3;%d;%dt", x, y);
3799 break; 3165 break;
3800 case 14: /* report window size (pixels) */ 3166 case 14: /* report window size (pixels) */
3801 XGetWindowAttributes (dpy, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent, &wattr);
3802 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3803 break; 3169 break;
3804 case 18: /* report text area size (chars) */ 3170 case 18: /* report text area size (chars) */
3805 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3171 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3806 break; 3172 break;
… …
3808 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3174 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3809 break; 3175 break;
3810 case 20: /* report icon label */ 3176 case 20: /* report icon label */
3811 { 3177 {
3812 char *s; 3178 char *s;
3813 XGetIconName (dpy, parent[0], &s); 3179 XGetIconName (dpy, parent, &s);
3814 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3180 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3815 XFree (s); 3181 XFree (s);
3816 } 3182 }
3817 break; 3183 break;
3818 case 21: /* report window title */ 3184 case 21: /* report window title */
3819 { 3185 {
3820 char *s; 3186 char *s;
3821 XFetchName (dpy, parent[0], &s); 3187 XFetchName (dpy, parent, &s);
3822 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3188 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3823 XFree (s); 3189 XFree (s);
3824 } 3190 }
3825 break; 3191 break;
3826 } 3192 }
… …
3882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3248 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3883 */ 3249 */
3884void 3250void
3885rxvt_term::process_dcs_seq () 3251rxvt_term::process_dcs_seq ()
3886{ 3252{
3887 char *s;
3888 unicode_t eh;
3889
3890 /* 3253 /*
3891 * Not handled yet 3254 * Not handled yet
3892 */ 3255 */
3256
3257 unicode_t eh;
3893 s = get_to_st (eh); 3258 char *s = get_to_st (eh);
3894 if (s) 3259 if (s)
3895 free (s); 3260 free (s);
3896 3261
3897 return; 3262 return;
3898} 3263}
… …
3902 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3267 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3903 */ 3268 */
3904void 3269void
3905rxvt_term::process_osc_seq () 3270rxvt_term::process_osc_seq ()
3906{ 3271{
3907 unicode_t ch, eh;
3908 int arg; 3272 int arg;
3909 3273
3910 ch = cmd_getc (); 3274 unicode_t ch = cmd_getc ();
3911 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3275 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3912 arg = arg * 10 + (ch - '0'); 3276 arg = arg * 10 + (ch - '0');
3913 3277
3914 if (ch == ';') 3278 if (ch == ';')
3915 { 3279 {
3280 unicode_t eh;
3916 char *s = get_to_st (eh); 3281 char *s = get_to_st (eh);
3917 3282
3918 if (s) 3283 if (s)
3919 { 3284 {
3920 process_xterm_seq (arg, s, eh); 3285 process_xterm_seq (arg, s, eh);
… …
3944 3309
3945/* 3310/*
3946 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3947 */ 3312 */
3948void 3313void
3949rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3314rxvt_term::process_xterm_seq (int op, char *str, char resp)
3950{ 3315{
3951 int color; 3316 int color;
3952 char *buf, *name; 3317 char *buf, *name;
3953 bool query = str[0] == '?' && !str[1]; 3318 bool query = str[0] == '?' && !str[1];
3954 int saveop = op; 3319 int saveop = op;
3955 3320
3956 dLocal (Display *, dpy); 3321 dLocal (Display *, dpy);
3957 3322
3958 assert (str != NULL); 3323 assert (str != NULL);
3959 3324
3960 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3325 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3961 return; 3326 return;
3962 3327
3963 switch (op) 3328 switch (op)
3964 { 3329 {
… …
3981 unsigned long bytes_after; 3346 unsigned long bytes_after;
3982 unsigned char *value = 0; 3347 unsigned char *value = 0;
3983 const char *str = ""; 3348 const char *str = "";
3984 3349
3985 if (prop 3350 if (prop
3986 && XGetWindowProperty (dpy, parent[0], 3351 && XGetWindowProperty (dpy, parent,
3987 prop, 0, 1<<16, 0, AnyPropertyType, 3352 prop, 0, 1<<16, 0, AnyPropertyType,
3988 &actual_type, &actual_format, 3353 &actual_type, &actual_format,
3989 &nitems, &bytes_after, &value) == Success 3354 &nitems, &bytes_after, &value) == Success
3990 && actual_type != None 3355 && actual_type != None
3991 && actual_format == 8) 3356 && actual_format == 8)
… …
3995 3360
3996 XFree (value); 3361 XFree (value);
3997 } 3362 }
3998 else 3363 else
3999 { 3364 {
4000 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3365 char *eq = strchr (str, '=');
4001 3366
4002 if (eq) 3367 if (eq)
4003 { 3368 {
4004 *eq = 0; 3369 *eq = 0;
4005 set_utf8_property (display->atom (str), eq + 1); 3370 set_utf8_property (display->atom (str), eq + 1);
4006 } 3371 }
4007 else 3372 else
4008 XDeleteProperty (dpy, parent[0], 3373 XDeleteProperty (dpy, parent,
4009 display->atom (str)); 3374 display->atom (str));
4010 } 3375 }
4011 break; 3376 break;
4012 3377
4013 case XTerm_Color: 3378 case XTerm_Color:
… …
4026 *buf++ = '\0'; 3391 *buf++ = '\0';
4027 3392
4028 process_color_seq (op, color, name, resp); 3393 process_color_seq (op, color, name, resp);
4029 } 3394 }
4030 break; 3395 break;
3396 case Rxvt_restoreFG:
4031 case XTerm_Color00: 3397 case XTerm_Color00:
4032 process_color_seq (op, Color_fg, str, resp); 3398 process_color_seq (op, Color_fg, str, resp);
4033 break; 3399 break;
3400 case Rxvt_restoreBG:
4034 case XTerm_Color01: 3401 case XTerm_Color01:
4035 process_color_seq (op, Color_bg, str, resp); 3402 process_color_seq (op, Color_bg, str, resp);
4036 break; 3403 break;
4037#ifndef NO_CURSORCOLOR 3404#ifndef NO_CURSORCOLOR
4038 case XTerm_Color_cursor: 3405 case XTerm_Color_cursor:
… …
4043 process_color_seq (op, Color_pointer_fg, str, resp); 3410 process_color_seq (op, Color_pointer_fg, str, resp);
4044 break; 3411 break;
4045 case XTerm_Color_pointer_bg: 3412 case XTerm_Color_pointer_bg:
4046 process_color_seq (op, Color_pointer_bg, str, resp); 3413 process_color_seq (op, Color_pointer_bg, str, resp);
4047 break; 3414 break;
3415#ifdef OPTION_HC
3416 case XTerm_Color_HC:
3417 process_color_seq (op, Color_HC, str, resp);
3418 break;
3419 case XTerm_Color_HTC:
3420 process_color_seq (op, Color_HTC, str, resp);
3421 break;
3422#endif
4048#ifndef NO_BOLD_UNDERLINE_REVERSE 3423#ifndef NO_BOLD_UNDERLINE_REVERSE
4049 case XTerm_Color_RV:
4050 process_color_seq (op, Color_RV, str, resp);
4051 break;
4052 case Rxvt_Color_BD:
4053 case URxvt_Color_BD: 3424 case URxvt_Color_BD:
4054 process_color_seq (op, Color_BD, str, resp); 3425 process_color_seq (op, Color_BD, str, resp);
4055 break; 3426 break;
4056 case Rxvt_Color_UL:
4057 case URxvt_Color_UL: 3427 case URxvt_Color_UL:
4058 process_color_seq (op, Color_UL, str, resp); 3428 process_color_seq (op, Color_UL, str, resp);
4059 break; 3429 break;
4060 case URxvt_Color_IT: 3430 case URxvt_Color_IT:
4061 process_color_seq (op, Color_IT, str, resp); 3431 process_color_seq (op, Color_IT, str, resp);
4062 break; 3432 break;
4063#endif 3433#endif
4064#if TRANSPARENT && TINTING 3434 case URxvt_Color_border:
3435 process_color_seq (op, Color_border, str, resp);
3436 break;
3437#if ENABLE_TRANSPARENCY
4065 case URxvt_Color_tint: 3438 case URxvt_Color_tint:
4066 process_color_seq (op, Color_tint, str, resp); 3439 process_color_seq (op, Color_tint, str, resp);
3440 {
3441 bool changed = false;
4067 3442
4068 check_our_parents (); 3443 if (ISSET_PIXCOLOR (Color_tint))
3444 changed = bg_set_tint (pix_colors_focused [Color_tint]);
4069 3445
4070 if (am_transparent) 3446 if (changed)
4071 want_full_refresh = want_refresh = 1; 3447 update_background ();
3448 }
4072 3449
4073 break; 3450 break;
4074#endif 3451#endif
4075 3452
3453#if BG_IMAGE_FROM_FILE
4076 case Rxvt_Pixmap: 3454 case Rxvt_Pixmap:
4077 { 3455 if (!strcmp (str, "?"))
4078 if (*str != ';')
4079 { 3456 {
4080#if XPM_BACKGROUND 3457 char str[256];
4081 scale_pixmap (""); /* reset to default scaling */ 3458
4082 set_bgPixmap (str); /* change pixmap */ 3459 sprintf (str, "[%dx%d+%d+%d]",
4083 scr_touch (true); 3460 min (h_scale, 32767), min (v_scale, 32767),
4084#endif 3461 min (h_align, 32767), min (v_align, 32767));
3462 process_xterm_seq (XTerm_title, str, CHAR_ST);
4085 } 3463 }
4086 3464 else
3465 {
4087 int changed = 0; 3466 int changed = 0;
4088 3467
4089 while ((str = strchr (str, ';')) != NULL) 3468 if (*str != ';')
4090 { 3469 {
3470 if (bg_set_file (str)) /* change pixmap */
3471 {
3472 changed++;
3473 str = strchr (str, ';');
3474 if (str == NULL)
3475 bg_set_default_geometry ();
3476 else
3477 bg_set_geometry (str+1);
3478 }
3479 }
3480 else
3481 {
4091 str++; 3482 str++;
4092#if XPM_BACKGROUND 3483 if (bg_set_geometry (str, true))
4093 changed += scale_pixmap (str); 3484 changed++;
4094#endif
4095 } 3485 }
4096 3486
4097 if (changed) 3487 if (changed)
4098 { 3488 {
4099#ifdef XPM_BACKGROUND 3489 if (bg_window_position_sensitive ())
4100 resize_pixmap (); 3490 {
4101 scr_touch (true); 3491 int x, y;
4102#endif 3492 get_window_origin (x, y);
3493 bg_set_position (x, y);
3494 }
3495 update_background ();
4103 } 3496 }
4104#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4105 if (option(Opt_transparent))
4106 check_our_parents ();
4107#endif
4108
4109 } 3497 }
4110 break; 3498 break;
4111 3499#endif
4112 case Rxvt_restoreFG:
4113 set_window_color (Color_fg, str);
4114 break;
4115 case Rxvt_restoreBG:
4116 set_window_color (Color_bg, str);
4117 break;
4118 3500
4119 case XTerm_logfile: 3501 case XTerm_logfile:
4120 // TODO, when secure mode? 3502 // TODO, when secure mode?
4121 break; 3503 break;
4122 3504
… …
4189 break; 3571 break;
4190#endif 3572#endif
4191 3573
4192#if ENABLE_PERL 3574#if ENABLE_PERL
4193 case URxvt_perl: 3575 case URxvt_perl:
4194 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3576 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4195 ; // no responses yet
4196 break; 3577 break;
4197#endif 3578#endif
4198 } 3579 }
4199} 3580}
4200/*----------------------------------------------------------------------*/ 3581/*----------------------------------------------------------------------*/
… …
4223 { 3604 {
4224 if (mode == 'r') 3605 if (mode == 'r')
4225 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3606 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4226 else 3607 else
4227 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3608 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4228 PrivMode (state, bit); 3609
3610 set_privmode (bit, state);
4229 } 3611 }
4230 3612
4231 return state; 3613 return state;
4232} 3614}
4233 3615
… …
4237{ 3619{
4238 unsigned int i, j; 3620 unsigned int i, j;
4239 int state; 3621 int state;
4240 3622
4241 static const struct 3623 static const struct
4242 { 3624 {
4243 const int argval; 3625 const int argval;
4244 const unsigned long bit; 3626 const unsigned long bit;
4245 }
4246
4247 argtopriv[] = { 3627 } argtopriv[] = {
4248 { 1, PrivMode_aplCUR }, 3628 { 1, PrivMode_aplCUR }, // DECCKM
4249 { 2, PrivMode_vt52 }, 3629 { 2, PrivMode_vt52 },
4250 { 3, PrivMode_132 }, 3630 { 3, PrivMode_132 }, // DECCOLM
4251 { 4, PrivMode_smoothScroll }, 3631 { 4, PrivMode_smoothScroll }, // DECSCLM
4252 { 5, PrivMode_rVideo }, 3632 { 5, PrivMode_rVideo }, // DECSCNM
4253 { 6, PrivMode_relOrigin }, 3633 { 6, PrivMode_relOrigin }, // DECOM
4254 { 7, PrivMode_Autowrap }, 3634 { 7, PrivMode_Autowrap }, // DECAWM
4255 // 8, bi-directional support mode 3635 // 8, auto-repeat keys // DECARM
4256 { 9, PrivMode_MouseX10 }, 3636 { 9, PrivMode_MouseX10 },
4257 // 18, 19 printing-related 3637 // 18 end FF to printer after print screen
3638 // 19 Print screen prints full screen/scroll region
4258 { 25, PrivMode_VisibleCursor }, 3639 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4259#ifdef scrollBar_esc 3640#ifdef scrollBar_esc
4260 { scrollBar_esc, PrivMode_scrollBar }, 3641 { scrollBar_esc, PrivMode_scrollBar },
4261#endif 3642#endif
4262 { 35, PrivMode_ShiftKeys }, // rxvt extension 3643 { 35, PrivMode_ShiftKeys }, // rxvt extension
3644 // 38, tektronix mode // DECTEK
4263 { 40, PrivMode_132OK }, 3645 { 40, PrivMode_132OK },
4264 // 41 xterm more fixes NYI 3646 // 41 xterm more fixes NYI
4265 // 45 margin bell NYI 3647 // 45 margin bell NYI
4266 // 46 start logging 3648 // 46 start logging
4267 { 47, PrivMode_Screen }, 3649 { 47, PrivMode_Screen },
4268 { 66, PrivMode_aplKP }, 3650 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4269#ifndef NO_BACKSPACE_KEY 3651#ifndef NO_BACKSPACE_KEY
4270 { 67, PrivMode_BackSpace }, 3652 { 67, PrivMode_BackSpace }, // DECBKM
4271#endif 3653#endif
4272 { 1000, PrivMode_MouseX11 }, 3654 { 1000, PrivMode_MouseX11 },
4273 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3655 { 1002, PrivMode_MouseBtnEvent },
4274 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3656 { 1003, PrivMode_MouseAnyEvent },
4275 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3657#if ENABLE_FRILLS
3658 { 1005, PrivMode_ExtModeMouse },
3659#endif
4276 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3660 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4277 { 1011, PrivMode_Keypress }, // rxvt extension 3661 { 1011, PrivMode_Keypress }, // rxvt extension
3662#if ENABLE_FRILLS
3663 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3664#endif
4278 // 1035 enable modifiers for alt, numlock NYI 3665 // 1035 enable modifiers for alt, numlock NYI
4279 // 1036 send ESC for meta keys NYI 3666 // 1036 send ESC for meta keys NYI
4280 // 1037 send DEL for keypad delete NYI 3667 // 1037 send DEL for keypad delete NYI
4281 { 1047, PrivMode_Screen }, 3668 { 1047, PrivMode_Screen },
4282 // 1048 save and restore cursor 3669 // 1048 save and restore cursor, implemented in code
4283 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3670 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4284 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3671 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3672 { 2004, PrivMode_BracketPaste },
4285 }; 3673 };
4286 3674
4287 if (nargs == 0) 3675 if (nargs == 0)
4288 return; 3676 return;
4289 3677
… …
4296 for (i = 0; i < nargs; i++) 3684 for (i = 0; i < nargs; i++)
4297 { 3685 {
4298 state = -1; 3686 state = -1;
4299 3687
4300 /* basic handling */ 3688 /* basic handling */
4301 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3689 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
4302 if (argtopriv[j].argval == arg[i]) 3690 if (argtopriv[j].argval == arg[i])
4303 { 3691 {
4304 state = privcases (mode, argtopriv[j].bit); 3692 state = privcases (mode, argtopriv[j].bit);
4305 break; 3693 break;
4306 } 3694 }
… …
4314 3702
4315 scr_touch (true); 3703 scr_touch (true);
4316 break; 3704 break;
4317#endif 3705#endif
4318 case 1048: /* alternative cursor save */ 3706 case 1048: /* alternative cursor save */
4319 case 1049:
4320 if (option (Opt_secondaryScreen)) 3707 if (option (Opt_secondaryScreen))
4321 if (mode == 0) 3708 if (mode == 0)
4322 scr_cursor (RESTORE); 3709 scr_cursor (RESTORE);
4323 else if (mode == 1) 3710 else if (mode == 1)
4324 scr_cursor (SAVE); 3711 scr_cursor (SAVE);
… …
4333 case 2: /* VT52 mode */ 3720 case 2: /* VT52 mode */
4334 /* oddball mode. should be set regardless of set/reset 3721 /* oddball mode. should be set regardless of set/reset
4335 * parameter. Return from VT52 mode with an ESC < from 3722 * parameter. Return from VT52 mode with an ESC < from
4336 * within VT52 mode 3723 * within VT52 mode
4337 */ 3724 */
4338 PrivMode (1, PrivMode_vt52); 3725 set_privmode (PrivMode_vt52, 1);
4339 break; 3726 break;
4340 case 3: /* 80/132 */ 3727 case 3: /* 80/132 */
4341 if (priv_modes & PrivMode_132OK) 3728 if (priv_modes & PrivMode_132OK)
4342 set_widthheight (((state ? 132 : 80) * fwidth), height); 3729 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4343 break; 3730 break;
4344 case 4: /* smooth scrolling */ 3731 case 4: /* smooth scrolling */
4345 set_option (Opt_jumpScroll, !state); 3732 set_option (Opt_jumpScroll, !state);
4346 break; 3733 break;
4347 case 5: /* reverse video */ 3734 case 5: /* reverse video */
… …
4354 scr_autowrap (state); 3741 scr_autowrap (state);
4355 break; 3742 break;
4356 /* case 8: - auto repeat, can't do on a per window basis */ 3743 /* case 8: - auto repeat, can't do on a per window basis */
4357 case 9: /* X10 mouse reporting */ 3744 case 9: /* X10 mouse reporting */
4358 if (state) /* orthogonal */ 3745 if (state) /* orthogonal */
4359 priv_modes &= ~PrivMode_MouseX11; 3746 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4360 break; 3747 break;
4361#ifdef scrollBar_esc 3748#ifdef scrollBar_esc
4362 case scrollBar_esc: 3749 case scrollBar_esc:
4363 if (scrollbar_mapping (state)) 3750 if (scrollBar.map (state))
4364 { 3751 {
4365 resize_all_windows (0, 0, 0); 3752 resize_all_windows (0, 0, 0);
4366 scr_touch (true); 3753 scr_touch (true);
4367 } 3754 }
4368 break; 3755 break;
… …
4377 break; 3764 break;
4378 /* case 66: - application key pad */ 3765 /* case 66: - application key pad */
4379 /* case 67: - backspace key */ 3766 /* case 67: - backspace key */
4380 case 1000: /* X11 mouse reporting */ 3767 case 1000: /* X11 mouse reporting */
4381 if (state) /* orthogonal */ 3768 if (state) /* orthogonal */
4382 priv_modes &= ~PrivMode_MouseX10; 3769 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4383 break; 3770 break;
4384#if 0
4385 case 1001: 3771 case 1002:
4386 break; /* X11 mouse highlighting */ 3772 case 1003:
4387#endif 3773 if (state)
3774 {
3775 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3776 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3777 mouse_row = mouse_col = 0;
3778 vt_emask_mouse = PointerMotionMask;
3779 }
3780 else
3781 vt_emask_mouse = NoEventMask;
3782
3783 vt_select_input ();
3784 break;
4388 case 1010: /* scroll to bottom on TTY output inhibit */ 3785 case 1010: /* scroll to bottom on TTY output inhibit */
4389 set_option (Opt_scrollTtyOutput, !state); 3786 set_option (Opt_scrollTtyOutput, !state);
4390 break; 3787 break;
4391 case 1011: /* scroll to bottom on key press */ 3788 case 1011: /* scroll to bottom on key press */
4392 set_option (Opt_scrollTtyKeypress, state); 3789 set_option (Opt_scrollTtyKeypress, state);
4393 break; 3790 break;
4394 case 1047: /* secondary screen w/ clearing last */ 3791 case 1047: /* secondary screen w/ clearing last */
4395 if (option (Opt_secondaryScreen)) 3792 if (option (Opt_secondaryScreen))
4396 if (current_screen != PRIMARY) 3793 if (!state)
4397 scr_erase_screen (2); 3794 scr_erase_screen (2);
3795
4398 scr_change_screen (state); 3796 scr_change_screen (state);
4399 break; 3797 break;
4400 case 1049: /* secondary screen w/ clearing first */ 3798 case 1049: /* secondary screen w/ clearing first */
3799 if (option (Opt_secondaryScreen))
3800 if (state)
3801 scr_cursor (SAVE);
3802
4401 scr_change_screen (state); 3803 scr_change_screen (state);
3804
4402 if (option (Opt_secondaryScreen)) 3805 if (option (Opt_secondaryScreen))
4403 if (current_screen != PRIMARY) 3806 if (state)
4404 scr_erase_screen (2); 3807 scr_erase_screen (2);
3808 else
3809 scr_cursor (RESTORE);
4405 break; 3810 break;
4406 default: 3811 default:
4407 break; 3812 break;
4408 } 3813 }
4409 } 3814 }
… …
4562 } 3967 }
4563 } 3968 }
4564} 3969}
4565/*}}} */ 3970/*}}} */
4566 3971
4567/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4568void
4569rxvt_term::process_graphics ()
4570{
4571 unicode_t ch, cmd = cmd_getc ();
4572
4573 if (cmd == 'Q')
4574 { /* query graphics */
4575 tt_printf ("\033G0\012"); /* no graphics */
4576 return;
4577 }
4578 /* swallow other graphics sequences until terminating ':' */
4579 do
4580 ch = cmd_getc ();
4581 while (ch != ':');
4582}
4583/*}}} */
4584
4585/* ------------------------------------------------------------------------- */ 3972/* ------------------------------------------------------------------------- */
4586 3973
4587/* 3974/*
4588 * Send printf () formatted output to the command. 3975 * Send printf () formatted output to the command.
4589 * Only use for small amounts of data. 3976 * Only use for small amounts of data.
… …
4602 3989
4603/* ---------------------------------------------------------------------- */ 3990/* ---------------------------------------------------------------------- */
4604/* Write data to the pty as typed by the user, pasted with the mouse, 3991/* Write data to the pty as typed by the user, pasted with the mouse,
4605 * or generated by us in response to a query ESC sequence. 3992 * or generated by us in response to a query ESC sequence.
4606 */ 3993 */
4607const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3994static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4608 3995
4609void 3996void
4610rxvt_term::tt_write (const char *data, unsigned int len) 3997rxvt_term::tt_write (const char *data, unsigned int len)
4611{ 3998{
4612 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3999 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4617 4004
4618 if (v_buflen == 0) 4005 if (v_buflen == 0)
4619 { 4006 {
4620 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4007 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4621 4008
4009 max_it (written, 0);
4010
4622 if ((unsigned int)written == len) 4011 if (written == len)
4623 return; 4012 return;
4624 4013
4625 data += written; 4014 data += written;
4626 len -= written; 4015 len -= written;
4627 } 4016 }
4628 4017
4629 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4018 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4630 4019
4631 memcpy (v_buffer + v_buflen, data, len); 4020 memcpy (v_buffer + v_buflen, data, len);
4632 v_buflen += len; 4021 v_buflen += len;
4633 4022
4634 pty_ev.set (EVENT_READ | EVENT_WRITE); 4023 pty_ev.set (ev::READ | ev::WRITE);
4635} 4024}
4636 4025
4637void rxvt_term::pty_write () 4026void rxvt_term::pty_write ()
4638{ 4027{
4639 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4028 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4644 4033
4645 if (v_buflen == 0) 4034 if (v_buflen == 0)
4646 { 4035 {
4647 free (v_buffer); 4036 free (v_buffer);
4648 v_buffer = 0; 4037 v_buffer = 0;
4649 v_buflen = 0;
4650 4038
4651 pty_ev.set (EVENT_READ); 4039 pty_ev.set (ev::READ);
4652 return; 4040 return;
4653 } 4041 }
4654 4042
4655 memmove (v_buffer, v_buffer + written, v_buflen); 4043 memmove (v_buffer, v_buffer + written, v_buflen);
4656 } 4044 }
4657 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4045 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4658 pty_ev.set (EVENT_READ); 4046 pty_ev.set (ev::READ);
4659} 4047}
4660 4048
4661/*----------------------- end-of-file (C source) -----------------------*/ 4049/*----------------------- end-of-file (C source) -----------------------*/
4662 4050

Diff Legend

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