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.268 by root, Tue Jan 17 05:47:42 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
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
53#include <wchar.h> 56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE
60# include "keyboard.h"
61#endif
62
63#include <csignal>
54 64
55/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
56 66
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 68
59// exception thrown when the command parser runs out of input data 69// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 70class out_of_input { } out_of_input;
61 71
62#ifndef NO_FRILLS 72#if ENABLE_FRILLS || ISO_14755
63 73
64#define ISO_14755_KEYCODE_VALID 0x80000000UL
65#define ISO_14755_ACTIVE 0x40000000UL 74#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_ESCAPE_NEXT 0x20000000UL 75#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
77#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
78#define ISO_14755_MASK 0x0fffffffUL
67 79
80#if ISO_14755
68static unsigned short iso14755_symtab[] = { 81static unsigned short iso14755_symtab[] = {
69 // keysym, unicode 82 // keysym, unicode
70 XK_Left, 0x2190, 83 XK_Left, 0x2190,
71 XK_KP_Left, 0x2190, 84 XK_KP_Left, 0x2190,
72 XK_Up, 0x2191, 85 XK_Up, 0x2191,
… …
110 XK_Escape, 0x238b, 123 XK_Escape, 0x238b,
111 XK_Undo, 0x238c, 124 XK_Undo, 0x238c,
112 XK_Print, 0x2399, 125 XK_Print, 0x2399,
113 126
114 XK_space, 0x2423, 127 XK_space, 0x2423,
128
129#ifdef XK_KP_Begin
130 XK_KP_Prior, 0x21de,
131 XK_KP_Next, 0x21df,
132 XK_KP_Begin, 0x2320,
133 XK_KP_Insert, 0x2380,
134 XK_KP_Delete, 0x2326,
115 XK_KP_Space, 0x2422, 135 XK_KP_Space, 0x2422,
136#endif
116 0, 137 0,
117}; 138};
118 139
119void 140void
141rxvt_term::iso14755_54 (int x, int y)
142{
143 x = Pixel2Col (x);
144 y = Pixel2Row (y);
145
146 if (!IN_RANGE_EXC (x, 0, ncol)
147 || !IN_RANGE_EXC (y, 0, nrow))
148 return;
149
150 for (;;)
151 {
152 const line_t &l = ROW(y + view_start);
153
154 text_t t = l.t[x];
155
156 if (t != NOCHAR || !x)
157 {
158 iso14755_51 (l.t[x], l.r[x], x, y);
159 iso14755buf = ISO_14755_54;
160 break;
161 }
162
163 x--;
164 }
165}
166
167void
168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
169{
170 rxvt_fontset *fs = FONTSET (r);
171 rxvt_font *f = (*fs)[fs->find_font (ch)];
172 wchar_t *chr, *alloc, ch2, *fname;
173 int len;
174
175 fname = rxvt_utf8towcs (f->name);
176
177# if ENABLE_COMBINING
178 if (IS_COMPOSE (ch))
179 {
180 len = rxvt_composite.expand (ch, 0);
181 alloc = chr = new wchar_t[len];
182 rxvt_composite.expand (ch, chr);
183 }
184 else
185# endif
186 {
187 ch2 = ch;
188
189 alloc = 0;
190 chr = &ch2;
191 len = 1;
192 }
193
194 char attr[80]; // plenty
195
196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
206 int width = wcswidth (fname, wcslen (fname));
207
208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
217 scr_overlay_new (x, y, width, len + 2);
218
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220
221 for (int y = 0; y < len; y++)
222 {
223 char buf[9];
224
225 ch = *chr++;
226
227 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf);
229 scr_overlay_set (9, y, '=');
230# if !UNICODE3
231 if (ch >= 0x10000)
232 ch = 0xfffd;
233# endif
234 scr_overlay_set (11, y, ch, r);
235 scr_overlay_set (12, y, NOCHAR, r);
236 }
237
238 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname);
240
241 free (fname);
242
243# if ENABLE_COMBINING
244 if (alloc)
245 delete [] alloc;
246# endif
247}
248#endif
249
250void
120rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
121{ 252{
122 wchar_t ch[2]; 253 wchar_t ch[2];
123 254
124 ch[0] = iso14755buf & 0x1fffffffUL; // actually, unicode needs a 0x1fffff mask 255 ch[0] = iso14755buf & ISO_14755_MASK;
125 ch[1] = 0; 256 ch[1] = 0;
126 257
127 if (iso14755buf & ISO_14755_KEYCODE_VALID) 258 if (iso14755buf & ISO_14755_51)
128 { 259 {
129 char mb[16]; 260 char mb[16];
130 int len; 261 int len;
131 262
132 // allow verbatim 0-bytes and control-bytes to be entered 263 // allow verbatim 0-bytes and control-bytes to be entered
… …
137 mb[0] = ch[0]; 268 mb[0] = ch[0];
138 len = 1; 269 len = 1;
139 } 270 }
140 271
141 if (len > 0) 272 if (len > 0)
142 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
143 else 274 else
144 scr_bell (); 275 scr_bell ();
145 } 276 }
146 277
147 iso14755buf = 0; 278 iso14755buf = 0;
… …
175 KeySym keysym; 306 KeySym keysym;
176#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
177 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
178#endif 309#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, 0, 0);
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) 910#if defined(DEBUG_CMD)
743 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
751#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
752 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
753} 921}
754/*}}} */ 922/*}}} */
755 923
756#if (MENUBAR_MAX) 924#if defined (KEYSYM_RESOURCE)
757/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
758/* attempt to `write' count to the input buffer */
759unsigned int 925unsigned int
760rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
761{ 927{
762 unsigned int n, s; 928 unsigned int n, s;
763 929
764 n = cmdbuf_ptr - cmdbuf_base; 930 n = cmdbuf_ptr - cmdbuf_base;
765 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 931 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
766 932
767 if (n > 0 && s < count) 933 if (n > 0 && s < count)
768 { 934 {
769 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 935 memmove (cmdbuf_base, cmdbuf_ptr,
770 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 936 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
771 cmdbuf_ptr = cmdbuf_base; 937 cmdbuf_ptr = cmdbuf_base;
772 cmdbuf_endp -= n; 938 cmdbuf_endp -= n;
773 s += n; 939 s += n;
774 } 940 }
… …
784 950
785 cmd_parse (); 951 cmd_parse ();
786 952
787 return 0; 953 return 0;
788} 954}
789#endif /* MENUBAR_MAX */ 955#endif
790 956
791void 957void
792rxvt_term::flush () 958rxvt_term::flush ()
793{ 959{
960 flush_ev.stop ();
961
794#ifdef TRANSPARENT 962#ifdef TRANSPARENT
795 if (want_full_refresh) 963 if (want_full_refresh)
796 { 964 {
797 want_full_refresh = 0; 965 want_full_refresh = 0;
798 scr_clear (); 966 scr_clear ();
… …
800 } 968 }
801#endif 969#endif
802 970
803 if (want_refresh) 971 if (want_refresh)
804 { 972 {
973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
974 {
975 int row = view_start;
976 int end_row = row + nrow;
977
978 while (row > top_row && ROW (row - 1).is_longer ())
979 --row;
980
981 do
982 {
983 int start_row = row;
984 line_t *l;
985
986 do
987 {
988 l = &ROW (row++);
989
990 if (!(l->f & LINE_FILTERED))
991 {
992 // line not filtered, mark it as filtered
993 l->f |= LINE_FILTERED;
994 while (l->is_longer ())
995 {
996 l = &ROW (row++);
997 l->f |= LINE_FILTERED;
998 }
999
1000 // and filter it
1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1002
1003 break;
1004 }
1005 }
1006 while (l->is_longer () && row < end_row);
1007 }
1008 while (row < end_row);
1009 }
1010
805 scr_refresh (refresh_type); 1011 scr_refresh ();
806 scrollbar_show (1); 1012 scrollbar_show (1);
807#ifdef USE_XIM 1013#ifdef USE_XIM
808 IMSendSpot (); 1014 IMSendSpot ();
809#endif 1015#endif
810 } 1016 }
811 1017
812 display->flush (); 1018 display->flush ();
813
814 flush_ev.stop ();
815} 1019}
816 1020
817void 1021void
818rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
819{ 1023{
820 SET_R (this); 1024 make_current ();
821 SET_LOCALE (locale);
822 1025
823 display->flush (); 1026 display->flush ();
824 1027
825 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
826 flush_ev.start (NOW + 0.01); 1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
827} 1030}
828 1031
829void 1032void
830rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
831{ 1034{
832 SET_R (this); 1035 make_current ();
833 SET_LOCALE (locale);
834 1036
835 refresh_limit = 1; 1037 refresh_limit = 1;
836 refresh_count = 0; 1038 refresh_count = 0;
837 flush (); 1039 flush ();
838} 1040}
… …
866rxvt_term::cont_scroll_cb (time_watcher &w) 1068rxvt_term::cont_scroll_cb (time_watcher &w)
867{ 1069{
868 if ((scrollbar_isUp() || scrollbar_isDn()) && 1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
869 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
870 { 1072 {
871 refresh_type |= SMOOTH_REFRESH;
872 want_refresh = 1; 1073 want_refresh = 1;
873 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
874 } 1075 }
875} 1076}
876#endif 1077#endif
… …
880rxvt_term::sel_scroll_cb (time_watcher &w) 1081rxvt_term::sel_scroll_cb (time_watcher &w)
881{ 1082{
882 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
883 { 1084 {
884 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
885 refresh_type |= SMOOTH_REFRESH;
886 want_refresh = 1; 1086 want_refresh = 1;
887 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
888 } 1088 }
889} 1089}
890#endif 1090#endif
… …
895{ 1095{
896 if (mouse_slip_wheel_speed == 0 1096 if (mouse_slip_wheel_speed == 0
897 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
898 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
899 { 1099 {
900 refresh_type |= SMOOTH_REFRESH; 1100 if (view_start == top_row || view_start == 0)
1101 mouse_slip_wheel_speed = 0;
1102
901 want_refresh = 1; 1103 want_refresh = 1;
902 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
903 } 1105 }
904} 1106}
905#endif 1107#endif
906 1108
1109#if HAVE_SCHED_YIELD
1110static struct event_handler
1111{
1112 check_watcher cw_yield;
1113
1114 void yield (check_watcher &w)
1115 {
1116 sched_yield ();
1117 w.stop ();
1118 }
1119
1120 event_handler ()
1121 : cw_yield (this, &event_handler::yield)
1122 {
1123 }
1124} event_handler;
1125#endif
1126
907bool 1127bool
908rxvt_term::pty_fill () 1128rxvt_term::pty_fill ()
909{ 1129{
910 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1130 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
911 1131
912 if (CBUFSIZ == n) 1132 if (CBUFSIZ == n)
913 { 1133 {
914 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1134 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
915 n = 0; 1135 n = 0;
916 } 1136 }
917 1137
918 memmove (cmdbuf_base, cmdbuf_ptr, n); 1138 memmove (cmdbuf_base, cmdbuf_ptr, n);
919 cmdbuf_ptr = cmdbuf_base; 1139 cmdbuf_ptr = cmdbuf_base;
920 cmdbuf_endp = cmdbuf_ptr + n; 1140 cmdbuf_endp = cmdbuf_ptr + n;
921 1141
922 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1142 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
923 1143
924 if (n > 0) 1144 if (r > 0)
925 { 1145 {
926 cmdbuf_endp += n; 1146 cmdbuf_endp += r;
927 return true; 1147 return true;
928 } 1148 }
929 else if (n < 0 && errno != EAGAIN) 1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 {
1151#if HAVE_SCHED_YIELD
1152 if (display->is_local)
1153 event_handler.cw_yield.start ();
1154#endif
1155 }
1156 else
1157 {
1158 pty_ev.stop ();
1159
1160 if (!OPTION (Opt_hold))
930 destroy (); 1161 destroy ();
1162 }
931 1163
932 return false; 1164 return false;
933} 1165}
934 1166
935void 1167void
936rxvt_term::pty_cb (io_watcher &w, short revents) 1168rxvt_term::pty_cb (io_watcher &w, short revents)
937{ 1169{
938 SET_R (this); 1170 make_current ();
939 SET_LOCALE (locale);
940 1171
941 if (revents & EVENT_WRITE)
942 tt_write (0, 0);
943 else if (revents & EVENT_READ) 1172 if (revents & EVENT_READ)
944 // loop, but don't allow a single term to monopolize us 1173 // loop, but don't allow a single term to monopolize us
945 while (pty_fill ()) 1174 while (pty_fill ())
946 if (cmd_parse ()) 1175 if (cmd_parse ())
947 break; 1176 break;
1177
1178 if (revents & EVENT_WRITE)
1179 pty_write ();
948} 1180}
949 1181
950void 1182void
951rxvt_term::pointer_unblank () 1183rxvt_term::pointer_unblank ()
952{ 1184{
953 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1185 XDefineCursor (display->display, vt, TermWin_cursor);
954 recolour_cursor (); 1186 recolour_cursor ();
955 1187
956#ifdef POINTER_BLANK 1188#ifdef POINTER_BLANK
957 hidden_pointer = 0; 1189 hidden_pointer = 0;
958 1190
959 if (Options & Opt_pointerBlank) 1191 if (OPTION (Opt_pointerBlank))
960 pointer_ev.start (NOW + pointerBlankDelay); 1192 pointer_ev.start (NOW + pointerBlankDelay);
961#endif 1193#endif
962} 1194}
963 1195
964#ifdef POINTER_BLANK 1196#ifdef POINTER_BLANK
965void 1197void
966rxvt_term::pointer_blank () 1198rxvt_term::pointer_blank ()
967{ 1199{
968 if (! (Options & Opt_pointerBlank)) 1200 if (!OPTION (Opt_pointerBlank))
969 return; 1201 return;
970 1202
971 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1203 XDefineCursor (display->display, vt, display->blank_cursor);
972 XFlush (display->display); 1204 XFlush (display->display);
973 1205
974 hidden_pointer = 1; 1206 hidden_pointer = 1;
975} 1207}
976 1208
977void 1209void
978rxvt_term::pointer_cb (time_watcher &w) 1210rxvt_term::pointer_cb (time_watcher &w)
979{ 1211{
980 SET_R (this); 1212 make_current ();
981 SET_LOCALE (locale);
982 1213
983 pointer_blank (); 1214 pointer_blank ();
984} 1215}
985#endif 1216#endif
986 1217
… …
993 x = ev.x; 1224 x = ev.x;
994 y = ev.y; 1225 y = ev.y;
995 pixel_position (&x, &y); 1226 pixel_position (&x, &y);
996 1227
997 if (MEvent.button == AnyButton) 1228 if (MEvent.button == AnyButton)
998 {
999 button_number = 3; 1229 button_number = 3;
1000 }
1001 else 1230 else
1002 { 1231 {
1003 button_number = MEvent.button - Button1; 1232 button_number = MEvent.button - Button1;
1004 /* add 0x3D for wheel events, like xterm does */ 1233 /* add 0x3D for wheel events, like xterm does */
1005 if (button_number >= 3) 1234 if (button_number >= 3)
1006 button_number += (64 - 3); 1235 button_number += (64 - 3);
1007 } 1236 }
1008 1237
1009 if (PrivateModes & PrivMode_MouseX10) 1238 if (priv_modes & PrivMode_MouseX10)
1010 { 1239 {
1011 /* 1240 /*
1012 * do not report ButtonRelease 1241 * do not report ButtonRelease
1013 * no state info allowed 1242 * no state info allowed
1014 */ 1243 */
… …
1029 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1258 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1030 + ((MEvent.state & ControlMask) ? 16 : 0); 1259 + ((MEvent.state & ControlMask) ? 16 : 0);
1031#ifdef MOUSE_REPORT_DOUBLECLICK 1260#ifdef MOUSE_REPORT_DOUBLECLICK
1032 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1261 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1033#endif 1262#endif
1034
1035 } 1263 }
1036 1264
1037#ifdef DEBUG_MOUSEREPORT 1265#if DEBUG_MOUSEREPORT
1038 fprintf (stderr, "Mouse ["); 1266 fprintf (stderr, "Mouse [");
1039 if (key_state & 16) 1267 if (key_state & 16)
1040 fputc ('C', stderr); 1268 fputc ('C', stderr);
1041 if (key_state & 4) 1269 if (key_state & 4)
1042 fputc ('S', stderr); 1270 fputc ('S', stderr);
… …
1046 fputc ('2', stderr); 1274 fputc ('2', stderr);
1047 fprintf (stderr, "]: <%d>, %d/%d\n", 1275 fprintf (stderr, "]: <%d>, %d/%d\n",
1048 button_number, 1276 button_number,
1049 x + 1, 1277 x + 1,
1050 y + 1); 1278 y + 1);
1051#else 1279#endif
1280
1052 tt_printf ("\033[M%c%c%c", 1281 tt_printf ("\033[M%c%c%c",
1053 (32 + button_number + key_state), 1282 (32 + button_number + key_state),
1054 (32 + x + 1), 1283 (32 + x + 1),
1055 (32 + y + 1)); 1284 (32 + y + 1));
1056#endif
1057} 1285}
1058 1286
1059#ifdef USING_W11LIB 1287#ifdef USING_W11LIB
1060void 1288void
1061rxvt_W11_process_x_event (XEvent *ev) 1289rxvt_W11_process_x_event (XEvent *ev)
… …
1068 1296
1069/*{{{ process an X event */ 1297/*{{{ process an X event */
1070void 1298void
1071rxvt_term::x_cb (XEvent &ev) 1299rxvt_term::x_cb (XEvent &ev)
1072{ 1300{
1073 SET_R (this); 1301 make_current ();
1074 SET_LOCALE (locale);
1075 1302
1076#if defined(CURSOR_BLINK) 1303 dDisp;
1077 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1078 {
1079 if (hidden_cursor)
1080 {
1081 hidden_cursor = 0;
1082 want_refresh = 1;
1083 }
1084 1304
1085 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1305 if (ev.xany.window == vt
1086 } 1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1087#endif 1307 && 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; 1308 return;
1106#endif
1107 1309
1310 // for XQueryPointer
1108 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
1109 int unused_root_x, unused_root_y; 1312 int unused_root_x, unused_root_y;
1110 unsigned int unused_mask; 1313 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 1314
1161 switch (ev.type) 1315 switch (ev.type)
1162 { 1316 {
1163 case KeyPress: 1317 case KeyPress:
1318#if ISO_14755
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT)) 1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1165 lookup_key (ev.xkey); 1321 lookup_key (ev.xkey);
1166 1322
1167 break; 1323 break;
1168 1324
1169 case KeyRelease: 1325 case KeyRelease:
1170 { 1326 {
1171#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || !defined (NO_FRILLS) 1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1172 KeySym ks; 1328 KeySym keysym;
1173 1329
1174 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1175#endif 1331#endif
1176 1332
1177#ifndef NO_FRILLS 1333#if ENABLE_FRILLS || ISO_14755
1178 // ISO 14755 support 1334 // ISO 14755 support
1179 if (iso14755buf) 1335 if (iso14755buf)
1180 if (iso14755buf & ISO_14755_ESCAPE_NEXT) 1336 if (iso14755buf & ISO_14755_52)
1181 { 1337 {
1338# if ENABLE_OVERLAY
1339 scr_overlay_off ();
1340# endif
1341# if ISO_14755
1182 // iso14755 part 5.2 handling: release time 1342 // iso14755 part 5.2 handling: release time
1183 // first: controls 1343 // first: controls
1184 if ((ev.xkey.state & ControlMask) 1344 if ((ev.xkey.state & ControlMask)
1185 && ((ks >= 0x40 && ks <= 0x5f) 1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1186 || (ks >= 0x61 && ks <= 0x7f))) 1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1187 { 1347 {
1188 iso14755buf = ISO_14755_KEYCODE_VALID | 0x2400 | (ks & 0x1f); 1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1189 commit_iso14755 (); 1349 commit_iso14755 ();
1190 return; // case-break; 1350 goto skip_switch;
1191 } 1351 }
1192 1352
1193 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1194 if (i[0] == ks) 1354 if (i[0] == keysym)
1195 { 1355 {
1196 iso14755buf = ISO_14755_KEYCODE_VALID | i[1]; 1356 iso14755buf = ISO_14755_51 | i[1];
1197 commit_iso14755 (); 1357 commit_iso14755 ();
1198 return; // case-break; 1358 goto skip_switch;
1199 } 1359 }
1200 1360
1361 scr_bell ();
1362# endif
1201 iso14755buf = 0; 1363 iso14755buf = 0;
1202 scr_bell ();
1203 break; 1364 break;
1204 } 1365 }
1205 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 1366 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1206 { 1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1207 if (iso14755buf & ISO_14755_KEYCODE_VALID) 1371 if (iso14755buf & ISO_14755_51)
1208 commit_iso14755 (); 1372 commit_iso14755 ();
1373#if ISO_14755
1209 else if (iso14755buf & ISO_14755_ACTIVE) 1374 else if (iso14755buf & ISO_14755_STARTED)
1375 {
1210 iso14755buf = ISO_14755_ESCAPE_NEXT; // iso14755 part 5.2: remember empty begin/end pair 1376 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1377
1378 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1379 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1380 }
1381# endif
1382 else
1383 iso14755buf = 0;
1211 } 1384 }
1212#endif 1385#endif
1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1213 1390
1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1215 if (!(ev.xkey.state & ControlMask)) 1392 if (!(ev.xkey.state & ControlMask))
1216 slip_wheel_ev.stop (); 1393 slip_wheel_ev.stop ();
1217 else if (ks == XK_Control_L || ks == XK_Control_R) 1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1218 mouse_slip_wheel_speed = 0; 1395 mouse_slip_wheel_speed = 0;
1219#endif 1396#endif
1220 break; 1397 break;
1221 } 1398 }
1222 1399
… …
1228 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1229 break; 1406 break;
1230 1407
1231 case ClientMessage: 1408 case ClientMessage:
1232 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1411 {
1233 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1234 destroy (); 1413 destroy ();
1414#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev);
1419#endif
1420 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1235#ifdef OFFIX_DND 1430#ifdef OFFIX_DND
1236 /* OffiX Dnd (drag 'n' drop) protocol */ 1431 /* OffiX Dnd (drag 'n' drop) protocol */
1237 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1238 && (ev.xclient.data.l[0] == DndFile 1433 && (ev.xclient.data.l[0] == DndFile
1239 || ev.xclient.data.l[0] == DndDir 1434 || ev.xclient.data.l[0] == DndDir
1240 || ev.xclient.data.l[0] == DndLink)) 1435 || ev.xclient.data.l[0] == DndLink))
1241 { 1436 {
1242 /* Get Dnd data */ 1437 /* Get Dnd data */
1243 Atom ActualType; 1438 Atom ActualType;
1244 int ActualFormat; 1439 int ActualFormat;
1245 unsigned char *data; 1440 unsigned char *data;
1246 unsigned long Size, RemainingBytes; 1441 unsigned long Size, RemainingBytes;
1247 1442
1248 XGetWindowProperty (display->display, display->root, 1443 XGetWindowProperty (disp, display->root,
1249 xa[XA_DNDSELECTION], 1444 xa[XA_DNDSELECTION],
1250 0L, 1000000L, 1445 0L, 1000000L,
1251 False, AnyPropertyType, 1446 False, AnyPropertyType,
1252 &ActualType, &ActualFormat, 1447 &ActualType, &ActualFormat,
1253 &Size, &RemainingBytes, 1448 &Size, &RemainingBytes,
1254 &data); 1449 &data);
1255 XChangeProperty (display->display, display->root, 1450 set_string_property (XA_CUT_BUFFER0, data);
1256 XA_CUT_BUFFER0, XA_STRING,
1257 8, PropModeReplace,
1258 data, STRLEN (data));
1259 XFree (data); 1451 XFree (data);
1260 selection_paste (display->root, XA_CUT_BUFFER0, True); 1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1262 } 1454 }
1263#endif /* OFFIX_DND */ 1455#endif /* OFFIX_DND */
1264 break; 1456 break;
1265 1457
1266 case MappingNotify: 1458 case MappingNotify:
… …
1291 break; 1483 break;
1292 } 1484 }
1293 break; 1485 break;
1294 1486
1295 case FocusIn: 1487 case FocusIn:
1296 if (!TermWin.focus) 1488 focus_in ();
1489 break;
1490
1491 case FocusOut:
1492 focus_out ();
1493 break;
1494
1495 case ConfigureNotify:
1496 if (ev.xconfigure.window == parent[0])
1297 { 1497 {
1298 TermWin.focus = 1; 1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1299 want_refresh = 1; 1499 ;
1300#ifdef USE_XIM 1500
1301 if (Input_Context != NULL) 1501 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 { 1502 {
1311 PixColors = PixColorsFocused; 1503 seen_resize = 1;
1312 set_colorfgbg (); 1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1313 scr_clear ();
1314 scr_touch (true);
1315 } 1505 }
1316#endif
1317
1318 }
1319 break;
1320
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 1506
1364#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1507#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1365 if (Options & Opt_transparent) 1508 if (OPTION (Opt_transparent))
1366 {
1367 check_our_parents (); 1509 check_our_parents ();
1368 if (am_transparent)
1369 want_refresh = want_full_refresh = 1;
1370 }
1371#endif 1510#endif
1372 } 1511 }
1373 break; 1512 break;
1374 1513
1375 case PropertyNotify: 1514 case PropertyNotify:
… …
1383 selection_clear (); 1522 selection_clear ();
1384 break; 1523 break;
1385 1524
1386 case SelectionNotify: 1525 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1526 if (selection_wait == Sel_normal)
1388 selection_paste (ev.xselection.requestor, 1527 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1389 ev.xselection.property, True);
1390 break; 1528 break;
1391 1529
1392 case SelectionRequest: 1530 case SelectionRequest:
1393 selection_send (ev.xselectionrequest); 1531 selection_send (ev.xselectionrequest);
1394 break; 1532 break;
1395 1533
1534 case MapNotify:
1535 mapped = 1;
1536#ifdef TEXT_BLINK
1537 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1538#endif
1539 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1540 break;
1541
1396 case UnmapNotify: 1542 case UnmapNotify:
1397 TermWin.mapped = 0; 1543 mapped = 0;
1398#ifdef TEXT_BLINK 1544#ifdef TEXT_BLINK
1399 text_blink_ev.stop (); 1545 text_blink_ev.stop ();
1400#endif 1546#endif
1401 break; 1547 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; 1548 break;
1409 1549
1410#ifdef TRANSPARENT 1550#ifdef TRANSPARENT
1411 case ReparentNotify: 1551 case ReparentNotify:
1412 rootwin_cb (ev); 1552 rootwin_cb (ev);
1413 break; 1553 break;
1414#endif /* TRANSPARENT */ 1554#endif /* TRANSPARENT */
1415 1555
1416 case GraphicsExpose: 1556 case GraphicsExpose:
1417 case Expose: 1557 case Expose:
1418 if (ev.xany.window == TermWin.vt) 1558 if (ev.xany.window == vt)
1419 { 1559 {
1420 do 1560 do
1421 scr_expose (ev.xexpose.x, ev.xexpose.y, 1561 scr_expose (ev.xexpose.x, ev.xexpose.y,
1422 ev.xexpose.width, ev.xexpose.height, False); 1562 ev.xexpose.width, ev.xexpose.height, False);
1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1563 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1424 1564
1425 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1565 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1426 1566
1427 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1428 scr_expose (ev.xexpose.x, ev.xexpose.y, 1568 scr_expose (ev.xexpose.x, ev.xexpose.y,
1429 ev.xexpose.width, ev.xexpose.height, False); 1569 ev.xexpose.width, ev.xexpose.height, False);
1430 1570
1431 scr_refresh (refresh_type); 1571 want_refresh = 1;
1432 } 1572 }
1433 else 1573 else
1434 { 1574 {
1435 XEvent unused_event; 1575 XEvent unused_event;
1436 1576
1437 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1577 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1438 ; 1578 ;
1439 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1440 ; 1580 ;
1441 1581
1442 if (isScrollbarWindow (ev.xany.window)) 1582 if (isScrollbarWindow (ev.xany.window))
1443 { 1583 {
1444 scrollBar.setIdle (); 1584 scrollBar.setIdle ();
1445 scrollbar_show (0); 1585 scrollbar_show (0);
1446 } 1586 }
1447#ifdef MENUBAR
1448 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1449 menubar_expose ();
1450#endif
1451 1587
1452#ifdef TRANSPARENT 1588#ifdef TRANSPARENT
1453 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1589 if (am_transparent && ev.xany.window == parent[0])
1454 XClearWindow (display->display, ev.xany.window); 1590 XClearWindow (disp, ev.xany.window);
1455#endif 1591#endif
1456 } 1592 }
1457 break; 1593 break;
1458 1594
1459 case MotionNotify: 1595 case MotionNotify:
1460#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1461 if (hidden_pointer) 1597 if (hidden_pointer)
1462 pointer_unblank (); 1598 pointer_unblank ();
1463#endif 1599#endif
1464#if MENUBAR 1600 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1465 if (isMenuBarWindow (ev.xany.window)) 1601 break;
1602
1603 if (ev.xany.window == vt)
1466 { 1604 {
1467 menubar_control (ev.xbutton); 1605 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1468 break; 1606 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1469 } 1607 ; // 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))) 1608 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1477 { 1609 {
1478 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1610 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1479 ; 1611 ;
1480 1612
1481 XQueryPointer (display->display, TermWin.vt, 1613 XQueryPointer (disp, vt,
1482 &unused_root, &unused_child, 1614 &unused_root, &unused_child,
1483 &unused_root_x, &unused_root_y, 1615 &unused_root_x, &unused_root_y,
1484 & (ev.xbutton.x), & (ev.xbutton.y), 1616 &ev.xbutton.x, &ev.xbutton.y,
1485 &unused_mask); 1617 &ev.xbutton.state);
1486#ifdef MOUSE_THRESHOLD 1618#ifdef MOUSE_THRESHOLD
1487 /* deal with a `jumpy' mouse */ 1619 /* deal with a `jumpy' mouse */
1488 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1620 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1489 { 1621 {
1490#endif 1622#endif
1623#if ISO_14755
1624 // 5.4
1625 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1626 {
1627 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1628 break;
1629 }
1630#endif
1491 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1631 selection_extend (ev.xbutton.x, ev.xbutton.y,
1492 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1632 ev.xbutton.state & Button3Mask ? 2 : 0);
1633
1493#ifdef SELECTION_SCROLLING 1634#ifdef SELECTION_SCROLLING
1494 if (ev.xbutton.y < TermWin.int_bwidth 1635 if (ev.xbutton.y < int_bwidth
1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1636 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1496 { 1637 {
1497 int dist; 1638 int dist;
1498 1639
1499 /* don't clobber the current delay if we are 1640 /* don't clobber the current delay if we are
1500 * already in the middle of scrolling. 1641 * already in the middle of scrolling.
… …
1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1644 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1504 1645
1505 /* save the event params so we can highlight 1646 /* save the event params so we can highlight
1506 * the selection in the pending-scroll loop 1647 * the selection in the pending-scroll loop
1507 */ 1648 */
1508 selection_save_x=ev.xbutton.x; 1649 selection_save_x = ev.xbutton.x;
1509 selection_save_y=ev.xbutton.y; 1650 selection_save_y = ev.xbutton.y;
1510 selection_save_state=
1511 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1651 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1512 1652
1513 /* calc number of lines to scroll */ 1653 /* calc number of lines to scroll */
1514 if (ev.xbutton.y<TermWin.int_bwidth) 1654 if (ev.xbutton.y < int_bwidth)
1515 { 1655 {
1516 scroll_selection_dir = UP; 1656 scroll_selection_dir = UP;
1517 dist = TermWin.int_bwidth - ev.xbutton.y; 1657 dist = int_bwidth - ev.xbutton.y;
1518 } 1658 }
1519 else 1659 else
1520 { 1660 {
1521 scroll_selection_dir = DN; 1661 scroll_selection_dir = DN;
1522 dist = ev.xbutton.y - 1662 dist = ev.xbutton.y - (int_bwidth + height);
1523 (TermWin.int_bwidth + TermWin.height);
1524 } 1663 }
1664
1525 scroll_selection_lines= (Pixel2Height (dist)/ 1665 scroll_selection_lines = Pixel2Height (dist)
1526 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1666 / SELECTION_SCROLL_LINE_SPEEDUP
1667 + 1;
1527 MIN_IT (scroll_selection_lines, 1668 min_it (scroll_selection_lines,
1528 SELECTION_SCROLL_MAX_LINES); 1669 SELECTION_SCROLL_MAX_LINES);
1529 } 1670 }
1530 else 1671 else
1531 { 1672 {
1532 /* we are within the text window, so we 1673 /* we are within the text window, so we
1533 * shouldn't be scrolling 1674 * shouldn't be scrolling
… …
1535 if (sel_scroll_ev.active) 1676 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop(); 1677 sel_scroll_ev.stop();
1537 } 1678 }
1538#endif 1679#endif
1539#ifdef MOUSE_THRESHOLD 1680#ifdef MOUSE_THRESHOLD
1540
1541 } 1681 }
1542#endif 1682#endif
1543
1544 } 1683 }
1545 } 1684 }
1546 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1685 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1547 { 1686 {
1548 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1687 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1549 MotionNotify, &ev)) ; 1688 MotionNotify, &ev))
1689 ;
1690
1550 XQueryPointer (display->display, scrollBar.win, 1691 XQueryPointer (disp, scrollBar.win,
1551 &unused_root, &unused_child, 1692 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1693 &unused_root_x, &unused_root_y,
1553 & (ev.xbutton.x), & (ev.xbutton.y), 1694 &ev.xbutton.x, &ev.xbutton.y,
1554 &unused_mask); 1695 &unused_mask);
1555 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1696 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1556 scrollbar_size ()); 1697 scrollbar_size ());
1557 scr_refresh (refresh_type); 1698 want_refresh = 1;
1558 refresh_limit = 0; 1699 refresh_limit = 0;
1559 scrollbar_show (1); 1700 scrollbar_show (1);
1560 } 1701 }
1561 break; 1702 break;
1562 } 1703 }
1704
1705skip_switch: ;
1706
1707#if defined(CURSOR_BLINK)
1708 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1709 {
1710 if (hidden_cursor)
1711 {
1712 hidden_cursor = 0;
1713 want_refresh = 1;
1714 }
1715
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1717 }
1718#endif
1719
1720#if defined(POINTER_BLANK)
1721 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1722 {
1723 if (ev.type == MotionNotify
1724 || ev.type == ButtonPress
1725 || ev.type == ButtonRelease)
1726 if (hidden_pointer)
1727 pointer_unblank ();
1728
1729 if (ev.type == KeyPress && hidden_pointer == 0)
1730 pointer_blank ();
1731 }
1732#endif
1733}
1734
1735void
1736rxvt_term::focus_in ()
1737{
1738 if (!focus)
1739 {
1740 focus = 1;
1741 want_refresh = 1;
1742
1743 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1744
1745#if USE_XIM
1746 if (Input_Context != NULL)
1747 {
1748 IMSetStatusPosition ();
1749 XSetICFocus (Input_Context);
1750 }
1751#endif
1752#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink))
1754 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1755#endif
1756#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade])
1758 {
1759 pix_colors = pix_colors_focused;
1760 scr_recolour ();
1761 }
1762#endif
1763 }
1764}
1765
1766void
1767rxvt_term::focus_out ()
1768{
1769 if (focus)
1770 {
1771 focus = 0;
1772 want_refresh = 1;
1773
1774 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1775
1776#if ENABLE_FRILLS || ISO_14755
1777 if (iso14755buf)
1778 {
1779 iso14755buf = 0;
1780# if ENABLE_OVERLAY
1781 scr_overlay_off ();
1782# endif
1783 }
1784#endif
1785#if USE_XIM
1786 if (Input_Context != NULL)
1787 XUnsetICFocus (Input_Context);
1788#endif
1789#if CURSOR_BLINK
1790 if (OPTION (Opt_cursorBlink))
1791 cursor_blink_ev.stop ();
1792 hidden_cursor = 0;
1793#endif
1794#if OFF_FOCUS_FADING
1795 if (rs[Rs_fade])
1796 {
1797 pix_colors = pix_colors_unfocused;
1798 scr_recolour ();
1799 }
1800#endif
1801 }
1563} 1802}
1564 1803
1565#if TRANSPARENT 1804#if TRANSPARENT
1566void 1805void
1567rxvt_term::rootwin_cb (XEvent &ev) 1806rxvt_term::rootwin_cb (XEvent &ev)
1568{ 1807{
1569 SET_R (this); 1808 make_current ();
1570 SET_LOCALE (locale);
1571 1809
1572 switch (ev.type) 1810 switch (ev.type)
1573 { 1811 {
1574 case PropertyNotify: 1812 case PropertyNotify:
1575 /* 1813 /*
1576 * if user used some Esetroot compatible prog to set the root bg, 1814 * 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. 1815 * use the property to determine the pixmap. We use it later on.
1578 */ 1816 */
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]) 1817 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1583 return; 1819 return;
1584 1820
1585 /* FALLTHROUGH */ 1821 /* FALLTHROUGH */
1586 case ReparentNotify: 1822 case ReparentNotify:
1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1823 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1588 want_refresh = want_full_refresh = 1; 1824 want_refresh = want_full_refresh = 1;
1589 break; 1825 break;
1590 } 1826 }
1591} 1827}
1592#endif 1828#endif
… …
1595rxvt_term::button_press (XButtonEvent &ev) 1831rxvt_term::button_press (XButtonEvent &ev)
1596{ 1832{
1597 int reportmode = 0, clickintime; 1833 int reportmode = 0, clickintime;
1598 1834
1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1835 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1836
1600 if (!bypass_keystate) 1837 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1838 reportmode = !! (priv_modes & PrivMode_mouse_report);
1839
1602 /* 1840 /*
1603 * VT window processing of button press 1841 * VT window processing of button press
1604 */ 1842 */
1605 if (ev.window == TermWin.vt) 1843 if (ev.window == vt)
1606 { 1844 {
1845#if ISO_14755
1846 // 5.4
1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1848 {
1849 iso14755_54 (ev.x, ev.y);
1850 return;
1851 }
1852#endif
1853
1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1854 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1855
1608 if (reportmode) 1856 if (reportmode)
1609 { 1857 {
1610 /* mouse report from vt window */ 1858 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */ 1859 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state; 1860 MEvent.state = ev.state;
1613#ifdef MOUSE_REPORT_DOUBLECLICK 1861#ifdef MOUSE_REPORT_DOUBLECLICK
1614 if (ev.button == MEvent.button && clickintime) 1862 if (ev.button == MEvent.button && clickintime)
1615 { 1863 {
1616 /* same button, within alloted time */ 1864 /* same button, within alloted time */
1617 MEvent.clicks++; 1865 MEvent.clicks++;
1866
1618 if (MEvent.clicks > 1) 1867 if (MEvent.clicks > 1)
1619 { 1868 {
1620 /* only report double clicks */ 1869 /* only report double clicks */
1621 MEvent.clicks = 2; 1870 MEvent.clicks = 2;
1622 mouse_report (ev); 1871 mouse_report (ev);
… …
1641 } 1890 }
1642 else 1891 else
1643 { 1892 {
1644 if (ev.button != MEvent.button) 1893 if (ev.button != MEvent.button)
1645 MEvent.clicks = 0; 1894 MEvent.clicks = 0;
1895
1896 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1646 switch (ev.button) 1897 switch (ev.button)
1647 { 1898 {
1648 case Button1: 1899 case Button1:
1900 /* allow meta + click to select rectangular areas */
1901 /* should be done in screen.C */
1902#if ENABLE_FRILLS
1903 selection.rect = !!(ev.state & ModMetaMask);
1904#else
1905 selection.rect = false;
1906#endif
1907
1649 /* allow shift+left click to extend selection */ 1908 /* allow shift+left click to extend selection */
1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1651 { 1910 {
1652 if (MEvent.button == Button1 && clickintime) 1911 if (MEvent.button == Button1 && clickintime)
1653 selection_rotate (ev.x, ev.y); 1912 selection_rotate (ev.x, ev.y);
1654 else 1913 else
1655 selection_extend (ev.x, ev.y, 1); 1914 selection_extend (ev.x, ev.y, 1);
1656 } 1915 }
1657 else 1916 else
1658 { 1917 {
1659 if (MEvent.button == Button1 && clickintime) 1918 if (MEvent.button == Button1 && clickintime)
1660 MEvent.clicks++; 1919 MEvent.clicks++;
1661 else 1920 else
1662 MEvent.clicks = 1; 1921 MEvent.clicks = 1;
1663 1922
1664 selection_click (MEvent.clicks, ev.x, ev.y); 1923 selection_click (MEvent.clicks, ev.x, ev.y);
1665 } 1924 }
1666 1925
1667 MEvent.button = Button1; 1926 MEvent.button = Button1;
1668 break; 1927 break;
1669 1928
1670 case Button3: 1929 case Button3:
1671 if (MEvent.button == Button3 && clickintime) 1930 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y); 1931 selection_rotate (ev.x, ev.y);
1673 else 1932 else
1674 selection_extend (ev.x, ev.y, 1); 1933 selection_extend (ev.x, ev.y, 1);
1934
1675 MEvent.button = Button3; 1935 MEvent.button = Button3;
1676 break; 1936 break;
1677 } 1937 }
1678 } 1938 }
1939
1679 MEvent.time = ev.time; 1940 MEvent.time = ev.time;
1680 return; 1941 return;
1681 } 1942 }
1682 1943
1683 /* 1944 /*
… …
1794 case Button3: 2055 case Button3:
1795 if (scrollBar.style != R_SB_XTERM) 2056 if (scrollBar.style != R_SB_XTERM)
1796 { 2057 {
1797 if (scrollbar_above_slider (ev.y)) 2058 if (scrollbar_above_slider (ev.y))
1798# ifdef RXVT_SCROLL_FULL 2059# ifdef RXVT_SCROLL_FULL
1799 scr_page (UP, TermWin.nrow - 1); 2060 scr_page (UP, nrow - 1);
1800# else 2061# else
1801 scr_page (UP, TermWin.nrow / 4); 2062 scr_page (UP, nrow / 4);
1802# endif 2063# endif
1803 else if (scrollbar_below_slider (ev.y)) 2064 else if (scrollbar_below_slider (ev.y))
1804# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
1805 scr_page (DN, TermWin.nrow - 1); 2066 scr_page (DN, nrow - 1);
1806# else 2067# else
1807 scr_page (DN, TermWin.nrow / 4); 2068 scr_page (DN, nrow / 4);
1808# endif 2069# endif
1809 else 2070 else
1810 scrollBar.setMotion (); 2071 scrollBar.setMotion ();
1811 } 2072 }
1812 else 2073 else
1813 { 2074 {
1814 scr_page ((ev.button == Button1 ? DN : UP), 2075 scr_page ((ev.button == Button1 ? DN : UP),
1815 (TermWin.nrow 2076 (nrow
1816 * scrollbar_position (ev.y) 2077 * scrollbar_position (ev.y)
1817 / scrollbar_size ())); 2078 / scrollbar_size ()));
1818 } 2079 }
1819 2080
1820 break; 2081 break;
1821 } 2082 }
1822 } 2083 }
2084
1823 return; 2085 return;
1824 } 2086 }
1825#if MENUBAR
1826 /*
1827 * Menubar window processing of button press
1828 */
1829 if (isMenuBarWindow (ev.window))
1830 menubar_control (ev);
1831#endif
1832} 2087}
1833 2088
1834void 2089void
1835rxvt_term::button_release (XButtonEvent &ev) 2090rxvt_term::button_release (XButtonEvent &ev)
1836{ 2091{
1837 int reportmode = 0; 2092 int reportmode = 0;
1838 2093
1839 csrO = 0; /* reset csr Offset */ 2094 csrO = 0; /* reset csr Offset */
1840 if (!bypass_keystate) 2095 if (!bypass_keystate)
1841 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2096 reportmode = !! (priv_modes & PrivMode_mouse_report);
1842 2097
1843 if (scrollbar_isUpDn ()) 2098 if (scrollbar_isUpDn ())
1844 { 2099 {
1845 scrollBar.setIdle (); 2100 scrollBar.setIdle ();
1846 scrollbar_show (0); 2101 scrollbar_show (0);
1847#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1848 refresh_type &= ~SMOOTH_REFRESH;
1849#endif
1850
1851 } 2102 }
2103
1852#ifdef SELECTION_SCROLLING 2104#ifdef SELECTION_SCROLLING
1853 if (sel_scroll_ev.active) 2105 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop(); 2106 sel_scroll_ev.stop();
1855#endif 2107#endif
2108
1856 if (ev.window == TermWin.vt) 2109 if (ev.window == vt)
1857 { 2110 {
2111#if ISO_14755
2112 // 5.4
2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2114 return;
2115#endif
1858 if (reportmode) 2116 if (reportmode)
1859 { 2117 {
1860 /* mouse report from vt window */ 2118 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */ 2119 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4) 2120 if (ev.button >= 4)
… …
1876 MEvent.button = AnyButton; 2134 MEvent.button = AnyButton;
1877 mouse_report (ev); 2135 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2136#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2137 return;
1880 } 2138 }
2139
1881 /* 2140 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2141 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2142 * when overriding mouse reporting
1884 */ 2143 */
1885 if (PrivateModes & PrivMode_mouse_report 2144 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2145 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2146 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2147 selection_extend (ev.x, ev.y, 0);
2148
2149 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2150 return;
1889 2151
1890 switch (ev.button) 2152 switch (ev.button)
1891 { 2153 {
1892 case Button1: 2154 case Button1:
1893 case Button3: 2155 case Button3:
… …
1905 2167
1906 v = ev.button == Button4 ? UP : DN; 2168 v = ev.button == Button4 ? UP : DN;
1907 2169
1908 if (ev.state & ShiftMask) 2170 if (ev.state & ShiftMask)
1909 i = 1; 2171 i = 1;
1910 else if (Options & Opt_mouseWheelScrollPage) 2172 else if (OPTION (Opt_mouseWheelScrollPage))
1911 i = TermWin.nrow - 1; 2173 i = nrow - 1;
1912 else 2174 else
1913 i = 5; 2175 i = 5;
1914 2176
1915# ifdef MOUSE_SLIP_WHEELING 2177# ifdef MOUSE_SLIP_WHEELING
1916 if (ev.state & ControlMask) 2178 if (ev.state & ControlMask)
1917 { 2179 {
1918 mouse_slip_wheel_speed += v ? -1 : 1; 2180 mouse_slip_wheel_speed += v ? -1 : 1;
1919 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2181 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; 2182 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1921 2183
1922 if (slip_wheel_ev.at < NOW) 2184 if (slip_wheel_ev.at < NOW)
1923 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2185 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1924 2186
1925 slip_wheel_ev.start (); 2187 slip_wheel_ev.start ();
1926 } 2188 }
1927 else 2189 else
1928 { 2190 {
1929# endif 2191# endif
1930# ifdef JUMP_MOUSE_WHEEL
1931 scr_page (v, i); 2192 scr_page (v, i);
1932 scr_refresh (SMOOTH_REFRESH);
1933 scrollbar_show (1); 2193 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 2194# ifdef MOUSE_SLIP_WHEELING
1943 } 2195 }
1944#endif 2196# endif
1945 } 2197 }
1946 break; 2198 break;
1947#endif 2199#endif
1948 } 2200 }
1949 } 2201 }
1950#ifdef MENUBAR
1951 else if (isMenuBarWindow (ev.window))
1952 menubar_control (ev);
1953#endif
1954} 2202}
1955 2203
1956#ifdef TRANSPARENT 2204#ifdef TRANSPARENT
1957#if TINTING 2205#if TINTING
1958/* taken from aterm-0.4.2 */ 2206/* taken from aterm-0.4.2 */
… …
1966 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2214 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1967 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2215 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1968 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2216 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1969 int i; 2217 int i;
1970 2218
1971 Visual* visual = display->visual; 2219 Visual *visual = display->visual;
1972 2220
1973 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2221 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1974 2222
1975 /* for convenience */ 2223 /* for convenience */
1976 mask_r = visual->red_mask; 2224 mask_r = visual->red_mask;
… …
2197 Atom atype; 2445 Atom atype;
2198 unsigned char *prop = NULL; 2446 unsigned char *prop = NULL;
2199 Window root, oldp, *list; 2447 Window root, oldp, *list;
2200 Pixmap rootpixmap = None; 2448 Pixmap rootpixmap = None;
2201 XWindowAttributes wattr, wrootattr; 2449 XWindowAttributes wattr, wrootattr;
2450 dDisp;
2202 2451
2203 pchanged = 0; 2452 pchanged = 0;
2204 2453
2205 if (!(Options & Opt_transparent)) 2454 if (!OPTION (Opt_transparent))
2206 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
2207 2456
2208 XGetWindowAttributes (display->display, display->root, &wrootattr); 2457 XGetWindowAttributes (disp, display->root, &wrootattr);
2209 rootdepth = wrootattr.depth; 2458 rootdepth = wrootattr.depth;
2210 2459
2211 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2460 XGetWindowAttributes (disp, parent[0], &wattr);
2212 2461
2213 if (rootdepth != wattr.depth) 2462 if (rootdepth != wattr.depth)
2214 { 2463 {
2215 if (am_transparent) 2464 if (am_transparent)
2216 { 2465 {
2217 pchanged = 1; 2466 pchanged = 1;
2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2467 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2219 am_transparent = am_pixmap_trans = 0; 2468 am_transparent = am_pixmap_trans = 0;
2220 } 2469 }
2221 2470
2222 return pchanged; /* Don't try any more */ 2471 return pchanged; /* Don't try any more */
2223 } 2472 }
2224 2473
2225 /* Get all X ops out of the queue so that our information is up-to-date. */ 2474 /* Get all X ops out of the queue so that our information is up-to-date. */
2226 XSync (display->display, False); 2475 XSync (disp, False);
2227 2476
2228 /* 2477 /*
2229 * Make the frame window set by the window manager have 2478 * Make the frame window set by the window manager have
2230 * the root background. Some window managers put multiple nested frame 2479 * the root background. Some window managers put multiple nested frame
2231 * windows for each client, so we have to take care about that. 2480 * windows for each client, so we have to take care about that.
2232 */ 2481 */
2233 i = (xa[XA_XROOTPMAPID] 2482 i = (xa[XA_XROOTPMAP_ID]
2234 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2483 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2235 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2236 &nitems, &bytes_after, &prop) == Success); 2485 &nitems, &bytes_after, &prop) == Success);
2237 2486
2238 if (!i || prop == NULL) 2487 if (!i || prop == NULL)
2239 i = (xa[XA_XSETROOTID] 2488 i = (xa[XA_ESETROOT_PMAP_ID]
2240 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2489 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2241 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2242 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2243 2492
2244 if (!i || prop == NULL 2493 if (!i || prop == NULL
2245#if TINTING 2494#if TINTING
… …
2264 Window cr; 2513 Window cr;
2265 XImage *image; 2514 XImage *image;
2266 GC gc; 2515 GC gc;
2267 XGCValues gcvalue; 2516 XGCValues gcvalue;
2268 2517
2269 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2518 XTranslateCoordinates (disp, parent[0], display->root,
2270 0, 0, &sx, &sy, &cr); 2519 0, 0, &sx, &sy, &cr);
2271 nw = (unsigned int)szHint.width; 2520 nw = (unsigned int)szHint.width;
2272 nh = (unsigned int)szHint.height; 2521 nh = (unsigned int)szHint.height;
2273 nx = ny = 0; 2522 nx = ny = 0;
2274 2523
… …
2284 nh += sy; 2533 nh += sy;
2285 ny = -sy; 2534 ny = -sy;
2286 sy = 0; 2535 sy = 0;
2287 } 2536 }
2288 2537
2289 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2290 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2540
2541 XSync (disp, False);
2291 allowedxerror = -1; 2542 allowedxerror = -1;
2292 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2543 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2293 2544
2294 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2295 /* XXX: may need a delay here? */ 2546 /* XXX: may need a delay here? */
2296 allowedxerror = 0; 2547 allowedxerror = 0;
2297 2548
2298 if (image == NULL) 2549 if (image == NULL)
2299 { 2550 {
2300 if (am_transparent && am_pixmap_trans) 2551 if (am_transparent && am_pixmap_trans)
2301 { 2552 {
2302 pchanged = 1; 2553 pchanged = 1;
2303 if (TermWin.pixmap != None) 2554 if (pixmap != None)
2304 { 2555 {
2305 XFreePixmap (display->display, TermWin.pixmap); 2556 XFreePixmap (disp, pixmap);
2306 TermWin.pixmap = None; 2557 pixmap = None;
2307 } 2558 }
2308 } 2559 }
2309 2560
2310 am_pixmap_trans = 0; 2561 am_pixmap_trans = 0;
2311 } 2562 }
2312 else 2563 else
2313 { 2564 {
2314 if (TermWin.pixmap != None) 2565 if (pixmap != None)
2315 XFreePixmap (display->display, TermWin.pixmap); 2566 XFreePixmap (disp, pixmap);
2316 2567
2317#if TINTING 2568#if TINTING
2318 if (ISSET_PIXCOLOR (Color_tint)) 2569 if (ISSET_PIXCOLOR (Color_tint))
2319 { 2570 {
2320 unsigned short rm, gm, bm; 2571 unsigned short rm, gm, bm;
2321 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2572 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2322 2573
2323 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2574 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2324 2575
2325 ShadeXImage (display, image, shade, rm, gm, bm); 2576 ShadeXImage (display, image, shade, rm, gm, bm);
2326 } 2577 }
2327#endif 2578#endif
2328 2579
2329 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2580 pixmap = XCreatePixmap (disp, vt,
2330 szHint.width, szHint.height, image->depth); 2581 szHint.width, szHint.height, image->depth);
2331 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2582 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2332 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2583 XPutImage (disp, pixmap, gc, image, 0, 0,
2333 nx, ny, image->width, image->height); 2584 nx, ny, image->width, image->height);
2334 XFreeGC (display->display, gc); 2585 XFreeGC (disp, gc);
2335 XDestroyImage (image); 2586 XDestroyImage (image);
2336 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2587 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2337 XClearWindow (display->display, TermWin.parent[0]); 2588 XClearWindow (disp, parent[0]);
2338 2589
2339 if (!am_transparent || !am_pixmap_trans) 2590 if (!am_transparent || !am_pixmap_trans)
2340 pchanged = 1; 2591 pchanged = 1;
2341 2592
2342 am_transparent = am_pixmap_trans = 1; 2593 am_transparent = am_pixmap_trans = 1;
2343 } 2594 }
2344 } 2595 }
2345 2596
2346 if (!am_pixmap_trans) 2597 if (am_pixmap_trans)
2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2599 else
2347 { 2600 {
2348 unsigned int n; 2601 unsigned int n;
2349 /* 2602 /*
2350 * InheritPixmap transparency 2603 * InheritPixmap transparency
2351 */ 2604 */
2352 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2353 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2605 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2354 { 2606 {
2355 oldp = TermWin.parent[i]; 2607 oldp = parent[i];
2356 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2608 XQueryTree (disp, parent[i - 1], &root,
2357 &TermWin.parent[i], &list, &n); 2609 &parent[i], &list, &n);
2358 XFree (list); 2610 XFree (list);
2359 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2360 2611
2361 if (TermWin.parent[i] == display->root) 2612 if (parent[i] == display->root)
2362 { 2613 {
2363 if (oldp != None) 2614 if (oldp != None)
2364 pchanged = 1; 2615 pchanged = 1;
2365 2616
2366 break; 2617 break;
2367 } 2618 }
2368 2619
2369 if (oldp != TermWin.parent[i]) 2620 if (oldp != parent[i])
2370 pchanged = 1; 2621 pchanged = 1;
2371 } 2622 }
2372 2623
2373 n = 0; 2624 n = 0;
2374 2625
2375 if (pchanged) 2626 if (pchanged)
2376 { 2627 {
2377 for (; n < (unsigned int)i; n++) 2628 for (; n < (unsigned int)i; n++)
2378 { 2629 {
2379 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2630 XGetWindowAttributes (disp, parent[n], &wattr);
2380 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2381 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2382 { 2632 {
2383 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2384 break; 2634 break;
2385 } 2635 }
2386 } 2636 }
2387 } 2637 }
2388 2638
2389 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2639 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2390 { 2640 {
2391 D_X ((stderr, "InheritPixmap Turning off"));
2392 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2641 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2642 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2394 am_transparent = 0; 2643 am_transparent = 0;
2395 /* XXX: also turn off Opt_transparent? */ 2644 /* XXX: also turn off Opt_transparent? */
2396 } 2645 }
2397 else 2646 else
2398 { 2647 {
2399#if WAIT_FOR_WM 2648#if WAIT_FOR_WM
2400 /* wait (an arbitrary period) for the WM to do its thing 2649 /* wait (an arbitrary period) for the WM to do its thing
2401 * needed for fvwm2.2.2 (and before?) */ 2650 * needed for fvwm2.2.2 (and before?) */
2402 sleep (1); 2651 sleep (1);
2403#endif 2652#endif
2404 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2405 for (n = 0; n < (unsigned int)i; n++) 2653 for (n = 0; n < (unsigned int)i; n++)
2406 { 2654 {
2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2655 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2408 XClearWindow (display->display, TermWin.parent[n]); 2656 XClearWindow (disp, parent[n]);
2409 } 2657 }
2410 2658
2411 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2659 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2412 am_transparent = 1; 2660 am_transparent = 1;
2413 } 2661 }
2414 2662
2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2663 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2416 TermWin.parent[i] = None; 2664 parent[i] = None;
2417 } 2665 }
2418 2666
2419 // this is experimental
2420 if (scrollBar.win) 2667 if (scrollBar.win)
2421 { 2668 {
2422 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2669 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2423 XClearWindow (display->display, scrollBar.win);
2424 scrollBar.setIdle (); 2670 scrollBar.setIdle ();
2425 scrollbar_show (0); 2671 scrollbar_show (0);
2426 } 2672 }
2427 2673
2674 if (am_transparent)
2675 {
2676 want_refresh = want_full_refresh = 1;
2677 if (am_pixmap_trans)
2678 flush ();
2679 }
2680
2428 return pchanged; 2681 return pchanged;
2429} 2682}
2430#endif 2683#endif
2431 2684
2432/*}}} */ 2685/*}}} */
2433 2686
2434bool 2687bool
2435rxvt_term::cmd_parse () 2688rxvt_term::cmd_parse ()
2436{ 2689{
2437 bool flag = false; 2690 bool flag = false;
2438 unicode_t ch = NOCHAR; 2691 wchar_t ch = NOCHAR;
2439 unsigned char *seq_begin; // remember start of esc-sequence here 2692 char *seq_begin; // remember start of esc-sequence here
2440 2693
2441 for (;;) 2694 for (;;)
2442 { 2695 {
2443 if (ch == NOCHAR) 2696 if (ch == NOCHAR)
2444 { 2697 {
2445 seq_begin = cmdbuf_ptr; 2698 seq_begin = cmdbuf_ptr;
2446 ch = next_char (); 2699 ch = next_char ();
2447 }
2448 2700
2449 if (ch == NOCHAR) // TODO: improve 2701 if (ch == NOCHAR)
2450 break; 2702 break;
2703 }
2451 2704
2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2705 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2453 { 2706 {
2707 if (!seen_input)
2708 {
2709 seen_input = 1;
2710 // many badly-written programs (e.g. jed) contain a race condition:
2711 // they first read the screensize and then install a SIGWINCH handler.
2712 // some window managers resize the window early, and these programs
2713 // then sometimes get the size wrong.
2714 // unfortunately other programs are even more buggy and dislike
2715 // being sent SIGWINCH, so only do it when we were in fact being
2716 // resized.
2717 if (seen_resize && cmd_pid)
2718 kill (-cmd_pid, SIGWINCH);
2719 }
2720
2454 /* Read a text string from the input buffer */ 2721 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ]; 2722 wchar_t buf[UBUFSIZ];
2456 bool refreshnow = false; 2723 bool refreshnow = false;
2457 int nlines = 0; 2724 int nlines = 0;
2458 unicode_t *str = buf; 2725 wchar_t *str = buf;
2726 wchar_t *eol = str + min (ncol, UBUFSIZ);
2459 2727
2460 for (;;) 2728 for (;;)
2461 { 2729 {
2462 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2730 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2463 break; 2731 break;
2464 2732
2465 *str++ = ch; 2733 *str++ = ch;
2466 2734
2467 if (ch == C0_LF) 2735 if (ch == C0_LF || str >= eol)
2468 { 2736 {
2737 if (ch == C0_LF)
2469 nlines++; 2738 nlines++;
2739
2470 refresh_count++; 2740 refresh_count++;
2471 2741
2472 if (!(Options & Opt_jumpScroll) 2742 if (!OPTION (Opt_jumpScroll)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2743 || (refresh_count >= refresh_limit * (nrow - 1)))
2474 { 2744 {
2475 refreshnow = true; 2745 refreshnow = true;
2746 refresh_count = 0;
2476 ch = NOCHAR; 2747 ch = NOCHAR;
2477 break; 2748 break;
2478 } 2749 }
2479 2750
2480 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2751 // scr_add_lines only works for nlines <= nrow - 1.
2481 if (nlines >= TermWin.nrow - 1) 2752 if (nlines >= nrow - 1)
2482 { 2753 {
2754 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2755 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2483 scr_add_lines (buf, nlines, str - buf); 2756 scr_add_lines (buf, str - buf, nlines);
2757
2484 nlines = 0; 2758 nlines = 0;
2485 str = buf; 2759 str = buf;
2760 eol = str + min (ncol, UBUFSIZ);
2486 } 2761 }
2487 }
2488 2762
2489 if (str >= buf + UBUFSIZ) 2763 if (str >= eol)
2490 { 2764 {
2765 if (eol >= buf + UBUFSIZ)
2766 {
2491 ch = NOCHAR; 2767 ch = NOCHAR;
2492 break; 2768 break;
2769 }
2770 else
2771 eol = min (eol + ncol, buf + UBUFSIZ);
2772 }
2773
2493 } 2774 }
2494 2775
2495 seq_begin = cmdbuf_ptr; 2776 seq_begin = cmdbuf_ptr;
2496 ch = next_char (); 2777 ch = next_char ();
2497 } 2778 }
2498 2779
2780 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2781 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2499 scr_add_lines (buf, nlines, str - buf); 2782 scr_add_lines (buf, str - buf, nlines);
2500 2783
2501 /* 2784 /*
2502 * If there have been a lot of new lines, then update the screen 2785 * 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. 2786 * 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 2787 * the number of pages between refreshes is refresh_limit, which
2505 * is incremented here because we must be doing flat-out scrolling. 2788 * is incremented here because we must be doing flat-out scrolling.
2506 */ 2789 */
2507 if (refreshnow) 2790 if (refreshnow)
2508 { 2791 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2792 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++; 2793 refresh_limit++;
2511 else 2794 else
2512 { 2795 {
2513 flag = true; 2796 flag = true;
2514 scr_refresh (refresh_type); 2797 scr_refresh ();
2798 want_refresh = 1;
2515 } 2799 }
2516 } 2800 }
2517 2801
2518 } 2802 }
2519 else 2803 else
… …
2534 } 2818 }
2535 2819
2536 return flag; 2820 return flag;
2537} 2821}
2538 2822
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 2823// read the next character
2549unicode_t 2824wchar_t
2550rxvt_term::next_char () 2825rxvt_term::next_char ()
2551{ 2826{
2552 while (cmdbuf_ptr < cmdbuf_endp) 2827 while (cmdbuf_ptr < cmdbuf_endp)
2553 { 2828 {
2554 // assume 7-bit to be ascii ALWAYS 2829 // assume 7-bit to be ascii ALWAYS
2555 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2830 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2556 return *cmdbuf_ptr++; 2831 return *cmdbuf_ptr++;
2557 2832
2558 wchar_t wc; 2833 wchar_t wc;
2559 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2834 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2560 2835
2561 if (len == (size_t)-2) 2836 if (len == (size_t)-2)
2562 { 2837 {
2563 // the mbstate stores incomplete sequences. didn't know this :/ 2838 // the mbstate stores incomplete sequences. didn't know this :/
2564 cmdbuf_ptr = cmdbuf_endp; 2839 cmdbuf_ptr = cmdbuf_endp;
2565 break; 2840 break;
2566 } 2841 }
2567 2842
2568 if (len == (size_t)-1) 2843 if (len == (size_t)-1)
2569 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2844 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2570 2845
2571 // assume wchar == unicode 2846 // assume wchar == unicode
2572 cmdbuf_ptr += len; 2847 cmdbuf_ptr += len;
2573 return wc; 2848 return wc & UNICODE_MASK;
2574 } 2849 }
2575 2850
2576 return NOCHAR; 2851 return NOCHAR;
2852}
2853
2854// read the next octet
2855uint32_t
2856rxvt_term::next_octet ()
2857{
2858 return cmdbuf_ptr < cmdbuf_endp
2859 ? (unsigned char)*cmdbuf_ptr++
2860 : NOCHAR;
2577} 2861}
2578 2862
2579/* rxvt_cmd_getc () - Return next input character */ 2863/* rxvt_cmd_getc () - Return next input character */
2580/* 2864/*
2581 * Return the next input character after first passing any keyboard input 2865 * Return the next input character after first passing any keyboard input
2582 * to the command. 2866 * to the command.
2583 */ 2867 */
2584unicode_t 2868wchar_t
2585rxvt_term::cmd_getc () 2869rxvt_term::cmd_getc ()
2586{ 2870{
2587 unicode_t c = next_char (); 2871 wchar_t c = next_char ();
2588 2872
2589 if (c == NOCHAR) 2873 if (c == NOCHAR)
2590 throw out_of_input; 2874 throw out_of_input;
2591 2875
2592 return c; 2876 return c;
2593} 2877}
2594 2878
2595unicode_t 2879uint32_t
2596rxvt_term::cmd_get8 () 2880rxvt_term::cmd_get8 ()
2597{ 2881{
2598 unicode_t c = next_octet (); 2882 uint32_t c = next_octet ();
2599 2883
2600 if (c == NOCHAR) 2884 if (c == NOCHAR)
2601 throw out_of_input; 2885 throw out_of_input;
2602 2886
2603 return c; 2887 return c;
… …
2703 case C0_ESC: 2987 case C0_ESC:
2704 process_escape_seq (); 2988 process_escape_seq ();
2705 break; 2989 break;
2706 case C0_ENQ: /* terminal Status */ 2990 case C0_ENQ: /* terminal Status */
2707 if (rs[Rs_answerbackstring]) 2991 if (rs[Rs_answerbackstring])
2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2992 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2709 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2710 else 2993 else
2711 tt_write ((unsigned char *)VT100_ANS, 2994 tt_write (VT100_ANS, strlen (VT100_ANS));
2712 (unsigned int)STRLEN (VT100_ANS));
2713 break; 2995 break;
2714 case C0_BEL: /* bell */ 2996 case C0_BEL: /* bell */
2715 scr_bell (); 2997 scr_bell ();
2716 break; 2998 break;
2717 case C0_BS: /* backspace */ 2999 case C0_BS: /* backspace */
… …
2816void 3098void
2817rxvt_term::process_escape_seq () 3099rxvt_term::process_escape_seq ()
2818{ 3100{
2819 unicode_t ch = cmd_getc (); 3101 unicode_t ch = cmd_getc ();
2820 3102
2821 if (PrivateModes & PrivMode_vt52) 3103 if (priv_modes & PrivMode_vt52)
2822 { 3104 {
2823 process_escape_vt52 (ch); 3105 process_escape_vt52 (ch);
2824 return; 3106 return;
2825 } 3107 }
2826 3108
… …
2841 scr_charset_set (2, (unsigned int)cmd_getc ()); 3123 scr_charset_set (2, (unsigned int)cmd_getc ());
2842 break; 3124 break;
2843 case '+': 3125 case '+':
2844 scr_charset_set (3, (unsigned int)cmd_getc ()); 3126 scr_charset_set (3, (unsigned int)cmd_getc ());
2845 break; 3127 break;
2846#ifndef NO_FRILLS 3128#if ENABLE_FRILLS
2847 case '6': 3129 case '6':
2848 scr_backindex (); 3130 scr_backindex ();
2849 break; 3131 break;
2850#endif 3132#endif
2851 case '7': 3133 case '7':
2852 scr_cursor (SAVE); 3134 scr_cursor (SAVE);
2853 break; 3135 break;
2854 case '8': 3136 case '8':
2855 scr_cursor (RESTORE); 3137 scr_cursor (RESTORE);
2856 break; 3138 break;
2857#ifndef NO_FRILLS 3139#if ENABLE_FRILLS
2858 case '9': 3140 case '9':
2859 scr_forwardindex (); 3141 scr_forwardindex ();
2860 break; 3142 break;
2861#endif 3143#endif
2862 case '=': 3144 case '=':
… …
2872 break; 3154 break;
2873 3155
2874 /* 8.3.87: NEXT LINE */ 3156 /* 8.3.87: NEXT LINE */
2875 case C1_NEL: /* ESC E */ 3157 case C1_NEL: /* ESC E */
2876 { 3158 {
2877 unicode_t nlcr[] = { C0_LF, C0_CR }; 3159 wchar_t nlcr[] = { C0_LF, C0_CR };
2878 scr_add_lines (nlcr, 1, 2); 3160 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2879 } 3161 }
2880 break; 3162 break;
2881 3163
2882 /* kidnapped escape sequence: Should be 8.3.48 */ 3164 /* kidnapped escape sequence: Should be 8.3.48 */
2883 case C1_ESA: /* ESC G */ 3165 case C1_ESA: /* ESC G */
… …
2905 process_dcs_seq (); 3187 process_dcs_seq ();
2906 break; 3188 break;
2907 3189
2908 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3190 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2909 case C1_SCI: /* ESC Z */ 3191 case C1_SCI: /* ESC Z */
2910 tt_write ((const unsigned char *)ESCZ_ANSWER, 3192 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2911 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2912 break; /* steal obsolete ESC [ c */ 3193 break; /* steal obsolete ESC [ c */
2913 3194
2914 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3195 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2915 case C1_CSI: /* ESC [ */ 3196 case C1_CSI: /* ESC [ */
2916 process_csi_seq (); 3197 process_csi_seq ();
… …
3041 { 3322 {
3042 switch (priv) 3323 switch (priv)
3043 { 3324 {
3044 case '>': 3325 case '>':
3045 if (ch == CSI_DA) /* secondary device attributes */ 3326 if (ch == CSI_DA) /* secondary device attributes */
3046 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3327 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3047 break; 3328 break;
3048 case '?': 3329 case '?':
3049 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3330 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3050 process_terminal_mode (ch, priv, nargs, arg); 3331 process_terminal_mode (ch, priv, nargs, arg);
3051 break; 3332 break;
… …
3156 3437
3157 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3438 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3158 arg[0] = -arg[0]; 3439 arg[0] = -arg[0];
3159 /* FALLTHROUGH */ 3440 /* FALLTHROUGH */
3160 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3441 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3161 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3442 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3162 break; 3443 break;
3163 3444
3164 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3445 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3165 tt_write ((const unsigned char *)VT100_ANS, 3446 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3166 (unsigned int) (sizeof (VT100_ANS) - 1));
3167 break; 3447 break;
3168 3448
3169 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3449 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3170 process_sgr_mode (nargs, arg); 3450 process_sgr_mode (nargs, arg);
3171 break; 3451 break;
… …
3178 break; 3458 break;
3179 case 6: /* CPR requested */ 3459 case 6: /* CPR requested */
3180 scr_report_position (); 3460 scr_report_position ();
3181 break; 3461 break;
3182 case 7: /* unofficial extension */ 3462 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure) 3463 if (OPTION (Opt_insecure))
3184 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3464 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3185 break; 3465 break;
3186 case 8: /* unofficial extension */ 3466 case 8: /* unofficial extension */
3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3467 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3188 break; 3468 break;
3189 } 3469 }
… …
3225 break; 3505 break;
3226 3506
3227 case CSI_RM: /* 8.3.107: RESET MODE */ 3507 case CSI_RM: /* 8.3.107: RESET MODE */
3228 if (arg[0] == 4) 3508 if (arg[0] == 4)
3229 scr_insert_mode (0); 3509 scr_insert_mode (0);
3510 else if (arg[0] == 20)
3511 priv_modes &= ~PrivMode_LFNL;
3230 break; 3512 break;
3231 3513
3232 case CSI_SM: /* 8.3.126: SET MODE */ 3514 case CSI_SM: /* 8.3.126: SET MODE */
3233 if (arg[0] == 4) 3515 if (arg[0] == 4)
3234 scr_insert_mode (1); 3516 scr_insert_mode (1);
3517 else if (arg[0] == 20)
3518 priv_modes |= PrivMode_LFNL;
3235 break; 3519 break;
3236 3520
3237 /* 3521 /*
3238 * PRIVATE USE beyond this point. All CSI_7? sequences here 3522 * PRIVATE USE beyond this point. All CSI_7? sequences here
3239 */ 3523 */
… …
3251 break; 3535 break;
3252 case CSI_75: 3536 case CSI_75:
3253 scr_cursor (RESTORE); 3537 scr_cursor (RESTORE);
3254 break; 3538 break;
3255 3539
3256#ifndef NO_FRILLS 3540#if ENABLE_FRILLS
3257 case CSI_74: 3541 case CSI_74:
3258 process_window_ops (arg, nargs); 3542 process_window_ops (arg, nargs);
3259 break; 3543 break;
3260#endif 3544#endif
3261 3545
… …
3268 break; 3552 break;
3269 } 3553 }
3270} 3554}
3271/*}}} */ 3555/*}}} */
3272 3556
3273#ifndef NO_FRILLS 3557#if ENABLE_FRILLS
3274/* ARGSUSED */ 3558/* ARGSUSED */
3275void 3559void
3276rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3560rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3277{ 3561{
3278 int x, y; 3562 int x, y;
3279 XWindowAttributes wattr; 3563 XWindowAttributes wattr;
3280 Window wdummy; 3564 Window wdummy;
3565 dDisp;
3281 3566
3282 if (nargs == 0) 3567 if (nargs == 0)
3283 return; 3568 return;
3284 3569
3285 switch (args[0]) 3570 switch (args[0])
3286 { 3571 {
3287 /* 3572 /*
3288 * commands 3573 * commands
3289 */ 3574 */
3290 case 1: /* deiconify window */ 3575 case 1: /* deiconify window */
3291 XMapWindow (display->display, TermWin.parent[0]); 3576 XMapWindow (disp, parent[0]);
3292 break; 3577 break;
3293 case 2: /* iconify window */ 3578 case 2: /* iconify window */
3294 XIconifyWindow (display->display, TermWin.parent[0], 3579 XIconifyWindow (disp, parent[0], display->screen);
3295 DefaultScreen (display->display));
3296 break; 3580 break;
3297 case 3: /* set position (pixels) */ 3581 case 3: /* set position (pixels) */
3298 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3582 XMoveWindow (disp, parent[0], args[1], args[2]);
3299 break; 3583 break;
3300 case 4: /* set size (pixels) */ 3584 case 4: /* set size (pixels) */
3301 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3302 break; 3586 break;
3303 case 5: /* raise window */ 3587 case 5: /* raise window */
3304 XRaiseWindow (display->display, TermWin.parent[0]); 3588 XRaiseWindow (disp, parent[0]);
3305 break; 3589 break;
3306 case 6: /* lower window */ 3590 case 6: /* lower window */
3307 XLowerWindow (display->display, TermWin.parent[0]); 3591 XLowerWindow (disp, parent[0]);
3308 break; 3592 break;
3309 case 7: /* refresh window */ 3593 case 7: /* refresh window */
3310 scr_touch (true); 3594 scr_touch (true);
3311 break; 3595 break;
3312 case 8: /* set size (chars) */ 3596 case 8: /* set size (chars) */
3313 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3597 set_widthheight ((unsigned int) (args[2] * fwidth),
3314 (unsigned int) (args[1] * TermWin.fheight)); 3598 (unsigned int) (args[1] * fheight));
3315 break; 3599 break;
3316 3600
3317 //case 9: NYI, TODO, restore maximized window or maximize window 3601 //case 9: NYI, TODO, restore maximized window or maximize window
3318 default: 3602 default:
3319 if (args[0] >= 24) /* set height (chars) */ 3603 if (args[0] >= 24) /* set height (chars) */
3320 set_widthheight ((unsigned int)TermWin.width, 3604 set_widthheight ((unsigned int)width,
3321 (unsigned int) (args[1] * TermWin.fheight)); 3605 (unsigned int) (args[1] * fheight));
3322 break; 3606 break;
3323 3607
3324 3608
3325 /* 3609 /*
3326 * reports - some output format copied from XTerm 3610 * reports - some output format copied from XTerm
3327 */ 3611 */
3328 case 11: /* report window state */ 3612 case 11: /* report window state */
3329 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3613 XGetWindowAttributes (disp, parent[0], &wattr);
3330 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3614 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3331 break; 3615 break;
3332 case 13: /* report window position */ 3616 case 13: /* report window position */
3333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3617 XGetWindowAttributes (disp, parent[0], &wattr);
3334 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3618 XTranslateCoordinates (disp, parent[0], wattr.root,
3335 -wattr.border_width, -wattr.border_width, 3619 -wattr.border_width, -wattr.border_width,
3336 &x, &y, &wdummy); 3620 &x, &y, &wdummy);
3337 tt_printf ("\033[3;%d;%dt", x, y); 3621 tt_printf ("\033[3;%d;%dt", x, y);
3338 break; 3622 break;
3339 case 14: /* report window size (pixels) */ 3623 case 14: /* report window size (pixels) */
3340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3624 XGetWindowAttributes (disp, parent[0], &wattr);
3341 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3625 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3342 break; 3626 break;
3343 case 18: /* report text area size (chars) */ 3627 case 18: /* report text area size (chars) */
3344 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3628 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3345 break; 3629 break;
3346 case 19: /* report window size (chars) */ 3630 case 19: /* report window size (chars) */
3347 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3631 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3348 break; 3632 break;
3349 case 20: /* report icon label */ 3633 case 20: /* report icon label */
3350 { 3634 {
3351 char *s; 3635 char *s;
3352 XGetIconName (display->display, TermWin.parent[0], &s); 3636 XGetIconName (disp, parent[0], &s);
3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3637 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s); 3638 XFree (s);
3355 } 3639 }
3356 break; 3640 break;
3357 case 21: /* report window title */ 3641 case 21: /* report window title */
3358 { 3642 {
3359 char *s; 3643 char *s;
3360 XFetchName (display->display, TermWin.parent[0], &s); 3644 XFetchName (disp, parent[0], &s);
3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3645 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s); 3646 XFree (s);
3363 } 3647 }
3364 break; 3648 break;
3365 } 3649 }
3366} 3650}
… …
3369/*----------------------------------------------------------------------*/ 3653/*----------------------------------------------------------------------*/
3370/* 3654/*
3371 * get input up until STRING TERMINATOR (or BEL) 3655 * get input up until STRING TERMINATOR (or BEL)
3372 * ends_how is terminator used. returned input must be free()'d 3656 * ends_how is terminator used. returned input must be free()'d
3373 */ 3657 */
3374unsigned char * 3658char *
3375rxvt_term::get_to_st (unicode_t &ends_how) 3659rxvt_term::get_to_st (unicode_t &ends_how)
3376{ 3660{
3377 unicode_t prev = 0, ch; 3661 unicode_t ch;
3662 bool seen_esc = false;
3378 unsigned int n = 0; 3663 unsigned int n = 0;
3379 unsigned char *s;
3380 unsigned char string[STRING_MAX]; 3664 wchar_t string[STRING_MAX];
3381 3665
3382 while ((ch = cmd_getc ()) != NOCHAR) 3666 while ((ch = cmd_getc ()) != NOCHAR)
3383 { 3667 {
3384 if (prev == C0_ESC) 3668 if (seen_esc)
3385 { 3669 {
3386 if (ch == 0x5c) /* 7bit ST */ 3670 if (ch == 0x5c) /* 7bit ST */
3387 break; 3671 break;
3388 else 3672 else
3389 return NULL; 3673 return NULL;
3390 } 3674 }
3675 else if (ch == C0_ESC)
3676 {
3677 seen_esc = true;
3678 continue;
3679 }
3391 else if (ch == C0_BEL || ch == CHAR_ST) 3680 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break; 3681 break;
3393 else if (ch < 0x20) 3682 else if (ch < 0x20)
3394 return NULL; /* other control character - exit */ 3683 return NULL; /* other control character - exit */
3395 3684
3396 if (n >= sizeof (string) - 1) 3685 seen_esc = false;
3686
3687 if (n >= STRING_MAX - 1)
3397 // stop at some sane length 3688 // stop at some sane length
3398 return NULL; 3689 return NULL;
3399 3690
3400 if (ch == C0_SYN) 3691 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 (); 3692 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else 3693 else
3406 string[n++] = prev = ch; 3694 string[n++] = ch;
3407 } 3695 }
3408 3696
3409 string[n++] = '\0'; 3697 string[n++] = '\0';
3410 3698
3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3412 return NULL;
3413
3414 ends_how = (ch == 0x5c ? C0_ESC : ch); 3699 ends_how = (ch == 0x5c ? C0_ESC : ch);
3415 STRNCPY (s, string, n); 3700
3416 return s; 3701 return rxvt_wcstombs (string);
3417} 3702}
3418 3703
3419/*----------------------------------------------------------------------*/ 3704/*----------------------------------------------------------------------*/
3420/* 3705/*
3421 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3706 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3422 */ 3707 */
3423void 3708void
3424rxvt_term::process_dcs_seq () 3709rxvt_term::process_dcs_seq ()
3425{ 3710{
3426 unsigned char *s; 3711 char *s;
3427 unicode_t eh; 3712 unicode_t eh;
3428 3713
3429 /* 3714 /*
3430 * Not handled yet 3715 * Not handled yet
3431 */ 3716 */
… …
3450 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3735 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3451 arg = arg * 10 + (ch - '0'); 3736 arg = arg * 10 + (ch - '0');
3452 3737
3453 if (ch == ';') 3738 if (ch == ';')
3454 { 3739 {
3455 unsigned char *s = get_to_st (eh); 3740 char *s = get_to_st (eh);
3456 3741
3457 if (s) 3742 if (s)
3458 { 3743 {
3459 process_xterm_seq (arg, (char *)s, eh); 3744 process_xterm_seq (arg, s, eh);
3460 free (s); 3745 free (s);
3461 } 3746 }
3462 } 3747 }
3463} 3748}
3464 3749
3465void 3750void
3466rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3751rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3467{ 3752{
3468 if (str[0] == '?' && !str[1]) 3753 if (str[0] == '?' && !str[1])
3469 { 3754 {
3470 unsigned short r, g, b; 3755 unsigned short r, g, b;
3471 PixColorsFocused[color].get (display, r, g, b); 3756 pix_colors_focused[color].get (display, r, g, b);
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3757 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3473 } 3758 }
3474 else 3759 else
3475 set_window_color (color, str); 3760 set_window_color (color, str);
3476} 3761}
3477 3762
3478/* 3763/*
3479 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3764 * 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 */ 3765 */
3503void 3766void
3504rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3767rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3505{ 3768{
3506 int changed = 0; 3769 int changed = 0;
3507 int color; 3770 int color;
3508 char *buf, *name; 3771 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1]; 3772 bool query = str[0] == '?' && !str[1];
3773 int saveop = op;
3774 dDisp;
3510 3775
3511 assert (str != NULL); 3776 assert (str != NULL);
3512 switch (op) 3777 switch (op)
3513 { 3778 {
3514 case XTerm_name: 3779 case XTerm_name:
… …
3521 set_title (str); 3786 set_title (str);
3522 break; 3787 break;
3523 case XTerm_property: 3788 case XTerm_property:
3524 if (str[0] == '?') 3789 if (str[0] == '?')
3525 { 3790 {
3526 Atom prop = XInternAtom (display->display, str + 1, True); 3791 Atom prop = display->atom (str + 1);
3527 Atom actual_type; 3792 Atom actual_type;
3528 int actual_format; 3793 int actual_format;
3529 unsigned long nitems; 3794 unsigned long nitems;
3530 unsigned long bytes_after; 3795 unsigned long bytes_after;
3531 unsigned char *value = 0; 3796 unsigned char *value = 0;
3532 const char *str = ""; 3797 const char *str = "";
3533 3798
3534 if (prop 3799 if (prop
3535 && XGetWindowProperty (display->display, TermWin.parent[0], 3800 && XGetWindowProperty (disp, parent[0],
3536 prop, 0, 1<<16, 0, AnyPropertyType, 3801 prop, 0, 1<<16, 0, AnyPropertyType,
3537 &actual_type, &actual_format, 3802 &actual_type, &actual_format,
3538 &nitems, &bytes_after, &value) == Success 3803 &nitems, &bytes_after, &value) == Success
3539 && actual_type != None 3804 && actual_type != None
3540 && actual_format == 8) 3805 && actual_format == 8)
… …
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3814 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550 3815
3551 if (eq) 3816 if (eq)
3552 { 3817 {
3553 *eq = 0; 3818 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0], 3819 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 } 3820 }
3559 else 3821 else
3560 XDeleteProperty (display->display, TermWin.parent[0], 3822 XDeleteProperty (disp, parent[0],
3561 display->atom (str)); 3823 display->atom (str));
3562 } 3824 }
3563 break; 3825 break;
3564 3826
3565 case XTerm_Color: 3827 case XTerm_Color:
3566 for (buf = (char *)str; buf && *buf;) 3828 for (buf = (char *)str; buf && *buf;)
3567 { 3829 {
3568 if ((name = STRCHR (buf, ';')) == NULL) 3830 if ((name = strchr (buf, ';')) == NULL)
3569 break; 3831 break;
3570 3832
3571 *name++ = '\0'; 3833 *name++ = '\0';
3572 color = atoi (buf); 3834 color = atoi (buf) + minCOLOR;
3573 3835
3574 if (color < 0 || color >= TOTAL_COLORS) 3836 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3575 break; 3837 break;
3576 3838
3577 if ((buf = STRCHR (name, ';')) != NULL) 3839 if ((buf = strchr (name, ';')) != NULL)
3578 *buf++ = '\0'; 3840 *buf++ = '\0';
3579 3841
3580 if (name[0] == '?' && !name[1]) 3842 if (name[0] == '?' && !name[1])
3581 { 3843 {
3582 unsigned short r, g, b; 3844 unsigned short r, g, b;
3583 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3845 pix_colors_focused[color].get (display, r, g, b);
3584 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3846 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3585 } 3847 }
3586 else 3848 else
3587 set_window_color (color + minCOLOR, name); 3849 set_window_color (color, name);
3588 } 3850 }
3589 break; 3851 break;
3590 case XTerm_Color00: 3852 case XTerm_Color00:
3591 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3853 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3592 break; 3854 break;
3593 case XTerm_Color01: 3855 case XTerm_Color01:
3594 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3856 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3595 break; 3857 break;
3596#ifndef NO_CURSORCOLOR 3858#ifndef NO_CURSORCOLOR
3597 case XTerm_Color_cursor: 3859 case XTerm_Color_cursor:
3598 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3860 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3599 break; 3861 break;
… …
3603 break; 3865 break;
3604 case XTerm_Color_pointer_bg: 3866 case XTerm_Color_pointer_bg:
3605 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3867 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3606 break; 3868 break;
3607#ifndef NO_BOLD_UNDERLINE_REVERSE 3869#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: 3870 case XTerm_Color_RV:
3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3871 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3616 break; 3872 break;
3873 case Rxvt_Color_BD:
3874 case URxvt_Color_BD:
3875 process_color_seq (op, Color_BD, str, resp);
3876 break;
3877 case Rxvt_Color_UL:
3878 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp);
3880 break;
3881 case URxvt_Color_IT:
3882 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3883 break;
3617#endif 3884#endif
3885#if TRANSPARENT && TINTING
3886 case URxvt_Color_tint:
3887 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3888 check_our_parents ();
3889 if (am_transparent)
3890 want_full_refresh = want_refresh = 1;
3891 break;
3892#endif
3618 3893
3619 case XTerm_Pixmap: 3894 case Rxvt_Pixmap:
3620 if (*str != ';') 3895 if (*str != ';')
3621 { 3896 {
3622#if XPM_BACKGROUND 3897#if XPM_BACKGROUND
3623 scale_pixmap (""); /* reset to default scaling */ 3898 scale_pixmap (""); /* reset to default scaling */
3624 set_bgPixmap (str); /* change pixmap */ 3899 set_bgPixmap (str); /* change pixmap */
3625#endif
3626 scr_touch (true); 3900 scr_touch (true);
3901#endif
3627 } 3902 }
3903
3628 while ((str = STRCHR (str, ';')) != NULL) 3904 while ((str = strchr (str, ';')) != NULL)
3629 { 3905 {
3630 str++; 3906 str++;
3631#if XPM_BACKGROUND 3907#if XPM_BACKGROUND
3632 changed += scale_pixmap (str); 3908 changed += scale_pixmap (str);
3633#endif 3909#endif
3634
3635 } 3910 }
3911
3636 if (changed) 3912 if (changed)
3637 { 3913 {
3638#ifdef XPM_BACKGROUND 3914#ifdef XPM_BACKGROUND
3639 resize_pixmap (); 3915 resize_pixmap ();
3640#endif
3641 scr_touch (true); 3916 scr_touch (true);
3917#endif
3642 } 3918 }
3643 break; 3919 break;
3644 3920
3645 case XTerm_restoreFG: 3921 case Rxvt_restoreFG:
3646 set_window_color (Color_fg, str); 3922 set_window_color (Color_fg, str);
3647 break; 3923 break;
3648 case XTerm_restoreBG: 3924 case Rxvt_restoreBG:
3649 set_window_color (Color_bg, str); 3925 set_window_color (Color_bg, str);
3650 break; 3926 break;
3651 3927
3652 case XTerm_logfile: 3928 case XTerm_logfile:
3653 // TODO, when secure mode? 3929 // TODO, when secure mode?
3654 break; 3930 break;
3655 3931
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 3932#if 0
3697 case XTerm_dumpscreen: /* no error notices */ 3933 case Rxvt_dumpscreen: /* no error notices */
3698 { 3934 {
3699 int fd; 3935 int fd;
3700 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3936 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3701 { 3937 {
3702 scr_dump (fd); 3938 scr_dump (fd);
3703 close (fd); 3939 close (fd);
3704 } 3940 }
3705 } 3941 }
3942 break;
3943#endif
3944 case XTerm_font:
3945 op = URxvt_font;
3946 case URxvt_font:
3947#if ENABLE_STYLES
3948 case URxvt_boldFont:
3949 case URxvt_italicFont:
3950 case URxvt_boldItalicFont:
3951#endif
3952 if (query)
3953 tt_printf ("\33]%d;%-.250s%c", saveop,
3954 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3955 ? fontset[op - URxvt_font]->fontdesc : "",
3956 resp);
3957 else
3958 {
3959 const char *&res = rs[Rs_font + (op - URxvt_font)];
3960
3961 res = strdup (str);
3962 allocated.push_back ((void *)res);
3963 set_fonts ();
3964 }
3965 break;
3966
3967#if ENABLE_FRILLS
3968 case URxvt_locale:
3969 if (query)
3970 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3971 else
3972 {
3973 set_locale (str);
3974 pty.set_utf8_mode (enc_utf8);
3975 init_xlocale ();
3976 }
3977 break;
3978
3979 case URxvt_view_up:
3980 case URxvt_view_down:
3981 {
3982 int lines = atoi (str);
3983
3984 if (lines)
3985 scr_page (op == URxvt_view_up ? UP : DN, lines);
3986 else
3987 scr_erase_savelines ();
3988 }
3989
3990 break;
3991#endif
3992
3993#if ENABLE_PERL
3994 case URxvt_perl:
3995 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3996 ; // no responses yet
3706 break; 3997 break;
3707#endif 3998#endif
3708 } 3999 }
3709} 4000}
3710/*----------------------------------------------------------------------*/ 4001/*----------------------------------------------------------------------*/
… …
3724{ 4015{
3725 int state; 4016 int state;
3726 4017
3727 if (mode == 's') 4018 if (mode == 's')
3728 { 4019 {
3729 SavedModes |= (PrivateModes & bit); 4020 SavedModes |= (priv_modes & bit);
3730 return -1; 4021 return -1;
3731 } 4022 }
3732 else 4023 else
3733 { 4024 {
3734 if (mode == 'r') 4025 if (mode == 'r')
3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4026 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3736 else 4027 else
3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4028 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3738 PrivMode (state, bit); 4029 PrivMode (state, bit);
3739 } 4030 }
3740 4031
3741 return state; 4032 return state;
3742} 4033}
… …
3760 { 3, PrivMode_132 }, 4051 { 3, PrivMode_132 },
3761 { 4, PrivMode_smoothScroll }, 4052 { 4, PrivMode_smoothScroll },
3762 { 5, PrivMode_rVideo }, 4053 { 5, PrivMode_rVideo },
3763 { 6, PrivMode_relOrigin }, 4054 { 6, PrivMode_relOrigin },
3764 { 7, PrivMode_Autowrap }, 4055 { 7, PrivMode_Autowrap },
4056 // 8, bi-directional support mode
3765 { 9, PrivMode_MouseX10 }, 4057 { 9, PrivMode_MouseX10 },
3766#ifdef menuBar_esc 4058 // 18, 19 printing-related
3767 { menuBar_esc, PrivMode_menuBar }, 4059 { 25, PrivMode_VisibleCursor },
3768#endif
3769#ifdef scrollBar_esc 4060#ifdef scrollBar_esc
3770 { scrollBar_esc, PrivMode_scrollBar }, 4061 { scrollBar_esc, PrivMode_scrollBar },
3771#endif 4062#endif
3772 // 18, 19 printing-related
3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3775 { 35, PrivMode_ShiftKeys }, // rxvt extension 4063 { 35, PrivMode_ShiftKeys }, // rxvt extension
3776 { 40, PrivMode_132OK }, 4064 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI 4065 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI 4066 // 45 margin bell NYI
3779 // 46 start logging 4067 // 46 start logging
… …
3819 } 4107 }
3820 4108
3821 /* extra handling for values with state unkept */ 4109 /* extra handling for values with state unkept */
3822 switch (arg[i]) 4110 switch (arg[i])
3823 { 4111 {
4112#if ENABLE_STYLES
4113 case 1021:
4114 set_option (Opt_intensityStyles, mode);
4115
4116 scr_touch (true);
4117 break;
4118#endif
3824 case 1048: /* alternative cursor save */ 4119 case 1048: /* alternative cursor save */
4120 case 1049:
3825 if (Options & Opt_secondaryScreen) 4121 if (OPTION (Opt_secondaryScreen))
3826 if (mode == 0) 4122 if (mode == 0)
3827 scr_cursor (RESTORE); 4123 scr_cursor (RESTORE);
3828 else if (mode == 1) 4124 else if (mode == 1)
3829 scr_cursor (SAVE); 4125 scr_cursor (SAVE);
3830 break; 4126 break;
… …
3841 * within VT52 mode 4137 * within VT52 mode
3842 */ 4138 */
3843 PrivMode (1, PrivMode_vt52); 4139 PrivMode (1, PrivMode_vt52);
3844 break; 4140 break;
3845 case 3: /* 80/132 */ 4141 case 3: /* 80/132 */
3846 if (PrivateModes & PrivMode_132OK) 4142 if (priv_modes & PrivMode_132OK)
3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4143 set_widthheight (((state ? 132 : 80) * fwidth), height);
3848 break; 4144 break;
3849 case 4: /* smooth scrolling */ 4145 case 4: /* smooth scrolling */
3850 if (state) 4146 set_option (Opt_jumpScroll, !state);
3851 Options &= ~Opt_jumpScroll;
3852 else
3853 Options |= Opt_jumpScroll;
3854 break; 4147 break;
3855 case 5: /* reverse video */ 4148 case 5: /* reverse video */
3856 scr_rvideo_mode (state); 4149 scr_rvideo_mode (state);
3857 break; 4150 break;
3858 case 6: /* relative/absolute origins */ 4151 case 6: /* relative/absolute origins */
… …
3862 scr_autowrap (state); 4155 scr_autowrap (state);
3863 break; 4156 break;
3864 /* case 8: - auto repeat, can't do on a per window basis */ 4157 /* case 8: - auto repeat, can't do on a per window basis */
3865 case 9: /* X10 mouse reporting */ 4158 case 9: /* X10 mouse reporting */
3866 if (state) /* orthogonal */ 4159 if (state) /* orthogonal */
3867 PrivateModes &= ~PrivMode_MouseX11; 4160 priv_modes &= ~PrivMode_MouseX11;
3868 break; 4161 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 4162#ifdef scrollBar_esc
3877 case scrollBar_esc: 4163 case scrollBar_esc:
3878 if (scrollbar_mapping (state)) 4164 if (scrollbar_mapping (state))
3879 { 4165 {
3880 resize_all_windows (0, 0, 0); 4166 resize_all_windows (0, 0, 0);
… …
3892 break; 4178 break;
3893 /* case 66: - application key pad */ 4179 /* case 66: - application key pad */
3894 /* case 67: - backspace key */ 4180 /* case 67: - backspace key */
3895 case 1000: /* X11 mouse reporting */ 4181 case 1000: /* X11 mouse reporting */
3896 if (state) /* orthogonal */ 4182 if (state) /* orthogonal */
3897 PrivateModes &= ~PrivMode_MouseX10; 4183 priv_modes &= ~PrivMode_MouseX10;
3898 break; 4184 break;
3899#if 0 4185#if 0
3900 case 1001: 4186 case 1001:
3901 break; /* X11 mouse highlighting */ 4187 break; /* X11 mouse highlighting */
3902#endif 4188#endif
3903 case 1010: /* scroll to bottom on TTY output inhibit */ 4189 case 1010: /* scroll to bottom on TTY output inhibit */
3904 if (state)
3905 Options &= ~Opt_scrollTtyOutput;
3906 else
3907 Options |= Opt_scrollTtyOutput; 4190 set_option (Opt_scrollTtyOutput, !state);
3908 break; 4191 break;
3909 case 1011: /* scroll to bottom on key press */ 4192 case 1011: /* scroll to bottom on key press */
3910 if (state)
3911 Options |= Opt_scrollTtyKeypress; 4193 set_option (Opt_scrollTtyKeypress, state);
3912 else
3913 Options &= ~Opt_scrollTtyKeypress;
3914 break; 4194 break;
3915 case 1047: /* secondary screen w/ clearing last */ 4195 case 1047: /* secondary screen w/ clearing last */
3916 if (Options & Opt_secondaryScreen) 4196 if (OPTION (Opt_secondaryScreen))
3917 if (current_screen != PRIMARY) 4197 if (current_screen != PRIMARY)
3918 scr_erase_screen (2); 4198 scr_erase_screen (2);
3919 scr_change_screen (state); 4199 scr_change_screen (state);
3920 break; 4200 break;
3921 case 1049: /* secondary screen w/ clearing first */ 4201 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state); 4202 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen) 4203 if (OPTION (Opt_secondaryScreen))
3924 if (current_screen != PRIMARY) 4204 if (current_screen != PRIMARY)
3925 scr_erase_screen (2); 4205 scr_erase_screen (2);
3926 break; 4206 break;
3927 default: 4207 default:
3928 break; 4208 break;
… …
3954 rendset = 0, rendstyle = ~RS_None; 4234 rendset = 0, rendstyle = ~RS_None;
3955 break; 4235 break;
3956 case 1: 4236 case 1:
3957 rendset = 1, rendstyle = RS_Bold; 4237 rendset = 1, rendstyle = RS_Bold;
3958 break; 4238 break;
3959 //case 2: // faint or second colour 4239 //case 2: // low intensity
4240 case 3:
4241 rendset = 1, rendstyle = RS_Italic;
4242 break;
3960 case 4: 4243 case 4:
3961 rendset = 1, rendstyle = RS_Uline; 4244 rendset = 1, rendstyle = RS_Uline;
3962 break; 4245 break;
3963 case 5: // slowly blinking 4246 case 5: // slowly blinking
3964 case 6: // rapidly blinking 4247 case 6: // rapidly blinking
… …
3976 //case 11: // scoansi acs on, first alt font 4259 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font 4260 //case 12: // scoansi acs on, |0x80, second alt font
3978 //... 4261 //...
3979 //case 19: // ninth alt font 4262 //case 19: // ninth alt font
3980 //case 20: // gothic 4263 //case 20: // gothic
3981 case 21: // disable bold, faint 4264 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3982 rendset = 0, rendstyle = RS_Bold; 4265 rendset = 0, rendstyle = RS_Bold;
3983 break; 4266 break;
3984 case 22: 4267 case 22: // normal intensity
3985 rendset = 0, rendstyle = RS_Bold; 4268 rendset = 0, rendstyle = RS_Bold;
3986 break; 4269 break;
3987 //case 23: disable italic 4270 case 23: // disable italic
4271 rendset = 0, rendstyle = RS_Italic;
4272 break;
3988 case 24: 4273 case 24:
3989 rendset = 0, rendstyle = RS_Uline; 4274 rendset = 0, rendstyle = RS_Uline;
3990 break; 4275 break;
3991 case 25: 4276 case 25:
4277 rendset = 0, rendstyle = RS_Blink;
4278 break;
4279 case 26: // variable spacing (iso 8613)
3992 rendset = 0, rendstyle = RS_Blink; 4280 rendset = 0, rendstyle = RS_Blink;
3993 break; 4281 break;
3994 case 27: 4282 case 27:
3995 rendset = 0, rendstyle = RS_RVid; 4283 rendset = 0, rendstyle = RS_RVid;
3996 break; 4284 break;
… …
4014 case 35: 4302 case 35:
4015 case 36: 4303 case 36:
4016 case 37: 4304 case 37:
4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4305 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4018 break; 4306 break;
4019#ifdef TTY_256COLOR 4307 case 38: // set fg color, ISO 8613-6
4020 case 38:
4021 if (nargs > i + 2 && arg[i + 1] == 5) 4308 if (nargs > i + 2 && arg[i + 1] == 5)
4022 { 4309 {
4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4310 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4024 i += 2; 4311 i += 2;
4025 } 4312 }
4026 break; 4313 break;
4027#endif
4028 case 39: /* default fg */ 4314 case 39: /* default fg */
4029 scr_color (Color_fg, Color_fg); 4315 scr_color (Color_fg, Color_fg);
4030 break; 4316 break;
4031 4317
4032 case 40: 4318 case 40:
… …
4037 case 45: 4323 case 45:
4038 case 46: 4324 case 46:
4039 case 47: 4325 case 47:
4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4326 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4041 break; 4327 break;
4042#ifdef TTY_256COLOR 4328 case 48: // set bg color, ISO 8613-6
4043 case 48:
4044 if (nargs > i + 2 && arg[i + 1] == 5) 4329 if (nargs > i + 2 && arg[i + 1] == 5)
4045 { 4330 {
4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4331 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4047 i += 2; 4332 i += 2;
4048 } 4333 }
4049 break; 4334 break;
4050#endif
4051 case 49: /* default bg */ 4335 case 49: /* default bg */
4052 scr_color (Color_bg, Color_bg); 4336 scr_color (Color_bg, Color_bg);
4053 break; 4337 break;
4054 4338
4055#ifndef NO_BRIGHTCOLOR 4339 //case 50: // not variable spacing
4340
4341#if ENABLE_FRILLS
4056 case 90: 4342 case 90:
4057 case 91: /* set bright fg color */ 4343 case 91: /* set bright fg color */
4058 case 92: 4344 case 92:
4059 case 93: 4345 case 93:
4060 case 94: 4346 case 94:
4061 case 95: 4347 case 95:
4062 case 96: 4348 case 96:
4063 case 97: 4349 case 97:
4064 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4350 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4065 Color_fg);
4066 break; 4351 break;
4067 case 100: 4352 case 100:
4068 case 101: /* set bright bg color */ 4353 case 101: /* set bright bg color */
4069 case 102: 4354 case 102:
4070 case 103: 4355 case 103:
4071 case 104: 4356 case 104:
4072 case 105: 4357 case 105:
4073 case 106: 4358 case 106:
4074 case 107: 4359 case 107:
4075 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4360 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4076 Color_bg);
4077 break; 4361 break;
4078#endif 4362#endif
4079
4080 } 4363 }
4081 } 4364 }
4082} 4365}
4083/*}}} */ 4366/*}}} */
4084 4367
… …
4088{ 4371{
4089 unicode_t ch, cmd = cmd_getc (); 4372 unicode_t ch, cmd = cmd_getc ();
4090 4373
4091 if (cmd == 'Q') 4374 if (cmd == 'Q')
4092 { /* query graphics */ 4375 { /* query graphics */
4093 tt_printf ("\033G0\n"); /* no graphics */ 4376 tt_printf ("\033G0\012"); /* no graphics */
4094 return; 4377 return;
4095 } 4378 }
4096 /* swallow other graphics sequences until terminating ':' */ 4379 /* swallow other graphics sequences until terminating ':' */
4097 do 4380 do
4098 ch = cmd_getc (); 4381 ch = cmd_getc ();
… …
4108 */ 4391 */
4109void 4392void
4110rxvt_term::tt_printf (const char *fmt,...) 4393rxvt_term::tt_printf (const char *fmt,...)
4111{ 4394{
4112 va_list arg_ptr; 4395 va_list arg_ptr;
4113 unsigned char buf[256]; 4396 char buf[256];
4114 4397
4115 va_start (arg_ptr, fmt); 4398 va_start (arg_ptr, fmt);
4116 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4399 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4117 va_end (arg_ptr); 4400 va_end (arg_ptr);
4118 tt_write (buf, STRLEN (buf)); 4401 tt_write (buf, strlen (buf));
4119} 4402}
4120 4403
4121/* ---------------------------------------------------------------------- */ 4404/* ---------------------------------------------------------------------- */
4122/* Write data to the pty as typed by the user, pasted with the mouse, 4405/* 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. 4406 * or generated by us in response to a query ESC sequence.
4124 */ 4407 */
4408const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4409
4125void 4410void
4126rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4411rxvt_term::tt_write (const char *data, unsigned int len)
4127{ 4412{
4128 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4413 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4414 return;
4129 4415
4130 if (len) 4416 if (pty.pty < 0)
4417 return;
4418
4419 if (v_buflen == 0)
4420 {
4421 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4422
4423 if ((unsigned int)written == len)
4424 return;
4425
4426 data += written;
4427 len -= written;
4131 { 4428 }
4429
4430 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4431
4432 memcpy (v_buffer + v_buflen, data, len);
4433 v_buflen += len;
4434
4435 pty_ev.set (EVENT_READ | EVENT_WRITE);
4436}
4437
4438void rxvt_term::pty_write ()
4439{
4440 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4441
4442 if (written > 0)
4443 {
4444 v_buflen -= written;
4445
4132 if (v_buflen == 0) 4446 if (v_buflen == 0)
4133 { 4447 {
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); 4448 free (v_buffer);
4161 v_buffer = 0; 4449 v_buffer = 0;
4162 v_buflen = 0; 4450 v_buflen = 0;
4163 4451
4164 pty_ev.set (EVENT_READ); 4452 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; 4453 return;
4177 } 4454 }
4455
4456 memmove (v_buffer, v_buffer + written, v_buflen);
4178 } 4457 }
4458 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4459 pty_ev.set (EVENT_READ);
4179} 4460}
4180 4461
4181/*----------------------- end-of-file (C source) -----------------------*/ 4462/*----------------------- end-of-file (C source) -----------------------*/
4182 4463

Diff Legend

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