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.351 by ayin, Sun Sep 9 10:14:40 2007 UTC vs.
Revision 1.494 by sf-exg, Mon Aug 22 17:23:56 2011 UTC

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

Diff Legend

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