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.131 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.304 by root, Tue Jan 31 22:01:25 2006 UTC

… …
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#ifndef NO_FRILLS
63
64#define ISO_14755_KEYCODE_VALID 0x80000000UL
65#define ISO_14755_ACTIVE 0x40000000UL 70#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_ESCAPE_NEXT 0x20000000UL 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
67 75
76#if ISO_14755
68static unsigned short iso14755_symtab[] = { 77static unsigned short iso14755_symtab[] = {
69 // keysym, unicode 78 // keysym, unicode
70 XK_Left, 0x2190, 79 XK_Left, 0x2190,
71 XK_KP_Left, 0x2190, 80 XK_KP_Left, 0x2190,
72 XK_Up, 0x2191, 81 XK_Up, 0x2191,
… …
110 XK_Escape, 0x238b, 119 XK_Escape, 0x238b,
111 XK_Undo, 0x238c, 120 XK_Undo, 0x238c,
112 XK_Print, 0x2399, 121 XK_Print, 0x2399,
113 122
114 XK_space, 0x2423, 123 XK_space, 0x2423,
124
125#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de,
127 XK_KP_Next, 0x21df,
128 XK_KP_Begin, 0x2320,
129 XK_KP_Insert, 0x2380,
130 XK_KP_Delete, 0x2326,
115 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif
116 0, 133 0,
117}; 134};
118 135
119void 136void
137rxvt_term::iso14755_54 (int x, int y)
138{
139 x = Pixel2Col (x);
140 y = Pixel2Row (y);
141
142 if (!IN_RANGE_EXC (x, 0, ncol)
143 || !IN_RANGE_EXC (y, 0, nrow))
144 return;
145
146 for (;;)
147 {
148 const line_t &l = ROW(y + view_start);
149
150 text_t t = l.t[x];
151
152 if (t != NOCHAR || !x)
153 {
154 iso14755_51 (l.t[x], l.r[x], x, y);
155 iso14755buf = ISO_14755_54;
156 break;
157 }
158
159 x--;
160 }
161}
162
163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{
166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname;
169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172
173# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch))
175 {
176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr);
179 }
180 else
181# endif
182 {
183 ch2 = ch;
184
185 alloc = 0;
186 chr = &ch2;
187 len = 1;
188 }
189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
214
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216
217 for (int y = 0; y < len; y++)
218 {
219 char buf[9];
220
221 ch = *chr++;
222
223 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '=');
226# if !UNICODE3
227 if (ch >= 0x10000)
228 ch = 0xfffd;
229# endif
230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r);
234 }
235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
241 scr_overlay_set (0, len , attr);
242 scr_overlay_set (0, len + 1, fname);
243
244 free (fname);
245
246# if ENABLE_COMBINING
247 if (alloc)
248 delete [] alloc;
249# endif
250}
251#endif
252
253void
120rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
121{ 255{
122 wchar_t ch[2]; 256 wchar_t ch[2];
123 257
124 ch[0] = iso14755buf & 0x1fffffffUL; // actually, unicode needs a 0x1fffff mask 258 ch[0] = iso14755buf & ISO_14755_MASK;
125 ch[1] = 0; 259 ch[1] = 0;
126 260
127 if (iso14755buf & ISO_14755_KEYCODE_VALID) 261 if (iso14755buf & ISO_14755_51)
128 { 262 {
129 char mb[16]; 263 char mb[16];
130 int len; 264 int len;
131 265
132 // allow verbatim 0-bytes and control-bytes to be entered 266 // allow verbatim 0-bytes and control-bytes to be entered
… …
137 mb[0] = ch[0]; 271 mb[0] = ch[0];
138 len = 1; 272 len = 1;
139 } 273 }
140 274
141 if (len > 0) 275 if (len > 0)
142 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
143 else 277 else
144 scr_bell (); 278 scr_bell ();
145 } 279 }
146 280
147 iso14755buf = 0; 281 iso14755buf = 0;
… …
171rxvt_term::lookup_key (XKeyEvent &ev) 305rxvt_term::lookup_key (XKeyEvent &ev)
172{ 306{
173 int ctrl, meta, shft, len; 307 int ctrl, meta, shft, len;
174 unsigned int newlen; 308 unsigned int newlen;
175 KeySym keysym; 309 KeySym keysym;
176#ifdef DEBUG_CMD
177 static int debug_key = 1; /* accessible by a debugger only */
178#endif
179 int valid_keysym; 310 int valid_keysym;
180 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
181 312
182 /* 313 /*
183 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
184 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
185 * 316 *
186 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
187 */ 318 */
188 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
189 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
190 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
191 322
192 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
193 { 324 {
194 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
195 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
203 Status status_return; 334 Status status_return;
204 335
205#if 0 336#if 0
206#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
207 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
208 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
209 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
210 else 341 else
211#endif 342#endif
212#endif 343#endif
213 { 344 {
… …
215 346
216 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
217 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
218 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
219 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
220 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
221 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
222 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
223 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
224 SET_LOCALE (locale); 357 SET_LOCALE (locale);
225 358
226 if (status_return == XLookupChars 359 if (status_return == XLookupChars
227 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
248 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
249 } 382 }
250 else 383 else
251#endif 384#endif
252 { 385 {
253 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
254 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
255 } 388 }
256 389
257 if (valid_keysym) 390 if (valid_keysym)
258 { 391 {
392#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state))
394 return;
395#endif
396
259 if (TermWin.saveLines) 397 if (saveLines)
260 { 398 {
261#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
262 if (!ctrl && !meta) 400 if (!ctrl && !meta)
263#else 401#else
264 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
265#endif 403#endif
266 { 404 {
267 int lnsppg; 405 int lnsppg;
268 406
269#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
270 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
271#else 409#else
272 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
273#endif 411#endif
274 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
275 { 413 {
276 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
277 return; 415 return;
… …
305 scr_move_to (0, 1); 443 scr_move_to (0, 1);
306 return; 444 return;
307 } 445 }
308 else if (keysym == XK_End) 446 else if (keysym == XK_End)
309 { 447 {
310 scr_move_to (1, 0); 448 scr_move_to (1, 1);
311 return; 449 return;
312 } 450 }
313 } 451 }
314#endif 452#endif
315 } 453 }
… …
320 if (keysym >= XK_F1 && keysym <= XK_F10) 458 if (keysym >= XK_F1 && keysym <= XK_F10)
321 { 459 {
322 keysym += (XK_F11 - XK_F1); 460 keysym += (XK_F11 - XK_F1);
323 shft = 0; /* turn off Shift */ 461 shft = 0; /* turn off Shift */
324 } 462 }
325 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 463 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
326 { 464 {
327 switch (keysym) 465 switch (keysym)
328 { 466 {
329 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
330 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
331 selection_request (ev.time, 0, 0); 469 selection_request (ev.time);
332 return; 470 return;
333#if TODO // TODO 471#if TODO
334 /* rxvt extras */ 472 /* rxvt extras */
335 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
336 change_font (FONT_UP); 474 change_font (FONT_UP);
337 return; 475 return;
338 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 476 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
341#endif 479#endif
342 } 480 }
343 } 481 }
344 } 482 }
345 483
346#ifndef NO_FRILLS 484#if ENABLE_FRILLS || ISO_14755
347 // ISO 14755 support 485 // ISO 14755 support
348 if (shft && ctrl) 486 if (shft && ctrl)
349 { 487 {
350 int hv; 488 int hv;
351 489
490 if (iso14755buf & ISO_14755_51
352 if (keysym == XK_space || keysym == XK_KP_Space 491 && (keysym == XK_space || keysym == XK_KP_Space
353 || keysym == XK_Return || keysym == XK_KP_Enter) 492 || keysym == XK_Return || keysym == XK_KP_Enter))
354 { 493 {
355 commit_iso14755 (); 494 commit_iso14755 ();
495 iso14755buf = ISO_14755_51;
496# if ISO_14755
497 iso14755_51 (0);
498# endif
356 return; 499 return;
357 } 500 }
358 else if ((hv = hex_keyval (ev)) >= 0) 501 else if ((hv = hex_keyval (ev)) >= 0)
359 { 502 {
360 iso14755buf = (iso14755buf << 4) | hv | ISO_14755_KEYCODE_VALID; 503 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
504 | hv | ISO_14755_51;
505# if ISO_14755
506 iso14755_51 (iso14755buf & ISO_14755_MASK);
507# endif
361 return; 508 return;
362 } 509 }
363 else 510 else
511 {
512# if ENABLE_OVERLAY
513 scr_overlay_off ();
514# endif
364 iso14755buf = 0; 515 iso14755buf = 0;
516 }
365 } 517 }
366 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
367 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED))
521 {
368 iso14755buf |= ISO_14755_ACTIVE; 522 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif
527 }
369#endif 528#endif
370 529
371#ifdef PRINTPIPE 530#ifdef PRINTPIPE
372 if (keysym == XK_Print) 531 if (keysym == XK_Print)
373 { 532 {
… …
376 } 535 }
377#endif 536#endif
378 537
379 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 538 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
380 { 539 {
381#ifdef KEYSYM_RESOURCE
382 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
383 {
384 unsigned int l;
385 const unsigned char *kbuf0;
386
387 kbuf0 = (Keysym_map[keysym & 0xFF]);
388 l = (unsigned int)*kbuf0++;
389
390 /* escape prefix */
391 if (meta
392# ifdef META8_OPTION
393 && meta_char == C0_ESC
394# endif
395 )
396 {
397 const unsigned char ch = C0_ESC;
398 tt_write (&ch, 1);
399 }
400
401 tt_write (kbuf0, l);
402 return;
403 }
404 else
405#endif
406 { 540 {
407 newlen = 1; 541 newlen = 1;
408 switch (keysym) 542 switch (keysym)
409 { 543 {
410#ifndef NO_BACKSPACE_KEY 544#ifndef NO_BACKSPACE_KEY
411 case XK_BackSpace: 545 case XK_BackSpace:
412 if (PrivateModes & PrivMode_HaveBackSpace) 546 if (priv_modes & PrivMode_HaveBackSpace)
413 { 547 {
414 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
415 ^ !!ctrl) ? '\b' : '\177'; 549 ^ !!ctrl) ? '\b' : '\177';
416 kbuf[1] = '\0'; 550 kbuf[1] = '\0';
417 } 551 }
418 else 552 else
419 STRCPY (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
420 break; 554 break;
421#endif 555#endif
422#ifndef NO_DELETE_KEY 556#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
423 case XK_Delete: 567 case XK_Delete:
424 STRCPY (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
425 break; 569 break;
426#endif 570#endif
427 case XK_Tab: 571 case XK_Tab:
428 if (shft) 572 if (shft)
429 STRCPY (kbuf, "\033[Z"); 573 strcpy (kbuf, "\033[Z");
430 else 574 else
431 { 575 {
432#ifdef CTRL_TAB_MAKES_META 576#ifdef CTRL_TAB_MAKES_META
433 if (ctrl) 577 if (ctrl)
434 meta = 1; 578 meta = 1;
… …
444#ifdef XK_KP_Left 588#ifdef XK_KP_Left
445 case XK_KP_Up: /* \033Ox or standard */ 589 case XK_KP_Up: /* \033Ox or standard */
446 case XK_KP_Down: /* \033Or or standard */ 590 case XK_KP_Down: /* \033Or or standard */
447 case XK_KP_Right: /* \033Ov or standard */ 591 case XK_KP_Right: /* \033Ov or standard */
448 case XK_KP_Left: /* \033Ot or standard */ 592 case XK_KP_Left: /* \033Ot or standard */
449 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
450 { 594 {
451 STRCPY (kbuf, "\033OZ"); 595 strcpy (kbuf, "\033OZ");
452 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
453 break; 597 break;
454 } 598 }
455 else 599 else
456 /* translate to std. cursor key */ 600 /* translate to std. cursor key */
… …
459#endif 603#endif
460 case XK_Up: /* "\033[A" */ 604 case XK_Up: /* "\033[A" */
461 case XK_Down: /* "\033[B" */ 605 case XK_Down: /* "\033[B" */
462 case XK_Right: /* "\033[C" */ 606 case XK_Right: /* "\033[C" */
463 case XK_Left: /* "\033[D" */ 607 case XK_Left: /* "\033[D" */
464 STRCPY (kbuf, "\033[Z"); 608 strcpy (kbuf, "\033[Z");
465 kbuf[2] = "DACB"[keysym - XK_Left]; 609 kbuf[2] = "DACB"[keysym - XK_Left];
466 /* do Shift first */ 610 /* do Shift first */
467 if (shft) 611 if (shft)
468 kbuf[2] = "dacb"[keysym - XK_Left]; 612 kbuf[2] = "dacb"[keysym - XK_Left];
469 else if (ctrl) 613 else if (ctrl)
470 { 614 {
471 kbuf[1] = 'O'; 615 kbuf[1] = 'O';
472 kbuf[2] = "dacb"[keysym - XK_Left]; 616 kbuf[2] = "dacb"[keysym - XK_Left];
473 } 617 }
474 else if (PrivateModes & PrivMode_aplCUR) 618 else if (priv_modes & PrivMode_aplCUR)
475 kbuf[1] = 'O'; 619 kbuf[1] = 'O';
476 break; 620 break;
477 621
478#ifndef UNSHIFTED_SCROLLKEYS 622#ifndef UNSHIFTED_SCROLLKEYS
479# ifdef XK_KP_Prior 623# ifdef XK_KP_Prior
480 case XK_KP_Prior: 624 case XK_KP_Prior:
481 /* allow shift to override */ 625 /* allow shift to override */
482 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
483 { 627 {
484 STRCPY (kbuf, "\033Oy"); 628 strcpy (kbuf, "\033Oy");
485 break; 629 break;
486 } 630 }
487 /* FALLTHROUGH */ 631 /* FALLTHROUGH */
488# endif 632# endif
489 case XK_Prior: 633 case XK_Prior:
490 STRCPY (kbuf, "\033[5~"); 634 strcpy (kbuf, "\033[5~");
491 break; 635 break;
492# ifdef XK_KP_Next 636# ifdef XK_KP_Next
493 case XK_KP_Next: 637 case XK_KP_Next:
494 /* allow shift to override */ 638 /* allow shift to override */
495 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
496 { 640 {
497 STRCPY (kbuf, "\033Os"); 641 strcpy (kbuf, "\033Os");
498 break; 642 break;
499 } 643 }
500 /* FALLTHROUGH */ 644 /* FALLTHROUGH */
501# endif 645# endif
502 case XK_Next: 646 case XK_Next:
503 STRCPY (kbuf, "\033[6~"); 647 strcpy (kbuf, "\033[6~");
504 break; 648 break;
505#endif 649#endif
506 case XK_KP_Enter: 650 case XK_KP_Enter:
507 /* allow shift to override */ 651 /* allow shift to override */
508 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
509 { 653 {
510 STRCPY (kbuf, "\033OM"); 654 strcpy (kbuf, "\033OM");
655 break;
656 }
657
658 /* FALLTHROUGH */
659
660 case XK_Return:
661 if (priv_modes & PrivMode_LFNL)
662 {
663 kbuf[0] = '\015';
664 kbuf[1] = '\012';
665 kbuf[2] = '\0';
511 } 666 }
512 else 667 else
513 { 668 {
514 kbuf[0] = '\r'; 669 kbuf[0] = '\015';
515 kbuf[1] = '\0'; 670 kbuf[1] = '\0';
516 } 671 }
517 break; 672 break;
518 673
519#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
520 case XK_KP_Begin: 675 case XK_KP_Begin:
521 STRCPY (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
522 break; 677 break;
523 678
524 case XK_KP_Insert:
525 STRCPY (kbuf, "\033Op");
526 break;
527
528 case XK_KP_Delete:
529 STRCPY (kbuf, "\033On");
530 break;
531#endif 679#endif
532 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
533 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
534 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
535 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
536 STRCPY (kbuf, "\033OP"); 684 strcpy (kbuf, "\033OP");
537 kbuf[2] += (keysym - XK_KP_F1); 685 kbuf[2] += (keysym - XK_KP_F1);
538 break; 686 break;
539 687
540 case XK_KP_Multiply: /* "\033Oj" : "*" */ 688 case XK_KP_Multiply: /* "\033Oj" : "*" */
541 case XK_KP_Add: /* "\033Ok" : "+" */ 689 case XK_KP_Add: /* "\033Ok" : "+" */
… …
552 case XK_KP_6: /* "\033Ov" : "6" */ 700 case XK_KP_6: /* "\033Ov" : "6" */
553 case XK_KP_7: /* "\033Ow" : "7" */ 701 case XK_KP_7: /* "\033Ow" : "7" */
554 case XK_KP_8: /* "\033Ox" : "8" */ 702 case XK_KP_8: /* "\033Ox" : "8" */
555 case XK_KP_9: /* "\033Oy" : "9" */ 703 case XK_KP_9: /* "\033Oy" : "9" */
556 /* allow shift to override */ 704 /* allow shift to override */
557 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 { 706 {
559 STRCPY (kbuf, "\033Oj"); 707 strcpy (kbuf, "\033Oj");
560 kbuf[2] += (keysym - XK_KP_Multiply); 708 kbuf[2] += (keysym - XK_KP_Multiply);
561 } 709 }
562 else 710 else
563 { 711 {
564 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 712 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
565 kbuf[1] = '\0'; 713 kbuf[1] = '\0';
566 } 714 }
567 break; 715 break;
568 716
569 case XK_Find: 717 case XK_Find:
570 STRCPY (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
571 break; 719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
572 case XK_Insert: 731 case XK_Insert:
573 STRCPY (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
574 break; 733 break;
575#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
576 case DXK_Remove: 735 case DXK_Remove:
577 /* FALLTHROUGH */ 736 /* FALLTHROUGH */
578#endif 737#endif
579 case XK_Execute: 738 case XK_Execute:
580 STRCPY (kbuf, "\033[3~"); 739 strcpy (kbuf, "\033[3~");
581 break; 740 break;
582 case XK_Select: 741 case XK_Select:
583 STRCPY (kbuf, "\033[4~"); 742 strcpy (kbuf, "\033[4~");
584 break; 743 break;
585#ifdef XK_KP_End 744#ifdef XK_KP_End
586 case XK_KP_End: 745 case XK_KP_End:
587 /* allow shift to override */ 746 /* allow shift to override */
588 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
589 { 748 {
590 STRCPY (kbuf, "\033Oq"); 749 strcpy (kbuf, "\033Oq");
591 break; 750 break;
592 } 751 }
593 /* FALLTHROUGH */ 752 /* FALLTHROUGH */
594#endif 753#endif
595 case XK_End: 754 case XK_End:
596 STRCPY (kbuf, KS_END); 755 strcpy (kbuf, KS_END);
597 break; 756 break;
598#ifdef XK_KP_Home 757#ifdef XK_KP_Home
599 case XK_KP_Home: 758 case XK_KP_Home:
600 /* allow shift to override */ 759 /* allow shift to override */
601 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
602 { 761 {
603 STRCPY (kbuf, "\033Ow"); 762 strcpy (kbuf, "\033Ow");
604 break; 763 break;
605 } 764 }
606 /* FALLTHROUGH */ 765 /* FALLTHROUGH */
607#endif 766#endif
608 case XK_Home: 767 case XK_Home:
609 STRCPY (kbuf, KS_HOME); 768 strcpy (kbuf, KS_HOME);
610 break; 769 break;
611 770
612#define FKEY(n, fkey) \ 771#define FKEY(n, fkey) \
613 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 772 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
614 773
… …
666#undef FKEY 825#undef FKEY
667 default: 826 default:
668 newlen = 0; 827 newlen = 0;
669 break; 828 break;
670 } 829 }
830
671 if (newlen) 831 if (newlen)
672 len = STRLEN (kbuf); 832 len = strlen (kbuf);
673 } 833 }
674 834
675 /* 835 /*
676 * Pass meta for all function keys, if 'meta' option set 836 * Pass meta for all function keys, if 'meta' option set
677 */ 837 */
… …
684 else if (ctrl && keysym == XK_minus) 844 else if (ctrl && keysym == XK_minus)
685 { 845 {
686 len = 1; 846 len = 1;
687 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 847 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
688 } 848 }
849 else if (keysym == XK_ISO_Left_Tab)
850 {
851 strcpy (kbuf, "\033[Z");
852 len = 3;
853 }
689 else 854 else
690 { 855 {
691#ifdef META8_OPTION 856#ifdef META8_OPTION
692 /* set 8-bit on */ 857 /* set 8-bit on */
693 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
694 { 859 {
695 unsigned char *ch; 860 char *ch;
696 861
697 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
698 *ch |= 0x80; 863 *ch |= 0x80;
699 864
700 meta = 0; 865 meta = 0;
… …
702#endif 867#endif
703 /* nil */ ; 868 /* nil */ ;
704 } 869 }
705 } 870 }
706 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
707 if (len <= 0) 875 if (len <= 0)
708 return; /* not mapped */ 876 return; /* not mapped */
709 877
710 if (Options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
711 if (TermWin.view_start) 879 if (view_start)
712 { 880 {
713 TermWin.view_start = 0; 881 view_start = 0;
714 want_refresh = 1; 882 want_refresh = 1;
715 } 883 }
716 884
717 /* 885 /*
718 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
733#ifdef META8_OPTION 901#ifdef META8_OPTION
734 && meta_char == C0_ESC 902 && meta_char == C0_ESC
735#endif 903#endif
736 ) 904 )
737 { 905 {
738 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
739 tt_write (&ch, 1); 907 tt_write (&ch, 1);
740 } 908 }
741 909
742#if defined(DEBUG_CMD)
743 /* Display keyboard buffer contents */
744 unsigned char *p;
745 int i;
746
747 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
748 for (i = 0, p = kbuf; i < len; i++, p++)
749 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
750 fprintf (stderr, "'\n");
751#endif /* DEBUG_CMD */
752 tt_write (kbuf, (unsigned int)len); 910 tt_write (kbuf, (unsigned int)len);
753} 911}
754/*}}} */ 912/*}}} */
755 913
756#if (MENUBAR_MAX) 914#if defined (KEYSYM_RESOURCE)
757/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
758/* attempt to `write' count to the input buffer */
759unsigned int 915unsigned int
760rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 916rxvt_term::cmd_write (const char *str, unsigned int count)
761{ 917{
762 unsigned int n, s; 918 unsigned int n, s;
763 919
764 n = cmdbuf_ptr - cmdbuf_base; 920 n = cmdbuf_ptr - cmdbuf_base;
765 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 921 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
766 922
767 if (n > 0 && s < count) 923 if (n > 0 && s < count)
768 { 924 {
769 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 925 memmove (cmdbuf_base, cmdbuf_ptr,
770 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 926 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
771 cmdbuf_ptr = cmdbuf_base; 927 cmdbuf_ptr = cmdbuf_base;
772 cmdbuf_endp -= n; 928 cmdbuf_endp -= n;
773 s += n; 929 s += n;
774 } 930 }
… …
784 940
785 cmd_parse (); 941 cmd_parse ();
786 942
787 return 0; 943 return 0;
788} 944}
789#endif /* MENUBAR_MAX */ 945#endif
790 946
791void 947void
792rxvt_term::flush () 948rxvt_term::flush ()
793{ 949{
950 flush_ev.stop ();
951
794#ifdef TRANSPARENT 952#ifdef TRANSPARENT
795 if (want_full_refresh) 953 if (want_full_refresh)
796 { 954 {
797 want_full_refresh = 0; 955 want_full_refresh = 0;
798 scr_clear (); 956 scr_clear ();
… …
800 } 958 }
801#endif 959#endif
802 960
803 if (want_refresh) 961 if (want_refresh)
804 { 962 {
963 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
964 {
965 int row = view_start;
966 int end_row = row + nrow;
967
968 while (row > top_row && ROW (row - 1).is_longer ())
969 --row;
970
971 do
972 {
973 int start_row = row;
974 line_t *l;
975
976 do
977 {
978 l = &ROW (row++);
979
980 if (!(l->f & LINE_FILTERED))
981 {
982 // line not filtered, mark it as filtered
983 l->f |= LINE_FILTERED;
984 while (l->is_longer ())
985 {
986 l = &ROW (row++);
987 l->f |= LINE_FILTERED;
988 }
989
990 // and filter it
991 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
992
993 break;
994 }
995 }
996 while (l->is_longer () && row < end_row);
997 }
998 while (row < end_row);
999 }
1000
805 scr_refresh (refresh_type); 1001 scr_refresh ();
806 scrollbar_show (1); 1002 scrollbar_show (1);
807#ifdef USE_XIM 1003#ifdef USE_XIM
808 IMSendSpot (); 1004 IMSendSpot ();
809#endif 1005#endif
810 } 1006 }
811 1007
812 display->flush (); 1008 display->flush ();
813
814 flush_ev.stop ();
815} 1009}
816 1010
817void 1011void
818rxvt_term::check_cb (check_watcher &w) 1012rxvt_term::check_cb (check_watcher &w)
819{ 1013{
820 SET_R (this); 1014 make_current ();
821 SET_LOCALE (locale);
822 1015
823 display->flush (); 1016 display->flush ();
824 1017
825 if (want_refresh && !flush_ev.active) 1018 if (want_refresh && !flush_ev.active)
826 flush_ev.start (NOW + 0.01); 1019 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
827} 1020}
828 1021
829void 1022void
830rxvt_term::flush_cb (time_watcher &w) 1023rxvt_term::flush_cb (time_watcher &w)
831{ 1024{
832 SET_R (this); 1025 make_current ();
833 SET_LOCALE (locale);
834 1026
835 refresh_limit = 1; 1027 refresh_limit = 1;
836 refresh_count = 0; 1028 refresh_count = 0;
837 flush (); 1029 flush ();
838} 1030}
… …
842rxvt_term::cursor_blink_cb (time_watcher &w) 1034rxvt_term::cursor_blink_cb (time_watcher &w)
843{ 1035{
844 hidden_cursor = !hidden_cursor; 1036 hidden_cursor = !hidden_cursor;
845 want_refresh = 1; 1037 want_refresh = 1;
846 1038
847 w.start (w.at + BLINK_INTERVAL); 1039 w.start (w.at + CURSOR_BLINK_INTERVAL);
848} 1040}
849#endif 1041#endif
850 1042
851#ifdef TEXT_BLINK 1043#ifdef TEXT_BLINK
852void 1044void
… …
866rxvt_term::cont_scroll_cb (time_watcher &w) 1058rxvt_term::cont_scroll_cb (time_watcher &w)
867{ 1059{
868 if ((scrollbar_isUp() || scrollbar_isDn()) && 1060 if ((scrollbar_isUp() || scrollbar_isDn()) &&
869 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1061 scr_page (scrollbar_isUp() ? UP : DN, 1))
870 { 1062 {
871 refresh_type |= SMOOTH_REFRESH;
872 want_refresh = 1; 1063 want_refresh = 1;
873 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1064 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
874 } 1065 }
875} 1066}
876#endif 1067#endif
… …
880rxvt_term::sel_scroll_cb (time_watcher &w) 1071rxvt_term::sel_scroll_cb (time_watcher &w)
881{ 1072{
882 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1073 if (scr_page (scroll_selection_dir, scroll_selection_lines))
883 { 1074 {
884 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1075 selection_extend (selection_save_x, selection_save_y, selection_save_state);
885 refresh_type |= SMOOTH_REFRESH;
886 want_refresh = 1; 1076 want_refresh = 1;
887 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
888 } 1078 }
889} 1079}
890#endif 1080#endif
… …
895{ 1085{
896 if (mouse_slip_wheel_speed == 0 1086 if (mouse_slip_wheel_speed == 0
897 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1087 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
898 : scr_page (UP, mouse_slip_wheel_speed)) 1088 : scr_page (UP, mouse_slip_wheel_speed))
899 { 1089 {
900 refresh_type |= SMOOTH_REFRESH; 1090 if (view_start == top_row || view_start == 0)
1091 mouse_slip_wheel_speed = 0;
1092
901 want_refresh = 1; 1093 want_refresh = 1;
902 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
903 } 1095 }
904} 1096}
905#endif 1097#endif
906 1098
1099#if LINUX_YIELD_HACK
1100static struct event_handler
1101{
1102 check_watcher yield_ev;
1103
1104 void yield_cb (check_watcher &w)
1105 {
1106 // this should really be sched_yield(), but the linux guys thought
1107 // that giving a process calling sched_yield () less cpu time than
1108 // ones with high nice levels is a useful thing to do. It surely is is
1109 // allowed by the sus... as is returning ENOSYS.
1110
1111 struct timespec ts = { 0, 0 };
1112 nanosleep (&ts, 0);
1113
1114 w.stop ();
1115 }
1116
1117 event_handler ()
1118 : yield_ev (this, &event_handler::yield_cb)
1119 {
1120 }
1121} event_handler;
1122#endif
1123
907bool 1124bool
908rxvt_term::pty_fill () 1125rxvt_term::pty_fill ()
909{ 1126{
910 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
911 1128
912 if (CBUFSIZ == n) 1129 if (CBUFSIZ == n)
913 { 1130 {
914 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1131 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
915 n = 0; 1132 n = 0;
916 } 1133 }
917 1134
918 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
919 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
920 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
921 1138
922 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
923 1140
924 if (n > 0) 1141 if (r > 0)
925 { 1142 {
926 cmdbuf_endp += n; 1143 cmdbuf_endp += r;
927 return true; 1144 return true;
928 } 1145 }
929 else if (n < 0 && errno != EAGAIN) 1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 {
1148#if LINUX_YIELD_HACK
1149 if (display->is_local)
1150 event_handler.yield_ev.start ();
1151#endif
1152 }
1153 else
1154 {
1155 pty_ev.stop ();
1156
1157 if (!OPTION (Opt_hold))
930 destroy (); 1158 destroy ();
1159 }
931 1160
932 return false; 1161 return false;
933} 1162}
934 1163
935void 1164void
936rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
937{ 1166{
938 SET_R (this); 1167 make_current ();
939 SET_LOCALE (locale);
940 1168
941 if (revents & EVENT_WRITE)
942 tt_write (0, 0);
943 else if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
944 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
945 while (pty_fill ()) 1171 while (pty_fill ())
946 if (cmd_parse ()) 1172 if (cmd_parse ())
947 break; 1173 break;
1174
1175 if (revents & EVENT_WRITE)
1176 pty_write ();
948} 1177}
949 1178
950void 1179void
951rxvt_term::pointer_unblank () 1180rxvt_term::pointer_unblank ()
952{ 1181{
953 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1182 XDefineCursor (xdisp, vt, TermWin_cursor);
954 recolour_cursor (); 1183 recolour_cursor ();
955 1184
956#ifdef POINTER_BLANK 1185#ifdef POINTER_BLANK
957 hidden_pointer = 0; 1186 hidden_pointer = 0;
958 1187
959 if (Options & Opt_pointerBlank) 1188 if (OPTION (Opt_pointerBlank))
960 pointer_ev.start (NOW + pointerBlankDelay); 1189 pointer_ev.start (NOW + pointerBlankDelay);
961#endif 1190#endif
962} 1191}
963 1192
964#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
965void 1194void
966rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
967{ 1196{
968 if (! (Options & Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
969 return; 1198 return;
970 1199
971 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1200 XDefineCursor (xdisp, vt, display->blank_cursor);
972 XFlush (display->display); 1201 XFlush (xdisp);
973 1202
974 hidden_pointer = 1; 1203 hidden_pointer = 1;
975} 1204}
976 1205
977void 1206void
978rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
979{ 1208{
980 SET_R (this); 1209 make_current ();
981 SET_LOCALE (locale);
982 1210
983 pointer_blank (); 1211 pointer_blank ();
984} 1212}
985#endif 1213#endif
986 1214
… …
993 x = ev.x; 1221 x = ev.x;
994 y = ev.y; 1222 y = ev.y;
995 pixel_position (&x, &y); 1223 pixel_position (&x, &y);
996 1224
997 if (MEvent.button == AnyButton) 1225 if (MEvent.button == AnyButton)
998 {
999 button_number = 3; 1226 button_number = 3;
1000 }
1001 else 1227 else
1002 { 1228 {
1003 button_number = MEvent.button - Button1; 1229 button_number = MEvent.button - Button1;
1004 /* add 0x3D for wheel events, like xterm does */ 1230 /* add 0x3D for wheel events, like xterm does */
1005 if (button_number >= 3) 1231 if (button_number >= 3)
1006 button_number += (64 - 3); 1232 button_number += (64 - 3);
1007 } 1233 }
1008 1234
1009 if (PrivateModes & PrivMode_MouseX10) 1235 if (priv_modes & PrivMode_MouseX10)
1010 { 1236 {
1011 /* 1237 /*
1012 * do not report ButtonRelease 1238 * do not report ButtonRelease
1013 * no state info allowed 1239 * no state info allowed
1014 */ 1240 */
… …
1029 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1255 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1030 + ((MEvent.state & ControlMask) ? 16 : 0); 1256 + ((MEvent.state & ControlMask) ? 16 : 0);
1031#ifdef MOUSE_REPORT_DOUBLECLICK 1257#ifdef MOUSE_REPORT_DOUBLECLICK
1032 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1258 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1033#endif 1259#endif
1034
1035 } 1260 }
1036 1261
1037#ifdef DEBUG_MOUSEREPORT 1262#if DEBUG_MOUSEREPORT
1038 fprintf (stderr, "Mouse ["); 1263 fprintf (stderr, "Mouse [");
1039 if (key_state & 16) 1264 if (key_state & 16)
1040 fputc ('C', stderr); 1265 fputc ('C', stderr);
1041 if (key_state & 4) 1266 if (key_state & 4)
1042 fputc ('S', stderr); 1267 fputc ('S', stderr);
… …
1046 fputc ('2', stderr); 1271 fputc ('2', stderr);
1047 fprintf (stderr, "]: <%d>, %d/%d\n", 1272 fprintf (stderr, "]: <%d>, %d/%d\n",
1048 button_number, 1273 button_number,
1049 x + 1, 1274 x + 1,
1050 y + 1); 1275 y + 1);
1051#else 1276#endif
1277
1052 tt_printf ("\033[M%c%c%c", 1278 tt_printf ("\033[M%c%c%c",
1053 (32 + button_number + key_state), 1279 (32 + button_number + key_state),
1054 (32 + x + 1), 1280 (32 + x + 1),
1055 (32 + y + 1)); 1281 (32 + y + 1));
1056#endif
1057} 1282}
1058
1059#ifdef USING_W11LIB
1060void
1061rxvt_W11_process_x_event (XEvent *ev)
1062{
1063 rxvt_t *r = rxvt_get_r ();
1064
1065 x_cb (*ev);
1066}
1067#endif
1068 1283
1069/*{{{ process an X event */ 1284/*{{{ process an X event */
1070void 1285void
1071rxvt_term::x_cb (XEvent &ev) 1286rxvt_term::x_cb (XEvent &ev)
1072{ 1287{
1073 SET_R (this); 1288 make_current ();
1074 SET_LOCALE (locale);
1075 1289
1076#if defined(CURSOR_BLINK) 1290 dLocal (Display *, xdisp);
1077 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1078 {
1079 if (hidden_cursor)
1080 {
1081 hidden_cursor = 0;
1082 want_refresh = 1;
1083 }
1084 1291
1085 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1292 if (ev.xany.window == vt
1086 } 1293 && SHOULD_INVOKE (HOOK_X_EVENT)
1087#endif 1294 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1088
1089#if defined(POINTER_BLANK)
1090 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1091 {
1092 if (ev.type == MotionNotify
1093 || ev.type == ButtonPress
1094 || ev.type == ButtonRelease)
1095 if (hidden_pointer)
1096 pointer_unblank ();
1097
1098 if (ev.type == KeyPress && hidden_pointer == 0)
1099 pointer_blank ();
1100 }
1101#endif
1102
1103#ifdef USE_XIM
1104 if (XFilterEvent (&ev, None))
1105 return; 1295 return;
1106#endif
1107 1296
1297 // for XQueryPointer
1108 Window unused_root, unused_child; 1298 Window unused_root, unused_child;
1109 int unused_root_x, unused_root_y; 1299 int unused_root_x, unused_root_y;
1110 unsigned int unused_mask; 1300 unsigned int unused_mask;
1111
1112#ifdef DEBUG_X
1113 const char *const eventnames[] =
1114 { /* mason - this matches my system */
1115 "",
1116 "",
1117 "KeyPress",
1118 "KeyRelease",
1119 "ButtonPress",
1120 "ButtonRelease",
1121 "MotionNotify",
1122 "EnterNotify",
1123 "LeaveNotify",
1124 "FocusIn",
1125 "FocusOut",
1126 "KeymapNotify",
1127 "Expose",
1128 "GraphicsExpose",
1129 "NoExpose",
1130 "VisibilityNotify",
1131 "CreateNotify",
1132 "DestroyNotify",
1133 "UnmapNotify",
1134 "MapNotify",
1135 "MapRequest",
1136 "ReparentNotify",
1137 "ConfigureNotify",
1138 "ConfigureRequest",
1139 "GravityNotify",
1140 "ResizeRequest",
1141 "CirculateNotify",
1142 "CirculateRequest",
1143 "PropertyNotify",
1144 "SelectionClear",
1145 "SelectionRequest",
1146 "SelectionNotify",
1147 "ColormapNotify",
1148 "ClientMessage",
1149 "MappingNotify"
1150 };
1151#endif
1152
1153#ifdef DEBUG_X
1154 struct timeval tp;
1155 struct tm *ltt;
1156 (void)gettimeofday (&tp, NULL);
1157 ltt = localtime (& (tp.tv_sec));
1158 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));
1159#endif
1160 1301
1161 switch (ev.type) 1302 switch (ev.type)
1162 { 1303 {
1163 case KeyPress: 1304 case KeyPress:
1305#if ISO_14755
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT)) 1306 if (!(iso14755buf & ISO_14755_52))
1307#endif
1165 lookup_key (ev.xkey); 1308 lookup_key (ev.xkey);
1166 1309
1167 break; 1310 break;
1168 1311
1169 case KeyRelease: 1312 case KeyRelease:
1170 { 1313 {
1171#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || !defined (NO_FRILLS) 1314#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1172 KeySym ks; 1315 KeySym keysym;
1173 1316
1174 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1317 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1175#endif 1318#endif
1176 1319
1177#ifndef NO_FRILLS 1320#if ENABLE_FRILLS || ISO_14755
1178 // ISO 14755 support 1321 // ISO 14755 support
1179 if (iso14755buf) 1322 if (iso14755buf)
1180 if (iso14755buf & ISO_14755_ESCAPE_NEXT) 1323 if (iso14755buf & ISO_14755_52)
1181 { 1324 {
1325# if ENABLE_OVERLAY
1326 scr_overlay_off ();
1327# endif
1328# if ISO_14755
1182 // iso14755 part 5.2 handling: release time 1329 // iso14755 part 5.2 handling: release time
1183 // first: controls 1330 // first: controls
1184 if ((ev.xkey.state & ControlMask) 1331 if ((ev.xkey.state & ControlMask)
1185 && ((ks >= 0x40 && ks <= 0x5f) 1332 && ((keysym >= 0x40 && keysym <= 0x5f)
1186 || (ks >= 0x61 && ks <= 0x7f))) 1333 || (keysym >= 0x61 && keysym <= 0x7f)))
1187 { 1334 {
1188 iso14755buf = ISO_14755_KEYCODE_VALID | 0x2400 | (ks & 0x1f); 1335 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1189 commit_iso14755 (); 1336 commit_iso14755 ();
1190 return; // case-break; 1337 goto skip_switch;
1191 } 1338 }
1192 1339
1193 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1340 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1194 if (i[0] == ks) 1341 if (i[0] == keysym)
1195 { 1342 {
1196 iso14755buf = ISO_14755_KEYCODE_VALID | i[1]; 1343 iso14755buf = ISO_14755_51 | i[1];
1197 commit_iso14755 (); 1344 commit_iso14755 ();
1198 return; // case-break; 1345 goto skip_switch;
1199 } 1346 }
1200 1347
1348 scr_bell ();
1349# endif
1201 iso14755buf = 0; 1350 iso14755buf = 0;
1202 scr_bell ();
1203 break; 1351 break;
1204 } 1352 }
1205 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 1353 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1206 { 1354 {
1355# if ENABLE_OVERLAY
1356 scr_overlay_off ();
1357# endif
1207 if (iso14755buf & ISO_14755_KEYCODE_VALID) 1358 if (iso14755buf & ISO_14755_51)
1208 commit_iso14755 (); 1359 commit_iso14755 ();
1360#if ISO_14755
1209 else if (iso14755buf & ISO_14755_ACTIVE) 1361 else if (iso14755buf & ISO_14755_STARTED)
1362 {
1210 iso14755buf = ISO_14755_ESCAPE_NEXT; // iso14755 part 5.2: remember empty begin/end pair 1363 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1364
1365 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1366 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1367 }
1368# endif
1369 else
1370 iso14755buf = 0;
1211 } 1371 }
1212#endif 1372#endif
1373
1374 if (ev.xany.window == vt
1375 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1376 break;
1213 1377
1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1215 if (!(ev.xkey.state & ControlMask)) 1379 if (!(ev.xkey.state & ControlMask))
1216 slip_wheel_ev.stop (); 1380 slip_wheel_ev.stop ();
1217 else if (ks == XK_Control_L || ks == XK_Control_R) 1381 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1218 mouse_slip_wheel_speed = 0; 1382 mouse_slip_wheel_speed = 0;
1219#endif 1383#endif
1220 break; 1384 break;
1221 } 1385 }
1222 1386
… …
1228 button_release (ev.xbutton); 1392 button_release (ev.xbutton);
1229 break; 1393 break;
1230 1394
1231 case ClientMessage: 1395 case ClientMessage:
1232 if (ev.xclient.format == 32 1396 if (ev.xclient.format == 32
1233 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1397 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1234 destroy ();
1235#ifdef OFFIX_DND
1236 /* OffiX Dnd (drag 'n' drop) protocol */
1237 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1238 && (ev.xclient.data.l[0] == DndFile
1239 || ev.xclient.data.l[0] == DndDir
1240 || ev.xclient.data.l[0] == DndLink))
1241 { 1398 {
1242 /* Get Dnd data */ 1399 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1243 Atom ActualType; 1400 {
1244 int ActualFormat; 1401 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1245 unsigned char *data; 1402 {
1246 unsigned long Size, RemainingBytes; 1403 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1247 1404 {
1248 XGetWindowProperty (display->display, display->root, 1405 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1249 xa[XA_DNDSELECTION], 1406 destroy ();
1250 0L, 1000000L, 1407 }
1251 False, AnyPropertyType, 1408#if ENABLE_EWMH
1252 &ActualType, &ActualFormat, 1409 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1253 &Size, &RemainingBytes, 1410 XSendEvent (xdisp, ev.xclient.window = display->root,
1411 False, SubstructureRedirectMask | SubstructureNotifyMask,
1254 &data); 1412 &ev);
1255 XChangeProperty (display->display, display->root, 1413#endif
1256 XA_CUT_BUFFER0, XA_STRING, 1414 }
1257 8, PropModeReplace, 1415 }
1258 data, STRLEN (data)); 1416#if ENABLE_XEMBED
1259 XFree (data); 1417 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1260 selection_paste (display->root, XA_CUT_BUFFER0, True); 1418 {
1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1419 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1420 focus_in ();
1421 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1422 focus_out ();
1423 }
1424#endif
1262 } 1425 }
1263#endif /* OFFIX_DND */
1264 break; 1426 break;
1265 1427
1266 case MappingNotify: 1428 case MappingNotify:
1267 XRefreshKeyboardMapping (&ev.xmapping); 1429 XRefreshKeyboardMapping (&ev.xmapping);
1268 break; 1430 break;
… …
1291 break; 1453 break;
1292 } 1454 }
1293 break; 1455 break;
1294 1456
1295 case FocusIn: 1457 case FocusIn:
1296 if (!TermWin.focus) 1458 focus_in ();
1459 break;
1460
1461 case FocusOut:
1462 focus_out ();
1463 break;
1464
1465 case ConfigureNotify:
1466 if (ev.xconfigure.window == parent[0])
1297 { 1467 {
1298 TermWin.focus = 1; 1468 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1299 want_refresh = 1; 1469 ;
1300#ifdef USE_XIM 1470
1301 if (Input_Context != NULL) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1302 XSetICFocus (Input_Context);
1303#endif
1304#ifdef CURSOR_BLINK
1305 if (Options & Opt_cursorBlink)
1306 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1307#endif
1308#ifdef OFF_FOCUS_FADING
1309 if (rs[Rs_fade])
1310 { 1472 {
1311 PixColors = PixColorsFocused; 1473 seen_resize = 1;
1312 set_colorfgbg (); 1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1313 scr_clear ();
1314 scr_touch (true);
1315 } 1475 }
1316#endif
1317 1476
1477 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1478
1479#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1480 if (OPTION (Opt_transparent))
1481 check_our_parents ();
1482#endif
1318 } 1483 }
1319 break; 1484 break;
1320 1485
1321 case FocusOut:
1322 if (TermWin.focus)
1323 {
1324 TermWin.focus = 0;
1325 want_refresh = 1;
1326#ifdef USE_XIM
1327 if (Input_Context != NULL)
1328 XUnsetICFocus (Input_Context);
1329#endif
1330#ifdef CURSOR_BLINK
1331 if (Options & Opt_cursorBlink)
1332 cursor_blink_ev.stop ();
1333 hidden_cursor = 0;
1334#endif
1335#ifdef OFF_FOCUS_FADING
1336 if (rs[Rs_fade])
1337 {
1338 PixColors = PixColorsUnFocused;
1339 set_colorfgbg ();
1340 scr_clear ();
1341 scr_touch (true);
1342 }
1343#endif
1344
1345 }
1346 break;
1347
1348 case ConfigureNotify:
1349 if (ev.xconfigure.window == TermWin.parent[0])
1350 {
1351 int height, width;
1352
1353 do
1354 { /* Wrap lots of configures into one */
1355 width = ev.xconfigure.width;
1356 height = ev.xconfigure.height;
1357 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1358 }
1359 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1360
1361 if (szHint.width != width || szHint.height != height)
1362 resize_all_windows (width, height, 1);
1363
1364#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1365 if (Options & Opt_transparent)
1366 {
1367 check_our_parents ();
1368 if (am_transparent)
1369 want_refresh = want_full_refresh = 1;
1370 }
1371#endif
1372 }
1373 break;
1374
1375 case PropertyNotify: 1486 case PropertyNotify:
1487 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1376 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1488 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1377 && ev.xproperty.state == PropertyNewValue) 1489 && ev.xproperty.state == PropertyNewValue)
1378 selection_property (ev.xproperty.window, ev.xproperty.atom); 1490 selection_property (ev.xproperty.window, ev.xproperty.atom);
1379 1491
1380 break; 1492 break;
1381 1493
1382 case SelectionClear: 1494 case SelectionClear:
1383 selection_clear (); 1495 selection_clear ();
1384 break; 1496 break;
1385 1497
1386 case SelectionNotify: 1498 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1499 if (selection_wait == Sel_normal)
1388 selection_paste (ev.xselection.requestor, 1500 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1389 ev.xselection.property, True);
1390 break; 1501 break;
1391 1502
1392 case SelectionRequest: 1503 case SelectionRequest:
1393 selection_send (ev.xselectionrequest); 1504 selection_send (ev.xselectionrequest);
1394 break; 1505 break;
1395 1506
1507 case MapNotify:
1508 mapped = 1;
1509#ifdef TEXT_BLINK
1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1511#endif
1512 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1513 break;
1514
1396 case UnmapNotify: 1515 case UnmapNotify:
1397 TermWin.mapped = 0; 1516 mapped = 0;
1398#ifdef TEXT_BLINK 1517#ifdef TEXT_BLINK
1399 text_blink_ev.stop (); 1518 text_blink_ev.stop ();
1400#endif 1519#endif
1401 break; 1520 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1402
1403 case MapNotify:
1404 TermWin.mapped = 1;
1405#ifdef TEXT_BLINK
1406 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1407#endif
1408 break; 1521 break;
1409 1522
1410#ifdef TRANSPARENT 1523#ifdef TRANSPARENT
1411 case ReparentNotify: 1524 case ReparentNotify:
1412 rootwin_cb (ev); 1525 rootwin_cb (ev);
1413 break; 1526 break;
1414#endif /* TRANSPARENT */ 1527#endif /* TRANSPARENT */
1415 1528
1416 case GraphicsExpose: 1529 case GraphicsExpose:
1417 case Expose: 1530 case Expose:
1418 if (ev.xany.window == TermWin.vt) 1531 if (ev.xany.window == vt)
1419 { 1532 {
1420 do 1533 do
1421 scr_expose (ev.xexpose.x, ev.xexpose.y, 1534 scr_expose (ev.xexpose.x, ev.xexpose.y,
1422 ev.xexpose.width, ev.xexpose.height, False); 1535 ev.xexpose.width, ev.xexpose.height, False);
1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1536 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1424 1537
1425 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1538 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1426 1539
1427 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1540 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1428 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1429 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1430 1543
1431 scr_refresh (refresh_type); 1544 want_refresh = 1;
1432 } 1545 }
1433 else 1546 else
1434 { 1547 {
1435 XEvent unused_event; 1548 XEvent unused_event;
1436 1549
1437 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1550 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1438 ; 1551 ;
1439 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1552 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1440 ; 1553 ;
1441 1554
1442 if (isScrollbarWindow (ev.xany.window)) 1555 if (isScrollbarWindow (ev.xany.window))
1443 { 1556 {
1444 scrollBar.setIdle (); 1557 scrollBar.setIdle ();
1445 scrollbar_show (0); 1558 scrollbar_show (0);
1446 } 1559 }
1447#ifdef MENUBAR
1448 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1449 menubar_expose ();
1450#endif
1451 1560
1452#ifdef TRANSPARENT 1561#ifdef TRANSPARENT
1453 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1562 if (am_transparent && ev.xany.window == parent[0])
1454 XClearWindow (display->display, ev.xany.window); 1563 XClearWindow (xdisp, ev.xany.window);
1455#endif 1564#endif
1456 } 1565 }
1457 break; 1566 break;
1458 1567
1459 case MotionNotify: 1568 case MotionNotify:
1460#ifdef POINTER_BLANK 1569#ifdef POINTER_BLANK
1461 if (hidden_pointer) 1570 if (hidden_pointer)
1462 pointer_unblank (); 1571 pointer_unblank ();
1463#endif 1572#endif
1464#if MENUBAR 1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1465 if (isMenuBarWindow (ev.xany.window)) 1574 break;
1575
1576 if (ev.xany.window == vt)
1466 { 1577 {
1467 menubar_control (ev.xbutton); 1578 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1468 break; 1579 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1469 } 1580 ; // nop
1470#endif
1471 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1472 break;
1473
1474 if (ev.xany.window == TermWin.vt)
1475 {
1476 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1581 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1477 { 1582 {
1478 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1583 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1479 ; 1584 ;
1480 1585
1481 XQueryPointer (display->display, TermWin.vt, 1586 XQueryPointer (xdisp, vt,
1482 &unused_root, &unused_child, 1587 &unused_root, &unused_child,
1483 &unused_root_x, &unused_root_y, 1588 &unused_root_x, &unused_root_y,
1484 & (ev.xbutton.x), & (ev.xbutton.y), 1589 &ev.xbutton.x, &ev.xbutton.y,
1485 &unused_mask); 1590 &ev.xbutton.state);
1486#ifdef MOUSE_THRESHOLD 1591#ifdef MOUSE_THRESHOLD
1487 /* deal with a `jumpy' mouse */ 1592 /* deal with a `jumpy' mouse */
1488 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1593 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1489 { 1594 {
1490#endif 1595#endif
1596#if ISO_14755
1597 // 5.4
1598 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1599 {
1600 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1601 break;
1602 }
1603#endif
1491 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1604 selection_extend (ev.xbutton.x, ev.xbutton.y,
1492 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1605 ev.xbutton.state & Button3Mask ? 2 : 0);
1606
1493#ifdef SELECTION_SCROLLING 1607#ifdef SELECTION_SCROLLING
1494 if (ev.xbutton.y < TermWin.int_bwidth 1608 if (ev.xbutton.y < int_bwidth
1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1609 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1496 { 1610 {
1497 int dist; 1611 int dist;
1498 1612
1499 /* don't clobber the current delay if we are 1613 /* don't clobber the current delay if we are
1500 * already in the middle of scrolling. 1614 * already in the middle of scrolling.
… …
1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1617 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1504 1618
1505 /* save the event params so we can highlight 1619 /* save the event params so we can highlight
1506 * the selection in the pending-scroll loop 1620 * the selection in the pending-scroll loop
1507 */ 1621 */
1508 selection_save_x=ev.xbutton.x; 1622 selection_save_x = ev.xbutton.x;
1509 selection_save_y=ev.xbutton.y; 1623 selection_save_y = ev.xbutton.y;
1510 selection_save_state=
1511 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1624 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1512 1625
1513 /* calc number of lines to scroll */ 1626 /* calc number of lines to scroll */
1514 if (ev.xbutton.y<TermWin.int_bwidth) 1627 if (ev.xbutton.y < int_bwidth)
1515 { 1628 {
1516 scroll_selection_dir = UP; 1629 scroll_selection_dir = UP;
1517 dist = TermWin.int_bwidth - ev.xbutton.y; 1630 dist = int_bwidth - ev.xbutton.y;
1518 } 1631 }
1519 else 1632 else
1520 { 1633 {
1521 scroll_selection_dir = DN; 1634 scroll_selection_dir = DN;
1522 dist = ev.xbutton.y - 1635 dist = ev.xbutton.y - (int_bwidth + height);
1523 (TermWin.int_bwidth + TermWin.height);
1524 } 1636 }
1637
1525 scroll_selection_lines= (Pixel2Height (dist)/ 1638 scroll_selection_lines = Pixel2Height (dist)
1526 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1639 / SELECTION_SCROLL_LINE_SPEEDUP
1640 + 1;
1527 MIN_IT (scroll_selection_lines, 1641 min_it (scroll_selection_lines,
1528 SELECTION_SCROLL_MAX_LINES); 1642 SELECTION_SCROLL_MAX_LINES);
1529 } 1643 }
1530 else 1644 else
1531 { 1645 {
1532 /* we are within the text window, so we 1646 /* we are within the text window, so we
1533 * shouldn't be scrolling 1647 * shouldn't be scrolling
… …
1535 if (sel_scroll_ev.active) 1649 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop(); 1650 sel_scroll_ev.stop();
1537 } 1651 }
1538#endif 1652#endif
1539#ifdef MOUSE_THRESHOLD 1653#ifdef MOUSE_THRESHOLD
1540
1541 } 1654 }
1542#endif 1655#endif
1543
1544 } 1656 }
1545 } 1657 }
1546 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1547 { 1659 {
1548 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1660 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1549 MotionNotify, &ev)) ; 1661 MotionNotify, &ev))
1662 ;
1663
1550 XQueryPointer (display->display, scrollBar.win, 1664 XQueryPointer (xdisp, scrollBar.win,
1551 &unused_root, &unused_child, 1665 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1666 &unused_root_x, &unused_root_y,
1553 & (ev.xbutton.x), & (ev.xbutton.y), 1667 &ev.xbutton.x, &ev.xbutton.y,
1554 &unused_mask); 1668 &unused_mask);
1555 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1556 scrollbar_size ()); 1670 scrollbar_size ());
1557 scr_refresh (refresh_type); 1671 want_refresh = 1;
1558 refresh_limit = 0; 1672 refresh_limit = 0;
1559 scrollbar_show (1); 1673 scrollbar_show (1);
1560 } 1674 }
1561 break; 1675 break;
1562 } 1676 }
1677
1678skip_switch: ;
1679
1680#if defined(CURSOR_BLINK)
1681 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1682 {
1683 if (hidden_cursor)
1684 {
1685 hidden_cursor = 0;
1686 want_refresh = 1;
1687 }
1688
1689 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1690 }
1691#endif
1692
1693#if defined(POINTER_BLANK)
1694 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1695 {
1696 if (ev.type == MotionNotify
1697 || ev.type == ButtonPress
1698 || ev.type == ButtonRelease)
1699 if (hidden_pointer)
1700 pointer_unblank ();
1701
1702 if (ev.type == KeyPress && hidden_pointer == 0)
1703 pointer_blank ();
1704 }
1705#endif
1706}
1707
1708void
1709rxvt_term::focus_in ()
1710{
1711 if (!focus)
1712 {
1713 focus = 1;
1714 want_refresh = 1;
1715
1716 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1717
1718#if USE_XIM
1719 if (Input_Context != NULL)
1720 {
1721 IMSetStatusPosition ();
1722 XSetICFocus (Input_Context);
1723 }
1724#endif
1725#if CURSOR_BLINK
1726 if (OPTION (Opt_cursorBlink))
1727 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1728#endif
1729#if OFF_FOCUS_FADING
1730 if (rs[Rs_fade])
1731 {
1732 pix_colors = pix_colors_focused;
1733 scr_recolour ();
1734 }
1735#endif
1736 }
1737}
1738
1739void
1740rxvt_term::focus_out ()
1741{
1742 if (focus)
1743 {
1744 focus = 0;
1745 want_refresh = 1;
1746
1747 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1748
1749#if ENABLE_FRILLS || ISO_14755
1750 if (iso14755buf)
1751 {
1752 iso14755buf = 0;
1753# if ENABLE_OVERLAY
1754 scr_overlay_off ();
1755# endif
1756 }
1757#endif
1758#if USE_XIM
1759 if (Input_Context != NULL)
1760 XUnsetICFocus (Input_Context);
1761#endif
1762#if CURSOR_BLINK
1763 if (OPTION (Opt_cursorBlink))
1764 cursor_blink_ev.stop ();
1765 hidden_cursor = 0;
1766#endif
1767#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade])
1769 {
1770 pix_colors = pix_colors_unfocused;
1771 scr_recolour ();
1772 }
1773#endif
1774 }
1563} 1775}
1564 1776
1565#if TRANSPARENT 1777#if TRANSPARENT
1566void 1778void
1567rxvt_term::rootwin_cb (XEvent &ev) 1779rxvt_term::rootwin_cb (XEvent &ev)
1568{ 1780{
1569 SET_R (this); 1781 make_current ();
1570 SET_LOCALE (locale);
1571 1782
1572 switch (ev.type) 1783 switch (ev.type)
1573 { 1784 {
1574 case PropertyNotify: 1785 case PropertyNotify:
1575 /* 1786 /*
1576 * if user used some Esetroot compatible prog to set the root bg, 1787 * if user used some Esetroot compatible prog to set the root bg,
1577 * use the property to determine the pixmap. We use it later on. 1788 * use the property to determine the pixmap. We use it later on.
1578 */ 1789 */
1579 if (xa[XA_XROOTPMAPID] == 0)
1580 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1581
1582 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1790 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1791 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1583 return; 1792 return;
1584 1793
1585 /* FALLTHROUGH */ 1794 /* FALLTHROUGH */
1586 case ReparentNotify: 1795 case ReparentNotify:
1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1796 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1588 want_refresh = want_full_refresh = 1; 1797 want_refresh = want_full_refresh = 1;
1589 break; 1798 break;
1590 } 1799 }
1591} 1800}
1592#endif 1801#endif
… …
1595rxvt_term::button_press (XButtonEvent &ev) 1804rxvt_term::button_press (XButtonEvent &ev)
1596{ 1805{
1597 int reportmode = 0, clickintime; 1806 int reportmode = 0, clickintime;
1598 1807
1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1808 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1809
1600 if (!bypass_keystate) 1810 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1811 reportmode = !! (priv_modes & PrivMode_mouse_report);
1812
1602 /* 1813 /*
1603 * VT window processing of button press 1814 * VT window processing of button press
1604 */ 1815 */
1605 if (ev.window == TermWin.vt) 1816 if (ev.window == vt)
1606 { 1817 {
1818 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1819 return;
1820
1821#if ISO_14755
1822 // 5.4
1823 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1824 {
1825 iso14755_54 (ev.x, ev.y);
1826 return;
1827 }
1828#endif
1829
1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1830 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1831
1608 if (reportmode) 1832 if (reportmode)
1609 { 1833 {
1610 /* mouse report from vt window */ 1834 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */ 1835 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state; 1836 MEvent.state = ev.state;
1613#ifdef MOUSE_REPORT_DOUBLECLICK 1837#ifdef MOUSE_REPORT_DOUBLECLICK
1614 if (ev.button == MEvent.button && clickintime) 1838 if (ev.button == MEvent.button && clickintime)
1615 { 1839 {
1616 /* same button, within alloted time */ 1840 /* same button, within alloted time */
1617 MEvent.clicks++; 1841 MEvent.clicks++;
1842
1618 if (MEvent.clicks > 1) 1843 if (MEvent.clicks > 1)
1619 { 1844 {
1620 /* only report double clicks */ 1845 /* only report double clicks */
1621 MEvent.clicks = 2; 1846 MEvent.clicks = 2;
1622 mouse_report (ev); 1847 mouse_report (ev);
… …
1641 } 1866 }
1642 else 1867 else
1643 { 1868 {
1644 if (ev.button != MEvent.button) 1869 if (ev.button != MEvent.button)
1645 MEvent.clicks = 0; 1870 MEvent.clicks = 0;
1871
1646 switch (ev.button) 1872 switch (ev.button)
1647 { 1873 {
1648 case Button1: 1874 case Button1:
1875 /* allow meta + click to select rectangular areas */
1876 /* should be done in screen.C */
1877#if ENABLE_FRILLS
1878 selection.rect = !!(ev.state & ModMetaMask);
1879#else
1880 selection.rect = false;
1881#endif
1882
1649 /* allow shift+left click to extend selection */ 1883 /* allow shift+left click to extend selection */
1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1884 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1651 { 1885 {
1652 if (MEvent.button == Button1 && clickintime) 1886 if (MEvent.button == Button1 && clickintime)
1653 selection_rotate (ev.x, ev.y); 1887 selection_rotate (ev.x, ev.y);
1654 else 1888 else
1655 selection_extend (ev.x, ev.y, 1); 1889 selection_extend (ev.x, ev.y, 1);
… …
1670 case Button3: 1904 case Button3:
1671 if (MEvent.button == Button3 && clickintime) 1905 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y); 1906 selection_rotate (ev.x, ev.y);
1673 else 1907 else
1674 selection_extend (ev.x, ev.y, 1); 1908 selection_extend (ev.x, ev.y, 1);
1909
1675 MEvent.button = Button3; 1910 MEvent.button = Button3;
1676 break; 1911 break;
1677 } 1912 }
1678 } 1913 }
1914
1679 MEvent.time = ev.time; 1915 MEvent.time = ev.time;
1680 return; 1916 return;
1681 } 1917 }
1682 1918
1683 /* 1919 /*
… …
1794 case Button3: 2030 case Button3:
1795 if (scrollBar.style != R_SB_XTERM) 2031 if (scrollBar.style != R_SB_XTERM)
1796 { 2032 {
1797 if (scrollbar_above_slider (ev.y)) 2033 if (scrollbar_above_slider (ev.y))
1798# ifdef RXVT_SCROLL_FULL 2034# ifdef RXVT_SCROLL_FULL
1799 scr_page (UP, TermWin.nrow - 1); 2035 scr_page (UP, nrow - 1);
1800# else 2036# else
1801 scr_page (UP, TermWin.nrow / 4); 2037 scr_page (UP, nrow / 4);
1802# endif 2038# endif
1803 else if (scrollbar_below_slider (ev.y)) 2039 else if (scrollbar_below_slider (ev.y))
1804# ifdef RXVT_SCROLL_FULL 2040# ifdef RXVT_SCROLL_FULL
1805 scr_page (DN, TermWin.nrow - 1); 2041 scr_page (DN, nrow - 1);
1806# else 2042# else
1807 scr_page (DN, TermWin.nrow / 4); 2043 scr_page (DN, nrow / 4);
1808# endif 2044# endif
1809 else 2045 else
1810 scrollBar.setMotion (); 2046 scrollBar.setMotion ();
1811 } 2047 }
1812 else 2048 else
1813 { 2049 {
1814 scr_page ((ev.button == Button1 ? DN : UP), 2050 scr_page ((ev.button == Button1 ? DN : UP),
1815 (TermWin.nrow 2051 (nrow
1816 * scrollbar_position (ev.y) 2052 * scrollbar_position (ev.y)
1817 / scrollbar_size ())); 2053 / scrollbar_size ()));
1818 } 2054 }
1819 2055
1820 break; 2056 break;
1821 } 2057 }
1822 } 2058 }
2059
1823 return; 2060 return;
1824 } 2061 }
1825#if MENUBAR
1826 /*
1827 * Menubar window processing of button press
1828 */
1829 if (isMenuBarWindow (ev.window))
1830 menubar_control (ev);
1831#endif
1832} 2062}
1833 2063
1834void 2064void
1835rxvt_term::button_release (XButtonEvent &ev) 2065rxvt_term::button_release (XButtonEvent &ev)
1836{ 2066{
1837 int reportmode = 0; 2067 int reportmode = 0;
1838 2068
1839 csrO = 0; /* reset csr Offset */ 2069 csrO = 0; /* reset csr Offset */
1840 if (!bypass_keystate) 2070 if (!bypass_keystate)
1841 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2071 reportmode = !! (priv_modes & PrivMode_mouse_report);
1842 2072
1843 if (scrollbar_isUpDn ()) 2073 if (scrollbar_isUpDn ())
1844 { 2074 {
1845 scrollBar.setIdle (); 2075 scrollBar.setIdle ();
1846 scrollbar_show (0); 2076 scrollbar_show (0);
1847#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1848 refresh_type &= ~SMOOTH_REFRESH;
1849#endif
1850
1851 } 2077 }
2078
1852#ifdef SELECTION_SCROLLING 2079#ifdef SELECTION_SCROLLING
1853 if (sel_scroll_ev.active) 2080 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop(); 2081 sel_scroll_ev.stop();
1855#endif 2082#endif
2083
1856 if (ev.window == TermWin.vt) 2084 if (ev.window == vt)
1857 { 2085 {
2086 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2087 return;
2088
2089#if ISO_14755
2090 // 5.4
2091 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2092 return;
2093#endif
2094
1858 if (reportmode) 2095 if (reportmode)
1859 { 2096 {
1860 /* mouse report from vt window */ 2097 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */ 2098 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4) 2099 if (ev.button >= 4)
… …
1876 MEvent.button = AnyButton; 2113 MEvent.button = AnyButton;
1877 mouse_report (ev); 2114 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2115#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2116 return;
1880 } 2117 }
2118
1881 /* 2119 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2120 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2121 * when overriding mouse reporting
1884 */ 2122 */
1885 if (PrivateModes & PrivMode_mouse_report 2123 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2124 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2125 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2126 selection_extend (ev.x, ev.y, 0);
1889 2127
1890 switch (ev.button) 2128 switch (ev.button)
1891 { 2129 {
1892 case Button1: 2130 case Button1:
1893 case Button3: 2131 case Button3:
1894 selection_make (ev.time); 2132 selection_make (ev.time);
1895 break; 2133 break;
2134
1896 case Button2: 2135 case Button2:
1897 selection_request (ev.time, ev.x, ev.y); 2136 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2137 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
1898 break; 2138 break;
2139
1899#ifdef MOUSE_WHEEL 2140#ifdef MOUSE_WHEEL
1900 case Button4: 2141 case Button4:
1901 case Button5: 2142 case Button5:
1902 { 2143 {
1903 int i; 2144 int i;
… …
1905 2146
1906 v = ev.button == Button4 ? UP : DN; 2147 v = ev.button == Button4 ? UP : DN;
1907 2148
1908 if (ev.state & ShiftMask) 2149 if (ev.state & ShiftMask)
1909 i = 1; 2150 i = 1;
1910 else if (Options & Opt_mouseWheelScrollPage) 2151 else if (OPTION (Opt_mouseWheelScrollPage))
1911 i = TermWin.nrow - 1; 2152 i = nrow - 1;
1912 else 2153 else
1913 i = 5; 2154 i = 5;
1914 2155
1915# ifdef MOUSE_SLIP_WHEELING 2156# ifdef MOUSE_SLIP_WHEELING
1916 if (ev.state & ControlMask) 2157 if (ev.state & ControlMask)
1917 { 2158 {
1918 mouse_slip_wheel_speed += v ? -1 : 1; 2159 mouse_slip_wheel_speed += v ? -1 : 1;
1919 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2160 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
1920 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2161 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1921 2162
1922 if (slip_wheel_ev.at < NOW) 2163 if (slip_wheel_ev.at < NOW)
1923 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2164 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1924 2165
1925 slip_wheel_ev.start (); 2166 slip_wheel_ev.start ();
1926 } 2167 }
1927 else 2168 else
1928 { 2169 {
1929# endif 2170# endif
1930# ifdef JUMP_MOUSE_WHEEL
1931 scr_page (v, i); 2171 scr_page (v, i);
1932 scr_refresh (SMOOTH_REFRESH);
1933 scrollbar_show (1); 2172 scrollbar_show (1);
1934# else
1935 while (i--)
1936 {
1937 scr_page (v, 1);
1938 scr_refresh (SMOOTH_REFRESH);
1939 scrollbar_show (1);
1940 }
1941# endif
1942# ifdef MOUSE_SLIP_WHEELING 2173# ifdef MOUSE_SLIP_WHEELING
1943 } 2174 }
1944#endif 2175# endif
1945 } 2176 }
1946 break; 2177 break;
1947#endif 2178#endif
1948 } 2179 }
1949 } 2180 }
1950#ifdef MENUBAR
1951 else if (isMenuBarWindow (ev.window))
1952 menubar_control (ev);
1953#endif
1954} 2181}
1955 2182
1956#ifdef TRANSPARENT 2183#ifdef TRANSPARENT
1957#if TINTING 2184#if TINTING
1958/* taken from aterm-0.4.2 */ 2185/* taken from aterm-0.4.2 */
1959 2186
1960typedef uint32_t RUINT32T; 2187typedef uint32_t RUINT32T;
1961 2188
1962void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2189void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
1963{ 2190{
1964 int sh_r, sh_g, sh_b; 2191 int sh_r, sh_g, sh_b;
1965 RUINT32T mask_r, mask_g, mask_b; 2192 RUINT32T mask_r, mask_g, mask_b;
1966 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2193 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1967 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2194 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1968 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2195 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1969 int i; 2196 int i;
1970 2197
1971 Visual* visual = display->visual; 2198 Visual *visual = term->visual;
1972 2199
1973 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2200 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1974 2201
1975 /* for convenience */ 2202 /* for convenience */
1976 mask_r = visual->red_mask; 2203 mask_r = visual->red_mask;
… …
2200 Pixmap rootpixmap = None; 2427 Pixmap rootpixmap = None;
2201 XWindowAttributes wattr, wrootattr; 2428 XWindowAttributes wattr, wrootattr;
2202 2429
2203 pchanged = 0; 2430 pchanged = 0;
2204 2431
2205 if (!(Options & Opt_transparent)) 2432 if (!OPTION (Opt_transparent))
2206 return pchanged; /* Don't try any more */ 2433 return pchanged; /* Don't try any more */
2207 2434
2208 XGetWindowAttributes (display->display, display->root, &wrootattr); 2435 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2209 rootdepth = wrootattr.depth; 2436 rootdepth = wrootattr.depth;
2210 2437
2211 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2438 XGetWindowAttributes (xdisp, parent[0], &wattr);
2212 2439
2213 if (rootdepth != wattr.depth) 2440 if (rootdepth != wattr.depth)
2214 { 2441 {
2215 if (am_transparent) 2442 if (am_transparent)
2216 { 2443 {
2217 pchanged = 1; 2444 pchanged = 1;
2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2445 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2219 am_transparent = am_pixmap_trans = 0; 2446 am_transparent = am_pixmap_trans = 0;
2220 } 2447 }
2221 2448
2222 return pchanged; /* Don't try any more */ 2449 return pchanged; /* Don't try any more */
2223 } 2450 }
2224 2451
2225 /* Get all X ops out of the queue so that our information is up-to-date. */ 2452 /* Get all X ops out of the queue so that our information is up-to-date. */
2226 XSync (display->display, False); 2453 XSync (xdisp, False);
2227 2454
2228 /* 2455 /*
2229 * Make the frame window set by the window manager have 2456 * Make the frame window set by the window manager have
2230 * the root background. Some window managers put multiple nested frame 2457 * the root background. Some window managers put multiple nested frame
2231 * windows for each client, so we have to take care about that. 2458 * windows for each client, so we have to take care about that.
2232 */ 2459 */
2233 i = (xa[XA_XROOTPMAPID] 2460 i = (xa[XA_XROOTPMAP_ID]
2234 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2461 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2235 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2236 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2237 2464
2238 if (!i || prop == NULL) 2465 if (!i || prop == NULL)
2239 i = (xa[XA_XSETROOTID] 2466 i = (xa[XA_ESETROOT_PMAP_ID]
2240 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2467 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2241 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2242 &nitems, &bytes_after, &prop) == Success); 2469 &nitems, &bytes_after, &prop) == Success);
2243 2470
2244 if (!i || prop == NULL 2471 if (!i || prop == NULL
2245#if TINTING 2472#if TINTING
2246 || !rs[Rs_color + Color_tint] 2473 || !ISSET_PIXCOLOR (Color_tint)
2247#endif 2474#endif
2248 ) 2475 )
2249 have_pixmap = 0; 2476 have_pixmap = 0;
2250 else 2477 else
2251 { 2478 {
… …
2264 Window cr; 2491 Window cr;
2265 XImage *image; 2492 XImage *image;
2266 GC gc; 2493 GC gc;
2267 XGCValues gcvalue; 2494 XGCValues gcvalue;
2268 2495
2269 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2496 XTranslateCoordinates (xdisp, parent[0], display->root,
2270 0, 0, &sx, &sy, &cr); 2497 0, 0, &sx, &sy, &cr);
2271 nw = (unsigned int)szHint.width; 2498 nw = (unsigned int)szHint.width;
2272 nh = (unsigned int)szHint.height; 2499 nh = (unsigned int)szHint.height;
2273 nx = ny = 0; 2500 nx = ny = 0;
2274 2501
… …
2284 nh += sy; 2511 nh += sy;
2285 ny = -sy; 2512 ny = -sy;
2286 sy = 0; 2513 sy = 0;
2287 } 2514 }
2288 2515
2289 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2516 min_it (nw, (unsigned int) (wrootattr.width - sx));
2290 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2517 min_it (nh, (unsigned int) (wrootattr.height - sy));
2518
2519 XSync (xdisp, False);
2291 allowedxerror = -1; 2520 allowedxerror = -1;
2292 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2521 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2293 2522
2294 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2523 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2295 /* XXX: may need a delay here? */ 2524 /* XXX: may need a delay here? */
2296 allowedxerror = 0; 2525 allowedxerror = 0;
2297 2526
2298 if (image == NULL) 2527 if (image == NULL)
2299 { 2528 {
2300 if (am_transparent && am_pixmap_trans) 2529 if (am_transparent && am_pixmap_trans)
2301 { 2530 {
2302 pchanged = 1; 2531 pchanged = 1;
2303 if (TermWin.pixmap != None) 2532 if (pixmap != None)
2304 { 2533 {
2305 XFreePixmap (display->display, TermWin.pixmap); 2534 XFreePixmap (xdisp, pixmap);
2306 TermWin.pixmap = None; 2535 pixmap = None;
2307 } 2536 }
2308 } 2537 }
2309 2538
2310 am_pixmap_trans = 0; 2539 am_pixmap_trans = 0;
2311 } 2540 }
2312 else 2541 else
2313 { 2542 {
2314 if (TermWin.pixmap != None) 2543 if (pixmap != None)
2315 XFreePixmap (display->display, TermWin.pixmap); 2544 XFreePixmap (xdisp, pixmap);
2316 2545
2317#if TINTING 2546#if TINTING
2318 if (ISSET_PIXCOLOR (Color_tint)) 2547 if (ISSET_PIXCOLOR (Color_tint))
2319 { 2548 {
2320 unsigned short rm, gm, bm;
2321 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2549 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2322 2550
2551 rgba c;
2323 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2552 pix_colors_focused [Color_tint].get (c);
2324 2553
2325 ShadeXImage (display, image, shade, rm, gm, bm); 2554 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2326 } 2555 }
2327#endif 2556#endif
2328 2557
2329 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2558 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2330 szHint.width, szHint.height, image->depth);
2331 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2559 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2332 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2560 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2333 nx, ny, image->width, image->height); 2561 nx, ny, image->width, image->height);
2334 XFreeGC (display->display, gc); 2562 XFreeGC (xdisp, gc);
2335 XDestroyImage (image); 2563 XDestroyImage (image);
2336 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2564 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2337 XClearWindow (display->display, TermWin.parent[0]); 2565 XClearWindow (xdisp, parent[0]);
2338 2566
2339 if (!am_transparent || !am_pixmap_trans) 2567 if (!am_transparent || !am_pixmap_trans)
2340 pchanged = 1; 2568 pchanged = 1;
2341 2569
2342 am_transparent = am_pixmap_trans = 1; 2570 am_transparent = am_pixmap_trans = 1;
2343 } 2571 }
2344 } 2572 }
2345 2573
2346 if (!am_pixmap_trans) 2574 if (am_pixmap_trans)
2575 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2576 else
2347 { 2577 {
2348 unsigned int n; 2578 unsigned int n;
2349 /* 2579 /*
2350 * InheritPixmap transparency 2580 * InheritPixmap transparency
2351 */ 2581 */
2352 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2353 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2582 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2354 { 2583 {
2355 oldp = TermWin.parent[i]; 2584 oldp = parent[i];
2356 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2585 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2357 &TermWin.parent[i], &list, &n);
2358 XFree (list); 2586 XFree (list);
2359 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2360 2587
2361 if (TermWin.parent[i] == display->root) 2588 if (parent[i] == display->root)
2362 { 2589 {
2363 if (oldp != None) 2590 if (oldp != None)
2364 pchanged = 1; 2591 pchanged = 1;
2365 2592
2366 break; 2593 break;
2367 } 2594 }
2368 2595
2369 if (oldp != TermWin.parent[i]) 2596 if (oldp != parent[i])
2370 pchanged = 1; 2597 pchanged = 1;
2371 } 2598 }
2372 2599
2373 n = 0; 2600 n = 0;
2374 2601
2375 if (pchanged) 2602 if (pchanged)
2376 {
2377 for (; n < (unsigned int)i; n++) 2603 for (; n < (unsigned int)i; n++)
2378 { 2604 {
2379 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2605 XGetWindowAttributes (xdisp, parent[n], &wattr);
2380 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2606
2381 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2382 { 2608 {
2383 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2384 break; 2610 break;
2385 } 2611 }
2386 } 2612 }
2613
2614 if (n > (sizeof (parent) / sizeof (parent[0])))
2387 } 2615 {
2388
2389 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2390 {
2391 D_X ((stderr, "InheritPixmap Turning off"));
2392 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2616 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2617 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2394 am_transparent = 0; 2618 am_transparent = 0;
2395 /* XXX: also turn off Opt_transparent? */ 2619 /* XXX: also turn off Opt_transparent? */
2396 } 2620 }
2397 else 2621 else
2398 { 2622 {
2399#if WAIT_FOR_WM
2400 /* wait (an arbitrary period) for the WM to do its thing
2401 * needed for fvwm2.2.2 (and before?) */
2402 sleep (1);
2403#endif
2404 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2405 for (n = 0; n < (unsigned int)i; n++) 2623 for (n = 0; n < (unsigned int)i; n++)
2406 { 2624 {
2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2625 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2408 XClearWindow (display->display, TermWin.parent[n]); 2626 XClearWindow (xdisp, parent[n]);
2409 } 2627 }
2410 2628
2411 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2629 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2412 am_transparent = 1; 2630 am_transparent = 1;
2413 } 2631 }
2414 2632
2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2633 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2416 TermWin.parent[i] = None; 2634 parent[i] = None;
2417 } 2635 }
2418 2636
2419 // this is experimental
2420 if (scrollBar.win) 2637 if (scrollBar.win)
2421 { 2638 {
2422 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2639 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2423 XClearWindow (display->display, scrollBar.win);
2424 scrollBar.setIdle (); 2640 scrollBar.setIdle ();
2425 scrollbar_show (0); 2641 scrollbar_show (0);
2426 } 2642 }
2427 2643
2644 if (am_transparent)
2645 {
2646 want_refresh = want_full_refresh = 1;
2647 if (am_pixmap_trans)
2648 flush ();
2649 }
2650
2428 return pchanged; 2651 return pchanged;
2429} 2652}
2430#endif 2653#endif
2431 2654
2432/*}}} */ 2655/*}}} */
2433 2656
2434bool 2657bool
2435rxvt_term::cmd_parse () 2658rxvt_term::cmd_parse ()
2436{ 2659{
2437 bool flag = false; 2660 bool flag = false;
2438 unicode_t ch = NOCHAR; 2661 wchar_t ch = NOCHAR;
2439 unsigned char *seq_begin; // remember start of esc-sequence here 2662 char *seq_begin; // remember start of esc-sequence here
2440 2663
2441 for (;;) 2664 for (;;)
2442 { 2665 {
2443 if (ch == NOCHAR) 2666 if (ch == NOCHAR)
2444 { 2667 {
2445 seq_begin = cmdbuf_ptr; 2668 seq_begin = cmdbuf_ptr;
2446 ch = next_char (); 2669 ch = next_char ();
2447 }
2448 2670
2449 if (ch == NOCHAR) // TODO: improve 2671 if (ch == NOCHAR)
2450 break; 2672 break;
2673 }
2451 2674
2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2675 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2453 { 2676 {
2677 if (!seen_input)
2678 {
2679 seen_input = 1;
2680 // many badly-written programs (e.g. jed) contain a race condition:
2681 // they first read the screensize and then install a SIGWINCH handler.
2682 // some window managers resize the window early, and these programs
2683 // then sometimes get the size wrong.
2684 // unfortunately other programs are even more buggy and dislike
2685 // being sent SIGWINCH, so only do it when we were in fact being
2686 // resized.
2687 if (seen_resize && cmd_pid)
2688 kill (-cmd_pid, SIGWINCH);
2689 }
2690
2454 /* Read a text string from the input buffer */ 2691 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ]; 2692 wchar_t buf[UBUFSIZ];
2456 bool refreshnow = false; 2693 bool refreshnow = false;
2457 int nlines = 0; 2694 int nlines = 0;
2458 unicode_t *str = buf; 2695 wchar_t *str = buf;
2696 wchar_t *eol = str + min (ncol, UBUFSIZ);
2459 2697
2460 for (;;) 2698 for (;;)
2461 { 2699 {
2462 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2700 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2463 break; 2701 break;
2464 2702
2465 *str++ = ch; 2703 *str++ = ch;
2466 2704
2467 if (ch == C0_LF) 2705 if (ch == C0_LF || str >= eol)
2468 { 2706 {
2707 if (ch == C0_LF)
2469 nlines++; 2708 nlines++;
2709
2470 refresh_count++; 2710 refresh_count++;
2471 2711
2472 if (!(Options & Opt_jumpScroll) 2712 if (!OPTION (Opt_jumpScroll)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2713 || (refresh_count >= refresh_limit * (nrow - 1)))
2474 { 2714 {
2475 refreshnow = true; 2715 refreshnow = true;
2716 refresh_count = 0;
2476 ch = NOCHAR; 2717 ch = NOCHAR;
2477 break; 2718 break;
2478 } 2719 }
2479 2720
2480 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2721 // scr_add_lines only works for nlines <= nrow - 1.
2481 if (nlines >= TermWin.nrow - 1) 2722 if (nlines >= nrow - 1)
2482 { 2723 {
2724 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2725 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2483 scr_add_lines (buf, nlines, str - buf); 2726 scr_add_lines (buf, str - buf, nlines);
2727
2484 nlines = 0; 2728 nlines = 0;
2485 str = buf; 2729 str = buf;
2730 eol = str + min (ncol, UBUFSIZ);
2486 } 2731 }
2487 }
2488 2732
2489 if (str >= buf + UBUFSIZ) 2733 if (str >= eol)
2490 { 2734 {
2735 if (eol >= buf + UBUFSIZ)
2736 {
2491 ch = NOCHAR; 2737 ch = NOCHAR;
2492 break; 2738 break;
2739 }
2740 else
2741 eol = min (eol + ncol, buf + UBUFSIZ);
2742 }
2743
2493 } 2744 }
2494 2745
2495 seq_begin = cmdbuf_ptr; 2746 seq_begin = cmdbuf_ptr;
2496 ch = next_char (); 2747 ch = next_char ();
2497 } 2748 }
2498 2749
2750 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2751 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2499 scr_add_lines (buf, nlines, str - buf); 2752 scr_add_lines (buf, str - buf, nlines);
2500 2753
2501 /* 2754 /*
2502 * If there have been a lot of new lines, then update the screen 2755 * If there have been a lot of new lines, then update the screen
2503 * What the heck I'll cheat and only refresh less than every page-full. 2756 * What the heck I'll cheat and only refresh less than every page-full.
2504 * the number of pages between refreshes is refresh_limit, which 2757 * the number of pages between refreshes is refresh_limit, which
2505 * is incremented here because we must be doing flat-out scrolling. 2758 * is incremented here because we must be doing flat-out scrolling.
2506 */ 2759 */
2507 if (refreshnow) 2760 if (refreshnow)
2508 { 2761 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2762 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++; 2763 refresh_limit++;
2511 else 2764 else
2512 { 2765 {
2513 flag = true; 2766 flag = true;
2514 scr_refresh (refresh_type); 2767 scr_refresh ();
2768 want_refresh = 1;
2515 } 2769 }
2516 } 2770 }
2517 2771
2518 } 2772 }
2519 else 2773 else
… …
2534 } 2788 }
2535 2789
2536 return flag; 2790 return flag;
2537} 2791}
2538 2792
2539// read the next octet
2540unicode_t
2541rxvt_term::next_octet ()
2542{
2543 return cmdbuf_ptr < cmdbuf_endp
2544 ? *cmdbuf_ptr++
2545 : NOCHAR;
2546}
2547
2548// read the next character 2793// read the next character
2549unicode_t 2794wchar_t
2550rxvt_term::next_char () 2795rxvt_term::next_char () NOTHROW
2551{ 2796{
2552 while (cmdbuf_ptr < cmdbuf_endp) 2797 while (cmdbuf_ptr < cmdbuf_endp)
2553 { 2798 {
2554 // assume 7-bit to be ascii ALWAYS 2799 // assume 7-bit to be ascii ALWAYS
2555 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2800 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2556 return *cmdbuf_ptr++; 2801 return *cmdbuf_ptr++;
2557 2802
2558 wchar_t wc; 2803 wchar_t wc;
2559 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2804 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2560 2805
2561 if (len == (size_t)-2) 2806 if (len == (size_t)-2)
2562 { 2807 {
2563 // the mbstate stores incomplete sequences. didn't know this :/ 2808 // the mbstate stores incomplete sequences. didn't know this :/
2564 cmdbuf_ptr = cmdbuf_endp; 2809 cmdbuf_ptr = cmdbuf_endp;
2565 break; 2810 break;
2566 } 2811 }
2567 2812
2568 if (len == (size_t)-1) 2813 if (len == (size_t)-1)
2569 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2814 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2570 2815
2571 // assume wchar == unicode 2816 // assume wchar == unicode
2572 cmdbuf_ptr += len; 2817 cmdbuf_ptr += len;
2573 return wc; 2818 return wc & UNICODE_MASK;
2574 } 2819 }
2575 2820
2576 return NOCHAR; 2821 return NOCHAR;
2577} 2822}
2823
2824// read the next octet
2825uint32_t
2826rxvt_term::next_octet () NOTHROW
2827{
2828 return cmdbuf_ptr < cmdbuf_endp
2829 ? (unsigned char)*cmdbuf_ptr++
2830 : NOCHAR;
2831}
2832
2833static class out_of_input out_of_input;
2578 2834
2579/* rxvt_cmd_getc () - Return next input character */ 2835/* rxvt_cmd_getc () - Return next input character */
2580/* 2836/*
2581 * Return the next input character after first passing any keyboard input 2837 * Return the next input character after first passing any keyboard input
2582 * to the command. 2838 * to the command.
2583 */ 2839 */
2584unicode_t 2840wchar_t
2585rxvt_term::cmd_getc () 2841rxvt_term::cmd_getc () THROW ((class out_of_input))
2586{ 2842{
2587 unicode_t c = next_char (); 2843 wchar_t c = next_char ();
2588 2844
2589 if (c == NOCHAR) 2845 if (c == NOCHAR)
2590 throw out_of_input; 2846 throw out_of_input;
2591 2847
2592 return c; 2848 return c;
2593} 2849}
2594 2850
2595unicode_t 2851uint32_t
2596rxvt_term::cmd_get8 () 2852rxvt_term::cmd_get8 () THROW ((class out_of_input))
2597{ 2853{
2598 unicode_t c = next_octet (); 2854 uint32_t c = next_octet ();
2599 2855
2600 if (c == NOCHAR) 2856 if (c == NOCHAR)
2601 throw out_of_input; 2857 throw out_of_input;
2602 2858
2603 return c; 2859 return c;
… …
2703 case C0_ESC: 2959 case C0_ESC:
2704 process_escape_seq (); 2960 process_escape_seq ();
2705 break; 2961 break;
2706 case C0_ENQ: /* terminal Status */ 2962 case C0_ENQ: /* terminal Status */
2707 if (rs[Rs_answerbackstring]) 2963 if (rs[Rs_answerbackstring])
2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2964 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2709 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2710 else 2965 else
2711 tt_write ((unsigned char *)VT100_ANS, 2966 tt_write (VT100_ANS, strlen (VT100_ANS));
2712 (unsigned int)STRLEN (VT100_ANS));
2713 break; 2967 break;
2714 case C0_BEL: /* bell */ 2968 case C0_BEL: /* bell */
2715 scr_bell (); 2969 scr_bell ();
2716 break; 2970 break;
2717 case C0_BS: /* backspace */ 2971 case C0_BS: /* backspace */
… …
2816void 3070void
2817rxvt_term::process_escape_seq () 3071rxvt_term::process_escape_seq ()
2818{ 3072{
2819 unicode_t ch = cmd_getc (); 3073 unicode_t ch = cmd_getc ();
2820 3074
2821 if (PrivateModes & PrivMode_vt52) 3075 if (priv_modes & PrivMode_vt52)
2822 { 3076 {
2823 process_escape_vt52 (ch); 3077 process_escape_vt52 (ch);
2824 return; 3078 return;
2825 } 3079 }
2826 3080
… …
2841 scr_charset_set (2, (unsigned int)cmd_getc ()); 3095 scr_charset_set (2, (unsigned int)cmd_getc ());
2842 break; 3096 break;
2843 case '+': 3097 case '+':
2844 scr_charset_set (3, (unsigned int)cmd_getc ()); 3098 scr_charset_set (3, (unsigned int)cmd_getc ());
2845 break; 3099 break;
2846#ifndef NO_FRILLS 3100#if !ENABLE_MINIMAL
2847 case '6': 3101 case '6':
2848 scr_backindex (); 3102 scr_backindex ();
2849 break; 3103 break;
2850#endif 3104#endif
2851 case '7': 3105 case '7':
2852 scr_cursor (SAVE); 3106 scr_cursor (SAVE);
2853 break; 3107 break;
2854 case '8': 3108 case '8':
2855 scr_cursor (RESTORE); 3109 scr_cursor (RESTORE);
2856 break; 3110 break;
2857#ifndef NO_FRILLS 3111#if !ENABLE_MINIMAL
2858 case '9': 3112 case '9':
2859 scr_forwardindex (); 3113 scr_forwardindex ();
2860 break; 3114 break;
2861#endif 3115#endif
2862 case '=': 3116 case '=':
… …
2872 break; 3126 break;
2873 3127
2874 /* 8.3.87: NEXT LINE */ 3128 /* 8.3.87: NEXT LINE */
2875 case C1_NEL: /* ESC E */ 3129 case C1_NEL: /* ESC E */
2876 { 3130 {
2877 unicode_t nlcr[] = { C0_LF, C0_CR }; 3131 wchar_t nlcr[] = { C0_LF, C0_CR };
2878 scr_add_lines (nlcr, 1, 2); 3132 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2879 } 3133 }
2880 break; 3134 break;
2881 3135
2882 /* kidnapped escape sequence: Should be 8.3.48 */ 3136 /* kidnapped escape sequence: Should be 8.3.48 */
2883 case C1_ESA: /* ESC G */ 3137 case C1_ESA: /* ESC G */
… …
2905 process_dcs_seq (); 3159 process_dcs_seq ();
2906 break; 3160 break;
2907 3161
2908 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3162 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2909 case C1_SCI: /* ESC Z */ 3163 case C1_SCI: /* ESC Z */
2910 tt_write ((const unsigned char *)ESCZ_ANSWER, 3164 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2911 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2912 break; /* steal obsolete ESC [ c */ 3165 break; /* steal obsolete ESC [ c */
2913 3166
2914 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3167 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2915 case C1_CSI: /* ESC [ */ 3168 case C1_CSI: /* ESC [ */
2916 process_csi_seq (); 3169 process_csi_seq ();
… …
3025 ndef = get_byte_array_bit (csi_defaults, i); 3278 ndef = get_byte_array_bit (csi_defaults, i);
3026 for (p = 0; p < nargs; p++) 3279 for (p = 0; p < nargs; p++)
3027 if (arg[p] == -1) 3280 if (arg[p] == -1)
3028 arg[p] = ndef; 3281 arg[p] = ndef;
3029 3282
3030#ifdef DEBUG_CMD
3031 fprintf (stderr, "CSI ");
3032 for (p = 0; p < nargs; p++)
3033 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3034 fprintf (stderr, "%c\n", ch);
3035#endif
3036
3037 /* 3283 /*
3038 * private mode handling 3284 * private mode handling
3039 */ 3285 */
3040 if (priv) 3286 if (priv)
3041 { 3287 {
3042 switch (priv) 3288 switch (priv)
3043 { 3289 {
3044 case '>': 3290 case '>':
3045 if (ch == CSI_DA) /* secondary device attributes */ 3291 if (ch == CSI_DA) /* secondary device attributes */
3292 {
3293 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3294 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3295 //
3296 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3297 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3298 // that we do not support xterm mouse reporting (should be 95 when we do).
3299 //
3046 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3300 tt_printf ("\033[>%d;94;0c", 'U');
3301 }
3047 break; 3302 break;
3048 case '?': 3303 case '?':
3049 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3304 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3050 process_terminal_mode (ch, priv, nargs, arg); 3305 process_terminal_mode (ch, priv, nargs, arg);
3051 break; 3306 break;
… …
3156 3411
3157 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3412 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3158 arg[0] = -arg[0]; 3413 arg[0] = -arg[0];
3159 /* FALLTHROUGH */ 3414 /* FALLTHROUGH */
3160 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3415 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3161 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3416 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3162 break; 3417 break;
3163 3418
3164 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3419 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3165 tt_write ((const unsigned char *)VT100_ANS, 3420 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3166 (unsigned int) (sizeof (VT100_ANS) - 1));
3167 break; 3421 break;
3168 3422
3169 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3423 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3170 process_sgr_mode (nargs, arg); 3424 process_sgr_mode (nargs, arg);
3171 break; 3425 break;
… …
3178 break; 3432 break;
3179 case 6: /* CPR requested */ 3433 case 6: /* CPR requested */
3180 scr_report_position (); 3434 scr_report_position ();
3181 break; 3435 break;
3182 case 7: /* unofficial extension */ 3436 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure) 3437 if (OPTION (Opt_insecure))
3184 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3438 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3185 break; 3439 break;
3186 case 8: /* unofficial extension */ 3440 case 8: /* unofficial extension */
3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3441 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3188 break; 3442 break;
3189 } 3443 }
… …
3225 break; 3479 break;
3226 3480
3227 case CSI_RM: /* 8.3.107: RESET MODE */ 3481 case CSI_RM: /* 8.3.107: RESET MODE */
3228 if (arg[0] == 4) 3482 if (arg[0] == 4)
3229 scr_insert_mode (0); 3483 scr_insert_mode (0);
3484 else if (arg[0] == 20)
3485 priv_modes &= ~PrivMode_LFNL;
3230 break; 3486 break;
3231 3487
3232 case CSI_SM: /* 8.3.126: SET MODE */ 3488 case CSI_SM: /* 8.3.126: SET MODE */
3233 if (arg[0] == 4) 3489 if (arg[0] == 4)
3234 scr_insert_mode (1); 3490 scr_insert_mode (1);
3491 else if (arg[0] == 20)
3492 priv_modes |= PrivMode_LFNL;
3235 break; 3493 break;
3236 3494
3237 /* 3495 /*
3238 * PRIVATE USE beyond this point. All CSI_7? sequences here 3496 * PRIVATE USE beyond this point. All CSI_7? sequences here
3239 */ 3497 */
… …
3251 break; 3509 break;
3252 case CSI_75: 3510 case CSI_75:
3253 scr_cursor (RESTORE); 3511 scr_cursor (RESTORE);
3254 break; 3512 break;
3255 3513
3256#ifndef NO_FRILLS 3514#if !ENABLE_MINIMAL
3257 case CSI_74: 3515 case CSI_74:
3258 process_window_ops (arg, nargs); 3516 process_window_ops (arg, nargs);
3259 break; 3517 break;
3260#endif 3518#endif
3261 3519
… …
3268 break; 3526 break;
3269 } 3527 }
3270} 3528}
3271/*}}} */ 3529/*}}} */
3272 3530
3273#ifndef NO_FRILLS 3531#if !ENABLE_MINIMAL
3274/* ARGSUSED */ 3532/* ARGSUSED */
3275void 3533void
3276rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3534rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3277{ 3535{
3278 int x, y; 3536 int x, y;
3279 XWindowAttributes wattr; 3537 XWindowAttributes wattr;
3280 Window wdummy; 3538 Window wdummy;
3539
3540 dLocal (Display *, xdisp);
3281 3541
3282 if (nargs == 0) 3542 if (nargs == 0)
3283 return; 3543 return;
3284 3544
3285 switch (args[0]) 3545 switch (args[0])
3286 { 3546 {
3287 /* 3547 /*
3288 * commands 3548 * commands
3289 */ 3549 */
3290 case 1: /* deiconify window */ 3550 case 1: /* deiconify window */
3291 XMapWindow (display->display, TermWin.parent[0]); 3551 XMapWindow (xdisp, parent[0]);
3292 break; 3552 break;
3293 case 2: /* iconify window */ 3553 case 2: /* iconify window */
3294 XIconifyWindow (display->display, TermWin.parent[0], 3554 XIconifyWindow (xdisp, parent[0], display->screen);
3295 DefaultScreen (display->display));
3296 break; 3555 break;
3297 case 3: /* set position (pixels) */ 3556 case 3: /* set position (pixels) */
3298 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3557 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3299 break; 3558 break;
3300 case 4: /* set size (pixels) */ 3559 case 4: /* set size (pixels) */
3301 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3302 break; 3561 break;
3303 case 5: /* raise window */ 3562 case 5: /* raise window */
3304 XRaiseWindow (display->display, TermWin.parent[0]); 3563 XRaiseWindow (xdisp, parent[0]);
3305 break; 3564 break;
3306 case 6: /* lower window */ 3565 case 6: /* lower window */
3307 XLowerWindow (display->display, TermWin.parent[0]); 3566 XLowerWindow (xdisp, parent[0]);
3308 break; 3567 break;
3309 case 7: /* refresh window */ 3568 case 7: /* refresh window */
3310 scr_touch (true); 3569 scr_touch (true);
3311 break; 3570 break;
3312 case 8: /* set size (chars) */ 3571 case 8: /* set size (chars) */
3313 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3572 set_widthheight ((unsigned int) (args[2] * fwidth),
3314 (unsigned int) (args[1] * TermWin.fheight)); 3573 (unsigned int) (args[1] * fheight));
3315 break; 3574 break;
3316 3575
3317 //case 9: NYI, TODO, restore maximized window or maximize window 3576 //case 9: NYI, TODO, restore maximized window or maximize window
3318 default: 3577 default:
3319 if (args[0] >= 24) /* set height (chars) */ 3578 if (args[0] >= 24) /* set height (chars) */
3320 set_widthheight ((unsigned int)TermWin.width, 3579 set_widthheight ((unsigned int)width,
3321 (unsigned int) (args[1] * TermWin.fheight)); 3580 (unsigned int) (args[1] * fheight));
3322 break; 3581 break;
3323
3324 3582
3325 /* 3583 /*
3326 * reports - some output format copied from XTerm 3584 * reports - some output format copied from XTerm
3327 */ 3585 */
3328 case 11: /* report window state */ 3586 case 11: /* report window state */
3329 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3587 XGetWindowAttributes (xdisp, parent[0], &wattr);
3330 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3588 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3331 break; 3589 break;
3332 case 13: /* report window position */ 3590 case 13: /* report window position */
3333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3591 XGetWindowAttributes (xdisp, parent[0], &wattr);
3334 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3592 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3335 -wattr.border_width, -wattr.border_width, 3593 -wattr.border_width, -wattr.border_width,
3336 &x, &y, &wdummy); 3594 &x, &y, &wdummy);
3337 tt_printf ("\033[3;%d;%dt", x, y); 3595 tt_printf ("\033[3;%d;%dt", x, y);
3338 break; 3596 break;
3339 case 14: /* report window size (pixels) */ 3597 case 14: /* report window size (pixels) */
3340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3598 XGetWindowAttributes (xdisp, parent[0], &wattr);
3341 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3599 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3342 break; 3600 break;
3343 case 18: /* report text area size (chars) */ 3601 case 18: /* report text area size (chars) */
3344 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3602 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3345 break; 3603 break;
3346 case 19: /* report window size (chars) */ 3604 case 19: /* report window size (chars) */
3347 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3605 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3348 break; 3606 break;
3349 case 20: /* report icon label */ 3607 case 20: /* report icon label */
3350 { 3608 {
3351 char *s; 3609 char *s;
3352 XGetIconName (display->display, TermWin.parent[0], &s); 3610 XGetIconName (xdisp, parent[0], &s);
3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3611 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s); 3612 XFree (s);
3355 } 3613 }
3356 break; 3614 break;
3357 case 21: /* report window title */ 3615 case 21: /* report window title */
3358 { 3616 {
3359 char *s; 3617 char *s;
3360 XFetchName (display->display, TermWin.parent[0], &s); 3618 XFetchName (xdisp, parent[0], &s);
3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3619 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s); 3620 XFree (s);
3363 } 3621 }
3364 break; 3622 break;
3365 } 3623 }
3366} 3624}
… …
3369/*----------------------------------------------------------------------*/ 3627/*----------------------------------------------------------------------*/
3370/* 3628/*
3371 * get input up until STRING TERMINATOR (or BEL) 3629 * get input up until STRING TERMINATOR (or BEL)
3372 * ends_how is terminator used. returned input must be free()'d 3630 * ends_how is terminator used. returned input must be free()'d
3373 */ 3631 */
3374unsigned char * 3632char *
3375rxvt_term::get_to_st (unicode_t &ends_how) 3633rxvt_term::get_to_st (unicode_t &ends_how)
3376{ 3634{
3377 unicode_t prev = 0, ch; 3635 unicode_t ch;
3636 bool seen_esc = false;
3378 unsigned int n = 0; 3637 unsigned int n = 0;
3379 unsigned char *s;
3380 unsigned char string[STRING_MAX]; 3638 wchar_t string[STRING_MAX];
3381 3639
3382 while ((ch = cmd_getc ()) != NOCHAR) 3640 while ((ch = cmd_getc ()) != NOCHAR)
3383 { 3641 {
3384 if (prev == C0_ESC) 3642 if (seen_esc)
3385 { 3643 {
3386 if (ch == 0x5c) /* 7bit ST */ 3644 if (ch == 0x5c) /* 7bit ST */
3387 break; 3645 break;
3388 else 3646 else
3389 return NULL; 3647 return NULL;
3390 } 3648 }
3649 else if (ch == C0_ESC)
3650 {
3651 seen_esc = true;
3652 continue;
3653 }
3391 else if (ch == C0_BEL || ch == CHAR_ST) 3654 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break; 3655 break;
3393 else if (ch < 0x20) 3656 else if (ch < 0x20)
3394 return NULL; /* other control character - exit */ 3657 return NULL; /* other control character - exit */
3395 3658
3396 if (n >= sizeof (string) - 1) 3659 seen_esc = false;
3660
3661 if (n >= STRING_MAX - 1)
3397 // stop at some sane length 3662 // stop at some sane length
3398 return NULL; 3663 return NULL;
3399 3664
3400 if (ch == C0_SYN) 3665 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 (); 3666 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else 3667 else
3406 string[n++] = prev = ch; 3668 string[n++] = ch;
3407 } 3669 }
3408 3670
3409 string[n++] = '\0'; 3671 string[n++] = '\0';
3410 3672
3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3412 return NULL;
3413
3414 ends_how = (ch == 0x5c ? C0_ESC : ch); 3673 ends_how = (ch == 0x5c ? C0_ESC : ch);
3415 STRNCPY (s, string, n); 3674
3416 return s; 3675 return rxvt_wcstombs (string);
3417} 3676}
3418 3677
3419/*----------------------------------------------------------------------*/ 3678/*----------------------------------------------------------------------*/
3420/* 3679/*
3421 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3680 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3422 */ 3681 */
3423void 3682void
3424rxvt_term::process_dcs_seq () 3683rxvt_term::process_dcs_seq ()
3425{ 3684{
3426 unsigned char *s; 3685 char *s;
3427 unicode_t eh; 3686 unicode_t eh;
3428 3687
3429 /* 3688 /*
3430 * Not handled yet 3689 * Not handled yet
3431 */ 3690 */
… …
3450 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3709 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3451 arg = arg * 10 + (ch - '0'); 3710 arg = arg * 10 + (ch - '0');
3452 3711
3453 if (ch == ';') 3712 if (ch == ';')
3454 { 3713 {
3455 unsigned char *s = get_to_st (eh); 3714 char *s = get_to_st (eh);
3456 3715
3457 if (s) 3716 if (s)
3458 { 3717 {
3459 process_xterm_seq (arg, (char *)s, eh); 3718 process_xterm_seq (arg, s, eh);
3460 free (s); 3719 free (s);
3461 } 3720 }
3462 } 3721 }
3463} 3722}
3464 3723
3465void 3724void
3466rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3725rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3467{ 3726{
3468 if (str[0] == '?' && !str[1]) 3727 if (str[0] == '?' && !str[1])
3469 { 3728 {
3470 unsigned short r, g, b; 3729 rgba c;
3471 PixColorsFocused[color].get (display, r, g, b); 3730 pix_colors_focused[color].get (c);
3731
3732#if XFT
3733 if (c.a != rgba::MAX_CC)
3734 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3735 else
3736#endif
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3737 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3473 } 3738 }
3474 else 3739 else
3475 set_window_color (color, str); 3740 set_window_color (color, str);
3476} 3741}
3477 3742
3478/* 3743/*
3479 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3744 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3480 * 0 = change iconName/title
3481 * 1 = change iconName
3482 * 2 = change title
3483 * 4 = change color
3484 * 10 = change fg color
3485 * 11 = change bg color
3486 * 12 = change text color
3487 * 13 = change mouse foreground color
3488 * 17 = change highlight character colour
3489 * 18 = change bold character color
3490 * 19 = change underlined character color
3491 * 46 = change logfile (not implemented)
3492 * 50 = change font
3493 *
3494 * rxvt extensions:
3495 * 20 = bg pixmap
3496 * 39 = change default fg color
3497 * 49 = change default bg color
3498 * 55 = dump scrollback buffer and all of screen
3499 * 701 = change locale
3500 * 702 = find font
3501 * 703 = menu
3502 */ 3745 */
3503void 3746void
3504rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3747rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3505{ 3748{
3506 int changed = 0;
3507 int color; 3749 int color;
3508 char *buf, *name; 3750 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1]; 3751 bool query = str[0] == '?' && !str[1];
3752 int saveop = op;
3753
3754 dLocal (Display *, xdisp);
3510 3755
3511 assert (str != NULL); 3756 assert (str != NULL);
3512 switch (op) 3757 switch (op)
3513 { 3758 {
3514 case XTerm_name: 3759 case XTerm_name:
… …
3521 set_title (str); 3766 set_title (str);
3522 break; 3767 break;
3523 case XTerm_property: 3768 case XTerm_property:
3524 if (str[0] == '?') 3769 if (str[0] == '?')
3525 { 3770 {
3526 Atom prop = XInternAtom (display->display, str + 1, True); 3771 Atom prop = display->atom (str + 1);
3527 Atom actual_type; 3772 Atom actual_type;
3528 int actual_format; 3773 int actual_format;
3529 unsigned long nitems; 3774 unsigned long nitems;
3530 unsigned long bytes_after; 3775 unsigned long bytes_after;
3531 unsigned char *value = 0; 3776 unsigned char *value = 0;
3532 const char *str = ""; 3777 const char *str = "";
3533 3778
3534 if (prop 3779 if (prop
3535 && XGetWindowProperty (display->display, TermWin.parent[0], 3780 && XGetWindowProperty (xdisp, parent[0],
3536 prop, 0, 1<<16, 0, AnyPropertyType, 3781 prop, 0, 1<<16, 0, AnyPropertyType,
3537 &actual_type, &actual_format, 3782 &actual_type, &actual_format,
3538 &nitems, &bytes_after, &value) == Success 3783 &nitems, &bytes_after, &value) == Success
3539 && actual_type != None 3784 && actual_type != None
3540 && actual_format == 8) 3785 && actual_format == 8)
3541 str = (const char *)(value); 3786 str = (const char *)(value);
3542 3787
3543 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3788 tt_printf ("\033]%d;%s%c", op, str, resp);
3544 3789
3545 XFree (value); 3790 XFree (value);
3546 } 3791 }
3547 else 3792 else
3548 { 3793 {
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3794 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550 3795
3551 if (eq) 3796 if (eq)
3552 { 3797 {
3553 *eq = 0; 3798 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0], 3799 set_utf8_property (display->atom (str), eq + 1);
3555 display->atom (str), XA_STRING, 8,
3556 PropModeReplace, (unsigned char *)eq + 1,
3557 strlen (eq + 1));
3558 } 3800 }
3559 else 3801 else
3560 XDeleteProperty (display->display, TermWin.parent[0], 3802 XDeleteProperty (xdisp, parent[0],
3561 display->atom (str)); 3803 display->atom (str));
3562 } 3804 }
3563 break; 3805 break;
3564 3806
3565 case XTerm_Color: 3807 case XTerm_Color:
3566 for (buf = (char *)str; buf && *buf;) 3808 for (buf = (char *)str; buf && *buf;)
3567 { 3809 {
3568 if ((name = STRCHR (buf, ';')) == NULL) 3810 if ((name = strchr (buf, ';')) == NULL)
3569 break; 3811 break;
3570 3812
3571 *name++ = '\0'; 3813 *name++ = '\0';
3572 color = atoi (buf); 3814 color = atoi (buf) + minCOLOR;
3573 3815
3574 if (color < 0 || color >= TOTAL_COLORS) 3816 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3575 break; 3817 break;
3576 3818
3577 if ((buf = STRCHR (name, ';')) != NULL) 3819 if ((buf = strchr (name, ';')) != NULL)
3578 *buf++ = '\0'; 3820 *buf++ = '\0';
3579 3821
3580 if (name[0] == '?' && !name[1]) 3822 process_color_seq (op, color, name, resp);
3581 {
3582 unsigned short r, g, b;
3583 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3584 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3585 }
3586 else
3587 set_window_color (color + minCOLOR, name);
3588 } 3823 }
3589 break; 3824 break;
3590 case XTerm_Color00: 3825 case XTerm_Color00:
3591 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3826 process_color_seq (op, Color_fg, str, resp);
3592 break; 3827 break;
3593 case XTerm_Color01: 3828 case XTerm_Color01:
3594 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3829 process_color_seq (op, Color_bg, str, resp);
3595 break; 3830 break;
3596#ifndef NO_CURSORCOLOR 3831#ifndef NO_CURSORCOLOR
3597 case XTerm_Color_cursor: 3832 case XTerm_Color_cursor:
3598 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3833 process_color_seq (op, Color_cursor, str, resp);
3599 break; 3834 break;
3600#endif 3835#endif
3601 case XTerm_Color_pointer_fg: 3836 case XTerm_Color_pointer_fg:
3602 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3837 process_color_seq (op, Color_pointer_fg, str, resp);
3603 break; 3838 break;
3604 case XTerm_Color_pointer_bg: 3839 case XTerm_Color_pointer_bg:
3605 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3840 process_color_seq (op, Color_pointer_bg, str, resp);
3606 break; 3841 break;
3607#ifndef NO_BOLD_UNDERLINE_REVERSE 3842#ifndef NO_BOLD_UNDERLINE_REVERSE
3608 case XTerm_Color_BD:
3609 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3610 break;
3611 case XTerm_Color_UL:
3612 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3613 break;
3614 case XTerm_Color_RV: 3843 case XTerm_Color_RV:
3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3844 process_color_seq (op, Color_RV, str, resp);
3616 break; 3845 break;
3846 case Rxvt_Color_BD:
3847 case URxvt_Color_BD:
3848 process_color_seq (op, Color_BD, str, resp);
3849 break;
3850 case Rxvt_Color_UL:
3851 case URxvt_Color_UL:
3852 process_color_seq (op, Color_UL, str, resp);
3853 break;
3854 case URxvt_Color_IT:
3855 process_color_seq (op, Color_IT, str, resp);
3856 break;
3617#endif 3857#endif
3858#if TRANSPARENT && TINTING
3859 case URxvt_Color_tint:
3860 process_color_seq (op, Color_tint, str, resp);
3618 3861
3862 check_our_parents ();
3863
3864 if (am_transparent)
3865 want_full_refresh = want_refresh = 1;
3866
3867 break;
3868#endif
3869
3619 case XTerm_Pixmap: 3870 case Rxvt_Pixmap:
3871 {
3620 if (*str != ';') 3872 if (*str != ';')
3621 { 3873 {
3622#if XPM_BACKGROUND 3874#if XPM_BACKGROUND
3623 scale_pixmap (""); /* reset to default scaling */ 3875 scale_pixmap (""); /* reset to default scaling */
3624 set_bgPixmap (str); /* change pixmap */ 3876 set_bgPixmap (str); /* change pixmap */
3625#endif
3626 scr_touch (true); 3877 scr_touch (true);
3878#endif
3627 } 3879 }
3880
3881 int changed = 0;
3882
3628 while ((str = STRCHR (str, ';')) != NULL) 3883 while ((str = strchr (str, ';')) != NULL)
3629 { 3884 {
3630 str++; 3885 str++;
3631#if XPM_BACKGROUND 3886#if XPM_BACKGROUND
3632 changed += scale_pixmap (str); 3887 changed += scale_pixmap (str);
3633#endif 3888#endif
3634
3635 } 3889 }
3890
3636 if (changed) 3891 if (changed)
3637 { 3892 {
3638#ifdef XPM_BACKGROUND 3893#ifdef XPM_BACKGROUND
3639 resize_pixmap (); 3894 resize_pixmap ();
3640#endif
3641 scr_touch (true); 3895 scr_touch (true);
3896#endif
3642 } 3897 }
3898 }
3643 break; 3899 break;
3644 3900
3645 case XTerm_restoreFG: 3901 case Rxvt_restoreFG:
3646 set_window_color (Color_fg, str); 3902 set_window_color (Color_fg, str);
3647 break; 3903 break;
3648 case XTerm_restoreBG: 3904 case Rxvt_restoreBG:
3649 set_window_color (Color_bg, str); 3905 set_window_color (Color_bg, str);
3650 break; 3906 break;
3651 3907
3652 case XTerm_logfile: 3908 case XTerm_logfile:
3653 // TODO, when secure mode? 3909 // TODO, when secure mode?
3654 break; 3910 break;
3655 3911
3656 case XTerm_font:
3657 if (query)
3658 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3659 (Options & Opt_insecure) && TermWin.fontset->fontdesc
3660 ? TermWin.fontset->fontdesc : "",
3661 resp);
3662 else
3663 change_font (str);
3664 break;
3665
3666#ifndef NO_FRILLS
3667 case XTerm_locale:
3668 if (query)
3669 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (Options & Opt_insecure) ? locale : "", resp);
3670 else
3671 {
3672 set_locale (str);
3673# ifdef USE_XIM
3674 im_cb ();
3675# endif
3676 }
3677 break;
3678
3679 case XTerm_findfont:
3680 {
3681 int fid = TermWin.fontset->find_font (atoi (str));
3682 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3683 fid,
3684 (Options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3685 resp);
3686 }
3687 break;
3688#endif
3689
3690#ifdef MENUBAR
3691 case XTerm_Menu:
3692 if (Options & Opt_insecure)
3693 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3694 break;
3695#endif
3696#if 0 3912#if 0
3697 case XTerm_dumpscreen: /* no error notices */ 3913 case Rxvt_dumpscreen: /* no error notices */
3698 { 3914 {
3699 int fd; 3915 int fd;
3700 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3916 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3701 { 3917 {
3702 scr_dump (fd); 3918 scr_dump (fd);
3703 close (fd); 3919 close (fd);
3704 } 3920 }
3705 } 3921 }
3922 break;
3923#endif
3924 case XTerm_font:
3925 op = URxvt_font;
3926 case URxvt_font:
3927#if ENABLE_STYLES
3928 case URxvt_boldFont:
3929 case URxvt_italicFont:
3930 case URxvt_boldItalicFont:
3931#endif
3932 if (query)
3933 tt_printf ("\33]%d;%-.250s%c", saveop,
3934 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3935 ? fontset[op - URxvt_font]->fontdesc : "",
3936 resp);
3937 else
3938 {
3939 const char *&res = rs[Rs_font + (op - URxvt_font)];
3940
3941 res = strdup (str);
3942 allocated.push_back ((void *)res);
3943 set_fonts ();
3944 }
3945 break;
3946
3947 case URxvt_version:
3948 if (query)
3949 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3950 op,
3951 rs[Rs_name], VERSION[0], VERSION[2],
3952 resp);
3953 break;
3954
3955#if !ENABLE_MINIMAL
3956 case URxvt_locale:
3957 if (query)
3958 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3959 else
3960 {
3961 set_locale (str);
3962 pty->set_utf8_mode (enc_utf8);
3963 init_xlocale ();
3964 }
3965 break;
3966
3967 case URxvt_view_up:
3968 case URxvt_view_down:
3969 {
3970 int lines = atoi (str);
3971
3972 if (lines)
3973 scr_page (op == URxvt_view_up ? UP : DN, lines);
3974 else
3975 scr_erase_savelines ();
3976 }
3977
3978 break;
3979#endif
3980
3981#if ENABLE_PERL
3982 case URxvt_perl:
3983 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3984 ; // no responses yet
3706 break; 3985 break;
3707#endif 3986#endif
3708 } 3987 }
3709} 3988}
3710/*----------------------------------------------------------------------*/ 3989/*----------------------------------------------------------------------*/
… …
3724{ 4003{
3725 int state; 4004 int state;
3726 4005
3727 if (mode == 's') 4006 if (mode == 's')
3728 { 4007 {
3729 SavedModes |= (PrivateModes & bit); 4008 SavedModes |= (priv_modes & bit);
3730 return -1; 4009 return -1;
3731 } 4010 }
3732 else 4011 else
3733 { 4012 {
3734 if (mode == 'r') 4013 if (mode == 'r')
3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4014 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3736 else 4015 else
3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4016 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3738 PrivMode (state, bit); 4017 PrivMode (state, bit);
3739 } 4018 }
3740 4019
3741 return state; 4020 return state;
3742} 4021}
3743 4022
3744/* we're not using priv _yet_ */ 4023/* we're not using priv _yet_ */
3745void 4024void
3746rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4025rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3747{ 4026{
3748 unsigned int i, j; 4027 unsigned int i, j;
3749 int state; 4028 int state;
3750 4029
3751 static const struct 4030 static const struct
… …
3760 { 3, PrivMode_132 }, 4039 { 3, PrivMode_132 },
3761 { 4, PrivMode_smoothScroll }, 4040 { 4, PrivMode_smoothScroll },
3762 { 5, PrivMode_rVideo }, 4041 { 5, PrivMode_rVideo },
3763 { 6, PrivMode_relOrigin }, 4042 { 6, PrivMode_relOrigin },
3764 { 7, PrivMode_Autowrap }, 4043 { 7, PrivMode_Autowrap },
4044 // 8, bi-directional support mode
3765 { 9, PrivMode_MouseX10 }, 4045 { 9, PrivMode_MouseX10 },
3766#ifdef menuBar_esc 4046 // 18, 19 printing-related
3767 { menuBar_esc, PrivMode_menuBar }, 4047 { 25, PrivMode_VisibleCursor },
3768#endif
3769#ifdef scrollBar_esc 4048#ifdef scrollBar_esc
3770 { scrollBar_esc, PrivMode_scrollBar }, 4049 { scrollBar_esc, PrivMode_scrollBar },
3771#endif 4050#endif
3772 // 18, 19 printing-related
3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3775 { 35, PrivMode_ShiftKeys }, // rxvt extension 4051 { 35, PrivMode_ShiftKeys }, // rxvt extension
3776 { 40, PrivMode_132OK }, 4052 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI 4053 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI 4054 // 45 margin bell NYI
3779 // 46 start logging 4055 // 46 start logging
… …
3819 } 4095 }
3820 4096
3821 /* extra handling for values with state unkept */ 4097 /* extra handling for values with state unkept */
3822 switch (arg[i]) 4098 switch (arg[i])
3823 { 4099 {
4100#if ENABLE_STYLES
4101 case 1021:
4102 set_option (Opt_intensityStyles, mode);
4103
4104 scr_touch (true);
4105 break;
4106#endif
3824 case 1048: /* alternative cursor save */ 4107 case 1048: /* alternative cursor save */
4108 case 1049:
3825 if (Options & Opt_secondaryScreen) 4109 if (OPTION (Opt_secondaryScreen))
3826 if (mode == 0) 4110 if (mode == 0)
3827 scr_cursor (RESTORE); 4111 scr_cursor (RESTORE);
3828 else if (mode == 1) 4112 else if (mode == 1)
3829 scr_cursor (SAVE); 4113 scr_cursor (SAVE);
3830 break; 4114 break;
… …
3841 * within VT52 mode 4125 * within VT52 mode
3842 */ 4126 */
3843 PrivMode (1, PrivMode_vt52); 4127 PrivMode (1, PrivMode_vt52);
3844 break; 4128 break;
3845 case 3: /* 80/132 */ 4129 case 3: /* 80/132 */
3846 if (PrivateModes & PrivMode_132OK) 4130 if (priv_modes & PrivMode_132OK)
3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4131 set_widthheight (((state ? 132 : 80) * fwidth), height);
3848 break; 4132 break;
3849 case 4: /* smooth scrolling */ 4133 case 4: /* smooth scrolling */
3850 if (state) 4134 set_option (Opt_jumpScroll, !state);
3851 Options &= ~Opt_jumpScroll;
3852 else
3853 Options |= Opt_jumpScroll;
3854 break; 4135 break;
3855 case 5: /* reverse video */ 4136 case 5: /* reverse video */
3856 scr_rvideo_mode (state); 4137 scr_rvideo_mode (state);
3857 break; 4138 break;
3858 case 6: /* relative/absolute origins */ 4139 case 6: /* relative/absolute origins */
… …
3862 scr_autowrap (state); 4143 scr_autowrap (state);
3863 break; 4144 break;
3864 /* case 8: - auto repeat, can't do on a per window basis */ 4145 /* case 8: - auto repeat, can't do on a per window basis */
3865 case 9: /* X10 mouse reporting */ 4146 case 9: /* X10 mouse reporting */
3866 if (state) /* orthogonal */ 4147 if (state) /* orthogonal */
3867 PrivateModes &= ~PrivMode_MouseX11; 4148 priv_modes &= ~PrivMode_MouseX11;
3868 break; 4149 break;
3869#ifdef menuBar_esc
3870 case menuBar_esc:
3871#ifdef MENUBAR
3872 map_menuBar (state);
3873#endif
3874 break;
3875#endif
3876#ifdef scrollBar_esc 4150#ifdef scrollBar_esc
3877 case scrollBar_esc: 4151 case scrollBar_esc:
3878 if (scrollbar_mapping (state)) 4152 if (scrollbar_mapping (state))
3879 { 4153 {
3880 resize_all_windows (0, 0, 0); 4154 resize_all_windows (0, 0, 0);
… …
3892 break; 4166 break;
3893 /* case 66: - application key pad */ 4167 /* case 66: - application key pad */
3894 /* case 67: - backspace key */ 4168 /* case 67: - backspace key */
3895 case 1000: /* X11 mouse reporting */ 4169 case 1000: /* X11 mouse reporting */
3896 if (state) /* orthogonal */ 4170 if (state) /* orthogonal */
3897 PrivateModes &= ~PrivMode_MouseX10; 4171 priv_modes &= ~PrivMode_MouseX10;
3898 break; 4172 break;
3899#if 0 4173#if 0
3900 case 1001: 4174 case 1001:
3901 break; /* X11 mouse highlighting */ 4175 break; /* X11 mouse highlighting */
3902#endif 4176#endif
3903 case 1010: /* scroll to bottom on TTY output inhibit */ 4177 case 1010: /* scroll to bottom on TTY output inhibit */
3904 if (state)
3905 Options &= ~Opt_scrollTtyOutput;
3906 else
3907 Options |= Opt_scrollTtyOutput; 4178 set_option (Opt_scrollTtyOutput, !state);
3908 break; 4179 break;
3909 case 1011: /* scroll to bottom on key press */ 4180 case 1011: /* scroll to bottom on key press */
3910 if (state)
3911 Options |= Opt_scrollTtyKeypress; 4181 set_option (Opt_scrollTtyKeypress, state);
3912 else
3913 Options &= ~Opt_scrollTtyKeypress;
3914 break; 4182 break;
3915 case 1047: /* secondary screen w/ clearing last */ 4183 case 1047: /* secondary screen w/ clearing last */
3916 if (Options & Opt_secondaryScreen) 4184 if (OPTION (Opt_secondaryScreen))
3917 if (current_screen != PRIMARY) 4185 if (current_screen != PRIMARY)
3918 scr_erase_screen (2); 4186 scr_erase_screen (2);
3919 scr_change_screen (state); 4187 scr_change_screen (state);
3920 break; 4188 break;
3921 case 1049: /* secondary screen w/ clearing first */ 4189 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state); 4190 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen) 4191 if (OPTION (Opt_secondaryScreen))
3924 if (current_screen != PRIMARY) 4192 if (current_screen != PRIMARY)
3925 scr_erase_screen (2); 4193 scr_erase_screen (2);
3926 break; 4194 break;
3927 default: 4195 default:
3928 break; 4196 break;
… …
3954 rendset = 0, rendstyle = ~RS_None; 4222 rendset = 0, rendstyle = ~RS_None;
3955 break; 4223 break;
3956 case 1: 4224 case 1:
3957 rendset = 1, rendstyle = RS_Bold; 4225 rendset = 1, rendstyle = RS_Bold;
3958 break; 4226 break;
3959 //case 2: // faint or second colour 4227 //case 2: // low intensity
4228 case 3:
4229 rendset = 1, rendstyle = RS_Italic;
4230 break;
3960 case 4: 4231 case 4:
3961 rendset = 1, rendstyle = RS_Uline; 4232 rendset = 1, rendstyle = RS_Uline;
3962 break; 4233 break;
3963 case 5: // slowly blinking 4234 case 5: // slowly blinking
3964 case 6: // rapidly blinking 4235 case 6: // rapidly blinking
… …
3976 //case 11: // scoansi acs on, first alt font 4247 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font 4248 //case 12: // scoansi acs on, |0x80, second alt font
3978 //... 4249 //...
3979 //case 19: // ninth alt font 4250 //case 19: // ninth alt font
3980 //case 20: // gothic 4251 //case 20: // gothic
3981 case 21: // disable bold, faint 4252 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3982 rendset = 0, rendstyle = RS_Bold; 4253 rendset = 0, rendstyle = RS_Bold;
3983 break; 4254 break;
3984 case 22: 4255 case 22: // normal intensity
3985 rendset = 0, rendstyle = RS_Bold; 4256 rendset = 0, rendstyle = RS_Bold;
3986 break; 4257 break;
3987 //case 23: disable italic 4258 case 23: // disable italic
4259 rendset = 0, rendstyle = RS_Italic;
4260 break;
3988 case 24: 4261 case 24:
3989 rendset = 0, rendstyle = RS_Uline; 4262 rendset = 0, rendstyle = RS_Uline;
3990 break; 4263 break;
3991 case 25: 4264 case 25:
4265 rendset = 0, rendstyle = RS_Blink;
4266 break;
4267 case 26: // variable spacing (iso 8613)
3992 rendset = 0, rendstyle = RS_Blink; 4268 rendset = 0, rendstyle = RS_Blink;
3993 break; 4269 break;
3994 case 27: 4270 case 27:
3995 rendset = 0, rendstyle = RS_RVid; 4271 rendset = 0, rendstyle = RS_RVid;
3996 break; 4272 break;
… …
4014 case 35: 4290 case 35:
4015 case 36: 4291 case 36:
4016 case 37: 4292 case 37:
4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4293 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4018 break; 4294 break;
4019#ifdef TTY_256COLOR 4295 case 38: // set fg color, ISO 8613-6
4020 case 38:
4021 if (nargs > i + 2 && arg[i + 1] == 5) 4296 if (nargs > i + 2 && arg[i + 1] == 5)
4022 { 4297 {
4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4298 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4024 i += 2; 4299 i += 2;
4025 } 4300 }
4026 break; 4301 break;
4027#endif
4028 case 39: /* default fg */ 4302 case 39: /* default fg */
4029 scr_color (Color_fg, Color_fg); 4303 scr_color (Color_fg, Color_fg);
4030 break; 4304 break;
4031 4305
4032 case 40: 4306 case 40:
… …
4037 case 45: 4311 case 45:
4038 case 46: 4312 case 46:
4039 case 47: 4313 case 47:
4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4314 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4041 break; 4315 break;
4042#ifdef TTY_256COLOR 4316 case 48: // set bg color, ISO 8613-6
4043 case 48:
4044 if (nargs > i + 2 && arg[i + 1] == 5) 4317 if (nargs > i + 2 && arg[i + 1] == 5)
4045 { 4318 {
4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4319 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4047 i += 2; 4320 i += 2;
4048 } 4321 }
4049 break; 4322 break;
4050#endif
4051 case 49: /* default bg */ 4323 case 49: /* default bg */
4052 scr_color (Color_bg, Color_bg); 4324 scr_color (Color_bg, Color_bg);
4053 break; 4325 break;
4054 4326
4055#ifndef NO_BRIGHTCOLOR 4327 //case 50: // not variable spacing
4328
4329#if !ENABLE_MINIMAL
4056 case 90: 4330 case 90:
4057 case 91: /* set bright fg color */ 4331 case 91: /* set bright fg color */
4058 case 92: 4332 case 92:
4059 case 93: 4333 case 93:
4060 case 94: 4334 case 94:
4061 case 95: 4335 case 95:
4062 case 96: 4336 case 96:
4063 case 97: 4337 case 97:
4064 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4338 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4065 Color_fg);
4066 break; 4339 break;
4067 case 100: 4340 case 100:
4068 case 101: /* set bright bg color */ 4341 case 101: /* set bright bg color */
4069 case 102: 4342 case 102:
4070 case 103: 4343 case 103:
4071 case 104: 4344 case 104:
4072 case 105: 4345 case 105:
4073 case 106: 4346 case 106:
4074 case 107: 4347 case 107:
4075 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4348 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4076 Color_bg);
4077 break; 4349 break;
4078#endif 4350#endif
4079
4080 } 4351 }
4081 } 4352 }
4082} 4353}
4083/*}}} */ 4354/*}}} */
4084 4355
… …
4088{ 4359{
4089 unicode_t ch, cmd = cmd_getc (); 4360 unicode_t ch, cmd = cmd_getc ();
4090 4361
4091 if (cmd == 'Q') 4362 if (cmd == 'Q')
4092 { /* query graphics */ 4363 { /* query graphics */
4093 tt_printf ("\033G0\n"); /* no graphics */ 4364 tt_printf ("\033G0\012"); /* no graphics */
4094 return; 4365 return;
4095 } 4366 }
4096 /* swallow other graphics sequences until terminating ':' */ 4367 /* swallow other graphics sequences until terminating ':' */
4097 do 4368 do
4098 ch = cmd_getc (); 4369 ch = cmd_getc ();
… …
4108 */ 4379 */
4109void 4380void
4110rxvt_term::tt_printf (const char *fmt,...) 4381rxvt_term::tt_printf (const char *fmt,...)
4111{ 4382{
4112 va_list arg_ptr; 4383 va_list arg_ptr;
4113 unsigned char buf[256]; 4384 char buf[256];
4114 4385
4115 va_start (arg_ptr, fmt); 4386 va_start (arg_ptr, fmt);
4116 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4387 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4117 va_end (arg_ptr); 4388 va_end (arg_ptr);
4118 tt_write (buf, STRLEN (buf)); 4389 tt_write (buf, strlen (buf));
4119} 4390}
4120 4391
4121/* ---------------------------------------------------------------------- */ 4392/* ---------------------------------------------------------------------- */
4122/* Write data to the pty as typed by the user, pasted with the mouse, 4393/* Write data to the pty as typed by the user, pasted with the mouse,
4123 * or generated by us in response to a query ESC sequence. 4394 * or generated by us in response to a query ESC sequence.
4124 */ 4395 */
4396const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4397
4125void 4398void
4126rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4399rxvt_term::tt_write (const char *data, unsigned int len)
4127{ 4400{
4128 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4401 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4402 return;
4129 4403
4130 if (len) 4404 if (pty->pty < 0)
4405 return;
4406
4407 if (v_buflen == 0)
4408 {
4409 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4410
4411 if ((unsigned int)written == len)
4412 return;
4413
4414 data += written;
4415 len -= written;
4131 { 4416 }
4417
4418 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4419
4420 memcpy (v_buffer + v_buflen, data, len);
4421 v_buflen += len;
4422
4423 pty_ev.set (EVENT_READ | EVENT_WRITE);
4424}
4425
4426void rxvt_term::pty_write ()
4427{
4428 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4429
4430 if (written > 0)
4431 {
4432 v_buflen -= written;
4433
4132 if (v_buflen == 0) 4434 if (v_buflen == 0)
4133 { 4435 {
4134 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
4135
4136 if ((unsigned int)written == len)
4137 return;
4138
4139 data += written;
4140 len -= written;
4141 }
4142
4143
4144 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4145
4146 memcpy (v_buffer + v_buflen, data, len);
4147 v_buflen += len;
4148 }
4149
4150 for (;;)
4151 {
4152 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
4153
4154 if (written > 0)
4155 {
4156 v_buflen -= written;
4157
4158 if (v_buflen == 0)
4159 {
4160 free (v_buffer); 4436 free (v_buffer);
4161 v_buffer = 0; 4437 v_buffer = 0;
4162 v_buflen = 0; 4438 v_buflen = 0;
4163 4439
4164 pty_ev.set (EVENT_READ); 4440 pty_ev.set (EVENT_READ);
4165 return;
4166 }
4167
4168 memmove (v_buffer, v_buffer + written, v_buflen);
4169 }
4170 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4171 // original code just ignores this...
4172 destroy ();
4173 else
4174 {
4175 pty_ev.set (EVENT_READ | EVENT_WRITE);
4176 return; 4441 return;
4177 } 4442 }
4443
4444 memmove (v_buffer, v_buffer + written, v_buflen);
4178 } 4445 }
4446 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4447 pty_ev.set (EVENT_READ);
4179} 4448}
4180 4449
4181/*----------------------- end-of-file (C source) -----------------------*/ 4450/*----------------------- end-of-file (C source) -----------------------*/
4182 4451

Diff Legend

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