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

Diff Legend

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