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.303 by root, Tue Jan 31 21:47:56 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.
1109
1110 struct timespec ts = { 0, 0 };
1111 nanosleep (&ts, 0);
1112
1113 w.stop ();
1114 }
1115
1116 event_handler ()
1117 : yield_ev (this, &event_handler::yield_cb)
1118 {
1119 }
1120} event_handler;
1121#endif
1122
907bool 1123bool
908rxvt_term::pty_fill () 1124rxvt_term::pty_fill ()
909{ 1125{
910 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1126 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
911 1127
912 if (CBUFSIZ == n) 1128 if (CBUFSIZ == n)
913 { 1129 {
914 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1130 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
915 n = 0; 1131 n = 0;
916 } 1132 }
917 1133
918 memmove (cmdbuf_base, cmdbuf_ptr, n); 1134 memmove (cmdbuf_base, cmdbuf_ptr, n);
919 cmdbuf_ptr = cmdbuf_base; 1135 cmdbuf_ptr = cmdbuf_base;
920 cmdbuf_endp = cmdbuf_ptr + n; 1136 cmdbuf_endp = cmdbuf_ptr + n;
921 1137
922 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1138 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
923 1139
924 if (n > 0) 1140 if (r > 0)
925 { 1141 {
926 cmdbuf_endp += n; 1142 cmdbuf_endp += r;
927 return true; 1143 return true;
928 } 1144 }
929 else if (n < 0 && errno != EAGAIN) 1145 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1146 {
1147#if LINUX_YIELD_HACK
1148 if (display->is_local)
1149 event_handler.yield_ev.start ();
1150#endif
1151 }
1152 else
1153 {
1154 pty_ev.stop ();
1155
1156 if (!OPTION (Opt_hold))
930 destroy (); 1157 destroy ();
1158 }
931 1159
932 return false; 1160 return false;
933} 1161}
934 1162
935void 1163void
936rxvt_term::pty_cb (io_watcher &w, short revents) 1164rxvt_term::pty_cb (io_watcher &w, short revents)
937{ 1165{
938 SET_R (this); 1166 make_current ();
939 SET_LOCALE (locale);
940 1167
941 if (revents & EVENT_WRITE)
942 tt_write (0, 0);
943 else if (revents & EVENT_READ) 1168 if (revents & EVENT_READ)
944 // loop, but don't allow a single term to monopolize us 1169 // loop, but don't allow a single term to monopolize us
945 while (pty_fill ()) 1170 while (pty_fill ())
946 if (cmd_parse ()) 1171 if (cmd_parse ())
947 break; 1172 break;
1173
1174 if (revents & EVENT_WRITE)
1175 pty_write ();
948} 1176}
949 1177
950void 1178void
951rxvt_term::pointer_unblank () 1179rxvt_term::pointer_unblank ()
952{ 1180{
953 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1181 XDefineCursor (xdisp, vt, TermWin_cursor);
954 recolour_cursor (); 1182 recolour_cursor ();
955 1183
956#ifdef POINTER_BLANK 1184#ifdef POINTER_BLANK
957 hidden_pointer = 0; 1185 hidden_pointer = 0;
958 1186
959 if (Options & Opt_pointerBlank) 1187 if (OPTION (Opt_pointerBlank))
960 pointer_ev.start (NOW + pointerBlankDelay); 1188 pointer_ev.start (NOW + pointerBlankDelay);
961#endif 1189#endif
962} 1190}
963 1191
964#ifdef POINTER_BLANK 1192#ifdef POINTER_BLANK
965void 1193void
966rxvt_term::pointer_blank () 1194rxvt_term::pointer_blank ()
967{ 1195{
968 if (! (Options & Opt_pointerBlank)) 1196 if (!OPTION (Opt_pointerBlank))
969 return; 1197 return;
970 1198
971 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1199 XDefineCursor (xdisp, vt, display->blank_cursor);
972 XFlush (display->display); 1200 XFlush (xdisp);
973 1201
974 hidden_pointer = 1; 1202 hidden_pointer = 1;
975} 1203}
976 1204
977void 1205void
978rxvt_term::pointer_cb (time_watcher &w) 1206rxvt_term::pointer_cb (time_watcher &w)
979{ 1207{
980 SET_R (this); 1208 make_current ();
981 SET_LOCALE (locale);
982 1209
983 pointer_blank (); 1210 pointer_blank ();
984} 1211}
985#endif 1212#endif
986 1213
… …
993 x = ev.x; 1220 x = ev.x;
994 y = ev.y; 1221 y = ev.y;
995 pixel_position (&x, &y); 1222 pixel_position (&x, &y);
996 1223
997 if (MEvent.button == AnyButton) 1224 if (MEvent.button == AnyButton)
998 {
999 button_number = 3; 1225 button_number = 3;
1000 }
1001 else 1226 else
1002 { 1227 {
1003 button_number = MEvent.button - Button1; 1228 button_number = MEvent.button - Button1;
1004 /* add 0x3D for wheel events, like xterm does */ 1229 /* add 0x3D for wheel events, like xterm does */
1005 if (button_number >= 3) 1230 if (button_number >= 3)
1006 button_number += (64 - 3); 1231 button_number += (64 - 3);
1007 } 1232 }
1008 1233
1009 if (PrivateModes & PrivMode_MouseX10) 1234 if (priv_modes & PrivMode_MouseX10)
1010 { 1235 {
1011 /* 1236 /*
1012 * do not report ButtonRelease 1237 * do not report ButtonRelease
1013 * no state info allowed 1238 * no state info allowed
1014 */ 1239 */
… …
1029 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1254 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1030 + ((MEvent.state & ControlMask) ? 16 : 0); 1255 + ((MEvent.state & ControlMask) ? 16 : 0);
1031#ifdef MOUSE_REPORT_DOUBLECLICK 1256#ifdef MOUSE_REPORT_DOUBLECLICK
1032 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1257 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1033#endif 1258#endif
1034
1035 } 1259 }
1036 1260
1037#ifdef DEBUG_MOUSEREPORT 1261#if DEBUG_MOUSEREPORT
1038 fprintf (stderr, "Mouse ["); 1262 fprintf (stderr, "Mouse [");
1039 if (key_state & 16) 1263 if (key_state & 16)
1040 fputc ('C', stderr); 1264 fputc ('C', stderr);
1041 if (key_state & 4) 1265 if (key_state & 4)
1042 fputc ('S', stderr); 1266 fputc ('S', stderr);
… …
1046 fputc ('2', stderr); 1270 fputc ('2', stderr);
1047 fprintf (stderr, "]: <%d>, %d/%d\n", 1271 fprintf (stderr, "]: <%d>, %d/%d\n",
1048 button_number, 1272 button_number,
1049 x + 1, 1273 x + 1,
1050 y + 1); 1274 y + 1);
1051#else 1275#endif
1276
1052 tt_printf ("\033[M%c%c%c", 1277 tt_printf ("\033[M%c%c%c",
1053 (32 + button_number + key_state), 1278 (32 + button_number + key_state),
1054 (32 + x + 1), 1279 (32 + x + 1),
1055 (32 + y + 1)); 1280 (32 + y + 1));
1056#endif
1057} 1281}
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 1282
1069/*{{{ process an X event */ 1283/*{{{ process an X event */
1070void 1284void
1071rxvt_term::x_cb (XEvent &ev) 1285rxvt_term::x_cb (XEvent &ev)
1072{ 1286{
1073 SET_R (this); 1287 make_current ();
1074 SET_LOCALE (locale);
1075 1288
1076#if defined(CURSOR_BLINK) 1289 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 1290
1085 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1291 if (ev.xany.window == vt
1086 } 1292 && SHOULD_INVOKE (HOOK_X_EVENT)
1087#endif 1293 && 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; 1294 return;
1106#endif
1107 1295
1296 // for XQueryPointer
1108 Window unused_root, unused_child; 1297 Window unused_root, unused_child;
1109 int unused_root_x, unused_root_y; 1298 int unused_root_x, unused_root_y;
1110 unsigned int unused_mask; 1299 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 1300
1161 switch (ev.type) 1301 switch (ev.type)
1162 { 1302 {
1163 case KeyPress: 1303 case KeyPress:
1304#if ISO_14755
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT)) 1305 if (!(iso14755buf & ISO_14755_52))
1306#endif
1165 lookup_key (ev.xkey); 1307 lookup_key (ev.xkey);
1166 1308
1167 break; 1309 break;
1168 1310
1169 case KeyRelease: 1311 case KeyRelease:
1170 { 1312 {
1171#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || !defined (NO_FRILLS) 1313#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1172 KeySym ks; 1314 KeySym keysym;
1173 1315
1174 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1316 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1175#endif 1317#endif
1176 1318
1177#ifndef NO_FRILLS 1319#if ENABLE_FRILLS || ISO_14755
1178 // ISO 14755 support 1320 // ISO 14755 support
1179 if (iso14755buf) 1321 if (iso14755buf)
1180 if (iso14755buf & ISO_14755_ESCAPE_NEXT) 1322 if (iso14755buf & ISO_14755_52)
1181 { 1323 {
1324# if ENABLE_OVERLAY
1325 scr_overlay_off ();
1326# endif
1327# if ISO_14755
1182 // iso14755 part 5.2 handling: release time 1328 // iso14755 part 5.2 handling: release time
1183 // first: controls 1329 // first: controls
1184 if ((ev.xkey.state & ControlMask) 1330 if ((ev.xkey.state & ControlMask)
1185 && ((ks >= 0x40 && ks <= 0x5f) 1331 && ((keysym >= 0x40 && keysym <= 0x5f)
1186 || (ks >= 0x61 && ks <= 0x7f))) 1332 || (keysym >= 0x61 && keysym <= 0x7f)))
1187 { 1333 {
1188 iso14755buf = ISO_14755_KEYCODE_VALID | 0x2400 | (ks & 0x1f); 1334 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1189 commit_iso14755 (); 1335 commit_iso14755 ();
1190 return; // case-break; 1336 goto skip_switch;
1191 } 1337 }
1192 1338
1193 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1339 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1194 if (i[0] == ks) 1340 if (i[0] == keysym)
1195 { 1341 {
1196 iso14755buf = ISO_14755_KEYCODE_VALID | i[1]; 1342 iso14755buf = ISO_14755_51 | i[1];
1197 commit_iso14755 (); 1343 commit_iso14755 ();
1198 return; // case-break; 1344 goto skip_switch;
1199 } 1345 }
1200 1346
1347 scr_bell ();
1348# endif
1201 iso14755buf = 0; 1349 iso14755buf = 0;
1202 scr_bell ();
1203 break; 1350 break;
1204 } 1351 }
1205 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 1352 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1206 { 1353 {
1354# if ENABLE_OVERLAY
1355 scr_overlay_off ();
1356# endif
1207 if (iso14755buf & ISO_14755_KEYCODE_VALID) 1357 if (iso14755buf & ISO_14755_51)
1208 commit_iso14755 (); 1358 commit_iso14755 ();
1359#if ISO_14755
1209 else if (iso14755buf & ISO_14755_ACTIVE) 1360 else if (iso14755buf & ISO_14755_STARTED)
1361 {
1210 iso14755buf = ISO_14755_ESCAPE_NEXT; // iso14755 part 5.2: remember empty begin/end pair 1362 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1363
1364 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1365 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1366 }
1367# endif
1368 else
1369 iso14755buf = 0;
1211 } 1370 }
1212#endif 1371#endif
1372
1373 if (ev.xany.window == vt
1374 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1375 break;
1213 1376
1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1215 if (!(ev.xkey.state & ControlMask)) 1378 if (!(ev.xkey.state & ControlMask))
1216 slip_wheel_ev.stop (); 1379 slip_wheel_ev.stop ();
1217 else if (ks == XK_Control_L || ks == XK_Control_R) 1380 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1218 mouse_slip_wheel_speed = 0; 1381 mouse_slip_wheel_speed = 0;
1219#endif 1382#endif
1220 break; 1383 break;
1221 } 1384 }
1222 1385
… …
1228 button_release (ev.xbutton); 1391 button_release (ev.xbutton);
1229 break; 1392 break;
1230 1393
1231 case ClientMessage: 1394 case ClientMessage:
1232 if (ev.xclient.format == 32 1395 if (ev.xclient.format == 32
1233 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1396 && !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 { 1397 {
1242 /* Get Dnd data */ 1398 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1243 Atom ActualType; 1399 {
1244 int ActualFormat; 1400 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1245 unsigned char *data; 1401 {
1246 unsigned long Size, RemainingBytes; 1402 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1247 1403 {
1248 XGetWindowProperty (display->display, display->root, 1404 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1249 xa[XA_DNDSELECTION], 1405 destroy ();
1250 0L, 1000000L, 1406 }
1251 False, AnyPropertyType, 1407#if ENABLE_EWMH
1252 &ActualType, &ActualFormat, 1408 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1253 &Size, &RemainingBytes, 1409 XSendEvent (xdisp, ev.xclient.window = display->root,
1410 False, SubstructureRedirectMask | SubstructureNotifyMask,
1254 &data); 1411 &ev);
1255 XChangeProperty (display->display, display->root, 1412#endif
1256 XA_CUT_BUFFER0, XA_STRING, 1413 }
1257 8, PropModeReplace, 1414 }
1258 data, STRLEN (data)); 1415#if ENABLE_XEMBED
1259 XFree (data); 1416 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1260 selection_paste (display->root, XA_CUT_BUFFER0, True); 1417 {
1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1418 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1419 focus_in ();
1420 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1421 focus_out ();
1422 }
1423#endif
1262 } 1424 }
1263#endif /* OFFIX_DND */
1264 break; 1425 break;
1265 1426
1266 case MappingNotify: 1427 case MappingNotify:
1267 XRefreshKeyboardMapping (&ev.xmapping); 1428 XRefreshKeyboardMapping (&ev.xmapping);
1268 break; 1429 break;
… …
1291 break; 1452 break;
1292 } 1453 }
1293 break; 1454 break;
1294 1455
1295 case FocusIn: 1456 case FocusIn:
1296 if (!TermWin.focus) 1457 focus_in ();
1458 break;
1459
1460 case FocusOut:
1461 focus_out ();
1462 break;
1463
1464 case ConfigureNotify:
1465 if (ev.xconfigure.window == parent[0])
1297 { 1466 {
1298 TermWin.focus = 1; 1467 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1299 want_refresh = 1; 1468 ;
1300#ifdef USE_XIM 1469
1301 if (Input_Context != NULL) 1470 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 { 1471 {
1311 PixColors = PixColorsFocused; 1472 seen_resize = 1;
1312 set_colorfgbg (); 1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1313 scr_clear ();
1314 scr_touch (true);
1315 } 1474 }
1316#endif
1317 1475
1476 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1477
1478#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1479 if (OPTION (Opt_transparent))
1480 check_our_parents ();
1481#endif
1318 } 1482 }
1319 break; 1483 break;
1320 1484
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: 1485 case PropertyNotify:
1486 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1376 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1487 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1377 && ev.xproperty.state == PropertyNewValue) 1488 && ev.xproperty.state == PropertyNewValue)
1378 selection_property (ev.xproperty.window, ev.xproperty.atom); 1489 selection_property (ev.xproperty.window, ev.xproperty.atom);
1379 1490
1380 break; 1491 break;
1381 1492
1382 case SelectionClear: 1493 case SelectionClear:
1383 selection_clear (); 1494 selection_clear ();
1384 break; 1495 break;
1385 1496
1386 case SelectionNotify: 1497 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1498 if (selection_wait == Sel_normal)
1388 selection_paste (ev.xselection.requestor, 1499 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1389 ev.xselection.property, True);
1390 break; 1500 break;
1391 1501
1392 case SelectionRequest: 1502 case SelectionRequest:
1393 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1394 break; 1504 break;
1395 1505
1506 case MapNotify:
1507 mapped = 1;
1508#ifdef TEXT_BLINK
1509 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1510#endif
1511 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1512 break;
1513
1396 case UnmapNotify: 1514 case UnmapNotify:
1397 TermWin.mapped = 0; 1515 mapped = 0;
1398#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1399 text_blink_ev.stop (); 1517 text_blink_ev.stop ();
1400#endif 1518#endif
1401 break; 1519 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; 1520 break;
1409 1521
1410#ifdef TRANSPARENT 1522#ifdef TRANSPARENT
1411 case ReparentNotify: 1523 case ReparentNotify:
1412 rootwin_cb (ev); 1524 rootwin_cb (ev);
1413 break; 1525 break;
1414#endif /* TRANSPARENT */ 1526#endif /* TRANSPARENT */
1415 1527
1416 case GraphicsExpose: 1528 case GraphicsExpose:
1417 case Expose: 1529 case Expose:
1418 if (ev.xany.window == TermWin.vt) 1530 if (ev.xany.window == vt)
1419 { 1531 {
1420 do 1532 do
1421 scr_expose (ev.xexpose.x, ev.xexpose.y, 1533 scr_expose (ev.xexpose.x, ev.xexpose.y,
1422 ev.xexpose.width, ev.xexpose.height, False); 1534 ev.xexpose.width, ev.xexpose.height, False);
1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1535 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1424 1536
1425 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1426 1538
1427 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1539 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1428 scr_expose (ev.xexpose.x, ev.xexpose.y, 1540 scr_expose (ev.xexpose.x, ev.xexpose.y,
1429 ev.xexpose.width, ev.xexpose.height, False); 1541 ev.xexpose.width, ev.xexpose.height, False);
1430 1542
1431 scr_refresh (refresh_type); 1543 want_refresh = 1;
1432 } 1544 }
1433 else 1545 else
1434 { 1546 {
1435 XEvent unused_event; 1547 XEvent unused_event;
1436 1548
1437 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1549 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1438 ; 1550 ;
1439 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1551 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1440 ; 1552 ;
1441 1553
1442 if (isScrollbarWindow (ev.xany.window)) 1554 if (isScrollbarWindow (ev.xany.window))
1443 { 1555 {
1444 scrollBar.setIdle (); 1556 scrollBar.setIdle ();
1445 scrollbar_show (0); 1557 scrollbar_show (0);
1446 } 1558 }
1447#ifdef MENUBAR
1448 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1449 menubar_expose ();
1450#endif
1451 1559
1452#ifdef TRANSPARENT 1560#ifdef TRANSPARENT
1453 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1561 if (am_transparent && ev.xany.window == parent[0])
1454 XClearWindow (display->display, ev.xany.window); 1562 XClearWindow (xdisp, ev.xany.window);
1455#endif 1563#endif
1456 } 1564 }
1457 break; 1565 break;
1458 1566
1459 case MotionNotify: 1567 case MotionNotify:
1460#ifdef POINTER_BLANK 1568#ifdef POINTER_BLANK
1461 if (hidden_pointer) 1569 if (hidden_pointer)
1462 pointer_unblank (); 1570 pointer_unblank ();
1463#endif 1571#endif
1464#if MENUBAR 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1465 if (isMenuBarWindow (ev.xany.window)) 1573 break;
1574
1575 if (ev.xany.window == vt)
1466 { 1576 {
1467 menubar_control (ev.xbutton); 1577 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1468 break; 1578 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1469 } 1579 ; // 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))) 1580 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1477 { 1581 {
1478 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1479 ; 1583 ;
1480 1584
1481 XQueryPointer (display->display, TermWin.vt, 1585 XQueryPointer (xdisp, vt,
1482 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1483 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1484 & (ev.xbutton.x), & (ev.xbutton.y), 1588 &ev.xbutton.x, &ev.xbutton.y,
1485 &unused_mask); 1589 &ev.xbutton.state);
1486#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
1487 /* deal with a `jumpy' mouse */ 1591 /* deal with a `jumpy' mouse */
1488 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1592 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1489 { 1593 {
1490#endif 1594#endif
1595#if ISO_14755
1596 // 5.4
1597 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1598 {
1599 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1600 break;
1601 }
1602#endif
1491 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1603 selection_extend (ev.xbutton.x, ev.xbutton.y,
1492 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1604 ev.xbutton.state & Button3Mask ? 2 : 0);
1605
1493#ifdef SELECTION_SCROLLING 1606#ifdef SELECTION_SCROLLING
1494 if (ev.xbutton.y < TermWin.int_bwidth 1607 if (ev.xbutton.y < int_bwidth
1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1608 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1496 { 1609 {
1497 int dist; 1610 int dist;
1498 1611
1499 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1500 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
… …
1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1616 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1504 1617
1505 /* save the event params so we can highlight 1618 /* save the event params so we can highlight
1506 * the selection in the pending-scroll loop 1619 * the selection in the pending-scroll loop
1507 */ 1620 */
1508 selection_save_x=ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
1509 selection_save_y=ev.xbutton.y; 1622 selection_save_y = ev.xbutton.y;
1510 selection_save_state=
1511 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1623 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1512 1624
1513 /* calc number of lines to scroll */ 1625 /* calc number of lines to scroll */
1514 if (ev.xbutton.y<TermWin.int_bwidth) 1626 if (ev.xbutton.y < int_bwidth)
1515 { 1627 {
1516 scroll_selection_dir = UP; 1628 scroll_selection_dir = UP;
1517 dist = TermWin.int_bwidth - ev.xbutton.y; 1629 dist = int_bwidth - ev.xbutton.y;
1518 } 1630 }
1519 else 1631 else
1520 { 1632 {
1521 scroll_selection_dir = DN; 1633 scroll_selection_dir = DN;
1522 dist = ev.xbutton.y - 1634 dist = ev.xbutton.y - (int_bwidth + height);
1523 (TermWin.int_bwidth + TermWin.height);
1524 } 1635 }
1636
1525 scroll_selection_lines= (Pixel2Height (dist)/ 1637 scroll_selection_lines = Pixel2Height (dist)
1526 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1638 / SELECTION_SCROLL_LINE_SPEEDUP
1639 + 1;
1527 MIN_IT (scroll_selection_lines, 1640 min_it (scroll_selection_lines,
1528 SELECTION_SCROLL_MAX_LINES); 1641 SELECTION_SCROLL_MAX_LINES);
1529 } 1642 }
1530 else 1643 else
1531 { 1644 {
1532 /* we are within the text window, so we 1645 /* we are within the text window, so we
1533 * shouldn't be scrolling 1646 * shouldn't be scrolling
… …
1535 if (sel_scroll_ev.active) 1648 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop(); 1649 sel_scroll_ev.stop();
1537 } 1650 }
1538#endif 1651#endif
1539#ifdef MOUSE_THRESHOLD 1652#ifdef MOUSE_THRESHOLD
1540
1541 } 1653 }
1542#endif 1654#endif
1543
1544 } 1655 }
1545 } 1656 }
1546 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1657 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1547 { 1658 {
1548 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1659 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1549 MotionNotify, &ev)) ; 1660 MotionNotify, &ev))
1661 ;
1662
1550 XQueryPointer (display->display, scrollBar.win, 1663 XQueryPointer (xdisp, scrollBar.win,
1551 &unused_root, &unused_child, 1664 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1665 &unused_root_x, &unused_root_y,
1553 & (ev.xbutton.x), & (ev.xbutton.y), 1666 &ev.xbutton.x, &ev.xbutton.y,
1554 &unused_mask); 1667 &unused_mask);
1555 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1556 scrollbar_size ()); 1669 scrollbar_size ());
1557 scr_refresh (refresh_type); 1670 want_refresh = 1;
1558 refresh_limit = 0; 1671 refresh_limit = 0;
1559 scrollbar_show (1); 1672 scrollbar_show (1);
1560 } 1673 }
1561 break; 1674 break;
1562 } 1675 }
1676
1677skip_switch: ;
1678
1679#if defined(CURSOR_BLINK)
1680 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1681 {
1682 if (hidden_cursor)
1683 {
1684 hidden_cursor = 0;
1685 want_refresh = 1;
1686 }
1687
1688 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1689 }
1690#endif
1691
1692#if defined(POINTER_BLANK)
1693 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 {
1695 if (ev.type == MotionNotify
1696 || ev.type == ButtonPress
1697 || ev.type == ButtonRelease)
1698 if (hidden_pointer)
1699 pointer_unblank ();
1700
1701 if (ev.type == KeyPress && hidden_pointer == 0)
1702 pointer_blank ();
1703 }
1704#endif
1705}
1706
1707void
1708rxvt_term::focus_in ()
1709{
1710 if (!focus)
1711 {
1712 focus = 1;
1713 want_refresh = 1;
1714
1715 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1716
1717#if USE_XIM
1718 if (Input_Context != NULL)
1719 {
1720 IMSetStatusPosition ();
1721 XSetICFocus (Input_Context);
1722 }
1723#endif
1724#if CURSOR_BLINK
1725 if (OPTION (Opt_cursorBlink))
1726 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1727#endif
1728#if OFF_FOCUS_FADING
1729 if (rs[Rs_fade])
1730 {
1731 pix_colors = pix_colors_focused;
1732 scr_recolour ();
1733 }
1734#endif
1735 }
1736}
1737
1738void
1739rxvt_term::focus_out ()
1740{
1741 if (focus)
1742 {
1743 focus = 0;
1744 want_refresh = 1;
1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1747
1748#if ENABLE_FRILLS || ISO_14755
1749 if (iso14755buf)
1750 {
1751 iso14755buf = 0;
1752# if ENABLE_OVERLAY
1753 scr_overlay_off ();
1754# endif
1755 }
1756#endif
1757#if USE_XIM
1758 if (Input_Context != NULL)
1759 XUnsetICFocus (Input_Context);
1760#endif
1761#if CURSOR_BLINK
1762 if (OPTION (Opt_cursorBlink))
1763 cursor_blink_ev.stop ();
1764 hidden_cursor = 0;
1765#endif
1766#if OFF_FOCUS_FADING
1767 if (rs[Rs_fade])
1768 {
1769 pix_colors = pix_colors_unfocused;
1770 scr_recolour ();
1771 }
1772#endif
1773 }
1563} 1774}
1564 1775
1565#if TRANSPARENT 1776#if TRANSPARENT
1566void 1777void
1567rxvt_term::rootwin_cb (XEvent &ev) 1778rxvt_term::rootwin_cb (XEvent &ev)
1568{ 1779{
1569 SET_R (this); 1780 make_current ();
1570 SET_LOCALE (locale);
1571 1781
1572 switch (ev.type) 1782 switch (ev.type)
1573 { 1783 {
1574 case PropertyNotify: 1784 case PropertyNotify:
1575 /* 1785 /*
1576 * if user used some Esetroot compatible prog to set the root bg, 1786 * 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. 1787 * use the property to determine the pixmap. We use it later on.
1578 */ 1788 */
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]) 1789 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1790 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1583 return; 1791 return;
1584 1792
1585 /* FALLTHROUGH */ 1793 /* FALLTHROUGH */
1586 case ReparentNotify: 1794 case ReparentNotify:
1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1795 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1588 want_refresh = want_full_refresh = 1; 1796 want_refresh = want_full_refresh = 1;
1589 break; 1797 break;
1590 } 1798 }
1591} 1799}
1592#endif 1800#endif
… …
1595rxvt_term::button_press (XButtonEvent &ev) 1803rxvt_term::button_press (XButtonEvent &ev)
1596{ 1804{
1597 int reportmode = 0, clickintime; 1805 int reportmode = 0, clickintime;
1598 1806
1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1807 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1808
1600 if (!bypass_keystate) 1809 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1810 reportmode = !! (priv_modes & PrivMode_mouse_report);
1811
1602 /* 1812 /*
1603 * VT window processing of button press 1813 * VT window processing of button press
1604 */ 1814 */
1605 if (ev.window == TermWin.vt) 1815 if (ev.window == vt)
1606 { 1816 {
1817 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1818 return;
1819
1820#if ISO_14755
1821 // 5.4
1822 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1823 {
1824 iso14755_54 (ev.x, ev.y);
1825 return;
1826 }
1827#endif
1828
1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1829 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1830
1608 if (reportmode) 1831 if (reportmode)
1609 { 1832 {
1610 /* mouse report from vt window */ 1833 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */ 1834 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state; 1835 MEvent.state = ev.state;
1613#ifdef MOUSE_REPORT_DOUBLECLICK 1836#ifdef MOUSE_REPORT_DOUBLECLICK
1614 if (ev.button == MEvent.button && clickintime) 1837 if (ev.button == MEvent.button && clickintime)
1615 { 1838 {
1616 /* same button, within alloted time */ 1839 /* same button, within alloted time */
1617 MEvent.clicks++; 1840 MEvent.clicks++;
1841
1618 if (MEvent.clicks > 1) 1842 if (MEvent.clicks > 1)
1619 { 1843 {
1620 /* only report double clicks */ 1844 /* only report double clicks */
1621 MEvent.clicks = 2; 1845 MEvent.clicks = 2;
1622 mouse_report (ev); 1846 mouse_report (ev);
… …
1641 } 1865 }
1642 else 1866 else
1643 { 1867 {
1644 if (ev.button != MEvent.button) 1868 if (ev.button != MEvent.button)
1645 MEvent.clicks = 0; 1869 MEvent.clicks = 0;
1870
1646 switch (ev.button) 1871 switch (ev.button)
1647 { 1872 {
1648 case Button1: 1873 case Button1:
1874 /* allow meta + click to select rectangular areas */
1875 /* should be done in screen.C */
1876#if ENABLE_FRILLS
1877 selection.rect = !!(ev.state & ModMetaMask);
1878#else
1879 selection.rect = false;
1880#endif
1881
1649 /* allow shift+left click to extend selection */ 1882 /* allow shift+left click to extend selection */
1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1883 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1651 { 1884 {
1652 if (MEvent.button == Button1 && clickintime) 1885 if (MEvent.button == Button1 && clickintime)
1653 selection_rotate (ev.x, ev.y); 1886 selection_rotate (ev.x, ev.y);
1654 else 1887 else
1655 selection_extend (ev.x, ev.y, 1); 1888 selection_extend (ev.x, ev.y, 1);
… …
1670 case Button3: 1903 case Button3:
1671 if (MEvent.button == Button3 && clickintime) 1904 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y); 1905 selection_rotate (ev.x, ev.y);
1673 else 1906 else
1674 selection_extend (ev.x, ev.y, 1); 1907 selection_extend (ev.x, ev.y, 1);
1908
1675 MEvent.button = Button3; 1909 MEvent.button = Button3;
1676 break; 1910 break;
1677 } 1911 }
1678 } 1912 }
1913
1679 MEvent.time = ev.time; 1914 MEvent.time = ev.time;
1680 return; 1915 return;
1681 } 1916 }
1682 1917
1683 /* 1918 /*
… …
1794 case Button3: 2029 case Button3:
1795 if (scrollBar.style != R_SB_XTERM) 2030 if (scrollBar.style != R_SB_XTERM)
1796 { 2031 {
1797 if (scrollbar_above_slider (ev.y)) 2032 if (scrollbar_above_slider (ev.y))
1798# ifdef RXVT_SCROLL_FULL 2033# ifdef RXVT_SCROLL_FULL
1799 scr_page (UP, TermWin.nrow - 1); 2034 scr_page (UP, nrow - 1);
1800# else 2035# else
1801 scr_page (UP, TermWin.nrow / 4); 2036 scr_page (UP, nrow / 4);
1802# endif 2037# endif
1803 else if (scrollbar_below_slider (ev.y)) 2038 else if (scrollbar_below_slider (ev.y))
1804# ifdef RXVT_SCROLL_FULL 2039# ifdef RXVT_SCROLL_FULL
1805 scr_page (DN, TermWin.nrow - 1); 2040 scr_page (DN, nrow - 1);
1806# else 2041# else
1807 scr_page (DN, TermWin.nrow / 4); 2042 scr_page (DN, nrow / 4);
1808# endif 2043# endif
1809 else 2044 else
1810 scrollBar.setMotion (); 2045 scrollBar.setMotion ();
1811 } 2046 }
1812 else 2047 else
1813 { 2048 {
1814 scr_page ((ev.button == Button1 ? DN : UP), 2049 scr_page ((ev.button == Button1 ? DN : UP),
1815 (TermWin.nrow 2050 (nrow
1816 * scrollbar_position (ev.y) 2051 * scrollbar_position (ev.y)
1817 / scrollbar_size ())); 2052 / scrollbar_size ()));
1818 } 2053 }
1819 2054
1820 break; 2055 break;
1821 } 2056 }
1822 } 2057 }
2058
1823 return; 2059 return;
1824 } 2060 }
1825#if MENUBAR
1826 /*
1827 * Menubar window processing of button press
1828 */
1829 if (isMenuBarWindow (ev.window))
1830 menubar_control (ev);
1831#endif
1832} 2061}
1833 2062
1834void 2063void
1835rxvt_term::button_release (XButtonEvent &ev) 2064rxvt_term::button_release (XButtonEvent &ev)
1836{ 2065{
1837 int reportmode = 0; 2066 int reportmode = 0;
1838 2067
1839 csrO = 0; /* reset csr Offset */ 2068 csrO = 0; /* reset csr Offset */
1840 if (!bypass_keystate) 2069 if (!bypass_keystate)
1841 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2070 reportmode = !! (priv_modes & PrivMode_mouse_report);
1842 2071
1843 if (scrollbar_isUpDn ()) 2072 if (scrollbar_isUpDn ())
1844 { 2073 {
1845 scrollBar.setIdle (); 2074 scrollBar.setIdle ();
1846 scrollbar_show (0); 2075 scrollbar_show (0);
1847#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1848 refresh_type &= ~SMOOTH_REFRESH;
1849#endif
1850
1851 } 2076 }
2077
1852#ifdef SELECTION_SCROLLING 2078#ifdef SELECTION_SCROLLING
1853 if (sel_scroll_ev.active) 2079 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop(); 2080 sel_scroll_ev.stop();
1855#endif 2081#endif
2082
1856 if (ev.window == TermWin.vt) 2083 if (ev.window == vt)
1857 { 2084 {
2085 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2086 return;
2087
2088#if ISO_14755
2089 // 5.4
2090 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2091 return;
2092#endif
2093
1858 if (reportmode) 2094 if (reportmode)
1859 { 2095 {
1860 /* mouse report from vt window */ 2096 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */ 2097 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4) 2098 if (ev.button >= 4)
… …
1876 MEvent.button = AnyButton; 2112 MEvent.button = AnyButton;
1877 mouse_report (ev); 2113 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2114#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2115 return;
1880 } 2116 }
2117
1881 /* 2118 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2119 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2120 * when overriding mouse reporting
1884 */ 2121 */
1885 if (PrivateModes & PrivMode_mouse_report 2122 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2123 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2124 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2125 selection_extend (ev.x, ev.y, 0);
1889 2126
1890 switch (ev.button) 2127 switch (ev.button)
1891 { 2128 {
1892 case Button1: 2129 case Button1:
1893 case Button3: 2130 case Button3:
1894 selection_make (ev.time); 2131 selection_make (ev.time);
1895 break; 2132 break;
2133
1896 case Button2: 2134 case Button2:
1897 selection_request (ev.time, ev.x, ev.y); 2135 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2136 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
1898 break; 2137 break;
2138
1899#ifdef MOUSE_WHEEL 2139#ifdef MOUSE_WHEEL
1900 case Button4: 2140 case Button4:
1901 case Button5: 2141 case Button5:
1902 { 2142 {
1903 int i; 2143 int i;
… …
1905 2145
1906 v = ev.button == Button4 ? UP : DN; 2146 v = ev.button == Button4 ? UP : DN;
1907 2147
1908 if (ev.state & ShiftMask) 2148 if (ev.state & ShiftMask)
1909 i = 1; 2149 i = 1;
1910 else if (Options & Opt_mouseWheelScrollPage) 2150 else if (OPTION (Opt_mouseWheelScrollPage))
1911 i = TermWin.nrow - 1; 2151 i = nrow - 1;
1912 else 2152 else
1913 i = 5; 2153 i = 5;
1914 2154
1915# ifdef MOUSE_SLIP_WHEELING 2155# ifdef MOUSE_SLIP_WHEELING
1916 if (ev.state & ControlMask) 2156 if (ev.state & ControlMask)
1917 { 2157 {
1918 mouse_slip_wheel_speed += v ? -1 : 1; 2158 mouse_slip_wheel_speed += v ? -1 : 1;
1919 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2159 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; 2160 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1921 2161
1922 if (slip_wheel_ev.at < NOW) 2162 if (slip_wheel_ev.at < NOW)
1923 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2163 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1924 2164
1925 slip_wheel_ev.start (); 2165 slip_wheel_ev.start ();
1926 } 2166 }
1927 else 2167 else
1928 { 2168 {
1929# endif 2169# endif
1930# ifdef JUMP_MOUSE_WHEEL
1931 scr_page (v, i); 2170 scr_page (v, i);
1932 scr_refresh (SMOOTH_REFRESH);
1933 scrollbar_show (1); 2171 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 2172# ifdef MOUSE_SLIP_WHEELING
1943 } 2173 }
1944#endif 2174# endif
1945 } 2175 }
1946 break; 2176 break;
1947#endif 2177#endif
1948 } 2178 }
1949 } 2179 }
1950#ifdef MENUBAR
1951 else if (isMenuBarWindow (ev.window))
1952 menubar_control (ev);
1953#endif
1954} 2180}
1955 2181
1956#ifdef TRANSPARENT 2182#ifdef TRANSPARENT
1957#if TINTING 2183#if TINTING
1958/* taken from aterm-0.4.2 */ 2184/* taken from aterm-0.4.2 */
1959 2185
1960typedef uint32_t RUINT32T; 2186typedef uint32_t RUINT32T;
1961 2187
1962void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2188void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
1963{ 2189{
1964 int sh_r, sh_g, sh_b; 2190 int sh_r, sh_g, sh_b;
1965 RUINT32T mask_r, mask_g, mask_b; 2191 RUINT32T mask_r, mask_g, mask_b;
1966 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2192 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1967 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2193 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1968 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2194 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1969 int i; 2195 int i;
1970 2196
1971 Visual* visual = display->visual; 2197 Visual *visual = term->visual;
1972 2198
1973 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2199 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1974 2200
1975 /* for convenience */ 2201 /* for convenience */
1976 mask_r = visual->red_mask; 2202 mask_r = visual->red_mask;
… …
2200 Pixmap rootpixmap = None; 2426 Pixmap rootpixmap = None;
2201 XWindowAttributes wattr, wrootattr; 2427 XWindowAttributes wattr, wrootattr;
2202 2428
2203 pchanged = 0; 2429 pchanged = 0;
2204 2430
2205 if (!(Options & Opt_transparent)) 2431 if (!OPTION (Opt_transparent))
2206 return pchanged; /* Don't try any more */ 2432 return pchanged; /* Don't try any more */
2207 2433
2208 XGetWindowAttributes (display->display, display->root, &wrootattr); 2434 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2209 rootdepth = wrootattr.depth; 2435 rootdepth = wrootattr.depth;
2210 2436
2211 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2437 XGetWindowAttributes (xdisp, parent[0], &wattr);
2212 2438
2213 if (rootdepth != wattr.depth) 2439 if (rootdepth != wattr.depth)
2214 { 2440 {
2215 if (am_transparent) 2441 if (am_transparent)
2216 { 2442 {
2217 pchanged = 1; 2443 pchanged = 1;
2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2444 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2219 am_transparent = am_pixmap_trans = 0; 2445 am_transparent = am_pixmap_trans = 0;
2220 } 2446 }
2221 2447
2222 return pchanged; /* Don't try any more */ 2448 return pchanged; /* Don't try any more */
2223 } 2449 }
2224 2450
2225 /* Get all X ops out of the queue so that our information is up-to-date. */ 2451 /* Get all X ops out of the queue so that our information is up-to-date. */
2226 XSync (display->display, False); 2452 XSync (xdisp, False);
2227 2453
2228 /* 2454 /*
2229 * Make the frame window set by the window manager have 2455 * Make the frame window set by the window manager have
2230 * the root background. Some window managers put multiple nested frame 2456 * the root background. Some window managers put multiple nested frame
2231 * windows for each client, so we have to take care about that. 2457 * windows for each client, so we have to take care about that.
2232 */ 2458 */
2233 i = (xa[XA_XROOTPMAPID] 2459 i = (xa[XA_XROOTPMAP_ID]
2234 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2460 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2235 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2461 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2236 &nitems, &bytes_after, &prop) == Success); 2462 &nitems, &bytes_after, &prop) == Success);
2237 2463
2238 if (!i || prop == NULL) 2464 if (!i || prop == NULL)
2239 i = (xa[XA_XSETROOTID] 2465 i = (xa[XA_ESETROOT_PMAP_ID]
2240 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2466 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2241 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2242 &nitems, &bytes_after, &prop) == Success); 2468 &nitems, &bytes_after, &prop) == Success);
2243 2469
2244 if (!i || prop == NULL 2470 if (!i || prop == NULL
2245#if TINTING 2471#if TINTING
2246 || !rs[Rs_color + Color_tint] 2472 || !ISSET_PIXCOLOR (Color_tint)
2247#endif 2473#endif
2248 ) 2474 )
2249 have_pixmap = 0; 2475 have_pixmap = 0;
2250 else 2476 else
2251 { 2477 {
… …
2264 Window cr; 2490 Window cr;
2265 XImage *image; 2491 XImage *image;
2266 GC gc; 2492 GC gc;
2267 XGCValues gcvalue; 2493 XGCValues gcvalue;
2268 2494
2269 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2495 XTranslateCoordinates (xdisp, parent[0], display->root,
2270 0, 0, &sx, &sy, &cr); 2496 0, 0, &sx, &sy, &cr);
2271 nw = (unsigned int)szHint.width; 2497 nw = (unsigned int)szHint.width;
2272 nh = (unsigned int)szHint.height; 2498 nh = (unsigned int)szHint.height;
2273 nx = ny = 0; 2499 nx = ny = 0;
2274 2500
… …
2284 nh += sy; 2510 nh += sy;
2285 ny = -sy; 2511 ny = -sy;
2286 sy = 0; 2512 sy = 0;
2287 } 2513 }
2288 2514
2289 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2515 min_it (nw, (unsigned int) (wrootattr.width - sx));
2290 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2516 min_it (nh, (unsigned int) (wrootattr.height - sy));
2517
2518 XSync (xdisp, False);
2291 allowedxerror = -1; 2519 allowedxerror = -1;
2292 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2520 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2293 2521
2294 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2522 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2295 /* XXX: may need a delay here? */ 2523 /* XXX: may need a delay here? */
2296 allowedxerror = 0; 2524 allowedxerror = 0;
2297 2525
2298 if (image == NULL) 2526 if (image == NULL)
2299 { 2527 {
2300 if (am_transparent && am_pixmap_trans) 2528 if (am_transparent && am_pixmap_trans)
2301 { 2529 {
2302 pchanged = 1; 2530 pchanged = 1;
2303 if (TermWin.pixmap != None) 2531 if (pixmap != None)
2304 { 2532 {
2305 XFreePixmap (display->display, TermWin.pixmap); 2533 XFreePixmap (xdisp, pixmap);
2306 TermWin.pixmap = None; 2534 pixmap = None;
2307 } 2535 }
2308 } 2536 }
2309 2537
2310 am_pixmap_trans = 0; 2538 am_pixmap_trans = 0;
2311 } 2539 }
2312 else 2540 else
2313 { 2541 {
2314 if (TermWin.pixmap != None) 2542 if (pixmap != None)
2315 XFreePixmap (display->display, TermWin.pixmap); 2543 XFreePixmap (xdisp, pixmap);
2316 2544
2317#if TINTING 2545#if TINTING
2318 if (ISSET_PIXCOLOR (Color_tint)) 2546 if (ISSET_PIXCOLOR (Color_tint))
2319 { 2547 {
2320 unsigned short rm, gm, bm;
2321 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2322 2549
2550 rgba c;
2323 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2551 pix_colors_focused [Color_tint].get (c);
2324 2552
2325 ShadeXImage (display, image, shade, rm, gm, bm); 2553 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2326 } 2554 }
2327#endif 2555#endif
2328 2556
2329 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2557 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); 2558 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2332 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2559 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2333 nx, ny, image->width, image->height); 2560 nx, ny, image->width, image->height);
2334 XFreeGC (display->display, gc); 2561 XFreeGC (xdisp, gc);
2335 XDestroyImage (image); 2562 XDestroyImage (image);
2336 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2563 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2337 XClearWindow (display->display, TermWin.parent[0]); 2564 XClearWindow (xdisp, parent[0]);
2338 2565
2339 if (!am_transparent || !am_pixmap_trans) 2566 if (!am_transparent || !am_pixmap_trans)
2340 pchanged = 1; 2567 pchanged = 1;
2341 2568
2342 am_transparent = am_pixmap_trans = 1; 2569 am_transparent = am_pixmap_trans = 1;
2343 } 2570 }
2344 } 2571 }
2345 2572
2346 if (!am_pixmap_trans) 2573 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2575 else
2347 { 2576 {
2348 unsigned int n; 2577 unsigned int n;
2349 /* 2578 /*
2350 * InheritPixmap transparency 2579 * InheritPixmap transparency
2351 */ 2580 */
2352 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2353 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2354 { 2582 {
2355 oldp = TermWin.parent[i]; 2583 oldp = parent[i];
2356 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2584 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2357 &TermWin.parent[i], &list, &n);
2358 XFree (list); 2585 XFree (list);
2359 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2360 2586
2361 if (TermWin.parent[i] == display->root) 2587 if (parent[i] == display->root)
2362 { 2588 {
2363 if (oldp != None) 2589 if (oldp != None)
2364 pchanged = 1; 2590 pchanged = 1;
2365 2591
2366 break; 2592 break;
2367 } 2593 }
2368 2594
2369 if (oldp != TermWin.parent[i]) 2595 if (oldp != parent[i])
2370 pchanged = 1; 2596 pchanged = 1;
2371 } 2597 }
2372 2598
2373 n = 0; 2599 n = 0;
2374 2600
2375 if (pchanged) 2601 if (pchanged)
2376 {
2377 for (; n < (unsigned int)i; n++) 2602 for (; n < (unsigned int)i; n++)
2378 { 2603 {
2379 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2604 XGetWindowAttributes (xdisp, parent[n], &wattr);
2380 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2605
2381 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2606 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2382 { 2607 {
2383 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2608 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2384 break; 2609 break;
2385 } 2610 }
2386 } 2611 }
2612
2613 if (n > (sizeof (parent) / sizeof (parent[0])))
2387 } 2614 {
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]); 2615 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2616 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2394 am_transparent = 0; 2617 am_transparent = 0;
2395 /* XXX: also turn off Opt_transparent? */ 2618 /* XXX: also turn off Opt_transparent? */
2396 } 2619 }
2397 else 2620 else
2398 { 2621 {
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++) 2622 for (n = 0; n < (unsigned int)i; n++)
2406 { 2623 {
2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2624 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2408 XClearWindow (display->display, TermWin.parent[n]); 2625 XClearWindow (xdisp, parent[n]);
2409 } 2626 }
2410 2627
2411 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2412 am_transparent = 1; 2629 am_transparent = 1;
2413 } 2630 }
2414 2631
2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2632 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2416 TermWin.parent[i] = None; 2633 parent[i] = None;
2417 } 2634 }
2418 2635
2419 // this is experimental
2420 if (scrollBar.win) 2636 if (scrollBar.win)
2421 { 2637 {
2422 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2638 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2423 XClearWindow (display->display, scrollBar.win);
2424 scrollBar.setIdle (); 2639 scrollBar.setIdle ();
2425 scrollbar_show (0); 2640 scrollbar_show (0);
2426 } 2641 }
2427 2642
2643 if (am_transparent)
2644 {
2645 want_refresh = want_full_refresh = 1;
2646 if (am_pixmap_trans)
2647 flush ();
2648 }
2649
2428 return pchanged; 2650 return pchanged;
2429} 2651}
2430#endif 2652#endif
2431 2653
2432/*}}} */ 2654/*}}} */
2433 2655
2434bool 2656bool
2435rxvt_term::cmd_parse () 2657rxvt_term::cmd_parse ()
2436{ 2658{
2437 bool flag = false; 2659 bool flag = false;
2438 unicode_t ch = NOCHAR; 2660 wchar_t ch = NOCHAR;
2439 unsigned char *seq_begin; // remember start of esc-sequence here 2661 char *seq_begin; // remember start of esc-sequence here
2440 2662
2441 for (;;) 2663 for (;;)
2442 { 2664 {
2443 if (ch == NOCHAR) 2665 if (ch == NOCHAR)
2444 { 2666 {
2445 seq_begin = cmdbuf_ptr; 2667 seq_begin = cmdbuf_ptr;
2446 ch = next_char (); 2668 ch = next_char ();
2447 }
2448 2669
2449 if (ch == NOCHAR) // TODO: improve 2670 if (ch == NOCHAR)
2450 break; 2671 break;
2672 }
2451 2673
2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2674 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2453 { 2675 {
2676 if (!seen_input)
2677 {
2678 seen_input = 1;
2679 // many badly-written programs (e.g. jed) contain a race condition:
2680 // they first read the screensize and then install a SIGWINCH handler.
2681 // some window managers resize the window early, and these programs
2682 // then sometimes get the size wrong.
2683 // unfortunately other programs are even more buggy and dislike
2684 // being sent SIGWINCH, so only do it when we were in fact being
2685 // resized.
2686 if (seen_resize && cmd_pid)
2687 kill (-cmd_pid, SIGWINCH);
2688 }
2689
2454 /* Read a text string from the input buffer */ 2690 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ]; 2691 wchar_t buf[UBUFSIZ];
2456 bool refreshnow = false; 2692 bool refreshnow = false;
2457 int nlines = 0; 2693 int nlines = 0;
2458 unicode_t *str = buf; 2694 wchar_t *str = buf;
2695 wchar_t *eol = str + min (ncol, UBUFSIZ);
2459 2696
2460 for (;;) 2697 for (;;)
2461 { 2698 {
2462 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2699 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2463 break; 2700 break;
2464 2701
2465 *str++ = ch; 2702 *str++ = ch;
2466 2703
2467 if (ch == C0_LF) 2704 if (ch == C0_LF || str >= eol)
2468 { 2705 {
2706 if (ch == C0_LF)
2469 nlines++; 2707 nlines++;
2708
2470 refresh_count++; 2709 refresh_count++;
2471 2710
2472 if (!(Options & Opt_jumpScroll) 2711 if (!OPTION (Opt_jumpScroll)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2712 || (refresh_count >= refresh_limit * (nrow - 1)))
2474 { 2713 {
2475 refreshnow = true; 2714 refreshnow = true;
2715 refresh_count = 0;
2476 ch = NOCHAR; 2716 ch = NOCHAR;
2477 break; 2717 break;
2478 } 2718 }
2479 2719
2480 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2720 // scr_add_lines only works for nlines <= nrow - 1.
2481 if (nlines >= TermWin.nrow - 1) 2721 if (nlines >= nrow - 1)
2482 { 2722 {
2723 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2724 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2483 scr_add_lines (buf, nlines, str - buf); 2725 scr_add_lines (buf, str - buf, nlines);
2726
2484 nlines = 0; 2727 nlines = 0;
2485 str = buf; 2728 str = buf;
2729 eol = str + min (ncol, UBUFSIZ);
2486 } 2730 }
2487 }
2488 2731
2489 if (str >= buf + UBUFSIZ) 2732 if (str >= eol)
2490 { 2733 {
2734 if (eol >= buf + UBUFSIZ)
2735 {
2491 ch = NOCHAR; 2736 ch = NOCHAR;
2492 break; 2737 break;
2738 }
2739 else
2740 eol = min (eol + ncol, buf + UBUFSIZ);
2741 }
2742
2493 } 2743 }
2494 2744
2495 seq_begin = cmdbuf_ptr; 2745 seq_begin = cmdbuf_ptr;
2496 ch = next_char (); 2746 ch = next_char ();
2497 } 2747 }
2498 2748
2749 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2750 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2499 scr_add_lines (buf, nlines, str - buf); 2751 scr_add_lines (buf, str - buf, nlines);
2500 2752
2501 /* 2753 /*
2502 * If there have been a lot of new lines, then update the screen 2754 * 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. 2755 * 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 2756 * the number of pages between refreshes is refresh_limit, which
2505 * is incremented here because we must be doing flat-out scrolling. 2757 * is incremented here because we must be doing flat-out scrolling.
2506 */ 2758 */
2507 if (refreshnow) 2759 if (refreshnow)
2508 { 2760 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2761 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++; 2762 refresh_limit++;
2511 else 2763 else
2512 { 2764 {
2513 flag = true; 2765 flag = true;
2514 scr_refresh (refresh_type); 2766 scr_refresh ();
2767 want_refresh = 1;
2515 } 2768 }
2516 } 2769 }
2517 2770
2518 } 2771 }
2519 else 2772 else
… …
2534 } 2787 }
2535 2788
2536 return flag; 2789 return flag;
2537} 2790}
2538 2791
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 2792// read the next character
2549unicode_t 2793wchar_t
2550rxvt_term::next_char () 2794rxvt_term::next_char () NOTHROW
2551{ 2795{
2552 while (cmdbuf_ptr < cmdbuf_endp) 2796 while (cmdbuf_ptr < cmdbuf_endp)
2553 { 2797 {
2554 // assume 7-bit to be ascii ALWAYS 2798 // assume 7-bit to be ascii ALWAYS
2555 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2799 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2556 return *cmdbuf_ptr++; 2800 return *cmdbuf_ptr++;
2557 2801
2558 wchar_t wc; 2802 wchar_t wc;
2559 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2803 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2560 2804
2561 if (len == (size_t)-2) 2805 if (len == (size_t)-2)
2562 { 2806 {
2563 // the mbstate stores incomplete sequences. didn't know this :/ 2807 // the mbstate stores incomplete sequences. didn't know this :/
2564 cmdbuf_ptr = cmdbuf_endp; 2808 cmdbuf_ptr = cmdbuf_endp;
2565 break; 2809 break;
2566 } 2810 }
2567 2811
2568 if (len == (size_t)-1) 2812 if (len == (size_t)-1)
2569 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2813 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2570 2814
2571 // assume wchar == unicode 2815 // assume wchar == unicode
2572 cmdbuf_ptr += len; 2816 cmdbuf_ptr += len;
2573 return wc; 2817 return wc & UNICODE_MASK;
2574 } 2818 }
2575 2819
2576 return NOCHAR; 2820 return NOCHAR;
2577} 2821}
2822
2823// read the next octet
2824uint32_t
2825rxvt_term::next_octet () NOTHROW
2826{
2827 return cmdbuf_ptr < cmdbuf_endp
2828 ? (unsigned char)*cmdbuf_ptr++
2829 : NOCHAR;
2830}
2831
2832static class out_of_input out_of_input;
2578 2833
2579/* rxvt_cmd_getc () - Return next input character */ 2834/* rxvt_cmd_getc () - Return next input character */
2580/* 2835/*
2581 * Return the next input character after first passing any keyboard input 2836 * Return the next input character after first passing any keyboard input
2582 * to the command. 2837 * to the command.
2583 */ 2838 */
2584unicode_t 2839wchar_t
2585rxvt_term::cmd_getc () 2840rxvt_term::cmd_getc () THROW ((class out_of_input))
2586{ 2841{
2587 unicode_t c = next_char (); 2842 wchar_t c = next_char ();
2588 2843
2589 if (c == NOCHAR) 2844 if (c == NOCHAR)
2590 throw out_of_input; 2845 throw out_of_input;
2591 2846
2592 return c; 2847 return c;
2593} 2848}
2594 2849
2595unicode_t 2850uint32_t
2596rxvt_term::cmd_get8 () 2851rxvt_term::cmd_get8 () THROW ((class out_of_input))
2597{ 2852{
2598 unicode_t c = next_octet (); 2853 uint32_t c = next_octet ();
2599 2854
2600 if (c == NOCHAR) 2855 if (c == NOCHAR)
2601 throw out_of_input; 2856 throw out_of_input;
2602 2857
2603 return c; 2858 return c;
… …
2703 case C0_ESC: 2958 case C0_ESC:
2704 process_escape_seq (); 2959 process_escape_seq ();
2705 break; 2960 break;
2706 case C0_ENQ: /* terminal Status */ 2961 case C0_ENQ: /* terminal Status */
2707 if (rs[Rs_answerbackstring]) 2962 if (rs[Rs_answerbackstring])
2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2963 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2709 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2710 else 2964 else
2711 tt_write ((unsigned char *)VT100_ANS, 2965 tt_write (VT100_ANS, strlen (VT100_ANS));
2712 (unsigned int)STRLEN (VT100_ANS));
2713 break; 2966 break;
2714 case C0_BEL: /* bell */ 2967 case C0_BEL: /* bell */
2715 scr_bell (); 2968 scr_bell ();
2716 break; 2969 break;
2717 case C0_BS: /* backspace */ 2970 case C0_BS: /* backspace */
… …
2816void 3069void
2817rxvt_term::process_escape_seq () 3070rxvt_term::process_escape_seq ()
2818{ 3071{
2819 unicode_t ch = cmd_getc (); 3072 unicode_t ch = cmd_getc ();
2820 3073
2821 if (PrivateModes & PrivMode_vt52) 3074 if (priv_modes & PrivMode_vt52)
2822 { 3075 {
2823 process_escape_vt52 (ch); 3076 process_escape_vt52 (ch);
2824 return; 3077 return;
2825 } 3078 }
2826 3079
… …
2841 scr_charset_set (2, (unsigned int)cmd_getc ()); 3094 scr_charset_set (2, (unsigned int)cmd_getc ());
2842 break; 3095 break;
2843 case '+': 3096 case '+':
2844 scr_charset_set (3, (unsigned int)cmd_getc ()); 3097 scr_charset_set (3, (unsigned int)cmd_getc ());
2845 break; 3098 break;
2846#ifndef NO_FRILLS 3099#if !ENABLE_MINIMAL
2847 case '6': 3100 case '6':
2848 scr_backindex (); 3101 scr_backindex ();
2849 break; 3102 break;
2850#endif 3103#endif
2851 case '7': 3104 case '7':
2852 scr_cursor (SAVE); 3105 scr_cursor (SAVE);
2853 break; 3106 break;
2854 case '8': 3107 case '8':
2855 scr_cursor (RESTORE); 3108 scr_cursor (RESTORE);
2856 break; 3109 break;
2857#ifndef NO_FRILLS 3110#if !ENABLE_MINIMAL
2858 case '9': 3111 case '9':
2859 scr_forwardindex (); 3112 scr_forwardindex ();
2860 break; 3113 break;
2861#endif 3114#endif
2862 case '=': 3115 case '=':
… …
2872 break; 3125 break;
2873 3126
2874 /* 8.3.87: NEXT LINE */ 3127 /* 8.3.87: NEXT LINE */
2875 case C1_NEL: /* ESC E */ 3128 case C1_NEL: /* ESC E */
2876 { 3129 {
2877 unicode_t nlcr[] = { C0_LF, C0_CR }; 3130 wchar_t nlcr[] = { C0_LF, C0_CR };
2878 scr_add_lines (nlcr, 1, 2); 3131 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2879 } 3132 }
2880 break; 3133 break;
2881 3134
2882 /* kidnapped escape sequence: Should be 8.3.48 */ 3135 /* kidnapped escape sequence: Should be 8.3.48 */
2883 case C1_ESA: /* ESC G */ 3136 case C1_ESA: /* ESC G */
… …
2905 process_dcs_seq (); 3158 process_dcs_seq ();
2906 break; 3159 break;
2907 3160
2908 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3161 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2909 case C1_SCI: /* ESC Z */ 3162 case C1_SCI: /* ESC Z */
2910 tt_write ((const unsigned char *)ESCZ_ANSWER, 3163 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2911 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2912 break; /* steal obsolete ESC [ c */ 3164 break; /* steal obsolete ESC [ c */
2913 3165
2914 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3166 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2915 case C1_CSI: /* ESC [ */ 3167 case C1_CSI: /* ESC [ */
2916 process_csi_seq (); 3168 process_csi_seq ();
… …
3025 ndef = get_byte_array_bit (csi_defaults, i); 3277 ndef = get_byte_array_bit (csi_defaults, i);
3026 for (p = 0; p < nargs; p++) 3278 for (p = 0; p < nargs; p++)
3027 if (arg[p] == -1) 3279 if (arg[p] == -1)
3028 arg[p] = ndef; 3280 arg[p] = ndef;
3029 3281
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 /* 3282 /*
3038 * private mode handling 3283 * private mode handling
3039 */ 3284 */
3040 if (priv) 3285 if (priv)
3041 { 3286 {
3042 switch (priv) 3287 switch (priv)
3043 { 3288 {
3044 case '>': 3289 case '>':
3045 if (ch == CSI_DA) /* secondary device attributes */ 3290 if (ch == CSI_DA) /* secondary device attributes */
3291 {
3292 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3293 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3294 //
3295 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3296 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3297 // that we do not support xterm mouse reporting (should be 95 when we do).
3298 //
3046 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3299 tt_printf ("\033[>%d;94;0c", 'U');
3300 }
3047 break; 3301 break;
3048 case '?': 3302 case '?':
3049 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3303 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3050 process_terminal_mode (ch, priv, nargs, arg); 3304 process_terminal_mode (ch, priv, nargs, arg);
3051 break; 3305 break;
… …
3156 3410
3157 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3411 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3158 arg[0] = -arg[0]; 3412 arg[0] = -arg[0];
3159 /* FALLTHROUGH */ 3413 /* FALLTHROUGH */
3160 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3414 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3161 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3415 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3162 break; 3416 break;
3163 3417
3164 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3418 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3165 tt_write ((const unsigned char *)VT100_ANS, 3419 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3166 (unsigned int) (sizeof (VT100_ANS) - 1));
3167 break; 3420 break;
3168 3421
3169 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3422 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3170 process_sgr_mode (nargs, arg); 3423 process_sgr_mode (nargs, arg);
3171 break; 3424 break;
… …
3178 break; 3431 break;
3179 case 6: /* CPR requested */ 3432 case 6: /* CPR requested */
3180 scr_report_position (); 3433 scr_report_position ();
3181 break; 3434 break;
3182 case 7: /* unofficial extension */ 3435 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure) 3436 if (OPTION (Opt_insecure))
3184 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3437 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3185 break; 3438 break;
3186 case 8: /* unofficial extension */ 3439 case 8: /* unofficial extension */
3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3440 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3188 break; 3441 break;
3189 } 3442 }
… …
3225 break; 3478 break;
3226 3479
3227 case CSI_RM: /* 8.3.107: RESET MODE */ 3480 case CSI_RM: /* 8.3.107: RESET MODE */
3228 if (arg[0] == 4) 3481 if (arg[0] == 4)
3229 scr_insert_mode (0); 3482 scr_insert_mode (0);
3483 else if (arg[0] == 20)
3484 priv_modes &= ~PrivMode_LFNL;
3230 break; 3485 break;
3231 3486
3232 case CSI_SM: /* 8.3.126: SET MODE */ 3487 case CSI_SM: /* 8.3.126: SET MODE */
3233 if (arg[0] == 4) 3488 if (arg[0] == 4)
3234 scr_insert_mode (1); 3489 scr_insert_mode (1);
3490 else if (arg[0] == 20)
3491 priv_modes |= PrivMode_LFNL;
3235 break; 3492 break;
3236 3493
3237 /* 3494 /*
3238 * PRIVATE USE beyond this point. All CSI_7? sequences here 3495 * PRIVATE USE beyond this point. All CSI_7? sequences here
3239 */ 3496 */
… …
3251 break; 3508 break;
3252 case CSI_75: 3509 case CSI_75:
3253 scr_cursor (RESTORE); 3510 scr_cursor (RESTORE);
3254 break; 3511 break;
3255 3512
3256#ifndef NO_FRILLS 3513#if !ENABLE_MINIMAL
3257 case CSI_74: 3514 case CSI_74:
3258 process_window_ops (arg, nargs); 3515 process_window_ops (arg, nargs);
3259 break; 3516 break;
3260#endif 3517#endif
3261 3518
… …
3268 break; 3525 break;
3269 } 3526 }
3270} 3527}
3271/*}}} */ 3528/*}}} */
3272 3529
3273#ifndef NO_FRILLS 3530#if !ENABLE_MINIMAL
3274/* ARGSUSED */ 3531/* ARGSUSED */
3275void 3532void
3276rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3533rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3277{ 3534{
3278 int x, y; 3535 int x, y;
3279 XWindowAttributes wattr; 3536 XWindowAttributes wattr;
3280 Window wdummy; 3537 Window wdummy;
3538
3539 dLocal (Display *, xdisp);
3281 3540
3282 if (nargs == 0) 3541 if (nargs == 0)
3283 return; 3542 return;
3284 3543
3285 switch (args[0]) 3544 switch (args[0])
3286 { 3545 {
3287 /* 3546 /*
3288 * commands 3547 * commands
3289 */ 3548 */
3290 case 1: /* deiconify window */ 3549 case 1: /* deiconify window */
3291 XMapWindow (display->display, TermWin.parent[0]); 3550 XMapWindow (xdisp, parent[0]);
3292 break; 3551 break;
3293 case 2: /* iconify window */ 3552 case 2: /* iconify window */
3294 XIconifyWindow (display->display, TermWin.parent[0], 3553 XIconifyWindow (xdisp, parent[0], display->screen);
3295 DefaultScreen (display->display));
3296 break; 3554 break;
3297 case 3: /* set position (pixels) */ 3555 case 3: /* set position (pixels) */
3298 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3556 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3299 break; 3557 break;
3300 case 4: /* set size (pixels) */ 3558 case 4: /* set size (pixels) */
3301 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3559 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3302 break; 3560 break;
3303 case 5: /* raise window */ 3561 case 5: /* raise window */
3304 XRaiseWindow (display->display, TermWin.parent[0]); 3562 XRaiseWindow (xdisp, parent[0]);
3305 break; 3563 break;
3306 case 6: /* lower window */ 3564 case 6: /* lower window */
3307 XLowerWindow (display->display, TermWin.parent[0]); 3565 XLowerWindow (xdisp, parent[0]);
3308 break; 3566 break;
3309 case 7: /* refresh window */ 3567 case 7: /* refresh window */
3310 scr_touch (true); 3568 scr_touch (true);
3311 break; 3569 break;
3312 case 8: /* set size (chars) */ 3570 case 8: /* set size (chars) */
3313 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3571 set_widthheight ((unsigned int) (args[2] * fwidth),
3314 (unsigned int) (args[1] * TermWin.fheight)); 3572 (unsigned int) (args[1] * fheight));
3315 break; 3573 break;
3316 3574
3317 //case 9: NYI, TODO, restore maximized window or maximize window 3575 //case 9: NYI, TODO, restore maximized window or maximize window
3318 default: 3576 default:
3319 if (args[0] >= 24) /* set height (chars) */ 3577 if (args[0] >= 24) /* set height (chars) */
3320 set_widthheight ((unsigned int)TermWin.width, 3578 set_widthheight ((unsigned int)width,
3321 (unsigned int) (args[1] * TermWin.fheight)); 3579 (unsigned int) (args[1] * fheight));
3322 break; 3580 break;
3323
3324 3581
3325 /* 3582 /*
3326 * reports - some output format copied from XTerm 3583 * reports - some output format copied from XTerm
3327 */ 3584 */
3328 case 11: /* report window state */ 3585 case 11: /* report window state */
3329 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3586 XGetWindowAttributes (xdisp, parent[0], &wattr);
3330 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3587 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3331 break; 3588 break;
3332 case 13: /* report window position */ 3589 case 13: /* report window position */
3333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3590 XGetWindowAttributes (xdisp, parent[0], &wattr);
3334 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3591 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3335 -wattr.border_width, -wattr.border_width, 3592 -wattr.border_width, -wattr.border_width,
3336 &x, &y, &wdummy); 3593 &x, &y, &wdummy);
3337 tt_printf ("\033[3;%d;%dt", x, y); 3594 tt_printf ("\033[3;%d;%dt", x, y);
3338 break; 3595 break;
3339 case 14: /* report window size (pixels) */ 3596 case 14: /* report window size (pixels) */
3340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3597 XGetWindowAttributes (xdisp, parent[0], &wattr);
3341 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3598 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3342 break; 3599 break;
3343 case 18: /* report text area size (chars) */ 3600 case 18: /* report text area size (chars) */
3344 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3601 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3345 break; 3602 break;
3346 case 19: /* report window size (chars) */ 3603 case 19: /* report window size (chars) */
3347 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3604 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3348 break; 3605 break;
3349 case 20: /* report icon label */ 3606 case 20: /* report icon label */
3350 { 3607 {
3351 char *s; 3608 char *s;
3352 XGetIconName (display->display, TermWin.parent[0], &s); 3609 XGetIconName (xdisp, parent[0], &s);
3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3610 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s); 3611 XFree (s);
3355 } 3612 }
3356 break; 3613 break;
3357 case 21: /* report window title */ 3614 case 21: /* report window title */
3358 { 3615 {
3359 char *s; 3616 char *s;
3360 XFetchName (display->display, TermWin.parent[0], &s); 3617 XFetchName (xdisp, parent[0], &s);
3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3618 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s); 3619 XFree (s);
3363 } 3620 }
3364 break; 3621 break;
3365 } 3622 }
3366} 3623}
… …
3369/*----------------------------------------------------------------------*/ 3626/*----------------------------------------------------------------------*/
3370/* 3627/*
3371 * get input up until STRING TERMINATOR (or BEL) 3628 * get input up until STRING TERMINATOR (or BEL)
3372 * ends_how is terminator used. returned input must be free()'d 3629 * ends_how is terminator used. returned input must be free()'d
3373 */ 3630 */
3374unsigned char * 3631char *
3375rxvt_term::get_to_st (unicode_t &ends_how) 3632rxvt_term::get_to_st (unicode_t &ends_how)
3376{ 3633{
3377 unicode_t prev = 0, ch; 3634 unicode_t ch;
3635 bool seen_esc = false;
3378 unsigned int n = 0; 3636 unsigned int n = 0;
3379 unsigned char *s;
3380 unsigned char string[STRING_MAX]; 3637 wchar_t string[STRING_MAX];
3381 3638
3382 while ((ch = cmd_getc ()) != NOCHAR) 3639 while ((ch = cmd_getc ()) != NOCHAR)
3383 { 3640 {
3384 if (prev == C0_ESC) 3641 if (seen_esc)
3385 { 3642 {
3386 if (ch == 0x5c) /* 7bit ST */ 3643 if (ch == 0x5c) /* 7bit ST */
3387 break; 3644 break;
3388 else 3645 else
3389 return NULL; 3646 return NULL;
3390 } 3647 }
3648 else if (ch == C0_ESC)
3649 {
3650 seen_esc = true;
3651 continue;
3652 }
3391 else if (ch == C0_BEL || ch == CHAR_ST) 3653 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break; 3654 break;
3393 else if (ch < 0x20) 3655 else if (ch < 0x20)
3394 return NULL; /* other control character - exit */ 3656 return NULL; /* other control character - exit */
3395 3657
3396 if (n >= sizeof (string) - 1) 3658 seen_esc = false;
3659
3660 if (n >= STRING_MAX - 1)
3397 // stop at some sane length 3661 // stop at some sane length
3398 return NULL; 3662 return NULL;
3399 3663
3400 if (ch == C0_SYN) 3664 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 (); 3665 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else 3666 else
3406 string[n++] = prev = ch; 3667 string[n++] = ch;
3407 } 3668 }
3408 3669
3409 string[n++] = '\0'; 3670 string[n++] = '\0';
3410 3671
3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3412 return NULL;
3413
3414 ends_how = (ch == 0x5c ? C0_ESC : ch); 3672 ends_how = (ch == 0x5c ? C0_ESC : ch);
3415 STRNCPY (s, string, n); 3673
3416 return s; 3674 return rxvt_wcstombs (string);
3417} 3675}
3418 3676
3419/*----------------------------------------------------------------------*/ 3677/*----------------------------------------------------------------------*/
3420/* 3678/*
3421 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3679 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3422 */ 3680 */
3423void 3681void
3424rxvt_term::process_dcs_seq () 3682rxvt_term::process_dcs_seq ()
3425{ 3683{
3426 unsigned char *s; 3684 char *s;
3427 unicode_t eh; 3685 unicode_t eh;
3428 3686
3429 /* 3687 /*
3430 * Not handled yet 3688 * Not handled yet
3431 */ 3689 */
… …
3450 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3708 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3451 arg = arg * 10 + (ch - '0'); 3709 arg = arg * 10 + (ch - '0');
3452 3710
3453 if (ch == ';') 3711 if (ch == ';')
3454 { 3712 {
3455 unsigned char *s = get_to_st (eh); 3713 char *s = get_to_st (eh);
3456 3714
3457 if (s) 3715 if (s)
3458 { 3716 {
3459 process_xterm_seq (arg, (char *)s, eh); 3717 process_xterm_seq (arg, s, eh);
3460 free (s); 3718 free (s);
3461 } 3719 }
3462 } 3720 }
3463} 3721}
3464 3722
3465void 3723void
3466rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3724rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3467{ 3725{
3468 if (str[0] == '?' && !str[1]) 3726 if (str[0] == '?' && !str[1])
3469 { 3727 {
3470 unsigned short r, g, b; 3728 rgba c;
3471 PixColorsFocused[color].get (display, r, g, b); 3729 pix_colors_focused[color].get (c);
3730
3731#if XFT
3732 if (c.a != rgba::MAX_CC)
3733 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3734 else
3735#endif
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3736 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3473 } 3737 }
3474 else 3738 else
3475 set_window_color (color, str); 3739 set_window_color (color, str);
3476} 3740}
3477 3741
3478/* 3742/*
3479 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3743 * 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 */ 3744 */
3503void 3745void
3504rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3746rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3505{ 3747{
3506 int changed = 0;
3507 int color; 3748 int color;
3508 char *buf, *name; 3749 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1]; 3750 bool query = str[0] == '?' && !str[1];
3751 int saveop = op;
3752
3753 dLocal (Display *, xdisp);
3510 3754
3511 assert (str != NULL); 3755 assert (str != NULL);
3512 switch (op) 3756 switch (op)
3513 { 3757 {
3514 case XTerm_name: 3758 case XTerm_name:
… …
3521 set_title (str); 3765 set_title (str);
3522 break; 3766 break;
3523 case XTerm_property: 3767 case XTerm_property:
3524 if (str[0] == '?') 3768 if (str[0] == '?')
3525 { 3769 {
3526 Atom prop = XInternAtom (display->display, str + 1, True); 3770 Atom prop = display->atom (str + 1);
3527 Atom actual_type; 3771 Atom actual_type;
3528 int actual_format; 3772 int actual_format;
3529 unsigned long nitems; 3773 unsigned long nitems;
3530 unsigned long bytes_after; 3774 unsigned long bytes_after;
3531 unsigned char *value = 0; 3775 unsigned char *value = 0;
3532 const char *str = ""; 3776 const char *str = "";
3533 3777
3534 if (prop 3778 if (prop
3535 && XGetWindowProperty (display->display, TermWin.parent[0], 3779 && XGetWindowProperty (xdisp, parent[0],
3536 prop, 0, 1<<16, 0, AnyPropertyType, 3780 prop, 0, 1<<16, 0, AnyPropertyType,
3537 &actual_type, &actual_format, 3781 &actual_type, &actual_format,
3538 &nitems, &bytes_after, &value) == Success 3782 &nitems, &bytes_after, &value) == Success
3539 && actual_type != None 3783 && actual_type != None
3540 && actual_format == 8) 3784 && actual_format == 8)
3541 str = (const char *)(value); 3785 str = (const char *)(value);
3542 3786
3543 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3787 tt_printf ("\033]%d;%s%c", op, str, resp);
3544 3788
3545 XFree (value); 3789 XFree (value);
3546 } 3790 }
3547 else 3791 else
3548 { 3792 {
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3793 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550 3794
3551 if (eq) 3795 if (eq)
3552 { 3796 {
3553 *eq = 0; 3797 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0], 3798 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 } 3799 }
3559 else 3800 else
3560 XDeleteProperty (display->display, TermWin.parent[0], 3801 XDeleteProperty (xdisp, parent[0],
3561 display->atom (str)); 3802 display->atom (str));
3562 } 3803 }
3563 break; 3804 break;
3564 3805
3565 case XTerm_Color: 3806 case XTerm_Color:
3566 for (buf = (char *)str; buf && *buf;) 3807 for (buf = (char *)str; buf && *buf;)
3567 { 3808 {
3568 if ((name = STRCHR (buf, ';')) == NULL) 3809 if ((name = strchr (buf, ';')) == NULL)
3569 break; 3810 break;
3570 3811
3571 *name++ = '\0'; 3812 *name++ = '\0';
3572 color = atoi (buf); 3813 color = atoi (buf) + minCOLOR;
3573 3814
3574 if (color < 0 || color >= TOTAL_COLORS) 3815 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3575 break; 3816 break;
3576 3817
3577 if ((buf = STRCHR (name, ';')) != NULL) 3818 if ((buf = strchr (name, ';')) != NULL)
3578 *buf++ = '\0'; 3819 *buf++ = '\0';
3579 3820
3580 if (name[0] == '?' && !name[1]) 3821 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 } 3822 }
3589 break; 3823 break;
3590 case XTerm_Color00: 3824 case XTerm_Color00:
3591 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3825 process_color_seq (op, Color_fg, str, resp);
3592 break; 3826 break;
3593 case XTerm_Color01: 3827 case XTerm_Color01:
3594 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3828 process_color_seq (op, Color_bg, str, resp);
3595 break; 3829 break;
3596#ifndef NO_CURSORCOLOR 3830#ifndef NO_CURSORCOLOR
3597 case XTerm_Color_cursor: 3831 case XTerm_Color_cursor:
3598 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3832 process_color_seq (op, Color_cursor, str, resp);
3599 break; 3833 break;
3600#endif 3834#endif
3601 case XTerm_Color_pointer_fg: 3835 case XTerm_Color_pointer_fg:
3602 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3836 process_color_seq (op, Color_pointer_fg, str, resp);
3603 break; 3837 break;
3604 case XTerm_Color_pointer_bg: 3838 case XTerm_Color_pointer_bg:
3605 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3839 process_color_seq (op, Color_pointer_bg, str, resp);
3606 break; 3840 break;
3607#ifndef NO_BOLD_UNDERLINE_REVERSE 3841#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: 3842 case XTerm_Color_RV:
3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3843 process_color_seq (op, Color_RV, str, resp);
3616 break; 3844 break;
3845 case Rxvt_Color_BD:
3846 case URxvt_Color_BD:
3847 process_color_seq (op, Color_BD, str, resp);
3848 break;
3849 case Rxvt_Color_UL:
3850 case URxvt_Color_UL:
3851 process_color_seq (op, Color_UL, str, resp);
3852 break;
3853 case URxvt_Color_IT:
3854 process_color_seq (op, Color_IT, str, resp);
3855 break;
3617#endif 3856#endif
3857#if TRANSPARENT && TINTING
3858 case URxvt_Color_tint:
3859 process_color_seq (op, Color_tint, str, resp);
3618 3860
3861 check_our_parents ();
3862
3863 if (am_transparent)
3864 want_full_refresh = want_refresh = 1;
3865
3866 break;
3867#endif
3868
3619 case XTerm_Pixmap: 3869 case Rxvt_Pixmap:
3870 {
3620 if (*str != ';') 3871 if (*str != ';')
3621 { 3872 {
3622#if XPM_BACKGROUND 3873#if XPM_BACKGROUND
3623 scale_pixmap (""); /* reset to default scaling */ 3874 scale_pixmap (""); /* reset to default scaling */
3624 set_bgPixmap (str); /* change pixmap */ 3875 set_bgPixmap (str); /* change pixmap */
3625#endif
3626 scr_touch (true); 3876 scr_touch (true);
3877#endif
3627 } 3878 }
3879
3880 int changed = 0;
3881
3628 while ((str = STRCHR (str, ';')) != NULL) 3882 while ((str = strchr (str, ';')) != NULL)
3629 { 3883 {
3630 str++; 3884 str++;
3631#if XPM_BACKGROUND 3885#if XPM_BACKGROUND
3632 changed += scale_pixmap (str); 3886 changed += scale_pixmap (str);
3633#endif 3887#endif
3634
3635 } 3888 }
3889
3636 if (changed) 3890 if (changed)
3637 { 3891 {
3638#ifdef XPM_BACKGROUND 3892#ifdef XPM_BACKGROUND
3639 resize_pixmap (); 3893 resize_pixmap ();
3640#endif
3641 scr_touch (true); 3894 scr_touch (true);
3895#endif
3642 } 3896 }
3897 }
3643 break; 3898 break;
3644 3899
3645 case XTerm_restoreFG: 3900 case Rxvt_restoreFG:
3646 set_window_color (Color_fg, str); 3901 set_window_color (Color_fg, str);
3647 break; 3902 break;
3648 case XTerm_restoreBG: 3903 case Rxvt_restoreBG:
3649 set_window_color (Color_bg, str); 3904 set_window_color (Color_bg, str);
3650 break; 3905 break;
3651 3906
3652 case XTerm_logfile: 3907 case XTerm_logfile:
3653 // TODO, when secure mode? 3908 // TODO, when secure mode?
3654 break; 3909 break;
3655 3910
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 3911#if 0
3697 case XTerm_dumpscreen: /* no error notices */ 3912 case Rxvt_dumpscreen: /* no error notices */
3698 { 3913 {
3699 int fd; 3914 int fd;
3700 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3915 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3701 { 3916 {
3702 scr_dump (fd); 3917 scr_dump (fd);
3703 close (fd); 3918 close (fd);
3704 } 3919 }
3705 } 3920 }
3921 break;
3922#endif
3923 case XTerm_font:
3924 op = URxvt_font;
3925 case URxvt_font:
3926#if ENABLE_STYLES
3927 case URxvt_boldFont:
3928 case URxvt_italicFont:
3929 case URxvt_boldItalicFont:
3930#endif
3931 if (query)
3932 tt_printf ("\33]%d;%-.250s%c", saveop,
3933 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3934 ? fontset[op - URxvt_font]->fontdesc : "",
3935 resp);
3936 else
3937 {
3938 const char *&res = rs[Rs_font + (op - URxvt_font)];
3939
3940 res = strdup (str);
3941 allocated.push_back ((void *)res);
3942 set_fonts ();
3943 }
3944 break;
3945
3946 case URxvt_version:
3947 if (query)
3948 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3949 op,
3950 rs[Rs_name], VERSION[0], VERSION[2],
3951 resp);
3952 break;
3953
3954#if !ENABLE_MINIMAL
3955 case URxvt_locale:
3956 if (query)
3957 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3958 else
3959 {
3960 set_locale (str);
3961 pty->set_utf8_mode (enc_utf8);
3962 init_xlocale ();
3963 }
3964 break;
3965
3966 case URxvt_view_up:
3967 case URxvt_view_down:
3968 {
3969 int lines = atoi (str);
3970
3971 if (lines)
3972 scr_page (op == URxvt_view_up ? UP : DN, lines);
3973 else
3974 scr_erase_savelines ();
3975 }
3976
3977 break;
3978#endif
3979
3980#if ENABLE_PERL
3981 case URxvt_perl:
3982 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3983 ; // no responses yet
3706 break; 3984 break;
3707#endif 3985#endif
3708 } 3986 }
3709} 3987}
3710/*----------------------------------------------------------------------*/ 3988/*----------------------------------------------------------------------*/
… …
3724{ 4002{
3725 int state; 4003 int state;
3726 4004
3727 if (mode == 's') 4005 if (mode == 's')
3728 { 4006 {
3729 SavedModes |= (PrivateModes & bit); 4007 SavedModes |= (priv_modes & bit);
3730 return -1; 4008 return -1;
3731 } 4009 }
3732 else 4010 else
3733 { 4011 {
3734 if (mode == 'r') 4012 if (mode == 'r')
3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4013 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3736 else 4014 else
3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4015 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3738 PrivMode (state, bit); 4016 PrivMode (state, bit);
3739 } 4017 }
3740 4018
3741 return state; 4019 return state;
3742} 4020}
3743 4021
3744/* we're not using priv _yet_ */ 4022/* we're not using priv _yet_ */
3745void 4023void
3746rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4024rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3747{ 4025{
3748 unsigned int i, j; 4026 unsigned int i, j;
3749 int state; 4027 int state;
3750 4028
3751 static const struct 4029 static const struct
… …
3760 { 3, PrivMode_132 }, 4038 { 3, PrivMode_132 },
3761 { 4, PrivMode_smoothScroll }, 4039 { 4, PrivMode_smoothScroll },
3762 { 5, PrivMode_rVideo }, 4040 { 5, PrivMode_rVideo },
3763 { 6, PrivMode_relOrigin }, 4041 { 6, PrivMode_relOrigin },
3764 { 7, PrivMode_Autowrap }, 4042 { 7, PrivMode_Autowrap },
4043 // 8, bi-directional support mode
3765 { 9, PrivMode_MouseX10 }, 4044 { 9, PrivMode_MouseX10 },
3766#ifdef menuBar_esc 4045 // 18, 19 printing-related
3767 { menuBar_esc, PrivMode_menuBar }, 4046 { 25, PrivMode_VisibleCursor },
3768#endif
3769#ifdef scrollBar_esc 4047#ifdef scrollBar_esc
3770 { scrollBar_esc, PrivMode_scrollBar }, 4048 { scrollBar_esc, PrivMode_scrollBar },
3771#endif 4049#endif
3772 // 18, 19 printing-related
3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3775 { 35, PrivMode_ShiftKeys }, // rxvt extension 4050 { 35, PrivMode_ShiftKeys }, // rxvt extension
3776 { 40, PrivMode_132OK }, 4051 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI 4052 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI 4053 // 45 margin bell NYI
3779 // 46 start logging 4054 // 46 start logging
… …
3819 } 4094 }
3820 4095
3821 /* extra handling for values with state unkept */ 4096 /* extra handling for values with state unkept */
3822 switch (arg[i]) 4097 switch (arg[i])
3823 { 4098 {
4099#if ENABLE_STYLES
4100 case 1021:
4101 set_option (Opt_intensityStyles, mode);
4102
4103 scr_touch (true);
4104 break;
4105#endif
3824 case 1048: /* alternative cursor save */ 4106 case 1048: /* alternative cursor save */
4107 case 1049:
3825 if (Options & Opt_secondaryScreen) 4108 if (OPTION (Opt_secondaryScreen))
3826 if (mode == 0) 4109 if (mode == 0)
3827 scr_cursor (RESTORE); 4110 scr_cursor (RESTORE);
3828 else if (mode == 1) 4111 else if (mode == 1)
3829 scr_cursor (SAVE); 4112 scr_cursor (SAVE);
3830 break; 4113 break;
… …
3841 * within VT52 mode 4124 * within VT52 mode
3842 */ 4125 */
3843 PrivMode (1, PrivMode_vt52); 4126 PrivMode (1, PrivMode_vt52);
3844 break; 4127 break;
3845 case 3: /* 80/132 */ 4128 case 3: /* 80/132 */
3846 if (PrivateModes & PrivMode_132OK) 4129 if (priv_modes & PrivMode_132OK)
3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4130 set_widthheight (((state ? 132 : 80) * fwidth), height);
3848 break; 4131 break;
3849 case 4: /* smooth scrolling */ 4132 case 4: /* smooth scrolling */
3850 if (state) 4133 set_option (Opt_jumpScroll, !state);
3851 Options &= ~Opt_jumpScroll;
3852 else
3853 Options |= Opt_jumpScroll;
3854 break; 4134 break;
3855 case 5: /* reverse video */ 4135 case 5: /* reverse video */
3856 scr_rvideo_mode (state); 4136 scr_rvideo_mode (state);
3857 break; 4137 break;
3858 case 6: /* relative/absolute origins */ 4138 case 6: /* relative/absolute origins */
… …
3862 scr_autowrap (state); 4142 scr_autowrap (state);
3863 break; 4143 break;
3864 /* case 8: - auto repeat, can't do on a per window basis */ 4144 /* case 8: - auto repeat, can't do on a per window basis */
3865 case 9: /* X10 mouse reporting */ 4145 case 9: /* X10 mouse reporting */
3866 if (state) /* orthogonal */ 4146 if (state) /* orthogonal */
3867 PrivateModes &= ~PrivMode_MouseX11; 4147 priv_modes &= ~PrivMode_MouseX11;
3868 break; 4148 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 4149#ifdef scrollBar_esc
3877 case scrollBar_esc: 4150 case scrollBar_esc:
3878 if (scrollbar_mapping (state)) 4151 if (scrollbar_mapping (state))
3879 { 4152 {
3880 resize_all_windows (0, 0, 0); 4153 resize_all_windows (0, 0, 0);
… …
3892 break; 4165 break;
3893 /* case 66: - application key pad */ 4166 /* case 66: - application key pad */
3894 /* case 67: - backspace key */ 4167 /* case 67: - backspace key */
3895 case 1000: /* X11 mouse reporting */ 4168 case 1000: /* X11 mouse reporting */
3896 if (state) /* orthogonal */ 4169 if (state) /* orthogonal */
3897 PrivateModes &= ~PrivMode_MouseX10; 4170 priv_modes &= ~PrivMode_MouseX10;
3898 break; 4171 break;
3899#if 0 4172#if 0
3900 case 1001: 4173 case 1001:
3901 break; /* X11 mouse highlighting */ 4174 break; /* X11 mouse highlighting */
3902#endif 4175#endif
3903 case 1010: /* scroll to bottom on TTY output inhibit */ 4176 case 1010: /* scroll to bottom on TTY output inhibit */
3904 if (state)
3905 Options &= ~Opt_scrollTtyOutput;
3906 else
3907 Options |= Opt_scrollTtyOutput; 4177 set_option (Opt_scrollTtyOutput, !state);
3908 break; 4178 break;
3909 case 1011: /* scroll to bottom on key press */ 4179 case 1011: /* scroll to bottom on key press */
3910 if (state)
3911 Options |= Opt_scrollTtyKeypress; 4180 set_option (Opt_scrollTtyKeypress, state);
3912 else
3913 Options &= ~Opt_scrollTtyKeypress;
3914 break; 4181 break;
3915 case 1047: /* secondary screen w/ clearing last */ 4182 case 1047: /* secondary screen w/ clearing last */
3916 if (Options & Opt_secondaryScreen) 4183 if (OPTION (Opt_secondaryScreen))
3917 if (current_screen != PRIMARY) 4184 if (current_screen != PRIMARY)
3918 scr_erase_screen (2); 4185 scr_erase_screen (2);
3919 scr_change_screen (state); 4186 scr_change_screen (state);
3920 break; 4187 break;
3921 case 1049: /* secondary screen w/ clearing first */ 4188 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state); 4189 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen) 4190 if (OPTION (Opt_secondaryScreen))
3924 if (current_screen != PRIMARY) 4191 if (current_screen != PRIMARY)
3925 scr_erase_screen (2); 4192 scr_erase_screen (2);
3926 break; 4193 break;
3927 default: 4194 default:
3928 break; 4195 break;
… …
3954 rendset = 0, rendstyle = ~RS_None; 4221 rendset = 0, rendstyle = ~RS_None;
3955 break; 4222 break;
3956 case 1: 4223 case 1:
3957 rendset = 1, rendstyle = RS_Bold; 4224 rendset = 1, rendstyle = RS_Bold;
3958 break; 4225 break;
3959 //case 2: // faint or second colour 4226 //case 2: // low intensity
4227 case 3:
4228 rendset = 1, rendstyle = RS_Italic;
4229 break;
3960 case 4: 4230 case 4:
3961 rendset = 1, rendstyle = RS_Uline; 4231 rendset = 1, rendstyle = RS_Uline;
3962 break; 4232 break;
3963 case 5: // slowly blinking 4233 case 5: // slowly blinking
3964 case 6: // rapidly blinking 4234 case 6: // rapidly blinking
… …
3976 //case 11: // scoansi acs on, first alt font 4246 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font 4247 //case 12: // scoansi acs on, |0x80, second alt font
3978 //... 4248 //...
3979 //case 19: // ninth alt font 4249 //case 19: // ninth alt font
3980 //case 20: // gothic 4250 //case 20: // gothic
3981 case 21: // disable bold, faint 4251 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3982 rendset = 0, rendstyle = RS_Bold; 4252 rendset = 0, rendstyle = RS_Bold;
3983 break; 4253 break;
3984 case 22: 4254 case 22: // normal intensity
3985 rendset = 0, rendstyle = RS_Bold; 4255 rendset = 0, rendstyle = RS_Bold;
3986 break; 4256 break;
3987 //case 23: disable italic 4257 case 23: // disable italic
4258 rendset = 0, rendstyle = RS_Italic;
4259 break;
3988 case 24: 4260 case 24:
3989 rendset = 0, rendstyle = RS_Uline; 4261 rendset = 0, rendstyle = RS_Uline;
3990 break; 4262 break;
3991 case 25: 4263 case 25:
4264 rendset = 0, rendstyle = RS_Blink;
4265 break;
4266 case 26: // variable spacing (iso 8613)
3992 rendset = 0, rendstyle = RS_Blink; 4267 rendset = 0, rendstyle = RS_Blink;
3993 break; 4268 break;
3994 case 27: 4269 case 27:
3995 rendset = 0, rendstyle = RS_RVid; 4270 rendset = 0, rendstyle = RS_RVid;
3996 break; 4271 break;
… …
4014 case 35: 4289 case 35:
4015 case 36: 4290 case 36:
4016 case 37: 4291 case 37:
4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4292 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4018 break; 4293 break;
4019#ifdef TTY_256COLOR 4294 case 38: // set fg color, ISO 8613-6
4020 case 38:
4021 if (nargs > i + 2 && arg[i + 1] == 5) 4295 if (nargs > i + 2 && arg[i + 1] == 5)
4022 { 4296 {
4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4297 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4024 i += 2; 4298 i += 2;
4025 } 4299 }
4026 break; 4300 break;
4027#endif
4028 case 39: /* default fg */ 4301 case 39: /* default fg */
4029 scr_color (Color_fg, Color_fg); 4302 scr_color (Color_fg, Color_fg);
4030 break; 4303 break;
4031 4304
4032 case 40: 4305 case 40:
… …
4037 case 45: 4310 case 45:
4038 case 46: 4311 case 46:
4039 case 47: 4312 case 47:
4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4313 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4041 break; 4314 break;
4042#ifdef TTY_256COLOR 4315 case 48: // set bg color, ISO 8613-6
4043 case 48:
4044 if (nargs > i + 2 && arg[i + 1] == 5) 4316 if (nargs > i + 2 && arg[i + 1] == 5)
4045 { 4317 {
4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4318 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4047 i += 2; 4319 i += 2;
4048 } 4320 }
4049 break; 4321 break;
4050#endif
4051 case 49: /* default bg */ 4322 case 49: /* default bg */
4052 scr_color (Color_bg, Color_bg); 4323 scr_color (Color_bg, Color_bg);
4053 break; 4324 break;
4054 4325
4055#ifndef NO_BRIGHTCOLOR 4326 //case 50: // not variable spacing
4327
4328#if !ENABLE_MINIMAL
4056 case 90: 4329 case 90:
4057 case 91: /* set bright fg color */ 4330 case 91: /* set bright fg color */
4058 case 92: 4331 case 92:
4059 case 93: 4332 case 93:
4060 case 94: 4333 case 94:
4061 case 95: 4334 case 95:
4062 case 96: 4335 case 96:
4063 case 97: 4336 case 97:
4064 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4337 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4065 Color_fg);
4066 break; 4338 break;
4067 case 100: 4339 case 100:
4068 case 101: /* set bright bg color */ 4340 case 101: /* set bright bg color */
4069 case 102: 4341 case 102:
4070 case 103: 4342 case 103:
4071 case 104: 4343 case 104:
4072 case 105: 4344 case 105:
4073 case 106: 4345 case 106:
4074 case 107: 4346 case 107:
4075 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4347 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4076 Color_bg);
4077 break; 4348 break;
4078#endif 4349#endif
4079
4080 } 4350 }
4081 } 4351 }
4082} 4352}
4083/*}}} */ 4353/*}}} */
4084 4354
… …
4088{ 4358{
4089 unicode_t ch, cmd = cmd_getc (); 4359 unicode_t ch, cmd = cmd_getc ();
4090 4360
4091 if (cmd == 'Q') 4361 if (cmd == 'Q')
4092 { /* query graphics */ 4362 { /* query graphics */
4093 tt_printf ("\033G0\n"); /* no graphics */ 4363 tt_printf ("\033G0\012"); /* no graphics */
4094 return; 4364 return;
4095 } 4365 }
4096 /* swallow other graphics sequences until terminating ':' */ 4366 /* swallow other graphics sequences until terminating ':' */
4097 do 4367 do
4098 ch = cmd_getc (); 4368 ch = cmd_getc ();
… …
4108 */ 4378 */
4109void 4379void
4110rxvt_term::tt_printf (const char *fmt,...) 4380rxvt_term::tt_printf (const char *fmt,...)
4111{ 4381{
4112 va_list arg_ptr; 4382 va_list arg_ptr;
4113 unsigned char buf[256]; 4383 char buf[256];
4114 4384
4115 va_start (arg_ptr, fmt); 4385 va_start (arg_ptr, fmt);
4116 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4386 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4117 va_end (arg_ptr); 4387 va_end (arg_ptr);
4118 tt_write (buf, STRLEN (buf)); 4388 tt_write (buf, strlen (buf));
4119} 4389}
4120 4390
4121/* ---------------------------------------------------------------------- */ 4391/* ---------------------------------------------------------------------- */
4122/* Write data to the pty as typed by the user, pasted with the mouse, 4392/* 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. 4393 * or generated by us in response to a query ESC sequence.
4124 */ 4394 */
4395const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4396
4125void 4397void
4126rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4398rxvt_term::tt_write (const char *data, unsigned int len)
4127{ 4399{
4128 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4400 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4401 return;
4129 4402
4130 if (len) 4403 if (pty->pty < 0)
4404 return;
4405
4406 if (v_buflen == 0)
4407 {
4408 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4409
4410 if ((unsigned int)written == len)
4411 return;
4412
4413 data += written;
4414 len -= written;
4131 { 4415 }
4416
4417 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4418
4419 memcpy (v_buffer + v_buflen, data, len);
4420 v_buflen += len;
4421
4422 pty_ev.set (EVENT_READ | EVENT_WRITE);
4423}
4424
4425void rxvt_term::pty_write ()
4426{
4427 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4428
4429 if (written > 0)
4430 {
4431 v_buflen -= written;
4432
4132 if (v_buflen == 0) 4433 if (v_buflen == 0)
4133 { 4434 {
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); 4435 free (v_buffer);
4161 v_buffer = 0; 4436 v_buffer = 0;
4162 v_buflen = 0; 4437 v_buflen = 0;
4163 4438
4164 pty_ev.set (EVENT_READ); 4439 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; 4440 return;
4177 } 4441 }
4442
4443 memmove (v_buffer, v_buffer + written, v_buflen);
4178 } 4444 }
4445 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4446 pty_ev.set (EVENT_READ);
4179} 4447}
4180 4448
4181/*----------------------- end-of-file (C source) -----------------------*/ 4449/*----------------------- end-of-file (C source) -----------------------*/
4182 4450

Diff Legend

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