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.227 by root, Mon Jan 2 15:35:43 2006 UTC vs.
Revision 1.534 by sf-exg, Tue Mar 26 14:16:46 2013 UTC

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

Diff Legend

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