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.318 by root, Sat Jan 13 15:26:56 2007 UTC vs.
Revision 1.494 by sf-exg, Mon Aug 22 17:23:56 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
… …
251#endif 257#endif
252 258
253void 259void
254rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
255{ 261{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 263
261 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
262 { 265 {
263 char mb[16]; 266 char mb[MB_LEN_MAX];
264 int len; 267 int len;
265 268
266 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
269 else 272 else
270 { 273 {
271 mb[0] = ch[0]; 274 mb[0] = ch;
272 len = 1; 275 len = 1;
273 } 276 }
274 277
275 if (len > 0) 278 if (len > 0)
276 tt_write (mb, len); 279 tt_write (mb, len);
… …
279 } 282 }
280 283
281 iso14755buf = 0; 284 iso14755buf = 0;
282} 285}
283 286
284int 287static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
286{ 289{
287 // check wether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
290 { 293 {
291 KeySym k = XLookupKeysym (&ev, index); 294 KeySym k = XLookupKeysym (&ev, index);
292 295
… …
298 301
299 return -1; 302 return -1;
300} 303}
301#endif 304#endif
302 305
306static inline KeySym
307translate_keypad (KeySym keysym, bool kp)
308{
309#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home
312 XK_KP_4, // XK_KP_Left
313 XK_KP_8, // XK_KP_Up
314 XK_KP_6, // XK_KP_Right
315 XK_KP_2, // XK_KP_Down
316# ifndef UNSHIFTED_SCROLLKEYS
317 XK_KP_9, // XK_KP_Prior
318 XK_KP_3, // XK_KP_Next
319# else
320 XK_Prior,
321 XK_Next,
322# endif
323 XK_KP_1, // XK_KP_End
324 XK_KP_5, // XK_KP_Begin
325 };
326
327 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
328 {
329 unsigned int index = keysym - XK_KP_Home;
330 keysym = kp ? keypadtrans[index] : XK_Home + index;
331 }
332 else if (keysym == XK_KP_Insert)
333 keysym = kp ? XK_KP_0 : XK_Insert;
334# ifndef NO_DELETE_KEY
335 else if (keysym == XK_KP_Delete)
336 keysym = kp ? XK_KP_Decimal : XK_Delete;
337# endif
338#endif
339 return keysym;
340}
341
342static inline int
343map_function_key (KeySym keysym)
344{
345 int param = 0;
346
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
348 {
349 param = 11 + keysym - XK_F1;
350 if (keysym >= XK_F17)
351 param += 4;
352 else if (keysym >= XK_F15)
353 param += 3;
354 else if (keysym >= XK_F11)
355 param += 2;
356 else if (keysym >= XK_F6)
357 param += 1;
358 }
359 else
360 switch (keysym)
361 {
362 case XK_Find:
363 param = 1;
364 break;
365 case XK_Insert:
366 param = 2;
367 break;
368#ifdef DXK_Remove
369 case DXK_Remove:
370#endif
371 case XK_Execute:
372 param = 3;
373 break;
374 case XK_Select:
375 param = 4;
376 break;
377#ifndef UNSHIFTED_SCROLLKEYS
378 case XK_Prior:
379 param = 5;
380 break;
381 case XK_Next:
382 param = 6;
383 break;
384 case XK_Home:
385 param = 7;
386 break;
387 case XK_End:
388 param = 8;
389 break;
390#endif
391 case XK_Help:
392 param = 28;
393 break;
394 case XK_Menu:
395 param = 29;
396 break;
397 }
398 return param;
399}
400
303void 401void
304rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
305{ 403{
306 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 405 KeySym keysym;
309 int valid_keysym; 406 int valid_keysym;
310 char kbuf[KBUFSZ]; 407 char kbuf[KBUFSZ];
311 408
312#if ISO_14755 409#if ISO_14755
… …
321 * Always permit `shift' to override the current setting 418 * Always permit `shift' to override the current setting
322 */ 419 */
323 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 422 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 423
333 kbuf[0] = 0; 424 kbuf[0] = 0;
334 425
335#ifdef USE_XIM 426#ifdef USE_XIM
336 if (Input_Context) 427 if (Input_Context)
… …
411#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 504#else
414 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
415#endif 506#endif
507 max_it (lnsppg, 1);
508
416 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
417 { 510 {
418 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
419 return; 512 return;
420 } 513 }
… …
473 selection_request (ev.time); 566 selection_request (ev.time);
474 return; 567 return;
475#if TODO 568#if TODO
476 /* rxvt extras */ 569 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 571 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 573 return;
483#endif 574#endif
484 } 575 }
485 } 576 }
486 } 577 }
487 578
488#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 580 // ISO 14755 support
490 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 582 {
492 int hv; 583 int hv;
493 584
494 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
497 { 588 {
498 commit_iso14755 (); 589 commit_iso14755 ();
499 iso14755buf = ISO_14755_51; 590 iso14755buf = ISO_14755_51;
500# if ISO_14755 591# if ISO_14755
501 iso14755_51 (0); 592 iso14755_51 (0);
593# endif
594 return;
595 }
596 else if (keysym == XK_BackSpace)
597 {
598 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
599# if ISO_14755
600 iso14755_51 (iso14755buf & ISO_14755_MASK);
502# endif 601# endif
503 return; 602 return;
504 } 603 }
505 else if ((hv = hex_keyval (ev)) >= 0) 604 else if ((hv = hex_keyval (ev)) >= 0)
506 { 605 {
… …
511# endif 610# endif
512 return; 611 return;
513 } 612 }
514 else 613 else
515 { 614 {
516# if ENABLE_OVERLAY 615# if ISO_14755
517 scr_overlay_off (); 616 scr_overlay_off ();
518# endif 617# endif
519 iso14755buf = 0; 618 iso14755buf = 0;
520 } 619 }
521 } 620 }
621 else if (option (Opt_iso14755) &&
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
524 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
525 { 625 {
526 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 627# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 629 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 630# endif
531 } 631 }
532#endif 632#endif
533 633
534#ifdef PRINTPIPE 634#ifdef PRINTPIPE
535 if (keysym == XK_Print) 635 if (keysym == XK_Print)
536 { 636 {
537 scr_printscreen (ctrl | shft); 637 scr_printscreen (ctrl | shft);
538 return; 638 return;
539 } 639 }
540#endif 640#endif
541 641
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 { 643 {
644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
645 unsigned int newlen = 1;
646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
544 { 653 {
654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
545 newlen = 1; 684 newlen = 0;
546 switch (keysym) 685 }
686 break;
687
688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
547 { 768 {
548#ifndef NO_BACKSPACE_KEY 769 int param = map_function_key (keysym);
549 case XK_BackSpace: 770 if (param > 0)
550 if (priv_modes & PrivMode_HaveBackSpace) 771 sprintf (kbuf,"\033[%d~", param);
551 {
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0';
555 }
556 else 772 else
557 strcpy (kbuf, key_backspace);
558 break;
559#endif
560#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior
562 case XK_KP_Delete:
563 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
565 {
566 strcpy (kbuf, "\033On");
567 break;
568 }
569 /* FALLTHROUGH */
570# endif
571 case XK_Delete:
572 strcpy (kbuf, key_delete);
573 break;
574#endif
575 case XK_Tab:
576 if (shft)
577 strcpy (kbuf, "\033[Z");
578 else
579 {
580#ifdef CTRL_TAB_MAKES_META
581 if (ctrl)
582 meta = 1;
583#endif
584#ifdef MOD4_TAB_MAKES_META
585 if (ev.state & Mod4Mask)
586 meta = 1;
587#endif
588 newlen = 0;
589 }
590 break;
591
592#ifdef XK_KP_Left
593 case XK_KP_Up: /* \033Ox or standard */
594 case XK_KP_Down: /* \033Or or standard */
595 case XK_KP_Right: /* \033Ov or standard */
596 case XK_KP_Left: /* \033Ot or standard */
597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
598 {
599 strcpy (kbuf, "\033OZ");
600 kbuf[2] = "txvr"[keysym - XK_KP_Left];
601 break;
602 }
603 else
604 /* translate to std. cursor key */
605 keysym = XK_Left + (keysym - XK_KP_Left);
606 /* FALLTHROUGH */
607#endif
608 case XK_Up: /* "\033[A" */
609 case XK_Down: /* "\033[B" */
610 case XK_Right: /* "\033[C" */
611 case XK_Left: /* "\033[D" */
612 strcpy (kbuf, "\033[Z");
613 kbuf[2] = "DACB"[keysym - XK_Left];
614 /* do Shift first */
615 if (shft)
616 kbuf[2] = "dacb"[keysym - XK_Left];
617 else if (ctrl)
618 {
619 kbuf[1] = 'O';
620 kbuf[2] = "dacb"[keysym - XK_Left];
621 }
622 else if (priv_modes & PrivMode_aplCUR)
623 kbuf[1] = 'O';
624 break;
625
626#ifndef UNSHIFTED_SCROLLKEYS
627# ifdef XK_KP_Prior
628 case XK_KP_Prior:
629 /* allow shift to override */
630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
631 {
632 strcpy (kbuf, "\033Oy");
633 break;
634 }
635 /* FALLTHROUGH */
636# endif
637 case XK_Prior:
638 strcpy (kbuf, "\033[5~");
639 break;
640# ifdef XK_KP_Next
641 case XK_KP_Next:
642 /* allow shift to override */
643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
644 {
645 strcpy (kbuf, "\033Os");
646 break;
647 }
648 /* FALLTHROUGH */
649# endif
650 case XK_Next:
651 strcpy (kbuf, "\033[6~");
652 break;
653#endif
654 case XK_KP_Enter:
655 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
657 {
658 strcpy (kbuf, "\033OM");
659 break;
660 }
661
662 /* FALLTHROUGH */
663
664 case XK_Return:
665 if (priv_modes & PrivMode_LFNL)
666 {
667 kbuf[0] = '\015';
668 kbuf[1] = '\012';
669 kbuf[2] = '\0';
670 }
671 else
672 {
673 kbuf[0] = '\015';
674 kbuf[1] = '\0';
675 }
676 break;
677
678#ifdef XK_KP_Begin
679 case XK_KP_Begin:
680 strcpy (kbuf, "\033Ou");
681 break;
682
683#endif
684 case XK_KP_F1: /* "\033OP" */
685 case XK_KP_F2: /* "\033OQ" */
686 case XK_KP_F3: /* "\033OR" */
687 case XK_KP_F4: /* "\033OS" */
688 strcpy (kbuf, "\033OP");
689 kbuf[2] += (keysym - XK_KP_F1);
690 break;
691
692 case XK_KP_Multiply: /* "\033Oj" : "*" */
693 case XK_KP_Add: /* "\033Ok" : "+" */
694 case XK_KP_Separator: /* "\033Ol" : "," */
695 case XK_KP_Subtract: /* "\033Om" : "-" */
696 case XK_KP_Decimal: /* "\033On" : "." */
697 case XK_KP_Divide: /* "\033Oo" : "/" */
698 case XK_KP_0: /* "\033Op" : "0" */
699 case XK_KP_1: /* "\033Oq" : "1" */
700 case XK_KP_2: /* "\033Or" : "2" */
701 case XK_KP_3: /* "\033Os" : "3" */
702 case XK_KP_4: /* "\033Ot" : "4" */
703 case XK_KP_5: /* "\033Ou" : "5" */
704 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
710 {
711 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply);
713 }
714 else
715 {
716 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
717 kbuf[1] = '\0';
718 }
719 break;
720
721 case XK_Find:
722 strcpy (kbuf, "\033[1~");
723 break;
724
725#ifdef XK_KP_End
726 case XK_KP_Insert:
727 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729 {
730 strcpy (kbuf, "\033Op");
731 break;
732 }
733 /* FALLTHROUGH */
734#endif
735 case XK_Insert:
736 strcpy (kbuf, "\033[2~");
737 break;
738#ifdef DXK_Remove /* support for DEC remove like key */
739 case DXK_Remove:
740 /* FALLTHROUGH */
741#endif
742 case XK_Execute:
743 strcpy (kbuf, "\033[3~");
744 break;
745 case XK_Select:
746 strcpy (kbuf, "\033[4~");
747 break;
748#ifdef XK_KP_End
749 case XK_KP_End:
750 /* allow shift to override */
751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
752 {
753 strcpy (kbuf, "\033Oq");
754 break;
755 }
756 /* FALLTHROUGH */
757#endif
758 case XK_End:
759 strcpy (kbuf, KS_END);
760 break;
761#ifdef XK_KP_Home
762 case XK_KP_Home:
763 /* allow shift to override */
764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
765 {
766 strcpy (kbuf, "\033Ow");
767 break;
768 }
769 /* FALLTHROUGH */
770#endif
771 case XK_Home:
772 strcpy (kbuf, KS_HOME);
773 break;
774
775#define FKEY(n, fkey) \
776 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
777
778 case XK_F1: /* "\033[11~" */
779 case XK_F2: /* "\033[12~" */
780 case XK_F3: /* "\033[13~" */
781 case XK_F4: /* "\033[14~" */
782 case XK_F5: /* "\033[15~" */
783 FKEY (11, XK_F1);
784 break;
785 case XK_F6: /* "\033[17~" */
786 case XK_F7: /* "\033[18~" */
787 case XK_F8: /* "\033[19~" */
788 case XK_F9: /* "\033[20~" */
789 case XK_F10: /* "\033[21~" */
790 FKEY (17, XK_F6);
791 break;
792 case XK_F11: /* "\033[23~" */
793 case XK_F12: /* "\033[24~" */
794 case XK_F13: /* "\033[25~" */
795 case XK_F14: /* "\033[26~" */
796 FKEY (23, XK_F11);
797 break;
798 case XK_F15: /* "\033[28~" */
799 case XK_F16: /* "\033[29~" */
800 FKEY (28, XK_F15);
801 break;
802 case XK_Help: /* "\033[28~" */
803 FKEY (28, XK_Help);
804 break;
805 case XK_Menu: /* "\033[29~" */
806 FKEY (29, XK_Menu);
807 break;
808 case XK_F17: /* "\033[31~" */
809 case XK_F18: /* "\033[32~" */
810 case XK_F19: /* "\033[33~" */
811 case XK_F20: /* "\033[34~" */
812 case XK_F21: /* "\033[35~" */
813 case XK_F22: /* "\033[36~" */
814 case XK_F23: /* "\033[37~" */
815 case XK_F24: /* "\033[38~" */
816 case XK_F25: /* "\033[39~" */
817 case XK_F26: /* "\033[40~" */
818 case XK_F27: /* "\033[41~" */
819 case XK_F28: /* "\033[42~" */
820 case XK_F29: /* "\033[43~" */
821 case XK_F30: /* "\033[44~" */
822 case XK_F31: /* "\033[45~" */
823 case XK_F32: /* "\033[46~" */
824 case XK_F33: /* "\033[47~" */
825 case XK_F34: /* "\033[48~" */
826 case XK_F35: /* "\033[49~" */
827 FKEY (31, XK_F17);
828 break;
829#undef FKEY
830 default:
831 newlen = 0; 773 newlen = 0;
832 break;
833 } 774 }
834 775 break;
835 if (newlen)
836 len = strlen (kbuf);
837 } 776 }
777
778 if (newlen)
779 len = strlen (kbuf);
838 780
839 /* 781 /*
840 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
841 */ 783 */
842#ifdef META8_OPTION 784#ifdef META8_OPTION
… …
877 return; 819 return;
878 820
879 if (len <= 0) 821 if (len <= 0)
880 return; /* not mapped */ 822 return; /* not mapped */
881 823
882 if (OPTION (Opt_scrollTtyKeypress)) 824 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 825 if (view_start)
884 { 826 {
885 view_start = 0; 827 view_start = 0;
886 want_refresh = 1; 828 want_refresh = 1;
887 } 829 }
… …
926#if ENABLE_FRILLS || ISO_14755 868#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 869 // ISO 14755 support
928 if (iso14755buf) 870 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 871 if (iso14755buf & ISO_14755_52)
930 { 872 {
931# if ENABLE_OVERLAY 873# if ISO_14755
932 scr_overlay_off (); 874 scr_overlay_off ();
933# endif 875# endif
934# if ISO_14755 876# if ISO_14755
935 // iso14755 part 5.2 handling: release time 877 // iso14755 part 5.2 handling: release time
936 // first: controls 878 // first: controls
… …
942 commit_iso14755 (); 884 commit_iso14755 ();
943 885
944 return; 886 return;
945 } 887 }
946 888
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
948 if (i[0] == keysym) 890 if (i[0] == keysym)
949 { 891 {
950 iso14755buf = ISO_14755_51 | i[1]; 892 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 (); 893 commit_iso14755 ();
952 894
… …
959 901
960 return; 902 return;
961 } 903 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 904 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 905 {
964# if ENABLE_OVERLAY 906# if ISO_14755
965 scr_overlay_off (); 907 scr_overlay_off ();
966# endif 908# endif
967 if (iso14755buf & ISO_14755_51) 909 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 910 commit_iso14755 ();
969#if ISO_14755 911#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 912 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 913 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 914 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 915
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 916 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 917 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
989 else if (keysym == XK_Control_L || keysym == XK_Control_R) 931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0; 932 mouse_slip_wheel_speed = 0;
991#endif 933#endif
992} 934}
993 935
994#if defined (KEYSYM_RESOURCE)
995unsigned int
996rxvt_term::cmd_write (const char *str, unsigned int count)
997{
998 unsigned int n, s;
999
1000 n = cmdbuf_ptr - cmdbuf_base;
1001 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1002
1003 if (n > 0 && s < count)
1004 {
1005 memmove (cmdbuf_base, cmdbuf_ptr,
1006 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1007 cmdbuf_ptr = cmdbuf_base;
1008 cmdbuf_endp -= n;
1009 s += n;
1010 }
1011
1012 if (count > s)
1013 {
1014 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1015 count = s;
1016 }
1017
1018 for (; count--;)
1019 *cmdbuf_endp++ = *str++;
1020
1021 cmd_parse ();
1022
1023 return 0;
1024}
1025#endif
1026
1027void 936void
1028rxvt_term::flush () 937rxvt_term::flush ()
1029{ 938{
1030 flush_ev.stop (); 939 flush_ev.stop ();
1031 940
1032#ifdef TRANSPARENT 941#ifdef HAVE_BG_PIXMAP
1033 if (want_full_refresh) 942 if (bg_flags & BG_NEEDS_REFRESH)
1034 { 943 {
1035 want_full_refresh = 0; 944 bg_flags &= ~BG_NEEDS_REFRESH;
1036 scr_clear ();
1037 scr_touch (false); 945 scr_touch (false);
1038 } 946 }
1039#endif 947#endif
1040 948
1041 if (want_refresh) 949 if (want_refresh)
… …
1077 } 985 }
1078 while (row < end_row); 986 while (row < end_row);
1079 } 987 }
1080 988
1081 scr_refresh (); 989 scr_refresh ();
1082 scrollbar_show (1); 990 scrollBar.show (1);
1083#ifdef USE_XIM 991#ifdef USE_XIM
1084 IMSendSpot (); 992 im_send_spot ();
1085#endif 993#endif
1086 } 994 }
1087 995
1088 display->flush (); 996 display->flush ();
1089} 997}
1090 998
999/* checks whether a refresh is requested and starts the refresh timer */
1091void 1000void
1092rxvt_term::check_cb (check_watcher &w) 1001rxvt_term::refresh_check ()
1002{
1003 if (want_refresh && !flush_ev.is_active ())
1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1005
1006 display->flush ();
1007}
1008
1009void
1010rxvt_term::flush_cb (ev::timer &w, int revents)
1093{ 1011{
1094 make_current (); 1012 make_current ();
1095 1013
1096 display->flush ();
1097
1098 if (want_refresh && !flush_ev.active)
1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1100}
1101
1102void
1103rxvt_term::flush_cb (time_watcher &w)
1104{
1105 make_current ();
1106
1107 refresh_limit = 1;
1108 refresh_count = 0; 1014 refresh_count = 0;
1109 flush (); 1015 flush ();
1110} 1016}
1111 1017
1112#ifdef CURSOR_BLINK 1018#ifdef CURSOR_BLINK
1113void 1019void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1021{
1116 hidden_cursor = !hidden_cursor; 1022 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1023 want_refresh = 1;
1118 1024 refresh_check ();
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1025}
1121#endif 1026#endif
1122 1027
1123#ifdef TEXT_BLINK 1028#ifdef TEXT_BLINK
1124void 1029void
1125rxvt_term::text_blink_cb (time_watcher &w) 1030rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1031{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1032 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1033 {
1129 hidden_text = !hidden_text; 1034 hidden_text = !hidden_text;
1130 want_refresh = 1; 1035 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL); 1036 refresh_check ();
1132 } 1037 }
1038 else
1039 w.stop ();
1133} 1040}
1134#endif 1041#endif
1135 1042
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1044void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1046{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1142 { 1049 {
1143 want_refresh = 1; 1050 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1051 refresh_check ();
1145 } 1052 }
1053 else
1054 w.stop ();
1146} 1055}
1147#endif 1056#endif
1148 1057
1149#ifdef SELECTION_SCROLLING 1058#ifdef SELECTION_SCROLLING
1150void 1059void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1060rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1061{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1062 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154 { 1063 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1064 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1065 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1066 refresh_check ();
1158 } 1067 }
1068 else
1069 w.stop ();
1159} 1070}
1160#endif 1071#endif
1161 1072
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1074void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1076{
1166 if (mouse_slip_wheel_speed == 0 1077 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1168 : scr_page (UP, mouse_slip_wheel_speed))
1169 { 1078 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1079 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1080 refresh_check ();
1081 }
1082
1083 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1084 {
1085 mouse_slip_wheel_speed = 0;
1086 w.stop ();
1175 } 1087 }
1176} 1088}
1177#endif 1089#endif
1178 1090
1179#if LINUX_YIELD_HACK 1091#if LINUX_YIELD_HACK
1180static struct event_handler 1092static struct event_handler
1181{ 1093{
1182 check_watcher yield_ev; 1094 ev::prepare yield_ev;
1183 1095
1184 void yield_cb (check_watcher &w) 1096 void yield_cb (ev::prepare &w, int revents)
1185 { 1097 {
1186 // this should really be sched_yield(), but the linux guys thought 1098 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1099 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is 1100 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1101 // allowed by the sus... as is returning ENOSYS.
1102 // since the linux guys additionally thought that breaking the only
1103 // known workaround against their unusable sched_yield hack is cool,
1104 // we just nanosleep a bit and hope for the best.
1190 1105
1191 struct timespec ts = { 0, 0 }; 1106 struct timespec ts = { 0, 1000 };
1192 nanosleep (&ts, 0); 1107 nanosleep (&ts, 0);
1193 1108
1194 w.stop (); 1109 w.stop ();
1195 } 1110 }
1196 1111
… …
1199 { 1114 {
1200 } 1115 }
1201} event_handler; 1116} event_handler;
1202#endif 1117#endif
1203 1118
1119/* make sure all the cmd data is at beginning of cmdbuf */
1120void
1121rxvt_term::cmdbuf_reify ()
1122{
1123 if (cmdbuf_ptr == cmdbuf_base)
1124 return;
1125
1126 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1127
1128 memmove (cmdbuf_base, cmdbuf_ptr, used);
1129 cmdbuf_ptr = cmdbuf_base;
1130 cmdbuf_endp = cmdbuf_ptr + used;
1131
1132}
1133
1134#if defined (KEYSYM_RESOURCE)
1135void
1136rxvt_term::cmdbuf_append (const char *str, size_t count)
1137{
1138 cmdbuf_reify ();
1139
1140 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1141
1142 if (count > avail)
1143 return;
1144
1145 memcpy (cmdbuf_endp, str, count);
1146 cmdbuf_endp += count;
1147
1148 cmd_parse ();
1149}
1150#endif
1151
1204bool 1152bool
1205rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1206{ 1154{
1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1208 1156
1209 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1210 { 1158
1211 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1212 n = 0;
1213 } 1160 {
1214 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1216 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1217 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1218 1166
1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1220 1168
1221 if (r > 0) 1169 if (r > 0)
1222 { 1170 {
1223 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1224 return true; 1172 return true;
… …
1232 } 1180 }
1233 else 1181 else
1234 { 1182 {
1235 pty_ev.stop (); 1183 pty_ev.stop ();
1236 1184
1237 if (!OPTION (Opt_hold)) 1185 if (!option (Opt_hold))
1238 destroy (); 1186 destroy ();
1239 } 1187 }
1240 1188
1241 return false; 1189 return false;
1242} 1190}
1243 1191
1244void 1192void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1193rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1194{
1247 make_current (); 1195 make_current ();
1248 1196
1249 if (revents & EVENT_READ) 1197 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1252 if (cmd_parse ()) 1200 cmd_parse ();
1253 break;
1254 1201
1255 if (revents & EVENT_WRITE) 1202 if (revents & ev::WRITE)
1256 pty_write (); 1203 pty_write ();
1204
1205 refresh_check ();
1257} 1206}
1258 1207
1259void 1208void
1260rxvt_term::pointer_unblank () 1209rxvt_term::pointer_unblank ()
1261{ 1210{
… …
1263 recolour_cursor (); 1212 recolour_cursor ();
1264 1213
1265#ifdef POINTER_BLANK 1214#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1215 hidden_pointer = 0;
1267 1216
1268 if (OPTION (Opt_pointerBlank)) 1217 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1218 pointer_ev.start (pointerBlankDelay);
1270#endif 1219#endif
1271} 1220}
1272 1221
1273#ifdef POINTER_BLANK 1222#ifdef POINTER_BLANK
1274void 1223void
1275rxvt_term::pointer_blank () 1224rxvt_term::pointer_blank ()
1276{ 1225{
1277 if (!OPTION (Opt_pointerBlank)) 1226 if (!option (Opt_pointerBlank))
1278 return; 1227 return;
1279 1228
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1229 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1230 XFlush (dpy);
1282 1231
1283 hidden_pointer = 1; 1232 hidden_pointer = 1;
1284} 1233}
1285 1234
1286void 1235void
1287rxvt_term::pointer_cb (time_watcher &w) 1236rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1237{
1289 make_current (); 1238 make_current ();
1290 1239
1291 pointer_blank (); 1240 pointer_blank ();
1292} 1241}
… …
1295void 1244void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1245rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1246{
1298 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1299 int x, y; 1248 int x, y;
1249 int code = 32;
1300 1250
1301 x = ev.x; 1251 x = Pixel2Col (ev.x) + 1;
1302 y = ev.y; 1252 y = Pixel2Row (ev.y) + 1;
1303 pixel_position (&x, &y); 1253
1254 if (ev.type == MotionNotify)
1255 {
1256 if (x == mouse_row && y == mouse_col)
1257 return;
1258
1259 mouse_row = x;
1260 mouse_col = y;
1261 code += 32;
1262 }
1304 1263
1305 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
1306 button_number = 3; 1265 button_number = 3;
1307 else 1266 else
1308 { 1267 {
1309 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1310 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1311 if (button_number >= 3) 1270 if (button_number >= 3)
1312 button_number += (64 - 3); 1271 button_number += 64 - 3;
1313 } 1272 }
1314 1273
1315 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1316 { 1275 {
1317 /* 1276 /*
… …
1349 fputc ('A', stderr); 1308 fputc ('A', stderr);
1350 if (key_state & 32) 1309 if (key_state & 32)
1351 fputc ('2', stderr); 1310 fputc ('2', stderr);
1352 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1353 button_number, 1312 button_number,
1354 x + 1, 1313 x,
1355 y + 1); 1314 y);
1356#endif 1315#endif
1357 1316
1317#if ENABLE_FRILLS
1318 if (priv_modes & PrivMode_ExtMouseRight)
1319 tt_printf ("\033[%d;%d;%dM",
1320 code + button_number + key_state,
1321 x,
1322 y);
1323 else if (priv_modes & PrivMode_ExtModeMouse)
1324 tt_printf ("\033[M%c%lc%lc",
1325 code + button_number + key_state,
1326 wint_t (32 + x),
1327 wint_t (32 + y));
1328 else
1329#endif
1358 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1331 code + button_number + key_state,
1360 (32 + x + 1), 1332 32 + x,
1361 (32 + y + 1)); 1333 32 + y);
1362} 1334}
1363 1335
1364/*{{{ process an X event */ 1336/*{{{ process an X event */
1365void 1337void
1366rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1398 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1399 focus_out ();
1428 } 1400 }
1429#endif 1401#endif
1430 } 1402 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1403 break;
1436 1404
1437 /* 1405 /*
1438 * XXX: this is not the _current_ arrangement 1406 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1407 * Here's my conclusion:
… …
1458 break; 1426 break;
1459 } 1427 }
1460 break; 1428 break;
1461 1429
1462 case FocusIn: 1430 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1431 if (ev.xfocus.detail != NotifyInferior
1432 && ev.xfocus.detail != NotifyPointer
1433 && ev.xfocus.mode != NotifyGrab)
1464 focus_in (); 1434 focus_in ();
1465 break; 1435 break;
1466 1436
1467 case FocusOut: 1437 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1438 if (ev.xfocus.detail != NotifyInferior
1439 && ev.xfocus.detail != NotifyPointer
1440 && ev.xfocus.mode != NotifyGrab)
1469 focus_out (); 1441 focus_out ();
1470 break; 1442 break;
1471 1443
1472 case ConfigureNotify: 1444 case ConfigureNotify:
1473 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1474 { 1446 {
1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1476 ; 1448 ;
1449
1450#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ())
1453 {
1454 int x, y;
1455 if (ev.xconfigure.send_event)
1456 {
1457 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y;
1459 }
1460 else
1461 get_window_origin (x, y);
1462
1463 if (bg_set_position (x, y)
1464 || !(bg_flags & BG_IS_VALID))
1465 moved = true;
1466 }
1467#endif
1477 1468
1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1479 { 1470 {
1480 seen_resize = 1; 1471 seen_resize = 1;
1481 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1482 } 1473 }
1474 else
1475 {
1476#ifdef HAVE_BG_PIXMAP
1477 if (moved)
1478 update_background ();
1479#endif
1480 }
1483 1481
1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485
1486#ifdef TRANSPARENT
1487 if (OPTION (Opt_transparent))
1488 check_our_parents ();
1489#endif
1490 } 1483 }
1491 break; 1484 break;
1492 1485
1493 case PropertyNotify: 1486 case PropertyNotify:
1494 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1487 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1495 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1496 && ev.xproperty.state == PropertyNewValue)
1497 selection_property (ev.xproperty.window, ev.xproperty.atom);
1498
1499 break; 1488 break;
1500 1489
1501 case SelectionClear: 1490 case SelectionClear:
1502 selection_clear (); 1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1503 break;
1504
1505 case SelectionNotify:
1506 if (selection_wait == Sel_normal)
1507 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1508 break; 1492 break;
1509 1493
1510 case SelectionRequest: 1494 case SelectionRequest:
1511 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1512 break; 1496 break;
1513 1497
1514 case MapNotify: 1498 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP
1500 /* This is needed specifically to fix the case of no window manager or a
1501 * non-reparenting window manager. In those cases we never get first
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1503 * care of multiplicity of ConfigureNotify events arriving while WM does
1504 * reparenting.
1505 * We should not render background immediately, as there could be several
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1507 * by scheduling background redraw as soon as we can, but giving a short
1508 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results.
1511 */
1512 if (!(bg_flags & BG_IS_VALID))
1513 update_background_ev.start (0.025);
1514#endif
1515 mapped = 1; 1515 mapped = 1;
1516#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1517 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1517 text_blink_ev.start ();
1518#endif 1518#endif
1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1520 break; 1520 break;
1521 1521
1522 case UnmapNotify: 1522 case UnmapNotify:
… …
1524#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1525 text_blink_ev.stop (); 1525 text_blink_ev.stop ();
1526#endif 1526#endif
1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1528 break; 1528 break;
1529
1530#ifdef TRANSPARENT
1531 case ReparentNotify:
1532 rootwin_cb (ev);
1533 break;
1534#endif /* TRANSPARENT */
1535 1529
1536 case GraphicsExpose: 1530 case GraphicsExpose:
1537 case Expose: 1531 case Expose:
1538 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1539 { 1533 {
1540 do 1534 do
1535 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, false);
1538 }
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1544 1540
1545 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1546 1542
1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1544 {
1548 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1549 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, false);
1547 }
1550 1548
1551 want_refresh = 1; 1549 want_refresh = 1;
1552 } 1550 }
1553 else 1551 else
1554 { 1552 {
… …
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1558 ; 1556 ;
1559 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1560 ; 1558 ;
1561 1559
1562 if (isScrollbarWindow (ev.xany.window)) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1563 { 1561 {
1564 scrollBar.setIdle (); 1562 scrollBar.state = STATE_IDLE;
1565 scrollbar_show (0); 1563 scrollBar.show (0);
1566 } 1564 }
1567
1568#ifdef TRANSPARENT
1569 if (am_transparent && ev.xany.window == parent[0])
1570 XClearWindow (dpy, ev.xany.window);
1571#endif
1572 } 1565 }
1573 break; 1566 break;
1574 1567
1575 case MotionNotify: 1568 case MotionNotify:
1576#ifdef POINTER_BLANK 1569#ifdef POINTER_BLANK
1577 if (hidden_pointer) 1570 if (hidden_pointer)
1578 pointer_unblank (); 1571 pointer_unblank ();
1579#endif 1572#endif
1573 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1574 || priv_modes & PrivMode_MouseAnyEvent)
1575 mouse_report (ev.xbutton);
1580 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1581 break; 1577 break;
1582 1578
1583 if (ev.xany.window == vt) 1579 if (ev.xany.window == vt)
1584 { 1580 {
… …
1618 int dist; 1614 int dist;
1619 1615
1620 /* don't clobber the current delay if we are 1616 /* don't clobber the current delay if we are
1621 * already in the middle of scrolling. 1617 * already in the middle of scrolling.
1622 */ 1618 */
1623 if (!sel_scroll_ev.active) 1619 if (!sel_scroll_ev.is_active ())
1624 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1620 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1625 1621
1626 /* save the event params so we can highlight 1622 /* save the event params so we can highlight
1627 * the selection in the pending-scroll loop 1623 * the selection in the pending-scroll loop
1628 */ 1624 */
1629 selection_save_x = ev.xbutton.x; 1625 selection_save_x = ev.xbutton.x;
… …
1651 else 1647 else
1652 { 1648 {
1653 /* we are within the text window, so we 1649 /* we are within the text window, so we
1654 * shouldn't be scrolling 1650 * shouldn't be scrolling
1655 */ 1651 */
1656 if (sel_scroll_ev.active)
1657 sel_scroll_ev.stop(); 1652 sel_scroll_ev.stop();
1658 } 1653 }
1659#endif 1654#endif
1660#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1661 } 1656 }
1662#endif 1657#endif
1663 } 1658 }
1664 } 1659 }
1665 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1666 { 1661 {
1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1669 ; 1664 ;
1670 1665
1671 XQueryPointer (dpy, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1672 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1673 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1674 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1670 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677 scrollbar_size ()); 1672 scrollBar.size ());
1678 want_refresh = 1; 1673 want_refresh = 1;
1679 refresh_limit = 0;
1680 scrollbar_show (1); 1674 scrollBar.show (1);
1681 } 1675 }
1682 break; 1676 break;
1683 } 1677 }
1684 1678
1685#if defined(CURSOR_BLINK) 1679#if defined(CURSOR_BLINK)
1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1680 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1687 { 1681 {
1688 if (hidden_cursor) 1682 if (hidden_cursor)
1689 { 1683 {
1690 hidden_cursor = 0; 1684 hidden_cursor = 0;
1691 want_refresh = 1; 1685 want_refresh = 1;
1692 } 1686 }
1693 1687
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1688 cursor_blink_ev.again ();
1695 } 1689 }
1696#endif 1690#endif
1697 1691
1698#if defined(POINTER_BLANK) 1692#if defined(POINTER_BLANK)
1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 { 1694 {
1701 if (ev.type == MotionNotify 1695 if (ev.type == MotionNotify
1702 || ev.type == ButtonPress 1696 || ev.type == ButtonPress
1703 || ev.type == ButtonRelease) 1697 || ev.type == ButtonRelease)
1704 if (hidden_pointer) 1698 if (hidden_pointer)
… …
1706 1700
1707 if (ev.type == KeyPress && hidden_pointer == 0) 1701 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank (); 1702 pointer_blank ();
1709 } 1703 }
1710#endif 1704#endif
1705
1706 refresh_check ();
1711} 1707}
1708
1709#if ENABLE_FRILLS
1710void
1711rxvt_term::set_urgency (bool enable)
1712{
1713 if (enable == urgency_hint)
1714 return;
1715
1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1717 {
1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1719 XSetWMHints (dpy, parent, h);
1720 urgency_hint = enable;
1721 }
1722}
1723#endif
1712 1724
1713void 1725void
1714rxvt_term::focus_in () 1726rxvt_term::focus_in ()
1715{ 1727{
1716 if (!focus) 1728 if (!focus)
1717 { 1729 {
1718 focus = 1; 1730 focus = 1;
1719 want_refresh = 1; 1731 want_refresh = 1;
1720 1732
1721 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722
1723#if USE_XIM 1733#if USE_XIM
1724 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1725 { 1735 {
1726 IMSetPosition (); 1736 im_set_position ();
1727 XSetICFocus (Input_Context); 1737 XSetICFocus (Input_Context);
1728 } 1738 }
1729#endif 1739#endif
1730#if CURSOR_BLINK 1740#if CURSOR_BLINK
1731 if (OPTION (Opt_cursorBlink)) 1741 if (option (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1742 cursor_blink_ev.again ();
1733#endif 1743#endif
1734#if OFF_FOCUS_FADING 1744#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade]) 1745 if (rs[Rs_fade])
1736 { 1746 {
1737 pix_colors = pix_colors_focused; 1747 pix_colors = pix_colors_focused;
1738 scr_recolour (); 1748 scr_recolour ();
1739 } 1749 }
1740#endif 1750#endif
1751#if ENABLE_FRILLS
1752 if (option (Opt_urgentOnBell))
1753 set_urgency (0);
1754#endif
1755
1756 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741 } 1757 }
1742} 1758}
1743 1759
1744void 1760void
1745rxvt_term::focus_out () 1761rxvt_term::focus_out ()
… …
1747 if (focus) 1763 if (focus)
1748 { 1764 {
1749 focus = 0; 1765 focus = 0;
1750 want_refresh = 1; 1766 want_refresh = 1;
1751 1767
1752 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1768#if ENABLE_FRILLS
1753 1769 if (option (Opt_urgentOnBell))
1770 set_urgency (0);
1771#endif
1754#if ENABLE_FRILLS || ISO_14755 1772#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf) 1773 if (iso14755buf)
1756 { 1774 {
1757 iso14755buf = 0; 1775 iso14755buf = 0;
1758# if ENABLE_OVERLAY 1776# if ISO_14755
1759 scr_overlay_off (); 1777 scr_overlay_off ();
1760# endif 1778# endif
1761 } 1779 }
1762#endif 1780#endif
1763#if USE_XIM 1781#if USE_XIM
1764 if (Input_Context != NULL) 1782 if (Input_Context != NULL)
1765 XUnsetICFocus (Input_Context); 1783 XUnsetICFocus (Input_Context);
1766#endif 1784#endif
1767#if CURSOR_BLINK 1785#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink)) 1786 if (option (Opt_cursorBlink))
1769 cursor_blink_ev.stop (); 1787 cursor_blink_ev.stop ();
1788
1770 hidden_cursor = 0; 1789 hidden_cursor = 0;
1771#endif 1790#endif
1772#if OFF_FOCUS_FADING 1791#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1792 if (rs[Rs_fade])
1774 { 1793 {
1775 pix_colors = pix_colors_unfocused; 1794 pix_colors = pix_colors_unfocused;
1776 scr_recolour (); 1795 scr_recolour ();
1777 } 1796 }
1778#endif 1797#endif
1798
1799 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1779 } 1800 }
1780} 1801}
1781 1802
1782void 1803void
1783rxvt_term::update_fade_color (unsigned int idx) 1804rxvt_term::update_fade_color (unsigned int idx)
… …
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1811 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 } 1812 }
1792#endif 1813#endif
1793} 1814}
1794 1815
1795#if TRANSPARENT || ENABLE_PERL 1816#if ENABLE_TRANSPARENCY || ENABLE_PERL
1796void 1817void
1797rxvt_term::rootwin_cb (XEvent &ev) 1818rxvt_term::rootwin_cb (XEvent &ev)
1798{ 1819{
1799 make_current (); 1820 make_current ();
1800 1821
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1822 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1823 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return; 1824 return;
1804 1825
1805# if TRANSPARENT 1826# if ENABLE_TRANSPARENCY
1806 switch (ev.type) 1827 switch (ev.type)
1807 { 1828 {
1808 case PropertyNotify: 1829 case PropertyNotify:
1809 /* 1830 /*
1810 * if user used some Esetroot compatible prog to set the root bg, 1831 * if user used some Esetroot compatible prog to set the root bg,
1811 * use the property to determine the pixmap. We use it later on. 1832 * use the property to determine the pixmap. We use it later on.
1812 */ 1833 */
1813 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1814 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1815 return; 1836 {
1837 bg_set_root_pixmap ();
1838 update_background ();
1839 }
1816 1840
1817 /* FALLTHROUGH */
1818 case ReparentNotify:
1819 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1820 want_refresh = want_full_refresh = 1;
1821 break; 1841 break;
1822 } 1842 }
1823# endif 1843# endif
1844
1845 refresh_check ();
1824} 1846}
1825#endif 1847#endif
1826 1848
1827void 1849void
1828rxvt_term::button_press (XButtonEvent &ev) 1850rxvt_term::button_press (XButtonEvent &ev)
… …
1859 /* save the xbutton state (for ButtonRelease) */ 1881 /* save the xbutton state (for ButtonRelease) */
1860 MEvent.state = ev.state; 1882 MEvent.state = ev.state;
1861#ifdef MOUSE_REPORT_DOUBLECLICK 1883#ifdef MOUSE_REPORT_DOUBLECLICK
1862 if (ev.button == MEvent.button && clickintime) 1884 if (ev.button == MEvent.button && clickintime)
1863 { 1885 {
1864 /* same button, within alloted time */ 1886 /* same button, within allowed time */
1865 MEvent.clicks++; 1887 MEvent.clicks++;
1866 1888
1867 if (MEvent.clicks > 1) 1889 if (MEvent.clicks > 1)
1868 { 1890 {
1869 /* only report double clicks */ 1891 /* only report double clicks */
… …
1883 mouse_report (ev); 1905 mouse_report (ev);
1884 } 1906 }
1885#else 1907#else
1886 MEvent.button = ev.button; 1908 MEvent.button = ev.button;
1887 mouse_report (ev); 1909 mouse_report (ev);
1888#endif /* MOUSE_REPORT_DOUBLECLICK */ 1910#endif /* MOUSE_REPORT_DOUBLECLICK */
1889 1911
1890 } 1912 }
1891 else 1913 else
1892 { 1914 {
1893 if (ev.button != MEvent.button) 1915 if (ev.button != MEvent.button)
… …
1941 } 1963 }
1942 1964
1943 /* 1965 /*
1944 * Scrollbar window processing of button press 1966 * Scrollbar window processing of button press
1945 */ 1967 */
1946 if (isScrollbarWindow (ev.window)) 1968 if (scrollBar.state && ev.window == scrollBar.win)
1947 { 1969 {
1948 scrollBar.setIdle (); 1970 page_dirn direction = NO_DIR;
1971
1972 if (scrollBar.upButton (ev.y))
1973 direction = UP; /* up */
1974 else if (scrollBar.dnButton (ev.y))
1975 direction = DN; /* down */
1976
1977 scrollBar.state = STATE_IDLE;
1949 /* 1978 /*
1950 * Rxvt-style scrollbar: 1979 * Rxvt-style scrollbar:
1951 * move up if mouse is above slider 1980 * move up if mouse is above slider
1952 * move dn if mouse is below slider 1981 * move dn if mouse is below slider
1953 * 1982 *
… …
1962 /* 1991 /*
1963 * Mouse report disabled scrollbar: 1992 * Mouse report disabled scrollbar:
1964 * arrow buttons - send up/down 1993 * arrow buttons - send up/down
1965 * click on scrollbar - send pageup/down 1994 * click on scrollbar - send pageup/down
1966 */ 1995 */
1967 if ((scrollBar.style == R_SB_NEXT 1996 if (direction == UP)
1968 && scrollbarnext_upButton (ev.y))
1969 || (scrollBar.style == R_SB_RXVT
1970 && scrollbarrxvt_upButton (ev.y)))
1971 tt_printf ("\033[A"); 1997 tt_printf ("\033[A");
1972 else if ((scrollBar.style == R_SB_NEXT 1998 else if (direction == DN)
1973 && scrollbarnext_dnButton (ev.y))
1974 || (scrollBar.style == R_SB_RXVT
1975 && scrollbarrxvt_dnButton (ev.y)))
1976 tt_printf ("\033[B"); 1999 tt_printf ("\033[B");
1977 else 2000 else
1978 switch (ev.button) 2001 switch (ev.button)
1979 { 2002 {
1980 case Button2: 2003 case Button2:
… …
1987 tt_printf ("\033[5~"); 2010 tt_printf ("\033[5~");
1988 break; 2011 break;
1989 } 2012 }
1990 } 2013 }
1991 else 2014 else
1992#endif /* NO_SCROLLBAR_REPORT */ 2015#endif /* NO_SCROLLBAR_REPORT */
1993
1994 {
1995 char upordown = 0;
1996
1997 if (scrollBar.style == R_SB_NEXT)
1998 { 2016 {
1999 if (scrollbarnext_upButton (ev.y)) 2017 if (direction != NO_DIR)
2000 upordown = -1; /* up */
2001 else if (scrollbarnext_dnButton (ev.y))
2002 upordown = 1; /* down */
2003 }
2004 else if (scrollBar.style == R_SB_RXVT)
2005 {
2006 if (scrollbarrxvt_upButton (ev.y))
2007 upordown = -1; /* up */
2008 else if (scrollbarrxvt_dnButton (ev.y))
2009 upordown = 1; /* down */
2010 }
2011 if (upordown)
2012 { 2018 {
2013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2019#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2020 if (!cont_scroll_ev.is_active ())
2014 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2021 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2015#endif 2022#endif
2016 if (scr_page (upordown < 0 ? UP : DN, 1)) 2023 if (scr_page (direction, 1))
2017 { 2024 {
2018 if (upordown < 0) 2025 if (direction == UP)
2019 scrollBar.setUp (); 2026 scrollBar.state = STATE_UP;
2020 else 2027 else
2021 scrollBar.setDn (); 2028 scrollBar.state = STATE_DOWN;
2022 } 2029 }
2023 } 2030 }
2024 else 2031 else
2025 switch (ev.button) 2032 switch (ev.button)
2026 { 2033 {
2027 case Button2: 2034 case Button2:
2028 switch (scrollbar_align) 2035 switch (scrollBar.align)
2029 { 2036 {
2030 case R_SB_ALIGN_TOP: 2037 case R_SB_ALIGN_TOP:
2031 csrO = 0; 2038 csrO = 0;
2032 break; 2039 break;
2033 case R_SB_ALIGN_CENTRE: 2040 case R_SB_ALIGN_CENTRE:
… …
2037 csrO = scrollBar.bot - scrollBar.top; 2044 csrO = scrollBar.bot - scrollBar.top;
2038 break; 2045 break;
2039 } 2046 }
2040 2047
2041 if (scrollBar.style == R_SB_XTERM 2048 if (scrollBar.style == R_SB_XTERM
2042 || scrollbar_above_slider (ev.y) 2049 || scrollBar.above_slider (ev.y)
2043 || scrollbar_below_slider (ev.y)) 2050 || scrollBar.below_slider (ev.y))
2044 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2045 2052
2046 scrollBar.setMotion (); 2053 scrollBar.state = STATE_MOTION;
2047 break; 2054 break;
2048 2055
2049 case Button1: 2056 case Button1:
2050 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2057 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2051 csrO = ev.y - scrollBar.top; 2058 csrO = ev.y - scrollBar.top;
2052 /* FALLTHROUGH */ 2059 /* FALLTHROUGH */
2053 2060
2054 case Button3: 2061 case Button3:
2055 if (scrollBar.style != R_SB_XTERM) 2062 if (scrollBar.style != R_SB_XTERM)
2056 { 2063 {
2057 if (scrollbar_above_slider (ev.y)) 2064 if (scrollBar.above_slider (ev.y))
2058# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
2059 scr_page (UP, nrow - 1); 2066 scr_page (UP, nrow - 1);
2060# else 2067# else
2061 scr_page (UP, nrow / 4); 2068 scr_page (UP, nrow / 4);
2062# endif 2069# endif
2063 else if (scrollbar_below_slider (ev.y)) 2070 else if (scrollBar.below_slider (ev.y))
2064# ifdef RXVT_SCROLL_FULL 2071# ifdef RXVT_SCROLL_FULL
2065 scr_page (DN, nrow - 1); 2072 scr_page (DN, nrow - 1);
2066# else 2073# else
2067 scr_page (DN, nrow / 4); 2074 scr_page (DN, nrow / 4);
2068# endif 2075# endif
2069 else 2076 else
2070 scrollBar.setMotion (); 2077 scrollBar.state = STATE_MOTION;
2071 } 2078 }
2072 else 2079 else
2073 { 2080 {
2074 scr_page ((ev.button == Button1 ? DN : UP), 2081 scr_page ((ev.button == Button1 ? DN : UP),
2075 (nrow 2082 (nrow
2076 * scrollbar_position (ev.y) 2083 * scrollBar.position (ev.y)
2077 / scrollbar_size ())); 2084 / scrollBar.size ()));
2078 } 2085 }
2079 2086
2080 break; 2087 break;
2081 } 2088 }
2082 } 2089 }
… …
2092 2099
2093 csrO = 0; /* reset csr Offset */ 2100 csrO = 0; /* reset csr Offset */
2094 if (!bypass_keystate) 2101 if (!bypass_keystate)
2095 reportmode = !! (priv_modes & PrivMode_mouse_report); 2102 reportmode = !! (priv_modes & PrivMode_mouse_report);
2096 2103
2097 if (scrollbar_isUpDn ()) 2104 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2098 { 2105 {
2099 scrollBar.setIdle (); 2106 scrollBar.state = STATE_IDLE;
2100 scrollbar_show (0); 2107 scrollBar.show (0);
2101 } 2108 }
2102 2109
2103#ifdef SELECTION_SCROLLING 2110#ifdef SELECTION_SCROLLING
2104 if (sel_scroll_ev.active)
2105 sel_scroll_ev.stop(); 2111 sel_scroll_ev.stop();
2106#endif 2112#endif
2107 2113
2108 if (ev.window == vt) 2114 if (ev.window == vt)
2109 { 2115 {
2110 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2116 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2134 mouse_report (ev); 2140 mouse_report (ev);
2135 } 2141 }
2136#else /* MOUSE_REPORT_DOUBLECLICK */ 2142#else /* MOUSE_REPORT_DOUBLECLICK */
2137 MEvent.button = AnyButton; 2143 MEvent.button = AnyButton;
2138 mouse_report (ev); 2144 mouse_report (ev);
2139#endif /* MOUSE_REPORT_DOUBLECLICK */ 2145#endif /* MOUSE_REPORT_DOUBLECLICK */
2140 return; 2146 return;
2141 } 2147 }
2142 2148
2143 /* 2149 /*
2144 * dumb hack to compensate for the failure of click-and-drag 2150 * dumb hack to compensate for the failure of click-and-drag
… …
2156 selection_make (ev.time); 2162 selection_make (ev.time);
2157 break; 2163 break;
2158 2164
2159 case Button2: 2165 case Button2:
2160 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2166 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2161 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2167 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2162 break; 2168 break;
2163 2169
2164#ifdef MOUSE_WHEEL 2170#ifdef MOUSE_WHEEL
2165 case Button4: 2171 case Button4:
2166 case Button5: 2172 case Button5:
… …
2170 2176
2171 v = ev.button == Button4 ? UP : DN; 2177 v = ev.button == Button4 ? UP : DN;
2172 2178
2173 if (ev.state & ShiftMask) 2179 if (ev.state & ShiftMask)
2174 i = 1; 2180 i = 1;
2175 else if (OPTION (Opt_mouseWheelScrollPage)) 2181 else if (option (Opt_mouseWheelScrollPage))
2176 i = nrow - 1; 2182 i = nrow - 1;
2177 else 2183 else
2178 i = 5; 2184 i = 5;
2179 2185
2180# ifdef MOUSE_SLIP_WHEELING 2186# ifdef MOUSE_SLIP_WHEELING
… …
2182 { 2188 {
2183 mouse_slip_wheel_speed += v ? -1 : 1; 2189 mouse_slip_wheel_speed += v ? -1 : 1;
2184 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2190 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2185 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2191 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2186 2192
2187 if (slip_wheel_ev.at < NOW) 2193 if (!slip_wheel_ev.is_active ())
2188 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2194 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2189
2190 slip_wheel_ev.start ();
2191 } 2195 }
2192 else 2196 else
2197# endif
2193 { 2198 {
2194# endif
2195 scr_page (v, i); 2199 scr_page (v, i);
2196 scrollbar_show (1); 2200 scrollBar.show (1);
2197# ifdef MOUSE_SLIP_WHEELING
2198 } 2201 }
2199# endif
2200 } 2202 }
2201 break; 2203 break;
2202#endif 2204#endif
2203 } 2205 }
2204 } 2206 }
2205} 2207}
2206 2208
2207#ifdef TRANSPARENT
2208#if TINTING
2209/* taken from aterm-0.4.2 */
2210
2211typedef uint32_t RUINT32T;
2212
2213void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2214{
2215 int sh_r, sh_g, sh_b;
2216 RUINT32T mask_r, mask_g, mask_b;
2217 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2218 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2219 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2220 int i;
2221
2222 Visual *visual = term->visual;
2223
2224 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2225
2226 /* for convenience */
2227 mask_r = visual->red_mask;
2228 mask_g = visual->green_mask;
2229 mask_b = visual->blue_mask;
2230
2231 /* boring lookup table pre-initialization */
2232 switch (srcImage->bits_per_pixel) {
2233 case 15:
2234 if ((mask_r != 0x7c00) ||
2235 (mask_g != 0x03e0) ||
2236 (mask_b != 0x001f))
2237 return;
2238 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2239 lookup_r = lookup;
2240 lookup_g = lookup+32;
2241 lookup_b = lookup+32+32;
2242 sh_r = 10;
2243 sh_g = 5;
2244 sh_b = 0;
2245 break;
2246 case 16:
2247 if ((mask_r != 0xf800) ||
2248 (mask_g != 0x07e0) ||
2249 (mask_b != 0x001f))
2250 return;
2251 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2252 lookup_r = lookup;
2253 lookup_g = lookup+32;
2254 lookup_b = lookup+32+64;
2255 sh_r = 11;
2256 sh_g = 5;
2257 sh_b = 0;
2258 break;
2259 case 24:
2260 if ((mask_r != 0xff0000) ||
2261 (mask_g != 0x00ff00) ||
2262 (mask_b != 0x0000ff))
2263 return;
2264 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2265 lookup_r = lookup;
2266 lookup_g = lookup+256;
2267 lookup_b = lookup+256+256;
2268 sh_r = 16;
2269 sh_g = 8;
2270 sh_b = 0;
2271 break;
2272 case 32:
2273 if ((mask_r != 0xff0000) ||
2274 (mask_g != 0x00ff00) ||
2275 (mask_b != 0x0000ff))
2276 return;
2277 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2278 lookup_r = lookup;
2279 lookup_g = lookup+256;
2280 lookup_b = lookup+256+256;
2281 sh_r = 16;
2282 sh_g = 8;
2283 sh_b = 0;
2284 break;
2285 default:
2286 return; /* we do not support this color depth */
2287 }
2288
2289 /* prepare limits for color transformation (each channel is handled separately) */
2290 if (shade < 0) {
2291 shade = -shade;
2292 if (shade < 0) shade = 0;
2293 if (shade > 100) shade = 100;
2294
2295 lower_lim_r = 65535-rm;
2296 lower_lim_g = 65535-gm;
2297 lower_lim_b = 65535-bm;
2298
2299 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2300 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2301 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2302
2303 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2304 } else {
2305 if (shade < 0) shade = 0;
2306 if (shade > 100) shade = 100;
2307
2308 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2309
2310 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2311 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2312 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2313 }
2314
2315 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2316 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2317 {
2318 unsigned int tmp;
2319
2320 tmp = lower_lim_r;
2321 lower_lim_r = lower_lim_b;
2322 lower_lim_b = tmp;
2323
2324 tmp = upper_lim_r;
2325 upper_lim_r = upper_lim_b;
2326 upper_lim_b = tmp;
2327 }
2328
2329 /* fill our lookup tables */
2330 for (i = 0; i <= mask_r>>sh_r; i++)
2331 {
2332 RUINT32T tmp;
2333 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2334 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2335 lookup_r[i] = (tmp/65535)<<sh_r;
2336 }
2337 for (i = 0; i <= mask_g>>sh_g; i++)
2338 {
2339 RUINT32T tmp;
2340 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2341 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2342 lookup_g[i] = (tmp/65535)<<sh_g;
2343 }
2344 for (i = 0; i <= mask_b>>sh_b; i++)
2345 {
2346 RUINT32T tmp;
2347 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2348 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2349 lookup_b[i] = (tmp/65535)<<sh_b;
2350 }
2351
2352 /* apply table to input image (replacing colors by newly calculated ones) */
2353 switch (srcImage->bits_per_pixel)
2354 {
2355 case 15:
2356 {
2357 unsigned short *p1, *pf, *p, *pl;
2358 p1 = (unsigned short *) srcImage->data;
2359 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2360 while (p1 < pf)
2361 {
2362 p = p1;
2363 pl = p1 + srcImage->width;
2364 for (; p < pl; p++)
2365 {
2366 *p = lookup_r[(*p & 0x7c00)>>10] |
2367 lookup_g[(*p & 0x03e0)>> 5] |
2368 lookup_b[(*p & 0x001f)];
2369 }
2370 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2371 }
2372 break;
2373 }
2374 case 16:
2375 {
2376 unsigned short *p1, *pf, *p, *pl;
2377 p1 = (unsigned short *) srcImage->data;
2378 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2379 while (p1 < pf)
2380 {
2381 p = p1;
2382 pl = p1 + srcImage->width;
2383 for (; p < pl; p++)
2384 {
2385 *p = lookup_r[(*p & 0xf800)>>11] |
2386 lookup_g[(*p & 0x07e0)>> 5] |
2387 lookup_b[(*p & 0x001f)];
2388 }
2389 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2390 }
2391 break;
2392 }
2393 case 24:
2394 {
2395 unsigned char *p1, *pf, *p, *pl;
2396 p1 = (unsigned char *) srcImage->data;
2397 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2398 while (p1 < pf)
2399 {
2400 p = p1;
2401 pl = p1 + srcImage->width * 3;
2402 for (; p < pl; p += 3)
2403 {
2404 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2405 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2406 p[2] = lookup_r[(p[2] & 0x0000ff)];
2407 }
2408 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 case 32:
2413 {
2414 RUINT32T *p1, *pf, *p, *pl;
2415 p1 = (RUINT32T *) srcImage->data;
2416 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2417
2418 while (p1 < pf)
2419 {
2420 p = p1;
2421 pl = p1 + srcImage->width;
2422 for (; p < pl; p++)
2423 {
2424 *p = lookup_r[(*p & 0xff0000)>>16] |
2425 lookup_g[(*p & 0x00ff00)>> 8] |
2426 lookup_b[(*p & 0x0000ff)] |
2427 (*p & ~0xffffff);
2428 }
2429 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2430 }
2431 break;
2432 }
2433 }
2434
2435 free (lookup);
2436}
2437#endif
2438
2439/*
2440 * Check our parents are still who we think they are.
2441 * Do transparency updates if required
2442 */
2443int
2444rxvt_term::check_our_parents ()
2445{
2446 int i, pchanged, aformat, have_pixmap, rootdepth;
2447 unsigned long nitems, bytes_after;
2448 Atom atype;
2449 unsigned char *prop = NULL;
2450 Window root, oldp, *list;
2451 Pixmap rootpixmap = None;
2452 XWindowAttributes wattr, wrootattr;
2453
2454 pchanged = 0;
2455
2456 if (!OPTION (Opt_transparent))
2457 return pchanged; /* Don't try any more */
2458
2459 XGetWindowAttributes (dpy, display->root, &wrootattr);
2460 rootdepth = wrootattr.depth;
2461
2462 XGetWindowAttributes (dpy, parent[0], &wattr);
2463
2464 if (rootdepth != wattr.depth)
2465 {
2466 if (am_transparent)
2467 {
2468 pchanged = 1;
2469 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2470 am_transparent = am_pixmap_trans = 0;
2471 }
2472
2473 return pchanged; /* Don't try any more */
2474 }
2475
2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2477 XSync (dpy, False);
2478
2479 /*
2480 * Make the frame window set by the window manager have
2481 * the root background. Some window managers put multiple nested frame
2482 * windows for each client, so we have to take care about that.
2483 */
2484 i = (xa[XA_XROOTPMAP_ID]
2485 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487 &nitems, &bytes_after, &prop) == Success);
2488
2489 if (!i || prop == NULL)
2490 i = (xa[XA_ESETROOT_PMAP_ID]
2491 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success);
2494
2495 if (!i || prop == NULL
2496#if TINTING
2497 || !ISSET_PIXCOLOR (Color_tint)
2498#endif
2499 )
2500 have_pixmap = 0;
2501 else
2502 {
2503 have_pixmap = 1;
2504 rootpixmap = *(Pixmap *)prop;
2505 XFree (prop);
2506 }
2507
2508 if (have_pixmap)
2509 {
2510 /*
2511 * Copy display->root pixmap transparency
2512 */
2513 int sx, sy, nx, ny;
2514 unsigned int nw, nh;
2515 Window cr;
2516 XImage *image;
2517 GC gc;
2518 XGCValues gcvalue;
2519
2520 XTranslateCoordinates (dpy, parent[0], display->root,
2521 0, 0, &sx, &sy, &cr);
2522 nw = (unsigned int)szHint.width;
2523 nh = (unsigned int)szHint.height;
2524 nx = ny = 0;
2525
2526 if (sx < 0)
2527 {
2528 nw += sx;
2529 nx = -sx;
2530 sx = 0;
2531 }
2532
2533 if (sy < 0)
2534 {
2535 nh += sy;
2536 ny = -sy;
2537 sy = 0;
2538 }
2539
2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (dpy, False);
2544 allowedxerror = -1;
2545 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546
2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2548 /* XXX: may need a delay here? */
2549 allowedxerror = 0;
2550
2551 if (image == NULL)
2552 {
2553 if (am_transparent && am_pixmap_trans)
2554 {
2555 pchanged = 1;
2556 if (pixmap != None)
2557 {
2558 XFreePixmap (dpy, pixmap);
2559 pixmap = None;
2560 }
2561 }
2562
2563 am_pixmap_trans = 0;
2564 }
2565 else
2566 {
2567 if (pixmap != None)
2568 XFreePixmap (dpy, pixmap);
2569
2570#if TINTING
2571 if (ISSET_PIXCOLOR (Color_tint))
2572 {
2573 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2574
2575 rgba c;
2576 pix_colors_focused [Color_tint].get (c);
2577
2578 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2579 }
2580#endif
2581
2582 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2583 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2584 XPutImage (dpy, pixmap, gc, image, 0, 0,
2585 nx, ny, image->width, image->height);
2586 XFreeGC (dpy, gc);
2587 XDestroyImage (image);
2588 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2589 XClearWindow (dpy, parent[0]);
2590
2591 if (!am_transparent || !am_pixmap_trans)
2592 pchanged = 1;
2593
2594 am_transparent = am_pixmap_trans = 1;
2595 }
2596 }
2597
2598 if (am_pixmap_trans)
2599 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2600 else
2601 {
2602 unsigned int n;
2603 /*
2604 * InheritPixmap transparency
2605 */
2606 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2607 {
2608 oldp = parent[i];
2609 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2610 XFree (list);
2611
2612 if (parent[i] == display->root)
2613 {
2614 if (oldp != None)
2615 pchanged = 1;
2616
2617 break;
2618 }
2619
2620 if (oldp != parent[i])
2621 pchanged = 1;
2622 }
2623
2624 n = 0;
2625
2626 if (pchanged)
2627 for (; n < (unsigned int)i; n++)
2628 {
2629 XGetWindowAttributes (dpy, parent[n], &wattr);
2630
2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2632 {
2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2634 break;
2635 }
2636 }
2637
2638 if (n > (sizeof (parent) / sizeof (parent[0])))
2639 {
2640 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2641 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2642 am_transparent = 0;
2643 /* XXX: also turn off Opt_transparent? */
2644 }
2645 else
2646 {
2647 for (n = 0; n < (unsigned int)i; n++)
2648 {
2649 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2650 XClearWindow (dpy, parent[n]);
2651 }
2652
2653 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2654 am_transparent = 1;
2655 }
2656
2657 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2658 parent[i] = None;
2659 }
2660
2661 if (scrollBar.win)
2662 {
2663 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2664 scrollBar.setIdle ();
2665 scrollbar_show (0);
2666 }
2667
2668 if (am_transparent)
2669 {
2670 want_refresh = want_full_refresh = 1;
2671 if (am_pixmap_trans)
2672 flush ();
2673 }
2674
2675 return pchanged;
2676}
2677#endif
2678
2679/*}}} */ 2209/*}}} */
2680 2210
2681bool 2211void
2682rxvt_term::cmd_parse () 2212rxvt_term::cmd_parse ()
2683{ 2213{
2684 bool flag = false;
2685 wchar_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2686 char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2687 2216
2688 for (;;) 2217 for (;;)
2689 { 2218 {
2690 if (ch == NOCHAR) 2219 if (ecb_unlikely (ch == NOCHAR))
2691 { 2220 {
2692 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2693 ch = next_char (); 2222 ch = next_char ();
2694 2223
2695 if (ch == NOCHAR) 2224 if (ch == NOCHAR)
2696 break; 2225 break;
2697 } 2226 }
2698 2227
2699 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2228 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2700 { 2229 {
2701 if (!seen_input) 2230 if (ecb_unlikely (!seen_input))
2702 { 2231 {
2703 seen_input = 1; 2232 seen_input = 1;
2704 // many badly-written programs (e.g. jed) contain a race condition: 2233 // many badly-written programs (e.g. jed) contain a race condition:
2705 // they first read the screensize and then install a SIGWINCH handler. 2234 // they first read the screensize and then install a SIGWINCH handler.
2706 // some window managers resize the window early, and these programs 2235 // some window managers resize the window early, and these programs
… …
2719 wchar_t *str = buf; 2248 wchar_t *str = buf;
2720 wchar_t *eol = str + min (ncol, UBUFSIZ); 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2721 2250
2722 for (;;) 2251 for (;;)
2723 { 2252 {
2724 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2253 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2725 break; 2254 break;
2726 2255
2727 *str++ = ch; 2256 *str++ = ch;
2728 2257
2729 if (ch == C0_LF || str >= eol) 2258 if (ecb_unlikely (ch == C0_LF || str >= eol))
2730 { 2259 {
2731 if (ch == C0_LF) 2260 if (ch == C0_LF)
2732 nlines++; 2261 nlines++;
2733 2262
2734 refresh_count++; 2263 refresh_count++;
2735 2264
2736 if (!OPTION (Opt_jumpScroll) 2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2737 || (refresh_count >= refresh_limit * (nrow - 1)))
2738 { 2266 {
2739 refreshnow = true;
2740 refresh_count = 0; 2267 refresh_count = 0;
2268
2269 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2270 {
2271 refreshnow = true;
2741 ch = NOCHAR; 2272 ch = NOCHAR;
2742 break; 2273 break;
2274 }
2743 } 2275 }
2744 2276
2745 // scr_add_lines only works for nlines <= nrow - 1. 2277 // scr_add_lines only works for nlines <= nrow - 1.
2746 if (nlines >= nrow - 1) 2278 if (nlines >= nrow - 1)
2747 { 2279 {
… …
2775 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2776 scr_add_lines (buf, str - buf, nlines); 2308 scr_add_lines (buf, str - buf, nlines);
2777 2309
2778 /* 2310 /*
2779 * If there have been a lot of new lines, then update the screen 2311 * If there have been a lot of new lines, then update the screen
2780 * What the heck I'll cheat and only refresh less than every page-full. 2312 * What the heck we'll cheat and only refresh less than every page-full.
2781 * the number of pages between refreshes is refresh_limit, which 2313 * if skipScroll is enabled.
2782 * is incremented here because we must be doing flat-out scrolling.
2783 */ 2314 */
2784 if (refreshnow) 2315 if (refreshnow)
2785 { 2316 {
2786 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2787 refresh_limit++;
2788 else
2789 {
2790 flag = true;
2791 //TODO: due to popular request, implement "skipscroll" option here
2792 scr_refresh (); 2317 scr_refresh ();
2793 want_refresh = 1; 2318 want_refresh = 1;
2794 }
2795 } 2319 }
2796
2797 } 2320 }
2798 else 2321 else
2799 { 2322 {
2800 try 2323 try
2801 { 2324 {
… …
2809 } 2332 }
2810 2333
2811 ch = NOCHAR; 2334 ch = NOCHAR;
2812 } 2335 }
2813 } 2336 }
2814
2815 return flag;
2816} 2337}
2817 2338
2818// read the next character 2339// read the next character
2819wchar_t 2340wchar_t
2820rxvt_term::next_char () NOTHROW 2341rxvt_term::next_char () NOTHROW
2821{ 2342{
2822 while (cmdbuf_ptr < cmdbuf_endp) 2343 while (cmdbuf_ptr < cmdbuf_endp)
2823 { 2344 {
2824 // assume 7-bit to be ascii ALWAYS 2345 // assume 7-bit to be ascii ALWAYS
2825 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2346 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2826 return *cmdbuf_ptr++; 2347 return *cmdbuf_ptr++;
2827 2348
2828 wchar_t wc; 2349 wchar_t wc;
2829 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2350 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2830 2351
… …
2834 cmdbuf_ptr = cmdbuf_endp; 2355 cmdbuf_ptr = cmdbuf_endp;
2835 break; 2356 break;
2836 } 2357 }
2837 2358
2838 if (len == (size_t)-1) 2359 if (len == (size_t)-1)
2360 {
2361 mbstate.reset (); // reset now undefined conversion state
2839 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2362 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2363 }
2840 2364
2841 // assume wchar == unicode 2365 // assume wchar == unicode
2842 cmdbuf_ptr += len; 2366 cmdbuf_ptr += len;
2843 return wc & UNICODE_MASK; 2367 return wc & UNICODE_MASK;
2844 } 2368 }
… …
2855 : NOCHAR; 2379 : NOCHAR;
2856} 2380}
2857 2381
2858static class out_of_input out_of_input; 2382static class out_of_input out_of_input;
2859 2383
2860/* rxvt_cmd_getc () - Return next input character */
2861/*
2862 * Return the next input character after first passing any keyboard input
2863 * to the command.
2864 */
2865wchar_t 2384wchar_t
2866rxvt_term::cmd_getc () THROW ((class out_of_input)) 2385rxvt_term::cmd_getc () THROW ((class out_of_input))
2867{ 2386{
2868 wchar_t c = next_char (); 2387 wchar_t c = next_char ();
2869 2388
… …
2888/*----------------------------------------------------------------------*/ 2407/*----------------------------------------------------------------------*/
2889#ifdef PRINTPIPE 2408#ifdef PRINTPIPE
2890FILE * 2409FILE *
2891rxvt_term::popen_printer () 2410rxvt_term::popen_printer ()
2892{ 2411{
2893 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2412 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2894 2413
2895 if (stream == NULL) 2414 if (stream == NULL)
2896 rxvt_warn ("can't open printer pipe, not printing.\n"); 2415 rxvt_warn ("can't open printer pipe, not printing.\n");
2897 2416
2898 return stream; 2417 return stream;
… …
2909 * simulate attached vt100 printer 2428 * simulate attached vt100 printer
2910 */ 2429 */
2911void 2430void
2912rxvt_term::process_print_pipe () 2431rxvt_term::process_print_pipe ()
2913{ 2432{
2914 int done; 2433 FILE *fd = popen_printer ();
2915 FILE *fd;
2916 2434
2917 if ((fd = popen_printer ()) == NULL) 2435 if (!fd)
2918 return; 2436 return;
2919 2437
2920 /* 2438 /*
2921 * Send all input to the printer until either ESC[4i or ESC[?4i 2439 * Send all input to the printer until either ESC[4i or ESC[?4i
2922 * is received. 2440 * is received.
2923 */ 2441 */
2924 for (done = 0; !done;) 2442 for (int done = 0; !done; )
2925 { 2443 {
2926 unsigned char buf[8]; 2444 unsigned char buf[8];
2927 unicode_t ch; 2445 unicode_t ch;
2928 unsigned int i, len; 2446 unsigned int i, len;
2929 2447
… …
2948 { 2466 {
2949 if ((buf[len++] = cmd_getc ()) == 'i') 2467 if ((buf[len++] = cmd_getc ()) == 'i')
2950 break; /* done = 1 */ 2468 break; /* done = 1 */
2951 } 2469 }
2952 } 2470 }
2953 2471
2954 for (i = 0; i < len; i++) 2472 for (i = 0; i < len; i++)
2955 if (putc (buf[i], fd) == EOF) 2473 if (putc (buf[i], fd) == EOF)
2956 { 2474 {
2957 done = 1; 2475 done = 1;
2958 break; 2476 break;
… …
2960 } 2478 }
2961 } 2479 }
2962 2480
2963 pclose_printer (fd); 2481 pclose_printer (fd);
2964} 2482}
2965#endif /* PRINTPIPE */ 2483#endif /* PRINTPIPE */
2966/*}}} */ 2484/*}}} */
2967 2485
2968/* *INDENT-OFF* */
2969enum { 2486enum {
2970 C1_40 = 0x40, 2487 C1_40 = 0x40,
2971 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2488 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2972 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2489 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2973 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2490 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2974 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2491 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2975}; 2492};
2976/* *INDENT-ON* */
2977 2493
2978/*{{{ process non-printing single characters */ 2494/*{{{ process non-printing single characters */
2979void 2495void
2980rxvt_term::process_nonprinting (unicode_t ch) 2496rxvt_term::process_nonprinting (unicode_t ch)
2981{ 2497{
… …
3020 process_dcs_seq (); 2536 process_dcs_seq ();
3021 break; 2537 break;
3022 case 0x9b: /* CSI */ 2538 case 0x9b: /* CSI */
3023 process_csi_seq (); 2539 process_csi_seq ();
3024 break; 2540 break;
3025 case 0x9d: /* CSI */ 2541 case 0x9d: /* OSC */
3026 process_osc_seq (); 2542 process_osc_seq ();
3027 break; 2543 break;
3028#endif 2544#endif
3029 } 2545 }
3030} 2546}
… …
3074 break; 2590 break;
3075 case 'Z': /* identify the terminal type */ 2591 case 'Z': /* identify the terminal type */
3076 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2592 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3077 break; 2593 break;
3078 case '<': /* turn off VT52 mode */ 2594 case '<': /* turn off VT52 mode */
3079 PrivMode (0, PrivMode_vt52); 2595 set_privmode (PrivMode_vt52, 0);
3080 break; 2596 break;
3081 case 'F': /* use special graphics character set */ 2597 case 'F': /* use special graphics character set */
3082 case 'G': /* use regular character set */ 2598 case 'G': /* use regular character set */
3083 /* unimplemented */ 2599 /* unimplemented */
3084 break; 2600 break;
… …
3103 return; 2619 return;
3104 } 2620 }
3105 2621
3106 switch (ch) 2622 switch (ch)
3107 { 2623 {
3108 /* case 1: do_tek_mode (); break; */
3109 case '#': 2624 case '#':
3110 if (cmd_getc () == '8') 2625 if (cmd_getc () == '8')
3111 scr_E (); 2626 scr_E ();
3112 break; 2627 break;
3113 case '(': 2628 case '(':
… …
3136#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
3137 case '9': 2652 case '9':
3138 scr_forwardindex (); 2653 scr_forwardindex ();
3139 break; 2654 break;
3140#endif 2655#endif
2656 // DECPAM/DECPNM
3141 case '=': 2657 case '=':
3142 case '>': 2658 case '>':
3143 PrivMode ((ch == '='), PrivMode_aplKP); 2659 set_privmode (PrivMode_aplKP, ch == '=');
3144 break; 2660 break;
3145 2661
3146 case C1_40: 2662 case C1_40:
3147 cmd_getc (); 2663 cmd_getc ();
3148 break; 2664 break;
… …
3152 2668
3153 /* 8.3.87: NEXT LINE */ 2669 /* 8.3.87: NEXT LINE */
3154 case C1_NEL: /* ESC E */ 2670 case C1_NEL: /* ESC E */
3155 { 2671 {
3156 wchar_t nlcr[] = { C0_LF, C0_CR }; 2672 wchar_t nlcr[] = { C0_LF, C0_CR };
3157 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2673 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3158 } 2674 }
3159 break; 2675 break;
3160 2676
3161 /* kidnapped escape sequence: Should be 8.3.48 */ 2677 /* kidnapped escape sequence: Should be 8.3.48 */
3162 case C1_ESA: /* ESC G */ 2678 case C1_ESA: /* ESC G */
3163 process_graphics (); 2679 // used by original rxvt for rob nations own graphics mode
2680 if (cmd_getc () == 'Q')
2681 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3164 break; 2682 break;
3165 2683
3166 /* 8.3.63: CHARACTER TABULATION SET */ 2684 /* 8.3.63: CHARACTER TABULATION SET */
3167 case C1_HTS: /* ESC H */ 2685 case C1_HTS: /* ESC H */
3168 scr_set_tab (1); 2686 scr_set_tab (1);
… …
3172 case C1_RI: /* ESC M */ 2690 case C1_RI: /* ESC M */
3173 scr_index (DN); 2691 scr_index (DN);
3174 break; 2692 break;
3175 2693
3176 /* 8.3.142: SINGLE-SHIFT TWO */ 2694 /* 8.3.142: SINGLE-SHIFT TWO */
3177 /*case C1_SS2: scr_single_shift (2); break; */ 2695 /* case C1_SS2: break; */
3178 2696
3179 /* 8.3.143: SINGLE-SHIFT THREE */ 2697 /* 8.3.143: SINGLE-SHIFT THREE */
3180 /*case C1_SS3: scr_single_shift (3); break; */ 2698 /* case C1_SS3: break; */
3181 2699
3182 /* 8.3.27: DEVICE CONTROL STRING */ 2700 /* 8.3.27: DEVICE CONTROL STRING */
3183 case C1_DCS: /* ESC P */ 2701 case C1_DCS: /* ESC P */
3184 process_dcs_seq (); 2702 process_dcs_seq ();
3185 break; 2703 break;
… …
3187 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2705 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3188 case C1_SCI: /* ESC Z */ 2706 case C1_SCI: /* ESC Z */
3189 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2707 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3190 break; /* steal obsolete ESC [ c */ 2708 break; /* steal obsolete ESC [ c */
3191 2709
3192 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2710 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3193 case C1_CSI: /* ESC [ */ 2711 case C1_CSI: /* ESC [ */
3194 process_csi_seq (); 2712 process_csi_seq ();
3195 break; 2713 break;
3196 2714
3197 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2715 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3198 case C1_OSC: /* ESC ] */ 2716 case C1_OSC: /* ESC ] */
3199 process_osc_seq (); 2717 process_osc_seq ();
3200 break; 2718 break;
3201 2719
3202 /* 8.3.106: RESET TO INITIAL STATE */ 2720 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3203 case 'c': 2721 case 'c':
3204 mbstate.reset (); 2722 mbstate.reset ();
3205 scr_poweron (); 2723 scr_poweron ();
3206 scrollbar_show (1); 2724 scrollBar.show (1);
3207 break; 2725 break;
3208 2726
3209 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2727 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3210 case 'n': 2728 case 'n':
3211 scr_charset_choose (2); 2729 scr_charset_choose (2);
… …
3218 } 2736 }
3219} 2737}
3220/*}}} */ 2738/*}}} */
3221 2739
3222/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2740/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3223/* *INDENT-OFF* */
3224enum { 2741enum {
3225 CSI_ICH = 0x40, 2742 CSI_ICH = 0x40,
3226 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2743 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3227 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2744 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3228 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2745 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3231 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2748 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3232 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2749 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3233 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2750 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3234}; 2751};
3235 2752
3236#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2753#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3237 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2754 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3238 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2755 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3239#define get_byte_array_bit(array, bit) \ 2756#define get_byte_array_bit(array, bit) \
3240 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2757 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3241 2758
3242const unsigned char csi_defaults[] = 2759static const unsigned char csi_defaults[] =
3243 { 2760 {
3244 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2761 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3245 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2762 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3246 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2763 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3247 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2764 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3248 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2765 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3249 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2766 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3250 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2767 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3251 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2768 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3252 }; 2769 };
3253/* *INDENT-ON* */
3254 2770
3255void 2771void
3256rxvt_term::process_csi_seq () 2772rxvt_term::process_csi_seq ()
3257{ 2773{
3258 unicode_t ch, priv, i; 2774 unicode_t ch, priv, i;
3259 unsigned int nargs, p; 2775 unsigned int nargs, p;
3260 int n, ndef; 2776 int n, ndef;
3261 int arg[ESC_ARGS]; 2777 int arg[ESC_ARGS] = { };
3262 2778
3263 for (nargs = ESC_ARGS; nargs > 0;) 2779 nargs = 0;
3264 arg[--nargs] = 0;
3265 2780
3266 priv = 0; 2781 priv = 0;
3267 ch = cmd_getc (); 2782 ch = cmd_getc ();
3268 if (ch >= '<' && ch <= '?') 2783 if ((ch >= '<' && ch <= '?') || ch == '!')
2784 {
3269 { /* '<' '=' '>' '?' */ 2785 /* '<' '=' '>' '?' '!' */
3270 priv = ch; 2786 priv = ch;
3271 ch = cmd_getc (); 2787 ch = cmd_getc ();
3272 } 2788 }
3273 2789
3274 /* read any numerical arguments */ 2790 /* read any numerical arguments */
… …
3313 switch (priv) 2829 switch (priv)
3314 { 2830 {
3315 case '>': 2831 case '>':
3316 if (ch == CSI_DA) /* secondary device attributes */ 2832 if (ch == CSI_DA) /* secondary device attributes */
3317 { 2833 {
3318 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2834 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3319 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2835 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3320 // 2836 //
3321 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2837 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3322 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2838 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3323 // that we do not support xterm mouse reporting (should be 95 when we do). 2839 // versions.
3324 // 2840 //
3325 tt_printf ("\033[>%d;94;0c", 'U'); 2841 tt_printf ("\033[>%d;95;0c", 'U');
3326 } 2842 }
3327 break; 2843 break;
2844
3328 case '?': 2845 case '?':
3329 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2846 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3330 process_terminal_mode (ch, priv, nargs, arg); 2847 process_terminal_mode (ch, priv, nargs, arg);
3331 break; 2848 break;
2849
2850 case '!':
2851 if (ch == CSI_70)
2852 {
2853 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2854 scr_soft_reset ();
2855
2856 static const int pm_h[] = { 7, 25 };
2857 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2858
2859 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2860 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3332 } 2861 }
2862 break;
2863 }
2864
3333 return; 2865 return;
3334 } 2866 }
3335 2867
3336 switch (ch) 2868 switch (ch)
3337 { 2869 {
… …
3457 break; 2989 break;
3458 case 6: /* CPR requested */ 2990 case 6: /* CPR requested */
3459 scr_report_position (); 2991 scr_report_position ();
3460 break; 2992 break;
3461 case 7: /* unofficial extension */ 2993 case 7: /* unofficial extension */
3462 if (OPTION (Opt_insecure)) 2994 if (option (Opt_insecure))
3463 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2995 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3464 break; 2996 break;
3465 case 8: /* unofficial extension */ 2997 case 8: /* unofficial extension */
3466 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2998 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3467 break; 2999 break;
… …
3552 } 3084 }
3553} 3085}
3554/*}}} */ 3086/*}}} */
3555 3087
3556#if !ENABLE_MINIMAL 3088#if !ENABLE_MINIMAL
3557/* ARGSUSED */
3558void 3089void
3559rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3090rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3560{ 3091{
3561 int x, y; 3092 int x, y;
3562 XWindowAttributes wattr; 3093 XWindowAttributes wattr;
… …
3571 { 3102 {
3572 /* 3103 /*
3573 * commands 3104 * commands
3574 */ 3105 */
3575 case 1: /* deiconify window */ 3106 case 1: /* deiconify window */
3576 XMapWindow (dpy, parent[0]); 3107 XMapWindow (dpy, parent);
3577 break; 3108 break;
3578 case 2: /* iconify window */ 3109 case 2: /* iconify window */
3579 XIconifyWindow (dpy, parent[0], display->screen); 3110 XIconifyWindow (dpy, parent, display->screen);
3580 break; 3111 break;
3581 case 3: /* set position (pixels) */ 3112 case 3: /* set position (pixels) */
3582 XMoveWindow (dpy, parent[0], args[1], args[2]); 3113 XMoveWindow (dpy, parent, args[1], args[2]);
3583 break; 3114 break;
3584 case 4: /* set size (pixels) */ 3115 case 4: /* set size (pixels) */
3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3116 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3586 break; 3117 break;
3587 case 5: /* raise window */ 3118 case 5: /* raise window */
3588 XRaiseWindow (dpy, parent[0]); 3119 XRaiseWindow (dpy, parent);
3589 break; 3120 break;
3590 case 6: /* lower window */ 3121 case 6: /* lower window */
3591 XLowerWindow (dpy, parent[0]); 3122 XLowerWindow (dpy, parent);
3592 break; 3123 break;
3593 case 7: /* refresh window */ 3124 case 7: /* refresh window */
3594 scr_touch (true); 3125 scr_touch (true);
3595 break; 3126 break;
3596 case 8: /* set size (chars) */ 3127 case 8: /* set size (chars) */
… …
3607 3138
3608 /* 3139 /*
3609 * reports - some output format copied from XTerm 3140 * reports - some output format copied from XTerm
3610 */ 3141 */
3611 case 11: /* report window state */ 3142 case 11: /* report window state */
3612 XGetWindowAttributes (dpy, parent[0], &wattr); 3143 XGetWindowAttributes (dpy, parent, &wattr);
3613 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3614 break; 3145 break;
3615 case 13: /* report window position */ 3146 case 13: /* report window position */
3616 XGetWindowAttributes (dpy, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3617 XTranslateCoordinates (dpy, parent[0], wattr.root, 3148 XTranslateCoordinates (dpy, parent, wattr.root,
3618 -wattr.border_width, -wattr.border_width, 3149 -wattr.border_width, -wattr.border_width,
3619 &x, &y, &wdummy); 3150 &x, &y, &wdummy);
3620 tt_printf ("\033[3;%d;%dt", x, y); 3151 tt_printf ("\033[3;%d;%dt", x, y);
3621 break; 3152 break;
3622 case 14: /* report window size (pixels) */ 3153 case 14: /* report window size (pixels) */
3623 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3624 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3625 break; 3156 break;
3626 case 18: /* report text area size (chars) */ 3157 case 18: /* report text area size (chars) */
3627 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3158 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3628 break; 3159 break;
… …
3630 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3161 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3631 break; 3162 break;
3632 case 20: /* report icon label */ 3163 case 20: /* report icon label */
3633 { 3164 {
3634 char *s; 3165 char *s;
3635 XGetIconName (dpy, parent[0], &s); 3166 XGetIconName (dpy, parent, &s);
3636 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3167 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3637 XFree (s); 3168 XFree (s);
3638 } 3169 }
3639 break; 3170 break;
3640 case 21: /* report window title */ 3171 case 21: /* report window title */
3641 { 3172 {
3642 char *s; 3173 char *s;
3643 XFetchName (dpy, parent[0], &s); 3174 XFetchName (dpy, parent, &s);
3644 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3645 XFree (s); 3176 XFree (s);
3646 } 3177 }
3647 break; 3178 break;
3648 } 3179 }
3649} 3180}
… …
3704 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3235 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3705 */ 3236 */
3706void 3237void
3707rxvt_term::process_dcs_seq () 3238rxvt_term::process_dcs_seq ()
3708{ 3239{
3709 char *s;
3710 unicode_t eh;
3711
3712 /* 3240 /*
3713 * Not handled yet 3241 * Not handled yet
3714 */ 3242 */
3243
3244 unicode_t eh;
3715 s = get_to_st (eh); 3245 char *s = get_to_st (eh);
3716 if (s) 3246 if (s)
3717 free (s); 3247 free (s);
3718 3248
3719 return; 3249 return;
3720} 3250}
… …
3724 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3254 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3725 */ 3255 */
3726void 3256void
3727rxvt_term::process_osc_seq () 3257rxvt_term::process_osc_seq ()
3728{ 3258{
3729 unicode_t ch, eh;
3730 int arg; 3259 int arg;
3731 3260
3732 ch = cmd_getc (); 3261 unicode_t ch = cmd_getc ();
3733 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3262 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3734 arg = arg * 10 + (ch - '0'); 3263 arg = arg * 10 + (ch - '0');
3735 3264
3736 if (ch == ';') 3265 if (ch == ';')
3737 { 3266 {
3267 unicode_t eh;
3738 char *s = get_to_st (eh); 3268 char *s = get_to_st (eh);
3739 3269
3740 if (s) 3270 if (s)
3741 { 3271 {
3742 process_xterm_seq (arg, s, eh); 3272 process_xterm_seq (arg, s, eh);
… …
3766 3296
3767/* 3297/*
3768 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3298 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3769 */ 3299 */
3770void 3300void
3771rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3301rxvt_term::process_xterm_seq (int op, char *str, char resp)
3772{ 3302{
3773 int color; 3303 int color;
3774 char *buf, *name; 3304 char *buf, *name;
3775 bool query = str[0] == '?' && !str[1]; 3305 bool query = str[0] == '?' && !str[1];
3776 int saveop = op; 3306 int saveop = op;
3777 3307
3778 dLocal (Display *, dpy); 3308 dLocal (Display *, dpy);
3779 3309
3780 assert (str != NULL); 3310 assert (str != NULL);
3781 3311
3782 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3312 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3783 return; 3313 return;
3784 3314
3785 switch (op) 3315 switch (op)
3786 { 3316 {
… …
3803 unsigned long bytes_after; 3333 unsigned long bytes_after;
3804 unsigned char *value = 0; 3334 unsigned char *value = 0;
3805 const char *str = ""; 3335 const char *str = "";
3806 3336
3807 if (prop 3337 if (prop
3808 && XGetWindowProperty (dpy, parent[0], 3338 && XGetWindowProperty (dpy, parent,
3809 prop, 0, 1<<16, 0, AnyPropertyType, 3339 prop, 0, 1<<16, 0, AnyPropertyType,
3810 &actual_type, &actual_format, 3340 &actual_type, &actual_format,
3811 &nitems, &bytes_after, &value) == Success 3341 &nitems, &bytes_after, &value) == Success
3812 && actual_type != None 3342 && actual_type != None
3813 && actual_format == 8) 3343 && actual_format == 8)
… …
3817 3347
3818 XFree (value); 3348 XFree (value);
3819 } 3349 }
3820 else 3350 else
3821 { 3351 {
3822 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3352 char *eq = strchr (str, '=');
3823 3353
3824 if (eq) 3354 if (eq)
3825 { 3355 {
3826 *eq = 0; 3356 *eq = 0;
3827 set_utf8_property (display->atom (str), eq + 1); 3357 set_utf8_property (display->atom (str), eq + 1);
3828 } 3358 }
3829 else 3359 else
3830 XDeleteProperty (dpy, parent[0], 3360 XDeleteProperty (dpy, parent,
3831 display->atom (str)); 3361 display->atom (str));
3832 } 3362 }
3833 break; 3363 break;
3834 3364
3835 case XTerm_Color: 3365 case XTerm_Color:
… …
3848 *buf++ = '\0'; 3378 *buf++ = '\0';
3849 3379
3850 process_color_seq (op, color, name, resp); 3380 process_color_seq (op, color, name, resp);
3851 } 3381 }
3852 break; 3382 break;
3383 case Rxvt_restoreFG:
3853 case XTerm_Color00: 3384 case XTerm_Color00:
3854 process_color_seq (op, Color_fg, str, resp); 3385 process_color_seq (op, Color_fg, str, resp);
3855 break; 3386 break;
3387 case Rxvt_restoreBG:
3856 case XTerm_Color01: 3388 case XTerm_Color01:
3857 process_color_seq (op, Color_bg, str, resp); 3389 process_color_seq (op, Color_bg, str, resp);
3858 break; 3390 break;
3859#ifndef NO_CURSORCOLOR 3391#ifndef NO_CURSORCOLOR
3860 case XTerm_Color_cursor: 3392 case XTerm_Color_cursor:
… …
3865 process_color_seq (op, Color_pointer_fg, str, resp); 3397 process_color_seq (op, Color_pointer_fg, str, resp);
3866 break; 3398 break;
3867 case XTerm_Color_pointer_bg: 3399 case XTerm_Color_pointer_bg:
3868 process_color_seq (op, Color_pointer_bg, str, resp); 3400 process_color_seq (op, Color_pointer_bg, str, resp);
3869 break; 3401 break;
3402#ifdef OPTION_HC
3403 case XTerm_Color_HC:
3404 process_color_seq (op, Color_HC, str, resp);
3405 break;
3406 case XTerm_Color_HTC:
3407 process_color_seq (op, Color_HTC, str, resp);
3408 break;
3409#endif
3870#ifndef NO_BOLD_UNDERLINE_REVERSE 3410#ifndef NO_BOLD_UNDERLINE_REVERSE
3871 case XTerm_Color_RV:
3872 process_color_seq (op, Color_RV, str, resp);
3873 break;
3874 case Rxvt_Color_BD:
3875 case URxvt_Color_BD: 3411 case URxvt_Color_BD:
3876 process_color_seq (op, Color_BD, str, resp); 3412 process_color_seq (op, Color_BD, str, resp);
3877 break; 3413 break;
3878 case Rxvt_Color_UL:
3879 case URxvt_Color_UL: 3414 case URxvt_Color_UL:
3880 process_color_seq (op, Color_UL, str, resp); 3415 process_color_seq (op, Color_UL, str, resp);
3881 break; 3416 break;
3882 case URxvt_Color_IT: 3417 case URxvt_Color_IT:
3883 process_color_seq (op, Color_IT, str, resp); 3418 process_color_seq (op, Color_IT, str, resp);
3884 break; 3419 break;
3885#endif 3420#endif
3886#if TRANSPARENT && TINTING 3421 case URxvt_Color_border:
3422 process_color_seq (op, Color_border, str, resp);
3423 break;
3424#if ENABLE_TRANSPARENCY
3887 case URxvt_Color_tint: 3425 case URxvt_Color_tint:
3888 process_color_seq (op, Color_tint, str, resp); 3426 process_color_seq (op, Color_tint, str, resp);
3427 {
3428 bool changed = false;
3889 3429
3890 check_our_parents (); 3430 if (ISSET_PIXCOLOR (Color_tint))
3431 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3891 3432
3892 if (am_transparent) 3433 if (changed)
3893 want_full_refresh = want_refresh = 1; 3434 update_background ();
3435 }
3894 3436
3895 break; 3437 break;
3896#endif 3438#endif
3897 3439
3440#if BG_IMAGE_FROM_FILE
3898 case Rxvt_Pixmap: 3441 case Rxvt_Pixmap:
3442 if (!strcmp (str, "?"))
3899 { 3443 {
3444 char str[256];
3445
3446 sprintf (str, "[%dx%d+%d+%d]",
3447 min (h_scale, 32767), min (v_scale, 32767),
3448 min (h_align, 32767), min (v_align, 32767));
3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3450 }
3451 else
3452 {
3453 bool changed = false;
3454
3900 if (*str != ';') 3455 if (*str != ';')
3901 { 3456 {
3902#if XPM_BACKGROUND
3903 scale_pixmap (""); /* reset to default scaling */
3904 set_bgPixmap (str); /* change pixmap */ 3457 if (bg_set_file (str)) /* change pixmap */
3905 scr_touch (true); 3458 changed = true;
3906#endif
3907 } 3459 }
3908 3460 else
3909 int changed = 0;
3910
3911 while ((str = strchr (str, ';')) != NULL)
3912 { 3461 {
3913 str++; 3462 str++;
3914#if XPM_BACKGROUND 3463 if (bg_set_geometry (str, true))
3915 changed += scale_pixmap (str); 3464 changed = true;
3916#endif
3917 } 3465 }
3918 3466
3919 if (changed) 3467 if (changed)
3920 { 3468 {
3921#ifdef XPM_BACKGROUND 3469 if (bg_window_position_sensitive ())
3922 resize_pixmap (); 3470 {
3923 scr_touch (true); 3471 int x, y;
3924#endif 3472 get_window_origin (x, y);
3473 bg_set_position (x, y);
3474 }
3475 update_background ();
3925 } 3476 }
3926 } 3477 }
3927 break; 3478 break;
3928 3479#endif
3929 case Rxvt_restoreFG:
3930 set_window_color (Color_fg, str);
3931 break;
3932 case Rxvt_restoreBG:
3933 set_window_color (Color_bg, str);
3934 break;
3935 3480
3936 case XTerm_logfile: 3481 case XTerm_logfile:
3937 // TODO, when secure mode? 3482 // TODO, when secure mode?
3938 break; 3483 break;
3939 3484
… …
3957 case URxvt_italicFont: 3502 case URxvt_italicFont:
3958 case URxvt_boldItalicFont: 3503 case URxvt_boldItalicFont:
3959#endif 3504#endif
3960 if (query) 3505 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", saveop, 3506 tt_printf ("\33]%d;%-.250s%c", saveop,
3962 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3507 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3963 ? fontset[op - URxvt_font]->fontdesc : "", 3508 ? fontset[op - URxvt_font]->fontdesc : "",
3964 resp); 3509 resp);
3965 else 3510 else
3966 { 3511 {
3967 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3512 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3981 break; 3526 break;
3982 3527
3983#if !ENABLE_MINIMAL 3528#if !ENABLE_MINIMAL
3984 case URxvt_locale: 3529 case URxvt_locale:
3985 if (query) 3530 if (query)
3986 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3531 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3987 else 3532 else
3988 { 3533 {
3989 set_locale (str); 3534 set_locale (str);
3990 pty->set_utf8_mode (enc_utf8); 3535 pty->set_utf8_mode (enc_utf8);
3991 init_xlocale (); 3536 init_xlocale ();
… …
4006 break; 3551 break;
4007#endif 3552#endif
4008 3553
4009#if ENABLE_PERL 3554#if ENABLE_PERL
4010 case URxvt_perl: 3555 case URxvt_perl:
4011 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3556 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4012 ; // no responses yet
4013 break; 3557 break;
4014#endif 3558#endif
4015 } 3559 }
4016} 3560}
4017/*----------------------------------------------------------------------*/ 3561/*----------------------------------------------------------------------*/
… …
4040 { 3584 {
4041 if (mode == 'r') 3585 if (mode == 'r')
4042 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3586 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4043 else 3587 else
4044 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3588 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4045 PrivMode (state, bit); 3589
3590 set_privmode (bit, state);
4046 } 3591 }
4047 3592
4048 return state; 3593 return state;
4049} 3594}
4050 3595
4051/* we're not using priv _yet_ */ 3596/* we're not using priv _yet_ */
4052void 3597void
4053rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3598rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4054{ 3599{
4055 unsigned int i, j; 3600 unsigned int i, j;
4056 int state; 3601 int state;
4057 3602
4058 static const struct 3603 static const struct
4059 { 3604 {
4060 const int argval; 3605 const int argval;
4061 const unsigned long bit; 3606 const unsigned long bit;
4062 }
4063
4064 argtopriv[] = { 3607 } argtopriv[] = {
4065 { 1, PrivMode_aplCUR }, 3608 { 1, PrivMode_aplCUR }, // DECCKM
4066 { 2, PrivMode_vt52 }, 3609 { 2, PrivMode_vt52 }, // DECANM
4067 { 3, PrivMode_132 }, 3610 { 3, PrivMode_132 }, // DECCOLM
4068 { 4, PrivMode_smoothScroll }, 3611 { 4, PrivMode_smoothScroll }, // DECSCLM
4069 { 5, PrivMode_rVideo }, 3612 { 5, PrivMode_rVideo }, // DECSCNM
4070 { 6, PrivMode_relOrigin }, 3613 { 6, PrivMode_relOrigin }, // DECOM
4071 { 7, PrivMode_Autowrap }, 3614 { 7, PrivMode_Autowrap }, // DECAWM
4072 // 8, bi-directional support mode 3615 // 8, auto-repeat keys // DECARM
4073 { 9, PrivMode_MouseX10 }, 3616 { 9, PrivMode_MouseX10 },
4074 // 18, 19 printing-related 3617 // 18 end FF to printer after print screen
3618 // 19 Print screen prints full screen/scroll region
4075 { 25, PrivMode_VisibleCursor }, 3619 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4076#ifdef scrollBar_esc 3620#ifdef scrollBar_esc
4077 { scrollBar_esc, PrivMode_scrollBar }, 3621 { scrollBar_esc, PrivMode_scrollBar },
4078#endif 3622#endif
4079 { 35, PrivMode_ShiftKeys }, // rxvt extension 3623 { 35, PrivMode_ShiftKeys }, // rxvt extension
3624 // 38, tektronix mode // DECTEK
4080 { 40, PrivMode_132OK }, 3625 { 40, PrivMode_132OK },
4081 // 41 xterm more fixes NYI 3626 // 41 xterm more fixes NYI
4082 // 45 margin bell NYI 3627 // 45 margin bell NYI
4083 // 46 start logging 3628 // 46 start logging
4084 { 47, PrivMode_Screen }, 3629 { 47, PrivMode_Screen },
4085 { 66, PrivMode_aplKP }, 3630 { 66, PrivMode_aplKP }, // DECNKM
4086#ifndef NO_BACKSPACE_KEY 3631#ifndef NO_BACKSPACE_KEY
4087 { 67, PrivMode_BackSpace }, 3632 { 67, PrivMode_BackSpace }, // DECBKM
4088#endif 3633#endif
4089 { 1000, PrivMode_MouseX11 }, 3634 { 1000, PrivMode_MouseX11 },
4090 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3635 { 1002, PrivMode_MouseBtnEvent },
4091 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3636 { 1003, PrivMode_MouseAnyEvent },
4092 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3637#if ENABLE_FRILLS
3638 { 1005, PrivMode_ExtModeMouse },
3639#endif
4093 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4094 { 1011, PrivMode_Keypress }, // rxvt extension 3641 { 1011, PrivMode_Keypress }, // rxvt extension
3642#if ENABLE_FRILLS
3643 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3644#endif
4095 // 1035 enable modifiers for alt, numlock NYI 3645 // 1035 enable modifiers for alt, numlock NYI
4096 // 1036 send ESC for meta keys NYI 3646 // 1036 send ESC for meta keys NYI
4097 // 1037 send DEL for keypad delete NYI 3647 // 1037 send DEL for keypad delete NYI
4098 { 1047, PrivMode_Screen }, 3648 { 1047, PrivMode_Screen },
4099 // 1048 save and restore cursor 3649 // 1048 save and restore cursor, implemented in code
4100 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3650 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4101 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3651 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3652 { 2004, PrivMode_BracketPaste },
4102 }; 3653 };
4103 3654
4104 if (nargs == 0) 3655 if (nargs == 0)
4105 return; 3656 return;
4106 3657
… …
4113 for (i = 0; i < nargs; i++) 3664 for (i = 0; i < nargs; i++)
4114 { 3665 {
4115 state = -1; 3666 state = -1;
4116 3667
4117 /* basic handling */ 3668 /* basic handling */
4118 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3669 for (j = 0; j < ecb_array_length (argtopriv); j++)
4119 if (argtopriv[j].argval == arg[i]) 3670 if (argtopriv[j].argval == arg[i])
4120 { 3671 {
4121 state = privcases (mode, argtopriv[j].bit); 3672 state = privcases (mode, argtopriv[j].bit);
4122 break; 3673 break;
4123 } 3674 }
… …
4131 3682
4132 scr_touch (true); 3683 scr_touch (true);
4133 break; 3684 break;
4134#endif 3685#endif
4135 case 1048: /* alternative cursor save */ 3686 case 1048: /* alternative cursor save */
4136 case 1049:
4137 if (OPTION (Opt_secondaryScreen)) 3687 if (option (Opt_secondaryScreen))
4138 if (mode == 0) 3688 if (mode == 0)
4139 scr_cursor (RESTORE); 3689 scr_cursor (RESTORE);
4140 else if (mode == 1) 3690 else if (mode == 1)
4141 scr_cursor (SAVE); 3691 scr_cursor (SAVE);
4142 break; 3692 break;
… …
4150 case 2: /* VT52 mode */ 3700 case 2: /* VT52 mode */
4151 /* oddball mode. should be set regardless of set/reset 3701 /* oddball mode. should be set regardless of set/reset
4152 * parameter. Return from VT52 mode with an ESC < from 3702 * parameter. Return from VT52 mode with an ESC < from
4153 * within VT52 mode 3703 * within VT52 mode
4154 */ 3704 */
4155 PrivMode (1, PrivMode_vt52); 3705 set_privmode (PrivMode_vt52, 1);
4156 break; 3706 break;
4157 case 3: /* 80/132 */ 3707 case 3: /* 80/132 */
4158 if (priv_modes & PrivMode_132OK) 3708 if (priv_modes & PrivMode_132OK)
4159 set_widthheight (((state ? 132 : 80) * fwidth), height); 3709 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4160 break; 3710 break;
4161 case 4: /* smooth scrolling */ 3711 case 4: /* smooth scrolling */
4162 set_option (Opt_jumpScroll, !state); 3712 set_option (Opt_jumpScroll, !state);
4163 break; 3713 break;
4164 case 5: /* reverse video */ 3714 case 5: /* reverse video */
… …
4171 scr_autowrap (state); 3721 scr_autowrap (state);
4172 break; 3722 break;
4173 /* case 8: - auto repeat, can't do on a per window basis */ 3723 /* case 8: - auto repeat, can't do on a per window basis */
4174 case 9: /* X10 mouse reporting */ 3724 case 9: /* X10 mouse reporting */
4175 if (state) /* orthogonal */ 3725 if (state) /* orthogonal */
4176 priv_modes &= ~PrivMode_MouseX11; 3726 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4177 break; 3727 break;
4178#ifdef scrollBar_esc 3728#ifdef scrollBar_esc
4179 case scrollBar_esc: 3729 case scrollBar_esc:
4180 if (scrollbar_mapping (state)) 3730 if (scrollBar.map (state))
4181 { 3731 {
4182 resize_all_windows (0, 0, 0); 3732 resize_all_windows (0, 0, 0);
4183 scr_touch (true); 3733 scr_touch (true);
4184 } 3734 }
4185 break; 3735 break;
… …
4194 break; 3744 break;
4195 /* case 66: - application key pad */ 3745 /* case 66: - application key pad */
4196 /* case 67: - backspace key */ 3746 /* case 67: - backspace key */
4197 case 1000: /* X11 mouse reporting */ 3747 case 1000: /* X11 mouse reporting */
4198 if (state) /* orthogonal */ 3748 if (state) /* orthogonal */
4199 priv_modes &= ~PrivMode_MouseX10; 3749 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4200 break; 3750 break;
4201#if 0
4202 case 1001: 3751 case 1002:
4203 break; /* X11 mouse highlighting */ 3752 case 1003:
4204#endif 3753 if (state)
3754 {
3755 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3756 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3757 mouse_row = mouse_col = 0;
3758 vt_emask_mouse = PointerMotionMask;
3759 }
3760 else
3761 vt_emask_mouse = NoEventMask;
3762
3763 vt_select_input ();
3764 break;
4205 case 1010: /* scroll to bottom on TTY output inhibit */ 3765 case 1010: /* scroll to bottom on TTY output inhibit */
4206 set_option (Opt_scrollTtyOutput, !state); 3766 set_option (Opt_scrollTtyOutput, !state);
4207 break; 3767 break;
4208 case 1011: /* scroll to bottom on key press */ 3768 case 1011: /* scroll to bottom on key press */
4209 set_option (Opt_scrollTtyKeypress, state); 3769 set_option (Opt_scrollTtyKeypress, state);
4210 break; 3770 break;
4211 case 1047: /* secondary screen w/ clearing last */ 3771 case 1047: /* secondary screen w/ clearing last */
4212 if (OPTION (Opt_secondaryScreen)) 3772 if (option (Opt_secondaryScreen))
4213 if (current_screen != PRIMARY) 3773 if (!state)
4214 scr_erase_screen (2); 3774 scr_erase_screen (2);
3775
4215 scr_change_screen (state); 3776 scr_change_screen (state);
4216 break; 3777 break;
4217 case 1049: /* secondary screen w/ clearing first */ 3778 case 1049: /* secondary screen w/ clearing first */
3779 if (option (Opt_secondaryScreen))
3780 if (state)
3781 scr_cursor (SAVE);
3782
4218 scr_change_screen (state); 3783 scr_change_screen (state);
3784
4219 if (OPTION (Opt_secondaryScreen)) 3785 if (option (Opt_secondaryScreen))
4220 if (current_screen != PRIMARY) 3786 if (state)
4221 scr_erase_screen (2); 3787 scr_erase_screen (2);
3788 else
3789 scr_cursor (RESTORE);
4222 break; 3790 break;
4223 default: 3791 default:
4224 break; 3792 break;
4225 } 3793 }
4226 } 3794 }
… …
4379 } 3947 }
4380 } 3948 }
4381} 3949}
4382/*}}} */ 3950/*}}} */
4383 3951
4384/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4385void
4386rxvt_term::process_graphics ()
4387{
4388 unicode_t ch, cmd = cmd_getc ();
4389
4390 if (cmd == 'Q')
4391 { /* query graphics */
4392 tt_printf ("\033G0\012"); /* no graphics */
4393 return;
4394 }
4395 /* swallow other graphics sequences until terminating ':' */
4396 do
4397 ch = cmd_getc ();
4398 while (ch != ':');
4399}
4400/*}}} */
4401
4402/* ------------------------------------------------------------------------- */ 3952/* ------------------------------------------------------------------------- */
4403 3953
4404/* 3954/*
4405 * Send printf () formatted output to the command. 3955 * Send printf () formatted output to the command.
4406 * Only use for small amounts of data. 3956 * Only use for small amounts of data.
… …
4419 3969
4420/* ---------------------------------------------------------------------- */ 3970/* ---------------------------------------------------------------------- */
4421/* Write data to the pty as typed by the user, pasted with the mouse, 3971/* Write data to the pty as typed by the user, pasted with the mouse,
4422 * or generated by us in response to a query ESC sequence. 3972 * or generated by us in response to a query ESC sequence.
4423 */ 3973 */
4424const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3974static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4425 3975
4426void 3976void
4427rxvt_term::tt_write (const char *data, unsigned int len) 3977rxvt_term::tt_write (const char *data, unsigned int len)
4428{ 3978{
4429 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3979 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4434 3984
4435 if (v_buflen == 0) 3985 if (v_buflen == 0)
4436 { 3986 {
4437 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3987 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4438 3988
3989 max_it (written, 0);
3990
4439 if ((unsigned int)written == len) 3991 if (written == len)
4440 return; 3992 return;
4441 3993
4442 data += written; 3994 data += written;
4443 len -= written; 3995 len -= written;
4444 } 3996 }
4445 3997
4446 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3998 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4447 3999
4448 memcpy (v_buffer + v_buflen, data, len); 4000 memcpy (v_buffer + v_buflen, data, len);
4449 v_buflen += len; 4001 v_buflen += len;
4450 4002
4451 pty_ev.set (EVENT_READ | EVENT_WRITE); 4003 pty_ev.set (ev::READ | ev::WRITE);
4452} 4004}
4453 4005
4454void rxvt_term::pty_write () 4006void rxvt_term::pty_write ()
4455{ 4007{
4456 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4008 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4461 4013
4462 if (v_buflen == 0) 4014 if (v_buflen == 0)
4463 { 4015 {
4464 free (v_buffer); 4016 free (v_buffer);
4465 v_buffer = 0; 4017 v_buffer = 0;
4466 v_buflen = 0;
4467 4018
4468 pty_ev.set (EVENT_READ); 4019 pty_ev.set (ev::READ);
4469 return; 4020 return;
4470 } 4021 }
4471 4022
4472 memmove (v_buffer, v_buffer + written, v_buflen); 4023 memmove (v_buffer, v_buffer + written, v_buflen);
4473 } 4024 }
4474 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4025 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4475 pty_ev.set (EVENT_READ); 4026 pty_ev.set (ev::READ);
4476} 4027}
4477 4028
4478/*----------------------- end-of-file (C source) -----------------------*/ 4029/*----------------------- end-of-file (C source) -----------------------*/
4479 4030

Diff Legend

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