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.235 by root, Wed Jan 4 20:43:37 2006 UTC vs.
Revision 1.545 by sf-exg, Sat Apr 26 15:05:17 2014 UTC

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

Diff Legend

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