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.352 by ayin, Sun Sep 9 10:35:00 2007 UTC vs.
Revision 1.497 by sf-exg, Thu Sep 1 08:11:26 2011 UTC

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

Diff Legend

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