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.240 by root, Fri Jan 6 03:40:19 2006 UTC vs.
Revision 1.544 by sf-exg, Sat Apr 26 14:55:58 2014 UTC

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

Diff Legend

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