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.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.363 by root, Sun Nov 11 04:08:00 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * 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 33 * 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 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#include <wchar.h> 54#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
54 63
55/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
56 65
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 67
59// exception thrown when the command parser runs out of input data 68#if ENABLE_FRILLS || ISO_14755
60class out_of_input { } out_of_input;
61 69
62/*{{{ Convert the keypress event into a string */ 70#define ISO_14755_STARTED 0x80000000UL
71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
72#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
73#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
74#define ISO_14755_MASK 0x0fffffffUL
75
76#if ISO_14755
77static unsigned short iso14755_symtab[] = {
78 // keysym, unicode
79 XK_Left, 0x2190,
80 XK_KP_Left, 0x2190,
81 XK_Up, 0x2191,
82 XK_KP_Up, 0x2191,
83 XK_Right, 0x2192,
84 XK_KP_Right, 0x2192,
85 XK_Down, 0x2193,
86 XK_KP_Down, 0x2193,
87 XK_Linefeed, 0x21b4,
88 XK_Return, 0x21b5,
89 XK_KP_Enter, 0x21b5,
90
91 XK_Prior, 0x21de,
92 XK_Next, 0x21df,
93 XK_Tab, 0x21e5,
94 XK_ISO_Left_Tab, 0x21e6,
95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7,
97
98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb,
100 XK_Caps_Lock, 0x21ec,
101 XK_Num_Lock, 0x21ed,
102 XK_ISO_Level3_Shift, 0x21ee,
103 XK_ISO_Level3_Lock, 0x21ef,
104 XK_ISO_Group_Lock, 0x21f0,
105 XK_Home, 0x21f1,
106 XK_End, 0x21f2,
107
108 XK_Execute, 0x2318,
109 XK_Begin, 0x2320,
110 XK_Delete, 0x2326,
111 XK_Clear, 0x2327,
112 XK_BackSpace, 0x232b,
113 XK_Insert, 0x2380,
114 XK_Control_L, 0x2388,
115 XK_Control_R, 0x2388,
116 XK_Pause, 0x2389,
117 XK_Break, 0x238a,
118 XK_Escape, 0x238b,
119 XK_Undo, 0x238c,
120 XK_Print, 0x2399,
121
122 XK_space, 0x2423,
123
124#ifdef XK_KP_Begin
125 XK_KP_Prior, 0x21de,
126 XK_KP_Next, 0x21df,
127 XK_KP_Begin, 0x2320,
128 XK_KP_Insert, 0x2380,
129 XK_KP_Delete, 0x2326,
130 XK_KP_Space, 0x2422,
131#endif
132 0,
133};
134
63void 135void
136rxvt_term::iso14755_54 (int x, int y)
137{
138 x = Pixel2Col (x);
139 y = Pixel2Row (y);
140
141 if (!IN_RANGE_EXC (x, 0, ncol)
142 || !IN_RANGE_EXC (y, 0, nrow))
143 return;
144
145 for (;;)
146 {
147 const line_t &l = ROW(y + view_start);
148
149 text_t t = l.t[x];
150
151 if (t != NOCHAR || !x)
152 {
153 iso14755_51 (l.t[x], l.r[x], x, y);
154 iso14755buf = ISO_14755_54;
155 break;
156 }
157
158 x--;
159 }
160}
161
162void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{
165 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname;
168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171
172# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch))
174 {
175 len = rxvt_composite.expand (ch, 0);
176 alloc = chr = new wchar_t[len];
177 rxvt_composite.expand (ch, chr);
178 }
179 else
180# endif
181 {
182 ch2 = ch;
183
184 alloc = 0;
185 chr = &ch2;
186 len = 1;
187 }
188
189 char attr[80]; // plenty
190
191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r,
193 fgcolor_of (r), bgcolor_of (r),
194 r & RS_Bold ? " bold" : "",
195 r & RS_Italic ? " italic" : "",
196 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : "");
200
201 int width = wcswidth (fname, wcslen (fname));
202
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr));
205
206 if (y >= 0)
207 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0;
210 }
211
212 scr_overlay_new (x, y, width, len + 2);
213
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215
216 for (int y = 0; y < len; y++)
217 {
218 char buf[9];
219
220 ch = *chr++;
221
222 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '=');
225# if !UNICODE3
226 if (ch >= 0x10000)
227 ch = 0xfffd;
228# endif
229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r);
233 }
234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
240 scr_overlay_set (0, len , attr);
241 scr_overlay_set (0, len + 1, fname);
242
243 free (fname);
244
245# if ENABLE_COMBINING
246 if (alloc)
247 delete [] alloc;
248# endif
249}
250#endif
251
252void
253rxvt_term::commit_iso14755 ()
254{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259
260 if (iso14755buf & ISO_14755_51)
261 {
262 char mb[16];
263 int len;
264
265 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20)
267 len = wcstombs (mb, ch, 16);
268 else
269 {
270 mb[0] = ch[0];
271 len = 1;
272 }
273
274 if (len > 0)
275 tt_write (mb, len);
276 else
277 scr_bell ();
278 }
279
280 iso14755buf = 0;
281}
282
283int
64rxvt_term::lookup_key (XKeyEvent &ev) 284rxvt_term::hex_keyval (XKeyEvent &ev)
285{
286 // check wether this event corresponds to a hex digit
287 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++)
289 {
290 KeySym k = XLookupKeysym (&ev, index);
291
292 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
293 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
294 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
295 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
296 }
297
298 return -1;
299}
300#endif
301
302void
303rxvt_term::key_press (XKeyEvent &ev)
65{ 304{
66 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
67 unsigned int newlen; 306 unsigned int newlen;
68 KeySym keysym; 307 KeySym keysym;
69#ifdef DEBUG_CMD
70 static int debug_key = 1; /* accessible by a debugger only */
71#endif
72 int valid_keysym; 308 int valid_keysym;
73 unsigned char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
74 315
75 /* 316 /*
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
78 * 319 *
79 * Always permit `shift' to override the current setting 320 * Always permit `shift' to override the current setting
80 */ 321 */
81 shft = (ev.state & ShiftMask); 322 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 323 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 324 meta = ev.state & ModMetaMask;
84 325
85 if (numlock_state || (ev.state & ModNumLockMask)) 326 if (numlock_state || (ev.state & ModNumLockMask))
86 { 327 {
87 numlock_state = (ev.state & ModNumLockMask); 328 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 329 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
96 Status status_return; 337 Status status_return;
97 338
98#if 0 339#if 0
99#ifdef X_HAVE_UTF8_STRING 340#ifdef X_HAVE_UTF8_STRING
100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 341 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 342 len = Xutf8LookupString (Input_Context, &ev, kbuf,
102 KBUFSZ, &keysym, &status_return); 343 KBUFSZ, &keysym, &status_return);
103 else 344 else
104#endif 345#endif
105#endif 346#endif
106 { 347 {
… …
108 349
109 // the XOpenIM manpage lies about hardcoding the locale 350 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 351 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 352 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 353 SET_LOCALE (rs[Rs_imLocale]);
354
113 // assume wchar_t == unicode or better 355 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 356 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 357 KBUFSZ, &keysym, &status_return);
358
116 if (rs[Rs_imLocale]) 359 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 360 SET_LOCALE (locale);
118 361
119 if (status_return == XLookupChars 362 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 363 || status_return == XLookupBoth)
… …
141 || status_return == XLookupBoth; 384 || status_return == XLookupBoth;
142 } 385 }
143 else 386 else
144#endif 387#endif
145 { 388 {
146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
147 valid_keysym = keysym != NoSymbol; 390 valid_keysym = keysym != NoSymbol;
148 } 391 }
149 392
150 if (valid_keysym) 393 if (valid_keysym)
151 { 394 {
395#ifdef KEYSYM_RESOURCE
396 if (keyboard->dispatch (this, keysym, ev.state))
397 return;
398#endif
399
152 if (TermWin.saveLines) 400 if (saveLines)
153 { 401 {
154#ifdef UNSHIFTED_SCROLLKEYS 402#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 403 if (!ctrl && !meta)
156 {
157#else 404#else
158 if (IS_SCROLL_MOD) 405 if (IS_SCROLL_MOD)
406#endif
159 { 407 {
160#endif
161 int lnsppg; 408 int lnsppg;
162 409
163#ifdef PAGING_CONTEXT_LINES 410#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 411 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 412#else
166 lnsppg = TermWin.nrow * 4 / 5; 413 lnsppg = nrow * 4 / 5;
167#endif 414#endif
168 if (keysym == XK_Prior) 415 if (keysym == XK_Prior)
169 { 416 {
170 scr_page (UP, lnsppg); 417 scr_page (UP, lnsppg);
171 return; 418 return;
… …
199 scr_move_to (0, 1); 446 scr_move_to (0, 1);
200 return; 447 return;
201 } 448 }
202 else if (keysym == XK_End) 449 else if (keysym == XK_End)
203 { 450 {
204 scr_move_to (1, 0); 451 scr_move_to (1, 1);
205 return; 452 return;
206 } 453 }
207 } 454 }
208#endif 455#endif
209 } 456 }
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 461 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 462 {
216 keysym += (XK_F11 - XK_F1); 463 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 464 shft = 0; /* turn off Shift */
218 } 465 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 466 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 467 {
221 switch (keysym) 468 switch (keysym)
222 { 469 {
223 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
226 return; 473 return;
474#if TODO
227 /* rxvt extras */ 475 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 477 change_font (FONT_UP);
230 return; 478 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 480 change_font (FONT_DN);
233 return; 481 return;
482#endif
234 } 483 }
235 } 484 }
236 } 485 }
237#ifdef PRINTPIPE 486
238 if (keysym == XK_Print) 487#if ENABLE_FRILLS || ISO_14755
239 { 488 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 489 if (shft && ctrl)
241 return;
242 } 490 {
243#endif 491 int hv;
244 492
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 493 if (iso14755buf & ISO_14755_51
246 { 494 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 495 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 496 {
250 unsigned int l; 497 commit_iso14755 ();
251 const unsigned char *kbuf0; 498 iso14755buf = ISO_14755_51;
252 499# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 500 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 501# endif
261 ) 502 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 503 }
266 504 else if (keysym == XK_BackSpace)
267 tt_write (kbuf0, l); 505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
509# endif
510 return;
511 }
512 else if ((hv = hex_keyval (ev)) >= 0)
513 {
514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
515 | hv | ISO_14755_51;
516# if ISO_14755
517 iso14755_51 (iso14755buf & ISO_14755_MASK);
518# endif
268 return; 519 return;
269 } 520 }
270 else 521 else
271#endif
272 { 522 {
523# if ISO_14755
524 scr_overlay_off ();
525# endif
526 iso14755buf = 0;
527 }
528 }
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
531 if (!(iso14755buf & ISO_14755_STARTED))
532 {
533 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
536 scr_overlay_set (0, 0, "ISO 14755 mode");
537# endif
538 }
539#endif
540
541#ifdef PRINTPIPE
542 if (keysym == XK_Print)
543 {
544 scr_printscreen (ctrl | shft);
545 return;
546 }
547#endif
548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
273 newlen = 1; 553 newlen = 1;
274 switch (keysym) 554 switch (keysym)
275 { 555 {
276#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 557 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 558 if (priv_modes & PrivMode_HaveBackSpace)
279 { 559 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
283 } 563 }
284 else 564 else
285 STRCPY (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
286 break; 566 break;
287#endif 567#endif
288#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
289 case XK_Delete: 579 case XK_Delete:
290 STRCPY (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
291 break; 581 break;
292#endif 582#endif
293 case XK_Tab: 583 case XK_Tab:
294 if (shft) 584 if (shft)
295 STRCPY (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
296 else 586 else
297 { 587 {
298#ifdef CTRL_TAB_MAKES_META 588#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 589 if (ctrl)
300 meta = 1; 590 meta = 1;
… …
306 newlen = 0; 596 newlen = 0;
307 } 597 }
308 break; 598 break;
309 599
310#ifdef XK_KP_Left 600#ifdef XK_KP_Left
601 case XK_KP_Left: /* \033Ot or standard */
311 case XK_KP_Up: /* \033Ox or standard */ 602 case XK_KP_Up: /* \033Ox or standard */
603 case XK_KP_Right: /* \033Ov or standard */
312 case XK_KP_Down: /* \033Or or standard */ 604 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 605 if (kp)
314 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
316 { 606 {
317 STRCPY (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 609 break;
320 } 610 }
321 else 611 else
322 /* translate to std. cursor key */ 612 /* translate to std. cursor key */
… …
325#endif 615#endif
326 case XK_Up: /* "\033[A" */ 616 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 617 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 618 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 619 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 620 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 621 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 622 /* do Shift first */
333 if (shft) 623 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 624 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 625 else if (ctrl)
336 { 626 {
337 kbuf[1] = 'O'; 627 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 628 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 629 }
340 else if (PrivateModes & PrivMode_aplCUR) 630 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 631 kbuf[1] = 'O';
342 break; 632 break;
343 633
344#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
346 case XK_KP_Prior: 636 case XK_KP_Prior:
347 /* allow shift to override */ 637 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
349 { 639 {
350 STRCPY (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
351 break; 641 break;
352 } 642 }
353 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
354# endif 644# endif
355 case XK_Prior: 645 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
357 break; 647 break;
358# ifdef XK_KP_Next 648# ifdef XK_KP_Next
359 case XK_KP_Next: 649 case XK_KP_Next:
360 /* allow shift to override */ 650 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
362 { 652 {
363 STRCPY (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
364 break; 654 break;
365 } 655 }
366 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
367# endif 657# endif
368 case XK_Next: 658 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
370 break; 660 break;
371#endif 661#endif
372 case XK_KP_Enter: 662 case XK_KP_Enter:
373 /* allow shift to override */ 663 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
375 { 665 {
376 STRCPY (kbuf, "\033OM"); 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';
377 } 678 }
378 else 679 else
379 { 680 {
380 kbuf[0] = '\r'; 681 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 682 kbuf[1] = '\0';
382 } 683 }
383 break; 684 break;
384 685
385#ifdef XK_KP_Begin 686#ifdef XK_KP_Begin
386 case XK_KP_Begin: 687 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 688 strcpy (kbuf, "\033Ou");
388 break; 689 break;
389 690
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 691#endif
398 case XK_KP_F1: /* "\033OP" */ 692 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 693 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 694 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 695 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 696 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 697 kbuf[2] += (keysym - XK_KP_F1);
404 break; 698 break;
405 699
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 700 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 701 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 716 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
424 { 718 {
425 STRCPY (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 721 }
428 else 722 else
429 { 723 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 725 kbuf[1] = '\0';
432 } 726 }
433 break; 727 break;
434 728
435 case XK_Find: 729 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
437 break; 731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
438 case XK_Insert: 743 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 744 strcpy (kbuf, "\033[2~");
440 break; 745 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 746#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 747 case DXK_Remove:
443 /* FALLTHROUGH */ 748 /* FALLTHROUGH */
444#endif 749#endif
445 case XK_Execute: 750 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 751 strcpy (kbuf, "\033[3~");
447 break; 752 break;
448 case XK_Select: 753 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
450 break; 755 break;
451#ifdef XK_KP_End 756#ifdef XK_KP_End
452 case XK_KP_End: 757 case XK_KP_End:
453 /* allow shift to override */ 758 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
455 { 760 {
456 STRCPY (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
457 break; 762 break;
458 } 763 }
459 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
460#endif 765#endif
461 case XK_End: 766 case XK_End:
462 STRCPY (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
463 break; 768 break;
464#ifdef XK_KP_Home 769#ifdef XK_KP_Home
465 case XK_KP_Home: 770 case XK_KP_Home:
466 /* allow shift to override */ 771 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
468 { 773 {
469 STRCPY (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
470 break; 775 break;
471 } 776 }
472 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
473#endif 778#endif
474 case XK_Home: 779 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 780 strcpy (kbuf, KS_HOME);
476 break; 781 break;
477 782
478#define FKEY(n, fkey) \ 783#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 785
… …
532#undef FKEY 837#undef FKEY
533 default: 838 default:
534 newlen = 0; 839 newlen = 0;
535 break; 840 break;
536 } 841 }
842
537 if (newlen) 843 if (newlen)
538 len = STRLEN (kbuf); 844 len = strlen (kbuf);
539 } 845 }
540 846
541 /* 847 /*
542 * Pass meta for all function keys, if 'meta' option set 848 * Pass meta for all function keys, if 'meta' option set
543 */ 849 */
… …
550 else if (ctrl && keysym == XK_minus) 856 else if (ctrl && keysym == XK_minus)
551 { 857 {
552 len = 1; 858 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 859 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 860 }
861 else if (keysym == XK_ISO_Left_Tab)
862 {
863 strcpy (kbuf, "\033[Z");
864 len = 3;
865 }
555 else 866 else
556 { 867 {
557#ifdef META8_OPTION 868#ifdef META8_OPTION
558 /* set 8-bit on */ 869 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
560 { 871 {
561 unsigned char *ch; 872 char *ch;
562 873
563 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
564 *ch |= 0x80; 875 *ch |= 0x80;
565 876
566 meta = 0; 877 meta = 0;
… …
568#endif 879#endif
569 /* nil */ ; 880 /* nil */ ;
570 } 881 }
571 } 882 }
572 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
573 if (len <= 0) 887 if (len <= 0)
574 return; /* not mapped */ 888 return; /* not mapped */
575 889
576 if (Options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 891 if (view_start)
578 { 892 {
579 TermWin.view_start = 0; 893 view_start = 0;
580 want_refresh = 1; 894 want_refresh = 1;
581 } 895 }
582 896
583 /* 897 /*
584 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
599#ifdef META8_OPTION 913#ifdef META8_OPTION
600 && meta_char == C0_ESC 914 && meta_char == C0_ESC
601#endif 915#endif
602 ) 916 )
603 { 917 {
604 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
605 tt_write (&ch, 1); 919 tt_write (&ch, 1);
606 } 920 }
607 921
608#if defined(DEBUG_CMD)
609 /* Display keyboard buffer contents */
610 unsigned char *p;
611 int i;
612
613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
614 for (i = 0, p = kbuf; i < len; i++, p++)
615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
616 fprintf (stderr, "'\n");
617#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
619} 923}
620/*}}} */
621 924
622#if (MENUBAR_MAX) 925void
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 926rxvt_term::key_release (XKeyEvent &ev)
624/* attempt to `write' count to the input buffer */ 927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
1002#if defined (KEYSYM_RESOURCE)
625unsigned int 1003unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
627{ 1005{
628 unsigned int n, s; 1006 unsigned int n, s;
629 1007
630 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 1010
633 if (n > 0 && s < count) 1011 if (n > 0 && s < count)
634 { 1012 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 1013 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 1015 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 1016 cmdbuf_endp -= n;
639 s += n; 1017 s += n;
640 } 1018 }
… …
650 1028
651 cmd_parse (); 1029 cmd_parse ();
652 1030
653 return 0; 1031 return 0;
654} 1032}
655#endif /* MENUBAR_MAX */ 1033#endif
656 1034
657void 1035void
658rxvt_term::flush () 1036rxvt_term::flush ()
659{ 1037{
660#ifdef TRANSPARENT 1038 flush_ev.stop ();
661 if (want_full_refresh) 1039
1040#ifdef HAVE_BG_PIXMAP
1041 if (bgPixmap.check_clearChanged ())
662 { 1042 {
663 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
664 scr_clear ();
665 scr_touch (false); 1044 scr_touch (false);
666 want_refresh = 1;
667 } 1045 }
668#endif 1046#endif
669 1047
670 if (want_refresh) 1048 if (want_refresh)
671 { 1049 {
1050 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1051 {
1052 int row = view_start;
1053 int end_row = row + nrow;
1054
1055 while (row > top_row && ROW (row - 1).is_longer ())
1056 --row;
1057
1058 do
1059 {
1060 int start_row = row;
1061 line_t *l;
1062
1063 do
1064 {
1065 l = &ROW (row++);
1066
1067 if (!(l->f & LINE_FILTERED))
1068 {
1069 // line not filtered, mark it as filtered
1070 l->f |= LINE_FILTERED;
1071 while (l->is_longer ())
1072 {
1073 l = &ROW (row++);
1074 l->f |= LINE_FILTERED;
1075 }
1076
1077 // and filter it
1078 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1079
1080 break;
1081 }
1082 }
1083 while (l->is_longer () && row < end_row);
1084 }
1085 while (row < end_row);
1086 }
1087
672 scr_refresh (refresh_type); 1088 scr_refresh ();
673 scrollbar_show (1); 1089 scrollbar_show (1);
674#ifdef USE_XIM 1090#ifdef USE_XIM
675 IMSendSpot (); 1091 IMSendSpot ();
676#endif 1092#endif
677 } 1093 }
678 1094
679 display->flush (); 1095 display->flush ();
680} 1096}
681 1097
682void 1098void
683rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::prepare_cb (ev::prepare &w, int revents)
684{ 1100{
685 SET_R (this); 1101 make_current ();
686 SET_LOCALE (locale);
687 1102
1103 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1107}
1108
1109void
1110rxvt_term::flush_cb (ev::timer &w, int revents)
1111{
1112 make_current ();
1113
1114 refresh_count = 0;
688 flush (); 1115 flush ();
689} 1116}
690 1117
691#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
692void 1119void
693rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
694{ 1121{
695 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
696 want_refresh = 1; 1123 want_refresh = 1;
697
698 w.start (w.at + BLINK_INTERVAL);
699} 1124}
700#endif 1125#endif
701 1126
702#ifdef TEXT_BLINK 1127#ifdef TEXT_BLINK
703void 1128void
704rxvt_term::text_blink_cb (time_watcher &w) 1129rxvt_term::text_blink_cb (ev::timer &w, int revents)
705{ 1130{
706 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1131 if (scr_refresh_rend (RS_Blink, RS_Blink))
707 { 1132 {
708 hidden_text = !hidden_text; 1133 hidden_text = !hidden_text;
709 want_refresh = 1; 1134 want_refresh = 1;
710 w.start (w.at + TEXT_BLINK_INTERVAL); 1135 }
1136}
1137#endif
1138
1139#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1140void
1141rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1142{
1143 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1144 scr_page (scrollbar_isUp() ? UP : DN, 1))
1145 want_refresh = 1;
1146 else
1147 w.stop ();
1148}
1149#endif
1150
1151#ifdef SELECTION_SCROLLING
1152void
1153rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1154{
1155 if (scr_page (scroll_selection_dir, scroll_selection_lines))
711 } 1156 {
1157 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1158 want_refresh = 1;
1159 }
1160 else
1161 w.stop ();
712} 1162}
1163#endif
1164
1165#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1166void
1167rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1168{
1169 if (mouse_slip_wheel_speed == 0
1170 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1171 : scr_page (UP, mouse_slip_wheel_speed))
1172 {
1173 if (view_start == top_row || view_start == 0)
1174 mouse_slip_wheel_speed = 0;
1175
1176 want_refresh = 1;
1177 }
1178 else
1179 w.stop ();
1180}
1181#endif
1182
1183#if LINUX_YIELD_HACK
1184static struct event_handler
1185{
1186 ev::prepare yield_ev;
1187
1188 void yield_cb (ev::prepare &w, int revents)
1189 {
1190 // this should really be sched_yield(), but the linux guys thought
1191 // that giving a process calling sched_yield () less cpu time than
1192 // ones with high nice levels is a useful thing to do. It surely is is
1193 // allowed by the sus... as is returning ENOSYS.
1194
1195 struct timespec ts = { 0, 0 };
1196 nanosleep (&ts, 0);
1197
1198 w.stop ();
1199 }
1200
1201 event_handler ()
1202 : yield_ev (this, &event_handler::yield_cb)
1203 {
1204 }
1205} event_handler;
713#endif 1206#endif
714 1207
715bool 1208bool
716rxvt_term::pty_fill () 1209rxvt_term::pty_fill ()
717{ 1210{
718 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1211 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
719 1212
720 if (CBUFSIZ == n) 1213 if (CBUFSIZ == n)
721 { 1214 {
722 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1215 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
723 n = 0; 1216 n = 0;
724 } 1217 }
725 1218
726 memmove (cmdbuf_base, cmdbuf_ptr, n); 1219 memmove (cmdbuf_base, cmdbuf_ptr, n);
727 cmdbuf_ptr = cmdbuf_base; 1220 cmdbuf_ptr = cmdbuf_base;
728 cmdbuf_endp = cmdbuf_ptr + n; 1221 cmdbuf_endp = cmdbuf_ptr + n;
729 1222
730 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1223 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
731 1224
732 if (n > 0) 1225 if (r > 0)
733 { 1226 {
734 cmdbuf_endp += n; 1227 cmdbuf_endp += r;
735 return true; 1228 return true;
736 } 1229 }
737 else if (n < 0 && errno != EAGAIN) 1230 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1231 {
1232#if LINUX_YIELD_HACK
1233 if (display->is_local)
1234 event_handler.yield_ev.start ();
1235#endif
1236 }
1237 else
1238 {
1239 pty_ev.stop ();
1240
1241 if (!option (Opt_hold))
738 destroy (); 1242 destroy ();
739 1243 }
1244
740 return false; 1245 return false;
741} 1246}
742 1247
743void 1248void
744rxvt_term::pty_cb (io_watcher &w, short revents) 1249rxvt_term::pty_cb (ev::io &w, int revents)
745{ 1250{
746 SET_R (this); 1251 make_current ();
747 SET_LOCALE (locale);
748 1252
749 if (revents & EVENT_WRITE) 1253 if (revents & ev::READ)
750 tt_write (0, 0);
751 else if (revents & EVENT_READ)
752 // loop, but don't allow a single term to monopolize us 1254 // loop, but don't allow a single term to monopolize us
753 while (pty_fill ()) 1255 while (pty_fill ())
754 if (cmd_parse ()) 1256 if (cmd_parse ())
755 break; 1257 break;
1258
1259 if (revents & ev::WRITE)
1260 pty_write ();
1261}
1262
1263void
1264rxvt_term::pointer_unblank ()
1265{
1266 XDefineCursor (dpy, vt, TermWin_cursor);
1267 recolour_cursor ();
1268
1269#ifdef POINTER_BLANK
1270 hidden_pointer = 0;
1271
1272 if (option (Opt_pointerBlank))
1273 pointer_ev.start (pointerBlankDelay);
1274#endif
756} 1275}
757 1276
758#ifdef POINTER_BLANK 1277#ifdef POINTER_BLANK
759void 1278void
760rxvt_term::pointer_unblank () 1279rxvt_term::pointer_blank ()
761{ 1280{
762 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1281 if (!option (Opt_pointerBlank))
763 recolour_cursor (); 1282 return;
764 1283
1284 XDefineCursor (dpy, vt, display->blank_cursor);
1285 XFlush (dpy);
1286
765 hidden_pointer = 0; 1287 hidden_pointer = 1;
766
767 if (Options & Opt_pointerBlank)
768 pointer_ev.start (NOW + pointerBlankDelay);
769} 1288}
770 1289
771void 1290void
772rxvt_term::pointer_blank () 1291rxvt_term::pointer_cb (ev::timer &w, int revents)
773{ 1292{
774 if (! (Options & Opt_pointerBlank)) 1293 make_current ();
775 return;
776
777 XDefineCursor (display->display, TermWin.vt, blank_cursor);
778 XFlush (display->display);
779
780 hidden_pointer = 1;
781}
782
783void
784rxvt_term::pointer_cb (time_watcher &w)
785{
786 SET_R (this);
787 SET_LOCALE (locale);
788 1294
789 pointer_blank (); 1295 pointer_blank ();
790} 1296}
791#endif 1297#endif
792 1298
793void 1299void
794rxvt_term::mouse_report (XButtonEvent &ev) 1300rxvt_term::mouse_report (XButtonEvent &ev)
795{ 1301{
796 int button_number, key_state = 0; 1302 int button_number, key_state = 0;
797 int x, y; 1303 int x, y;
1304 int code = 32;
798 1305
799 x = ev.x; 1306 x = Pixel2Col (ev.x);
800 y = ev.y; 1307 y = Pixel2Row (ev.y);
801 pixel_position (&x, &y); 1308 if (ev.type == MotionNotify) {
1309 if (x == mouse_row && y == mouse_col)
1310 return;
1311 mouse_row = x;
1312 mouse_col = y;
1313 code += 32;
1314 }
802 1315
803 if (MEvent.button == AnyButton) 1316 if (MEvent.button == AnyButton)
804 {
805 button_number = 3; 1317 button_number = 3;
806 }
807 else 1318 else
808 { 1319 {
809 button_number = MEvent.button - Button1; 1320 button_number = MEvent.button - Button1;
810 /* add 0x3D for wheel events, like xterm does */ 1321 /* add 0x3D for wheel events, like xterm does */
811 if (button_number >= 3) 1322 if (button_number >= 3)
812 button_number += (64 - 3); 1323 button_number += (64 - 3);
813 } 1324 }
814 1325
815 if (PrivateModes & PrivMode_MouseX10) 1326 if (priv_modes & PrivMode_MouseX10)
816 { 1327 {
817 /* 1328 /*
818 * do not report ButtonRelease 1329 * do not report ButtonRelease
819 * no state info allowed 1330 * no state info allowed
820 */ 1331 */
… …
835 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1346 + ((MEvent.state & ModMetaMask) ? 8 : 0)
836 + ((MEvent.state & ControlMask) ? 16 : 0); 1347 + ((MEvent.state & ControlMask) ? 16 : 0);
837#ifdef MOUSE_REPORT_DOUBLECLICK 1348#ifdef MOUSE_REPORT_DOUBLECLICK
838 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1349 key_state += ((MEvent.clicks > 1) ? 32 : 0);
839#endif 1350#endif
840
841 } 1351 }
842 1352
843#ifdef DEBUG_MOUSEREPORT 1353#if DEBUG_MOUSEREPORT
844 fprintf (stderr, "Mouse ["); 1354 fprintf (stderr, "Mouse [");
845 if (key_state & 16) 1355 if (key_state & 16)
846 fputc ('C', stderr); 1356 fputc ('C', stderr);
847 if (key_state & 4) 1357 if (key_state & 4)
848 fputc ('S', stderr); 1358 fputc ('S', stderr);
… …
852 fputc ('2', stderr); 1362 fputc ('2', stderr);
853 fprintf (stderr, "]: <%d>, %d/%d\n", 1363 fprintf (stderr, "]: <%d>, %d/%d\n",
854 button_number, 1364 button_number,
855 x + 1, 1365 x + 1,
856 y + 1); 1366 y + 1);
857#else 1367#endif
1368
858 tt_printf ("\033[M%c%c%c", 1369 tt_printf ("\033[M%c%c%c",
859 (32 + button_number + key_state), 1370 (code + button_number + key_state),
860 (32 + x + 1), 1371 (32 + x + 1),
861 (32 + y + 1)); 1372 (32 + y + 1));
862#endif
863} 1373}
864
865#ifdef USING_W11LIB
866void
867rxvt_W11_process_x_event (XEvent *ev)
868{
869 rxvt_t *r = rxvt_get_r ();
870
871 x_cb (*ev);
872}
873#endif
874 1374
875/*{{{ process an X event */ 1375/*{{{ process an X event */
876void 1376void
877rxvt_term::x_cb (XEvent &ev) 1377rxvt_term::x_cb (XEvent &ev)
878{ 1378{
879 SET_R (this); 1379 make_current ();
880 SET_LOCALE (locale);
881 1380
882#if defined(CURSOR_BLINK) 1381 dLocal (Display *, dpy);
883 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
884 {
885 if (hidden_cursor)
886 {
887 hidden_cursor = 0;
888 want_refresh = 1;
889 }
890 1382
891 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1383 if (ev.xany.window == vt
892 } 1384 && SHOULD_INVOKE (HOOK_X_EVENT)
893#endif 1385 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
894
895#if defined(POINTER_BLANK)
896 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
897 {
898 if (ev.type == MotionNotify
899 || ev.type == ButtonPress
900 || ev.type == ButtonRelease)
901 if (hidden_pointer)
902 pointer_unblank ();
903
904 if (ev.type == KeyPress && hidden_pointer == 0)
905 pointer_blank ();
906 }
907#endif
908
909#ifdef USE_XIM
910 if (XFilterEvent (&ev, None))
911 return; 1386 return;
912#endif
913 1387
1388 // for XQueryPointer
914 Window unused_root, unused_child; 1389 Window unused_root, unused_child;
915 int unused_root_x, unused_root_y; 1390 int unused_root_x, unused_root_y;
916 unsigned int unused_mask; 1391 unsigned int unused_mask;
917
918#ifdef DEBUG_X
919 const char *const eventnames[] =
920 { /* mason - this matches my system */
921 "",
922 "",
923 "KeyPress",
924 "KeyRelease",
925 "ButtonPress",
926 "ButtonRelease",
927 "MotionNotify",
928 "EnterNotify",
929 "LeaveNotify",
930 "FocusIn",
931 "FocusOut",
932 "KeymapNotify",
933 "Expose",
934 "GraphicsExpose",
935 "NoExpose",
936 "VisibilityNotify",
937 "CreateNotify",
938 "DestroyNotify",
939 "UnmapNotify",
940 "MapNotify",
941 "MapRequest",
942 "ReparentNotify",
943 "ConfigureNotify",
944 "ConfigureRequest",
945 "GravityNotify",
946 "ResizeRequest",
947 "CirculateNotify",
948 "CirculateRequest",
949 "PropertyNotify",
950 "SelectionClear",
951 "SelectionRequest",
952 "SelectionNotify",
953 "ColormapNotify",
954 "ClientMessage",
955 "MappingNotify"
956 };
957#endif
958
959#ifdef DEBUG_X
960 struct timeval tp;
961 struct tm *ltt;
962 (void)gettimeofday (&tp, NULL);
963 ltt = localtime (& (tp.tv_sec));
964 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
965#endif
966 1392
967 switch (ev.type) 1393 switch (ev.type)
968 { 1394 {
969 case KeyPress: 1395 case KeyPress:
970 lookup_key (ev.xkey); 1396 key_press (ev.xkey);
971 break; 1397 break;
972 1398
973#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
974 case KeyRelease: 1399 case KeyRelease:
975 { 1400 key_release (ev.xkey);
976 if (! (ev.xkey.state & ControlMask))
977 mouse_slip_wheel_speed = 0;
978 else
979 {
980 KeySym ks;
981
982 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
983 if (ks == XK_Control_L || ks == XK_Control_R)
984 mouse_slip_wheel_speed = 0;
985 }
986 break; 1401 break;
987 }
988#endif
989 1402
990 case ButtonPress: 1403 case ButtonPress:
991 button_press (ev.xbutton); 1404 button_press (ev.xbutton);
992 break; 1405 break;
993 1406
… …
995 button_release (ev.xbutton); 1408 button_release (ev.xbutton);
996 break; 1409 break;
997 1410
998 case ClientMessage: 1411 case ClientMessage:
999 if (ev.xclient.format == 32 1412 if (ev.xclient.format == 32
1000 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1413 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1001 destroy ();
1002#ifdef OFFIX_DND
1003 /* OffiX Dnd (drag 'n' drop) protocol */
1004 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1005 && (ev.xclient.data.l[0] == DndFile
1006 || ev.xclient.data.l[0] == DndDir
1007 || ev.xclient.data.l[0] == DndLink))
1008 { 1414 {
1009 /* Get Dnd data */ 1415 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1010 Atom ActualType; 1416 {
1011 int ActualFormat; 1417 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1012 unsigned char *data; 1418 {
1013 unsigned long Size, RemainingBytes; 1419 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1014 1420 {
1015 XGetWindowProperty (display->display, display->root, 1421 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1016 xa[XA_DNDSELECTION], 1422 destroy ();
1017 0L, 1000000L, 1423 }
1018 False, AnyPropertyType, 1424#if ENABLE_EWMH
1019 &ActualType, &ActualFormat, 1425 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1020 &Size, &RemainingBytes, 1426 XSendEvent (dpy, ev.xclient.window = display->root,
1427 False, SubstructureRedirectMask | SubstructureNotifyMask,
1021 &data); 1428 &ev);
1022 XChangeProperty (display->display, display->root, 1429#endif
1023 XA_CUT_BUFFER0, XA_STRING, 1430 }
1024 8, PropModeReplace, 1431 }
1025 data, STRLEN (data)); 1432#if ENABLE_XEMBED
1026 XFree (data); 1433 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1027 selection_paste (display->root, XA_CUT_BUFFER0, True); 1434 {
1028 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1435 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1436 focus_in ();
1437 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1438 focus_out ();
1439 }
1440#endif
1029 } 1441 }
1030#endif /* OFFIX_DND */
1031 break;
1032
1033 case MappingNotify:
1034 XRefreshKeyboardMapping (& (ev.xmapping));
1035 break; 1442 break;
1036 1443
1037 /* 1444 /*
1038 * XXX: this is not the _current_ arrangement 1445 * XXX: this is not the _current_ arrangement
1039 * Here's my conclusion: 1446 * Here's my conclusion:
… …
1058 break; 1465 break;
1059 } 1466 }
1060 break; 1467 break;
1061 1468
1062 case FocusIn: 1469 case FocusIn:
1063 if (!TermWin.focus) 1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1473 focus_in ();
1474 break;
1475
1476 case FocusOut:
1477 if (ev.xfocus.detail != NotifyInferior
1478 && ev.xfocus.detail != NotifyPointer
1479 && ev.xfocus.mode != NotifyGrab)
1480 focus_out ();
1481 break;
1482
1483 case ConfigureNotify:
1484 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1485 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1486 szHint.width, szHint.height); */
1487 if (ev.xconfigure.window == parent[0])
1064 { 1488 {
1065 TermWin.focus = 1; 1489 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1066 want_refresh = 1;
1067#ifdef USE_XIM
1068 if (Input_Context != NULL)
1069 XSetICFocus (Input_Context);
1070#endif
1071#ifdef CURSOR_BLINK
1072 if (Options & Opt_cursorBlink)
1073 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1074#endif
1075
1076 } 1490 ;
1077 break;
1078 1491
1079 case FocusOut: 1492 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1080 if (TermWin.focus)
1081 { 1493 {
1082 TermWin.focus = 0; 1494 seen_resize = 1;
1083 want_refresh = 1; 1495 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1084#ifdef USE_XIM
1085 if (Input_Context != NULL)
1086 XUnsetICFocus (Input_Context);
1087#endif
1088#ifdef CURSOR_BLINK
1089 if (Options & Opt_cursorBlink)
1090 cursor_blink_ev.stop ();
1091 hidden_cursor = 0;
1092#endif
1093
1094 }
1095 break;
1096
1097 case ConfigureNotify:
1098 if (ev.xconfigure.window == TermWin.parent[0])
1099 {
1100 int height, width;
1101
1102 do
1103 { /* Wrap lots of configures into one */
1104 width = ev.xconfigure.width;
1105 height = ev.xconfigure.height;
1106 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1107 } 1496 }
1108 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1109
1110 if (szHint.width != width || szHint.height != height)
1111 {
1112 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1113 resize_all_windows (width, height, 1);
1114 }
1115#ifdef DEBUG_SIZE
1116 else 1497 else
1117 { 1498 {
1118 D_SIZE ((stderr, "Size: Not resizing")); 1499#ifdef HAVE_BG_PIXMAP
1500 if (bgPixmap.window_position_sensitive ())
1501 update_background ();
1502#endif
1119 } 1503 }
1120#endif 1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1121#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1122 if (Options & Opt_transparent)
1123 {
1124 check_our_parents ();
1125 if (am_transparent)
1126 want_full_refresh = 1;
1127 }
1128#endif
1129 } 1505 }
1506 break;
1507
1508 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1510 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1511 && ev.xproperty.state == PropertyNewValue)
1512 selection_property (ev.xproperty.window, ev.xproperty.atom);
1513
1130 break; 1514 break;
1131 1515
1132 case SelectionClear: 1516 case SelectionClear:
1133 selection_clear (); 1517 selection_clear ();
1134 break; 1518 break;
1135 1519
1136 case SelectionNotify: 1520 case SelectionNotify:
1137 if (selection_wait == Sel_normal) 1521 if (selection_wait == Sel_normal)
1138 selection_paste (ev.xselection.requestor, 1522 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1139 ev.xselection.property, True);
1140 break; 1523 break;
1141 1524
1142 case SelectionRequest: 1525 case SelectionRequest:
1143 selection_send (ev.xselectionrequest); 1526 selection_send (ev.xselectionrequest);
1144 break; 1527 break;
1145 1528
1529 case MapNotify:
1530 mapped = 1;
1531#ifdef TEXT_BLINK
1532 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1533#endif
1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1535 break;
1536
1146 case UnmapNotify: 1537 case UnmapNotify:
1147 TermWin.mapped = 0; 1538 mapped = 0;
1148#ifdef TEXT_BLINK 1539#ifdef TEXT_BLINK
1149 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1150#endif 1541#endif
1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1151 break; 1543 break;
1152
1153 case MapNotify:
1154 TermWin.mapped = 1;
1155#ifdef TEXT_BLINK
1156 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1157#endif
1158 break;
1159
1160#ifdef TRANSPARENT
1161 case ReparentNotify:
1162 rootwin_cb (ev);
1163 break;
1164#endif /* TRANSPARENT */
1165 1544
1166 case GraphicsExpose: 1545 case GraphicsExpose:
1167 case Expose: 1546 case Expose:
1168 if (ev.xany.window == TermWin.vt) 1547 if (ev.xany.window == vt)
1169 { 1548 {
1170#ifdef NO_SLOW_LINK_SUPPORT 1549 do
1550 {
1171 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1172 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1173#else 1553 }
1174 // don't understand this, so commented it out 1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1555
1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1557
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1559 {
1175 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1176 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1177 //scr_expose (ev.xexpose.x, 0, 1562 }
1178 // ev.xexpose.width, TermWin.height, False);
1179#endif
1180 want_refresh = 1; 1563 want_refresh = 1;
1181 } 1564 }
1182 else 1565 else
1183 { 1566 {
1184 XEvent unused_event; 1567 XEvent unused_event;
1185 1568
1186 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1187 Expose, 1570 ;
1188 &unused_event)) ; 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1189 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1572 ;
1190 GraphicsExpose, 1573
1191 &unused_event)) ;
1192 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1193 { 1575 {
1194 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1195 scrollbar_show (0); 1577 scrollbar_show (0);
1196 } 1578 }
1197#ifdef MENUBAR
1198 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1199 menubar_expose ();
1200#endif
1201 } 1579 }
1202 break; 1580 break;
1203 1581
1204 case MotionNotify: 1582 case MotionNotify:
1205#ifdef POINTER_BLANK 1583#ifdef POINTER_BLANK
1206 if (hidden_pointer) 1584 if (hidden_pointer)
1207 pointer_unblank (); 1585 pointer_unblank ();
1208#endif 1586#endif
1209#if MENUBAR 1587 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1210 if (isMenuBarWindow (ev.xany.window)) 1588 || priv_modes & PrivMode_MouseAnyEvent)
1589 mouse_report (ev.xbutton);
1590 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1591 break;
1592
1593 if (ev.xany.window == vt)
1211 { 1594 {
1212 menubar_control (ev.xbutton); 1595 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1213 break; 1596 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1214 } 1597 ; // nop
1215#endif
1216 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1217 break;
1218
1219 if (ev.xany.window == TermWin.vt)
1220 {
1221 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1598 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1222 { 1599 {
1223 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1600 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1224 ; 1601 ;
1225 1602
1226 XQueryPointer (display->display, TermWin.vt, 1603 XQueryPointer (dpy, vt,
1227 &unused_root, &unused_child, 1604 &unused_root, &unused_child,
1228 &unused_root_x, &unused_root_y, 1605 &unused_root_x, &unused_root_y,
1229 & (ev.xbutton.x), & (ev.xbutton.y), 1606 &ev.xbutton.x, &ev.xbutton.y,
1230 &unused_mask); 1607 &ev.xbutton.state);
1231#ifdef MOUSE_THRESHOLD 1608#ifdef MOUSE_THRESHOLD
1232 /* deal with a `jumpy' mouse */ 1609 /* deal with a `jumpy' mouse */
1233 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1610 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1234 { 1611 {
1235#endif 1612#endif
1613#if ISO_14755
1614 // 5.4
1615 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1616 {
1617 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1618 break;
1619 }
1620#endif
1236 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1621 selection_extend (ev.xbutton.x, ev.xbutton.y,
1237 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1622 ev.xbutton.state & Button3Mask ? 2 : 0);
1623
1238#ifdef SELECTION_SCROLLING 1624#ifdef SELECTION_SCROLLING
1239 if (ev.xbutton.y < TermWin.int_bwidth 1625 if (ev.xbutton.y < int_bwidth
1240 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1626 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1241 { 1627 {
1242 int dist; 1628 int dist;
1243
1244 pending_scroll_selection=1;
1245 1629
1246 /* don't clobber the current delay if we are 1630 /* don't clobber the current delay if we are
1247 * already in the middle of scrolling. 1631 * already in the middle of scrolling.
1248 */ 1632 */
1249 if (scroll_selection_delay<=0) 1633 if (!sel_scroll_ev.active)
1250 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1634 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1251 1635
1252 /* save the event params so we can highlight 1636 /* save the event params so we can highlight
1253 * the selection in the pending-scroll loop 1637 * the selection in the pending-scroll loop
1254 */ 1638 */
1255 selection_save_x=ev.xbutton.x; 1639 selection_save_x = ev.xbutton.x;
1256 selection_save_y=ev.xbutton.y; 1640 selection_save_y = ev.xbutton.y;
1257 selection_save_state=
1258 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1641 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1259 1642
1260 /* calc number of lines to scroll */ 1643 /* calc number of lines to scroll */
1261 if (ev.xbutton.y<TermWin.int_bwidth) 1644 if (ev.xbutton.y < int_bwidth)
1262 { 1645 {
1263 scroll_selection_dir = UP; 1646 scroll_selection_dir = UP;
1264 dist = TermWin.int_bwidth - ev.xbutton.y; 1647 dist = int_bwidth - ev.xbutton.y;
1265 } 1648 }
1266 else 1649 else
1267 { 1650 {
1268 scroll_selection_dir = DN; 1651 scroll_selection_dir = DN;
1269 dist = ev.xbutton.y - 1652 dist = ev.xbutton.y - (int_bwidth + height);
1270 (TermWin.int_bwidth + TermWin.height);
1271 } 1653 }
1654
1272 scroll_selection_lines= (Pixel2Height (dist)/ 1655 scroll_selection_lines = Pixel2Height (dist)
1273 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1656 / SELECTION_SCROLL_LINE_SPEEDUP
1657 + 1;
1274 MIN_IT (scroll_selection_lines, 1658 min_it (scroll_selection_lines,
1275 SELECTION_SCROLL_MAX_LINES); 1659 SELECTION_SCROLL_MAX_LINES);
1276 } 1660 }
1277 else 1661 else
1278 { 1662 {
1279 /* we are within the text window, so we 1663 /* we are within the text window, so we
1280 * shouldn't be scrolling 1664 * shouldn't be scrolling
1281 */ 1665 */
1282 pending_scroll_selection = 0; 1666 if (sel_scroll_ev.active)
1667 sel_scroll_ev.stop();
1283 } 1668 }
1284#endif 1669#endif
1285#ifdef MOUSE_THRESHOLD 1670#ifdef MOUSE_THRESHOLD
1286
1287 } 1671 }
1288#endif 1672#endif
1289
1290 } 1673 }
1291 } 1674 }
1292 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1675 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1293 { 1676 {
1294 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1677 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1295 MotionNotify, &ev)) ; 1678 MotionNotify, &ev))
1679 ;
1680
1296 XQueryPointer (display->display, scrollBar.win, 1681 XQueryPointer (dpy, scrollBar.win,
1297 &unused_root, &unused_child, 1682 &unused_root, &unused_child,
1298 &unused_root_x, &unused_root_y, 1683 &unused_root_x, &unused_root_y,
1299 & (ev.xbutton.x), & (ev.xbutton.y), 1684 &ev.xbutton.x, &ev.xbutton.y,
1300 &unused_mask); 1685 &unused_mask);
1301 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1686 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1302 scrollbar_size ()); 1687 scrollbar_size ());
1303 scr_refresh (refresh_type);
1304 refresh_limit = 0; 1688 want_refresh = 1;
1305 scrollbar_show (1); 1689 scrollbar_show (1);
1306 } 1690 }
1307 break; 1691 break;
1308 } 1692 }
1309}
1310 1693
1694#if defined(CURSOR_BLINK)
1695 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1696 {
1697 if (hidden_cursor)
1698 {
1699 hidden_cursor = 0;
1700 want_refresh = 1;
1701 }
1702
1703 cursor_blink_ev.again ();
1704 }
1705#endif
1706
1707#if defined(POINTER_BLANK)
1708 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1709 {
1710 if (ev.type == MotionNotify
1711 || ev.type == ButtonPress
1712 || ev.type == ButtonRelease)
1713 if (hidden_pointer)
1714 pointer_unblank ();
1715
1716 if (ev.type == KeyPress && hidden_pointer == 0)
1717 pointer_blank ();
1718 }
1719#endif
1720}
1721
1722void
1723rxvt_term::focus_in ()
1724{
1725 if (!focus)
1726 {
1727 focus = 1;
1728 want_refresh = 1;
1729
1730 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1731
1732#if USE_XIM
1733 if (Input_Context != NULL)
1734 {
1735 IMSetPosition ();
1736 XSetICFocus (Input_Context);
1737 }
1738#endif
1739#if CURSOR_BLINK
1740 if (option (Opt_cursorBlink))
1741 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1742#endif
1743#if OFF_FOCUS_FADING
1744 if (rs[Rs_fade])
1745 {
1746 pix_colors = pix_colors_focused;
1747 scr_recolour ();
1748 }
1749#endif
1750#if ENABLE_FRILLS
1751 if (option (Opt_urgentOnBell))
1752 {
1753 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1754 {
1755 h->flags &= ~XUrgencyHint;
1756 XSetWMHints (dpy, parent[0], h);
1757 }
1758 }
1759#endif
1760 }
1761}
1762
1763void
1764rxvt_term::focus_out ()
1765{
1766 if (focus)
1767 {
1768 focus = 0;
1769 want_refresh = 1;
1770
1771 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1772
1773#if ENABLE_FRILLS || ISO_14755
1774 if (iso14755buf)
1775 {
1776 iso14755buf = 0;
1777# if ISO_14755
1778 scr_overlay_off ();
1779# endif
1780 }
1781#endif
1782#if USE_XIM
1783 if (Input_Context != NULL)
1784 XUnsetICFocus (Input_Context);
1785#endif
1786#if CURSOR_BLINK
1787 if (option (Opt_cursorBlink))
1788 cursor_blink_ev.stop ();
1789
1790 hidden_cursor = 0;
1791#endif
1792#if OFF_FOCUS_FADING
1793 if (rs[Rs_fade])
1794 {
1795 pix_colors = pix_colors_unfocused;
1796 scr_recolour ();
1797 }
1798#endif
1799 }
1800}
1801
1802void
1803rxvt_term::update_fade_color (unsigned int idx)
1804{
1805#if OFF_FOCUS_FADING
1806 if (rs[Rs_fade])
1807 {
1808 rgba c;
1809 pix_colors [Color_fade].get (c);
1810 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1811 }
1812#endif
1813}
1814
1815#if ENABLE_TRANSPARENCY || ENABLE_PERL
1311void 1816void
1312rxvt_term::rootwin_cb (XEvent &ev) 1817rxvt_term::rootwin_cb (XEvent &ev)
1313{ 1818{
1314 SET_R (this); 1819 make_current ();
1315 SET_LOCALE (locale);
1316 1820
1821 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1822 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1823 return;
1824
1825# if ENABLE_TRANSPARENCY
1317 switch (ev.type) 1826 switch (ev.type)
1318 { 1827 {
1319 case PropertyNotify: 1828 case PropertyNotify:
1829 /*
1830 * if user used some Esetroot compatible prog to set the root bg,
1831 * use the property to determine the pixmap. We use it later on.
1832 */
1320 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1833 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1834 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1321 { 1835 {
1322 if (ev.xproperty.state == PropertyNewValue) 1836 bgPixmap.set_root_pixmap ();
1323 selection_property (ev.xproperty.window, ev.xproperty.atom); 1837 update_background ();
1324 break;
1325 } 1838 }
1326#ifdef TRANSPARENT
1327 else
1328 {
1329 /*
1330 * if user used some Esetroot compatible prog to set the root bg,
1331 * use the property to determine the pixmap. We use it later on.
1332 */
1333 if (xa[XA_XROOTPMAPID] == 0)
1334 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1335
1336 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1337 return;
1338 }
1339
1340 /* FALLTHROUGH */
1341 case ReparentNotify:
1342 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1343 want_full_refresh = 1;
1344 break; 1839 break;
1840 }
1345#endif 1841# endif
1346 }
1347} 1842}
1843#endif
1348 1844
1349void 1845void
1350rxvt_term::button_press (XButtonEvent &ev) 1846rxvt_term::button_press (XButtonEvent &ev)
1351{ 1847{
1352 int reportmode = 0, clickintime; 1848 int reportmode = 0, clickintime;
1353 1849
1354 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1850 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1851
1355 if (!bypass_keystate) 1852 if (!bypass_keystate)
1356 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1853 reportmode = !! (priv_modes & PrivMode_mouse_report);
1854
1357 /* 1855 /*
1358 * VT window processing of button press 1856 * VT window processing of button press
1359 */ 1857 */
1360 if (ev.window == TermWin.vt) 1858 if (ev.window == vt)
1361 { 1859 {
1860 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1861 return;
1862
1863#if ISO_14755
1864 // 5.4
1865 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1866 {
1867 iso14755_54 (ev.x, ev.y);
1868 return;
1869 }
1870#endif
1871
1362 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1872 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1873
1363 if (reportmode) 1874 if (reportmode)
1364 { 1875 {
1365 /* mouse report from vt window */ 1876 /* mouse report from vt window */
1366 /* save the xbutton state (for ButtonRelease) */ 1877 /* save the xbutton state (for ButtonRelease) */
1367 MEvent.state = ev.state; 1878 MEvent.state = ev.state;
1368#ifdef MOUSE_REPORT_DOUBLECLICK 1879#ifdef MOUSE_REPORT_DOUBLECLICK
1369 if (ev.button == MEvent.button && clickintime) 1880 if (ev.button == MEvent.button && clickintime)
1370 { 1881 {
1371 /* same button, within alloted time */ 1882 /* same button, within alloted time */
1372 MEvent.clicks++; 1883 MEvent.clicks++;
1884
1373 if (MEvent.clicks > 1) 1885 if (MEvent.clicks > 1)
1374 { 1886 {
1375 /* only report double clicks */ 1887 /* only report double clicks */
1376 MEvent.clicks = 2; 1888 MEvent.clicks = 2;
1377 mouse_report (ev); 1889 mouse_report (ev);
… …
1396 } 1908 }
1397 else 1909 else
1398 { 1910 {
1399 if (ev.button != MEvent.button) 1911 if (ev.button != MEvent.button)
1400 MEvent.clicks = 0; 1912 MEvent.clicks = 0;
1913
1401 switch (ev.button) 1914 switch (ev.button)
1402 { 1915 {
1403 case Button1: 1916 case Button1:
1917 /* allow meta + click to select rectangular areas */
1918 /* should be done in screen.C */
1919#if ENABLE_FRILLS
1920 selection.rect = !!(ev.state & ModMetaMask);
1921#else
1922 selection.rect = false;
1923#endif
1924
1404 /* allow shift+left click to extend selection */ 1925 /* allow shift+left click to extend selection */
1405 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1926 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1406 { 1927 {
1407 if (MEvent.button == Button1 && clickintime) 1928 if (MEvent.button == Button1 && clickintime)
1408 selection_rotate (ev.x, ev.y); 1929 selection_rotate (ev.x, ev.y);
1409 else 1930 else
1410 selection_extend (ev.x, ev.y, 1); 1931 selection_extend (ev.x, ev.y, 1);
… …
1425 case Button3: 1946 case Button3:
1426 if (MEvent.button == Button3 && clickintime) 1947 if (MEvent.button == Button3 && clickintime)
1427 selection_rotate (ev.x, ev.y); 1948 selection_rotate (ev.x, ev.y);
1428 else 1949 else
1429 selection_extend (ev.x, ev.y, 1); 1950 selection_extend (ev.x, ev.y, 1);
1951
1430 MEvent.button = Button3; 1952 MEvent.button = Button3;
1431 break; 1953 break;
1432 } 1954 }
1433 } 1955 }
1956
1434 MEvent.time = ev.time; 1957 MEvent.time = ev.time;
1435 return; 1958 return;
1436 } 1959 }
1437 1960
1438 /* 1961 /*
… …
1504 upordown = 1; /* down */ 2027 upordown = 1; /* down */
1505 } 2028 }
1506 if (upordown) 2029 if (upordown)
1507 { 2030 {
1508#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1509 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2032 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1510#endif 2033#endif
1511 if (scr_page (upordown < 0 ? UP : DN, 1)) 2034 if (scr_page (upordown < 0 ? UP : DN, 1))
1512 { 2035 {
1513 if (upordown < 0) 2036 if (upordown < 0)
1514 scrollBar.setUp (); 2037 scrollBar.setUp ();
… …
1530 break; 2053 break;
1531 case R_SB_ALIGN_BOTTOM: 2054 case R_SB_ALIGN_BOTTOM:
1532 csrO = scrollBar.bot - scrollBar.top; 2055 csrO = scrollBar.bot - scrollBar.top;
1533 break; 2056 break;
1534 } 2057 }
2058
1535 if (scrollBar.style == R_SB_XTERM 2059 if (scrollBar.style == R_SB_XTERM
1536 || scrollbar_above_slider (ev.y) 2060 || scrollbar_above_slider (ev.y)
1537 || scrollbar_below_slider (ev.y)) 2061 || scrollbar_below_slider (ev.y))
1538 scr_move_to ( scrollbar_position (ev.y) - csrO, 2062 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1539 scrollbar_size ()); 2063
1540 scrollBar.setMotion (); 2064 scrollBar.setMotion ();
1541 break; 2065 break;
1542 2066
1543 case Button1: 2067 case Button1:
1544 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2068 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1548 case Button3: 2072 case Button3:
1549 if (scrollBar.style != R_SB_XTERM) 2073 if (scrollBar.style != R_SB_XTERM)
1550 { 2074 {
1551 if (scrollbar_above_slider (ev.y)) 2075 if (scrollbar_above_slider (ev.y))
1552# ifdef RXVT_SCROLL_FULL 2076# ifdef RXVT_SCROLL_FULL
1553 scr_page (UP, TermWin.nrow - 1); 2077 scr_page (UP, nrow - 1);
1554# else 2078# else
1555 scr_page (UP, TermWin.nrow / 4); 2079 scr_page (UP, nrow / 4);
1556# endif 2080# endif
1557 else if (scrollbar_below_slider (ev.y)) 2081 else if (scrollbar_below_slider (ev.y))
1558# ifdef RXVT_SCROLL_FULL 2082# ifdef RXVT_SCROLL_FULL
1559 scr_page (DN, TermWin.nrow - 1); 2083 scr_page (DN, nrow - 1);
1560# else 2084# else
1561 scr_page (DN, TermWin.nrow / 4); 2085 scr_page (DN, nrow / 4);
1562# endif 2086# endif
1563 else 2087 else
1564 scrollBar.setMotion (); 2088 scrollBar.setMotion ();
1565 } 2089 }
1566 else 2090 else
1567 { 2091 {
1568 scr_page ((ev.button == Button1 ? DN : UP), 2092 scr_page ((ev.button == Button1 ? DN : UP),
1569 (TermWin.nrow 2093 (nrow
1570 * scrollbar_position (ev.y) 2094 * scrollbar_position (ev.y)
1571 / scrollbar_size ())); 2095 / scrollbar_size ()));
1572 } 2096 }
2097
1573 break; 2098 break;
1574 } 2099 }
1575 } 2100 }
2101
1576 return; 2102 return;
1577 } 2103 }
1578#if MENUBAR
1579 /*
1580 * Menubar window processing of button press
1581 */
1582 if (isMenuBarWindow (ev.window))
1583 menubar_control (ev);
1584#endif
1585} 2104}
1586 2105
1587void 2106void
1588rxvt_term::button_release (XButtonEvent &ev) 2107rxvt_term::button_release (XButtonEvent &ev)
1589{ 2108{
1590 int reportmode = 0; 2109 int reportmode = 0;
1591 2110
1592 csrO = 0; /* reset csr Offset */ 2111 csrO = 0; /* reset csr Offset */
1593 if (!bypass_keystate) 2112 if (!bypass_keystate)
1594 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2113 reportmode = !! (priv_modes & PrivMode_mouse_report);
1595 2114
1596 if (scrollbar_isUpDn ()) 2115 if (scrollbar_isUpDn ())
1597 { 2116 {
1598 scrollBar.setIdle (); 2117 scrollBar.setIdle ();
1599 scrollbar_show (0); 2118 scrollbar_show (0);
1600#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1601 refresh_type &= ~SMOOTH_REFRESH;
1602#endif
1603
1604 } 2119 }
2120
1605#ifdef SELECTION_SCROLLING 2121#ifdef SELECTION_SCROLLING
1606 pending_scroll_selection=0; 2122 if (sel_scroll_ev.active)
2123 sel_scroll_ev.stop();
1607#endif 2124#endif
2125
1608 if (ev.window == TermWin.vt) 2126 if (ev.window == vt)
1609 { 2127 {
2128 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2129 return;
2130
2131#if ISO_14755
2132 // 5.4
2133 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2134 return;
2135#endif
2136
1610 if (reportmode) 2137 if (reportmode)
1611 { 2138 {
1612 /* mouse report from vt window */ 2139 /* mouse report from vt window */
1613 /* don't report release of wheel "buttons" */ 2140 /* don't report release of wheel "buttons" */
1614 if (ev.button >= 4) 2141 if (ev.button >= 4)
… …
1628 MEvent.button = AnyButton; 2155 MEvent.button = AnyButton;
1629 mouse_report (ev); 2156 mouse_report (ev);
1630#endif /* MOUSE_REPORT_DOUBLECLICK */ 2157#endif /* MOUSE_REPORT_DOUBLECLICK */
1631 return; 2158 return;
1632 } 2159 }
2160
1633 /* 2161 /*
1634 * dumb hack to compensate for the failure of click-and-drag 2162 * dumb hack to compensate for the failure of click-and-drag
1635 * when overriding mouse reporting 2163 * when overriding mouse reporting
1636 */ 2164 */
1637 if (PrivateModes & PrivMode_mouse_report 2165 if (priv_modes & PrivMode_mouse_report
1638 && bypass_keystate 2166 && bypass_keystate
1639 && ev.button == Button1 && MEvent.clicks <= 1) 2167 && ev.button == Button1 && MEvent.clicks <= 1)
1640 selection_extend (ev.x, ev.y, 0); 2168 selection_extend (ev.x, ev.y, 0);
1641 2169
1642 switch (ev.button) 2170 switch (ev.button)
1643 { 2171 {
1644 case Button1: 2172 case Button1:
1645 case Button3: 2173 case Button3:
1646 selection_make (ev.time); 2174 selection_make (ev.time);
1647 break; 2175 break;
2176
1648 case Button2: 2177 case Button2:
1649 selection_request (ev.time, ev.x, ev.y); 2178 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2179 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1650 break; 2180 break;
2181
1651#ifdef MOUSE_WHEEL 2182#ifdef MOUSE_WHEEL
1652 case Button4: 2183 case Button4:
1653 case Button5: 2184 case Button5:
1654 { 2185 {
1655 int i; 2186 int i;
1656 page_dirn v; 2187 page_dirn v;
1657 2188
1658 v = (ev.button == Button4) ? UP : DN; 2189 v = ev.button == Button4 ? UP : DN;
2190
1659 if (ev.state & ShiftMask) 2191 if (ev.state & ShiftMask)
1660 i = 1; 2192 i = 1;
1661 else if ((Options & Opt_mouseWheelScrollPage)) 2193 else if (option (Opt_mouseWheelScrollPage))
1662 i = TermWin.nrow - 1; 2194 i = nrow - 1;
1663 else 2195 else
1664 i = 5; 2196 i = 5;
2197
1665# ifdef MOUSE_SLIP_WHEELING 2198# ifdef MOUSE_SLIP_WHEELING
1666 if (ev.state & ControlMask) 2199 if (ev.state & ControlMask)
1667 { 2200 {
1668 mouse_slip_wheel_speed += (v ? -1 : 1); 2201 mouse_slip_wheel_speed += v ? -1 : 1;
1669 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2202 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2203 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2204
2205 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2206 }
2207 else
2208 {
2209# endif
2210 scr_page (v, i);
2211 scrollbar_show (1);
2212# ifdef MOUSE_SLIP_WHEELING
1670 } 2213 }
1671# endif 2214# endif
1672# ifdef JUMP_MOUSE_WHEEL
1673 scr_page (v, i);
1674 scr_refresh (SMOOTH_REFRESH);
1675 scrollbar_show (1);
1676# else
1677 while (i--)
1678 {
1679 scr_page (v, 1);
1680 scr_refresh (SMOOTH_REFRESH);
1681 scrollbar_show (1);
1682 }
1683# endif
1684
1685 } 2215 }
1686 break; 2216 break;
1687#endif 2217#endif
1688
1689 }
1690 }
1691#ifdef MENUBAR
1692 else if (isMenuBarWindow (ev.window))
1693 menubar_control (ev);
1694#endif
1695}
1696
1697#ifdef TRANSPARENT
1698#if TINTING
1699/* shading taken from eterm-0.9.2 */
1700/* RGB 15 */
1701
1702static void
1703shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1704{
1705 unsigned char *ptr;
1706 int x, y;
1707
1708 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1709 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1710 /* No saturation */
1711 for (y = h; --y >= 0;) {
1712 for (x = -w; x < 0; x++) {
1713 int r, g, b;
1714
1715 b = ((uint16_t *) ptr)[x];
1716 r = (b & 0x7c00) * rm;
1717 g = (b & 0x3e0) * gm;
1718 b = (b & 0x1f) * bm;
1719 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1720 | ((g >> 8) & 0x3e0)
1721 | ((b >> 8) & 0x1f);
1722 }
1723 ptr += bpl;
1724 }
1725 } else {
1726 for (y = h; --y >= 0;) {
1727 for (x = -w; x < 0; x++) {
1728 int r, g, b;
1729
1730 b = ((uint16_t *) ptr)[x];
1731 r = (b & 0x7c00) * rm;
1732 g = (b & 0x3e0) * gm;
1733 b = (b & 0x1f) * bm;
1734 r |= (!(r >> 15) - 1);
1735 g |= (!(g >> 10) - 1);
1736 b |= (!(b >> 5) - 1);
1737 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1738 | ((g >> 8) & 0x3e0)
1739 | ((b >> 8) & 0x1f);
1740 }
1741 ptr += bpl;
1742 }
1743 }
1744}
1745
1746/* RGB 16 */
1747static void
1748shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1749{
1750 unsigned char *ptr;
1751 int x, y;
1752
1753 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1754 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1755 /* No saturation */
1756 for (y = h; --y >= 0;) {
1757 for (x = -w; x < 0; x++) {
1758 int r, g, b;
1759
1760 b = ((uint16_t *) ptr)[x];
1761 r = (b & 0xf800) * rm;
1762 g = (b & 0x7e0) * gm;
1763 b = (b & 0x1f) * bm;
1764 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1765 | ((g >> 8) & 0x7e0)
1766 | ((b >> 8) & 0x1f);
1767 }
1768 ptr += bpl;
1769 }
1770 } else {
1771 for (y = h; --y >= 0;) {
1772 for (x = -w; x < 0; x++) {
1773 int r, g, b;
1774
1775 b = ((uint16_t *) ptr)[x];
1776 r = (b & 0xf800) * rm;
1777 g = (b & 0x7e0) * gm;
1778 b = (b & 0x1f) * bm;
1779 r |= (!(r >> 16) - 1);
1780 g |= (!(g >> 11) - 1);
1781 b |= (!(b >> 5) - 1);
1782 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1783 | ((g >> 8) & 0x7e0)
1784 | ((b >> 8) & 0x1f);
1785 }
1786 ptr += bpl;
1787 }
1788 }
1789}
1790
1791/* RGB 24 */
1792static void
1793shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1794{
1795 unsigned char *ptr;
1796 int x, y;
1797
1798 ptr = (unsigned char *)data + (w * 3);
1799 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1800 /* No saturation */
1801 for (y = h; --y >= 0;) {
1802 for (x = -(w * 3); x < 0; x += 3) {
1803 int r, g, b;
1804
1805 if (byteorder.big_endian()) {
1806 r = (ptr[x + 0] * rm) >> 8;
1807 g = (ptr[x + 1] * gm) >> 8;
1808 b = (ptr[x + 2] * bm) >> 8;
1809 ptr[x + 0] = r;
1810 ptr[x + 1] = g;
1811 ptr[x + 2] = b;
1812 } else {
1813 r = (ptr[x + 2] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 0] * bm) >> 8;
1816 ptr[x + 2] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 0] = b;
1819 }
1820 }
1821 ptr += bpl;
1822 }
1823 } else {
1824 for (y = h; --y >= 0;) {
1825 for (x = -(w * 3); x < 0; x += 3) {
1826 int r, g, b;
1827
1828 if (byteorder.big_endian()) {
1829 r = (ptr[x + 0] * rm) >> 8;
1830 g = (ptr[x + 1] * gm) >> 8;
1831 b = (ptr[x + 2] * bm) >> 8;
1832
1833 r |= (!(r >> 8) - 1);
1834 g |= (!(g >> 8) - 1);
1835 b |= (!(b >> 8) - 1);
1836
1837 ptr[x + 0] = r;
1838 ptr[x + 1] = g;
1839 ptr[x + 2] = b;
1840 } else {
1841 r = (ptr[x + 2] * rm) >> 8;
1842 g = (ptr[x + 1] * gm) >> 8;
1843 b = (ptr[x + 0] * bm) >> 8;
1844
1845 r |= (!(r >> 8) - 1);
1846 g |= (!(g >> 8) - 1);
1847 b |= (!(b >> 8) - 1);
1848
1849 ptr[x + 2] = r;
1850 ptr[x + 1] = g;
1851 ptr[x + 0] = b;
1852 }
1853 }
1854 ptr += bpl;
1855 }
1856 }
1857}
1858
1859/* RGB 32 */
1860static void
1861shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1862{
1863 unsigned char *ptr;
1864 int x, y;
1865
1866 ptr = (unsigned char *)data + (w * 4);
1867 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1868 /* No saturation */
1869 for (y = h; --y >= 0;) {
1870 if (byteorder.big_endian()) {
1871 for (x = -(w * 4); x < 0; x += 4) {
1872 int r, g, b;
1873
1874 r = (ptr[x + 1] * rm) >> 8;
1875 g = (ptr[x + 2] * gm) >> 8;
1876 b = (ptr[x + 3] * bm) >> 8;
1877 ptr[x + 1] = r;
1878 ptr[x + 2] = g;
1879 ptr[x + 3] = b;
1880 }
1881 } else {
1882 for (x = -(w * 4); x < 0; x += 4) {
1883 int r, g, b;
1884
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888 ptr[x + 2] = r;
1889 ptr[x + 1] = g;
1890 ptr[x + 0] = b;
1891 }
1892 }
1893 ptr += bpl;
1894 }
1895 } else {
1896 for (y = h; --y >= 0;) {
1897 for (x = -(w * 4); x < 0; x += 4) {
1898 int r, g, b;
1899
1900 if (byteorder.big_endian()) {
1901 r = (ptr[x + 1] * rm) >> 8;
1902 g = (ptr[x + 2] * gm) >> 8;
1903 b = (ptr[x + 3] * bm) >> 8;
1904
1905 r |= (!(r >> 8) - 1);
1906 g |= (!(g >> 8) - 1);
1907 b |= (!(b >> 8) - 1);
1908
1909 ptr[x + 1] = r;
1910 ptr[x + 2] = g;
1911 ptr[x + 3] = b;
1912 } else {
1913 r = (ptr[x + 2] * rm) >> 8;
1914 g = (ptr[x + 1] * gm) >> 8;
1915 b = (ptr[x + 0] * bm) >> 8;
1916
1917 r |= (!(r >> 8) - 1);
1918 g |= (!(g >> 8) - 1);
1919 b |= (!(b >> 8) - 1);
1920
1921 ptr[x + 2] = r;
1922 ptr[x + 1] = g;
1923 ptr[x + 0] = b;
1924 }
1925 }
1926 ptr += bpl;
1927 }
1928 }
1929}
1930
1931#endif
1932
1933/*
1934 * Check our parents are still who we think they are.
1935 * Do transparency updates if required
1936 */
1937int
1938rxvt_term::check_our_parents ()
1939{
1940 int i, pchanged, aformat, have_pixmap, rootdepth;
1941 unsigned long nitems, bytes_after;
1942 Atom atype;
1943 unsigned char *prop = NULL;
1944 Window root, oldp, *list;
1945 Pixmap rootpixmap = None;
1946 XWindowAttributes wattr, wrootattr;
1947
1948 pchanged = 0;
1949
1950 if (!(Options & Opt_transparent))
1951 return pchanged; /* Don't try any more */
1952
1953 XGetWindowAttributes (display->display, display->root, &wrootattr);
1954 rootdepth = wrootattr.depth;
1955
1956 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1957
1958 if (rootdepth != wattr.depth)
1959 {
1960 if (am_transparent)
1961 { 2218 }
1962 pchanged = 1;
1963 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1964 am_transparent = am_pixmap_trans = 0;
1965 }
1966
1967 return pchanged; /* Don't try any more */
1968 }
1969
1970 /* Get all X ops out of the queue so that our information is up-to-date. */
1971 XSync (display->display, False);
1972
1973 /*
1974 * Make the frame window set by the window manager have
1975 * the root background. Some window managers put multiple nested frame
1976 * windows for each client, so we have to take care about that.
1977 */
1978 i = (xa[XA_XROOTPMAPID]
1979 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1980 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1981 &nitems, &bytes_after, &prop) == Success);
1982
1983 if (!i || prop == NULL)
1984 i = (xa[XA_XSETROOTID]
1985 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1986 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1987 &nitems, &bytes_after, &prop) == Success);
1988
1989 if (!i || prop == NULL)
1990 have_pixmap = 0;
1991 else
1992 { 2219 }
1993 have_pixmap = 1;
1994 rootpixmap = *(Pixmap *)prop;
1995 XFree (prop);
1996 }
1997
1998 if (have_pixmap)
1999 {
2000 /*
2001 * Copy display->root pixmap transparency
2002 */
2003 int sx, sy, nx, ny;
2004 unsigned int nw, nh;
2005 Window cr;
2006 XImage *image;
2007 GC gc;
2008 XGCValues gcvalue;
2009
2010 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2011 0, 0, &sx, &sy, &cr);
2012 nw = (unsigned int)szHint.width;
2013 nh = (unsigned int)szHint.height;
2014 nx = ny = 0;
2015
2016 if (sx < 0)
2017 {
2018 nw += sx;
2019 nx = -sx;
2020 sx = 0;
2021 }
2022
2023 if (sy < 0)
2024 {
2025 nh += sy;
2026 ny = -sy;
2027 sy = 0;
2028 }
2029
2030 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2031 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2032 allowedxerror = -1;
2033 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2034
2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2036 /* XXX: may need a delay here? */
2037 allowedxerror = 0;
2038
2039 if (image == NULL)
2040 {
2041 if (am_transparent && am_pixmap_trans)
2042 {
2043 pchanged = 1;
2044 if (TermWin.pixmap != None)
2045 {
2046 XFreePixmap (display->display, TermWin.pixmap);
2047 TermWin.pixmap = None;
2048 }
2049 }
2050
2051 am_pixmap_trans = 0;
2052 }
2053 else
2054 {
2055 if (TermWin.pixmap != None)
2056 XFreePixmap (display->display, TermWin.pixmap);
2057
2058#if TINTING
2059 if (ISSET_PIXCOLOR (Color_tint))
2060 {
2061 unsigned short shade, rm, gm, bm;
2062
2063 PixColors[Color_tint].get (display, rm, gm, bm);
2064
2065 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2066
2067 /* Determine bitshift and bitmask values */
2068 switch (image->bits_per_pixel)
2069 {
2070 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2074 }
2075 }
2076#endif
2077
2078 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2079 szHint.width, szHint.height, image->depth);
2080 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2081 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2082 nx, ny, image->width, image->height);
2083 XFreeGC (display->display, gc);
2084 XDestroyImage (image);
2085 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2086 TermWin.pixmap);
2087
2088 if (!am_transparent || !am_pixmap_trans)
2089 pchanged = 1;
2090
2091 am_transparent = am_pixmap_trans = 1;
2092 }
2093 }
2094
2095 if (!am_pixmap_trans)
2096 {
2097 unsigned int n;
2098 /*
2099 * InheritPixmap transparency
2100 */
2101 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2102 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2103 {
2104 oldp = TermWin.parent[i];
2105 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2106 &TermWin.parent[i], &list, &n);
2107 XFree (list);
2108 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2109
2110 if (TermWin.parent[i] == display->root)
2111 {
2112 if (oldp != None)
2113 pchanged = 1;
2114
2115 break;
2116 }
2117
2118 if (oldp != TermWin.parent[i])
2119 pchanged = 1;
2120 }
2121
2122 n = 0;
2123
2124 if (pchanged)
2125 {
2126 for (; n < (unsigned int)i; n++)
2127 {
2128 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2129 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2130 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2131 {
2132 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2133 break;
2134 }
2135 }
2136 }
2137
2138 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2139 {
2140 D_X ((stderr, "InheritPixmap Turning off"));
2141 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2142 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2143 am_transparent = 0;
2144 /* XXX: also turn off Opt_transparent? */
2145 }
2146 else
2147 {
2148#if WAIT_FOR_WM
2149 /* wait (an arbitrary period) for the WM to do its thing
2150 * needed for fvwm2.2.2 (and before?) */
2151 sleep (1);
2152#endif
2153 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2154 for (n = 0; n < (unsigned int)i; n++)
2155 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2156
2157 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2158 am_transparent = 1;
2159 }
2160
2161 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2162 TermWin.parent[i] = None;
2163 }
2164
2165 return pchanged;
2166} 2220}
2167#endif
2168 2221
2169/*}}} */ 2222/*}}} */
2170 2223
2171bool 2224bool
2172rxvt_term::cmd_parse () 2225rxvt_term::cmd_parse ()
2173{ 2226{
2174 bool flag = false; 2227 bool flag = false;
2175 unicode_t ch = NOCHAR; 2228 wchar_t ch = NOCHAR;
2176 unsigned char *seq_begin; // remember start of esc-sequence here 2229 char *seq_begin; // remember start of esc-sequence here
2177 2230
2178 for (;;) 2231 for (;;)
2179 { 2232 {
2180 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
2181 { 2234 {
2182 seq_begin = cmdbuf_ptr; 2235 seq_begin = cmdbuf_ptr;
2183 ch = next_char (); 2236 ch = next_char ();
2184 }
2185 2237
2186 if (ch == NOCHAR) // TODO: improve 2238 if (ch == NOCHAR)
2187 break; 2239 break;
2240 }
2188 2241
2189 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2242 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2190 { 2243 {
2244 if (!seen_input)
2245 {
2246 seen_input = 1;
2247 // many badly-written programs (e.g. jed) contain a race condition:
2248 // they first read the screensize and then install a SIGWINCH handler.
2249 // some window managers resize the window early, and these programs
2250 // then sometimes get the size wrong.
2251 // unfortunately other programs are even more buggy and dislike
2252 // being sent SIGWINCH, so only do it when we were in fact being
2253 // resized.
2254 if (seen_resize && cmd_pid)
2255 kill (-cmd_pid, SIGWINCH);
2256 }
2257
2191 /* Read a text string from the input buffer */ 2258 /* Read a text string from the input buffer */
2192 unicode_t buf[UBUFSIZ]; 2259 wchar_t buf[UBUFSIZ];
2193 bool refreshnow = false; 2260 bool refreshnow = false;
2194 int nlines = 0; 2261 int nlines = 0;
2195 unicode_t *str = buf; 2262 wchar_t *str = buf;
2196 2263 wchar_t *eol = str + min (ncol, UBUFSIZ);
2197 *str++ = ch;
2198 2264
2199 for (;;) 2265 for (;;)
2200 { 2266 {
2267 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2268 break;
2269
2270 *str++ = ch;
2271
2272 if (ch == C0_LF || str >= eol)
2273 {
2274 if (ch == C0_LF)
2275 nlines++;
2276
2277 refresh_count++;
2278
2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2280 {
2281 refresh_count = 0;
2282
2283 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2284 {
2285 refreshnow = true;
2286 ch = NOCHAR;
2287 break;
2288 }
2289 }
2290
2291 // scr_add_lines only works for nlines <= nrow - 1.
2292 if (nlines >= nrow - 1)
2293 {
2294 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2295 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2296 scr_add_lines (buf, str - buf, nlines);
2297
2298 nlines = 0;
2299 str = buf;
2300 eol = str + min (ncol, UBUFSIZ);
2301 }
2302
2303 if (str >= eol)
2304 {
2305 if (eol >= buf + UBUFSIZ)
2306 {
2307 ch = NOCHAR;
2308 break;
2309 }
2310 else
2311 eol = min (eol + ncol, buf + UBUFSIZ);
2312 }
2313
2314 }
2315
2201 seq_begin = cmdbuf_ptr; 2316 seq_begin = cmdbuf_ptr;
2202 ch = next_char (); 2317 ch = next_char ();
2203
2204 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2205 break;
2206
2207 *str++ = ch;
2208
2209 if (ch == C0_LF)
2210 {
2211 nlines++;
2212 refresh_count++;
2213
2214 if (! (Options & Opt_jumpScroll)
2215 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
2216 {
2217 refreshnow = true;
2218 flag = true;
2219 ch = NOCHAR;
2220 break;
2221 }
2222
2223 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2224 if (nlines >= TermWin.nrow - 1)
2225 {
2226 scr_add_lines (buf, nlines, str - buf);
2227 nlines = 0;
2228 str = buf;
2229 }
2230 }
2231
2232 if (str >= buf + UBUFSIZ)
2233 {
2234 ch = NOCHAR;
2235 break;
2236 }
2237 } 2318 }
2238 2319
2320 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2321 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2239 scr_add_lines (buf, nlines, str - buf); 2322 scr_add_lines (buf, str - buf, nlines);
2240 2323
2241 /* 2324 /*
2242 * If there have been a lot of new lines, then update the screen 2325 * If there have been a lot of new lines, then update the screen
2243 * What the heck I'll cheat and only refresh less than every page-full. 2326 * What the heck we'll cheat and only refresh less than every page-full.
2244 * the number of pages between refreshes is refresh_limit, which 2327 * if skipScroll is enabled.
2245 * is incremented here because we must be doing flat-out scrolling.
2246 *
2247 * refreshing should be correct for small scrolls, because of the
2248 * time-out
2249 */ 2328 */
2250 if (refreshnow) 2329 if (refreshnow)
2251 { 2330 {
2252 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2331 flag = true;
2253 refresh_limit++;
2254 else
2255 scr_refresh (refresh_type); 2332 scr_refresh ();
2333 want_refresh = 1;
2256 } 2334 }
2257 2335
2258 } 2336 }
2259 else 2337 else
2260 { 2338 {
… …
2275 2353
2276 return flag; 2354 return flag;
2277} 2355}
2278 2356
2279// read the next character 2357// read the next character
2280unicode_t 2358wchar_t
2281rxvt_term::next_char () 2359rxvt_term::next_char () NOTHROW
2282{ 2360{
2283 while (cmdbuf_ptr < cmdbuf_endp) 2361 while (cmdbuf_ptr < cmdbuf_endp)
2284 { 2362 {
2285 // assume 7-bit to be ascii ALWAYS 2363 // assume 7-bit to be ascii ALWAYS
2286 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2364 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2287 return *cmdbuf_ptr++; 2365 return *cmdbuf_ptr++;
2288 2366
2289 wchar_t wc; 2367 wchar_t wc;
2290 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2368 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2291 2369
2292 if (len == (size_t)-2) 2370 if (len == (size_t)-2)
2293 { 2371 {
2294 // the mbstate stores incomplete sequences. didn't know this :/ 2372 // the mbstate stores incomplete sequences. didn't know this :/
2295 cmdbuf_ptr = cmdbuf_endp; 2373 cmdbuf_ptr = cmdbuf_endp;
2296 break; 2374 break;
2297 } 2375 }
2298 2376
2299 if (len == (size_t)-1) 2377 if (len == (size_t)-1)
2300 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2378 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2301 2379
2302 // assume wchar == unicode 2380 // assume wchar == unicode
2303 cmdbuf_ptr += len; 2381 cmdbuf_ptr += len;
2304 return wc; 2382 return wc & UNICODE_MASK;
2305 } 2383 }
2306 2384
2307 return NOCHAR; 2385 return NOCHAR;
2308} 2386}
2387
2388// read the next octet
2389uint32_t
2390rxvt_term::next_octet () NOTHROW
2391{
2392 return cmdbuf_ptr < cmdbuf_endp
2393 ? (unsigned char)*cmdbuf_ptr++
2394 : NOCHAR;
2395}
2396
2397static class out_of_input out_of_input;
2309 2398
2310/* rxvt_cmd_getc () - Return next input character */ 2399/* rxvt_cmd_getc () - Return next input character */
2311/* 2400/*
2312 * Return the next input character after first passing any keyboard input 2401 * Return the next input character after first passing any keyboard input
2313 * to the command. 2402 * to the command.
2314 */ 2403 */
2315unicode_t 2404wchar_t
2316rxvt_term::cmd_getc () 2405rxvt_term::cmd_getc () THROW ((class out_of_input))
2317{ 2406{
2318 unicode_t c = next_char (); 2407 wchar_t c = next_char ();
2408
2409 if (c == NOCHAR)
2410 throw out_of_input;
2411
2412 return c;
2413}
2414
2415uint32_t
2416rxvt_term::cmd_get8 () THROW ((class out_of_input))
2417{
2418 uint32_t c = next_octet ();
2319 2419
2320 if (c == NOCHAR) 2420 if (c == NOCHAR)
2321 throw out_of_input; 2421 throw out_of_input;
2322 2422
2323 return c; 2423 return c;
… …
2387 { 2487 {
2388 if ((buf[len++] = cmd_getc ()) == 'i') 2488 if ((buf[len++] = cmd_getc ()) == 'i')
2389 break; /* done = 1 */ 2489 break; /* done = 1 */
2390 } 2490 }
2391 } 2491 }
2392 2492
2393 for (i = 0; i < len; i++) 2493 for (i = 0; i < len; i++)
2394 if (putc (buf[i], fd) == EOF) 2494 if (putc (buf[i], fd) == EOF)
2395 { 2495 {
2396 done = 1; 2496 done = 1;
2397 break; 2497 break;
… …
2423 case C0_ESC: 2523 case C0_ESC:
2424 process_escape_seq (); 2524 process_escape_seq ();
2425 break; 2525 break;
2426 case C0_ENQ: /* terminal Status */ 2526 case C0_ENQ: /* terminal Status */
2427 if (rs[Rs_answerbackstring]) 2527 if (rs[Rs_answerbackstring])
2428 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2528 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2429 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2430 else 2529 else
2431 tt_write ((unsigned char *)VT100_ANS, 2530 tt_write (VT100_ANS, strlen (VT100_ANS));
2432 (unsigned int)STRLEN (VT100_ANS));
2433 break; 2531 break;
2434 case C0_BEL: /* bell */ 2532 case C0_BEL: /* bell */
2435 scr_bell (); 2533 scr_bell ();
2436 break; 2534 break;
2437 case C0_BS: /* backspace */ 2535 case C0_BS: /* backspace */
… …
2453 break; 2551 break;
2454 case C0_SI: /* shift in - acs */ 2552 case C0_SI: /* shift in - acs */
2455 scr_charset_choose (0); 2553 scr_charset_choose (0);
2456 break; 2554 break;
2457 2555
2556#ifdef EIGHT_BIT_CONTROLS
2458 // 8-bit controls 2557 // 8-bit controls
2459 case 0x90: /* DCS */ 2558 case 0x90: /* DCS */
2460 process_dcs_seq (); 2559 process_dcs_seq ();
2461 break; 2560 break;
2462 case 0x9b: /* CSI */ 2561 case 0x9b: /* CSI */
2463 process_csi_seq (); 2562 process_csi_seq ();
2464 break; 2563 break;
2465 case 0x9d: /* CSI */ 2564 case 0x9d: /* OSC */
2466 process_osc_seq (); 2565 process_osc_seq ();
2467 break; 2566 break;
2567#endif
2468 } 2568 }
2469} 2569}
2470/*}}} */ 2570/*}}} */
2471 2571
2472 2572
… …
2534void 2634void
2535rxvt_term::process_escape_seq () 2635rxvt_term::process_escape_seq ()
2536{ 2636{
2537 unicode_t ch = cmd_getc (); 2637 unicode_t ch = cmd_getc ();
2538 2638
2539 if (PrivateModes & PrivMode_vt52) 2639 if (priv_modes & PrivMode_vt52)
2540 { 2640 {
2541 process_escape_vt52 (ch); 2641 process_escape_vt52 (ch);
2542 return; 2642 return;
2543 } 2643 }
2544 2644
… …
2559 scr_charset_set (2, (unsigned int)cmd_getc ()); 2659 scr_charset_set (2, (unsigned int)cmd_getc ());
2560 break; 2660 break;
2561 case '+': 2661 case '+':
2562 scr_charset_set (3, (unsigned int)cmd_getc ()); 2662 scr_charset_set (3, (unsigned int)cmd_getc ());
2563 break; 2663 break;
2564#ifndef NO_FRILLS 2664#if !ENABLE_MINIMAL
2565 case '6': 2665 case '6':
2566 scr_backindex (); 2666 scr_backindex ();
2567 break; 2667 break;
2568#endif 2668#endif
2569 case '7': 2669 case '7':
2570 scr_cursor (SAVE); 2670 scr_cursor (SAVE);
2571 break; 2671 break;
2572 case '8': 2672 case '8':
2573 scr_cursor (RESTORE); 2673 scr_cursor (RESTORE);
2574 break; 2674 break;
2575#ifndef NO_FRILLS 2675#if !ENABLE_MINIMAL
2576 case '9': 2676 case '9':
2577 scr_forwardindex (); 2677 scr_forwardindex ();
2578 break; 2678 break;
2579#endif 2679#endif
2580 case '=': 2680 case '=':
… …
2590 break; 2690 break;
2591 2691
2592 /* 8.3.87: NEXT LINE */ 2692 /* 8.3.87: NEXT LINE */
2593 case C1_NEL: /* ESC E */ 2693 case C1_NEL: /* ESC E */
2594 { 2694 {
2595 unicode_t nlcr[] = { C0_LF, C0_CR }; 2695 wchar_t nlcr[] = { C0_LF, C0_CR };
2596 scr_add_lines (nlcr, 1, 2); 2696 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2597 } 2697 }
2598 break; 2698 break;
2599 2699
2600 /* kidnapped escape sequence: Should be 8.3.48 */ 2700 /* kidnapped escape sequence: Should be 8.3.48 */
2601 case C1_ESA: /* ESC G */ 2701 case C1_ESA: /* ESC G */
… …
2623 process_dcs_seq (); 2723 process_dcs_seq ();
2624 break; 2724 break;
2625 2725
2626 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2726 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2627 case C1_SCI: /* ESC Z */ 2727 case C1_SCI: /* ESC Z */
2628 tt_write ((const unsigned char *)ESCZ_ANSWER, 2728 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2629 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2630 break; /* steal obsolete ESC [ c */ 2729 break; /* steal obsolete ESC [ c */
2631 2730
2632 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2731 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2633 case C1_CSI: /* ESC [ */ 2732 case C1_CSI: /* ESC [ */
2634 process_csi_seq (); 2733 process_csi_seq ();
… …
2661 2760
2662/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2761/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2663/* *INDENT-OFF* */ 2762/* *INDENT-OFF* */
2664enum { 2763enum {
2665 CSI_ICH = 0x40, 2764 CSI_ICH = 0x40,
2666 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2765 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2667 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2766 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2668 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2767 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2669 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2768 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2670 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2769 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2671 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2770 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2696rxvt_term::process_csi_seq () 2795rxvt_term::process_csi_seq ()
2697{ 2796{
2698 unicode_t ch, priv, i; 2797 unicode_t ch, priv, i;
2699 unsigned int nargs, p; 2798 unsigned int nargs, p;
2700 int n, ndef; 2799 int n, ndef;
2701 int arg[ESC_ARGS]; 2800 int arg[ESC_ARGS] = { };
2702 2801
2703 for (nargs = ESC_ARGS; nargs > 0;) 2802 nargs = 0;
2704 arg[--nargs] = 0;
2705 2803
2706 priv = 0; 2804 priv = 0;
2707 ch = cmd_getc (); 2805 ch = cmd_getc ();
2708 if (ch >= '<' && ch <= '?') 2806 if (ch >= '<' && ch <= '?')
2709 { /* '<' '=' '>' '?' */ 2807 { /* '<' '=' '>' '?' */
… …
2743 ndef = get_byte_array_bit (csi_defaults, i); 2841 ndef = get_byte_array_bit (csi_defaults, i);
2744 for (p = 0; p < nargs; p++) 2842 for (p = 0; p < nargs; p++)
2745 if (arg[p] == -1) 2843 if (arg[p] == -1)
2746 arg[p] = ndef; 2844 arg[p] = ndef;
2747 2845
2748#ifdef DEBUG_CMD
2749 fprintf (stderr, "CSI ");
2750 for (p = 0; p < nargs; p++)
2751 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2752 fprintf (stderr, "%c\n", ch);
2753#endif
2754
2755 /* 2846 /*
2756 * private mode handling 2847 * private mode handling
2757 */ 2848 */
2758 if (priv) 2849 if (priv)
2759 { 2850 {
2760 switch (priv) 2851 switch (priv)
2761 { 2852 {
2762 case '>': 2853 case '>':
2763 if (ch == CSI_DA) /* secondary device attributes */ 2854 if (ch == CSI_DA) /* secondary device attributes */
2855 {
2856 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2857 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2858 //
2859 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2860 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2861 // versions.
2862 //
2764 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2863 tt_printf ("\033[>%d;95;0c", 'U');
2864 }
2765 break; 2865 break;
2766 case '?': 2866 case '?':
2767 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2768 process_terminal_mode (ch, priv, nargs, arg); 2868 process_terminal_mode (ch, priv, nargs, arg);
2769 break; 2869 break;
… …
2874 2974
2875 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2975 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2876 arg[0] = -arg[0]; 2976 arg[0] = -arg[0];
2877 /* FALLTHROUGH */ 2977 /* FALLTHROUGH */
2878 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2978 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2879 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2979 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2880 break; 2980 break;
2881 2981
2882 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2982 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2883 tt_write ((const unsigned char *)VT100_ANS, 2983 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2884 (unsigned int) (sizeof (VT100_ANS) - 1));
2885 break; 2984 break;
2886 2985
2887 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2986 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2888 process_sgr_mode (nargs, arg); 2987 process_sgr_mode (nargs, arg);
2889 break; 2988 break;
… …
2896 break; 2995 break;
2897 case 6: /* CPR requested */ 2996 case 6: /* CPR requested */
2898 scr_report_position (); 2997 scr_report_position ();
2899 break; 2998 break;
2900 case 7: /* unofficial extension */ 2999 case 7: /* unofficial extension */
2901 if (Options & Opt_insecure) 3000 if (option (Opt_insecure))
2902 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3001 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2903 break; 3002 break;
2904 case 8: /* unofficial extension */ 3003 case 8: /* unofficial extension */
2905 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3004 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2906 break; 3005 break;
2907 } 3006 }
… …
2943 break; 3042 break;
2944 3043
2945 case CSI_RM: /* 8.3.107: RESET MODE */ 3044 case CSI_RM: /* 8.3.107: RESET MODE */
2946 if (arg[0] == 4) 3045 if (arg[0] == 4)
2947 scr_insert_mode (0); 3046 scr_insert_mode (0);
3047 else if (arg[0] == 20)
3048 priv_modes &= ~PrivMode_LFNL;
2948 break; 3049 break;
2949 3050
2950 case CSI_SM: /* 8.3.126: SET MODE */ 3051 case CSI_SM: /* 8.3.126: SET MODE */
2951 if (arg[0] == 4) 3052 if (arg[0] == 4)
2952 scr_insert_mode (1); 3053 scr_insert_mode (1);
3054 else if (arg[0] == 20)
3055 priv_modes |= PrivMode_LFNL;
2953 break; 3056 break;
2954 3057
2955 /* 3058 /*
2956 * PRIVATE USE beyond this point. All CSI_7? sequences here 3059 * PRIVATE USE beyond this point. All CSI_7? sequences here
2957 */ 3060 */
… …
2969 break; 3072 break;
2970 case CSI_75: 3073 case CSI_75:
2971 scr_cursor (RESTORE); 3074 scr_cursor (RESTORE);
2972 break; 3075 break;
2973 3076
2974#ifndef NO_FRILLS 3077#if !ENABLE_MINIMAL
2975 case CSI_74: 3078 case CSI_74:
2976 process_window_ops (arg, nargs); 3079 process_window_ops (arg, nargs);
2977 break; 3080 break;
2978#endif 3081#endif
2979 3082
… …
2986 break; 3089 break;
2987 } 3090 }
2988} 3091}
2989/*}}} */ 3092/*}}} */
2990 3093
2991#ifndef NO_FRILLS 3094#if !ENABLE_MINIMAL
2992/* ARGSUSED */ 3095/* ARGSUSED */
2993void 3096void
2994rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3097rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2995{ 3098{
2996 int x, y; 3099 int x, y;
2997 XWindowAttributes wattr; 3100 XWindowAttributes wattr;
2998 Window wdummy; 3101 Window wdummy;
3102
3103 dLocal (Display *, dpy);
2999 3104
3000 if (nargs == 0) 3105 if (nargs == 0)
3001 return; 3106 return;
3002 3107
3003 switch (args[0]) 3108 switch (args[0])
3004 { 3109 {
3005 /* 3110 /*
3006 * commands 3111 * commands
3007 */ 3112 */
3008 case 1: /* deiconify window */ 3113 case 1: /* deiconify window */
3009 XMapWindow (display->display, TermWin.parent[0]); 3114 XMapWindow (dpy, parent[0]);
3010 break; 3115 break;
3011 case 2: /* iconify window */ 3116 case 2: /* iconify window */
3012 XIconifyWindow (display->display, TermWin.parent[0], 3117 XIconifyWindow (dpy, parent[0], display->screen);
3013 DefaultScreen (display->display));
3014 break; 3118 break;
3015 case 3: /* set position (pixels) */ 3119 case 3: /* set position (pixels) */
3016 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3120 XMoveWindow (dpy, parent[0], args[1], args[2]);
3017 break; 3121 break;
3018 case 4: /* set size (pixels) */ 3122 case 4: /* set size (pixels) */
3019 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3123 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3020 break; 3124 break;
3021 case 5: /* raise window */ 3125 case 5: /* raise window */
3022 XRaiseWindow (display->display, TermWin.parent[0]); 3126 XRaiseWindow (dpy, parent[0]);
3023 break; 3127 break;
3024 case 6: /* lower window */ 3128 case 6: /* lower window */
3025 XLowerWindow (display->display, TermWin.parent[0]); 3129 XLowerWindow (dpy, parent[0]);
3026 break; 3130 break;
3027 case 7: /* refresh window */ 3131 case 7: /* refresh window */
3028 scr_touch (true); 3132 scr_touch (true);
3029 break; 3133 break;
3030 case 8: /* set size (chars) */ 3134 case 8: /* set size (chars) */
3031 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3135 set_widthheight ((unsigned int) (args[2] * fwidth),
3032 (unsigned int) (args[1] * TermWin.fheight)); 3136 (unsigned int) (args[1] * fheight));
3033 break; 3137 break;
3034 3138
3035 //case 9: NYI, TODO, restore maximized window or maximize window 3139 //case 9: NYI, TODO, restore maximized window or maximize window
3036 default: 3140 default:
3037 if (args[0] >= 24) /* set height (chars) */ 3141 if (args[0] >= 24) /* set height (chars) */
3038 set_widthheight ((unsigned int)TermWin.width, 3142 set_widthheight ((unsigned int)width,
3039 (unsigned int) (args[1] * TermWin.fheight)); 3143 (unsigned int) (args[1] * fheight));
3040 break; 3144 break;
3041
3042 3145
3043 /* 3146 /*
3044 * reports - some output format copied from XTerm 3147 * reports - some output format copied from XTerm
3045 */ 3148 */
3046 case 11: /* report window state */ 3149 case 11: /* report window state */
3047 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3150 XGetWindowAttributes (dpy, parent[0], &wattr);
3048 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3151 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3049 break; 3152 break;
3050 case 13: /* report window position */ 3153 case 13: /* report window position */
3051 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent[0], &wattr);
3052 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3155 XTranslateCoordinates (dpy, parent[0], wattr.root,
3053 -wattr.border_width, -wattr.border_width, 3156 -wattr.border_width, -wattr.border_width,
3054 &x, &y, &wdummy); 3157 &x, &y, &wdummy);
3055 tt_printf ("\033[3;%d;%dt", x, y); 3158 tt_printf ("\033[3;%d;%dt", x, y);
3056 break; 3159 break;
3057 case 14: /* report window size (pixels) */ 3160 case 14: /* report window size (pixels) */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3161 XGetWindowAttributes (dpy, parent[0], &wattr);
3059 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3162 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3060 break; 3163 break;
3061 case 18: /* report text area size (chars) */ 3164 case 18: /* report text area size (chars) */
3062 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3165 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3063 break; 3166 break;
3064 case 19: /* report window size (chars) */ 3167 case 19: /* report window size (chars) */
3065 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3168 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3066 break; 3169 break;
3067 case 20: /* report icon label */ 3170 case 20: /* report icon label */
3068 if (Options & Opt_insecure)
3069 { 3171 {
3070 char *s; 3172 char *s;
3071 XGetIconName (display->display, TermWin.parent[0], &s); 3173 XGetIconName (dpy, parent[0], &s);
3072 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3174 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3175 XFree (s);
3073 } 3176 }
3074 break; 3177 break;
3075 case 21: /* report window title */ 3178 case 21: /* report window title */
3076 if (Options & Opt_insecure)
3077 { 3179 {
3078 char *s; 3180 char *s;
3079 XFetchName (display->display, TermWin.parent[0], &s); 3181 XFetchName (dpy, parent[0], &s);
3080 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3182 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3183 XFree (s);
3081 } 3184 }
3082 break; 3185 break;
3083 } 3186 }
3084} 3187}
3085#endif 3188#endif
3086 3189
3087/*----------------------------------------------------------------------*/ 3190/*----------------------------------------------------------------------*/
3088/* 3191/*
3089 * get input up until STRING TERMINATOR (or BEL) 3192 * get input up until STRING TERMINATOR (or BEL)
3090 * ends_how is terminator used. returned input must be free()'d 3193 * ends_how is terminator used. returned input must be free()'d
3091 */ 3194 */
3092unsigned char * 3195char *
3093rxvt_term::get_to_st (unicode_t &ends_how) 3196rxvt_term::get_to_st (unicode_t &ends_how)
3094{ 3197{
3095 int seen_esc = 0; /* seen escape? */ 3198 unicode_t ch;
3199 bool seen_esc = false;
3096 unsigned int n = 0; 3200 unsigned int n = 0;
3097 unsigned char *s;
3098 unicode_t ch;
3099 unsigned char string[STRING_MAX]; 3201 wchar_t string[STRING_MAX];
3100 3202
3101 while ((ch = cmd_getc ())) 3203 while ((ch = cmd_getc ()) != NOCHAR)
3102 { 3204 {
3103 if (ch == C0_BEL || ch == CHAR_ST)
3104 break;
3105
3106 if (seen_esc) 3205 if (seen_esc)
3206 {
3107 if (ch == 0x5c) /* 7bit ST */ 3207 if (ch == 0x5c) /* 7bit ST */
3108 break; 3208 break;
3109 else 3209 else
3110 return NULL; 3210 return NULL;
3111 3211 }
3112 if (ch == C0_ESC) 3212 else if (ch == C0_ESC)
3113 { 3213 {
3114 seen_esc = 1; 3214 seen_esc = true;
3115 continue; 3215 continue;
3116 } 3216 }
3217 else if (ch == C0_BEL || ch == CHAR_ST)
3218 break;
3117 else if (ch == C0_HT) 3219 else if (ch == C0_SYN)
3118 ch = ' '; /* translate '\t' to space */ 3220 ch = cmd_get8 ();
3119 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR)) 3221 else if (ch < 0x20)
3120 return NULL; /* other control character - exit */ 3222 return NULL; /* other control character - exit */
3121 3223
3122 if (n >= sizeof (string) - 1) 3224 seen_esc = false;
3225
3226 if (n >= STRING_MAX - 1)
3123 // stop at some sane length 3227 // stop at some sane length
3124 return NULL; 3228 return NULL;
3125 3229
3126 string[n++] = ch; 3230 string[n++] = ch;
3127 seen_esc = 0;
3128 } 3231 }
3129 3232
3130 string[n++] = '\0'; 3233 string[n++] = '\0';
3131 3234
3132 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3133 return NULL;
3134
3135 ends_how = (ch == 0x5c ? C0_ESC : ch); 3235 ends_how = (ch == 0x5c ? C0_ESC : ch);
3136 STRNCPY (s, string, n); 3236
3137 return s; 3237 return rxvt_wcstombs (string);
3138} 3238}
3139 3239
3140/*----------------------------------------------------------------------*/ 3240/*----------------------------------------------------------------------*/
3141/* 3241/*
3142 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3242 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3143 */ 3243 */
3144void 3244void
3145rxvt_term::process_dcs_seq () 3245rxvt_term::process_dcs_seq ()
3146{ 3246{
3147 unsigned char *s; 3247 char *s;
3148 unicode_t eh; 3248 unicode_t eh;
3149 3249
3150 /* 3250 /*
3151 * Not handled yet 3251 * Not handled yet
3152 */ 3252 */
… …
3171 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3271 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3172 arg = arg * 10 + (ch - '0'); 3272 arg = arg * 10 + (ch - '0');
3173 3273
3174 if (ch == ';') 3274 if (ch == ';')
3175 { 3275 {
3176 unsigned char *s = get_to_st (eh); 3276 char *s = get_to_st (eh);
3177 3277
3178 if (s) 3278 if (s)
3179 { 3279 {
3180 process_xterm_seq (arg, (char *)s, eh); 3280 process_xterm_seq (arg, s, eh);
3181 free (s); 3281 free (s);
3182 } 3282 }
3183 } 3283 }
3184} 3284}
3185 3285
3186void 3286void
3187rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3287rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3188{ 3288{
3189 if (str[0] == '?' && !str[1]) 3289 if (str[0] == '?' && !str[1])
3190 { 3290 {
3191 if (Options & Opt_insecure) 3291 rgba c;
3192 { 3292 pix_colors_focused[color].get (c);
3193 unsigned short r, g, b; 3293
3194 PixColors[color].get (display, r, g, b); 3294#if XFT
3295 if (c.a != rgba::MAX_CC)
3296 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3297 else
3298#endif
3195 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3299 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3196 }
3197 } 3300 }
3198 else 3301 else
3199 set_window_color (color, str); 3302 set_window_color (color, str);
3200} 3303}
3201 3304
3202/* 3305/*
3203 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3306 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3204 * 0 = change iconName/title
3205 * 1 = change iconName
3206 * 2 = change title
3207 * 4 = change color
3208 * 10 = change fg color
3209 * 11 = change bg color
3210 * 12 = change text color
3211 * 13 = change mouse foreground color
3212 * 17 = change highlight character colour
3213 * 18 = change bold character color
3214 * 19 = change underlined character color
3215 * 46 = change logfile (not implemented)
3216 * 50 = change font
3217 *
3218 * rxvt extensions:
3219 * 20 = bg pixmap
3220 * 39 = change default fg color
3221 * 49 = change default bg color
3222 * 55 = dump scrollback buffer and all of screen
3223 * 701 = change locale
3224 * 702 = find font
3225 * 703 = menu
3226 */ 3307 */
3227void 3308void
3228rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3309rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3229{ 3310{
3230 int changed = 0;
3231 int color; 3311 int color;
3232 char *buf, *name; 3312 char *buf, *name;
3233 bool query = str[0] == '?' && !str[1]; 3313 bool query = str[0] == '?' && !str[1];
3314 int saveop = op;
3315
3316 dLocal (Display *, dpy);
3234 3317
3235 assert (str != NULL); 3318 assert (str != NULL);
3319
3320 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3321 return;
3322
3236 switch (op) 3323 switch (op)
3237 { 3324 {
3238 case XTerm_name: 3325 case XTerm_name:
3239 set_title (str); 3326 set_title (str);
3240 /* FALLTHROUGH */ 3327 /* FALLTHROUGH */
… …
3245 set_title (str); 3332 set_title (str);
3246 break; 3333 break;
3247 case XTerm_property: 3334 case XTerm_property:
3248 if (str[0] == '?') 3335 if (str[0] == '?')
3249 { 3336 {
3250 Atom prop = XInternAtom (display->display, str + 1, True); 3337 Atom prop = display->atom (str + 1);
3251 Atom actual_type; 3338 Atom actual_type;
3252 int actual_format; 3339 int actual_format;
3253 unsigned long nitems; 3340 unsigned long nitems;
3254 unsigned long bytes_after; 3341 unsigned long bytes_after;
3255 unsigned char *value = 0; 3342 unsigned char *value = 0;
3256 const char *str = ""; 3343 const char *str = "";
3257 3344
3258 if (prop 3345 if (prop
3259 && XGetWindowProperty (display->display, TermWin.parent[0], 3346 && XGetWindowProperty (dpy, parent[0],
3260 prop, 0, 1<<16, 0, AnyPropertyType, 3347 prop, 0, 1<<16, 0, AnyPropertyType,
3261 &actual_type, &actual_format, 3348 &actual_type, &actual_format,
3262 &nitems, &bytes_after, &value) == Success 3349 &nitems, &bytes_after, &value) == Success
3263 && actual_type != None 3350 && actual_type != None
3264 && actual_format == 8) 3351 && actual_format == 8)
3265 str = (const char *)(value); 3352 str = (const char *)(value);
3266 3353
3267 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3354 tt_printf ("\033]%d;%s%c", op, str, resp);
3268 3355
3269 XFree (value); 3356 XFree (value);
3270 } 3357 }
3271 else 3358 else
3272 { 3359 {
3273 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3360 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3274 3361
3275 if (eq) 3362 if (eq)
3276 { 3363 {
3277 *eq = 0; 3364 *eq = 0;
3278 XChangeProperty (display->display, TermWin.parent[0], 3365 set_utf8_property (display->atom (str), eq + 1);
3279 display->atom (str), XA_STRING, 8,
3280 PropModeReplace, (unsigned char *)eq + 1,
3281 strlen (eq + 1));
3282 } 3366 }
3283 else 3367 else
3284 XDeleteProperty (display->display, TermWin.parent[0], 3368 XDeleteProperty (dpy, parent[0],
3285 display->atom (str)); 3369 display->atom (str));
3286 } 3370 }
3287 break; 3371 break;
3288 3372
3289 case XTerm_Color: 3373 case XTerm_Color:
3290 for (buf = (char *)str; buf && *buf;) 3374 for (buf = (char *)str; buf && *buf;)
3291 { 3375 {
3292 if ((name = STRCHR (buf, ';')) == NULL) 3376 if ((name = strchr (buf, ';')) == NULL)
3293 break; 3377 break;
3294 3378
3295 *name++ = '\0'; 3379 *name++ = '\0';
3296 color = atoi (buf); 3380 color = atoi (buf) + minCOLOR;
3297 3381
3298 if (color < 0 || color >= TOTAL_COLORS) 3382 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3299 break; 3383 break;
3300 3384
3301 if ((buf = STRCHR (name, ';')) != NULL) 3385 if ((buf = strchr (name, ';')) != NULL)
3302 *buf++ = '\0'; 3386 *buf++ = '\0';
3303 3387
3304 if (name[0] == '?' && !name[1]) 3388 process_color_seq (op, color, name, resp);
3305 {
3306 if (Options & Opt_insecure)
3307 {
3308 unsigned short r, g, b;
3309 PixColors[color + minCOLOR].get (display, r, g, b);
3310 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3311 }
3312 }
3313 else
3314 set_window_color (color + minCOLOR, name);
3315 } 3389 }
3316 break; 3390 break;
3317 case XTerm_Color00: 3391 case XTerm_Color00:
3318 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3392 process_color_seq (op, Color_fg, str, resp);
3319 break; 3393 break;
3320 case XTerm_Color01: 3394 case XTerm_Color01:
3321 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3395 process_color_seq (op, Color_bg, str, resp);
3322 break; 3396 break;
3323#ifndef NO_CURSORCOLOR 3397#ifndef NO_CURSORCOLOR
3324 case XTerm_Color_cursor: 3398 case XTerm_Color_cursor:
3325 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3399 process_color_seq (op, Color_cursor, str, resp);
3326 break; 3400 break;
3327#endif 3401#endif
3328 case XTerm_Color_pointer_fg: 3402 case XTerm_Color_pointer_fg:
3329 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3403 process_color_seq (op, Color_pointer_fg, str, resp);
3330 break; 3404 break;
3331 case XTerm_Color_pointer_bg: 3405 case XTerm_Color_pointer_bg:
3332 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3406 process_color_seq (op, Color_pointer_bg, str, resp);
3333 break; 3407 break;
3334#ifndef NO_BOLD_UNDERLINE_REVERSE 3408#ifndef NO_BOLD_UNDERLINE_REVERSE
3335 case XTerm_Color_BD:
3336 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3337 break;
3338 case XTerm_Color_UL:
3339 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3340 break;
3341 case XTerm_Color_RV: 3409 case XTerm_Color_RV:
3342 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3410 process_color_seq (op, Color_RV, str, resp);
3343 break; 3411 break;
3412 case Rxvt_Color_BD:
3413 case URxvt_Color_BD:
3414 process_color_seq (op, Color_BD, str, resp);
3415 break;
3416 case Rxvt_Color_UL:
3417 case URxvt_Color_UL:
3418 process_color_seq (op, Color_UL, str, resp);
3419 break;
3420 case URxvt_Color_IT:
3421 process_color_seq (op, Color_IT, str, resp);
3422 break;
3344#endif 3423#endif
3424#if ENABLE_TRANSPARENCY
3425 case URxvt_Color_tint:
3426 process_color_seq (op, Color_tint, str, resp);
3427 {
3428 bool changed = false;
3429 if (ISSET_PIXCOLOR (Color_tint))
3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3431 else
3432 changed = bgPixmap.unset_tint ();
3433 if (changed)
3434 update_background ();
3435 }
3345 3436
3437 break;
3438#endif
3439
3440#if BG_IMAGE_FROM_FILE
3346 case XTerm_Pixmap: 3441 case Rxvt_Pixmap:
3347 if (*str != ';') 3442 if (!strcmp (str, "?"))
3348 { 3443 {
3349#if XPM_BACKGROUND 3444 char str[256];
3350 scale_pixmap (""); /* reset to default scaling */
3351 set_bgPixmap (str); /* change pixmap */
3352#endif
3353 scr_touch (true);
3354 }
3355 while ((str = STRCHR (str, ';')) != NULL)
3356 {
3357 str++;
3358#if XPM_BACKGROUND
3359 changed += scale_pixmap (str);
3360#endif
3361 3445
3362 } 3446 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3363 if (changed) 3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3364 { 3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3365#ifdef XPM_BACKGROUND 3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3366 resize_pixmap ();
3367#endif
3368 scr_touch (true);
3369 }
3370 break;
3371
3372 case XTerm_restoreFG:
3373 set_window_color (Color_fg, str);
3374 break;
3375 case XTerm_restoreBG:
3376 set_window_color (Color_bg, str);
3377 break;
3378
3379 case XTerm_logfile:
3380 // TODO, when secure mode?
3381 break;
3382
3383 case XTerm_font:
3384 if (query)
3385 {
3386 if (Options & Opt_insecure)
3387 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3388 TermWin.fontset->fontdesc
3389 ? TermWin.fontset->fontdesc
3390 : "",
3391 resp);
3392 }
3393 else
3394 change_font (str);
3395 break;
3396
3397#ifndef NO_FRILLS
3398 case XTerm_locale:
3399 if (query)
3400 {
3401 if (Options & Opt_insecure)
3402 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3403 } 3450 }
3404 else 3451 else
3405 { 3452 {
3453 int changed = 0;
3454
3455 if (*str != ';')
3456 {
3457 /* reset to default scaling :*/
3458 bgPixmap.unset_geometry ();
3459 if (bgPixmap.set_file (str)) /* change pixmap */
3460 changed++;
3461 str = strchr (str, ';');
3462 if (str == NULL)
3463 bgPixmap.set_defaultGeometry ();
3464 }
3406 set_locale (str); 3465 while (str)
3407# ifdef USE_XIM 3466 {
3408 im_cb (); 3467 str++;
3409# endif 3468 if (bgPixmap.set_geometry (str))
3469 changed++;
3470 str = strchr (str, ';');
3471 }
3472 if (changed)
3473 update_background ();
3410 } 3474 }
3411 break; 3475 break;
3412
3413 case XTerm_findfont:
3414 if (Options & Opt_insecure)
3415 {
3416 int fid = TermWin.fontset->find_font (atoi (str));
3417 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3418 fid, (*TermWin.fontset)[fid]->name, resp);
3419 }
3420 break;
3421#endif 3476#endif
3422 3477
3423#ifdef MENUBAR 3478 case Rxvt_restoreFG:
3424 case XTerm_Menu: 3479 set_window_color (Color_fg, str);
3425 if (Options & Opt_insecure)
3426 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3427 break; 3480 break;
3428#endif 3481 case Rxvt_restoreBG:
3482 set_window_color (Color_bg, str);
3483 break;
3484
3485 case XTerm_logfile:
3486 // TODO, when secure mode?
3487 break;
3488
3429#if 0 3489#if 0
3430 case XTerm_dumpscreen: /* no error notices */ 3490 case Rxvt_dumpscreen: /* no error notices */
3431 { 3491 {
3432 int fd; 3492 int fd;
3433 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3493 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3434 { 3494 {
3435 scr_dump (fd); 3495 scr_dump (fd);
3436 close (fd); 3496 close (fd);
3437 } 3497 }
3438 } 3498 }
3499 break;
3500#endif
3501 case XTerm_font:
3502 op = URxvt_font;
3503 case URxvt_font:
3504#if ENABLE_STYLES
3505 case URxvt_boldFont:
3506 case URxvt_italicFont:
3507 case URxvt_boldItalicFont:
3508#endif
3509 if (query)
3510 tt_printf ("\33]%d;%-.250s%c", saveop,
3511 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3512 ? fontset[op - URxvt_font]->fontdesc : "",
3513 resp);
3514 else
3515 {
3516 const char *&res = rs[Rs_font + (op - URxvt_font)];
3517
3518 res = strdup (str);
3519 allocated.push_back ((void *)res);
3520 set_fonts ();
3521 }
3522 break;
3523
3524 case URxvt_version:
3525 if (query)
3526 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3527 op,
3528 rs[Rs_name], VERSION[0], VERSION[2],
3529 resp);
3530 break;
3531
3532#if !ENABLE_MINIMAL
3533 case URxvt_locale:
3534 if (query)
3535 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3536 else
3537 {
3538 set_locale (str);
3539 pty->set_utf8_mode (enc_utf8);
3540 init_xlocale ();
3541 }
3542 break;
3543
3544 case URxvt_view_up:
3545 case URxvt_view_down:
3546 {
3547 int lines = atoi (str);
3548
3549 if (lines)
3550 scr_page (op == URxvt_view_up ? UP : DN, lines);
3551 else
3552 scr_erase_savelines ();
3553 }
3554
3555 break;
3556#endif
3557
3558#if ENABLE_PERL
3559 case URxvt_perl:
3560 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3561 ; // no responses yet
3439 break; 3562 break;
3440#endif 3563#endif
3441 } 3564 }
3442} 3565}
3443/*----------------------------------------------------------------------*/ 3566/*----------------------------------------------------------------------*/
… …
3457{ 3580{
3458 int state; 3581 int state;
3459 3582
3460 if (mode == 's') 3583 if (mode == 's')
3461 { 3584 {
3462 SavedModes |= (PrivateModes & bit); 3585 SavedModes |= (priv_modes & bit);
3463 return -1; 3586 return -1;
3464 } 3587 }
3465 else 3588 else
3466 { 3589 {
3467 if (mode == 'r') 3590 if (mode == 'r')
3468 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3591 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3469 else 3592 else
3470 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3593 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3471 PrivMode (state, bit); 3594 PrivMode (state, bit);
3472 } 3595 }
3473 3596
3474 return state; 3597 return state;
3475} 3598}
3476 3599
3477/* we're not using priv _yet_ */ 3600/* we're not using priv _yet_ */
3478void 3601void
3479rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3602rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3480{ 3603{
3481 unsigned int i, j; 3604 unsigned int i, j;
3482 int state; 3605 int state;
3483 3606
3484 static const struct 3607 static const struct
3485 { 3608 {
3486 const int argval; 3609 const int argval;
3487 const unsigned long bit; 3610 const unsigned long bit;
3488 }
3489
3490 argtopriv[] = { 3611 } argtopriv[] = {
3491 { 1, PrivMode_aplCUR }, 3612 { 1, PrivMode_aplCUR },
3492 { 2, PrivMode_vt52 }, 3613 { 2, PrivMode_vt52 },
3493 { 3, PrivMode_132 }, 3614 { 3, PrivMode_132 },
3494 { 4, PrivMode_smoothScroll }, 3615 { 4, PrivMode_smoothScroll },
3495 { 5, PrivMode_rVideo }, 3616 { 5, PrivMode_rVideo },
3496 { 6, PrivMode_relOrigin }, 3617 { 6, PrivMode_relOrigin },
3497 { 7, PrivMode_Autowrap }, 3618 { 7, PrivMode_Autowrap },
3619 // 8, bi-directional support mode
3498 { 9, PrivMode_MouseX10 }, 3620 { 9, PrivMode_MouseX10 },
3499#ifdef menuBar_esc 3621 // 18, 19 printing-related
3500 { menuBar_esc, PrivMode_menuBar }, 3622 { 25, PrivMode_VisibleCursor },
3501#endif
3502#ifdef scrollBar_esc 3623#ifdef scrollBar_esc
3503 { scrollBar_esc, PrivMode_scrollBar }, 3624 { scrollBar_esc, PrivMode_scrollBar },
3504#endif 3625#endif
3505 // 18, 19 printing-related
3506 { 25, PrivMode_VisibleCursor },
3507 // 30 show scrollbar rxvt. extension
3508 { 35, PrivMode_ShiftKeys }, // rxvt extension 3626 { 35, PrivMode_ShiftKeys }, // rxvt extension
3509 { 40, PrivMode_132OK }, 3627 { 40, PrivMode_132OK },
3510 // 41 xterm more fixes NYI 3628 // 41 xterm more fixes NYI
3511 // 45 margin bell NYI 3629 // 45 margin bell NYI
3512 // 46 start logging 3630 // 46 start logging
… …
3515#ifndef NO_BACKSPACE_KEY 3633#ifndef NO_BACKSPACE_KEY
3516 { 67, PrivMode_BackSpace }, 3634 { 67, PrivMode_BackSpace },
3517#endif 3635#endif
3518 { 1000, PrivMode_MouseX11 }, 3636 { 1000, PrivMode_MouseX11 },
3519 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3520 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3638 { 1002, PrivMode_MouseBtnEvent },
3521 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3639 { 1003, PrivMode_MouseAnyEvent },
3522 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3523 { 1011, PrivMode_Keypress }, // rxvt extension 3641 { 1011, PrivMode_Keypress }, // rxvt extension
3524 // 1035 enable modifiers for alt, numlock NYI 3642 // 1035 enable modifiers for alt, numlock NYI
3525 // 1036 send ESC for meta keys NYI 3643 // 1036 send ESC for meta keys NYI
3526 // 1037 send DEL for keypad delete NYI 3644 // 1037 send DEL for keypad delete NYI
… …
3552 } 3670 }
3553 3671
3554 /* extra handling for values with state unkept */ 3672 /* extra handling for values with state unkept */
3555 switch (arg[i]) 3673 switch (arg[i])
3556 { 3674 {
3675#if ENABLE_STYLES
3676 case 1021:
3677 set_option (Opt_intensityStyles, mode);
3678
3679 scr_touch (true);
3680 break;
3681#endif
3557 case 1048: /* alternative cursor save */ 3682 case 1048: /* alternative cursor save */
3683 case 1049:
3558 if (Options & Opt_secondaryScreen) 3684 if (option (Opt_secondaryScreen))
3559 if (mode == 0) 3685 if (mode == 0)
3560 scr_cursor (RESTORE); 3686 scr_cursor (RESTORE);
3561 else if (mode == 1) 3687 else if (mode == 1)
3562 scr_cursor (SAVE); 3688 scr_cursor (SAVE);
3563 break; 3689 break;
… …
3574 * within VT52 mode 3700 * within VT52 mode
3575 */ 3701 */
3576 PrivMode (1, PrivMode_vt52); 3702 PrivMode (1, PrivMode_vt52);
3577 break; 3703 break;
3578 case 3: /* 80/132 */ 3704 case 3: /* 80/132 */
3579 if (PrivateModes & PrivMode_132OK) 3705 if (priv_modes & PrivMode_132OK)
3580 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3706 set_widthheight (((state ? 132 : 80) * fwidth), height);
3581 break; 3707 break;
3582 case 4: /* smooth scrolling */ 3708 case 4: /* smooth scrolling */
3583 if (state) 3709 set_option (Opt_jumpScroll, !state);
3584 Options &= ~Opt_jumpScroll;
3585 else
3586 Options |= Opt_jumpScroll;
3587 break; 3710 break;
3588 case 5: /* reverse video */ 3711 case 5: /* reverse video */
3589 scr_rvideo_mode (state); 3712 scr_rvideo_mode (state);
3590 break; 3713 break;
3591 case 6: /* relative/absolute origins */ 3714 case 6: /* relative/absolute origins */
… …
3595 scr_autowrap (state); 3718 scr_autowrap (state);
3596 break; 3719 break;
3597 /* case 8: - auto repeat, can't do on a per window basis */ 3720 /* case 8: - auto repeat, can't do on a per window basis */
3598 case 9: /* X10 mouse reporting */ 3721 case 9: /* X10 mouse reporting */
3599 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
3600 PrivateModes &= ~PrivMode_MouseX11; 3723 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3601 break; 3724 break;
3602#ifdef menuBar_esc
3603 case menuBar_esc:
3604#ifdef MENUBAR
3605 map_menuBar (state);
3606#endif
3607 break;
3608#endif
3609#ifdef scrollBar_esc 3725#ifdef scrollBar_esc
3610 case scrollBar_esc: 3726 case scrollBar_esc:
3611 if (scrollbar_mapping (state)) 3727 if (scrollbar_mapping (state))
3612 { 3728 {
3613 resize_all_windows (0, 0, 0); 3729 resize_all_windows (0, 0, 0);
… …
3625 break; 3741 break;
3626 /* case 66: - application key pad */ 3742 /* case 66: - application key pad */
3627 /* case 67: - backspace key */ 3743 /* case 67: - backspace key */
3628 case 1000: /* X11 mouse reporting */ 3744 case 1000: /* X11 mouse reporting */
3629 if (state) /* orthogonal */ 3745 if (state) /* orthogonal */
3630 PrivateModes &= ~PrivMode_MouseX10; 3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3631 break; 3747 break;
3632#if 0 3748#if 0
3633 case 1001: 3749 case 1001:
3634 break; /* X11 mouse highlighting */ 3750 break; /* X11 mouse highlighting */
3635#endif 3751#endif
3752 case 1002:
3753 case 1003:
3754 if (state) {
3755 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3756 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3757 vt_emask_mouse = PointerMotionMask;
3758 } else
3759 vt_emask_mouse = NoEventMask;
3760 vt_select_input ();
3761 break;
3636 case 1010: /* scroll to bottom on TTY output inhibit */ 3762 case 1010: /* scroll to bottom on TTY output inhibit */
3637 if (state)
3638 Options &= ~Opt_scrollTtyOutput;
3639 else
3640 Options |= Opt_scrollTtyOutput; 3763 set_option (Opt_scrollTtyOutput, !state);
3641 break; 3764 break;
3642 case 1011: /* scroll to bottom on key press */ 3765 case 1011: /* scroll to bottom on key press */
3643 if (state)
3644 Options |= Opt_scrollTtyKeypress; 3766 set_option (Opt_scrollTtyKeypress, state);
3645 else
3646 Options &= ~Opt_scrollTtyKeypress;
3647 break; 3767 break;
3648 case 1047: /* secondary screen w/ clearing last */ 3768 case 1047: /* secondary screen w/ clearing last */
3649 if (Options & Opt_secondaryScreen) 3769 if (option (Opt_secondaryScreen))
3650 if (current_screen != PRIMARY) 3770 if (current_screen != PRIMARY)
3651 scr_erase_screen (2); 3771 scr_erase_screen (2);
3652 scr_change_screen (state); 3772 scr_change_screen (state);
3653 break; 3773 break;
3654 case 1049: /* secondary screen w/ clearing first */ 3774 case 1049: /* secondary screen w/ clearing first */
3655 scr_change_screen (state); 3775 scr_change_screen (state);
3656 if (Options & Opt_secondaryScreen) 3776 if (option (Opt_secondaryScreen))
3657 if (current_screen != PRIMARY) 3777 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 3778 scr_erase_screen (2);
3659 break; 3779 break;
3660 default: 3780 default:
3661 break; 3781 break;
… …
3687 rendset = 0, rendstyle = ~RS_None; 3807 rendset = 0, rendstyle = ~RS_None;
3688 break; 3808 break;
3689 case 1: 3809 case 1:
3690 rendset = 1, rendstyle = RS_Bold; 3810 rendset = 1, rendstyle = RS_Bold;
3691 break; 3811 break;
3812 //case 2: // low intensity
3813 case 3:
3814 rendset = 1, rendstyle = RS_Italic;
3815 break;
3692 case 4: 3816 case 4:
3693 rendset = 1, rendstyle = RS_Uline; 3817 rendset = 1, rendstyle = RS_Uline;
3694 break; 3818 break;
3695 case 5: 3819 case 5: // slowly blinking
3820 case 6: // rapidly blinking
3696 rendset = 1, rendstyle = RS_Blink; 3821 rendset = 1, rendstyle = RS_Blink;
3697 break; 3822 break;
3698 //case 6: // scoansi light background 3823 //case 6: // scoansi light background
3699 case 7: 3824 case 7:
3700 rendset = 1, rendstyle = RS_RVid; 3825 rendset = 1, rendstyle = RS_RVid;
3701 break; 3826 break;
3702 case 8: 3827 case 8:
3703 // invisible. NYI 3828 // invisible. NYI
3704 break; 3829 break;
3830 //case 9: // crossed out
3705 //case 10: // scoansi acs off 3831 //case 10: // scoansi acs off, primary font
3706 //case 11: // scoansi acs on 3832 //case 11: // scoansi acs on, first alt font
3707 //case 12: // scoansi acs on, |0x80 3833 //case 12: // scoansi acs on, |0x80, second alt font
3708 case 21: // disable bold, blink and invis (some terminals use this) 3834 //...
3835 //case 19: // ninth alt font
3836 //case 20: // gothic
3837 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3709 rendset = 0, rendstyle = RS_Bold | RS_Blink; 3838 rendset = 0, rendstyle = RS_Bold;
3710 break; 3839 break;
3711 case 22: 3840 case 22: // normal intensity
3712 rendset = 0, rendstyle = RS_Bold; 3841 rendset = 0, rendstyle = RS_Bold;
3842 break;
3843 case 23: // disable italic
3844 rendset = 0, rendstyle = RS_Italic;
3713 break; 3845 break;
3714 case 24: 3846 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 3847 rendset = 0, rendstyle = RS_Uline;
3716 break; 3848 break;
3717 case 25: 3849 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 3850 rendset = 0, rendstyle = RS_Blink;
3719 break; 3851 break;
3852 case 26: // variable spacing (iso 8613)
3853 rendset = 0, rendstyle = RS_Blink;
3854 break;
3720 case 27: 3855 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 3856 rendset = 0, rendstyle = RS_RVid;
3722 break; 3857 break;
3723 case 28:
3724 // visible. NYI 3858 //case 28: // visible. NYI
3725 break; 3859 //case 29: // not crossed-out
3726 } 3860 }
3727 3861
3728 if (rendset != -1) 3862 if (rendset != -1)
3729 { 3863 {
3730 scr_rendition (rendset, rendstyle); 3864 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 3875 case 35:
3742 case 36: 3876 case 36:
3743 case 37: 3877 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3878 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 3879 break;
3746#ifdef TTY_256COLOR 3880 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 3881 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 3882 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3883 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 3884 i += 2;
3752 } 3885 }
3753 break; 3886 break;
3754#endif
3755 case 39: /* default fg */ 3887 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 3888 scr_color (Color_fg, Color_fg);
3757 break; 3889 break;
3758 3890
3759 case 40: 3891 case 40:
… …
3764 case 45: 3896 case 45:
3765 case 46: 3897 case 46:
3766 case 47: 3898 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3899 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 3900 break;
3769#ifdef TTY_256COLOR 3901 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 3902 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 3903 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3904 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 3905 i += 2;
3775 } 3906 }
3776 break; 3907 break;
3777#endif
3778 case 49: /* default bg */ 3908 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 3909 scr_color (Color_bg, Color_bg);
3780 break; 3910 break;
3781 3911
3782#ifndef NO_BRIGHTCOLOR 3912 //case 50: // not variable spacing
3913
3914#if !ENABLE_MINIMAL
3783 case 90: 3915 case 90:
3784 case 91: /* set bright fg color */ 3916 case 91: /* set bright fg color */
3785 case 92: 3917 case 92:
3786 case 93: 3918 case 93:
3787 case 94: 3919 case 94:
3788 case 95: 3920 case 95:
3789 case 96: 3921 case 96:
3790 case 97: 3922 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3923 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 3924 break;
3794 case 100: 3925 case 100:
3795 case 101: /* set bright bg color */ 3926 case 101: /* set bright bg color */
3796 case 102: 3927 case 102:
3797 case 103: 3928 case 103:
3798 case 104: 3929 case 104:
3799 case 105: 3930 case 105:
3800 case 106: 3931 case 106:
3801 case 107: 3932 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3933 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 3934 break;
3805#endif 3935#endif
3806
3807 } 3936 }
3808 } 3937 }
3809} 3938}
3810/*}}} */ 3939/*}}} */
3811 3940
… …
3815{ 3944{
3816 unicode_t ch, cmd = cmd_getc (); 3945 unicode_t ch, cmd = cmd_getc ();
3817 3946
3818 if (cmd == 'Q') 3947 if (cmd == 'Q')
3819 { /* query graphics */ 3948 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 3949 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 3950 return;
3822 } 3951 }
3823 /* swallow other graphics sequences until terminating ':' */ 3952 /* swallow other graphics sequences until terminating ':' */
3824 do 3953 do
3825 ch = cmd_getc (); 3954 ch = cmd_getc ();
… …
3835 */ 3964 */
3836void 3965void
3837rxvt_term::tt_printf (const char *fmt,...) 3966rxvt_term::tt_printf (const char *fmt,...)
3838{ 3967{
3839 va_list arg_ptr; 3968 va_list arg_ptr;
3840 unsigned char buf[256]; 3969 char buf[256];
3841 3970
3842 va_start (arg_ptr, fmt); 3971 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3972 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 3973 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 3974 tt_write (buf, strlen (buf));
3846} 3975}
3847 3976
3848/* ---------------------------------------------------------------------- */ 3977/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 3978/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 3979 * or generated by us in response to a query ESC sequence.
3851 */ 3980 */
3981const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3982
3852void 3983void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3984rxvt_term::tt_write (const char *data, unsigned int len)
3854{ 3985{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3986 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3987 return;
3856 3988
3857 if (len) 3989 if (pty->pty < 0)
3990 return;
3991
3992 if (v_buflen == 0)
3993 {
3994 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3995
3996 if ((unsigned int)written == len)
3997 return;
3998
3999 data += written;
4000 len -= written;
3858 { 4001 }
4002
4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4004
4005 memcpy (v_buffer + v_buflen, data, len);
4006 v_buflen += len;
4007
4008 pty_ev.set (ev::READ | ev::WRITE);
4009}
4010
4011void rxvt_term::pty_write ()
4012{
4013 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4014
4015 if (written > 0)
4016 {
4017 v_buflen -= written;
4018
3859 if (v_buflen == 0) 4019 if (v_buflen == 0)
3860 { 4020 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3862
3863 if ((unsigned int)written == len)
3864 return;
3865
3866 data += written;
3867 len -= written;
3868 }
3869
3870
3871 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3872
3873 memcpy (v_buffer + v_buflen, data, len);
3874 v_buflen += len;
3875 }
3876
3877 for (;;)
3878 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880
3881 if (written > 0)
3882 {
3883 v_buflen -= written;
3884
3885 if (v_buflen == 0)
3886 {
3887 free (v_buffer); 4021 free (v_buffer);
3888 v_buffer = 0; 4022 v_buffer = 0;
3889 v_buflen = 0;
3890 4023
3891 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
3892 return;
3893 }
3894
3895 memmove (v_buffer, v_buffer + written, v_buflen);
3896 }
3897 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3898 // original code just ignores this...
3899 destroy ();
3900 else
3901 {
3902 pty_ev.set (EVENT_READ | EVENT_WRITE);
3903 return; 4025 return;
3904 } 4026 }
4027
4028 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4029 }
4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4031 pty_ev.set (ev::READ);
3906} 4032}
3907 4033
3908/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
3909 4035

Diff Legend

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