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.302 by root, Tue Jan 31 21:35:39 2006 UTC vs.
Revision 1.546 by sf-exg, Tue Apr 29 07:50:53 2014 UTC

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

Diff Legend

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