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.323 by ayin, Mon May 28 18:38:03 2007 UTC vs.
Revision 1.544 by sf-exg, Sat Apr 26 14:55:58 2014 UTC

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

Diff Legend

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