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.241 by root, Fri Jan 6 05:28:55 2006 UTC vs.
Revision 1.543 by sf-exg, Sat Apr 26 14:07:36 2014 UTC

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

Diff Legend

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