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

Diff Legend

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