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

Diff Legend

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