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

Diff Legend

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