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.313 by root, Wed Jul 5 22:46:14 2006 UTC vs.
Revision 1.499 by root, Wed Nov 16 20:15:45 2011 UTC

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

Diff Legend

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