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