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

Diff Legend

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