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.259 by root, Fri Jan 13 04:59:04 2006 UTC vs.
Revision 1.547 by sf-exg, Tue Apr 29 12:51:41 2014 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 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 + 1];
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 (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
704 return;
705
706 if (valid_keysym)
707 {
392#ifdef KEYSYM_RESOURCE 708#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state)) 709 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
394 return; 710 return;
395#endif 711#endif
396 712
397 if (saveLines) 713 if (saveLines)
398 { 714 {
… …
407#ifdef PAGING_CONTEXT_LINES 723#ifdef PAGING_CONTEXT_LINES
408 lnsppg = nrow - PAGING_CONTEXT_LINES; 724 lnsppg = nrow - PAGING_CONTEXT_LINES;
409#else 725#else
410 lnsppg = nrow * 4 / 5; 726 lnsppg = nrow * 4 / 5;
411#endif 727#endif
728 max_it (lnsppg, 1);
729
412 if (keysym == XK_Prior) 730 if (keysym == XK_Prior)
413 { 731 {
414 scr_page (UP, lnsppg); 732 scr_page (lnsppg);
415 return; 733 return;
416 } 734 }
417 else if (keysym == XK_Next) 735 else if (keysym == XK_Next)
418 { 736 {
419 scr_page (DN, lnsppg); 737 scr_page (-lnsppg);
420 return; 738 return;
421 } 739 }
422 } 740 }
423#ifdef SCROLL_ON_UPDOWN_KEYS 741#ifdef SCROLL_ON_UPDOWN_KEYS
424 if (IS_SCROLL_MOD) 742 if (IS_SCROLL_MOD)
425 { 743 {
426 if (keysym == XK_Up) 744 if (keysym == XK_Up)
427 { 745 {
428 scr_page (UP, 1); 746 scr_page (1);
429 return; 747 return;
430 } 748 }
431 else if (keysym == XK_Down) 749 else if (keysym == XK_Down)
432 { 750 {
433 scr_page (DN, 1); 751 scr_page (-1);
434 return; 752 return;
435 } 753 }
436 } 754 }
437#endif 755#endif
438#ifdef SCROLL_ON_HOMEEND_KEYS 756#ifdef SCROLL_ON_HOMEEND_KEYS
439 if (IS_SCROLL_MOD) 757 if (IS_SCROLL_MOD)
440 { 758 {
441 if (keysym == XK_Home) 759 if (keysym == XK_Home)
442 { 760 {
443 scr_move_to (0, 1); 761 scr_changeview (top_row);
444 return; 762 return;
445 } 763 }
446 else if (keysym == XK_End) 764 else if (keysym == XK_End)
447 { 765 {
448 scr_move_to (1, 0); 766 scr_changeview (0);
449 return; 767 return;
450 } 768 }
451 } 769 }
452#endif 770#endif
453 } 771 }
… …
464 { 782 {
465 switch (keysym) 783 switch (keysym)
466 { 784 {
467 /* normal XTerm key bindings */ 785 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 786 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 787 selection_request (ev.time);
470 return; 788 return;
471#if TODO 789#if TODO
472 /* rxvt extras */ 790 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 791 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP);
475 return; 792 return;
476 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 793 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
477 change_font (FONT_DN);
478 return; 794 return;
479#endif 795#endif
480 } 796 }
481 } 797 }
482 } 798 }
483 799
800 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
801 {
802 if (keysym == XK_v)
803 selection_request (ev.time, Sel_Clipboard);
804 else if (selection.len > 0)
805 {
806 free (selection.clip_text);
807 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
808 selection.clip_len = selection.len;
809 selection_grab (CurrentTime, true);
810 }
811
812 return;
813 }
814
484#if ENABLE_FRILLS || ISO_14755 815#if ENABLE_FRILLS || ISO_14755
485 // ISO 14755 support 816 // ISO 14755 support
486 if (shft && ctrl) 817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
487 { 818 {
488 int hv; 819 int hv;
489 820
490 if (iso14755buf & ISO_14755_51 821 if (iso14755buf & ISO_14755_51
491 && (keysym == XK_space || keysym == XK_KP_Space 822 && (keysym == XK_space || keysym == XK_KP_Space
… …
493 { 824 {
494 commit_iso14755 (); 825 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 826 iso14755buf = ISO_14755_51;
496# if ISO_14755 827# if ISO_14755
497 iso14755_51 (0); 828 iso14755_51 (0);
829# endif
830 return;
831 }
832 else if (keysym == XK_BackSpace)
833 {
834 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
835# if ISO_14755
836 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 837# endif
499 return; 838 return;
500 } 839 }
501 else if ((hv = hex_keyval (ev)) >= 0) 840 else if ((hv = hex_keyval (ev)) >= 0)
502 { 841 {
… …
507# endif 846# endif
508 return; 847 return;
509 } 848 }
510 else 849 else
511 { 850 {
512# if ENABLE_OVERLAY 851# if ISO_14755
513 scr_overlay_off (); 852 scr_overlay_off ();
514# endif 853# endif
515 iso14755buf = 0; 854 iso14755buf = 0;
516 } 855 }
517 } 856 }
857 else if (option (Opt_iso14755) &&
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 858 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 859 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
520 if (!(iso14755buf & ISO_14755_STARTED)) 860 if (!(iso14755buf & ISO_14755_STARTED))
521 { 861 {
522 iso14755buf |= ISO_14755_STARTED; 862 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 863# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 864 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 865 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 866# endif
527 } 867 }
528#endif 868#endif
529 869
530#ifdef PRINTPIPE 870#ifdef PRINTPIPE
531 if (keysym == XK_Print) 871 if (keysym == XK_Print)
532 { 872 {
533 scr_printscreen (ctrl | shft); 873 scr_printscreen (ctrl | shft);
534 return; 874 return;
535 } 875 }
536#endif 876#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 } 877 }
871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874 878
875 if (len <= 0) 879 if (len <= 0)
876 return; /* not mapped */ 880 return; /* not mapped */
877 881
878 if (OPTION (Opt_scrollTtyKeypress)) 882 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 883 if (view_start)
880 { 884 {
881 view_start = 0; 885 view_start = 0;
882 want_refresh = 1; 886 want_refresh = 1;
883 } 887 }
884 888
885 /*
886 * these modifications only affect the static keybuffer
887 * pass Shift/Control indicators for function keys ending with `~'
888 *
889 * eg,
890 * Prior = "ESC[5~"
891 * Shift+Prior = "ESC[5$"
892 * Ctrl+Prior = "ESC[5^"
893 * Ctrl+Shift+Prior = "ESC[5@"
894 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
895 */
896 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
897 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
898
899 /* escape prefix */
900 if (meta
901#ifdef META8_OPTION
902 && meta_char == C0_ESC
903#endif
904 )
905 {
906 const char ch = C0_ESC;
907 tt_write (&ch, 1);
908 }
909
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 889 tt_write (kbuf, (unsigned int)len);
921} 890}
922/*}}} */
923 891
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 892void ecb_cold
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 893rxvt_term::key_release (XKeyEvent &ev)
926/* attempt to `write' count to the input buffer */
927unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 894{
930 unsigned int n, s; 895#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
896 KeySym keysym;
931 897
932 n = cmdbuf_ptr - cmdbuf_base; 898 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 899#endif
934 900
935 if (n > 0 && s < count) 901#if ENABLE_FRILLS || ISO_14755
902 // ISO 14755 support
903 if (iso14755buf)
904 if (iso14755buf & ISO_14755_52)
936 { 905 {
937 memmove (cmdbuf_base, cmdbuf_ptr, 906# if ISO_14755
938 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 907 scr_overlay_off ();
939 cmdbuf_ptr = cmdbuf_base;
940 cmdbuf_endp -= n;
941 s += n;
942 }
943
944 if (count > s)
945 {
946 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
947 count = s;
948 }
949
950 for (; count--;)
951 *cmdbuf_endp++ = *str++;
952
953 cmd_parse ();
954
955 return 0;
956}
957#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}
958 968
959void 969void
960rxvt_term::flush () 970rxvt_term::flush ()
961{ 971{
962 flush_ev.stop (); 972 flush_ev.stop ();
963 973
964#ifdef TRANSPARENT 974#ifdef HAVE_IMG
965 if (want_full_refresh) 975 if (bg_flags & BG_NEEDS_REFRESH)
966 { 976 {
967 want_full_refresh = 0; 977 bg_flags &= ~BG_NEEDS_REFRESH;
968 scr_clear ();
969 scr_touch (false); 978 scr_touch (false);
970 } 979 }
971#endif 980#endif
972 981
973 if (want_refresh) 982 if (want_refresh)
974 { 983 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 984 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 985 {
977 int row = -view_start; 986 int row = view_start;
978 int end_row = row + nrow; 987 int end_row = row + nrow;
979 988
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 989 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 990 --row;
982 991
983 do 992 do
984 { 993 {
985 int start_row = row; 994 int start_row = row;
… …
1008 while (l->is_longer () && row < end_row); 1017 while (l->is_longer () && row < end_row);
1009 } 1018 }
1010 while (row < end_row); 1019 while (row < end_row);
1011 } 1020 }
1012 1021
1013 scr_refresh (refresh_type); 1022 scr_refresh ();
1014 scrollbar_show (1); 1023 scrollBar.show (1);
1015#ifdef USE_XIM 1024#if USE_XIM
1016 IMSendSpot (); 1025 im_send_spot ();
1017#endif 1026#endif
1018 } 1027 }
1019 1028
1020 display->flush (); 1029 display->flush ();
1021} 1030}
1022 1031
1032/* checks whether a refresh is requested and starts the refresh timer */
1023void 1033void
1024rxvt_term::check_cb (check_watcher &w) 1034rxvt_term::refresh_check ()
1025{ 1035{
1026 SET_R (this); 1036 if (want_refresh && !flush_ev.is_active ())
1027 SET_LOCALE (locale); 1037 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1028 1038
1029 display->flush (); 1039 display->flush ();
1030
1031 if (want_refresh && !flush_ev.active)
1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033} 1040}
1034 1041
1035void 1042void
1036rxvt_term::flush_cb (time_watcher &w) 1043rxvt_term::flush_cb (ev::timer &w, int revents)
1037{ 1044{
1038 SET_R (this); 1045 make_current ();
1039 SET_LOCALE (locale);
1040 1046
1041 refresh_limit = 1;
1042 refresh_count = 0; 1047 refresh_count = 0;
1043 flush (); 1048 flush ();
1044} 1049}
1045 1050
1046#ifdef CURSOR_BLINK 1051#ifdef CURSOR_BLINK
1047void 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
1048rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1049{ 1069{
1050 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1051 want_refresh = 1; 1071 want_refresh = 1;
1052 1072 refresh_check ();
1053 w.start (w.at + BLINK_INTERVAL);
1054} 1073}
1055#endif 1074#endif
1056 1075
1057#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
1058void 1077void
1059rxvt_term::text_blink_cb (time_watcher &w) 1078rxvt_term::text_blink_cb (ev::timer &w, int revents)
1060{ 1079{
1061 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
1062 { 1081 {
1063 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
1064 want_refresh = 1; 1083 want_refresh = 1;
1065 w.start (w.at + TEXT_BLINK_INTERVAL); 1084 refresh_check ();
1066 } 1085 }
1086 else
1087 w.stop ();
1067} 1088}
1068#endif 1089#endif
1069 1090
1070#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1071void 1092void
1072rxvt_term::cont_scroll_cb (time_watcher &w) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1073{ 1094{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) && 1095 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1075 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1076 { 1097 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1; 1098 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1099 refresh_check ();
1080 } 1100 }
1101 else
1102 w.stop ();
1081} 1103}
1082#endif 1104#endif
1083 1105
1084#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1085void 1107void
1086rxvt_term::sel_scroll_cb (time_watcher &w) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1087{ 1109{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_lines))
1089 { 1111 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1; 1113 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 refresh_check ();
1094 } 1115 }
1116 else
1117 w.stop ();
1095} 1118}
1096#endif 1119#endif
1097 1120
1098#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1099void 1122void
1100rxvt_term::slip_wheel_cb (time_watcher &w) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1101{ 1124{
1102 if (mouse_slip_wheel_speed == 0 1125 if (scr_page (mouse_slip_wheel_speed))
1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1126 {
1106 if (view_start == nsaved ||
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0;
1109
1110 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1127 want_refresh = 1;
1112 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)
1113 } 1132 {
1133 mouse_slip_wheel_speed = 0;
1134 w.stop ();
1135 }
1114} 1136}
1115#endif 1137#endif
1116 1138
1117#if HAVE_SCHED_YIELD 1139#if LINUX_YIELD_HACK
1118static struct event_handler 1140static struct event_handler
1119{ 1141{
1120 check_watcher cw_yield; 1142 ev::prepare yield_ev;
1121 1143
1122 void yield (check_watcher &w) 1144 void yield_cb (ev::prepare &w, int revents)
1123 { 1145 {
1124 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
1125 w.stop (); 1157 w.stop ();
1126 } 1158 }
1127 1159
1128 event_handler () 1160 event_handler ()
1129 : cw_yield (this, &event_handler::yield) 1161 : yield_ev (this, &event_handler::yield_cb)
1130 { 1162 {
1131 } 1163 }
1132} event_handler; 1164} event_handler;
1133#endif 1165#endif
1134 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
1135bool 1200bool
1136rxvt_term::pty_fill () 1201rxvt_term::pty_fill ()
1137{ 1202{
1138 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1203 cmdbuf_reify ();
1139 1204
1140 if (CBUFSIZ == n) 1205 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1141 { 1206
1142 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1207 if (!avail)
1143 n = 0;
1144 } 1208 {
1145 1209 // normally this indicates a "too long" command sequence - just drop the data we have
1146 memmove (cmdbuf_base, cmdbuf_ptr, n);
1147 cmdbuf_ptr = cmdbuf_base; 1210 cmdbuf_ptr = cmdbuf_base;
1148 cmdbuf_endp = cmdbuf_ptr + n; 1211 cmdbuf_endp = cmdbuf_ptr;
1212 avail = CBUFSIZ;
1213 }
1149 1214
1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1215 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1151 1216
1152 if (r > 0) 1217 if (r > 0)
1153 { 1218 {
1154 cmdbuf_endp += r; 1219 cmdbuf_endp += r;
1155 return true; 1220 return true;
1156 } 1221 }
1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1222 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 { 1223 {
1159#if HAVE_SCHED_YIELD 1224#if LINUX_YIELD_HACK
1160 if (display->is_local) 1225 if (display->is_local)
1161 event_handler.cw_yield.start (); 1226 event_handler.yield_ev.start ();
1162#endif 1227#endif
1163 } 1228 }
1164 else 1229 else
1165 { 1230 {
1166 pty_ev.stop (); 1231 pty_ev.stop ();
1167 1232
1168 if (!OPTION (Opt_hold)) 1233 if (!option (Opt_hold))
1169 destroy (); 1234 destroy ();
1170 } 1235 }
1171 1236
1172 return false; 1237 return false;
1173} 1238}
1174 1239
1175void 1240void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1241rxvt_term::pty_cb (ev::io &w, int revents)
1177{ 1242{
1178 SET_R (this); 1243 make_current ();
1179 SET_LOCALE (locale);
1180 1244
1181 if (revents & EVENT_READ) 1245 if (revents & ev::READ)
1182 // loop, but don't allow a single term to monopolize us 1246 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1247 for (int i = CBUFCNT; i-- && pty_fill (); )
1184 if (cmd_parse ()) 1248 cmd_parse ();
1185 break;
1186 1249
1187 if (revents & EVENT_WRITE) 1250 if (revents & ev::WRITE)
1188 pty_write (); 1251 pty_write ();
1189}
1190 1252
1191void 1253 refresh_check ();
1254}
1255
1256void ecb_cold
1192rxvt_term::pointer_unblank () 1257rxvt_term::pointer_unblank ()
1193{ 1258{
1194 XDefineCursor (display->display, vt, TermWin_cursor); 1259 XDefineCursor (dpy, vt, TermWin_cursor);
1195 recolour_cursor (); 1260 recolour_cursor ();
1196 1261
1197#ifdef POINTER_BLANK 1262#ifdef POINTER_BLANK
1198 hidden_pointer = 0; 1263 hidden_pointer = 0;
1199 1264
1200 if (OPTION (Opt_pointerBlank)) 1265 if (option (Opt_pointerBlank))
1201 pointer_ev.start (NOW + pointerBlankDelay); 1266 pointer_ev.start (pointerBlankDelay);
1202#endif 1267#endif
1203} 1268}
1204 1269
1205#ifdef POINTER_BLANK 1270#ifdef POINTER_BLANK
1206void 1271void ecb_cold
1207rxvt_term::pointer_blank () 1272rxvt_term::pointer_blank ()
1208{ 1273{
1209 if (!OPTION (Opt_pointerBlank)) 1274 if (!option (Opt_pointerBlank))
1210 return; 1275 return;
1211 1276
1212 XDefineCursor (display->display, vt, display->blank_cursor); 1277 XDefineCursor (dpy, vt, display->blank_cursor);
1213 XFlush (display->display); 1278 XFlush (dpy);
1214 1279
1215 hidden_pointer = 1; 1280 hidden_pointer = 1;
1216} 1281}
1217 1282
1218void 1283void ecb_cold
1219rxvt_term::pointer_cb (time_watcher &w) 1284rxvt_term::pointer_cb (ev::timer &w, int revents)
1220{ 1285{
1221 SET_R (this); 1286 make_current ();
1222 SET_LOCALE (locale);
1223 1287
1224 pointer_blank (); 1288 pointer_blank ();
1225} 1289}
1226#endif 1290#endif
1227 1291
1228void 1292void
1229rxvt_term::mouse_report (XButtonEvent &ev) 1293rxvt_term::mouse_report (XButtonEvent &ev)
1230{ 1294{
1231 int button_number, key_state = 0; 1295 int button_number, key_state = 0;
1232 int x, y; 1296 int x, y;
1297 int code = 32;
1233 1298
1234 x = ev.x; 1299 x = Pixel2Col (ev.x) + 1;
1235 y = ev.y; 1300 y = Pixel2Row (ev.y) + 1;
1236 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 }
1237 1311
1238 if (MEvent.button == AnyButton) 1312 if (MEvent.button == AnyButton)
1239 button_number = 3; 1313 button_number = 3;
1240 else 1314 else
1241 { 1315 {
1242 button_number = MEvent.button - Button1; 1316 button_number = MEvent.button - Button1;
1243 /* add 0x3D for wheel events, like xterm does */ 1317 /* add 0x3D for wheel events, like xterm does */
1244 if (button_number >= 3) 1318 if (button_number >= 3)
1245 button_number += (64 - 3); 1319 button_number += 64 - 3;
1246 } 1320 }
1247 1321
1248 if (priv_modes & PrivMode_MouseX10) 1322 if (priv_modes & PrivMode_MouseX10)
1249 { 1323 {
1250 /* 1324 /*
… …
1282 fputc ('A', stderr); 1356 fputc ('A', stderr);
1283 if (key_state & 32) 1357 if (key_state & 32)
1284 fputc ('2', stderr); 1358 fputc ('2', stderr);
1285 fprintf (stderr, "]: <%d>, %d/%d\n", 1359 fprintf (stderr, "]: <%d>, %d/%d\n",
1286 button_number, 1360 button_number,
1287 x + 1, 1361 x,
1288 y + 1); 1362 y);
1289#endif 1363#endif
1290 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
1291 tt_printf ("\033[M%c%c%c", 1378 tt_printf ("\033[M%c%c%c",
1292 (32 + button_number + key_state), 1379 code + button_number + key_state,
1293 (32 + x + 1), 1380 32 + x,
1294 (32 + y + 1)); 1381 32 + y);
1295} 1382}
1296
1297#ifdef USING_W11LIB
1298void
1299rxvt_W11_process_x_event (XEvent *ev)
1300{
1301 rxvt_t *r = rxvt_get_r ();
1302
1303 x_cb (*ev);
1304}
1305#endif
1306 1383
1307/*{{{ process an X event */ 1384/*{{{ process an X event */
1308void 1385void ecb_hot
1309rxvt_term::x_cb (XEvent &ev) 1386rxvt_term::x_cb (XEvent &ev)
1310{ 1387{
1311 dDisp; 1388 make_current ();
1312 1389
1313 SET_R (this); 1390 dLocal (Display *, dpy);
1314 SET_LOCALE (locale);
1315 1391
1316 if (ev.xany.window == vt 1392 if (ev.xany.window == vt
1393 && SHOULD_INVOKE (HOOK_X_EVENT)
1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1394 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1318 return; 1395 return;
1319 1396
1397 // for XQueryPointer
1320 Window unused_root, unused_child; 1398 Window unused_root, unused_child;
1321 int unused_root_x, unused_root_y; 1399 int unused_root_x, unused_root_y;
1322 unsigned int unused_mask; 1400 unsigned int unused_mask;
1323 1401
1324 switch (ev.type) 1402 switch (ev.type)
1325 { 1403 {
1326 case KeyPress: 1404 case KeyPress:
1327#if ISO_14755 1405 key_press (ev.xkey);
1328 if (!(iso14755buf & ISO_14755_52))
1329#endif
1330 lookup_key (ev.xkey);
1331
1332 break; 1406 break;
1333 1407
1334 case KeyRelease: 1408 case KeyRelease:
1335 { 1409 key_release (ev.xkey);
1336#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1337 KeySym keysym;
1338
1339 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1340#endif
1341
1342#if ENABLE_FRILLS || ISO_14755
1343 // ISO 14755 support
1344 if (iso14755buf)
1345 if (iso14755buf & ISO_14755_52)
1346 {
1347# if ENABLE_OVERLAY
1348 scr_overlay_off ();
1349# endif
1350# if ISO_14755
1351 // iso14755 part 5.2 handling: release time
1352 // first: controls
1353 if ((ev.xkey.state & ControlMask)
1354 && ((keysym >= 0x40 && keysym <= 0x5f)
1355 || (keysym >= 0x61 && keysym <= 0x7f)))
1356 {
1357 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1358 commit_iso14755 ();
1359 goto skip_switch;
1360 }
1361
1362 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1363 if (i[0] == keysym)
1364 {
1365 iso14755buf = ISO_14755_51 | i[1];
1366 commit_iso14755 ();
1367 goto skip_switch;
1368 }
1369
1370 scr_bell ();
1371# endif
1372 iso14755buf = 0;
1373 break;
1374 }
1375 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1376 {
1377# if ENABLE_OVERLAY
1378 scr_overlay_off ();
1379# endif
1380 if (iso14755buf & ISO_14755_51)
1381 commit_iso14755 ();
1382#if ISO_14755
1383 else if (iso14755buf & ISO_14755_STARTED)
1384 {
1385 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1386
1387 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1388 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1389 }
1390# endif
1391 else
1392 iso14755buf = 0;
1393 }
1394#endif
1395
1396 if (ev.xany.window == vt
1397 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1398 break;
1399
1400#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1401 if (!(ev.xkey.state & ControlMask))
1402 slip_wheel_ev.stop ();
1403 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1404 mouse_slip_wheel_speed = 0;
1405#endif
1406 break; 1410 break;
1407 }
1408 1411
1409 case ButtonPress: 1412 case ButtonPress:
1410 button_press (ev.xbutton); 1413 button_press (ev.xbutton);
1411 break; 1414 break;
1412 1415
… …
1414 button_release (ev.xbutton); 1417 button_release (ev.xbutton);
1415 break; 1418 break;
1416 1419
1417 case ClientMessage: 1420 case ClientMessage:
1418 if (ev.xclient.format == 32 1421 if (ev.xclient.format == 32
1419 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1422 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1420 { 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 {
1421 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)))
1422 destroy (); 1431 destroy ();
1432 }
1423#if ENABLE_EWMH 1433#if ENABLE_EWMH
1424 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])
1425 XSendEvent (disp, ev.xclient.window = display->root, 1435 XSendEvent (dpy, ev.xclient.window = display->root,
1426 False, SubstructureRedirectMask | SubstructureNotifyMask, 1436 False, SubstructureRedirectMask | SubstructureNotifyMask,
1427 &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 }
1428#endif 1449#endif
1429 } 1450 }
1430#if ENABLE_XEMBED
1431 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1432 {
1433 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1434 focus_in ();
1435 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1436 focus_out ();
1437 }
1438#endif
1439#ifdef OFFIX_DND
1440 /* OffiX Dnd (drag 'n' drop) protocol */
1441 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1442 && (ev.xclient.data.l[0] == DndFile
1443 || ev.xclient.data.l[0] == DndDir
1444 || ev.xclient.data.l[0] == DndLink))
1445 {
1446 /* Get Dnd data */
1447 Atom ActualType;
1448 int ActualFormat;
1449 unsigned char *data;
1450 unsigned long Size, RemainingBytes;
1451
1452 XGetWindowProperty (disp, display->root,
1453 xa[XA_DNDSELECTION],
1454 0L, 1000000L,
1455 False, AnyPropertyType,
1456 &ActualType, &ActualFormat,
1457 &Size, &RemainingBytes,
1458 &data);
1459 set_string_property (XA_CUT_BUFFER0, data);
1460 XFree (data);
1461 selection_paste (display->root, XA_CUT_BUFFER0, true);
1462 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1463 }
1464#endif /* OFFIX_DND */
1465 break;
1466
1467 case MappingNotify:
1468 XRefreshKeyboardMapping (&ev.xmapping);
1469 break; 1451 break;
1470 1452
1471 /* 1453 /*
1472 * XXX: this is not the _current_ arrangement 1454 * XXX: this is not the _current_ arrangement
1473 * Here's my conclusion: 1455 * Here's my conclusion:
… …
1492 break; 1474 break;
1493 } 1475 }
1494 break; 1476 break;
1495 1477
1496 case FocusIn: 1478 case FocusIn:
1479 if (ev.xfocus.detail != NotifyInferior
1480 && ev.xfocus.detail != NotifyPointer
1481 && ev.xfocus.mode != NotifyGrab)
1497 focus_in (); 1482 focus_in ();
1498 break; 1483 break;
1499 1484
1500 case FocusOut: 1485 case FocusOut:
1486 if (ev.xfocus.detail != NotifyInferior
1487 && ev.xfocus.detail != NotifyPointer
1488 && ev.xfocus.mode != NotifyGrab)
1501 focus_out (); 1489 focus_out ();
1502 break; 1490 break;
1503 1491
1504 case ConfigureNotify: 1492 case ConfigureNotify:
1505 if (ev.xconfigure.window == parent[0]) 1493 if (ev.xconfigure.window == parent)
1506 { 1494 {
1507 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1495 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1508 ; 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 }
1509 1530
1510 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1531 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1511 { 1532 {
1512 seen_resize = 1; 1533 seen_resize = 1;
1513 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1534 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1514 } 1535 }
1515 1536 else
1516#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1537 {
1517 if (OPTION (Opt_transparent)) 1538#ifdef HAVE_BG_PIXMAP
1518 check_our_parents (); 1539 if (moved)
1540 update_background ();
1519#endif 1541#endif
1542 }
1543
1544 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1520 } 1545 }
1521 break; 1546 break;
1522 1547
1523 case PropertyNotify: 1548 case PropertyNotify:
1524 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1549 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1525 && ev.xproperty.state == PropertyNewValue)
1526 selection_property (ev.xproperty.window, ev.xproperty.atom);
1527
1528 break; 1550 break;
1529 1551
1530 case SelectionClear: 1552 case SelectionClear:
1531 selection_clear (); 1553 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1532 break;
1533
1534 case SelectionNotify:
1535 if (selection_wait == Sel_normal)
1536 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1537 break; 1554 break;
1538 1555
1539 case SelectionRequest: 1556 case SelectionRequest:
1540 selection_send (ev.xselectionrequest); 1557 selection_send (ev.xselectionrequest);
1541 break; 1558 break;
1542 1559
1543 case MapNotify: 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
1544 mapped = 1; 1572 mapped = 1;
1545#ifdef TEXT_BLINK 1573#ifdef TEXT_BLINK
1546 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1574 text_blink_ev.start ();
1547#endif 1575#endif
1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1576 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1549 break; 1577 break;
1550 1578
1551 case UnmapNotify: 1579 case UnmapNotify:
… …
1553#ifdef TEXT_BLINK 1581#ifdef TEXT_BLINK
1554 text_blink_ev.stop (); 1582 text_blink_ev.stop ();
1555#endif 1583#endif
1556 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1584 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1557 break; 1585 break;
1558
1559#ifdef TRANSPARENT
1560 case ReparentNotify:
1561 rootwin_cb (ev);
1562 break;
1563#endif /* TRANSPARENT */
1564 1586
1565 case GraphicsExpose: 1587 case GraphicsExpose:
1566 case Expose: 1588 case Expose:
1567 if (ev.xany.window == vt) 1589 if (ev.xany.window == vt)
1568 { 1590 {
1569 do 1591 do
1592 {
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1593 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1594 ev.xexpose.width, ev.xexpose.height, false);
1595 }
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1596 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1573 1597
1574 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1598 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1575 1599
1576 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1600 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1601 {
1577 scr_expose (ev.xexpose.x, ev.xexpose.y, 1602 scr_expose (ev.xexpose.x, ev.xexpose.y,
1578 ev.xexpose.width, ev.xexpose.height, False); 1603 ev.xexpose.width, ev.xexpose.height, false);
1604 }
1579 1605
1580 want_refresh = 1; 1606 want_refresh = 1;
1581 } 1607 }
1582 else 1608 else
1583 { 1609 {
1584 XEvent unused_event; 1610 XEvent unused_event;
1585 1611
1586 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1612 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1587 ; 1613 ;
1588 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1614 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1589 ; 1615 ;
1590 1616
1591 if (isScrollbarWindow (ev.xany.window)) 1617 if (scrollBar.state && ev.xany.window == scrollBar.win)
1592 { 1618 {
1593 scrollBar.setIdle (); 1619 scrollBar.state = SB_STATE_IDLE;
1594 scrollbar_show (0); 1620 scrollBar.show (0);
1595 } 1621 }
1596#ifdef MENUBAR
1597 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1598 menubar_expose ();
1599#endif
1600
1601#ifdef TRANSPARENT
1602 if (am_transparent && ev.xany.window == parent[0])
1603 XClearWindow (disp, ev.xany.window);
1604#endif
1605 } 1622 }
1606 break; 1623 break;
1607 1624
1608 case MotionNotify: 1625 case MotionNotify:
1609 printf ("motion notify\n");//D
1610#ifdef POINTER_BLANK 1626#ifdef POINTER_BLANK
1611 if (hidden_pointer) 1627 if (hidden_pointer)
1612 pointer_unblank (); 1628 pointer_unblank ();
1613#endif 1629#endif
1614#if MENUBAR 1630 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1615 if (isMenuBarWindow (ev.xany.window)) 1631 || priv_modes & PrivMode_MouseAnyEvent)
1616 {
1617 menubar_control (ev.xbutton); 1632 mouse_report (ev.xbutton);
1618 break;
1619 }
1620#endif
1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1633 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1622 break; 1634 break;
1623 1635
1624 if (ev.xany.window == vt) 1636 if (ev.xany.window == vt)
1625 { 1637 {
1638 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1626 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1639 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1627 ; // nop 1640 ; // nop
1628 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1641 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1629 { 1642 {
1630 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1643 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1631 ; 1644 ;
1632 1645
1633 XQueryPointer (disp, vt, 1646 XQueryPointer (dpy, vt,
1634 &unused_root, &unused_child, 1647 &unused_root, &unused_child,
1635 &unused_root_x, &unused_root_y, 1648 &unused_root_x, &unused_root_y,
1636 &ev.xbutton.x, &ev.xbutton.y, 1649 &ev.xbutton.x, &ev.xbutton.y,
1637 &ev.xbutton.state); 1650 &ev.xbutton.state);
1638#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
… …
1653 1666
1654#ifdef SELECTION_SCROLLING 1667#ifdef SELECTION_SCROLLING
1655 if (ev.xbutton.y < int_bwidth 1668 if (ev.xbutton.y < int_bwidth
1656 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1669 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1657 { 1670 {
1671 page_dirn scroll_selection_dir;
1658 int dist; 1672 int dist;
1659 1673
1660 /* don't clobber the current delay if we are 1674 /* don't clobber the current delay if we are
1661 * already in the middle of scrolling. 1675 * already in the middle of scrolling.
1662 */ 1676 */
1663 if (!sel_scroll_ev.active) 1677 if (!sel_scroll_ev.is_active ())
1664 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1678 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1665 1679
1666 /* save the event params so we can highlight 1680 /* save the event params so we can highlight
1667 * the selection in the pending-scroll loop 1681 * the selection in the pending-scroll loop
1668 */ 1682 */
1669 selection_save_x = ev.xbutton.x; 1683 selection_save_x = ev.xbutton.x;
… …
1677 dist = int_bwidth - ev.xbutton.y; 1691 dist = int_bwidth - ev.xbutton.y;
1678 } 1692 }
1679 else 1693 else
1680 { 1694 {
1681 scroll_selection_dir = DN; 1695 scroll_selection_dir = DN;
1682 dist = ev.xbutton.y - (int_bwidth + height); 1696 dist = ev.xbutton.y - (int_bwidth + vt_height);
1683 } 1697 }
1684 1698
1685 scroll_selection_lines = Pixel2Height (dist) 1699 scroll_selection_lines = Pixel2Height (dist)
1686 / SELECTION_SCROLL_LINE_SPEEDUP 1700 / SELECTION_SCROLL_LINE_SPEEDUP
1687 + 1; 1701 + 1;
1688 min_it (scroll_selection_lines, 1702 min_it (scroll_selection_lines,
1689 SELECTION_SCROLL_MAX_LINES); 1703 SELECTION_SCROLL_MAX_LINES);
1704 scroll_selection_lines *= scroll_selection_dir;
1690 } 1705 }
1691 else 1706 else
1692 { 1707 {
1693 /* we are within the text window, so we 1708 /* we are within the text window, so we
1694 * shouldn't be scrolling 1709 * shouldn't be scrolling
1695 */ 1710 */
1696 if (sel_scroll_ev.active)
1697 sel_scroll_ev.stop(); 1711 sel_scroll_ev.stop();
1698 } 1712 }
1699#endif 1713#endif
1700#ifdef MOUSE_THRESHOLD 1714#ifdef MOUSE_THRESHOLD
1701 } 1715 }
1702#endif 1716#endif
1703 } 1717 }
1704 } 1718 }
1705 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1719 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1706 { 1720 {
1707 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1721 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1708 MotionNotify, &ev)) 1722 MotionNotify, &ev))
1709 ; 1723 ;
1710 1724
1711 XQueryPointer (disp, scrollBar.win, 1725 XQueryPointer (dpy, scrollBar.win,
1712 &unused_root, &unused_child, 1726 &unused_root, &unused_child,
1713 &unused_root_x, &unused_root_y, 1727 &unused_root_x, &unused_root_y,
1714 &ev.xbutton.x, &ev.xbutton.y, 1728 &ev.xbutton.x, &ev.xbutton.y,
1715 &unused_mask); 1729 &unused_mask);
1716 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1730 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1717 scrollbar_size ()); 1731 scrollBar.size ());
1718 want_refresh = 1; 1732 want_refresh = 1;
1719 refresh_limit = 0;
1720 scrollbar_show (1); 1733 scrollBar.show (1);
1721 } 1734 }
1722 break; 1735 break;
1723 } 1736 }
1724 1737
1725skip_switch: ;
1726
1727#if defined(CURSOR_BLINK) 1738#if defined(CURSOR_BLINK)
1728 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1739 if (ev.type == KeyPress)
1729 { 1740 cursor_blink_reset ();
1730 if (hidden_cursor)
1731 {
1732 hidden_cursor = 0;
1733 want_refresh = 1;
1734 }
1735
1736 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1737 }
1738#endif 1741#endif
1739 1742
1740#if defined(POINTER_BLANK) 1743#if defined(POINTER_BLANK)
1741 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1744 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1742 { 1745 {
1743 if (ev.type == MotionNotify 1746 if (ev.type == MotionNotify
1744 || ev.type == ButtonPress 1747 || ev.type == ButtonPress
1745 || ev.type == ButtonRelease) 1748 || ev.type == ButtonRelease)
1746 if (hidden_pointer) 1749 if (hidden_pointer)
… …
1748 1751
1749 if (ev.type == KeyPress && hidden_pointer == 0) 1752 if (ev.type == KeyPress && hidden_pointer == 0)
1750 pointer_blank (); 1753 pointer_blank ();
1751 } 1754 }
1752#endif 1755#endif
1753}
1754 1756
1755void 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
1756rxvt_term::focus_in () 1778rxvt_term::focus_in ()
1757{ 1779{
1758 if (!focus) 1780 if (!focus)
1759 { 1781 {
1760 focus = 1; 1782 focus = 1;
1761 want_refresh = 1; 1783 want_refresh = 1;
1762 1784
1763 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764
1765#if USE_XIM 1785#if USE_XIM
1766 if (Input_Context != NULL) 1786 if (Input_Context != NULL)
1767 { 1787 {
1768 IMSetStatusPosition (); 1788 im_set_position ();
1769 XSetICFocus (Input_Context); 1789 XSetICFocus (Input_Context);
1770 } 1790 }
1771#endif 1791#endif
1772#if CURSOR_BLINK 1792#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1794 cursor_blink_ev.again ();
1775#endif 1795#endif
1776#if OFF_FOCUS_FADING 1796#if OFF_FOCUS_FADING
1777 if (rs[Rs_fade]) 1797 if (rs[Rs_fade])
1778 { 1798 {
1779 pix_colors = pix_colors_focused; 1799 pix_colors = pix_colors_focused;
1780 scr_recolour (); 1800 scr_recolour ();
1781 } 1801 }
1782#endif 1802#endif
1783 } 1803#if ENABLE_FRILLS
1784} 1804 if (option (Opt_urgentOnBell))
1805 set_urgency (0);
1806#endif
1785 1807
1786void 1808 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1809 }
1810}
1811
1812void ecb_cold
1787rxvt_term::focus_out () 1813rxvt_term::focus_out ()
1788{ 1814{
1789 if (focus) 1815 if (focus)
1790 { 1816 {
1791 focus = 0; 1817 focus = 0;
1792 want_refresh = 1; 1818 want_refresh = 1;
1793 1819
1794 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1820#if ENABLE_FRILLS
1795 1821 if (option (Opt_urgentOnBell))
1822 set_urgency (0);
1823#endif
1796#if ENABLE_FRILLS || ISO_14755 1824#if ENABLE_FRILLS || ISO_14755
1797 if (iso14755buf) 1825 if (iso14755buf)
1798 { 1826 {
1799 iso14755buf = 0; 1827 iso14755buf = 0;
1800# if ENABLE_OVERLAY 1828# if ISO_14755
1801 scr_overlay_off (); 1829 scr_overlay_off ();
1802# endif 1830# endif
1803 } 1831 }
1804#endif 1832#endif
1805#if USE_XIM 1833#if USE_XIM
1806 if (Input_Context != NULL) 1834 if (Input_Context != NULL)
1807 XUnsetICFocus (Input_Context); 1835 XUnsetICFocus (Input_Context);
1808#endif 1836#endif
1809#if CURSOR_BLINK 1837#if CURSOR_BLINK
1810 if (OPTION (Opt_cursorBlink)) 1838 if (option (Opt_cursorBlink))
1811 cursor_blink_ev.stop (); 1839 cursor_blink_ev.stop ();
1840
1812 hidden_cursor = 0; 1841 hidden_cursor = 0;
1813#endif 1842#endif
1814#if OFF_FOCUS_FADING 1843#if OFF_FOCUS_FADING
1815 if (rs[Rs_fade]) 1844 if (rs[Rs_fade])
1816 { 1845 {
1817 pix_colors = pix_colors_unfocused; 1846 pix_colors = pix_colors_unfocused;
1818 scr_recolour (); 1847 scr_recolour ();
1819 } 1848 }
1820#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])
1821 } 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
1822} 1866}
1823 1867
1824#if TRANSPARENT 1868#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1825void 1869void ecb_hot
1826rxvt_term::rootwin_cb (XEvent &ev) 1870rxvt_term::rootwin_cb (XEvent &ev)
1827{ 1871{
1828 SET_R (this); 1872 make_current ();
1829 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;
1830 1877
1831 switch (ev.type) 1878 switch (ev.type)
1832 { 1879 {
1833 case PropertyNotify: 1880 case PropertyNotify:
1834 /* 1881 /*
1835 * 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,
1836 * 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.
1837 */ 1884 */
1838 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1885 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1886 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1840 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 }
1841 1897
1842 /* FALLTHROUGH */
1843 case ReparentNotify:
1844 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1845 want_refresh = want_full_refresh = 1;
1846 break; 1898 break;
1847 } 1899 }
1900
1901 refresh_check ();
1848} 1902}
1849#endif 1903#endif
1850 1904
1851void 1905void
1852rxvt_term::button_press (XButtonEvent &ev) 1906rxvt_term::button_press (XButtonEvent &ev)
… …
1861 /* 1915 /*
1862 * VT window processing of button press 1916 * VT window processing of button press
1863 */ 1917 */
1864 if (ev.window == vt) 1918 if (ev.window == vt)
1865 { 1919 {
1920 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1921 return;
1922
1866#if ISO_14755 1923#if ISO_14755
1867 // 5.4 1924 // 5.4
1868 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1925 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1869 { 1926 {
1870 iso14755_54 (ev.x, ev.y); 1927 iso14755_54 (ev.x, ev.y);
… …
1880 /* save the xbutton state (for ButtonRelease) */ 1937 /* save the xbutton state (for ButtonRelease) */
1881 MEvent.state = ev.state; 1938 MEvent.state = ev.state;
1882#ifdef MOUSE_REPORT_DOUBLECLICK 1939#ifdef MOUSE_REPORT_DOUBLECLICK
1883 if (ev.button == MEvent.button && clickintime) 1940 if (ev.button == MEvent.button && clickintime)
1884 { 1941 {
1885 /* same button, within alloted time */ 1942 /* same button, within allowed time */
1886 MEvent.clicks++; 1943 MEvent.clicks++;
1887 1944
1888 if (MEvent.clicks > 1) 1945 if (MEvent.clicks > 1)
1889 { 1946 {
1890 /* only report double clicks */ 1947 /* only report double clicks */
… …
1904 mouse_report (ev); 1961 mouse_report (ev);
1905 } 1962 }
1906#else 1963#else
1907 MEvent.button = ev.button; 1964 MEvent.button = ev.button;
1908 mouse_report (ev); 1965 mouse_report (ev);
1909#endif /* MOUSE_REPORT_DOUBLECLICK */ 1966#endif /* MOUSE_REPORT_DOUBLECLICK */
1910 1967
1911 } 1968 }
1912 else 1969 else
1913 { 1970 {
1914 if (ev.button != MEvent.button) 1971 if (ev.button != MEvent.button)
1915 MEvent.clicks = 0; 1972 MEvent.clicks = 0;
1916 1973
1917 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1918 switch (ev.button) 1974 switch (ev.button)
1919 { 1975 {
1920 case Button1: 1976 case Button1:
1921 /* allow meta + click to select rectangular areas */ 1977 /* allow meta + click to select rectangular areas */
1922 /* should be done in screen.C */ 1978 /* should be done in screen.C */
1923#if ENABLE_FRILLS 1979#if ENABLE_FRILLS
1924 selection.rect = !!(ev.state & ModMetaMask); 1980 selection.rect = !!(ev.state & ModMetaMask);
1925#else 1981#else
1926 selection.rect = false; 1982 selection.rect = false;
1927#endif 1983#endif
1928 1984
1929 /* allow shift+left click to extend selection */ 1985 /* allow shift+left click to extend selection */
1930 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1986 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1931 { 1987 {
1932 if (MEvent.button == Button1 && clickintime) 1988 if (MEvent.button == Button1 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1989 selection_rotate (ev.x, ev.y);
1934 else 1990 else
1935 selection_extend (ev.x, ev.y, 1); 1991 selection_extend (ev.x, ev.y, 1);
1936 } 1992 }
1937 else 1993 else
1938 { 1994 {
1939 if (MEvent.button == Button1 && clickintime) 1995 if (MEvent.button == Button1 && clickintime)
1940 MEvent.clicks++; 1996 MEvent.clicks++;
1941 else 1997 else
1942 MEvent.clicks = 1; 1998 MEvent.clicks = 1;
1943 1999
1944 selection_click (MEvent.clicks, ev.x, ev.y); 2000 selection_click (MEvent.clicks, ev.x, ev.y);
1945 } 2001 }
1946 2002
1947 MEvent.button = Button1; 2003 MEvent.button = Button1;
1948 break; 2004 break;
1949 2005
1950 case Button3: 2006 case Button3:
1951 if (MEvent.button == Button3 && clickintime) 2007 if (MEvent.button == Button3 && clickintime)
1952 selection_rotate (ev.x, ev.y); 2008 selection_rotate (ev.x, ev.y);
1953 else 2009 else
1954 selection_extend (ev.x, ev.y, 1); 2010 selection_extend (ev.x, ev.y, 1);
1955 2011
1956 MEvent.button = Button3; 2012 MEvent.button = Button3;
1957 break; 2013 break;
1958 } 2014 }
1959 } 2015 }
1960 2016
1961 MEvent.time = ev.time; 2017 MEvent.time = ev.time;
1962 return; 2018 return;
1963 } 2019 }
1964 2020
1965 /* 2021 /*
1966 * Scrollbar window processing of button press 2022 * Scrollbar window processing of button press
1967 */ 2023 */
1968 if (isScrollbarWindow (ev.window)) 2024 if (scrollBar.state && ev.window == scrollBar.win)
1969 { 2025 {
1970 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;
1971 /* 2034 /*
1972 * Rxvt-style scrollbar: 2035 * Rxvt-style scrollbar:
1973 * move up if mouse is above slider 2036 * move up if mouse is above slider
1974 * move dn if mouse is below slider 2037 * move dn if mouse is below slider
1975 * 2038 *
… …
1984 /* 2047 /*
1985 * Mouse report disabled scrollbar: 2048 * Mouse report disabled scrollbar:
1986 * arrow buttons - send up/down 2049 * arrow buttons - send up/down
1987 * click on scrollbar - send pageup/down 2050 * click on scrollbar - send pageup/down
1988 */ 2051 */
1989 if ((scrollBar.style == R_SB_NEXT 2052 if (direction == UP)
1990 && scrollbarnext_upButton (ev.y))
1991 || (scrollBar.style == R_SB_RXVT
1992 && scrollbarrxvt_upButton (ev.y)))
1993 tt_printf ("\033[A"); 2053 tt_printf ("\033[A");
1994 else if ((scrollBar.style == R_SB_NEXT 2054 else if (direction == DN)
1995 && scrollbarnext_dnButton (ev.y))
1996 || (scrollBar.style == R_SB_RXVT
1997 && scrollbarrxvt_dnButton (ev.y)))
1998 tt_printf ("\033[B"); 2055 tt_printf ("\033[B");
1999 else 2056 else
2000 switch (ev.button) 2057 switch (ev.button)
2001 { 2058 {
2002 case Button2: 2059 case Button2:
… …
2009 tt_printf ("\033[5~"); 2066 tt_printf ("\033[5~");
2010 break; 2067 break;
2011 } 2068 }
2012 } 2069 }
2013 else 2070 else
2014#endif /* NO_SCROLLBAR_REPORT */ 2071#endif /* NO_SCROLLBAR_REPORT */
2015
2016 {
2017 char upordown = 0;
2018
2019 if (scrollBar.style == R_SB_NEXT)
2020 { 2072 {
2021 if (scrollbarnext_upButton (ev.y)) 2073 if (direction != NO_DIR)
2022 upordown = -1; /* up */
2023 else if (scrollbarnext_dnButton (ev.y))
2024 upordown = 1; /* down */
2025 }
2026 else if (scrollBar.style == R_SB_RXVT)
2027 {
2028 if (scrollbarrxvt_upButton (ev.y))
2029 upordown = -1; /* up */
2030 else if (scrollbarrxvt_dnButton (ev.y))
2031 upordown = 1; /* down */
2032 }
2033 if (upordown)
2034 { 2074 {
2035#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2075#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2076 if (!cont_scroll_ev.is_active ())
2036 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2077 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2037#endif 2078#endif
2038 if (scr_page (upordown < 0 ? UP : DN, 1)) 2079 if (scr_page (direction, 1))
2039 { 2080 {
2040 if (upordown < 0) 2081 if (direction == UP)
2041 scrollBar.setUp (); 2082 scrollBar.state = SB_STATE_UP;
2042 else 2083 else
2043 scrollBar.setDn (); 2084 scrollBar.state = SB_STATE_DOWN;
2044 } 2085 }
2045 } 2086 }
2046 else 2087 else
2047 switch (ev.button) 2088 switch (ev.button)
2048 { 2089 {
2049 case Button2: 2090 case Button2:
2050 switch (scrollbar_align) 2091 switch (scrollBar.align)
2051 { 2092 {
2052 case R_SB_ALIGN_TOP: 2093 case SB_ALIGN_TOP:
2053 csrO = 0; 2094 csrO = 0;
2054 break; 2095 break;
2055 case R_SB_ALIGN_CENTRE: 2096 case SB_ALIGN_CENTRE:
2056 csrO = (scrollBar.bot - scrollBar.top) / 2; 2097 csrO = (scrollBar.bot - scrollBar.top) / 2;
2057 break; 2098 break;
2058 case R_SB_ALIGN_BOTTOM: 2099 case SB_ALIGN_BOTTOM:
2059 csrO = scrollBar.bot - scrollBar.top; 2100 csrO = scrollBar.bot - scrollBar.top;
2060 break; 2101 break;
2061 } 2102 }
2062 2103
2063 if (scrollBar.style == R_SB_XTERM 2104 if (scrollBar.style == SB_STYLE_XTERM
2064 || scrollbar_above_slider (ev.y) 2105 || scrollBar.above_slider (ev.y)
2065 || scrollbar_below_slider (ev.y)) 2106 || scrollBar.below_slider (ev.y))
2066 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2107 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2067 2108
2068 scrollBar.setMotion (); 2109 scrollBar.state = SB_STATE_MOTION;
2069 break; 2110 break;
2070 2111
2071 case Button1: 2112 case Button1:
2072 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2113 if (scrollBar.align == SB_ALIGN_CENTRE)
2073 csrO = ev.y - scrollBar.top; 2114 csrO = ev.y - scrollBar.top;
2074 /* FALLTHROUGH */ 2115 /* FALLTHROUGH */
2075 2116
2076 case Button3: 2117 case Button3:
2077 if (scrollBar.style != R_SB_XTERM) 2118 if (scrollBar.style != SB_STYLE_XTERM)
2078 { 2119 {
2079 if (scrollbar_above_slider (ev.y)) 2120 if (scrollBar.above_slider (ev.y))
2080# ifdef RXVT_SCROLL_FULL 2121# ifdef RXVT_SCROLL_FULL
2081 scr_page (UP, nrow - 1); 2122 scr_page (UP, nrow - 1);
2082# else 2123# else
2083 scr_page (UP, nrow / 4); 2124 scr_page (UP, nrow / 4);
2084# endif 2125# endif
2085 else if (scrollbar_below_slider (ev.y)) 2126 else if (scrollBar.below_slider (ev.y))
2086# ifdef RXVT_SCROLL_FULL 2127# ifdef RXVT_SCROLL_FULL
2087 scr_page (DN, nrow - 1); 2128 scr_page (DN, nrow - 1);
2088# else 2129# else
2089 scr_page (DN, nrow / 4); 2130 scr_page (DN, nrow / 4);
2090# endif 2131# endif
2091 else 2132 else
2092 scrollBar.setMotion (); 2133 scrollBar.state = SB_STATE_MOTION;
2093 } 2134 }
2094 else 2135 else
2095 { 2136 {
2096 scr_page ((ev.button == Button1 ? DN : UP), 2137 scr_page ((ev.button == Button1 ? DN : UP),
2097 (nrow 2138 (nrow
2098 * scrollbar_position (ev.y) 2139 * scrollBar.position (ev.y)
2099 / scrollbar_size ())); 2140 / scrollBar.size ()));
2100 } 2141 }
2101 2142
2102 break; 2143 break;
2103 } 2144 }
2104 } 2145 }
2105 2146
2106 return; 2147 return;
2107 } 2148 }
2108
2109#if MENUBAR
2110 /*
2111 * Menubar window processing of button press
2112 */
2113 if (isMenuBarWindow (ev.window))
2114 menubar_control (ev);
2115#endif
2116} 2149}
2117 2150
2118void 2151void
2119rxvt_term::button_release (XButtonEvent &ev) 2152rxvt_term::button_release (XButtonEvent &ev)
2120{ 2153{
… …
2122 2155
2123 csrO = 0; /* reset csr Offset */ 2156 csrO = 0; /* reset csr Offset */
2124 if (!bypass_keystate) 2157 if (!bypass_keystate)
2125 reportmode = !! (priv_modes & PrivMode_mouse_report); 2158 reportmode = !! (priv_modes & PrivMode_mouse_report);
2126 2159
2127 if (scrollbar_isUpDn ()) 2160 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2128 { 2161 {
2129 scrollBar.setIdle (); 2162 scrollBar.state = SB_STATE_IDLE;
2130 scrollbar_show (0); 2163 scrollBar.show (0);
2131#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2132 refresh_type &= ~SMOOTH_REFRESH;
2133#endif
2134 } 2164 }
2135 2165
2136#ifdef SELECTION_SCROLLING 2166#ifdef SELECTION_SCROLLING
2137 if (sel_scroll_ev.active)
2138 sel_scroll_ev.stop(); 2167 sel_scroll_ev.stop();
2139#endif 2168#endif
2140 2169
2141 if (ev.window == vt) 2170 if (ev.window == vt)
2142 { 2171 {
2172 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2173 return;
2174
2143#if ISO_14755 2175#if ISO_14755
2144 // 5.4 2176 // 5.4
2145 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2177 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2146 return; 2178 return;
2147#endif 2179#endif
2180
2148 if (reportmode) 2181 if (reportmode)
2149 { 2182 {
2150 /* mouse report from vt window */ 2183 /* mouse report from vt window */
2151 /* don't report release of wheel "buttons" */ 2184 /* don't report release of wheel "buttons" */
2152 if (ev.button >= 4) 2185 if (ev.button >= 4)
… …
2163 mouse_report (ev); 2196 mouse_report (ev);
2164 } 2197 }
2165#else /* MOUSE_REPORT_DOUBLECLICK */ 2198#else /* MOUSE_REPORT_DOUBLECLICK */
2166 MEvent.button = AnyButton; 2199 MEvent.button = AnyButton;
2167 mouse_report (ev); 2200 mouse_report (ev);
2168#endif /* MOUSE_REPORT_DOUBLECLICK */ 2201#endif /* MOUSE_REPORT_DOUBLECLICK */
2169 return; 2202 return;
2170 } 2203 }
2171 2204
2172 /* 2205 /*
2173 * dumb hack to compensate for the failure of click-and-drag 2206 * dumb hack to compensate for the failure of click-and-drag
… …
2176 if (priv_modes & PrivMode_mouse_report 2209 if (priv_modes & PrivMode_mouse_report
2177 && bypass_keystate 2210 && bypass_keystate
2178 && ev.button == Button1 && MEvent.clicks <= 1) 2211 && ev.button == Button1 && MEvent.clicks <= 1)
2179 selection_extend (ev.x, ev.y, 0); 2212 selection_extend (ev.x, ev.y, 0);
2180 2213
2181 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2182 return;
2183
2184 switch (ev.button) 2214 switch (ev.button)
2185 { 2215 {
2186 case Button1: 2216 case Button1:
2187 case Button3: 2217 case Button3:
2188 selection_make (ev.time); 2218 selection_make (ev.time);
2189 break; 2219 break;
2220
2190 case Button2: 2221 case Button2:
2191 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);
2192 break; 2224 break;
2225
2193#ifdef MOUSE_WHEEL 2226#ifdef MOUSE_WHEEL
2194 case Button4: 2227 case Button4:
2195 case Button5: 2228 case Button5:
2196 { 2229 {
2197 int i; 2230 int lines;
2198 page_dirn v; 2231 page_dirn dirn;
2199 2232
2200 v = ev.button == Button4 ? UP : DN; 2233 dirn = ev.button == Button4 ? UP : DN;
2201 2234
2202 if (ev.state & ShiftMask) 2235 if (ev.state & ShiftMask)
2203 i = 1; 2236 lines = 1;
2204 else if (OPTION (Opt_mouseWheelScrollPage)) 2237 else if (option (Opt_mouseWheelScrollPage))
2205 i = nrow - 1; 2238 lines = nrow - 1;
2206 else 2239 else
2207 i = 5; 2240 lines = 5;
2208 2241
2209# ifdef MOUSE_SLIP_WHEELING 2242# ifdef MOUSE_SLIP_WHEELING
2210 if (ev.state & ControlMask) 2243 if (ev.state & ControlMask)
2211 { 2244 {
2212 mouse_slip_wheel_speed += v ? -1 : 1; 2245 mouse_slip_wheel_speed += dirn;
2213 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2246 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2214 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2215 2247
2216 if (slip_wheel_ev.at < NOW) 2248 if (!slip_wheel_ev.is_active ())
2217 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2249 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2218
2219 slip_wheel_ev.start ();
2220 } 2250 }
2221 else 2251 else
2252# endif
2222 { 2253 {
2223# endif
2224 scr_page (v, i); 2254 scr_page (dirn, lines);
2225 scrollbar_show (1); 2255 scrollBar.show (1);
2226# ifdef MOUSE_SLIP_WHEELING
2227 } 2256 }
2228# endif
2229 } 2257 }
2230 break; 2258 break;
2231#endif 2259#endif
2232 } 2260 }
2233 } 2261 }
2234#ifdef MENUBAR
2235 else if (isMenuBarWindow (ev.window))
2236 menubar_control (ev);
2237#endif
2238} 2262}
2239
2240#ifdef TRANSPARENT
2241#if TINTING
2242/* taken from aterm-0.4.2 */
2243
2244typedef uint32_t RUINT32T;
2245
2246void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2247{
2248 int sh_r, sh_g, sh_b;
2249 RUINT32T mask_r, mask_g, mask_b;
2250 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2251 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2252 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2253 int i;
2254
2255 Visual *visual = display->visual;
2256
2257 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2258
2259 /* for convenience */
2260 mask_r = visual->red_mask;
2261 mask_g = visual->green_mask;
2262 mask_b = visual->blue_mask;
2263
2264 /* boring lookup table pre-initialization */
2265 switch (srcImage->bits_per_pixel) {
2266 case 15:
2267 if ((mask_r != 0x7c00) ||
2268 (mask_g != 0x03e0) ||
2269 (mask_b != 0x001f))
2270 return;
2271 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2272 lookup_r = lookup;
2273 lookup_g = lookup+32;
2274 lookup_b = lookup+32+32;
2275 sh_r = 10;
2276 sh_g = 5;
2277 sh_b = 0;
2278 break;
2279 case 16:
2280 if ((mask_r != 0xf800) ||
2281 (mask_g != 0x07e0) ||
2282 (mask_b != 0x001f))
2283 return;
2284 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2285 lookup_r = lookup;
2286 lookup_g = lookup+32;
2287 lookup_b = lookup+32+64;
2288 sh_r = 11;
2289 sh_g = 5;
2290 sh_b = 0;
2291 break;
2292 case 24:
2293 if ((mask_r != 0xff0000) ||
2294 (mask_g != 0x00ff00) ||
2295 (mask_b != 0x0000ff))
2296 return;
2297 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2298 lookup_r = lookup;
2299 lookup_g = lookup+256;
2300 lookup_b = lookup+256+256;
2301 sh_r = 16;
2302 sh_g = 8;
2303 sh_b = 0;
2304 break;
2305 case 32:
2306 if ((mask_r != 0xff0000) ||
2307 (mask_g != 0x00ff00) ||
2308 (mask_b != 0x0000ff))
2309 return;
2310 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2311 lookup_r = lookup;
2312 lookup_g = lookup+256;
2313 lookup_b = lookup+256+256;
2314 sh_r = 16;
2315 sh_g = 8;
2316 sh_b = 0;
2317 break;
2318 default:
2319 return; /* we do not support this color depth */
2320 }
2321
2322 /* prepare limits for color transformation (each channel is handled separately) */
2323 if (shade < 0) {
2324 shade = -shade;
2325 if (shade < 0) shade = 0;
2326 if (shade > 100) shade = 100;
2327
2328 lower_lim_r = 65535-rm;
2329 lower_lim_g = 65535-gm;
2330 lower_lim_b = 65535-bm;
2331
2332 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2333 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2334 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2335
2336 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2337 } else {
2338 if (shade < 0) shade = 0;
2339 if (shade > 100) shade = 100;
2340
2341 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2342
2343 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2344 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2345 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2346 }
2347
2348 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2349 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2350 {
2351 unsigned int tmp;
2352
2353 tmp = lower_lim_r;
2354 lower_lim_r = lower_lim_b;
2355 lower_lim_b = tmp;
2356
2357 tmp = upper_lim_r;
2358 upper_lim_r = upper_lim_b;
2359 upper_lim_b = tmp;
2360 }
2361
2362 /* fill our lookup tables */
2363 for (i = 0; i <= mask_r>>sh_r; i++)
2364 {
2365 RUINT32T tmp;
2366 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2367 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2368 lookup_r[i] = (tmp/65535)<<sh_r;
2369 }
2370 for (i = 0; i <= mask_g>>sh_g; i++)
2371 {
2372 RUINT32T tmp;
2373 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2374 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2375 lookup_g[i] = (tmp/65535)<<sh_g;
2376 }
2377 for (i = 0; i <= mask_b>>sh_b; i++)
2378 {
2379 RUINT32T tmp;
2380 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2381 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2382 lookup_b[i] = (tmp/65535)<<sh_b;
2383 }
2384
2385 /* apply table to input image (replacing colors by newly calculated ones) */
2386 switch (srcImage->bits_per_pixel)
2387 {
2388 case 15:
2389 {
2390 unsigned short *p1, *pf, *p, *pl;
2391 p1 = (unsigned short *) srcImage->data;
2392 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2393 while (p1 < pf)
2394 {
2395 p = p1;
2396 pl = p1 + srcImage->width;
2397 for (; p < pl; p++)
2398 {
2399 *p = lookup_r[(*p & 0x7c00)>>10] |
2400 lookup_g[(*p & 0x03e0)>> 5] |
2401 lookup_b[(*p & 0x001f)];
2402 }
2403 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2404 }
2405 break;
2406 }
2407 case 16:
2408 {
2409 unsigned short *p1, *pf, *p, *pl;
2410 p1 = (unsigned short *) srcImage->data;
2411 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2412 while (p1 < pf)
2413 {
2414 p = p1;
2415 pl = p1 + srcImage->width;
2416 for (; p < pl; p++)
2417 {
2418 *p = lookup_r[(*p & 0xf800)>>11] |
2419 lookup_g[(*p & 0x07e0)>> 5] |
2420 lookup_b[(*p & 0x001f)];
2421 }
2422 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2423 }
2424 break;
2425 }
2426 case 24:
2427 {
2428 unsigned char *p1, *pf, *p, *pl;
2429 p1 = (unsigned char *) srcImage->data;
2430 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2431 while (p1 < pf)
2432 {
2433 p = p1;
2434 pl = p1 + srcImage->width * 3;
2435 for (; p < pl; p += 3)
2436 {
2437 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2438 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2439 p[2] = lookup_r[(p[2] & 0x0000ff)];
2440 }
2441 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2442 }
2443 break;
2444 }
2445 case 32:
2446 {
2447 RUINT32T *p1, *pf, *p, *pl;
2448 p1 = (RUINT32T *) srcImage->data;
2449 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2450
2451 while (p1 < pf)
2452 {
2453 p = p1;
2454 pl = p1 + srcImage->width;
2455 for (; p < pl; p++)
2456 {
2457 *p = lookup_r[(*p & 0xff0000)>>16] |
2458 lookup_g[(*p & 0x00ff00)>> 8] |
2459 lookup_b[(*p & 0x0000ff)] |
2460 (*p & ~0xffffff);
2461 }
2462 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2463 }
2464 break;
2465 }
2466 }
2467
2468 free (lookup);
2469}
2470#endif
2471
2472/*
2473 * Check our parents are still who we think they are.
2474 * Do transparency updates if required
2475 */
2476int
2477rxvt_term::check_our_parents ()
2478{
2479 int i, pchanged, aformat, have_pixmap, rootdepth;
2480 unsigned long nitems, bytes_after;
2481 Atom atype;
2482 unsigned char *prop = NULL;
2483 Window root, oldp, *list;
2484 Pixmap rootpixmap = None;
2485 XWindowAttributes wattr, wrootattr;
2486 dDisp;
2487
2488 pchanged = 0;
2489
2490 if (!OPTION (Opt_transparent))
2491 return pchanged; /* Don't try any more */
2492
2493 XGetWindowAttributes (disp, display->root, &wrootattr);
2494 rootdepth = wrootattr.depth;
2495
2496 XGetWindowAttributes (disp, parent[0], &wattr);
2497
2498 if (rootdepth != wattr.depth)
2499 {
2500 if (am_transparent)
2501 {
2502 pchanged = 1;
2503 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2504 am_transparent = am_pixmap_trans = 0;
2505 }
2506
2507 return pchanged; /* Don't try any more */
2508 }
2509
2510 /* Get all X ops out of the queue so that our information is up-to-date. */
2511 XSync (disp, False);
2512
2513 /*
2514 * Make the frame window set by the window manager have
2515 * the root background. Some window managers put multiple nested frame
2516 * windows for each client, so we have to take care about that.
2517 */
2518 i = (xa[XA_XROOTPMAP_ID]
2519 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2520 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2521 &nitems, &bytes_after, &prop) == Success);
2522
2523 if (!i || prop == NULL)
2524 i = (xa[XA_ESETROOT_PMAP_ID]
2525 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2526 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2527 &nitems, &bytes_after, &prop) == Success);
2528
2529 if (!i || prop == NULL
2530#if TINTING
2531 || !rs[Rs_color + Color_tint]
2532#endif
2533 )
2534 have_pixmap = 0;
2535 else
2536 {
2537 have_pixmap = 1;
2538 rootpixmap = *(Pixmap *)prop;
2539 XFree (prop);
2540 }
2541
2542 if (have_pixmap)
2543 {
2544 /*
2545 * Copy display->root pixmap transparency
2546 */
2547 int sx, sy, nx, ny;
2548 unsigned int nw, nh;
2549 Window cr;
2550 XImage *image;
2551 GC gc;
2552 XGCValues gcvalue;
2553
2554 XTranslateCoordinates (disp, parent[0], display->root,
2555 0, 0, &sx, &sy, &cr);
2556 nw = (unsigned int)szHint.width;
2557 nh = (unsigned int)szHint.height;
2558 nx = ny = 0;
2559
2560 if (sx < 0)
2561 {
2562 nw += sx;
2563 nx = -sx;
2564 sx = 0;
2565 }
2566
2567 if (sy < 0)
2568 {
2569 nh += sy;
2570 ny = -sy;
2571 sy = 0;
2572 }
2573
2574 min_it (nw, (unsigned int) (wrootattr.width - sx));
2575 min_it (nh, (unsigned int) (wrootattr.height - sy));
2576
2577 XSync (disp, False);
2578 allowedxerror = -1;
2579 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2580
2581 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2582 /* XXX: may need a delay here? */
2583 allowedxerror = 0;
2584
2585 if (image == NULL)
2586 {
2587 if (am_transparent && am_pixmap_trans)
2588 {
2589 pchanged = 1;
2590 if (pixmap != None)
2591 {
2592 XFreePixmap (disp, pixmap);
2593 pixmap = None;
2594 }
2595 }
2596
2597 am_pixmap_trans = 0;
2598 }
2599 else
2600 {
2601 if (pixmap != None)
2602 XFreePixmap (disp, pixmap);
2603
2604#if TINTING
2605 if (ISSET_PIXCOLOR (Color_tint))
2606 {
2607 unsigned short rm, gm, bm;
2608 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2609
2610 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2611
2612 ShadeXImage (display, image, shade, rm, gm, bm);
2613 }
2614#endif
2615
2616 pixmap = XCreatePixmap (disp, vt,
2617 szHint.width, szHint.height, image->depth);
2618 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2619 XPutImage (disp, pixmap, gc, image, 0, 0,
2620 nx, ny, image->width, image->height);
2621 XFreeGC (disp, gc);
2622 XDestroyImage (image);
2623 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2624 XClearWindow (disp, parent[0]);
2625
2626 if (!am_transparent || !am_pixmap_trans)
2627 pchanged = 1;
2628
2629 am_transparent = am_pixmap_trans = 1;
2630 }
2631 }
2632
2633 if (am_pixmap_trans)
2634 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2635 else
2636 {
2637 unsigned int n;
2638 /*
2639 * InheritPixmap transparency
2640 */
2641 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2642 {
2643 oldp = parent[i];
2644 XQueryTree (disp, parent[i - 1], &root,
2645 &parent[i], &list, &n);
2646 XFree (list);
2647
2648 if (parent[i] == display->root)
2649 {
2650 if (oldp != None)
2651 pchanged = 1;
2652
2653 break;
2654 }
2655
2656 if (oldp != parent[i])
2657 pchanged = 1;
2658 }
2659
2660 n = 0;
2661
2662 if (pchanged)
2663 {
2664 for (; n < (unsigned int)i; n++)
2665 {
2666 XGetWindowAttributes (disp, parent[n], &wattr);
2667 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2668 {
2669 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2670 break;
2671 }
2672 }
2673 }
2674
2675 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2676 {
2677 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2678 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2679 am_transparent = 0;
2680 /* XXX: also turn off Opt_transparent? */
2681 }
2682 else
2683 {
2684#if WAIT_FOR_WM
2685 /* wait (an arbitrary period) for the WM to do its thing
2686 * needed for fvwm2.2.2 (and before?) */
2687 sleep (1);
2688#endif
2689 for (n = 0; n < (unsigned int)i; n++)
2690 {
2691 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2692 XClearWindow (disp, parent[n]);
2693 }
2694
2695 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2696 am_transparent = 1;
2697 }
2698
2699 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2700 parent[i] = None;
2701 }
2702
2703 if (scrollBar.win)
2704 {
2705 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2706 scrollBar.setIdle ();
2707 scrollbar_show (0);
2708 }
2709
2710 if (am_transparent)
2711 {
2712 want_refresh = want_full_refresh = 1;
2713 if (am_pixmap_trans)
2714 flush ();
2715 }
2716
2717 return pchanged;
2718}
2719#endif
2720 2263
2721/*}}} */ 2264/*}}} */
2722 2265
2723bool 2266void ecb_hot
2724rxvt_term::cmd_parse () 2267rxvt_term::cmd_parse ()
2725{ 2268{
2726 bool flag = false;
2727 wchar_t ch = NOCHAR; 2269 wchar_t ch = NOCHAR;
2728 char *seq_begin; // remember start of esc-sequence here 2270 char *seq_begin; // remember start of esc-sequence here
2729 2271
2730 for (;;) 2272 for (;;)
2731 { 2273 {
2732 if (ch == NOCHAR) 2274 if (ecb_unlikely (ch == NOCHAR))
2733 { 2275 {
2734 seq_begin = cmdbuf_ptr; 2276 seq_begin = cmdbuf_ptr;
2735 ch = next_char (); 2277 ch = next_char ();
2736 2278
2737 if (ch == NOCHAR) 2279 if (ch == NOCHAR)
2738 break; 2280 break;
2739 } 2281 }
2740 2282
2741 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))
2742 { 2284 {
2743 if (!seen_input) 2285 if (ecb_unlikely (!seen_input))
2744 { 2286 {
2745 seen_input = 1; 2287 seen_input = 1;
2746 // many badly-written programs (e.g. jed) contain a race condition: 2288 // many badly-written programs (e.g. jed) contain a race condition:
2747 // they first read the screensize and then install a SIGWINCH handler. 2289 // they first read the screensize and then install a SIGWINCH handler.
2748 // some window managers resize the window early, and these programs 2290 // some window managers resize the window early, and these programs
… …
2761 wchar_t *str = buf; 2303 wchar_t *str = buf;
2762 wchar_t *eol = str + min (ncol, UBUFSIZ); 2304 wchar_t *eol = str + min (ncol, UBUFSIZ);
2763 2305
2764 for (;;) 2306 for (;;)
2765 { 2307 {
2766 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)))
2767 break; 2309 break;
2768 2310
2769 *str++ = ch; 2311 *str++ = ch;
2770 2312
2771 if (ch == C0_LF || str >= eol) 2313 if (ecb_unlikely (ch == C0_LF || str >= eol))
2772 { 2314 {
2773 if (ch == C0_LF) 2315 if (ch == C0_LF)
2774 nlines++; 2316 nlines++;
2775 2317
2776 refresh_count++; 2318 refresh_count++;
2777 2319
2778 if (!OPTION (Opt_jumpScroll) 2320 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2779 || (refresh_count >= refresh_limit * (nrow - 1)))
2780 { 2321 {
2781 refreshnow = true;
2782 refresh_count = 0; 2322 refresh_count = 0;
2323
2324 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2325 {
2326 refreshnow = true;
2783 ch = NOCHAR; 2327 ch = NOCHAR;
2784 break; 2328 break;
2329 }
2785 } 2330 }
2786 2331
2787 // scr_add_lines only works for nlines <= nrow - 1. 2332 // scr_add_lines only works for nlines <= nrow - 1.
2788 if (nlines >= nrow - 1) 2333 if (nlines >= nrow - 1)
2789 { 2334 {
2335 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2790 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2336 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2791 scr_add_lines (buf, str - buf, nlines); 2337 scr_add_lines (buf, str - buf, nlines);
2792 2338
2793 nlines = 0; 2339 nlines = 0;
2794 str = buf; 2340 str = buf;
2795 eol = str + min (ncol, UBUFSIZ); 2341 eol = str + min (ncol, UBUFSIZ);
… …
2810 2356
2811 seq_begin = cmdbuf_ptr; 2357 seq_begin = cmdbuf_ptr;
2812 ch = next_char (); 2358 ch = next_char ();
2813 } 2359 }
2814 2360
2361 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2815 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2362 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2816 scr_add_lines (buf, str - buf, nlines); 2363 scr_add_lines (buf, str - buf, nlines);
2817 2364
2818 /* 2365 /*
2819 * 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
2820 * 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.
2821 * the number of pages between refreshes is refresh_limit, which 2368 * if skipScroll is enabled.
2822 * is incremented here because we must be doing flat-out scrolling.
2823 */ 2369 */
2824 if (refreshnow) 2370 if (refreshnow)
2825 { 2371 {
2826 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2827 refresh_limit++;
2828 else
2829 {
2830 flag = true;
2831 scr_refresh (refresh_type); 2372 scr_refresh ();
2832 want_refresh = 1; 2373 want_refresh = 1;
2833 }
2834 } 2374 }
2835
2836 } 2375 }
2837 else 2376 else
2838 { 2377 {
2839 try 2378 try
2840 { 2379 {
… …
2848 } 2387 }
2849 2388
2850 ch = NOCHAR; 2389 ch = NOCHAR;
2851 } 2390 }
2852 } 2391 }
2853
2854 return flag;
2855} 2392}
2856 2393
2857// read the next character 2394// read the next character
2858wchar_t 2395wchar_t ecb_hot
2859rxvt_term::next_char () 2396rxvt_term::next_char () NOTHROW
2860{ 2397{
2861 while (cmdbuf_ptr < cmdbuf_endp) 2398 while (cmdbuf_ptr < cmdbuf_endp)
2862 { 2399 {
2863 // assume 7-bit to be ascii ALWAYS 2400 // assume 7-bit to be ascii ALWAYS
2864 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2401 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2865 return *cmdbuf_ptr++; 2402 return *cmdbuf_ptr++;
2866 2403
2867 wchar_t wc; 2404 wchar_t wc;
2868 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);
2869 2406
… …
2873 cmdbuf_ptr = cmdbuf_endp; 2410 cmdbuf_ptr = cmdbuf_endp;
2874 break; 2411 break;
2875 } 2412 }
2876 2413
2877 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.
2878 return (unsigned char)*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 }
2879 2421
2880 // assume wchar == unicode 2422 // assume wchar == unicode
2881 cmdbuf_ptr += len; 2423 cmdbuf_ptr += len;
2882 return wc & UNICODE_MASK; 2424 return wc & UNICODE_MASK;
2883 } 2425 }
2884 2426
2885 return NOCHAR; 2427 return NOCHAR;
2886} 2428}
2887 2429
2888// read the next octet 2430// read the next octet
2889uint32_t 2431uint32_t ecb_hot
2890rxvt_term::next_octet () 2432rxvt_term::next_octet () NOTHROW
2891{ 2433{
2892 return cmdbuf_ptr < cmdbuf_endp 2434 return cmdbuf_ptr < cmdbuf_endp
2893 ? (unsigned char)*cmdbuf_ptr++ 2435 ? (unsigned char)*cmdbuf_ptr++
2894 : NOCHAR; 2436 : NOCHAR;
2895} 2437}
2896 2438
2897/* rxvt_cmd_getc () - Return next input character */ 2439static class out_of_input out_of_input;
2898/* 2440
2899 * Return the next input character after first passing any keyboard input 2441wchar_t ecb_hot
2900 * to the command. 2442rxvt_term::cmd_getc () THROW ((class out_of_input))
2901 */
2902wchar_t
2903rxvt_term::cmd_getc ()
2904{ 2443{
2905 wchar_t c = next_char (); 2444 wchar_t c = next_char ();
2906 2445
2907 if (c == NOCHAR) 2446 if (c == NOCHAR)
2908 throw out_of_input; 2447 throw out_of_input;
2909 2448
2910 return c; 2449 return c;
2911} 2450}
2912 2451
2913uint32_t 2452uint32_t ecb_hot
2914rxvt_term::cmd_get8 () 2453rxvt_term::cmd_get8 () THROW ((class out_of_input))
2915{ 2454{
2916 uint32_t c = next_octet (); 2455 uint32_t c = next_octet ();
2917 2456
2918 if (c == NOCHAR) 2457 if (c == NOCHAR)
2919 throw out_of_input; 2458 throw out_of_input;
… …
2922} 2461}
2923 2462
2924/*{{{ print pipe */ 2463/*{{{ print pipe */
2925/*----------------------------------------------------------------------*/ 2464/*----------------------------------------------------------------------*/
2926#ifdef PRINTPIPE 2465#ifdef PRINTPIPE
2927FILE * 2466FILE * ecb_cold
2928rxvt_term::popen_printer () 2467rxvt_term::popen_printer ()
2929{ 2468{
2930 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2469 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2931 2470
2932 if (stream == NULL) 2471 if (stream == NULL)
2933 rxvt_warn ("can't open printer pipe, not printing.\n"); 2472 rxvt_warn ("can't open printer pipe, not printing.\n");
2934 2473
2935 return stream; 2474 return stream;
2936} 2475}
2937 2476
2938int 2477int ecb_cold
2939rxvt_term::pclose_printer (FILE *stream) 2478rxvt_term::pclose_printer (FILE *stream)
2940{ 2479{
2941 fflush (stream); 2480 fflush (stream);
2942 return pclose (stream); 2481 return pclose (stream);
2943} 2482}
2944 2483
2945/* 2484/*
2946 * simulate attached vt100 printer 2485 * simulate attached vt100 printer
2947 */ 2486 */
2948void 2487void ecb_cold
2949rxvt_term::process_print_pipe () 2488rxvt_term::process_print_pipe ()
2950{ 2489{
2951 int done; 2490 FILE *fd = popen_printer ();
2952 FILE *fd;
2953 2491
2954 if ((fd = popen_printer ()) == NULL) 2492 if (!fd)
2955 return; 2493 return;
2956 2494
2957 /* 2495 /*
2958 * 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
2959 * is received. 2497 * is received.
2960 */ 2498 */
2961 for (done = 0; !done;) 2499 for (int done = 0; !done; )
2962 { 2500 {
2963 unsigned char buf[8]; 2501 unsigned char buf[8];
2964 unicode_t ch; 2502 unicode_t ch;
2965 unsigned int i, len; 2503 unsigned int i, len;
2966 2504
… …
2985 { 2523 {
2986 if ((buf[len++] = cmd_getc ()) == 'i') 2524 if ((buf[len++] = cmd_getc ()) == 'i')
2987 break; /* done = 1 */ 2525 break; /* done = 1 */
2988 } 2526 }
2989 } 2527 }
2990 2528
2991 for (i = 0; i < len; i++) 2529 for (i = 0; i < len; i++)
2992 if (putc (buf[i], fd) == EOF) 2530 if (putc (buf[i], fd) == EOF)
2993 { 2531 {
2994 done = 1; 2532 done = 1;
2995 break; 2533 break;
… …
2997 } 2535 }
2998 } 2536 }
2999 2537
3000 pclose_printer (fd); 2538 pclose_printer (fd);
3001} 2539}
3002#endif /* PRINTPIPE */ 2540#endif /* PRINTPIPE */
3003/*}}} */ 2541/*}}} */
3004 2542
3005/* *INDENT-OFF* */
3006enum { 2543enum {
3007 C1_40 = 0x40, 2544 C1_40 = 0x40,
3008 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,
3009 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,
3010 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,
3011 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,
3012}; 2549};
3013/* *INDENT-ON* */
3014 2550
3015/*{{{ process non-printing single characters */ 2551/*{{{ process non-printing single characters */
3016void 2552void ecb_hot
3017rxvt_term::process_nonprinting (unicode_t ch) 2553rxvt_term::process_nonprinting (unicode_t ch)
3018{ 2554{
3019 switch (ch) 2555 switch (ch)
3020 { 2556 {
3021 case C0_ESC: 2557 case C0_ESC:
… …
3057 process_dcs_seq (); 2593 process_dcs_seq ();
3058 break; 2594 break;
3059 case 0x9b: /* CSI */ 2595 case 0x9b: /* CSI */
3060 process_csi_seq (); 2596 process_csi_seq ();
3061 break; 2597 break;
3062 case 0x9d: /* CSI */ 2598 case 0x9d: /* OSC */
3063 process_osc_seq (); 2599 process_osc_seq ();
3064 break; 2600 break;
3065#endif 2601#endif
3066 } 2602 }
3067} 2603}
3068/*}}} */ 2604/*}}} */
3069 2605
3070 2606
3071/*{{{ process VT52 escape sequences */ 2607/*{{{ process VT52 escape sequences */
3072void 2608void ecb_cold
3073rxvt_term::process_escape_vt52 (unicode_t ch) 2609rxvt_term::process_escape_vt52 (unicode_t ch)
3074{ 2610{
3075 int row, col; 2611 int row, col;
3076 2612
3077 switch (ch) 2613 switch (ch)
… …
3111 break; 2647 break;
3112 case 'Z': /* identify the terminal type */ 2648 case 'Z': /* identify the terminal type */
3113 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2649 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3114 break; 2650 break;
3115 case '<': /* turn off VT52 mode */ 2651 case '<': /* turn off VT52 mode */
3116 PrivMode (0, PrivMode_vt52); 2652 priv_modes &= ~PrivMode_vt52;
3117 break; 2653 break;
3118 case 'F': /* use special graphics character set */ 2654 case 'F': /* use special graphics character set */
3119 case 'G': /* use regular character set */ 2655 case 'G': /* use regular character set */
3120 /* unimplemented */ 2656 /* unimplemented */
3121 break; 2657 break;
… …
3127} 2663}
3128/*}}} */ 2664/*}}} */
3129 2665
3130 2666
3131/*{{{ process escape sequences */ 2667/*{{{ process escape sequences */
3132void 2668void ecb_hot
3133rxvt_term::process_escape_seq () 2669rxvt_term::process_escape_seq ()
3134{ 2670{
3135 unicode_t ch = cmd_getc (); 2671 unicode_t ch = cmd_getc ();
3136 2672
3137 if (priv_modes & PrivMode_vt52) 2673 if (priv_modes & PrivMode_vt52)
… …
3140 return; 2676 return;
3141 } 2677 }
3142 2678
3143 switch (ch) 2679 switch (ch)
3144 { 2680 {
3145 /* case 1: do_tek_mode (); break; */
3146 case '#': 2681 case '#':
3147 if (cmd_getc () == '8') 2682 if (cmd_getc () == '8')
3148 scr_E (); 2683 scr_E ();
3149 break; 2684 break;
3150 case '(': 2685 case '(':
… …
3157 scr_charset_set (2, (unsigned int)cmd_getc ()); 2692 scr_charset_set (2, (unsigned int)cmd_getc ());
3158 break; 2693 break;
3159 case '+': 2694 case '+':
3160 scr_charset_set (3, (unsigned int)cmd_getc ()); 2695 scr_charset_set (3, (unsigned int)cmd_getc ());
3161 break; 2696 break;
3162#if ENABLE_FRILLS 2697#if !ENABLE_MINIMAL
3163 case '6': 2698 case '6':
3164 scr_backindex (); 2699 scr_backindex ();
3165 break; 2700 break;
3166#endif 2701#endif
3167 case '7': 2702 case '7':
3168 scr_cursor (SAVE); 2703 scr_cursor (SAVE);
3169 break; 2704 break;
3170 case '8': 2705 case '8':
3171 scr_cursor (RESTORE); 2706 scr_cursor (RESTORE);
3172 break; 2707 break;
3173#if ENABLE_FRILLS 2708#if !ENABLE_MINIMAL
3174 case '9': 2709 case '9':
3175 scr_forwardindex (); 2710 scr_forwardindex ();
3176 break; 2711 break;
3177#endif 2712#endif
2713 // DECPAM/DECPNM
3178 case '=': 2714 case '=':
2715 priv_modes |= PrivMode_aplKP;
2716 break;
3179 case '>': 2717 case '>':
3180 PrivMode ((ch == '='), PrivMode_aplKP); 2718 priv_modes &= ~PrivMode_aplKP;
3181 break; 2719 break;
3182 2720
3183 case C1_40: 2721 case C1_40:
3184 cmd_getc (); 2722 cmd_getc ();
3185 break; 2723 break;
… …
3189 2727
3190 /* 8.3.87: NEXT LINE */ 2728 /* 8.3.87: NEXT LINE */
3191 case C1_NEL: /* ESC E */ 2729 case C1_NEL: /* ESC E */
3192 { 2730 {
3193 wchar_t nlcr[] = { C0_LF, C0_CR }; 2731 wchar_t nlcr[] = { C0_LF, C0_CR };
3194 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2732 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3195 } 2733 }
3196 break; 2734 break;
3197 2735
3198 /* kidnapped escape sequence: Should be 8.3.48 */ 2736 /* kidnapped escape sequence: Should be 8.3.48 */
3199 case C1_ESA: /* ESC G */ 2737 case C1_ESA: /* ESC G */
3200 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 */
3201 break; 2741 break;
3202 2742
3203 /* 8.3.63: CHARACTER TABULATION SET */ 2743 /* 8.3.63: CHARACTER TABULATION SET */
3204 case C1_HTS: /* ESC H */ 2744 case C1_HTS: /* ESC H */
3205 scr_set_tab (1); 2745 scr_set_tab (1);
… …
3209 case C1_RI: /* ESC M */ 2749 case C1_RI: /* ESC M */
3210 scr_index (DN); 2750 scr_index (DN);
3211 break; 2751 break;
3212 2752
3213 /* 8.3.142: SINGLE-SHIFT TWO */ 2753 /* 8.3.142: SINGLE-SHIFT TWO */
3214 /*case C1_SS2: scr_single_shift (2); break; */ 2754 /* case C1_SS2: break; */
3215 2755
3216 /* 8.3.143: SINGLE-SHIFT THREE */ 2756 /* 8.3.143: SINGLE-SHIFT THREE */
3217 /*case C1_SS3: scr_single_shift (3); break; */ 2757 /* case C1_SS3: break; */
3218 2758
3219 /* 8.3.27: DEVICE CONTROL STRING */ 2759 /* 8.3.27: DEVICE CONTROL STRING */
3220 case C1_DCS: /* ESC P */ 2760 case C1_DCS: /* ESC P */
3221 process_dcs_seq (); 2761 process_dcs_seq ();
3222 break; 2762 break;
… …
3224 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2764 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3225 case C1_SCI: /* ESC Z */ 2765 case C1_SCI: /* ESC Z */
3226 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2766 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3227 break; /* steal obsolete ESC [ c */ 2767 break; /* steal obsolete ESC [ c */
3228 2768
3229 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2769 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3230 case C1_CSI: /* ESC [ */ 2770 case C1_CSI: /* ESC [ */
3231 process_csi_seq (); 2771 process_csi_seq ();
3232 break; 2772 break;
3233 2773
3234 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2774 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3235 case C1_OSC: /* ESC ] */ 2775 case C1_OSC: /* ESC ] */
3236 process_osc_seq (); 2776 process_osc_seq ();
3237 break; 2777 break;
3238 2778
3239 /* 8.3.106: RESET TO INITIAL STATE */ 2779 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3240 case 'c': 2780 case 'c':
3241 mbstate.reset (); 2781 mbstate.reset ();
3242 scr_poweron (); 2782 scr_poweron ();
3243 scrollbar_show (1); 2783 scrollBar.show (1);
3244 break; 2784 break;
3245 2785
3246 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2786 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3247 case 'n': 2787 case 'n':
3248 scr_charset_choose (2); 2788 scr_charset_choose (2);
… …
3255 } 2795 }
3256} 2796}
3257/*}}} */ 2797/*}}} */
3258 2798
3259/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2799/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3260/* *INDENT-OFF* */
3261enum { 2800enum {
3262 CSI_ICH = 0x40, 2801 CSI_ICH = 0x40,
3263 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,
3264 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 ,
3265 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,
… …
3268 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,
3269 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 ,
3270 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
3271}; 2810};
3272 2811
3273#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2812#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3274 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2813 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3275 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2814 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3276#define get_byte_array_bit(array, bit) \ 2815#define get_byte_array_bit(array, bit) \
3277 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2816 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3278 2817
3279const unsigned char csi_defaults[] = 2818static const unsigned char csi_defaults[] =
3280 { 2819 {
3281 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, */
3282 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, */
3283 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, */
3284 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, [, \, ], ^, _, */
3285 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, */
3286 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, */
3287 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, */
3288 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, {, |, }, ~, */
3289 }; 2828 };
3290/* *INDENT-ON* */
3291 2829
3292void 2830void ecb_hot
3293rxvt_term::process_csi_seq () 2831rxvt_term::process_csi_seq ()
3294{ 2832{
3295 unicode_t ch, priv, i; 2833 unicode_t ch, priv, prev_ch, i;
3296 unsigned int nargs, p; 2834 unsigned int nargs, p;
3297 int n, ndef; 2835 int n, ndef;
3298 int arg[ESC_ARGS]; 2836 int arg[ESC_ARGS] = { };
3299 2837
3300 for (nargs = ESC_ARGS; nargs > 0;) 2838 nargs = 0;
3301 arg[--nargs] = 0;
3302 2839
3303 priv = 0; 2840 priv = 0;
3304 ch = cmd_getc (); 2841 ch = cmd_getc ();
3305 if (ch >= '<' && ch <= '?') 2842 if ((ch >= '<' && ch <= '?') || ch == '!')
2843 {
3306 { /* '<' '=' '>' '?' */ 2844 /* '<' '=' '>' '?' '!' */
3307 priv = ch; 2845 priv = ch;
3308 ch = cmd_getc (); 2846 ch = cmd_getc ();
3309 } 2847 }
3310 2848
2849 prev_ch = 0;
3311 /* read any numerical arguments */ 2850 /* read any numerical arguments */
3312 for (n = -1; ch < CSI_ICH; ) 2851 for (n = -1; ch < CSI_ICH; )
3313 { 2852 {
3314 if (isdigit (ch)) 2853 if (isdigit (ch))
3315 { 2854 {
… …
3325 n = -1; 2864 n = -1;
3326 } 2865 }
3327 else if (IS_CONTROL (ch)) 2866 else if (IS_CONTROL (ch))
3328 process_nonprinting (ch); 2867 process_nonprinting (ch);
3329 2868
2869 prev_ch = ch;
3330 ch = cmd_getc (); 2870 ch = cmd_getc ();
3331 } 2871 }
3332 2872
3333 if (ch > CSI_7F) 2873 if (ch > CSI_7F)
3334 return; 2874 return;
… …
3340 ndef = get_byte_array_bit (csi_defaults, i); 2880 ndef = get_byte_array_bit (csi_defaults, i);
3341 for (p = 0; p < nargs; p++) 2881 for (p = 0; p < nargs; p++)
3342 if (arg[p] == -1) 2882 if (arg[p] == -1)
3343 arg[p] = ndef; 2883 arg[p] = ndef;
3344 2884
3345#ifdef DEBUG_CMD
3346 fprintf (stderr, "CSI ");
3347 for (p = 0; p < nargs; p++)
3348 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3349 fprintf (stderr, "%c\n", ch);
3350#endif
3351
3352 /* 2885 /*
3353 * private mode handling 2886 * private mode handling
3354 */ 2887 */
3355 if (priv) 2888 if (priv)
3356 { 2889 {
3357 switch (priv) 2890 switch (priv)
3358 { 2891 {
3359 case '>': 2892 case '>':
3360 if (ch == CSI_DA) /* secondary device attributes */ 2893 if (ch == CSI_DA) /* secondary device attributes */
3361 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 }
3362 break; 2904 break;
2905
3363 case '?': 2906 case '?':
3364 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2907 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3365 process_terminal_mode (ch, priv, nargs, arg); 2908 process_terminal_mode (ch, priv, nargs, arg);
3366 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);
3367 } 2922 }
2923 break;
2924 }
2925
3368 return; 2926 return;
3369 } 2927 }
3370 2928
3371 switch (ch) 2929 switch (ch)
3372 { 2930 {
… …
3386 } 2944 }
3387 break; 2945 break;
3388#endif 2946#endif
3389 2947
3390 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2948 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3391 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2949 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3392 arg[0] = -arg[0]; 2950 arg[0] = -arg[0];
3393 /* FALLTHROUGH */ 2951 /* FALLTHROUGH */
3394 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2952 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3395 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2953 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3396 scr_gotorc (arg[0], 0, RELATIVE); 2954 scr_gotorc (arg[0], 0, RELATIVE);
3397 break; 2955 break;
3398 2956
3399 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2957 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3400 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2958 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3492 break; 3050 break;
3493 case 6: /* CPR requested */ 3051 case 6: /* CPR requested */
3494 scr_report_position (); 3052 scr_report_position ();
3495 break; 3053 break;
3496 case 7: /* unofficial extension */ 3054 case 7: /* unofficial extension */
3497 if (OPTION (Opt_insecure)) 3055 if (option (Opt_insecure))
3498 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3056 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3499 break; 3057 break;
3500 case 8: /* unofficial extension */ 3058 case 8: /* unofficial extension */
3501 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3059 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3502 break; 3060 break;
… …
3550 scr_insert_mode (1); 3108 scr_insert_mode (1);
3551 else if (arg[0] == 20) 3109 else if (arg[0] == 20)
3552 priv_modes |= PrivMode_LFNL; 3110 priv_modes |= PrivMode_LFNL;
3553 break; 3111 break;
3554 3112
3113 case CSI_71: // DESCUSR: set cursor style
3114 if (prev_ch == ' ')
3115 set_cursor_style (arg[0]);
3116 break;
3117
3555 /* 3118 /*
3556 * PRIVATE USE beyond this point. All CSI_7? sequences here 3119 * PRIVATE USE beyond this point. All CSI_7? sequences here
3557 */ 3120 */
3558 case CSI_72: /* DECSTBM: set top and bottom margins */ 3121 case CSI_72: /* DECSTBM: set top and bottom margins */
3559 if (nargs == 1) 3122 if (nargs == 1)
… …
3569 break; 3132 break;
3570 case CSI_75: 3133 case CSI_75:
3571 scr_cursor (RESTORE); 3134 scr_cursor (RESTORE);
3572 break; 3135 break;
3573 3136
3574#if ENABLE_FRILLS 3137#if !ENABLE_MINIMAL
3575 case CSI_74: 3138 case CSI_74:
3576 process_window_ops (arg, nargs); 3139 process_window_ops (arg, nargs);
3577 break; 3140 break;
3578#endif 3141#endif
3579 3142
… …
3586 break; 3149 break;
3587 } 3150 }
3588} 3151}
3589/*}}} */ 3152/*}}} */
3590 3153
3591#if ENABLE_FRILLS 3154#if !ENABLE_MINIMAL
3592/* ARGSUSED */
3593void 3155void
3594rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3156rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3595{ 3157{
3596 int x, y; 3158 int x, y;
3597 XWindowAttributes wattr; 3159 XWindowAttributes wattr;
3598 Window wdummy; 3160 Window wdummy;
3599 dDisp; 3161
3162 dLocal (Display *, dpy);
3600 3163
3601 if (nargs == 0) 3164 if (nargs == 0)
3602 return; 3165 return;
3603 3166
3604 switch (args[0]) 3167 switch (args[0])
3605 { 3168 {
3606 /* 3169 /*
3607 * commands 3170 * commands
3608 */ 3171 */
3609 case 1: /* deiconify window */ 3172 case 1: /* deiconify window */
3610 XMapWindow (disp, parent[0]); 3173 XMapWindow (dpy, parent);
3611 break; 3174 break;
3612 case 2: /* iconify window */ 3175 case 2: /* iconify window */
3613 XIconifyWindow (disp, parent[0], display->screen); 3176 XIconifyWindow (dpy, parent, display->screen);
3614 break; 3177 break;
3615 case 3: /* set position (pixels) */ 3178 case 3: /* set position (pixels) */
3616 XMoveWindow (disp, parent[0], args[1], args[2]); 3179 XMoveWindow (dpy, parent, args[1], args[2]);
3617 break; 3180 break;
3618 case 4: /* set size (pixels) */ 3181 case 4: /* set size (pixels) */
3619 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3182 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3620 break; 3183 break;
3621 case 5: /* raise window */ 3184 case 5: /* raise window */
3622 XRaiseWindow (disp, parent[0]); 3185 XRaiseWindow (dpy, parent);
3623 break; 3186 break;
3624 case 6: /* lower window */ 3187 case 6: /* lower window */
3625 XLowerWindow (disp, parent[0]); 3188 XLowerWindow (dpy, parent);
3626 break; 3189 break;
3627 case 7: /* refresh window */ 3190 case 7: /* refresh window */
3628 scr_touch (true); 3191 scr_touch (true);
3629 break; 3192 break;
3630 case 8: /* set size (chars) */ 3193 case 8: /* set size (chars) */
… …
3633 break; 3196 break;
3634 3197
3635 //case 9: NYI, TODO, restore maximized window or maximize window 3198 //case 9: NYI, TODO, restore maximized window or maximize window
3636 default: 3199 default:
3637 if (args[0] >= 24) /* set height (chars) */ 3200 if (args[0] >= 24) /* set height (chars) */
3638 set_widthheight ((unsigned int)width, 3201 set_widthheight ((unsigned int)vt_width,
3639 (unsigned int) (args[1] * fheight)); 3202 (unsigned int) (args[1] * fheight));
3640 break; 3203 break;
3641
3642 3204
3643 /* 3205 /*
3644 * reports - some output format copied from XTerm 3206 * reports - some output format copied from XTerm
3645 */ 3207 */
3646 case 11: /* report window state */ 3208 case 11: /* report window state */
3647 XGetWindowAttributes (disp, parent[0], &wattr); 3209 XGetWindowAttributes (dpy, parent, &wattr);
3648 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3210 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3649 break; 3211 break;
3650 case 13: /* report window position */ 3212 case 13: /* report window position */
3651 XGetWindowAttributes (disp, parent[0], &wattr); 3213 XGetWindowAttributes (dpy, parent, &wattr);
3652 XTranslateCoordinates (disp, parent[0], wattr.root, 3214 XTranslateCoordinates (dpy, parent, wattr.root,
3653 -wattr.border_width, -wattr.border_width, 3215 -wattr.border_width, -wattr.border_width,
3654 &x, &y, &wdummy); 3216 &x, &y, &wdummy);
3655 tt_printf ("\033[3;%d;%dt", x, y); 3217 tt_printf ("\033[3;%d;%dt", x, y);
3656 break; 3218 break;
3657 case 14: /* report window size (pixels) */ 3219 case 14: /* report window size (pixels) */
3658 XGetWindowAttributes (disp, parent[0], &wattr); 3220 XGetWindowAttributes (dpy, parent, &wattr);
3659 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3221 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3660 break; 3222 break;
3661 case 18: /* report text area size (chars) */ 3223 case 18: /* report text area size (chars) */
3662 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3224 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3663 break; 3225 break;
… …
3665 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3227 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3666 break; 3228 break;
3667 case 20: /* report icon label */ 3229 case 20: /* report icon label */
3668 { 3230 {
3669 char *s; 3231 char *s;
3670 XGetIconName (disp, parent[0], &s); 3232 XGetIconName (dpy, parent, &s);
3671 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 */
3672 XFree (s); 3234 XFree (s);
3673 } 3235 }
3674 break; 3236 break;
3675 case 21: /* report window title */ 3237 case 21: /* report window title */
3676 { 3238 {
3677 char *s; 3239 char *s;
3678 XFetchName (disp, parent[0], &s); 3240 XFetchName (dpy, parent, &s);
3679 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 */
3680 XFree (s); 3242 XFree (s);
3681 } 3243 }
3682 break; 3244 break;
3683 } 3245 }
3684} 3246}
… …
3693rxvt_term::get_to_st (unicode_t &ends_how) 3255rxvt_term::get_to_st (unicode_t &ends_how)
3694{ 3256{
3695 unicode_t ch; 3257 unicode_t ch;
3696 bool seen_esc = false; 3258 bool seen_esc = false;
3697 unsigned int n = 0; 3259 unsigned int n = 0;
3698 wchar_t string[STRING_MAX]; 3260 wchar_t string[CBUFSIZ];
3699 3261
3700 while ((ch = cmd_getc ()) != NOCHAR) 3262 while ((ch = cmd_getc ()) != NOCHAR)
3701 { 3263 {
3702 if (seen_esc) 3264 if (seen_esc)
3703 { 3265 {
… …
3711 seen_esc = true; 3273 seen_esc = true;
3712 continue; 3274 continue;
3713 } 3275 }
3714 else if (ch == C0_BEL || ch == CHAR_ST) 3276 else if (ch == C0_BEL || ch == CHAR_ST)
3715 break; 3277 break;
3278 else if (ch == C0_SYN)
3279 ch = cmd_get8 ();
3716 else if (ch < 0x20) 3280 else if (ch < 0x20)
3717 return NULL; /* other control character - exit */ 3281 return NULL; /* other control character - exit */
3718 3282
3719 seen_esc = false; 3283 seen_esc = false;
3720 3284
3721 if (n >= STRING_MAX - 1) 3285 if (n >= sizeof (string) - 1)
3722 // stop at some sane length 3286 // stop at some sane length
3723 return NULL; 3287 return NULL;
3724 3288
3725 if (ch == C0_SYN)
3726 string[n++] = cmd_get8 ();
3727 else
3728 string[n++] = ch; 3289 string[n++] = ch;
3729 } 3290 }
3730 3291
3731 string[n++] = '\0'; 3292 string[n++] = '\0';
3732 3293
3733 ends_how = (ch == 0x5c ? C0_ESC : ch); 3294 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3740 * 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)'
3741 */ 3302 */
3742void 3303void
3743rxvt_term::process_dcs_seq () 3304rxvt_term::process_dcs_seq ()
3744{ 3305{
3745 char *s;
3746 unicode_t eh;
3747
3748 /* 3306 /*
3749 * Not handled yet 3307 * Not handled yet
3750 */ 3308 */
3309
3310 unicode_t eh;
3751 s = get_to_st (eh); 3311 char *s = get_to_st (eh);
3752 if (s) 3312 if (s)
3753 free (s); 3313 free (s);
3754 3314
3755 return; 3315 return;
3756} 3316}
… …
3760 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3320 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3761 */ 3321 */
3762void 3322void
3763rxvt_term::process_osc_seq () 3323rxvt_term::process_osc_seq ()
3764{ 3324{
3765 unicode_t ch, eh;
3766 int arg; 3325 int arg;
3767 3326
3768 ch = cmd_getc (); 3327 unicode_t ch = cmd_getc ();
3769 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3328 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3770 arg = arg * 10 + (ch - '0'); 3329 arg = arg * 10 + (ch - '0');
3771 3330
3772 if (ch == ';') 3331 if (ch == ';')
3773 { 3332 {
3333 unicode_t eh;
3774 char *s = get_to_st (eh); 3334 char *s = get_to_st (eh);
3775 3335
3776 if (s) 3336 if (s)
3777 { 3337 {
3778 process_xterm_seq (arg, s, eh); 3338 process_xterm_seq (arg, s, eh);
… …
3784void 3344void
3785rxvt_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)
3786{ 3346{
3787 if (str[0] == '?' && !str[1]) 3347 if (str[0] == '?' && !str[1])
3788 { 3348 {
3789 unsigned short r, g, b; 3349 rgba c;
3790 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
3791 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);
3792 } 3358 }
3793 else 3359 else
3794 set_window_color (color, str); 3360 set_window_color (color, str);
3795} 3361}
3796 3362
3797/* 3363/*
3798 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3364 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3799 */ 3365 */
3800void 3366void
3801rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3367rxvt_term::process_xterm_seq (int op, char *str, char resp)
3802{ 3368{
3803 int changed = 0;
3804 int color; 3369 int color;
3805 char *buf, *name; 3370 char *buf, *name;
3806 bool query = str[0] == '?' && !str[1]; 3371 bool query = str[0] == '?' && !str[1];
3807 int saveop = op; 3372 int saveop = op;
3808 dDisp; 3373
3374 dLocal (Display *, dpy);
3809 3375
3810 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
3811 switch (op) 3381 switch (op)
3812 { 3382 {
3813 case XTerm_name: 3383 case XTerm_name:
3814 set_title (str); 3384 set_title (str);
3815 /* FALLTHROUGH */ 3385 /* FALLTHROUGH */
… …
3829 unsigned long bytes_after; 3399 unsigned long bytes_after;
3830 unsigned char *value = 0; 3400 unsigned char *value = 0;
3831 const char *str = ""; 3401 const char *str = "";
3832 3402
3833 if (prop 3403 if (prop
3834 && XGetWindowProperty (disp, parent[0], 3404 && XGetWindowProperty (dpy, parent,
3835 prop, 0, 1<<16, 0, AnyPropertyType, 3405 prop, 0, 1<<16, 0, AnyPropertyType,
3836 &actual_type, &actual_format, 3406 &actual_type, &actual_format,
3837 &nitems, &bytes_after, &value) == Success 3407 &nitems, &bytes_after, &value) == Success
3838 && actual_type != None 3408 && actual_type != None
3839 && actual_format == 8) 3409 && actual_format == 8)
3840 str = (const char *)(value); 3410 str = (const char *)(value);
3841 3411
3842 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3412 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3843 3413
3844 XFree (value); 3414 XFree (value);
3845 } 3415 }
3846 else 3416 else
3847 { 3417 {
3848 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3418 char *eq = strchr (str, '=');
3849 3419
3850 if (eq) 3420 if (eq)
3851 { 3421 {
3852 *eq = 0; 3422 *eq = 0;
3853 set_utf8_property (display->atom (str), eq + 1); 3423 set_utf8_property (display->atom (str), eq + 1);
3854 } 3424 }
3855 else 3425 else
3856 XDeleteProperty (disp, parent[0], 3426 XDeleteProperty (dpy, parent,
3857 display->atom (str)); 3427 display->atom (str));
3858 } 3428 }
3859 break; 3429 break;
3860 3430
3861 case XTerm_Color: 3431 case XTerm_Color:
… …
3871 break; 3441 break;
3872 3442
3873 if ((buf = strchr (name, ';')) != NULL) 3443 if ((buf = strchr (name, ';')) != NULL)
3874 *buf++ = '\0'; 3444 *buf++ = '\0';
3875 3445
3876 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 != ';')
3877 { 3527 {
3878 unsigned short r, g, b; 3528 try
3879 pix_colors_focused[color].get (display, r, g, b); 3529 {
3880 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 }
3881 } 3536 }
3882 else 3537 else
3883 set_window_color (color, 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 }
3884 } 3555 }
3885 break; 3556 break;
3886 case XTerm_Color00:
3887 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3888 break;
3889 case XTerm_Color01:
3890 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3891 break;
3892#ifndef NO_CURSORCOLOR
3893 case XTerm_Color_cursor:
3894 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3895 break;
3896#endif 3557#endif
3897 case XTerm_Color_pointer_fg:
3898 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3899 break;
3900 case XTerm_Color_pointer_bg:
3901 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3902 break;
3903#ifndef NO_BOLD_UNDERLINE_REVERSE
3904 case XTerm_Color_RV:
3905 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3906 break;
3907 case Rxvt_Color_BD:
3908 case URxvt_Color_BD:
3909 process_color_seq (op, Color_BD, str, resp);
3910 break;
3911 case Rxvt_Color_UL:
3912 case URxvt_Color_UL:
3913 process_color_seq (op, Color_UL, str, resp);
3914 break;
3915 case URxvt_Color_IT:
3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3917 break;
3918#endif
3919#if TRANSPARENT && TINTING
3920 case URxvt_Color_tint:
3921 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3922 check_our_parents ();
3923 if (am_transparent)
3924 want_full_refresh = want_refresh = 1;
3925 break;
3926#endif
3927
3928 case Rxvt_Pixmap:
3929 if (*str != ';')
3930 {
3931#if XPM_BACKGROUND
3932 scale_pixmap (""); /* reset to default scaling */
3933 set_bgPixmap (str); /* change pixmap */
3934 scr_touch (true);
3935#endif
3936 }
3937
3938 while ((str = strchr (str, ';')) != NULL)
3939 {
3940 str++;
3941#if XPM_BACKGROUND
3942 changed += scale_pixmap (str);
3943#endif
3944 }
3945
3946 if (changed)
3947 {
3948#ifdef XPM_BACKGROUND
3949 resize_pixmap ();
3950 scr_touch (true);
3951#endif
3952 }
3953 break;
3954
3955 case Rxvt_restoreFG:
3956 set_window_color (Color_fg, str);
3957 break;
3958 case Rxvt_restoreBG:
3959 set_window_color (Color_bg, str);
3960 break;
3961 3558
3962 case XTerm_logfile: 3559 case XTerm_logfile:
3963 // TODO, when secure mode? 3560 // TODO, when secure mode?
3964 break; 3561 break;
3965 3562
3966#ifdef MENUBAR
3967 case URxvt_Menu:
3968 if (OPTION (Opt_insecure))
3969 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3970 break;
3971#endif
3972#if 0 3563#if 0
3973 case Rxvt_dumpscreen: /* no error notices */ 3564 case Rxvt_dumpscreen: /* no error notices */
3974 { 3565 {
3975 int fd; 3566 int fd;
3976 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)
… …
3989 case URxvt_italicFont: 3580 case URxvt_italicFont:
3990 case URxvt_boldItalicFont: 3581 case URxvt_boldItalicFont:
3991#endif 3582#endif
3992 if (query) 3583 if (query)
3993 tt_printf ("\33]%d;%-.250s%c", saveop, 3584 tt_printf ("\33]%d;%-.250s%c", saveop,
3994 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3585 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3995 ? fontset[op - URxvt_font]->fontdesc : "", 3586 ? fontset[op - URxvt_font]->fontdesc : "",
3996 resp); 3587 resp);
3997 else 3588 else
3998 { 3589 {
3999 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3590 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4002 allocated.push_back ((void *)res); 3593 allocated.push_back ((void *)res);
4003 set_fonts (); 3594 set_fonts ();
4004 } 3595 }
4005 break; 3596 break;
4006 3597
4007#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
4008 case URxvt_locale: 3607 case URxvt_locale:
4009 if (query) 3608 if (query)
4010 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);
4011 else 3610 else
4012 { 3611 {
4013 set_locale (str); 3612 set_locale (str);
4014 pty.set_utf8_mode (enc_utf8); 3613 pty->set_utf8_mode (enc_utf8);
4015 init_xlocale (); 3614 init_xlocale ();
4016 } 3615 }
4017 break; 3616 break;
4018 3617
4019 case URxvt_view_up: 3618 case URxvt_view_up:
… …
4030 break; 3629 break;
4031#endif 3630#endif
4032 3631
4033#if ENABLE_PERL 3632#if ENABLE_PERL
4034 case URxvt_perl: 3633 case URxvt_perl:
4035 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3634 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4036 ; // no responses yet
4037 break; 3635 break;
4038#endif 3636#endif
4039 } 3637 }
4040} 3638}
4041/*----------------------------------------------------------------------*/ 3639/*----------------------------------------------------------------------*/
… …
4048 * 's' = save 3646 * 's' = save
4049 * 'r' = restore 3647 * 'r' = restore
4050 * 't' = toggle 3648 * 't' = toggle
4051 * so no need for fancy checking 3649 * so no need for fancy checking
4052 */ 3650 */
4053int 3651int ecb_cold
4054rxvt_term::privcases (int mode, unsigned long bit) 3652rxvt_term::privcases (int mode, unsigned long bit)
4055{ 3653{
4056 int state; 3654 int state;
4057 3655
4058 if (mode == 's') 3656 if (mode == 's')
4059 { 3657 {
4060 SavedModes |= (priv_modes & bit); 3658 if (priv_modes & bit)
3659 SavedModes |= bit;
3660 else
3661 SavedModes &= ~bit;
4061 return -1; 3662 return -1;
4062 } 3663 }
4063 else 3664 else
4064 { 3665 {
4065 if (mode == 'r') 3666 if (mode == 'r')
4066 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3667 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4067 else 3668 else
4068 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3669 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4069 PrivMode (state, bit); 3670
3671 if (state)
3672 priv_modes |= bit;
3673 else
3674 priv_modes &= ~bit;
4070 } 3675 }
4071 3676
4072 return state; 3677 return state;
4073} 3678}
4074 3679
4075/* we're not using priv _yet_ */ 3680/* we're not using priv _yet_ */
4076void 3681void
4077rxvt_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)
4078{ 3683{
4079 unsigned int i, j; 3684 unsigned int i, j;
4080 int state; 3685 int state;
4081 3686
4082 static const struct 3687 static const struct
4083 { 3688 {
4084 const int argval; 3689 const int argval;
4085 const unsigned long bit; 3690 const unsigned long bit;
4086 }
4087
4088 argtopriv[] = { 3691 } argtopriv[] = {
4089 { 1, PrivMode_aplCUR }, 3692 { 1, PrivMode_aplCUR }, // DECCKM
4090 { 2, PrivMode_vt52 }, 3693 { 2, PrivMode_vt52 }, // DECANM
4091 { 3, PrivMode_132 }, 3694 { 3, PrivMode_132 }, // DECCOLM
4092 { 4, PrivMode_smoothScroll }, 3695 { 4, PrivMode_smoothScroll }, // DECSCLM
4093 { 5, PrivMode_rVideo }, 3696 { 5, PrivMode_rVideo }, // DECSCNM
4094 { 6, PrivMode_relOrigin }, 3697 { 6, PrivMode_relOrigin }, // DECOM
4095 { 7, PrivMode_Autowrap }, 3698 { 7, PrivMode_Autowrap }, // DECAWM
4096 // 8, bi-directional support mode 3699 // 8, auto-repeat keys // DECARM
4097 { 9, PrivMode_MouseX10 }, 3700 { 9, PrivMode_MouseX10 },
4098#ifdef menuBar_esc 3701 // 18 end FF to printer after print screen
4099 { menuBar_esc, PrivMode_menuBar }, 3702 // 19 Print screen prints full screen/scroll region
4100#endif
4101 // 18, 19 printing-related
4102 { 25, PrivMode_VisibleCursor }, 3703 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4103#ifdef scrollBar_esc 3704#ifdef scrollBar_esc
4104 { scrollBar_esc, PrivMode_scrollBar }, 3705 { scrollBar_esc, PrivMode_scrollBar },
4105#endif 3706#endif
4106 { 35, PrivMode_ShiftKeys }, // rxvt extension 3707 { 35, PrivMode_ShiftKeys }, // rxvt extension
3708 // 38, tektronix mode // DECTEK
4107 { 40, PrivMode_132OK }, 3709 { 40, PrivMode_132OK },
4108 // 41 xterm more fixes NYI 3710 // 41 xterm more fixes NYI
4109 // 45 margin bell NYI 3711 // 45 margin bell NYI
4110 // 46 start logging 3712 // 46 start logging
4111 { 47, PrivMode_Screen }, 3713 { 47, PrivMode_Screen },
4112 { 66, PrivMode_aplKP }, 3714 { 66, PrivMode_aplKP }, // DECNKM
4113#ifndef NO_BACKSPACE_KEY 3715#ifndef NO_BACKSPACE_KEY
4114 { 67, PrivMode_BackSpace }, 3716 { 67, PrivMode_BackSpace }, // DECBKM
4115#endif 3717#endif
4116 { 1000, PrivMode_MouseX11 }, 3718 { 1000, PrivMode_MouseX11 },
4117 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3719 { 1002, PrivMode_MouseBtnEvent },
4118 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3720 { 1003, PrivMode_MouseAnyEvent },
4119 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3721#if ENABLE_FRILLS
3722 { 1005, PrivMode_ExtModeMouse },
3723#endif
4120 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3724 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4121 { 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
4122 // 1035 enable modifiers for alt, numlock NYI 3729 // 1035 enable modifiers for alt, numlock NYI
4123 // 1036 send ESC for meta keys NYI 3730 // 1036 send ESC for meta keys NYI
4124 // 1037 send DEL for keypad delete NYI 3731 // 1037 send DEL for keypad delete NYI
4125 { 1047, PrivMode_Screen }, 3732 { 1047, PrivMode_Screen },
4126 // 1048 save and restore cursor 3733 // 1048 save and restore cursor, implemented in code
4127 { 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 */
4128 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3735 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3736 { 2004, PrivMode_BracketPaste },
4129 }; 3737 };
4130 3738
4131 if (nargs == 0) 3739 if (nargs == 0)
4132 return; 3740 return;
4133 3741
… …
4140 for (i = 0; i < nargs; i++) 3748 for (i = 0; i < nargs; i++)
4141 { 3749 {
4142 state = -1; 3750 state = -1;
4143 3751
4144 /* basic handling */ 3752 /* basic handling */
4145 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3753 for (j = 0; j < ecb_array_length (argtopriv); j++)
4146 if (argtopriv[j].argval == arg[i]) 3754 if (argtopriv[j].argval == arg[i])
4147 { 3755 {
4148 state = privcases (mode, argtopriv[j].bit); 3756 state = privcases (mode, argtopriv[j].bit);
4149 break; 3757 break;
4150 } 3758 }
… …
4158 3766
4159 scr_touch (true); 3767 scr_touch (true);
4160 break; 3768 break;
4161#endif 3769#endif
4162 case 1048: /* alternative cursor save */ 3770 case 1048: /* alternative cursor save */
4163 case 1049:
4164 if (OPTION (Opt_secondaryScreen)) 3771 if (option (Opt_secondaryScreen))
4165 if (mode == 0) 3772 if (mode == 0)
4166 scr_cursor (RESTORE); 3773 scr_cursor (RESTORE);
4167 else if (mode == 1) 3774 else if (mode == 1)
4168 scr_cursor (SAVE); 3775 scr_cursor (SAVE);
4169 break; 3776 break;
… …
4177 case 2: /* VT52 mode */ 3784 case 2: /* VT52 mode */
4178 /* oddball mode. should be set regardless of set/reset 3785 /* oddball mode. should be set regardless of set/reset
4179 * parameter. Return from VT52 mode with an ESC < from 3786 * parameter. Return from VT52 mode with an ESC < from
4180 * within VT52 mode 3787 * within VT52 mode
4181 */ 3788 */
4182 PrivMode (1, PrivMode_vt52); 3789 priv_modes |= PrivMode_vt52;
4183 break; 3790 break;
4184 case 3: /* 80/132 */ 3791 case 3: /* 80/132 */
4185 if (priv_modes & PrivMode_132OK) 3792 if (priv_modes & PrivMode_132OK)
4186 set_widthheight (((state ? 132 : 80) * fwidth), height); 3793 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4187 break; 3794 break;
4188 case 4: /* smooth scrolling */ 3795 case 4: /* smooth scrolling */
4189 set_option (Opt_jumpScroll, !state); 3796 set_option (Opt_jumpScroll, !state);
4190 break; 3797 break;
4191 case 5: /* reverse video */ 3798 case 5: /* reverse video */
… …
4198 scr_autowrap (state); 3805 scr_autowrap (state);
4199 break; 3806 break;
4200 /* 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 */
4201 case 9: /* X10 mouse reporting */ 3808 case 9: /* X10 mouse reporting */
4202 if (state) /* orthogonal */ 3809 if (state) /* orthogonal */
4203 priv_modes &= ~PrivMode_MouseX11; 3810 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4204 break; 3811 break;
4205#ifdef menuBar_esc
4206 case menuBar_esc:
4207#ifdef MENUBAR
4208 map_menuBar (state);
4209#endif
4210 break;
4211#endif
4212#ifdef scrollBar_esc 3812#ifdef scrollBar_esc
4213 case scrollBar_esc: 3813 case scrollBar_esc:
4214 if (scrollbar_mapping (state)) 3814 scrollBar.map (state);
4215 {
4216 resize_all_windows (0, 0, 0); 3815 resize_all_windows (0, 0, 0);
4217 scr_touch (true); 3816 scr_touch (true);
4218 }
4219 break; 3817 break;
4220#endif 3818#endif
4221 case 25: /* visible/invisible cursor */ 3819 case 25: /* visible/invisible cursor */
4222 scr_cursor_visible (state); 3820 scr_cursor_visible (state);
4223 break; 3821 break;
… …
4228 break; 3826 break;
4229 /* case 66: - application key pad */ 3827 /* case 66: - application key pad */
4230 /* case 67: - backspace key */ 3828 /* case 67: - backspace key */
4231 case 1000: /* X11 mouse reporting */ 3829 case 1000: /* X11 mouse reporting */
4232 if (state) /* orthogonal */ 3830 if (state) /* orthogonal */
4233 priv_modes &= ~PrivMode_MouseX10; 3831 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4234 break; 3832 break;
4235#if 0
4236 case 1001: 3833 case 1002:
4237 break; /* X11 mouse highlighting */ 3834 case 1003:
4238#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;
4239 case 1010: /* scroll to bottom on TTY output inhibit */ 3847 case 1010: /* scroll to bottom on TTY output inhibit */
4240 set_option (Opt_scrollTtyOutput, !state); 3848 set_option (Opt_scrollTtyOutput, !state);
4241 break; 3849 break;
4242 case 1011: /* scroll to bottom on key press */ 3850 case 1011: /* scroll to bottom on key press */
4243 set_option (Opt_scrollTtyKeypress, state); 3851 set_option (Opt_scrollTtyKeypress, state);
4244 break; 3852 break;
4245 case 1047: /* secondary screen w/ clearing last */ 3853 case 1047: /* secondary screen w/ clearing last */
4246 if (OPTION (Opt_secondaryScreen)) 3854 if (option (Opt_secondaryScreen))
4247 if (current_screen != PRIMARY) 3855 if (!state)
4248 scr_erase_screen (2); 3856 scr_erase_screen (2);
3857
4249 scr_change_screen (state); 3858 scr_change_screen (state);
4250 break; 3859 break;
4251 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
4252 scr_change_screen (state); 3865 scr_change_screen (state);
3866
4253 if (OPTION (Opt_secondaryScreen)) 3867 if (option (Opt_secondaryScreen))
4254 if (current_screen != PRIMARY) 3868 if (state)
4255 scr_erase_screen (2); 3869 scr_erase_screen (2);
3870 else
3871 scr_cursor (RESTORE);
4256 break; 3872 break;
4257 default: 3873 default:
4258 break; 3874 break;
4259 } 3875 }
4260 } 3876 }
4261} 3877}
4262/*}}} */ 3878/*}}} */
4263 3879
4264/*{{{ process sgr sequences */ 3880/*{{{ process sgr sequences */
4265void 3881void ecb_hot
4266rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3882rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4267{ 3883{
4268 unsigned int i; 3884 unsigned int i;
4269 short rendset; 3885 short rendset;
4270 int rendstyle; 3886 int rendstyle;
… …
4386 scr_color (Color_bg, Color_bg); 4002 scr_color (Color_bg, Color_bg);
4387 break; 4003 break;
4388 4004
4389 //case 50: // not variable spacing 4005 //case 50: // not variable spacing
4390 4006
4391#if ENABLE_FRILLS 4007#if !ENABLE_MINIMAL
4392 case 90: 4008 case 90:
4393 case 91: /* set bright fg color */ 4009 case 91: /* set bright fg color */
4394 case 92: 4010 case 92:
4395 case 93: 4011 case 93:
4396 case 94: 4012 case 94:
… …
4411 break; 4027 break;
4412#endif 4028#endif
4413 } 4029 }
4414 } 4030 }
4415} 4031}
4416/*}}} */
4417 4032
4418/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4419void 4033void
4420rxvt_term::process_graphics () 4034rxvt_term::set_cursor_style (int style)
4421{ 4035{
4422 unicode_t ch, cmd = cmd_getc (); 4036 if (!IN_RANGE_INC (style, 0, 4))
4423
4424 if (cmd == 'Q')
4425 { /* query graphics */
4426 tt_printf ("\033G0\012"); /* no graphics */
4427 return; 4037 return;
4428 } 4038
4429 /* swallow other graphics sequences until terminating ':' */ 4039 set_option (Opt_cursorUnderline, style >= 3);
4430 do 4040
4431 ch = cmd_getc (); 4041#ifdef CURSOR_BLINK
4432 while (ch != ':'); 4042 set_option (Opt_cursorBlink, !style || (style & 1));
4043 cursor_blink_reset ();
4044#endif
4045
4046 want_refresh = 1;
4433} 4047}
4434/*}}} */ 4048/*}}} */
4435 4049
4436/* ------------------------------------------------------------------------- */ 4050/* ------------------------------------------------------------------------- */
4437 4051
… …
4453 4067
4454/* ---------------------------------------------------------------------- */ 4068/* ---------------------------------------------------------------------- */
4455/* 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,
4456 * or generated by us in response to a query ESC sequence. 4070 * or generated by us in response to a query ESC sequence.
4457 */ 4071 */
4458const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4072static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4459 4073
4460void 4074void
4461rxvt_term::tt_write (const char *data, unsigned int len) 4075rxvt_term::tt_write (const char *data, unsigned int len)
4462{ 4076{
4463 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4077 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4464 return; 4078 return;
4465 4079
4466 if (pty.pty < 0) 4080 if (pty->pty < 0)
4467 return; 4081 return;
4468 4082
4469 if (v_buflen == 0) 4083 if (v_buflen == 0)
4470 { 4084 {
4471 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));
4472 4086
4087 max_it (written, 0);
4088
4473 if ((unsigned int)written == len) 4089 if (written == len)
4474 return; 4090 return;
4475 4091
4476 data += written; 4092 data += written;
4477 len -= written; 4093 len -= written;
4478 } 4094 }
4479 4095
4480 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4096 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4481 4097
4482 memcpy (v_buffer + v_buflen, data, len); 4098 memcpy (v_buffer + v_buflen, data, len);
4483 v_buflen += len; 4099 v_buflen += len;
4484 4100
4485 pty_ev.set (EVENT_READ | EVENT_WRITE); 4101 pty_ev.set (ev::READ | ev::WRITE);
4486} 4102}
4487 4103
4488void rxvt_term::pty_write () 4104void rxvt_term::pty_write ()
4489{ 4105{
4490 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));
4491 4107
4492 if (written > 0) 4108 if (written > 0)
4493 { 4109 {
4494 v_buflen -= written; 4110 v_buflen -= written;
4495 4111
4496 if (v_buflen == 0) 4112 if (v_buflen == 0)
4497 { 4113 {
4498 free (v_buffer); 4114 free (v_buffer);
4499 v_buffer = 0; 4115 v_buffer = 0;
4500 v_buflen = 0;
4501 4116
4502 pty_ev.set (EVENT_READ); 4117 pty_ev.set (ev::READ);
4503 return; 4118 return;
4504 } 4119 }
4505 4120
4506 memmove (v_buffer, v_buffer + written, v_buflen); 4121 memmove (v_buffer, v_buffer + written, v_buflen);
4507 } 4122 }
4508 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4123 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4509 pty_ev.set (EVENT_READ); 4124 pty_ev.set (ev::READ);
4510} 4125}
4511 4126
4512/*----------------------- end-of-file (C source) -----------------------*/ 4127/*----------------------- end-of-file (C source) -----------------------*/
4513 4128

Diff Legend

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