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

Diff Legend

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