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.443 by sf-exg, Wed Mar 31 13:14:50 2010 UTC vs.
Revision 1.568 by sf-exg, Tue Oct 13 08:10:43 2015 UTC

… …
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-2007 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 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * 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
34 * 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
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 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",
190 (int)r, 193 (int)r,
… …
198 201
199 int width = 0; 202 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len); 203 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++) 204 for (int i = 0; i < len; i++)
202 { 205 {
203 rxvt_font *f = (*fs)[fs->find_font (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 267
267 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
268 { 269 {
269 char mb[16]; 270 char mb[MB_LEN_MAX];
270 int len; 271 int len;
271 272
272 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
275 else 276 else
276 { 277 {
277 mb[0] = ch[0]; 278 mb[0] = ch;
278 len = 1; 279 len = 1;
279 } 280 }
280 281
281 if (len > 0) 282 if (len > 0)
282 tt_write (mb, len); 283 tt_write (mb, len);
… …
285 } 286 }
286 287
287 iso14755buf = 0; 288 iso14755buf = 0;
288} 289}
289 290
290static int 291static int ecb_cold
291hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
292{ 293{
293 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
294 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
295 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
304 305
305 return -1; 306 return -1;
306} 307}
307#endif 308#endif
308 309
309static inline KeySym 310static inline KeySym ecb_cold
310translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
311{ 312{
312#ifdef XK_KP_Home 313#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left 316 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up 317 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right 318 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down 319 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior 320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next 321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End 322 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin 323 XK_KP_5, // XK_KP_Begin
328 }; 324 };
329 325
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
340# endif 336# endif
341#endif 337#endif
342 return keysym; 338 return keysym;
343} 339}
344 340
345static inline int 341static inline int ecb_cold
346map_function_key (KeySym keysym) 342map_function_key (KeySym keysym)
347{ 343{
348 int param = 0; 344 int param = 0;
349 345
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
375 param = 3; 371 param = 3;
376 break; 372 break;
377 case XK_Select: 373 case XK_Select:
378 param = 4; 374 param = 4;
379 break; 375 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior: 376 case XK_Prior:
382 param = 5; 377 param = 5;
383 break; 378 break;
384 case XK_Next: 379 case XK_Next:
385 param = 6; 380 param = 6;
… …
388 param = 7; 383 param = 7;
389 break; 384 break;
390 case XK_End: 385 case XK_End:
391 param = 8; 386 param = 8;
392 break; 387 break;
393#endif
394 case XK_Help: 388 case XK_Help:
395 param = 28; 389 param = 28;
396 break; 390 break;
397 case XK_Menu: 391 case XK_Menu:
398 param = 29; 392 param = 29;
399 break; 393 break;
400 } 394 }
401 return param; 395 return param;
402} 396}
403 397
404void 398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
407void ecb_cold
405rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
406{ 409{
407 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
408 KeySym keysym; 411 KeySym keysym = NoSymbol;
409 int valid_keysym;
410 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
411 414
412#if ISO_14755 415#if ISO_14755
413 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
414 return; 417 return;
415#endif 418#endif
… …
422 */ 425 */
423 shft = ev.state & ShiftMask; 426 shft = ev.state & ShiftMask;
424 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
426 429
427 if (numlock_state || (ev.state & ModNumLockMask))
428 {
429 numlock_state = (ev.state & ModNumLockMask);
430 set_privmode (PrivMode_aplKP, !numlock_state);
431 }
432
433 kbuf[0] = 0; 430 kbuf[0] = 0;
434 431
435#ifdef USE_XIM 432#if USE_XIM
436 if (Input_Context) 433 if (Input_Context)
437 { 434 {
438 Status status_return; 435 Status status_return;
439 436
440#if 0 437#if 0
… …
478 } 475 }
479 } 476 }
480 else 477 else
481 len = 0; 478 len = 0;
482 } 479 }
483
484 valid_keysym = status_return == XLookupKeySym
485 || status_return == XLookupBoth;
486 } 480 }
487 else 481 else
488#endif 482#endif
489 { 483 {
490 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
491 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
492 } 488 {
489 KeySym orig_keysym = keysym;
493 490
494 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681 }
682#endif
683 /* nil */ ;
684 }
685
686 keysym = orig_keysym;
687 }
688
689 /* escape prefix */
690 if (len && meta
691#ifdef META8_OPTION
692 && meta_char == C0_ESC
693#endif
694 )
695 {
696 *--kbuf = C0_ESC;
697 len++;
698 }
699
700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
495 { 704 {
496#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
497 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
498 return; 707 return;
499#endif 708#endif
500 709
501 if (saveLines) 710 if (saveLines)
502 { 711 {
… …
515#endif 724#endif
516 max_it (lnsppg, 1); 725 max_it (lnsppg, 1);
517 726
518 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
519 { 728 {
520 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
521 return; 730 return;
522 } 731 }
523 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
524 { 733 {
525 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
526 return; 735 return;
527 } 736 }
528 } 737 }
529#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
530 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
531 { 740 {
532 if (keysym == XK_Up) 741 if (keysym == XK_Up)
533 { 742 {
534 scr_page (UP, 1); 743 scr_page (1);
535 return; 744 return;
536 } 745 }
537 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
538 { 747 {
539 scr_page (DN, 1); 748 scr_page (-1);
540 return; 749 return;
541 } 750 }
542 } 751 }
543#endif 752#endif
544#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
545 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
546 { 755 {
547 if (keysym == XK_Home) 756 if (keysym == XK_Home)
548 { 757 {
549 scr_move_to (0, 1); 758 scr_changeview (top_row);
550 return; 759 return;
551 } 760 }
552 else if (keysym == XK_End) 761 else if (keysym == XK_End)
553 { 762 {
554 scr_move_to (1, 1); 763 scr_changeview (0);
555 return; 764 return;
556 } 765 }
557 } 766 }
558#endif 767#endif
559 } 768 }
560 769
561 if (shft) 770 if (shft)
562 { 771 {
563 /* Shift + F1 - F10 generates F11 - F20 */
564 if (keysym >= XK_F1 && keysym <= XK_F10)
565 {
566 keysym += (XK_F11 - XK_F1);
567 shft = 0; /* turn off Shift */
568 }
569 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
570 { 773 {
571 switch (keysym) 774 switch (keysym)
572 { 775 {
573 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
574 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
575 selection_request (ev.time); 778 selection_request (ev.time);
576 return; 779 return;
577#if TODO 780#if TODO
578 /* rxvt extras */ 781 /* rxvt extras */
579 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 782 case XK_KP_Add: /* Shift+KP_Add = bigger font */
580 change_font (FONT_UP);
581 return; 783 return;
582 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
583 change_font (FONT_DN);
584 return; 785 return;
585#endif 786#endif
586 } 787 }
587 } 788 }
789 }
790
791 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
792 {
793 if (keysym == XK_v)
794 selection_request (ev.time, Sel_Clipboard);
795 else if (selection.len > 0)
796 {
797 free (selection.clip_text);
798 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
799 selection.clip_len = selection.len;
800 selection_grab (CurrentTime, true);
801 }
802
803 return;
588 } 804 }
589 805
590#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
591 // ISO 14755 support 807 // ISO 14755 support
592 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
647 { 863 {
648 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
649 return; 865 return;
650 } 866 }
651#endif 867#endif
652
653 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
654 {
655 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
656 unsigned int newlen = 1;
657
658 switch (translate_keypad (keysym, kp))
659 {
660#ifndef NO_BACKSPACE_KEY
661 case XK_BackSpace:
662 if (priv_modes & PrivMode_HaveBackSpace)
663 {
664 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
665 ^ !!ctrl) ? '\b' : '\177';
666 kbuf[1] = '\0';
667 }
668 else
669 strcpy (kbuf, rs[Rs_backspace_key]);
670 break;
671#endif
672#ifndef NO_DELETE_KEY
673 case XK_Delete:
674 strcpy (kbuf, rs[Rs_delete_key]);
675 break;
676#endif
677 case XK_Tab:
678 if (shft)
679 strcpy (kbuf, "\033[Z");
680 else
681 {
682#ifdef CTRL_TAB_MAKES_META
683 if (ctrl)
684 meta = 1;
685#endif
686#ifdef MOD4_TAB_MAKES_META
687 if (ev.state & Mod4Mask)
688 meta = 1;
689#endif
690 newlen = 0;
691 }
692 break;
693
694 case XK_Up: /* "\033[A" */
695 case XK_Down: /* "\033[B" */
696 case XK_Right: /* "\033[C" */
697 case XK_Left: /* "\033[D" */
698 strcpy (kbuf, "\033[Z");
699 kbuf[2] = "DACB"[keysym - XK_Left];
700 /* do Shift first */
701 if (shft)
702 kbuf[2] = "dacb"[keysym - XK_Left];
703 else if (ctrl)
704 {
705 kbuf[1] = 'O';
706 kbuf[2] = "dacb"[keysym - XK_Left];
707 }
708 else if (priv_modes & PrivMode_aplCUR)
709 kbuf[1] = 'O';
710 break;
711
712 case XK_KP_Enter:
713 /* allow shift to override */
714 if (kp)
715 {
716 strcpy (kbuf, "\033OM");
717 break;
718 }
719
720 /* FALLTHROUGH */
721
722 case XK_Return:
723 if (priv_modes & PrivMode_LFNL)
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\012';
727 kbuf[2] = '\0';
728 }
729 else
730 {
731 kbuf[0] = '\015';
732 kbuf[1] = '\0';
733 }
734 break;
735
736 case XK_KP_F1: /* "\033OP" */
737 case XK_KP_F2: /* "\033OQ" */
738 case XK_KP_F3: /* "\033OR" */
739 case XK_KP_F4: /* "\033OS" */
740 strcpy (kbuf, "\033OP");
741 kbuf[2] += (keysym - XK_KP_F1);
742 break;
743
744 case XK_KP_Multiply: /* "\033Oj" : "*" */
745 case XK_KP_Add: /* "\033Ok" : "+" */
746 case XK_KP_Separator: /* "\033Ol" : "," */
747 case XK_KP_Subtract: /* "\033Om" : "-" */
748 case XK_KP_Decimal: /* "\033On" : "." */
749 case XK_KP_Divide: /* "\033Oo" : "/" */
750 case XK_KP_0: /* "\033Op" : "0" */
751 case XK_KP_1: /* "\033Oq" : "1" */
752 case XK_KP_2: /* "\033Or" : "2" */
753 case XK_KP_3: /* "\033Os" : "3" */
754 case XK_KP_4: /* "\033Ot" : "4" */
755 case XK_KP_5: /* "\033Ou" : "5" */
756 case XK_KP_6: /* "\033Ov" : "6" */
757 case XK_KP_7: /* "\033Ow" : "7" */
758 case XK_KP_8: /* "\033Ox" : "8" */
759 case XK_KP_9: /* "\033Oy" : "9" */
760 /* allow shift to override */
761 if (kp)
762 {
763 strcpy (kbuf, "\033Oj");
764 kbuf[2] += (keysym - XK_KP_Multiply);
765 }
766 else
767 {
768 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
769 kbuf[1] = '\0';
770 }
771 break;
772
773 default:
774 {
775 int param = map_function_key (keysym);
776 if (param > 0)
777 sprintf (kbuf,"\033[%d~", param);
778 else
779 newlen = 0;
780 }
781 break;
782 }
783
784 if (newlen)
785 len = strlen (kbuf);
786
787 /*
788 * Pass meta for all function keys, if 'meta' option set
789 */
790#ifdef META8_OPTION
791 if (meta && (meta_char == 0x80) && len > 0)
792 kbuf[len - 1] |= 0x80;
793#endif
794
795 }
796 else if (ctrl && keysym == XK_minus)
797 {
798 len = 1;
799 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
800 }
801 else if (keysym == XK_ISO_Left_Tab)
802 {
803 strcpy (kbuf, "\033[Z");
804 len = 3;
805 }
806 else
807 {
808#ifdef META8_OPTION
809 /* set 8-bit on */
810 if (meta && (meta_char == 0x80))
811 {
812 char *ch;
813
814 for (ch = kbuf; ch < kbuf + len; ch++)
815 *ch |= 0x80;
816
817 meta = 0;
818 }
819#endif
820 /* nil */ ;
821 }
822 } 868 }
823
824 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
825 return;
826 869
827 if (len <= 0) 870 if (len <= 0)
828 return; /* not mapped */ 871 return; /* not mapped */
829 872
830 if (option (Opt_scrollTtyKeypress))
831 if (view_start)
832 {
833 view_start = 0;
834 want_refresh = 1;
835 }
836
837 /*
838 * these modifications only affect the static keybuffer
839 * pass Shift/Control indicators for function keys ending with `~'
840 *
841 * eg,
842 * Prior = "ESC[5~"
843 * Shift+Prior = "ESC[5$"
844 * Ctrl+Prior = "ESC[5^"
845 * Ctrl+Shift+Prior = "ESC[5@"
846 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
847 */
848 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
849 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
850
851 /* escape prefix */
852 if (meta
853#ifdef META8_OPTION
854 && meta_char == C0_ESC
855#endif
856 )
857 {
858 const char ch = C0_ESC;
859 tt_write (&ch, 1);
860 }
861
862 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
863} 874}
864 875
865void 876void ecb_cold
866rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
867{ 878{
868#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
869 KeySym keysym; 880 KeySym keysym;
870 881
… …
890 commit_iso14755 (); 901 commit_iso14755 ();
891 902
892 return; 903 return;
893 } 904 }
894 905
895 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 906 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
896 if (i[0] == keysym) 907 if (i[0] == keysym)
897 { 908 {
898 iso14755buf = ISO_14755_51 | i[1]; 909 iso14755buf = ISO_14755_51 | i[1];
899 commit_iso14755 (); 910 commit_iso14755 ();
900 911
… …
937 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
938 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
939#endif 950#endif
940} 951}
941 952
942#if defined (KEYSYM_RESOURCE)
943unsigned int
944rxvt_term::cmd_write (const char *str, unsigned int count)
945{
946 unsigned int n, s;
947
948 n = cmdbuf_ptr - cmdbuf_base;
949 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
950
951 if (n > 0 && s < count)
952 {
953 memmove (cmdbuf_base, cmdbuf_ptr,
954 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
955 cmdbuf_ptr = cmdbuf_base;
956 cmdbuf_endp -= n;
957 s += n;
958 }
959
960 if (count > s)
961 {
962 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
963 count = s;
964 }
965
966 for (; count--;)
967 *cmdbuf_endp++ = *str++;
968
969 cmd_parse ();
970
971 return 0;
972}
973#endif
974
975void 953void
976rxvt_term::flush () 954rxvt_term::flush ()
977{ 955{
978 flush_ev.stop (); 956 flush_ev.stop ();
979 957
980#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
981 if (bgPixmap.check_clearChanged ()) 959 if (bg_flags & BG_NEEDS_REFRESH)
982 { 960 {
983// scr_clear (true); This needs to be researched further! 961 bg_flags &= ~BG_NEEDS_REFRESH;
984 scr_touch (false); 962 scr_touch (false);
985 } 963 }
986#endif 964#endif
987 965
988 if (want_refresh) 966 if (want_refresh)
… …
1025 while (row < end_row); 1003 while (row < end_row);
1026 } 1004 }
1027 1005
1028 scr_refresh (); 1006 scr_refresh ();
1029 scrollBar.show (1); 1007 scrollBar.show (1);
1030#ifdef USE_XIM 1008#if USE_XIM
1031 IMSendSpot (); 1009 im_send_spot ();
1032#endif 1010#endif
1033 } 1011 }
1034 1012
1035 display->flush (); 1013 display->flush ();
1036} 1014}
… …
1054 flush (); 1032 flush ();
1055} 1033}
1056 1034
1057#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1058void 1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (!focus)
1040 return;
1041
1042 if (hidden_cursor)
1043 {
1044 hidden_cursor = 0;
1045 want_refresh = 1;
1046 }
1047
1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1049 cursor_blink_ev.again ();
1050 else
1051 cursor_blink_ev.stop ();
1052}
1053
1054void
1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1060{ 1056{
1061 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1062 want_refresh = 1; 1058 want_refresh = 1;
1063 refresh_check (); 1059 refresh_check ();
… …
1081 1077
1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1083void 1079void
1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1085{ 1081{
1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1082 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1088 { 1084 {
1089 want_refresh = 1; 1085 want_refresh = 1;
1090 refresh_check (); 1086 refresh_check ();
1091 } 1087 }
1092 else 1088 else
… …
1096 1092
1097#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1098void 1094void
1099rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1100{ 1096{
1101 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1102 { 1098 {
1103 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1104 want_refresh = 1; 1100 want_refresh = 1;
1105 refresh_check (); 1101 refresh_check ();
1106 } 1102 }
… …
1111 1107
1112#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1113void 1109void
1114rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1115{ 1111{
1116 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1112 if (scr_page (mouse_slip_wheel_speed))
1117 { 1113 {
1118 want_refresh = 1; 1114 want_refresh = 1;
1119 refresh_check (); 1115 refresh_check ();
1120 } 1116 }
1121 1117
… …
1153 { 1149 {
1154 } 1150 }
1155} event_handler; 1151} event_handler;
1156#endif 1152#endif
1157 1153
1154/* make sure all the cmd data is at beginning of cmdbuf */
1155void
1156rxvt_term::cmdbuf_reify ()
1157{
1158 if (cmdbuf_ptr == cmdbuf_base)
1159 return;
1160
1161 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1162
1163 memmove (cmdbuf_base, cmdbuf_ptr, used);
1164 cmdbuf_ptr = cmdbuf_base;
1165 cmdbuf_endp = cmdbuf_ptr + used;
1166
1167}
1168
1169#if defined (KEYSYM_RESOURCE)
1170void
1171rxvt_term::cmdbuf_append (const char *str, size_t count)
1172{
1173 cmdbuf_reify ();
1174
1175 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1176
1177 if (count > avail)
1178 return;
1179
1180 memcpy (cmdbuf_endp, str, count);
1181 cmdbuf_endp += count;
1182
1183 cmd_parse ();
1184}
1185#endif
1186
1158bool 1187bool
1159rxvt_term::pty_fill () 1188rxvt_term::pty_fill ()
1160{ 1189{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1190 cmdbuf_reify ();
1162 1191
1163 if (CBUFSIZ == n) 1192 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1193
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1194 if (!avail)
1166 n = 0;
1167 } 1195 {
1168 1196 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1197 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1198 cmdbuf_endp = cmdbuf_ptr;
1199 avail = CBUFSIZ;
1200 }
1172 1201
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1202 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1203
1175 if (r > 0) 1204 if (r > 0)
1176 { 1205 {
1177 cmdbuf_endp += r; 1206 cmdbuf_endp += r;
1178 return true; 1207 return true;
… …
1209 pty_write (); 1238 pty_write ();
1210 1239
1211 refresh_check (); 1240 refresh_check ();
1212} 1241}
1213 1242
1214void 1243void ecb_cold
1215rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1216{ 1245{
1217 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1218 recolour_cursor (); 1247 recolor_cursor ();
1219 1248
1220#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1221 hidden_pointer = 0; 1250 hidden_pointer = 0;
1222 1251
1223 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1224 pointer_ev.start (pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1225#endif 1254#endif
1226} 1255}
1227 1256
1228#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1229void 1258void ecb_cold
1230rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1231{ 1260{
1232 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1233 return; 1262 return;
1234 1263
… …
1236 XFlush (dpy); 1265 XFlush (dpy);
1237 1266
1238 hidden_pointer = 1; 1267 hidden_pointer = 1;
1239} 1268}
1240 1269
1241void 1270void ecb_cold
1242rxvt_term::pointer_cb (ev::timer &w, int revents) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1243{ 1272{
1244 make_current (); 1273 make_current ();
1245 1274
1246 pointer_blank (); 1275 pointer_blank ();
… …
1252{ 1281{
1253 int button_number, key_state = 0; 1282 int button_number, key_state = 0;
1254 int x, y; 1283 int x, y;
1255 int code = 32; 1284 int code = 32;
1256 1285
1257 x = Pixel2Col (ev.x); 1286 x = Pixel2Col (ev.x) + 1;
1258 y = Pixel2Row (ev.y); 1287 y = Pixel2Row (ev.y) + 1;
1288
1259 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
1260 { 1290 {
1261 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1262 return; 1292 return;
1293
1263 mouse_row = x; 1294 mouse_row = x;
1264 mouse_col = y; 1295 mouse_col = y;
1265 code += 32; 1296 code += 32;
1266 } 1297 }
1267 1298
… …
1270 else 1301 else
1271 { 1302 {
1272 button_number = MEvent.button - Button1; 1303 button_number = MEvent.button - Button1;
1273 /* add 0x3D for wheel events, like xterm does */ 1304 /* add 0x3D for wheel events, like xterm does */
1274 if (button_number >= 3) 1305 if (button_number >= 3)
1275 button_number += (64 - 3); 1306 button_number += 64 - 3;
1276 } 1307 }
1277 1308
1278 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1279 { 1310 {
1280 /* 1311 /*
… …
1312 fputc ('A', stderr); 1343 fputc ('A', stderr);
1313 if (key_state & 32) 1344 if (key_state & 32)
1314 fputc ('2', stderr); 1345 fputc ('2', stderr);
1315 fprintf (stderr, "]: <%d>, %d/%d\n", 1346 fprintf (stderr, "]: <%d>, %d/%d\n",
1316 button_number, 1347 button_number,
1317 x + 1, 1348 x,
1318 y + 1); 1349 y);
1319#endif 1350#endif
1320 1351
1352#if ENABLE_FRILLS
1353 if (priv_modes & PrivMode_ExtMouseRight)
1354 tt_printf ("\033[%d;%d;%dM",
1355 code + button_number + key_state,
1356 x,
1357 y);
1358 else if (priv_modes & PrivMode_ExtModeMouse)
1359 tt_printf ("\033[M%c%lc%lc",
1360 code + button_number + key_state,
1361 wint_t (32 + x),
1362 wint_t (32 + y));
1363 else
1364#endif
1321 tt_printf ("\033[M%c%c%c", 1365 tt_printf ("\033[M%c%c%c",
1322 (code + button_number + key_state), 1366 code + button_number + key_state,
1323 (32 + x + 1), 1367 32 + x,
1324 (32 + y + 1)); 1368 32 + y);
1325} 1369}
1326 1370
1327/*{{{ process an X event */ 1371/*{{{ process an X event */
1328void 1372void ecb_hot
1329rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1330{ 1374{
1331 make_current (); 1375 make_current ();
1332 1376
1333 dLocal (Display *, dpy); 1377 dLocal (Display *, dpy);
… …
1431 && ev.xfocus.mode != NotifyGrab) 1475 && ev.xfocus.mode != NotifyGrab)
1432 focus_out (); 1476 focus_out ();
1433 break; 1477 break;
1434 1478
1435 case ConfigureNotify: 1479 case ConfigureNotify:
1436 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1437 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1438 szHint.width, szHint.height);*/
1439 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent)
1440 { 1481 {
1441 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1442 ; 1483 ;
1484
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486
1487 bool moved = false;
1488#ifdef HAVE_BG_PIXMAP
1489 if (bg_window_position_sensitive ())
1490 {
1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1495#endif
1496
1497 if (want_position_change)
1498 {
1499 int x, y;
1500
1501 if (ev.xconfigure.send_event)
1502 {
1503 x = ev.xconfigure.x;
1504 y = ev.xconfigure.y;
1505 }
1506 else
1507 get_window_origin (x, y);
1508
1509 if (x != parent_x || y != parent_y)
1510 {
1511 parent_x = x;
1512 parent_y = y;
1513 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1514 moved = true;
1515 }
1516 }
1443 1517
1444 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1445 { 1519 {
1446 seen_resize = 1; 1520 seen_resize = 1;
1447 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1448 } 1522 }
1449 else 1523 else
1450 { 1524 {
1451#ifdef HAVE_BG_PIXMAP 1525#ifdef HAVE_BG_PIXMAP
1452 if (bgPixmap.window_position_sensitive ())
1453 {
1454 if (mapped) 1526 if (moved)
1455 update_background (); 1527 update_background ();
1456 else
1457 bgPixmap.invalidate ();
1458 }
1459#endif 1528#endif
1460 } 1529 }
1461 1530
1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 } 1532 }
1464 break; 1533 break;
1465 1534
1466 case PropertyNotify: 1535 case PropertyNotify:
1467 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1536 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1468 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1469 && ev.xproperty.state == PropertyNewValue)
1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1471
1472 break; 1537 break;
1473 1538
1474 case SelectionClear: 1539 case SelectionClear:
1475 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1540 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1476 break; 1541 break;
1477 1542
1478 case SelectionNotify:
1479 if (selection_wait == Sel_normal)
1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1481 break;
1482
1483 case SelectionRequest: 1543 case SelectionRequest:
1484 selection_send (ev.xselectionrequest); 1544 selection_send (ev.xselectionrequest);
1485 break; 1545 break;
1486 1546
1487 case MapNotify: 1547 case MapNotify:
1488#ifdef HAVE_BG_PIXMAP 1548#ifdef HAVE_BG_PIXMAP
1489 /* This is needed spcifically to fix the case of no window manager or a 1549 // This is needed at startup for the case of no window manager
1490 * non-reparenting window manager. In those cases we never get first 1550 // or a non-reparenting window manager and also because we
1491 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1551 // defer bg image updates if the window is not mapped. The
1492 * care of multiplicity of ConfigureNotify events arriwing while WM does 1552 // short delay is to optimize for multiple ConfigureNotify
1493 * reparenting. 1553 // events at startup when the window manager reparents the
1494 * We should not render background immidiately, as there could be several 1554 // window, so as to perform the computation after we have
1495 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1555 // received all of them.
1496 * by scheduling background redraw as soon as we can, but giving a short 1556 if (bg_img == 0)
1497 * bit of time for ConfigureNotifies to arrive.
1498 * We should render background PRIOR to drawing any text, but AFTER all
1499 * of ConfigureNotifys for the best results.
1500 */
1501 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1502 update_background_ev.start (0.025); 1557 update_background_ev.start (0.025);
1503#endif 1558#endif
1504 mapped = 1; 1559 mapped = 1;
1505#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1506 text_blink_ev.start (); 1561 text_blink_ev.start ();
… …
1521 if (ev.xany.window == vt) 1576 if (ev.xany.window == vt)
1522 { 1577 {
1523 do 1578 do
1524 { 1579 {
1525 scr_expose (ev.xexpose.x, ev.xexpose.y, 1580 scr_expose (ev.xexpose.x, ev.xexpose.y,
1526 ev.xexpose.width, ev.xexpose.height, False); 1581 ev.xexpose.width, ev.xexpose.height, false);
1527 } 1582 }
1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1583 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1529 1584
1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1585 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1531 1586
1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1587 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1533 { 1588 {
1534 scr_expose (ev.xexpose.x, ev.xexpose.y, 1589 scr_expose (ev.xexpose.x, ev.xexpose.y,
1535 ev.xexpose.width, ev.xexpose.height, False); 1590 ev.xexpose.width, ev.xexpose.height, false);
1536 } 1591 }
1537 1592
1538 want_refresh = 1; 1593 want_refresh = 1;
1539 } 1594 }
1540 else 1595 else
… …
1546 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1601 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1547 ; 1602 ;
1548 1603
1549 if (scrollBar.state && ev.xany.window == scrollBar.win) 1604 if (scrollBar.state && ev.xany.window == scrollBar.win)
1550 { 1605 {
1551 scrollBar.state = STATE_IDLE; 1606 scrollBar.state = SB_STATE_IDLE;
1552 scrollBar.show (0); 1607 scrollBar.show (0);
1553 } 1608 }
1554 } 1609 }
1555 break; 1610 break;
1556 1611
1557 case MotionNotify: 1612 case MotionNotify:
1558#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1559 if (hidden_pointer) 1614 if (hidden_pointer)
1560 pointer_unblank (); 1615 pointer_unblank ();
1561#endif 1616#endif
1617 if (!bypass_keystate
1562 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1563 || priv_modes & PrivMode_MouseAnyEvent) 1619 || priv_modes & PrivMode_MouseAnyEvent))
1564 mouse_report (ev.xbutton); 1620 mouse_report (ev.xbutton);
1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1566 break; 1622 break;
1567 1623
1568 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
… …
1580 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1581 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1582 &ev.xbutton.state); 1638 &ev.xbutton.state);
1583#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1584 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1585 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1586 { 1643 {
1587#endif
1588#if ISO_14755 1644#if ISO_14755
1589 // 5.4 1645 // 5.4
1590 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1591 { 1647 {
1592 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1598 1654
1599#ifdef SELECTION_SCROLLING 1655#ifdef SELECTION_SCROLLING
1600 if (ev.xbutton.y < int_bwidth 1656 if (ev.xbutton.y < int_bwidth
1601 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1657 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1602 { 1658 {
1659 page_dirn scroll_selection_dir;
1603 int dist; 1660 int dist;
1604 1661
1605 /* don't clobber the current delay if we are 1662 /* don't clobber the current delay if we are
1606 * already in the middle of scrolling. 1663 * already in the middle of scrolling.
1607 */ 1664 */
… …
1622 dist = int_bwidth - ev.xbutton.y; 1679 dist = int_bwidth - ev.xbutton.y;
1623 } 1680 }
1624 else 1681 else
1625 { 1682 {
1626 scroll_selection_dir = DN; 1683 scroll_selection_dir = DN;
1627 dist = ev.xbutton.y - (int_bwidth + height); 1684 dist = ev.xbutton.y - (int_bwidth + vt_height);
1628 } 1685 }
1629 1686
1630 scroll_selection_lines = Pixel2Height (dist) 1687 scroll_selection_lines = Pixel2Height (dist)
1631 / SELECTION_SCROLL_LINE_SPEEDUP 1688 / SELECTION_SCROLL_LINE_SPEEDUP
1632 + 1; 1689 + 1;
1633 min_it (scroll_selection_lines, 1690 min_it (scroll_selection_lines,
1634 SELECTION_SCROLL_MAX_LINES); 1691 SELECTION_SCROLL_MAX_LINES);
1692 scroll_selection_lines *= scroll_selection_dir;
1635 } 1693 }
1636 else 1694 else
1637 { 1695 {
1638 /* we are within the text window, so we 1696 /* we are within the text window, so we
1639 * shouldn't be scrolling 1697 * shouldn't be scrolling
1640 */ 1698 */
1641 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1642 } 1700 }
1643#endif 1701#endif
1644#ifdef MOUSE_THRESHOLD
1645 } 1702 }
1646#endif
1647 } 1703 }
1648 } 1704 }
1649 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1650 { 1706 {
1651 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1652 MotionNotify, &ev)) 1708 MotionNotify, &ev))
1653 ; 1709 ;
1654 1710
1655 XQueryPointer (dpy, scrollBar.win, 1711 XQueryPointer (dpy, scrollBar.win,
1656 &unused_root, &unused_child, 1712 &unused_root, &unused_child,
1657 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1658 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1659 &unused_mask); 1715 &unused_mask);
1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1661 scrollBar.size ()); 1717 scrollBar.size ());
1662 want_refresh = 1; 1718 want_refresh = 1;
1663 scrollBar.show (1); 1719 scrollBar.show (1);
1664 } 1720 }
1665 break; 1721 break;
1666 } 1722 }
1667 1723
1668#if defined(CURSOR_BLINK) 1724#if defined(CURSOR_BLINK)
1669 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1725 if (ev.type == KeyPress)
1670 {
1671 if (hidden_cursor)
1672 {
1673 hidden_cursor = 0;
1674 want_refresh = 1;
1675 }
1676
1677 cursor_blink_ev.again (); 1726 cursor_blink_reset ();
1678 }
1679#endif 1727#endif
1680 1728
1681#if defined(POINTER_BLANK) 1729#if defined(POINTER_BLANK)
1682 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1730 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1683 { 1731 {
… …
1694 1742
1695 refresh_check (); 1743 refresh_check ();
1696} 1744}
1697 1745
1698#if ENABLE_FRILLS 1746#if ENABLE_FRILLS
1699void 1747void ecb_cold
1700rxvt_term::set_urgency (bool enable) 1748rxvt_term::set_urgency (bool enable)
1701{ 1749{
1702 if (enable == urgency_hint) 1750 if (enable == urgency_hint)
1703 return; 1751 return;
1704 1752
1705 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1753 if (XWMHints *h = XGetWMHints (dpy, parent))
1706 { 1754 {
1707 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1755 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1708 XSetWMHints (dpy, parent[0], h); 1756 XSetWMHints (dpy, parent, h);
1709 urgency_hint = enable; 1757 urgency_hint = enable;
1758 XFree (h);
1710 } 1759 }
1711} 1760}
1712#endif 1761#endif
1713 1762
1714void 1763void ecb_cold
1715rxvt_term::focus_in () 1764rxvt_term::focus_in ()
1716{ 1765{
1717 if (!focus) 1766 if (!focus)
1718 { 1767 {
1719 focus = 1; 1768 focus = 1;
1720 want_refresh = 1; 1769 want_refresh = 1;
1721 1770
1722#if USE_XIM 1771#if USE_XIM
1723 if (Input_Context != NULL) 1772 if (Input_Context != NULL)
1724 { 1773 {
1725 IMSetPosition (); 1774 im_set_position ();
1726 XSetICFocus (Input_Context); 1775 XSetICFocus (Input_Context);
1727 } 1776 }
1728#endif 1777#endif
1729#if CURSOR_BLINK 1778#if CURSOR_BLINK
1730 if (option (Opt_cursorBlink)) 1779 if (option (Opt_cursorBlink))
… …
1732#endif 1781#endif
1733#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1734 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1735 { 1784 {
1736 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1737 scr_recolour (); 1786 scr_recolor ();
1738 } 1787 }
1739#endif 1788#endif
1740#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1741 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1742 set_urgency (0); 1791 set_urgency (0);
… …
1744 1793
1745 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1794 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746 } 1795 }
1747} 1796}
1748 1797
1749void 1798void ecb_cold
1750rxvt_term::focus_out () 1799rxvt_term::focus_out ()
1751{ 1800{
1752 if (focus) 1801 if (focus)
1753 { 1802 {
1754 focus = 0; 1803 focus = 0;
… …
1779#endif 1828#endif
1780#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1781 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1782 { 1831 {
1783 pix_colors = pix_colors_unfocused; 1832 pix_colors = pix_colors_unfocused;
1784 scr_recolour (); 1833 scr_recolor ();
1785 } 1834 }
1786#endif 1835#endif
1787 1836
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1837 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1789 } 1838 }
1790} 1839}
1791 1840
1792void 1841void ecb_cold
1793rxvt_term::update_fade_color (unsigned int idx) 1842rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1794{ 1843{
1795#if OFF_FOCUS_FADING 1844#if OFF_FOCUS_FADING
1796 if (rs[Rs_fade]) 1845 if (rs[Rs_fade])
1797 { 1846 {
1847 if (!first_time)
1848 pix_colors_focused [idx].free (this);
1849
1798 rgba c; 1850 rgba c;
1799 pix_colors [Color_fade].get (c); 1851 pix_colors [Color_fade].get (c);
1800 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1852 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1801 } 1853 }
1802#endif 1854#endif
1803} 1855}
1804 1856
1805#if ENABLE_TRANSPARENCY || ENABLE_PERL 1857#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1806void 1858void ecb_hot
1807rxvt_term::rootwin_cb (XEvent &ev) 1859rxvt_term::rootwin_cb (XEvent &ev)
1808{ 1860{
1809 make_current (); 1861 make_current ();
1810 1862
1811 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1863 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1812 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1864 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1813 return; 1865 return;
1814 1866
1815# if ENABLE_TRANSPARENCY
1816 switch (ev.type) 1867 switch (ev.type)
1817 { 1868 {
1818 case PropertyNotify: 1869 case PropertyNotify:
1819 /* 1870 /*
1820 * if user used some Esetroot compatible prog to set the root bg, 1871 * if user used some Esetroot compatible prog to set the root bg,
1821 * use the property to determine the pixmap. We use it later on. 1872 * use the property to determine the pixmap. We use it later on.
1822 */ 1873 */
1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1874 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1875 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1825 { 1876 {
1826 bgPixmap.set_root_pixmap (); 1877#if BG_IMAGE_FROM_ROOT
1878 if (option (Opt_transparent))
1879 {
1880 rxvt_img::new_from_root (this)->replace (root_img);
1827 update_background (); 1881 update_background ();
1882 }
1883#endif
1884 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1828 } 1885 }
1829 1886
1830 break; 1887 break;
1831 } 1888 }
1832# endif
1833 1889
1834 refresh_check (); 1890 refresh_check ();
1835} 1891}
1836#endif 1892#endif
1837 1893
… …
1860 iso14755_54 (ev.x, ev.y); 1916 iso14755_54 (ev.x, ev.y);
1861 return; 1917 return;
1862 } 1918 }
1863#endif 1919#endif
1864 1920
1865 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1921 clickintime = ev.time - MEvent.time < multiClickTime;
1866 1922
1867 if (reportmode) 1923 if (reportmode)
1868 { 1924 {
1869 /* mouse report from vt window */ 1925 /* mouse report from vt window */
1870 /* save the xbutton state (for ButtonRelease) */ 1926 /* save the xbutton state (for ButtonRelease) */
1871 MEvent.state = ev.state; 1927 MEvent.state = ev.state;
1872#ifdef MOUSE_REPORT_DOUBLECLICK 1928#ifdef MOUSE_REPORT_DOUBLECLICK
1873 if (ev.button == MEvent.button && clickintime) 1929 if (ev.button == MEvent.button && clickintime)
1874 { 1930 {
1875 /* same button, within alloted time */ 1931 /* same button, within allowed time */
1876 MEvent.clicks++; 1932 MEvent.clicks++;
1877 1933
1878 if (MEvent.clicks > 1) 1934 if (MEvent.clicks > 1)
1879 { 1935 {
1880 /* only report double clicks */ 1936 /* only report double clicks */
… …
1961 if (scrollBar.upButton (ev.y)) 2017 if (scrollBar.upButton (ev.y))
1962 direction = UP; /* up */ 2018 direction = UP; /* up */
1963 else if (scrollBar.dnButton (ev.y)) 2019 else if (scrollBar.dnButton (ev.y))
1964 direction = DN; /* down */ 2020 direction = DN; /* down */
1965 2021
1966 scrollBar.state = STATE_IDLE; 2022 scrollBar.state = SB_STATE_IDLE;
1967 /* 2023 /*
1968 * Rxvt-style scrollbar: 2024 * Rxvt-style scrollbar:
1969 * move up if mouse is above slider 2025 * move up if mouse is above slider
1970 * move dn if mouse is below slider 2026 * move dn if mouse is below slider
1971 * 2027 *
… …
2010 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2066 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2011#endif 2067#endif
2012 if (scr_page (direction, 1)) 2068 if (scr_page (direction, 1))
2013 { 2069 {
2014 if (direction == UP) 2070 if (direction == UP)
2015 scrollBar.state = STATE_UP; 2071 scrollBar.state = SB_STATE_UP;
2016 else 2072 else
2017 scrollBar.state = STATE_DOWN; 2073 scrollBar.state = SB_STATE_DOWN;
2018 } 2074 }
2019 } 2075 }
2020 else 2076 else
2021 switch (ev.button) 2077 switch (ev.button)
2022 { 2078 {
2023 case Button2: 2079 case Button2:
2024 switch (scrollBar.align) 2080 switch (scrollBar.align)
2025 { 2081 {
2026 case R_SB_ALIGN_TOP: 2082 case SB_ALIGN_TOP:
2027 csrO = 0; 2083 csrO = 0;
2028 break; 2084 break;
2029 case R_SB_ALIGN_CENTRE: 2085 case SB_ALIGN_CENTRE:
2030 csrO = (scrollBar.bot - scrollBar.top) / 2; 2086 csrO = (scrollBar.bot - scrollBar.top) / 2;
2031 break; 2087 break;
2032 case R_SB_ALIGN_BOTTOM: 2088 case SB_ALIGN_BOTTOM:
2033 csrO = scrollBar.bot - scrollBar.top; 2089 csrO = scrollBar.bot - scrollBar.top;
2034 break; 2090 break;
2035 } 2091 }
2036 2092
2037 if (scrollBar.style == R_SB_XTERM 2093 if (scrollBar.style == SB_STYLE_XTERM
2038 || scrollbar_above_slider (ev.y) 2094 || scrollBar.above_slider (ev.y)
2039 || scrollbar_below_slider (ev.y)) 2095 || scrollBar.below_slider (ev.y))
2040 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2096 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2041 2097
2042 scrollBar.state = STATE_MOTION; 2098 scrollBar.state = SB_STATE_MOTION;
2043 break; 2099 break;
2044 2100
2045 case Button1: 2101 case Button1:
2046 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2102 if (scrollBar.align == SB_ALIGN_CENTRE)
2047 csrO = ev.y - scrollBar.top; 2103 csrO = ev.y - scrollBar.top;
2048 /* FALLTHROUGH */ 2104 /* FALLTHROUGH */
2049 2105
2050 case Button3: 2106 case Button3:
2051 if (scrollBar.style != R_SB_XTERM) 2107 if (scrollBar.style != SB_STYLE_XTERM)
2052 { 2108 {
2053 if (scrollbar_above_slider (ev.y)) 2109 if (scrollBar.above_slider (ev.y))
2054# ifdef RXVT_SCROLL_FULL 2110# ifdef RXVT_SCROLL_FULL
2055 scr_page (UP, nrow - 1); 2111 scr_page (UP, nrow - 1);
2056# else 2112# else
2057 scr_page (UP, nrow / 4); 2113 scr_page (UP, nrow / 4);
2058# endif 2114# endif
2059 else if (scrollbar_below_slider (ev.y)) 2115 else if (scrollBar.below_slider (ev.y))
2060# ifdef RXVT_SCROLL_FULL 2116# ifdef RXVT_SCROLL_FULL
2061 scr_page (DN, nrow - 1); 2117 scr_page (DN, nrow - 1);
2062# else 2118# else
2063 scr_page (DN, nrow / 4); 2119 scr_page (DN, nrow / 4);
2064# endif 2120# endif
2065 else 2121 else
2066 scrollBar.state = STATE_MOTION; 2122 scrollBar.state = SB_STATE_MOTION;
2067 } 2123 }
2068 else 2124 else
2069 { 2125 {
2070 scr_page ((ev.button == Button1 ? DN : UP), 2126 scr_page ((ev.button == Button1 ? DN : UP),
2071 (nrow 2127 (nrow
2072 * scrollbar_position (ev.y) 2128 * scrollBar.position (ev.y)
2073 / scrollBar.size ())); 2129 / scrollBar.size ()));
2074 } 2130 }
2075 2131
2076 break; 2132 break;
2077 } 2133 }
… …
2088 2144
2089 csrO = 0; /* reset csr Offset */ 2145 csrO = 0; /* reset csr Offset */
2090 if (!bypass_keystate) 2146 if (!bypass_keystate)
2091 reportmode = !! (priv_modes & PrivMode_mouse_report); 2147 reportmode = !! (priv_modes & PrivMode_mouse_report);
2092 2148
2093 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2149 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2094 { 2150 {
2095 scrollBar.state = STATE_IDLE; 2151 scrollBar.state = SB_STATE_IDLE;
2096 scrollBar.show (0); 2152 scrollBar.show (0);
2097 } 2153 }
2098 2154
2099#ifdef SELECTION_SCROLLING 2155#ifdef SELECTION_SCROLLING
2100 sel_scroll_ev.stop(); 2156 sel_scroll_ev.stop();
… …
2120#ifdef MOUSE_REPORT_DOUBLECLICK 2176#ifdef MOUSE_REPORT_DOUBLECLICK
2121 /* only report the release of 'slow' single clicks */ 2177 /* only report the release of 'slow' single clicks */
2122 if (MEvent.button != AnyButton 2178 if (MEvent.button != AnyButton
2123 && (ev.button != MEvent.button 2179 && (ev.button != MEvent.button
2124 || (ev.time - MEvent.time 2180 || (ev.time - MEvent.time
2125 > MULTICLICK_TIME / 2))) 2181 > multiClickTime / 2)))
2126 { 2182 {
2127 MEvent.clicks = 0; 2183 MEvent.clicks = 0;
2128 MEvent.button = AnyButton; 2184 MEvent.button = AnyButton;
2129 mouse_report (ev); 2185 mouse_report (ev);
2130 } 2186 }
… …
2150 case Button3: 2206 case Button3:
2151 selection_make (ev.time); 2207 selection_make (ev.time);
2152 break; 2208 break;
2153 2209
2154 case Button2: 2210 case Button2:
2155 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2211 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2156 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2212 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2157 break; 2213 break;
2158 2214
2159#ifdef MOUSE_WHEEL 2215#ifdef MOUSE_WHEEL
2160 case Button4: 2216 case Button4:
2161 case Button5: 2217 case Button5:
2162 { 2218 {
2163 int i; 2219 int lines;
2164 page_dirn v; 2220 page_dirn dirn;
2165 2221
2166 v = ev.button == Button4 ? UP : DN; 2222 dirn = ev.button == Button4 ? UP : DN;
2167 2223
2168 if (ev.state & ShiftMask) 2224 if (ev.state & ShiftMask)
2169 i = 1; 2225 lines = 1;
2170 else if (option (Opt_mouseWheelScrollPage)) 2226 else if (option (Opt_mouseWheelScrollPage))
2171 i = nrow - 1; 2227 lines = nrow - 1;
2172 else 2228 else
2173 i = 5; 2229 lines = 5;
2174 2230
2175# ifdef MOUSE_SLIP_WHEELING 2231# ifdef MOUSE_SLIP_WHEELING
2176 if (ev.state & ControlMask) 2232 if (ev.state & ControlMask)
2177 { 2233 {
2178 mouse_slip_wheel_speed += v ? -1 : 1; 2234 mouse_slip_wheel_speed += dirn;
2179 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2235 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2180 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2181 2236
2182 if (!slip_wheel_ev.is_active ()) 2237 if (!slip_wheel_ev.is_active ())
2183 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2238 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2184 } 2239 }
2185 else 2240 else
2186# endif 2241# endif
2187 { 2242 {
2188 scr_page (v, i); 2243 scr_page (dirn, lines);
2189 scrollBar.show (1); 2244 scrollBar.show (1);
2190 } 2245 }
2191 } 2246 }
2192 break; 2247 break;
2193#endif 2248#endif
… …
2195 } 2250 }
2196} 2251}
2197 2252
2198/*}}} */ 2253/*}}} */
2199 2254
2200void 2255void ecb_hot
2201rxvt_term::cmd_parse () 2256rxvt_term::cmd_parse ()
2202{ 2257{
2203 wchar_t ch = NOCHAR; 2258 wchar_t ch = NOCHAR;
2204 char *seq_begin; // remember start of esc-sequence here 2259 char *seq_begin; // remember start of esc-sequence here
2205 2260
2206 for (;;) 2261 for (;;)
2207 { 2262 {
2208 if (expect_false (ch == NOCHAR)) 2263 if (ecb_unlikely (ch == NOCHAR))
2209 { 2264 {
2210 seq_begin = cmdbuf_ptr; 2265 seq_begin = cmdbuf_ptr;
2211 ch = next_char (); 2266 ch = next_char ();
2212 2267
2213 if (ch == NOCHAR) 2268 if (ch == NOCHAR)
2214 break; 2269 break;
2215 } 2270 }
2216 2271
2217 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2272 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2218 { 2273 {
2219 if (expect_false (!seen_input)) 2274 if (ecb_unlikely (!seen_input))
2220 { 2275 {
2221 seen_input = 1; 2276 seen_input = 1;
2222 // many badly-written programs (e.g. jed) contain a race condition: 2277 // many badly-written programs (e.g. jed) contain a race condition:
2223 // they first read the screensize and then install a SIGWINCH handler. 2278 // they first read the screensize and then install a SIGWINCH handler.
2224 // some window managers resize the window early, and these programs 2279 // some window managers resize the window early, and these programs
… …
2237 wchar_t *str = buf; 2292 wchar_t *str = buf;
2238 wchar_t *eol = str + min (ncol, UBUFSIZ); 2293 wchar_t *eol = str + min (ncol, UBUFSIZ);
2239 2294
2240 for (;;) 2295 for (;;)
2241 { 2296 {
2242 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2297 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2243 break; 2298 break;
2244 2299
2245 *str++ = ch; 2300 *str++ = ch;
2246 2301
2247 if (expect_false (ch == C0_LF || str >= eol)) 2302 if (ecb_unlikely (ch == C0_LF || str >= eol))
2248 { 2303 {
2249 if (ch == C0_LF) 2304 if (ch == C0_LF)
2250 nlines++; 2305 nlines++;
2251 2306
2252 refresh_count++; 2307 refresh_count++;
… …
2324 } 2379 }
2325 } 2380 }
2326} 2381}
2327 2382
2328// read the next character 2383// read the next character
2329wchar_t 2384wchar_t ecb_hot
2330rxvt_term::next_char () NOTHROW 2385rxvt_term::next_char () NOTHROW
2331{ 2386{
2332 while (cmdbuf_ptr < cmdbuf_endp) 2387 while (cmdbuf_ptr < cmdbuf_endp)
2333 { 2388 {
2334 // assume 7-bit to be ascii ALWAYS 2389 // assume 7-bit to be ascii ALWAYS
2335 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2390 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2336 return *cmdbuf_ptr++; 2391 return *cmdbuf_ptr++;
2337 2392
2338 wchar_t wc; 2393 wchar_t wc;
2339 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2394 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2340 2395
… …
2346 } 2401 }
2347 2402
2348 if (len == (size_t)-1) 2403 if (len == (size_t)-1)
2349 { 2404 {
2350 mbstate.reset (); // reset now undefined conversion state 2405 mbstate.reset (); // reset now undefined conversion state
2406 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2407 // in which case we "erroneously" return the next byte which might be valid.
2351 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2408 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2352 } 2409 }
2353 2410
2354 // assume wchar == unicode 2411 // assume wchar == unicode
2355 cmdbuf_ptr += len; 2412 cmdbuf_ptr += len;
… …
2358 2415
2359 return NOCHAR; 2416 return NOCHAR;
2360} 2417}
2361 2418
2362// read the next octet 2419// read the next octet
2363uint32_t 2420uint32_t ecb_hot
2364rxvt_term::next_octet () NOTHROW 2421rxvt_term::next_octet () NOTHROW
2365{ 2422{
2366 return cmdbuf_ptr < cmdbuf_endp 2423 return cmdbuf_ptr < cmdbuf_endp
2367 ? (unsigned char)*cmdbuf_ptr++ 2424 ? (unsigned char)*cmdbuf_ptr++
2368 : NOCHAR; 2425 : NOCHAR;
2369} 2426}
2370 2427
2371static class out_of_input out_of_input; 2428static class out_of_input out_of_input;
2372 2429
2373/* rxvt_cmd_getc () - Return next input character */ 2430wchar_t ecb_hot
2374/*
2375 * Return the next input character after first passing any keyboard input
2376 * to the command.
2377 */
2378wchar_t
2379rxvt_term::cmd_getc () THROW ((class out_of_input)) 2431rxvt_term::cmd_getc () THROW ((class out_of_input))
2380{ 2432{
2381 wchar_t c = next_char (); 2433 wchar_t c = next_char ();
2382 2434
2383 if (c == NOCHAR) 2435 if (c == NOCHAR)
2384 throw out_of_input; 2436 throw out_of_input;
2385 2437
2386 return c; 2438 return c;
2387} 2439}
2388 2440
2389uint32_t 2441uint32_t ecb_hot
2390rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2442rxvt_term::cmd_get8 () THROW ((class out_of_input))
2391{ 2443{
2392 uint32_t c = next_octet (); 2444 uint32_t c = next_octet ();
2393 2445
2394 if (c == NOCHAR) 2446 if (c == NOCHAR)
… …
2398} 2450}
2399 2451
2400/*{{{ print pipe */ 2452/*{{{ print pipe */
2401/*----------------------------------------------------------------------*/ 2453/*----------------------------------------------------------------------*/
2402#ifdef PRINTPIPE 2454#ifdef PRINTPIPE
2403FILE * 2455FILE * ecb_cold
2404rxvt_term::popen_printer () 2456rxvt_term::popen_printer ()
2405{ 2457{
2406 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2458 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2407 2459
2408 if (stream == NULL) 2460 if (stream == NULL)
2409 rxvt_warn ("can't open printer pipe, not printing.\n"); 2461 rxvt_warn ("can't open printer pipe, not printing.\n");
2410 2462
2411 return stream; 2463 return stream;
2412} 2464}
2413 2465
2414int 2466int ecb_cold
2415rxvt_term::pclose_printer (FILE *stream) 2467rxvt_term::pclose_printer (FILE *stream)
2416{ 2468{
2417 fflush (stream); 2469 fflush (stream);
2418 return pclose (stream); 2470 return pclose (stream);
2419} 2471}
2420 2472
2421/* 2473/*
2422 * simulate attached vt100 printer 2474 * simulate attached vt100 printer
2423 */ 2475 */
2424void 2476void ecb_cold
2425rxvt_term::process_print_pipe () 2477rxvt_term::process_print_pipe ()
2426{ 2478{
2427 FILE *fd = popen_printer (); 2479 FILE *fd = popen_printer ();
2428 2480
2429 if (!fd) 2481 if (!fd)
… …
2475 pclose_printer (fd); 2527 pclose_printer (fd);
2476} 2528}
2477#endif /* PRINTPIPE */ 2529#endif /* PRINTPIPE */
2478/*}}} */ 2530/*}}} */
2479 2531
2480/* *INDENT-OFF* */
2481enum { 2532enum {
2482 C1_40 = 0x40, 2533 C1_40 = 0x40,
2483 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2534 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2484 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2535 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2485 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2536 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2486 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2537 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2487}; 2538};
2488/* *INDENT-ON* */
2489 2539
2490/*{{{ process non-printing single characters */ 2540/*{{{ process non-printing single characters */
2491void 2541void ecb_hot
2492rxvt_term::process_nonprinting (unicode_t ch) 2542rxvt_term::process_nonprinting (unicode_t ch)
2493{ 2543{
2494 switch (ch) 2544 switch (ch)
2495 { 2545 {
2496 case C0_ESC: 2546 case C0_ESC:
… …
2526 scr_charset_choose (0); 2576 scr_charset_choose (0);
2527 break; 2577 break;
2528 2578
2529#ifdef EIGHT_BIT_CONTROLS 2579#ifdef EIGHT_BIT_CONTROLS
2530 // 8-bit controls 2580 // 8-bit controls
2531 case 0x90: /* DCS */ 2581 case 0x90: /* DCS */
2532 process_dcs_seq (); 2582 process_dcs_seq ();
2533 break; 2583 break;
2534 case 0x9b: /* CSI */ 2584 case 0x9b: /* CSI */
2535 process_csi_seq (); 2585 process_csi_seq ();
2536 break; 2586 break;
2537 case 0x9d: /* OSC */ 2587 case 0x9d: /* OSC */
2538 process_osc_seq (); 2588 process_osc_seq ();
2539 break; 2589 break;
2540#endif 2590#endif
2541 } 2591 }
2542} 2592}
2543/*}}} */ 2593/*}}} */
2544 2594
2545 2595
2546/*{{{ process VT52 escape sequences */ 2596/*{{{ process VT52 escape sequences */
2547void 2597void ecb_cold
2548rxvt_term::process_escape_vt52 (unicode_t ch) 2598rxvt_term::process_escape_vt52 (unicode_t ch)
2549{ 2599{
2550 int row, col; 2600 int row, col;
2551 2601
2552 switch (ch) 2602 switch (ch)
… …
2586 break; 2636 break;
2587 case 'Z': /* identify the terminal type */ 2637 case 'Z': /* identify the terminal type */
2588 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2638 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2589 break; 2639 break;
2590 case '<': /* turn off VT52 mode */ 2640 case '<': /* turn off VT52 mode */
2591 set_privmode (PrivMode_vt52, 0); 2641 priv_modes &= ~PrivMode_vt52;
2592 break; 2642 break;
2593 case 'F': /* use special graphics character set */ 2643 case 'F': /* use special graphics character set */
2594 case 'G': /* use regular character set */ 2644 case 'G': /* use regular character set */
2595 /* unimplemented */ 2645 /* unimplemented */
2596 break; 2646 break;
… …
2602} 2652}
2603/*}}} */ 2653/*}}} */
2604 2654
2605 2655
2606/*{{{ process escape sequences */ 2656/*{{{ process escape sequences */
2607void 2657void ecb_hot
2608rxvt_term::process_escape_seq () 2658rxvt_term::process_escape_seq ()
2609{ 2659{
2610 unicode_t ch = cmd_getc (); 2660 unicode_t ch = cmd_getc ();
2611 2661
2612 if (priv_modes & PrivMode_vt52) 2662 if (priv_modes & PrivMode_vt52)
… …
2615 return; 2665 return;
2616 } 2666 }
2617 2667
2618 switch (ch) 2668 switch (ch)
2619 { 2669 {
2620 /* case 1: do_tek_mode (); break; */
2621 case '#': 2670 case '#':
2622 if (cmd_getc () == '8') 2671 if (cmd_getc () == '8')
2623 scr_E (); 2672 scr_E ();
2624 break; 2673 break;
2625 case '(': 2674 case '(':
… …
2648#if !ENABLE_MINIMAL 2697#if !ENABLE_MINIMAL
2649 case '9': 2698 case '9':
2650 scr_forwardindex (); 2699 scr_forwardindex ();
2651 break; 2700 break;
2652#endif 2701#endif
2702 // DECPAM/DECPNM
2653 case '=': 2703 case '=':
2704 priv_modes |= PrivMode_aplKP;
2705 break;
2654 case '>': 2706 case '>':
2655 set_privmode (PrivMode_aplKP, ch == '='); 2707 priv_modes &= ~PrivMode_aplKP;
2656 break; 2708 break;
2657 2709
2658 case C1_40: 2710 case C1_40:
2659 cmd_getc (); 2711 cmd_getc ();
2660 break; 2712 break;
… …
2664 2716
2665 /* 8.3.87: NEXT LINE */ 2717 /* 8.3.87: NEXT LINE */
2666 case C1_NEL: /* ESC E */ 2718 case C1_NEL: /* ESC E */
2667 { 2719 {
2668 wchar_t nlcr[] = { C0_LF, C0_CR }; 2720 wchar_t nlcr[] = { C0_LF, C0_CR };
2669 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2721 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2670 } 2722 }
2671 break; 2723 break;
2672 2724
2673 /* kidnapped escape sequence: Should be 8.3.48 */ 2725 /* kidnapped escape sequence: Should be 8.3.48 */
2674 case C1_ESA: /* ESC G */ 2726 case C1_ESA: /* ESC G */
2675 process_graphics (); 2727 // used by original rxvt for rob nations own graphics mode
2728 if (cmd_getc () == 'Q')
2729 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2676 break; 2730 break;
2677 2731
2678 /* 8.3.63: CHARACTER TABULATION SET */ 2732 /* 8.3.63: CHARACTER TABULATION SET */
2679 case C1_HTS: /* ESC H */ 2733 case C1_HTS: /* ESC H */
2680 scr_set_tab (1); 2734 scr_set_tab (1);
… …
2684 case C1_RI: /* ESC M */ 2738 case C1_RI: /* ESC M */
2685 scr_index (DN); 2739 scr_index (DN);
2686 break; 2740 break;
2687 2741
2688 /* 8.3.142: SINGLE-SHIFT TWO */ 2742 /* 8.3.142: SINGLE-SHIFT TWO */
2689 /*case C1_SS2: scr_single_shift (2); break; */ 2743 /* case C1_SS2: break; */
2690 2744
2691 /* 8.3.143: SINGLE-SHIFT THREE */ 2745 /* 8.3.143: SINGLE-SHIFT THREE */
2692 /*case C1_SS3: scr_single_shift (3); break; */ 2746 /* case C1_SS3: break; */
2693 2747
2694 /* 8.3.27: DEVICE CONTROL STRING */ 2748 /* 8.3.27: DEVICE CONTROL STRING */
2695 case C1_DCS: /* ESC P */ 2749 case C1_DCS: /* ESC P */
2696 process_dcs_seq (); 2750 process_dcs_seq ();
2697 break; 2751 break;
… …
2730 } 2784 }
2731} 2785}
2732/*}}} */ 2786/*}}} */
2733 2787
2734/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2788/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2735/* *INDENT-OFF* */
2736enum { 2789enum {
2737 CSI_ICH = 0x40, 2790 CSI_ICH = 0x40,
2738 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2791 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2739 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2792 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2740 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2793 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2743 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2796 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2744 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2797 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2745 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2798 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2746}; 2799};
2747 2800
2748#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2801#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2749 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2802 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2750 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2803 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2751#define get_byte_array_bit(array, bit) \ 2804#define get_byte_array_bit(array, bit) \
2752 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2805 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2753 2806
2754const unsigned char csi_defaults[] = 2807static const unsigned char csi_defaults[] =
2755 { 2808 {
2756 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2809 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2757 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2810 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2758 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2811 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2759 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2812 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2760 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2813 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2761 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2814 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2762 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2815 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2763 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2816 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2764 }; 2817 };
2765/* *INDENT-ON* */
2766 2818
2767void 2819void ecb_hot
2768rxvt_term::process_csi_seq () 2820rxvt_term::process_csi_seq ()
2769{ 2821{
2770 unicode_t ch, priv, i; 2822 unicode_t ch, priv, prev_ch, i;
2771 unsigned int nargs, p; 2823 unsigned int nargs, p;
2772 int n, ndef; 2824 int n, ndef;
2773 int arg[ESC_ARGS] = { }; 2825 int arg[ESC_ARGS] = { };
2774 2826
2775 nargs = 0; 2827 nargs = 0;
… …
2781 /* '<' '=' '>' '?' '!' */ 2833 /* '<' '=' '>' '?' '!' */
2782 priv = ch; 2834 priv = ch;
2783 ch = cmd_getc (); 2835 ch = cmd_getc ();
2784 } 2836 }
2785 2837
2838 prev_ch = 0;
2786 /* read any numerical arguments */ 2839 /* read any numerical arguments */
2787 for (n = -1; ch < CSI_ICH; ) 2840 for (n = -1; ch < CSI_ICH; )
2788 { 2841 {
2789 if (isdigit (ch)) 2842 if (isdigit (ch))
2790 { 2843 {
… …
2800 n = -1; 2853 n = -1;
2801 } 2854 }
2802 else if (IS_CONTROL (ch)) 2855 else if (IS_CONTROL (ch))
2803 process_nonprinting (ch); 2856 process_nonprinting (ch);
2804 2857
2858 prev_ch = ch;
2805 ch = cmd_getc (); 2859 ch = cmd_getc ();
2806 } 2860 }
2807 2861
2808 if (ch > CSI_7F) 2862 if (ch > CSI_7F)
2809 return; 2863 return;
… …
2848 { 2902 {
2849 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2903 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2850 scr_soft_reset (); 2904 scr_soft_reset ();
2851 2905
2852 static const int pm_h[] = { 7, 25 }; 2906 static const int pm_h[] = { 7, 25 };
2853 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2907 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2854 2908
2855 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2909 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2856 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2910 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2857 } 2911 }
2858 break; 2912 break;
2859 } 2913 }
2860 2914
2861 return; 2915 return;
… …
2879 } 2933 }
2880 break; 2934 break;
2881#endif 2935#endif
2882 2936
2883 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2937 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2884 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2938 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2885 arg[0] = -arg[0]; 2939 arg[0] = -arg[0];
2886 /* FALLTHROUGH */ 2940 /* FALLTHROUGH */
2887 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2941 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2888 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2942 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2889 scr_gotorc (arg[0], 0, RELATIVE); 2943 scr_gotorc (arg[0], 0, RELATIVE);
2890 break; 2944 break;
2891 2945
2892 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2946 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2893 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2947 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3043 scr_insert_mode (1); 3097 scr_insert_mode (1);
3044 else if (arg[0] == 20) 3098 else if (arg[0] == 20)
3045 priv_modes |= PrivMode_LFNL; 3099 priv_modes |= PrivMode_LFNL;
3046 break; 3100 break;
3047 3101
3102 case CSI_71: // DECSCUSR: set cursor style
3103 if (prev_ch == ' ')
3104 set_cursor_style (arg[0]);
3105 break;
3106
3048 /* 3107 /*
3049 * PRIVATE USE beyond this point. All CSI_7? sequences here 3108 * PRIVATE USE beyond this point. All CSI_7? sequences here
3050 */ 3109 */
3051 case CSI_72: /* DECSTBM: set top and bottom margins */ 3110 case CSI_72: /* DECSTBM: set top and bottom margins */
3052 if (nargs == 1) 3111 if (nargs == 1)
… …
3080 } 3139 }
3081} 3140}
3082/*}}} */ 3141/*}}} */
3083 3142
3084#if !ENABLE_MINIMAL 3143#if !ENABLE_MINIMAL
3085/* ARGSUSED */
3086void 3144void
3087rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3145rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3088{ 3146{
3089 int x, y; 3147 int x, y;
3090 XWindowAttributes wattr; 3148 XWindowAttributes wattr;
… …
3099 { 3157 {
3100 /* 3158 /*
3101 * commands 3159 * commands
3102 */ 3160 */
3103 case 1: /* deiconify window */ 3161 case 1: /* deiconify window */
3104 XMapWindow (dpy, parent[0]); 3162 XMapWindow (dpy, parent);
3105 break; 3163 break;
3106 case 2: /* iconify window */ 3164 case 2: /* iconify window */
3107 XIconifyWindow (dpy, parent[0], display->screen); 3165 XIconifyWindow (dpy, parent, display->screen);
3108 break; 3166 break;
3109 case 3: /* set position (pixels) */ 3167 case 3: /* set position (pixels) */
3110 XMoveWindow (dpy, parent[0], args[1], args[2]); 3168 XMoveWindow (dpy, parent, args[1], args[2]);
3111 break; 3169 break;
3112 case 4: /* set size (pixels) */ 3170 case 4: /* set size (pixels) */
3113 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3171 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3114 break; 3172 break;
3115 case 5: /* raise window */ 3173 case 5: /* raise window */
3116 XRaiseWindow (dpy, parent[0]); 3174 XRaiseWindow (dpy, parent);
3117 break; 3175 break;
3118 case 6: /* lower window */ 3176 case 6: /* lower window */
3119 XLowerWindow (dpy, parent[0]); 3177 XLowerWindow (dpy, parent);
3120 break; 3178 break;
3121 case 7: /* refresh window */ 3179 case 7: /* refresh window */
3122 scr_touch (true); 3180 scr_touch (true);
3123 break; 3181 break;
3124 case 8: /* set size (chars) */ 3182 case 8: /* set size (chars) */
… …
3127 break; 3185 break;
3128 3186
3129 //case 9: NYI, TODO, restore maximized window or maximize window 3187 //case 9: NYI, TODO, restore maximized window or maximize window
3130 default: 3188 default:
3131 if (args[0] >= 24) /* set height (chars) */ 3189 if (args[0] >= 24) /* set height (chars) */
3132 set_widthheight ((unsigned int)width, 3190 set_widthheight ((unsigned int)vt_width,
3133 (unsigned int) (args[1] * fheight)); 3191 (unsigned int) (args[1] * fheight));
3134 break; 3192 break;
3135 3193
3136 /* 3194 /*
3137 * reports - some output format copied from XTerm 3195 * reports - some output format copied from XTerm
3138 */ 3196 */
3139 case 11: /* report window state */ 3197 case 11: /* report window state */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3198 XGetWindowAttributes (dpy, parent, &wattr);
3141 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3199 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3142 break; 3200 break;
3143 case 13: /* report window position */ 3201 case 13: /* report window position */
3144 XGetWindowAttributes (dpy, parent[0], &wattr); 3202 XGetWindowAttributes (dpy, parent, &wattr);
3145 XTranslateCoordinates (dpy, parent[0], wattr.root, 3203 XTranslateCoordinates (dpy, parent, wattr.root,
3146 -wattr.border_width, -wattr.border_width, 3204 -wattr.border_width, -wattr.border_width,
3147 &x, &y, &wdummy); 3205 &x, &y, &wdummy);
3148 tt_printf ("\033[3;%d;%dt", x, y); 3206 tt_printf ("\033[3;%d;%dt", x, y);
3149 break; 3207 break;
3150 case 14: /* report window size (pixels) */ 3208 case 14: /* report window size (pixels) */
3151 XGetWindowAttributes (dpy, parent[0], &wattr); 3209 XGetWindowAttributes (dpy, parent, &wattr);
3152 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3210 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3153 break; 3211 break;
3154 case 18: /* report text area size (chars) */ 3212 case 18: /* report text area size (chars) */
3155 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3213 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3156 break; 3214 break;
… …
3158 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3216 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3159 break; 3217 break;
3160 case 20: /* report icon label */ 3218 case 20: /* report icon label */
3161 { 3219 {
3162 char *s; 3220 char *s;
3163 XGetIconName (dpy, parent[0], &s); 3221 XGetIconName (dpy, parent, &s);
3164 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3222 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3165 XFree (s); 3223 XFree (s);
3166 } 3224 }
3167 break; 3225 break;
3168 case 21: /* report window title */ 3226 case 21: /* report window title */
3169 { 3227 {
3170 char *s; 3228 char *s;
3171 XFetchName (dpy, parent[0], &s); 3229 XFetchName (dpy, parent, &s);
3172 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3230 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3173 XFree (s); 3231 XFree (s);
3174 } 3232 }
3175 break; 3233 break;
3176 } 3234 }
… …
3186rxvt_term::get_to_st (unicode_t &ends_how) 3244rxvt_term::get_to_st (unicode_t &ends_how)
3187{ 3245{
3188 unicode_t ch; 3246 unicode_t ch;
3189 bool seen_esc = false; 3247 bool seen_esc = false;
3190 unsigned int n = 0; 3248 unsigned int n = 0;
3191 wchar_t string[STRING_MAX]; 3249 wchar_t string[CBUFSIZ];
3192 3250
3193 while ((ch = cmd_getc ()) != NOCHAR) 3251 while ((ch = cmd_getc ()) != NOCHAR)
3194 { 3252 {
3195 if (seen_esc) 3253 if (seen_esc)
3196 { 3254 {
… …
3211 else if (ch < 0x20) 3269 else if (ch < 0x20)
3212 return NULL; /* other control character - exit */ 3270 return NULL; /* other control character - exit */
3213 3271
3214 seen_esc = false; 3272 seen_esc = false;
3215 3273
3216 if (n >= STRING_MAX - 1) 3274 if (n >= sizeof (string) - 1)
3217 // stop at some sane length 3275 // stop at some sane length
3218 return NULL; 3276 return NULL;
3219 3277
3220 string[n++] = ch; 3278 string[n++] = ch;
3221 } 3279 }
… …
3232 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3290 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3233 */ 3291 */
3234void 3292void
3235rxvt_term::process_dcs_seq () 3293rxvt_term::process_dcs_seq ()
3236{ 3294{
3237 char *s;
3238 unicode_t eh;
3239
3240 /* 3295 /*
3241 * Not handled yet 3296 * Not handled yet
3242 */ 3297 */
3298
3299 unicode_t eh;
3243 s = get_to_st (eh); 3300 char *s = get_to_st (eh);
3244 if (s) 3301 if (s)
3245 free (s); 3302 free (s);
3246 3303
3247 return; 3304 return;
3248} 3305}
… …
3252 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3309 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3253 */ 3310 */
3254void 3311void
3255rxvt_term::process_osc_seq () 3312rxvt_term::process_osc_seq ()
3256{ 3313{
3257 unicode_t ch, eh;
3258 int arg; 3314 int arg;
3259 3315
3260 ch = cmd_getc (); 3316 unicode_t ch = cmd_getc ();
3261 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3317 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3262 arg = arg * 10 + (ch - '0'); 3318 arg = arg * 10 + (ch - '0');
3263 3319
3264 if (ch == ';') 3320 if (ch == ';')
3265 { 3321 {
3322 unicode_t eh;
3266 char *s = get_to_st (eh); 3323 char *s = get_to_st (eh);
3267 3324
3268 if (s) 3325 if (s)
3269 { 3326 {
3270 process_xterm_seq (arg, s, eh); 3327 process_xterm_seq (arg, s, eh);
… …
3281 rgba c; 3338 rgba c;
3282 pix_colors_focused[color].get (c); 3339 pix_colors_focused[color].get (c);
3283 3340
3284#if XFT 3341#if XFT
3285 if (c.a != rgba::MAX_CC) 3342 if (c.a != rgba::MAX_CC)
3286 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3343 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3287 else 3344 else
3288#endif 3345#endif
3289 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3346 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3290 } 3347 }
3291 else 3348 else
… …
3331 unsigned long bytes_after; 3388 unsigned long bytes_after;
3332 unsigned char *value = 0; 3389 unsigned char *value = 0;
3333 const char *str = ""; 3390 const char *str = "";
3334 3391
3335 if (prop 3392 if (prop
3336 && XGetWindowProperty (dpy, parent[0], 3393 && XGetWindowProperty (dpy, parent,
3337 prop, 0, 1<<16, 0, AnyPropertyType, 3394 prop, 0, 1<<16, 0, AnyPropertyType,
3338 &actual_type, &actual_format, 3395 &actual_type, &actual_format,
3339 &nitems, &bytes_after, &value) == Success 3396 &nitems, &bytes_after, &value) == Success
3340 && actual_type != None 3397 && actual_type != None
3341 && actual_format == 8) 3398 && actual_format == 8)
3342 str = (const char *)(value); 3399 str = (const char *)(value);
3343 3400
3344 tt_printf ("\033]%d;%s%c", op, str, resp); 3401 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3345 3402
3346 XFree (value); 3403 XFree (value);
3347 } 3404 }
3348 else 3405 else
3349 { 3406 {
… …
3353 { 3410 {
3354 *eq = 0; 3411 *eq = 0;
3355 set_utf8_property (display->atom (str), eq + 1); 3412 set_utf8_property (display->atom (str), eq + 1);
3356 } 3413 }
3357 else 3414 else
3358 XDeleteProperty (dpy, parent[0], 3415 XDeleteProperty (dpy, parent,
3359 display->atom (str)); 3416 display->atom (str));
3360 } 3417 }
3361 break; 3418 break;
3362 3419
3363 case XTerm_Color: 3420 case XTerm_Color:
… …
3395 process_color_seq (op, Color_pointer_fg, str, resp); 3452 process_color_seq (op, Color_pointer_fg, str, resp);
3396 break; 3453 break;
3397 case XTerm_Color_pointer_bg: 3454 case XTerm_Color_pointer_bg:
3398 process_color_seq (op, Color_pointer_bg, str, resp); 3455 process_color_seq (op, Color_pointer_bg, str, resp);
3399 break; 3456 break;
3457#ifdef OPTION_HC
3458 case XTerm_Color_HC:
3459 process_color_seq (op, Color_HC, str, resp);
3460 break;
3461 case XTerm_Color_HTC:
3462 process_color_seq (op, Color_HTC, str, resp);
3463 break;
3464#endif
3400#ifndef NO_BOLD_UNDERLINE_REVERSE 3465#ifndef NO_BOLD_UNDERLINE_REVERSE
3401 case XTerm_Color_RV:
3402 process_color_seq (op, Color_RV, str, resp);
3403 break;
3404 case Rxvt_Color_BD:
3405 case URxvt_Color_BD: 3466 case URxvt_Color_BD:
3406 process_color_seq (op, Color_BD, str, resp); 3467 process_color_seq (op, Color_BD, str, resp);
3407 break; 3468 break;
3408 case Rxvt_Color_UL:
3409 case URxvt_Color_UL: 3469 case URxvt_Color_UL:
3410 process_color_seq (op, Color_UL, str, resp); 3470 process_color_seq (op, Color_UL, str, resp);
3411 break; 3471 break;
3412 case URxvt_Color_IT: 3472 case URxvt_Color_IT:
3413 process_color_seq (op, Color_IT, str, resp); 3473 process_color_seq (op, Color_IT, str, resp);
3414 break; 3474 break;
3415#endif 3475#endif
3416 case URxvt_Color_border: 3476 case URxvt_Color_border:
3417 process_color_seq (op, Color_border, str, resp); 3477 process_color_seq (op, Color_border, str, resp);
3418 break; 3478 break;
3419#if ENABLE_TRANSPARENCY 3479
3480#if BG_IMAGE_FROM_ROOT
3420 case URxvt_Color_tint: 3481 case URxvt_Color_tint:
3421 process_color_seq (op, Color_tint, str, resp); 3482 process_color_seq (op, Color_tint, str, resp);
3422 { 3483 {
3423 bool changed = false; 3484 bool changed = false;
3424 3485
3425 if (ISSET_PIXCOLOR (Color_tint)) 3486 if (ISSET_PIXCOLOR (Color_tint))
3426 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3487 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3427 else
3428 changed = bgPixmap.unset_tint ();
3429 3488
3430 if (changed) 3489 if (changed)
3431 update_background (); 3490 update_background ();
3432 } 3491 }
3433 3492
… …
3437#if BG_IMAGE_FROM_FILE 3496#if BG_IMAGE_FROM_FILE
3438 case Rxvt_Pixmap: 3497 case Rxvt_Pixmap:
3439 if (!strcmp (str, "?")) 3498 if (!strcmp (str, "?"))
3440 { 3499 {
3441 char str[256]; 3500 char str[256];
3501 int h_scale = fimage.h_scale;
3502 int v_scale = fimage.v_scale;
3503 int h_align = fimage.h_align;
3504 int v_align = fimage.v_align;
3442 3505
3443 sprintf (str, "[%dx%d+%d+%d]", 3506 sprintf (str, "[%dx%d+%d+%d]",
3444 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3507 h_scale, v_scale,
3445 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3508 h_align, v_align);
3446 process_xterm_seq (XTerm_title, str, CHAR_ST); 3509 process_xterm_seq (XTerm_title, str, CHAR_ST);
3447 } 3510 }
3448 else 3511 else
3449 { 3512 {
3450 int changed = 0; 3513 bool changed = false;
3451 3514
3452 if (*str != ';') 3515 if (*str != ';')
3453 { 3516 {
3454 /* reset to default scaling :*/ 3517 try
3455 bgPixmap.unset_geometry (); 3518 {
3456 if (bgPixmap.set_file (str)) /* change pixmap */ 3519 fimage.set_file_geometry (this, str);
3457 changed++; 3520 changed = true;
3458 str = strchr (str, ';'); 3521 }
3459 if (str == NULL) 3522 catch (const class rxvt_failure_exception &e)
3460 bgPixmap.set_defaultGeometry (); 3523 {
3524 }
3461 } 3525 }
3462 3526 else
3463 while (str)
3464 { 3527 {
3465 str++; 3528 str++;
3466 if (bgPixmap.set_geometry (str)) 3529 if (fimage.set_geometry (str, true))
3467 changed++; 3530 changed = true;
3468 str = strchr (str, ';');
3469 } 3531 }
3470 3532
3471 if (changed) 3533 if (changed)
3534 {
3535 if (bg_window_position_sensitive ())
3536 {
3537 int x, y;
3538 get_window_origin (x, y);
3539 parent_x = x;
3540 parent_y = y;
3541 }
3472 update_background (); 3542 update_background ();
3543 }
3473 } 3544 }
3474 break; 3545 break;
3475#endif 3546#endif
3476 3547
3477 case XTerm_logfile: 3548 case XTerm_logfile:
… …
3564 * 's' = save 3635 * 's' = save
3565 * 'r' = restore 3636 * 'r' = restore
3566 * 't' = toggle 3637 * 't' = toggle
3567 * so no need for fancy checking 3638 * so no need for fancy checking
3568 */ 3639 */
3569int 3640int ecb_cold
3570rxvt_term::privcases (int mode, unsigned long bit) 3641rxvt_term::privcases (int mode, unsigned long bit)
3571{ 3642{
3572 int state; 3643 int state;
3573 3644
3574 if (mode == 's') 3645 if (mode == 's')
3575 { 3646 {
3576 SavedModes |= (priv_modes & bit); 3647 if (priv_modes & bit)
3648 SavedModes |= bit;
3649 else
3650 SavedModes &= ~bit;
3577 return -1; 3651 return -1;
3578 } 3652 }
3579 else 3653 else
3580 { 3654 {
3581 if (mode == 'r') 3655 if (mode == 'r')
3582 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3656 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3583 else 3657 else
3584 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3658 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3585 set_privmode (bit, state); 3659
3660 if (state)
3661 priv_modes |= bit;
3662 else
3663 priv_modes &= ~bit;
3586 } 3664 }
3587 3665
3588 return state; 3666 return state;
3589} 3667}
3590 3668
3591/* we're not using priv _yet_ */ 3669/* we're not using priv _yet_ */
3592void 3670void
3593rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3671rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3594{ 3672{
3595 unsigned int i, j; 3673 unsigned int i, j;
3596 int state; 3674 int state;
3597 3675
3598 static const struct 3676 static const struct
3599 { 3677 {
3600 const int argval; 3678 const int argval;
3601 const unsigned long bit; 3679 const unsigned long bit;
3602 } argtopriv[] = { 3680 } argtopriv[] = {
3603 { 1, PrivMode_aplCUR }, // DECCKM 3681 { 1, PrivMode_aplCUR }, // DECCKM
3604 { 2, PrivMode_vt52 }, 3682 { 2, PrivMode_vt52 }, // DECANM
3605 { 3, PrivMode_132 }, // DECCOLM 3683 { 3, PrivMode_132 }, // DECCOLM
3606 { 4, PrivMode_smoothScroll }, // DECSCLM 3684 { 4, PrivMode_smoothScroll }, // DECSCLM
3607 { 5, PrivMode_rVideo }, // DECSCNM 3685 { 5, PrivMode_rVideo }, // DECSCNM
3608 { 6, PrivMode_relOrigin }, // DECOM 3686 { 6, PrivMode_relOrigin }, // DECOM
3609 { 7, PrivMode_Autowrap }, // DECAWM 3687 { 7, PrivMode_Autowrap }, // DECAWM
3610 // 8, auto-repeat keys // DECARM 3688 // 8, auto-repeat keys // DECARM
3611 { 9, PrivMode_MouseX10 }, 3689 { 9, PrivMode_MouseX10 },
3690 { 12, PrivMode_BlinkingCursor },
3612 // 18 end FF to printer after print screen 3691 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scorll region 3692 // 19 Print screen prints full screen/scroll region
3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3693 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3615#ifdef scrollBar_esc 3694#ifdef scrollBar_esc
3616 { scrollBar_esc, PrivMode_scrollBar }, 3695 { scrollBar_esc, PrivMode_scrollBar },
3617#endif 3696#endif
3618 { 35, PrivMode_ShiftKeys }, // rxvt extension 3697 { 35, PrivMode_ShiftKeys }, // rxvt extension
3619 // 38, tektronix mode // DECTEK 3698 // 38, tektronix mode // DECTEK
3620 { 40, PrivMode_132OK }, 3699 { 40, PrivMode_132OK },
3621 // 41 xterm more fixes NYI 3700 // 41 xterm more fixes NYI
3622 // 45 margin bell NYI 3701 // 45 margin bell NYI
3623 // 46 start logging 3702 // 46 start logging
3624 { 47, PrivMode_Screen }, 3703 { 47, PrivMode_Screen },
3625 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3704 { 66, PrivMode_aplKP }, // DECNKM
3626#ifndef NO_BACKSPACE_KEY 3705#ifndef NO_BACKSPACE_KEY
3627 { 67, PrivMode_BackSpace }, // DECBKM 3706 { 67, PrivMode_BackSpace }, // DECBKM
3628#endif 3707#endif
3629 { 1000, PrivMode_MouseX11 }, 3708 { 1000, PrivMode_MouseX11 },
3630 { 1002, PrivMode_MouseBtnEvent }, 3709 { 1002, PrivMode_MouseBtnEvent },
3631 { 1003, PrivMode_MouseAnyEvent }, 3710 { 1003, PrivMode_MouseAnyEvent },
3711#if ENABLE_FRILLS
3712 { 1005, PrivMode_ExtModeMouse },
3713#endif
3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3714 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3633 { 1011, PrivMode_Keypress }, // rxvt extension 3715 { 1011, PrivMode_Keypress }, // rxvt extension
3716#if ENABLE_FRILLS
3717 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3718#endif
3634 // 1035 enable modifiers for alt, numlock NYI 3719 // 1035 enable modifiers for alt, numlock NYI
3635 // 1036 send ESC for meta keys NYI 3720 // 1036 send ESC for meta keys NYI
3636 // 1037 send DEL for keypad delete NYI 3721 // 1037 send DEL for keypad delete NYI
3637 { 1047, PrivMode_Screen }, 3722 { 1047, PrivMode_Screen },
3638 // 1048 save and restore cursor 3723 // 1048 save and restore cursor, implemented in code
3639 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3724 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3725 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste }, 3726 { 2004, PrivMode_BracketPaste },
3642 }; 3727 };
3643 3728
… …
3653 for (i = 0; i < nargs; i++) 3738 for (i = 0; i < nargs; i++)
3654 { 3739 {
3655 state = -1; 3740 state = -1;
3656 3741
3657 /* basic handling */ 3742 /* basic handling */
3658 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3743 for (j = 0; j < ecb_array_length (argtopriv); j++)
3659 if (argtopriv[j].argval == arg[i]) 3744 if (argtopriv[j].argval == arg[i])
3660 { 3745 {
3661 state = privcases (mode, argtopriv[j].bit); 3746 state = privcases (mode, argtopriv[j].bit);
3662 break; 3747 break;
3663 } 3748 }
… …
3689 case 2: /* VT52 mode */ 3774 case 2: /* VT52 mode */
3690 /* oddball mode. should be set regardless of set/reset 3775 /* oddball mode. should be set regardless of set/reset
3691 * parameter. Return from VT52 mode with an ESC < from 3776 * parameter. Return from VT52 mode with an ESC < from
3692 * within VT52 mode 3777 * within VT52 mode
3693 */ 3778 */
3694 set_privmode (PrivMode_vt52, 1); 3779 priv_modes |= PrivMode_vt52;
3695 break; 3780 break;
3696 case 3: /* 80/132 */ 3781 case 3: /* 80/132 */
3697 if (priv_modes & PrivMode_132OK) 3782 if (priv_modes & PrivMode_132OK)
3698 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3783 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3699 break; 3784 break;
… …
3714 if (state) /* orthogonal */ 3799 if (state) /* orthogonal */
3715 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3800 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3716 break; 3801 break;
3717#ifdef scrollBar_esc 3802#ifdef scrollBar_esc
3718 case scrollBar_esc: 3803 case scrollBar_esc:
3719 if (scrollBar.map (state)) 3804 scrollBar.map (state);
3720 {
3721 resize_all_windows (0, 0, 0); 3805 resize_all_windows (0, 0, 0);
3722 scr_touch (true); 3806 scr_touch (true);
3723 } 3807 break;
3808#endif
3809#ifdef CURSOR_BLINK
3810 case 12:
3811 cursor_blink_reset ();
3724 break; 3812 break;
3725#endif 3813#endif
3726 case 25: /* visible/invisible cursor */ 3814 case 25: /* visible/invisible cursor */
3727 scr_cursor_visible (state); 3815 scr_cursor_visible (state);
3728 break; 3816 break;
… …
3741 case 1003: 3829 case 1003:
3742 if (state) 3830 if (state)
3743 { 3831 {
3744 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3832 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3745 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3833 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3834 mouse_row = mouse_col = 0;
3746 vt_emask_mouse = PointerMotionMask; 3835 vt_emask_mouse = PointerMotionMask;
3747 } 3836 }
3748 else 3837 else
3749 vt_emask_mouse = NoEventMask; 3838 vt_emask_mouse = NoEventMask;
3750 3839
… …
3782 } 3871 }
3783} 3872}
3784/*}}} */ 3873/*}}} */
3785 3874
3786/*{{{ process sgr sequences */ 3875/*{{{ process sgr sequences */
3787void 3876void ecb_hot
3788rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3877rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3789{ 3878{
3790 unsigned int i; 3879 unsigned int i;
3791 short rendset; 3880 short rendset;
3792 int rendstyle; 3881 int rendstyle;
… …
3834 //case 19: // ninth alt font 3923 //case 19: // ninth alt font
3835 //case 20: // gothic 3924 //case 20: // gothic
3836 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3925 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3837 rendset = 0, rendstyle = RS_Bold; 3926 rendset = 0, rendstyle = RS_Bold;
3838 break; 3927 break;
3839 case 22: // normal intensity 3928 case 22: // bold off (vt220)
3840 rendset = 0, rendstyle = RS_Bold; 3929 rendset = 0, rendstyle = RS_Bold;
3841 break; 3930 break;
3842 case 23: // disable italic 3931 case 23: // disable italic
3843 rendset = 0, rendstyle = RS_Italic; 3932 rendset = 0, rendstyle = RS_Italic;
3844 break; 3933 break;
3845 case 24: 3934 case 24: // underline off (vt220)
3846 rendset = 0, rendstyle = RS_Uline; 3935 rendset = 0, rendstyle = RS_Uline;
3847 break; 3936 break;
3848 case 25: 3937 case 25: // blink off (vt220)
3849 rendset = 0, rendstyle = RS_Blink; 3938 rendset = 0, rendstyle = RS_Blink;
3850 break; 3939 break;
3851 case 26: // variable spacing (iso 8613) 3940 case 26: // variable spacing (iso 8613)
3852 rendset = 0, rendstyle = RS_Blink; 3941 rendset = 0, rendstyle = RS_Blink;
3853 break; 3942 break;
3854 case 27: 3943 case 27: // reverse off (vt220)
3855 rendset = 0, rendstyle = RS_RVid; 3944 rendset = 0, rendstyle = RS_RVid;
3856 break; 3945 break;
3857 //case 28: // visible. NYI 3946 //case 28: // visible. NYI
3858 //case 29: // not crossed-out 3947 //case 29: // not crossed-out
3859 } 3948 }
… …
3933 break; 4022 break;
3934#endif 4023#endif
3935 } 4024 }
3936 } 4025 }
3937} 4026}
4027
4028void
4029rxvt_term::set_cursor_style (int style)
4030{
4031 if (!IN_RANGE_INC (style, 0, 6))
4032 return;
4033
4034 if (style == 0)
4035 style = 1;
4036
4037 cursor_type = (style - 1) / 2;
4038 set_option (Opt_cursorUnderline, cursor_type == 1);
4039
4040#ifdef CURSOR_BLINK
4041 set_option (Opt_cursorBlink, style & 1);
4042 cursor_blink_reset ();
4043#endif
4044
4045 want_refresh = 1;
4046}
3938/*}}} */ 4047/*}}} */
3939 4048
3940/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3941void
3942rxvt_term::process_graphics ()
3943{
3944 unicode_t ch, cmd = cmd_getc ();
3945
3946 if (cmd == 'Q')
3947 {
3948 /* query graphics */
3949 tt_printf ("\033G0\012"); /* no graphics */
3950 return;
3951 }
3952 /* swallow other graphics sequences until terminating ':' */
3953 do
3954 ch = cmd_getc ();
3955 while (ch != ':');
3956}
3957/*}}} */
3958
3959/* ------------------------------------------------------------------------- */ 4049/* ---------------------------------------------------------------------- */
4050/* Write data to the pty as typed by the user, pasted with the mouse,
4051 * or generated by us in response to a query ESC sequence.
4052 */
3960 4053
3961/* 4054/*
3962 * Send printf () formatted output to the command. 4055 * Send printf () formatted output to the command.
3963 * Only use for small amounts of data. 4056 * Only use for small amounts of data.
3964 */ 4057 */
… …
3972 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4065 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3973 va_end (arg_ptr); 4066 va_end (arg_ptr);
3974 tt_write (buf, strlen (buf)); 4067 tt_write (buf, strlen (buf));
3975} 4068}
3976 4069
3977/* ---------------------------------------------------------------------- */
3978/* Write data to the pty as typed by the user, pasted with the mouse, 4070/* Write data to the pty as typed by the user. */
3979 * or generated by us in response to a query ESC sequence. 4071void
3980 */ 4072rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3981const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4073{
4074 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4075 return;
4076
4077 if (option (Opt_scrollTtyKeypress))
4078 if (view_start)
4079 {
4080 view_start = 0;
4081 want_refresh = 1;
4082 }
4083
4084 tt_write_ (data, len);
4085}
3982 4086
3983void 4087void
3984rxvt_term::tt_write (const char *data, unsigned int len) 4088rxvt_term::tt_write (const char *data, unsigned int len)
3985{ 4089{
3986 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4090 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3987 return; 4091 return;
3988 4092
4093 tt_write_ (data, len);
4094}
4095
4096static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4097
4098void
4099rxvt_term::tt_write_ (const char *data, unsigned int len)
4100{
3989 if (pty->pty < 0) 4101 if (pty->pty < 0)
3990 return; 4102 return;
3991 4103
3992 if (v_buflen == 0) 4104 if (v_buflen == 0)
3993 { 4105 {
3994 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4106 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3995 4107
4108 max_it (written, 0);
4109
3996 if ((unsigned int)written == len) 4110 if (written == len)
3997 return; 4111 return;
3998 4112
3999 data += written; 4113 data += written;
4000 len -= written; 4114 len -= written;
4001 } 4115 }
4002 4116
4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4117 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4004 4118
4005 memcpy (v_buffer + v_buflen, data, len); 4119 memcpy (v_buffer + v_buflen, data, len);
4006 v_buflen += len; 4120 v_buflen += len;
4007 4121
4008 pty_ev.set (ev::READ | ev::WRITE); 4122 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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