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.276 by root, Fri Jan 20 11:02:46 2006 UTC vs.
Revision 1.553 by sf-exg, Sat Jul 26 15:58:38 2014 UTC

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

Diff Legend

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