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.298 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.553 by sf-exg, Sat Jul 26 15:58:38 2014 UTC

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

Diff Legend

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