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.275 by root, Fri Jan 20 10:35:25 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
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
1407 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1408 {
1233 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1409 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1234 destroy (); 1410 destroy ();
1411#if ENABLE_EWMH
1412 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1413 XSendEvent (disp, ev.xclient.window = display->root,
1414 False, SubstructureRedirectMask | SubstructureNotifyMask,
1415 &ev);
1416#endif
1417 }
1418#if ENABLE_XEMBED
1419 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1420 {
1421 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1422 focus_in ();
1423 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1424 focus_out ();
1425 }
1426#endif
1235#ifdef OFFIX_DND 1427#ifdef OFFIX_DND
1236 /* OffiX Dnd (drag 'n' drop) protocol */ 1428 /* OffiX Dnd (drag 'n' drop) protocol */
1237 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1429 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1238 && (ev.xclient.data.l[0] == DndFile 1430 && (ev.xclient.data.l[0] == DndFile
1239 || ev.xclient.data.l[0] == DndDir 1431 || ev.xclient.data.l[0] == DndDir
1240 || ev.xclient.data.l[0] == DndLink)) 1432 || ev.xclient.data.l[0] == DndLink))
1241 { 1433 {
1242 /* Get Dnd data */ 1434 /* Get Dnd data */
1243 Atom ActualType; 1435 Atom ActualType;
1244 int ActualFormat; 1436 int ActualFormat;
1245 unsigned char *data; 1437 unsigned char *data;
1246 unsigned long Size, RemainingBytes; 1438 unsigned long Size, RemainingBytes;
1247 1439
1248 XGetWindowProperty (display->display, display->root, 1440 XGetWindowProperty (disp, display->root,
1249 xa[XA_DNDSELECTION], 1441 xa[XA_DNDSELECTION],
1250 0L, 1000000L, 1442 0L, 1000000L,
1251 False, AnyPropertyType, 1443 False, AnyPropertyType,
1252 &ActualType, &ActualFormat, 1444 &ActualType, &ActualFormat,
1253 &Size, &RemainingBytes, 1445 &Size, &RemainingBytes,
1254 &data); 1446 &data);
1255 XChangeProperty (display->display, display->root, 1447 set_string_property (XA_CUT_BUFFER0, data);
1256 XA_CUT_BUFFER0, XA_STRING,
1257 8, PropModeReplace,
1258 data, STRLEN (data));
1259 XFree (data); 1448 XFree (data);
1260 selection_paste (display->root, XA_CUT_BUFFER0, True); 1449 selection_paste (display->root, XA_CUT_BUFFER0, true);
1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1450 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1262 } 1451 }
1263#endif /* OFFIX_DND */ 1452#endif /* OFFIX_DND */
1264 break; 1453 break;
1265 1454
1266 case MappingNotify: 1455 case MappingNotify:
… …
1291 break; 1480 break;
1292 } 1481 }
1293 break; 1482 break;
1294 1483
1295 case FocusIn: 1484 case FocusIn:
1296 if (!TermWin.focus) 1485 focus_in ();
1486 break;
1487
1488 case FocusOut:
1489 focus_out ();
1490 break;
1491
1492 case ConfigureNotify:
1493 if (ev.xconfigure.window == parent[0])
1297 { 1494 {
1298 TermWin.focus = 1; 1495 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1299 want_refresh = 1; 1496 ;
1300#ifdef USE_XIM 1497
1301 if (Input_Context != NULL) 1498 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 { 1499 {
1311 PixColors = PixColorsFocused; 1500 seen_resize = 1;
1312 set_colorfgbg (); 1501 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1313 scr_clear ();
1314 scr_touch (true);
1315 } 1502 }
1316#endif
1317 1503
1318 } 1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1319 break;
1320
1321 case FocusOut:
1322 if (TermWin.focus)
1323 {
1324 TermWin.focus = 0;
1325 want_refresh = 1;
1326#ifdef USE_XIM
1327 if (Input_Context != NULL)
1328 XUnsetICFocus (Input_Context);
1329#endif
1330#ifdef CURSOR_BLINK
1331 if (Options & Opt_cursorBlink)
1332 cursor_blink_ev.stop ();
1333 hidden_cursor = 0;
1334#endif
1335#ifdef OFF_FOCUS_FADING
1336 if (rs[Rs_fade])
1337 {
1338 PixColors = PixColorsUnFocused;
1339 set_colorfgbg ();
1340 scr_clear ();
1341 scr_touch (true);
1342 }
1343#endif
1344
1345 }
1346 break;
1347
1348 case ConfigureNotify:
1349 if (ev.xconfigure.window == TermWin.parent[0])
1350 {
1351 int height, width;
1352
1353 do
1354 { /* Wrap lots of configures into one */
1355 width = ev.xconfigure.width;
1356 height = ev.xconfigure.height;
1357 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1358 }
1359 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1360
1361 if (szHint.width != width || szHint.height != height)
1362 resize_all_windows (width, height, 1);
1363 1505
1364#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1506#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1365 if (Options & Opt_transparent) 1507 if (OPTION (Opt_transparent))
1366 {
1367 check_our_parents (); 1508 check_our_parents ();
1368 if (am_transparent)
1369 want_refresh = want_full_refresh = 1;
1370 }
1371#endif 1509#endif
1372 } 1510 }
1373 break; 1511 break;
1374 1512
1375 case PropertyNotify: 1513 case PropertyNotify:
… …
1383 selection_clear (); 1521 selection_clear ();
1384 break; 1522 break;
1385 1523
1386 case SelectionNotify: 1524 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1525 if (selection_wait == Sel_normal)
1388 selection_paste (ev.xselection.requestor, 1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1389 ev.xselection.property, True);
1390 break; 1527 break;
1391 1528
1392 case SelectionRequest: 1529 case SelectionRequest:
1393 selection_send (ev.xselectionrequest); 1530 selection_send (ev.xselectionrequest);
1394 break; 1531 break;
1395 1532
1533 case MapNotify:
1534 mapped = 1;
1535#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1537#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break;
1540
1396 case UnmapNotify: 1541 case UnmapNotify:
1397 TermWin.mapped = 0; 1542 mapped = 0;
1398#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1399 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1400#endif 1545#endif
1401 break; 1546 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; 1547 break;
1409 1548
1410#ifdef TRANSPARENT 1549#ifdef TRANSPARENT
1411 case ReparentNotify: 1550 case ReparentNotify:
1412 rootwin_cb (ev); 1551 rootwin_cb (ev);
1413 break; 1552 break;
1414#endif /* TRANSPARENT */ 1553#endif /* TRANSPARENT */
1415 1554
1416 case GraphicsExpose: 1555 case GraphicsExpose:
1417 case Expose: 1556 case Expose:
1418 if (ev.xany.window == TermWin.vt) 1557 if (ev.xany.window == vt)
1419 { 1558 {
1420 do 1559 do
1421 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1422 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1424 1563
1425 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1426 1565
1427 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1428 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1429 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1430 1569
1431 scr_refresh (refresh_type); 1570 want_refresh = 1;
1432 } 1571 }
1433 else 1572 else
1434 { 1573 {
1435 XEvent unused_event; 1574 XEvent unused_event;
1436 1575
1437 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1438 ; 1577 ;
1439 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1440 ; 1579 ;
1441 1580
1442 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1443 { 1582 {
1444 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1445 scrollbar_show (0); 1584 scrollbar_show (0);
1446 } 1585 }
1447#ifdef MENUBAR
1448 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1449 menubar_expose ();
1450#endif
1451 1586
1452#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1453 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1454 XClearWindow (display->display, ev.xany.window); 1589 XClearWindow (disp, ev.xany.window);
1455#endif 1590#endif
1456 } 1591 }
1457 break; 1592 break;
1458 1593
1459 case MotionNotify: 1594 case MotionNotify:
1460#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1461 if (hidden_pointer) 1596 if (hidden_pointer)
1462 pointer_unblank (); 1597 pointer_unblank ();
1463#endif 1598#endif
1464#if MENUBAR 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1465 if (isMenuBarWindow (ev.xany.window)) 1600 break;
1601
1602 if (ev.xany.window == vt)
1466 { 1603 {
1467 menubar_control (ev.xbutton); 1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1468 break; 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1469 } 1606 ; // 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))) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1477 { 1608 {
1478 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1479 ; 1610 ;
1480 1611
1481 XQueryPointer (display->display, TermWin.vt, 1612 XQueryPointer (disp, vt,
1482 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1483 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1484 & (ev.xbutton.x), & (ev.xbutton.y), 1615 &ev.xbutton.x, &ev.xbutton.y,
1485 &unused_mask); 1616 &ev.xbutton.state);
1486#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
1487 /* deal with a `jumpy' mouse */ 1618 /* deal with a `jumpy' mouse */
1488 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1619 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1489 { 1620 {
1490#endif 1621#endif
1622#if ISO_14755
1623 // 5.4
1624 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1625 {
1626 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1627 break;
1628 }
1629#endif
1491 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1630 selection_extend (ev.xbutton.x, ev.xbutton.y,
1492 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1631 ev.xbutton.state & Button3Mask ? 2 : 0);
1632
1493#ifdef SELECTION_SCROLLING 1633#ifdef SELECTION_SCROLLING
1494 if (ev.xbutton.y < TermWin.int_bwidth 1634 if (ev.xbutton.y < int_bwidth
1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1635 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1496 { 1636 {
1497 int dist; 1637 int dist;
1498 1638
1499 /* don't clobber the current delay if we are 1639 /* don't clobber the current delay if we are
1500 * already in the middle of scrolling. 1640 * already in the middle of scrolling.
… …
1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1504 1644
1505 /* save the event params so we can highlight 1645 /* save the event params so we can highlight
1506 * the selection in the pending-scroll loop 1646 * the selection in the pending-scroll loop
1507 */ 1647 */
1508 selection_save_x=ev.xbutton.x; 1648 selection_save_x = ev.xbutton.x;
1509 selection_save_y=ev.xbutton.y; 1649 selection_save_y = ev.xbutton.y;
1510 selection_save_state=
1511 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1650 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1512 1651
1513 /* calc number of lines to scroll */ 1652 /* calc number of lines to scroll */
1514 if (ev.xbutton.y<TermWin.int_bwidth) 1653 if (ev.xbutton.y < int_bwidth)
1515 { 1654 {
1516 scroll_selection_dir = UP; 1655 scroll_selection_dir = UP;
1517 dist = TermWin.int_bwidth - ev.xbutton.y; 1656 dist = int_bwidth - ev.xbutton.y;
1518 } 1657 }
1519 else 1658 else
1520 { 1659 {
1521 scroll_selection_dir = DN; 1660 scroll_selection_dir = DN;
1522 dist = ev.xbutton.y - 1661 dist = ev.xbutton.y - (int_bwidth + height);
1523 (TermWin.int_bwidth + TermWin.height);
1524 } 1662 }
1663
1525 scroll_selection_lines= (Pixel2Height (dist)/ 1664 scroll_selection_lines = Pixel2Height (dist)
1526 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1665 / SELECTION_SCROLL_LINE_SPEEDUP
1666 + 1;
1527 MIN_IT (scroll_selection_lines, 1667 min_it (scroll_selection_lines,
1528 SELECTION_SCROLL_MAX_LINES); 1668 SELECTION_SCROLL_MAX_LINES);
1529 } 1669 }
1530 else 1670 else
1531 { 1671 {
1532 /* we are within the text window, so we 1672 /* we are within the text window, so we
1533 * shouldn't be scrolling 1673 * shouldn't be scrolling
… …
1535 if (sel_scroll_ev.active) 1675 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop(); 1676 sel_scroll_ev.stop();
1537 } 1677 }
1538#endif 1678#endif
1539#ifdef MOUSE_THRESHOLD 1679#ifdef MOUSE_THRESHOLD
1540
1541 } 1680 }
1542#endif 1681#endif
1543
1544 } 1682 }
1545 } 1683 }
1546 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1547 { 1685 {
1548 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1686 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1549 MotionNotify, &ev)) ; 1687 MotionNotify, &ev))
1688 ;
1689
1550 XQueryPointer (display->display, scrollBar.win, 1690 XQueryPointer (disp, scrollBar.win,
1551 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1553 & (ev.xbutton.x), & (ev.xbutton.y), 1693 &ev.xbutton.x, &ev.xbutton.y,
1554 &unused_mask); 1694 &unused_mask);
1555 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1556 scrollbar_size ()); 1696 scrollbar_size ());
1557 scr_refresh (refresh_type); 1697 want_refresh = 1;
1558 refresh_limit = 0; 1698 refresh_limit = 0;
1559 scrollbar_show (1); 1699 scrollbar_show (1);
1560 } 1700 }
1561 break; 1701 break;
1562 } 1702 }
1703
1704skip_switch: ;
1705
1706#if defined(CURSOR_BLINK)
1707 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1708 {
1709 if (hidden_cursor)
1710 {
1711 hidden_cursor = 0;
1712 want_refresh = 1;
1713 }
1714
1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1716 }
1717#endif
1718
1719#if defined(POINTER_BLANK)
1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1721 {
1722 if (ev.type == MotionNotify
1723 || ev.type == ButtonPress
1724 || ev.type == ButtonRelease)
1725 if (hidden_pointer)
1726 pointer_unblank ();
1727
1728 if (ev.type == KeyPress && hidden_pointer == 0)
1729 pointer_blank ();
1730 }
1731#endif
1732}
1733
1734void
1735rxvt_term::focus_in ()
1736{
1737 if (!focus)
1738 {
1739 focus = 1;
1740 want_refresh = 1;
1741
1742 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1743
1744#if USE_XIM
1745 if (Input_Context != NULL)
1746 {
1747 IMSetStatusPosition ();
1748 XSetICFocus (Input_Context);
1749 }
1750#endif
1751#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink))
1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1754#endif
1755#if OFF_FOCUS_FADING
1756 if (rs[Rs_fade])
1757 {
1758 pix_colors = pix_colors_focused;
1759 scr_recolour ();
1760 }
1761#endif
1762 }
1763}
1764
1765void
1766rxvt_term::focus_out ()
1767{
1768 if (focus)
1769 {
1770 focus = 0;
1771 want_refresh = 1;
1772
1773 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1774
1775#if ENABLE_FRILLS || ISO_14755
1776 if (iso14755buf)
1777 {
1778 iso14755buf = 0;
1779# if ENABLE_OVERLAY
1780 scr_overlay_off ();
1781# endif
1782 }
1783#endif
1784#if USE_XIM
1785 if (Input_Context != NULL)
1786 XUnsetICFocus (Input_Context);
1787#endif
1788#if CURSOR_BLINK
1789 if (OPTION (Opt_cursorBlink))
1790 cursor_blink_ev.stop ();
1791 hidden_cursor = 0;
1792#endif
1793#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade])
1795 {
1796 pix_colors = pix_colors_unfocused;
1797 scr_recolour ();
1798 }
1799#endif
1800 }
1563} 1801}
1564 1802
1565#if TRANSPARENT 1803#if TRANSPARENT
1566void 1804void
1567rxvt_term::rootwin_cb (XEvent &ev) 1805rxvt_term::rootwin_cb (XEvent &ev)
1568{ 1806{
1569 SET_R (this); 1807 make_current ();
1570 SET_LOCALE (locale);
1571 1808
1572 switch (ev.type) 1809 switch (ev.type)
1573 { 1810 {
1574 case PropertyNotify: 1811 case PropertyNotify:
1575 /* 1812 /*
1576 * if user used some Esetroot compatible prog to set the root bg, 1813 * 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. 1814 * use the property to determine the pixmap. We use it later on.
1578 */ 1815 */
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]) 1816 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1817 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1583 return; 1818 return;
1584 1819
1585 /* FALLTHROUGH */ 1820 /* FALLTHROUGH */
1586 case ReparentNotify: 1821 case ReparentNotify:
1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1822 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1588 want_refresh = want_full_refresh = 1; 1823 want_refresh = want_full_refresh = 1;
1589 break; 1824 break;
1590 } 1825 }
1591} 1826}
1592#endif 1827#endif
… …
1595rxvt_term::button_press (XButtonEvent &ev) 1830rxvt_term::button_press (XButtonEvent &ev)
1596{ 1831{
1597 int reportmode = 0, clickintime; 1832 int reportmode = 0, clickintime;
1598 1833
1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1834 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1835
1600 if (!bypass_keystate) 1836 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1837 reportmode = !! (priv_modes & PrivMode_mouse_report);
1838
1602 /* 1839 /*
1603 * VT window processing of button press 1840 * VT window processing of button press
1604 */ 1841 */
1605 if (ev.window == TermWin.vt) 1842 if (ev.window == vt)
1606 { 1843 {
1844#if ISO_14755
1845 // 5.4
1846 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1847 {
1848 iso14755_54 (ev.x, ev.y);
1849 return;
1850 }
1851#endif
1852
1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1853 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1854
1608 if (reportmode) 1855 if (reportmode)
1609 { 1856 {
1610 /* mouse report from vt window */ 1857 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */ 1858 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state; 1859 MEvent.state = ev.state;
1613#ifdef MOUSE_REPORT_DOUBLECLICK 1860#ifdef MOUSE_REPORT_DOUBLECLICK
1614 if (ev.button == MEvent.button && clickintime) 1861 if (ev.button == MEvent.button && clickintime)
1615 { 1862 {
1616 /* same button, within alloted time */ 1863 /* same button, within alloted time */
1617 MEvent.clicks++; 1864 MEvent.clicks++;
1865
1618 if (MEvent.clicks > 1) 1866 if (MEvent.clicks > 1)
1619 { 1867 {
1620 /* only report double clicks */ 1868 /* only report double clicks */
1621 MEvent.clicks = 2; 1869 MEvent.clicks = 2;
1622 mouse_report (ev); 1870 mouse_report (ev);
… …
1641 } 1889 }
1642 else 1890 else
1643 { 1891 {
1644 if (ev.button != MEvent.button) 1892 if (ev.button != MEvent.button)
1645 MEvent.clicks = 0; 1893 MEvent.clicks = 0;
1894
1895 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1646 switch (ev.button) 1896 switch (ev.button)
1647 { 1897 {
1648 case Button1: 1898 case Button1:
1899 /* allow meta + click to select rectangular areas */
1900 /* should be done in screen.C */
1901#if ENABLE_FRILLS
1902 selection.rect = !!(ev.state & ModMetaMask);
1903#else
1904 selection.rect = false;
1905#endif
1906
1649 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1651 { 1909 {
1652 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1653 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1654 else 1912 else
1655 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
1656 } 1914 }
1657 else 1915 else
1658 { 1916 {
1659 if (MEvent.button == Button1 && clickintime) 1917 if (MEvent.button == Button1 && clickintime)
1660 MEvent.clicks++; 1918 MEvent.clicks++;
1661 else 1919 else
1662 MEvent.clicks = 1; 1920 MEvent.clicks = 1;
1663 1921
1664 selection_click (MEvent.clicks, ev.x, ev.y); 1922 selection_click (MEvent.clicks, ev.x, ev.y);
1665 } 1923 }
1666 1924
1667 MEvent.button = Button1; 1925 MEvent.button = Button1;
1668 break; 1926 break;
1669 1927
1670 case Button3: 1928 case Button3:
1671 if (MEvent.button == Button3 && clickintime) 1929 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1673 else 1931 else
1674 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1933
1675 MEvent.button = Button3; 1934 MEvent.button = Button3;
1676 break; 1935 break;
1677 } 1936 }
1678 } 1937 }
1938
1679 MEvent.time = ev.time; 1939 MEvent.time = ev.time;
1680 return; 1940 return;
1681 } 1941 }
1682 1942
1683 /* 1943 /*
… …
1794 case Button3: 2054 case Button3:
1795 if (scrollBar.style != R_SB_XTERM) 2055 if (scrollBar.style != R_SB_XTERM)
1796 { 2056 {
1797 if (scrollbar_above_slider (ev.y)) 2057 if (scrollbar_above_slider (ev.y))
1798# ifdef RXVT_SCROLL_FULL 2058# ifdef RXVT_SCROLL_FULL
1799 scr_page (UP, TermWin.nrow - 1); 2059 scr_page (UP, nrow - 1);
1800# else 2060# else
1801 scr_page (UP, TermWin.nrow / 4); 2061 scr_page (UP, nrow / 4);
1802# endif 2062# endif
1803 else if (scrollbar_below_slider (ev.y)) 2063 else if (scrollbar_below_slider (ev.y))
1804# ifdef RXVT_SCROLL_FULL 2064# ifdef RXVT_SCROLL_FULL
1805 scr_page (DN, TermWin.nrow - 1); 2065 scr_page (DN, nrow - 1);
1806# else 2066# else
1807 scr_page (DN, TermWin.nrow / 4); 2067 scr_page (DN, nrow / 4);
1808# endif 2068# endif
1809 else 2069 else
1810 scrollBar.setMotion (); 2070 scrollBar.setMotion ();
1811 } 2071 }
1812 else 2072 else
1813 { 2073 {
1814 scr_page ((ev.button == Button1 ? DN : UP), 2074 scr_page ((ev.button == Button1 ? DN : UP),
1815 (TermWin.nrow 2075 (nrow
1816 * scrollbar_position (ev.y) 2076 * scrollbar_position (ev.y)
1817 / scrollbar_size ())); 2077 / scrollbar_size ()));
1818 } 2078 }
1819 2079
1820 break; 2080 break;
1821 } 2081 }
1822 } 2082 }
2083
1823 return; 2084 return;
1824 } 2085 }
1825#if MENUBAR
1826 /*
1827 * Menubar window processing of button press
1828 */
1829 if (isMenuBarWindow (ev.window))
1830 menubar_control (ev);
1831#endif
1832} 2086}
1833 2087
1834void 2088void
1835rxvt_term::button_release (XButtonEvent &ev) 2089rxvt_term::button_release (XButtonEvent &ev)
1836{ 2090{
1837 int reportmode = 0; 2091 int reportmode = 0;
1838 2092
1839 csrO = 0; /* reset csr Offset */ 2093 csrO = 0; /* reset csr Offset */
1840 if (!bypass_keystate) 2094 if (!bypass_keystate)
1841 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2095 reportmode = !! (priv_modes & PrivMode_mouse_report);
1842 2096
1843 if (scrollbar_isUpDn ()) 2097 if (scrollbar_isUpDn ())
1844 { 2098 {
1845 scrollBar.setIdle (); 2099 scrollBar.setIdle ();
1846 scrollbar_show (0); 2100 scrollbar_show (0);
1847#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1848 refresh_type &= ~SMOOTH_REFRESH;
1849#endif
1850
1851 } 2101 }
2102
1852#ifdef SELECTION_SCROLLING 2103#ifdef SELECTION_SCROLLING
1853 if (sel_scroll_ev.active) 2104 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop(); 2105 sel_scroll_ev.stop();
1855#endif 2106#endif
2107
1856 if (ev.window == TermWin.vt) 2108 if (ev.window == vt)
1857 { 2109 {
2110#if ISO_14755
2111 // 5.4
2112 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2113 return;
2114#endif
1858 if (reportmode) 2115 if (reportmode)
1859 { 2116 {
1860 /* mouse report from vt window */ 2117 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */ 2118 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4) 2119 if (ev.button >= 4)
… …
1876 MEvent.button = AnyButton; 2133 MEvent.button = AnyButton;
1877 mouse_report (ev); 2134 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2135#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2136 return;
1880 } 2137 }
2138
1881 /* 2139 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2140 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2141 * when overriding mouse reporting
1884 */ 2142 */
1885 if (PrivateModes & PrivMode_mouse_report 2143 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2144 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2145 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2146 selection_extend (ev.x, ev.y, 0);
2147
2148 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149 return;
1889 2150
1890 switch (ev.button) 2151 switch (ev.button)
1891 { 2152 {
1892 case Button1: 2153 case Button1:
1893 case Button3: 2154 case Button3:
1894 selection_make (ev.time); 2155 selection_make (ev.time);
1895 break; 2156 break;
2157
1896 case Button2: 2158 case Button2:
1897 selection_request (ev.time, ev.x, ev.y); 2159 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2160 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
1898 break; 2161 break;
2162
1899#ifdef MOUSE_WHEEL 2163#ifdef MOUSE_WHEEL
1900 case Button4: 2164 case Button4:
1901 case Button5: 2165 case Button5:
1902 { 2166 {
1903 int i; 2167 int i;
… …
1905 2169
1906 v = ev.button == Button4 ? UP : DN; 2170 v = ev.button == Button4 ? UP : DN;
1907 2171
1908 if (ev.state & ShiftMask) 2172 if (ev.state & ShiftMask)
1909 i = 1; 2173 i = 1;
1910 else if (Options & Opt_mouseWheelScrollPage) 2174 else if (OPTION (Opt_mouseWheelScrollPage))
1911 i = TermWin.nrow - 1; 2175 i = nrow - 1;
1912 else 2176 else
1913 i = 5; 2177 i = 5;
1914 2178
1915# ifdef MOUSE_SLIP_WHEELING 2179# ifdef MOUSE_SLIP_WHEELING
1916 if (ev.state & ControlMask) 2180 if (ev.state & ControlMask)
1917 { 2181 {
1918 mouse_slip_wheel_speed += v ? -1 : 1; 2182 mouse_slip_wheel_speed += v ? -1 : 1;
1919 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2183 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; 2184 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1921 2185
1922 if (slip_wheel_ev.at < NOW) 2186 if (slip_wheel_ev.at < NOW)
1923 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2187 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1924 2188
1925 slip_wheel_ev.start (); 2189 slip_wheel_ev.start ();
1926 } 2190 }
1927 else 2191 else
1928 { 2192 {
1929# endif 2193# endif
1930# ifdef JUMP_MOUSE_WHEEL
1931 scr_page (v, i); 2194 scr_page (v, i);
1932 scr_refresh (SMOOTH_REFRESH);
1933 scrollbar_show (1); 2195 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 2196# ifdef MOUSE_SLIP_WHEELING
1943 } 2197 }
1944#endif 2198# endif
1945 } 2199 }
1946 break; 2200 break;
1947#endif 2201#endif
1948 } 2202 }
1949 } 2203 }
1950#ifdef MENUBAR
1951 else if (isMenuBarWindow (ev.window))
1952 menubar_control (ev);
1953#endif
1954} 2204}
1955 2205
1956#ifdef TRANSPARENT 2206#ifdef TRANSPARENT
1957#if TINTING 2207#if TINTING
1958/* taken from aterm-0.4.2 */ 2208/* taken from aterm-0.4.2 */
… …
1966 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2216 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1967 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2217 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1968 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2218 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1969 int i; 2219 int i;
1970 2220
1971 Visual* visual = display->visual; 2221 Visual *visual = display->visual;
1972 2222
1973 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2223 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1974 2224
1975 /* for convenience */ 2225 /* for convenience */
1976 mask_r = visual->red_mask; 2226 mask_r = visual->red_mask;
… …
2197 Atom atype; 2447 Atom atype;
2198 unsigned char *prop = NULL; 2448 unsigned char *prop = NULL;
2199 Window root, oldp, *list; 2449 Window root, oldp, *list;
2200 Pixmap rootpixmap = None; 2450 Pixmap rootpixmap = None;
2201 XWindowAttributes wattr, wrootattr; 2451 XWindowAttributes wattr, wrootattr;
2452 dDisp;
2202 2453
2203 pchanged = 0; 2454 pchanged = 0;
2204 2455
2205 if (!(Options & Opt_transparent)) 2456 if (!OPTION (Opt_transparent))
2206 return pchanged; /* Don't try any more */ 2457 return pchanged; /* Don't try any more */
2207 2458
2208 XGetWindowAttributes (display->display, display->root, &wrootattr); 2459 XGetWindowAttributes (disp, display->root, &wrootattr);
2209 rootdepth = wrootattr.depth; 2460 rootdepth = wrootattr.depth;
2210 2461
2211 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2462 XGetWindowAttributes (disp, parent[0], &wattr);
2212 2463
2213 if (rootdepth != wattr.depth) 2464 if (rootdepth != wattr.depth)
2214 { 2465 {
2215 if (am_transparent) 2466 if (am_transparent)
2216 { 2467 {
2217 pchanged = 1; 2468 pchanged = 1;
2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2469 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2219 am_transparent = am_pixmap_trans = 0; 2470 am_transparent = am_pixmap_trans = 0;
2220 } 2471 }
2221 2472
2222 return pchanged; /* Don't try any more */ 2473 return pchanged; /* Don't try any more */
2223 } 2474 }
2224 2475
2225 /* Get all X ops out of the queue so that our information is up-to-date. */ 2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2226 XSync (display->display, False); 2477 XSync (disp, False);
2227 2478
2228 /* 2479 /*
2229 * Make the frame window set by the window manager have 2480 * Make the frame window set by the window manager have
2230 * the root background. Some window managers put multiple nested frame 2481 * the root background. Some window managers put multiple nested frame
2231 * windows for each client, so we have to take care about that. 2482 * windows for each client, so we have to take care about that.
2232 */ 2483 */
2233 i = (xa[XA_XROOTPMAPID] 2484 i = (xa[XA_XROOTPMAP_ID]
2234 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2485 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2235 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2236 &nitems, &bytes_after, &prop) == Success); 2487 &nitems, &bytes_after, &prop) == Success);
2237 2488
2238 if (!i || prop == NULL) 2489 if (!i || prop == NULL)
2239 i = (xa[XA_XSETROOTID] 2490 i = (xa[XA_ESETROOT_PMAP_ID]
2240 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2491 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2241 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2242 &nitems, &bytes_after, &prop) == Success); 2493 &nitems, &bytes_after, &prop) == Success);
2243 2494
2244 if (!i || prop == NULL 2495 if (!i || prop == NULL
2245#if TINTING 2496#if TINTING
… …
2264 Window cr; 2515 Window cr;
2265 XImage *image; 2516 XImage *image;
2266 GC gc; 2517 GC gc;
2267 XGCValues gcvalue; 2518 XGCValues gcvalue;
2268 2519
2269 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2520 XTranslateCoordinates (disp, parent[0], display->root,
2270 0, 0, &sx, &sy, &cr); 2521 0, 0, &sx, &sy, &cr);
2271 nw = (unsigned int)szHint.width; 2522 nw = (unsigned int)szHint.width;
2272 nh = (unsigned int)szHint.height; 2523 nh = (unsigned int)szHint.height;
2273 nx = ny = 0; 2524 nx = ny = 0;
2274 2525
… …
2284 nh += sy; 2535 nh += sy;
2285 ny = -sy; 2536 ny = -sy;
2286 sy = 0; 2537 sy = 0;
2287 } 2538 }
2288 2539
2289 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2290 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (disp, False);
2291 allowedxerror = -1; 2544 allowedxerror = -1;
2292 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2545 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2293 2546
2294 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2295 /* XXX: may need a delay here? */ 2548 /* XXX: may need a delay here? */
2296 allowedxerror = 0; 2549 allowedxerror = 0;
2297 2550
2298 if (image == NULL) 2551 if (image == NULL)
2299 { 2552 {
2300 if (am_transparent && am_pixmap_trans) 2553 if (am_transparent && am_pixmap_trans)
2301 { 2554 {
2302 pchanged = 1; 2555 pchanged = 1;
2303 if (TermWin.pixmap != None) 2556 if (pixmap != None)
2304 { 2557 {
2305 XFreePixmap (display->display, TermWin.pixmap); 2558 XFreePixmap (disp, pixmap);
2306 TermWin.pixmap = None; 2559 pixmap = None;
2307 } 2560 }
2308 } 2561 }
2309 2562
2310 am_pixmap_trans = 0; 2563 am_pixmap_trans = 0;
2311 } 2564 }
2312 else 2565 else
2313 { 2566 {
2314 if (TermWin.pixmap != None) 2567 if (pixmap != None)
2315 XFreePixmap (display->display, TermWin.pixmap); 2568 XFreePixmap (disp, pixmap);
2316 2569
2317#if TINTING 2570#if TINTING
2318 if (ISSET_PIXCOLOR (Color_tint)) 2571 if (ISSET_PIXCOLOR (Color_tint))
2319 { 2572 {
2320 unsigned short rm, gm, bm; 2573 unsigned short rm, gm, bm;
2321 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2574 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2322 2575
2323 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2576 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2324 2577
2325 ShadeXImage (display, image, shade, rm, gm, bm); 2578 ShadeXImage (display, image, shade, rm, gm, bm);
2326 } 2579 }
2327#endif 2580#endif
2328 2581
2329 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2582 pixmap = XCreatePixmap (disp, vt,
2330 szHint.width, szHint.height, image->depth); 2583 szHint.width, szHint.height, image->depth);
2331 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2584 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2332 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2585 XPutImage (disp, pixmap, gc, image, 0, 0,
2333 nx, ny, image->width, image->height); 2586 nx, ny, image->width, image->height);
2334 XFreeGC (display->display, gc); 2587 XFreeGC (disp, gc);
2335 XDestroyImage (image); 2588 XDestroyImage (image);
2336 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2589 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2337 XClearWindow (display->display, TermWin.parent[0]); 2590 XClearWindow (disp, parent[0]);
2338 2591
2339 if (!am_transparent || !am_pixmap_trans) 2592 if (!am_transparent || !am_pixmap_trans)
2340 pchanged = 1; 2593 pchanged = 1;
2341 2594
2342 am_transparent = am_pixmap_trans = 1; 2595 am_transparent = am_pixmap_trans = 1;
2343 } 2596 }
2344 } 2597 }
2345 2598
2346 if (!am_pixmap_trans) 2599 if (am_pixmap_trans)
2600 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2601 else
2347 { 2602 {
2348 unsigned int n; 2603 unsigned int n;
2349 /* 2604 /*
2350 * InheritPixmap transparency 2605 * InheritPixmap transparency
2351 */ 2606 */
2352 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2353 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2607 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2354 { 2608 {
2355 oldp = TermWin.parent[i]; 2609 oldp = parent[i];
2356 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2610 XQueryTree (disp, parent[i - 1], &root,
2357 &TermWin.parent[i], &list, &n); 2611 &parent[i], &list, &n);
2358 XFree (list); 2612 XFree (list);
2359 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2360 2613
2361 if (TermWin.parent[i] == display->root) 2614 if (parent[i] == display->root)
2362 { 2615 {
2363 if (oldp != None) 2616 if (oldp != None)
2364 pchanged = 1; 2617 pchanged = 1;
2365 2618
2366 break; 2619 break;
2367 } 2620 }
2368 2621
2369 if (oldp != TermWin.parent[i]) 2622 if (oldp != parent[i])
2370 pchanged = 1; 2623 pchanged = 1;
2371 } 2624 }
2372 2625
2373 n = 0; 2626 n = 0;
2374 2627
2375 if (pchanged) 2628 if (pchanged)
2376 { 2629 {
2377 for (; n < (unsigned int)i; n++) 2630 for (; n < (unsigned int)i; n++)
2378 { 2631 {
2379 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2632 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) 2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2382 { 2634 {
2383 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2384 break; 2636 break;
2385 } 2637 }
2386 } 2638 }
2387 } 2639 }
2388 2640
2389 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2641 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2390 { 2642 {
2391 D_X ((stderr, "InheritPixmap Turning off"));
2392 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2643 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2644 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2394 am_transparent = 0; 2645 am_transparent = 0;
2395 /* XXX: also turn off Opt_transparent? */ 2646 /* XXX: also turn off Opt_transparent? */
2396 } 2647 }
2397 else 2648 else
2398 { 2649 {
2399#if WAIT_FOR_WM 2650#if WAIT_FOR_WM
2400 /* wait (an arbitrary period) for the WM to do its thing 2651 /* wait (an arbitrary period) for the WM to do its thing
2401 * needed for fvwm2.2.2 (and before?) */ 2652 * needed for fvwm2.2.2 (and before?) */
2402 sleep (1); 2653 sleep (1);
2403#endif 2654#endif
2404 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2405 for (n = 0; n < (unsigned int)i; n++) 2655 for (n = 0; n < (unsigned int)i; n++)
2406 { 2656 {
2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2657 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2408 XClearWindow (display->display, TermWin.parent[n]); 2658 XClearWindow (disp, parent[n]);
2409 } 2659 }
2410 2660
2411 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2661 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2412 am_transparent = 1; 2662 am_transparent = 1;
2413 } 2663 }
2414 2664
2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2665 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2416 TermWin.parent[i] = None; 2666 parent[i] = None;
2417 } 2667 }
2418 2668
2419 // this is experimental
2420 if (scrollBar.win) 2669 if (scrollBar.win)
2421 { 2670 {
2422 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2671 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2423 XClearWindow (display->display, scrollBar.win);
2424 scrollBar.setIdle (); 2672 scrollBar.setIdle ();
2425 scrollbar_show (0); 2673 scrollbar_show (0);
2426 } 2674 }
2427 2675
2676 if (am_transparent)
2677 {
2678 want_refresh = want_full_refresh = 1;
2679 if (am_pixmap_trans)
2680 flush ();
2681 }
2682
2428 return pchanged; 2683 return pchanged;
2429} 2684}
2430#endif 2685#endif
2431 2686
2432/*}}} */ 2687/*}}} */
2433 2688
2434bool 2689bool
2435rxvt_term::cmd_parse () 2690rxvt_term::cmd_parse ()
2436{ 2691{
2437 bool flag = false; 2692 bool flag = false;
2438 unicode_t ch = NOCHAR; 2693 wchar_t ch = NOCHAR;
2439 unsigned char *seq_begin; // remember start of esc-sequence here 2694 char *seq_begin; // remember start of esc-sequence here
2440 2695
2441 for (;;) 2696 for (;;)
2442 { 2697 {
2443 if (ch == NOCHAR) 2698 if (ch == NOCHAR)
2444 { 2699 {
2445 seq_begin = cmdbuf_ptr; 2700 seq_begin = cmdbuf_ptr;
2446 ch = next_char (); 2701 ch = next_char ();
2447 }
2448 2702
2449 if (ch == NOCHAR) // TODO: improve 2703 if (ch == NOCHAR)
2450 break; 2704 break;
2705 }
2451 2706
2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2707 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2453 { 2708 {
2709 if (!seen_input)
2710 {
2711 seen_input = 1;
2712 // many badly-written programs (e.g. jed) contain a race condition:
2713 // they first read the screensize and then install a SIGWINCH handler.
2714 // some window managers resize the window early, and these programs
2715 // then sometimes get the size wrong.
2716 // unfortunately other programs are even more buggy and dislike
2717 // being sent SIGWINCH, so only do it when we were in fact being
2718 // resized.
2719 if (seen_resize && cmd_pid)
2720 kill (-cmd_pid, SIGWINCH);
2721 }
2722
2454 /* Read a text string from the input buffer */ 2723 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ]; 2724 wchar_t buf[UBUFSIZ];
2456 bool refreshnow = false; 2725 bool refreshnow = false;
2457 int nlines = 0; 2726 int nlines = 0;
2458 unicode_t *str = buf; 2727 wchar_t *str = buf;
2728 wchar_t *eol = str + min (ncol, UBUFSIZ);
2459 2729
2460 for (;;) 2730 for (;;)
2461 { 2731 {
2462 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2732 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2463 break; 2733 break;
2464 2734
2465 *str++ = ch; 2735 *str++ = ch;
2466 2736
2467 if (ch == C0_LF) 2737 if (ch == C0_LF || str >= eol)
2468 { 2738 {
2739 if (ch == C0_LF)
2469 nlines++; 2740 nlines++;
2741
2470 refresh_count++; 2742 refresh_count++;
2471 2743
2472 if (!(Options & Opt_jumpScroll) 2744 if (!OPTION (Opt_jumpScroll)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2745 || (refresh_count >= refresh_limit * (nrow - 1)))
2474 { 2746 {
2475 refreshnow = true; 2747 refreshnow = true;
2748 refresh_count = 0;
2476 ch = NOCHAR; 2749 ch = NOCHAR;
2477 break; 2750 break;
2478 } 2751 }
2479 2752
2480 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2753 // scr_add_lines only works for nlines <= nrow - 1.
2481 if (nlines >= TermWin.nrow - 1) 2754 if (nlines >= nrow - 1)
2482 { 2755 {
2756 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2757 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2483 scr_add_lines (buf, nlines, str - buf); 2758 scr_add_lines (buf, str - buf, nlines);
2759
2484 nlines = 0; 2760 nlines = 0;
2485 str = buf; 2761 str = buf;
2762 eol = str + min (ncol, UBUFSIZ);
2486 } 2763 }
2487 }
2488 2764
2489 if (str >= buf + UBUFSIZ) 2765 if (str >= eol)
2490 { 2766 {
2767 if (eol >= buf + UBUFSIZ)
2768 {
2491 ch = NOCHAR; 2769 ch = NOCHAR;
2492 break; 2770 break;
2771 }
2772 else
2773 eol = min (eol + ncol, buf + UBUFSIZ);
2774 }
2775
2493 } 2776 }
2494 2777
2495 seq_begin = cmdbuf_ptr; 2778 seq_begin = cmdbuf_ptr;
2496 ch = next_char (); 2779 ch = next_char ();
2497 } 2780 }
2498 2781
2782 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2783 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2499 scr_add_lines (buf, nlines, str - buf); 2784 scr_add_lines (buf, str - buf, nlines);
2500 2785
2501 /* 2786 /*
2502 * If there have been a lot of new lines, then update the screen 2787 * 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. 2788 * 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 2789 * the number of pages between refreshes is refresh_limit, which
2505 * is incremented here because we must be doing flat-out scrolling. 2790 * is incremented here because we must be doing flat-out scrolling.
2506 */ 2791 */
2507 if (refreshnow) 2792 if (refreshnow)
2508 { 2793 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++; 2795 refresh_limit++;
2511 else 2796 else
2512 { 2797 {
2513 flag = true; 2798 flag = true;
2514 scr_refresh (refresh_type); 2799 scr_refresh ();
2800 want_refresh = 1;
2515 } 2801 }
2516 } 2802 }
2517 2803
2518 } 2804 }
2519 else 2805 else
… …
2534 } 2820 }
2535 2821
2536 return flag; 2822 return flag;
2537} 2823}
2538 2824
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 2825// read the next character
2549unicode_t 2826wchar_t
2550rxvt_term::next_char () 2827rxvt_term::next_char () NOTHROW
2551{ 2828{
2552 while (cmdbuf_ptr < cmdbuf_endp) 2829 while (cmdbuf_ptr < cmdbuf_endp)
2553 { 2830 {
2554 // assume 7-bit to be ascii ALWAYS 2831 // assume 7-bit to be ascii ALWAYS
2555 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2556 return *cmdbuf_ptr++; 2833 return *cmdbuf_ptr++;
2557 2834
2558 wchar_t wc; 2835 wchar_t wc;
2559 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2836 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2560 2837
2561 if (len == (size_t)-2) 2838 if (len == (size_t)-2)
2562 { 2839 {
2563 // the mbstate stores incomplete sequences. didn't know this :/ 2840 // the mbstate stores incomplete sequences. didn't know this :/
2564 cmdbuf_ptr = cmdbuf_endp; 2841 cmdbuf_ptr = cmdbuf_endp;
2565 break; 2842 break;
2566 } 2843 }
2567 2844
2568 if (len == (size_t)-1) 2845 if (len == (size_t)-1)
2569 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2846 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2570 2847
2571 // assume wchar == unicode 2848 // assume wchar == unicode
2572 cmdbuf_ptr += len; 2849 cmdbuf_ptr += len;
2573 return wc; 2850 return wc & UNICODE_MASK;
2574 } 2851 }
2575 2852
2576 return NOCHAR; 2853 return NOCHAR;
2577} 2854}
2855
2856// read the next octet
2857uint32_t
2858rxvt_term::next_octet () NOTHROW
2859{
2860 return cmdbuf_ptr < cmdbuf_endp
2861 ? (unsigned char)*cmdbuf_ptr++
2862 : NOCHAR;
2863}
2864
2865static class out_of_input out_of_input;
2578 2866
2579/* rxvt_cmd_getc () - Return next input character */ 2867/* rxvt_cmd_getc () - Return next input character */
2580/* 2868/*
2581 * Return the next input character after first passing any keyboard input 2869 * Return the next input character after first passing any keyboard input
2582 * to the command. 2870 * to the command.
2583 */ 2871 */
2584unicode_t 2872wchar_t
2585rxvt_term::cmd_getc () 2873rxvt_term::cmd_getc () THROW ((class out_of_input))
2586{ 2874{
2587 unicode_t c = next_char (); 2875 wchar_t c = next_char ();
2588 2876
2589 if (c == NOCHAR) 2877 if (c == NOCHAR)
2590 throw out_of_input; 2878 throw out_of_input;
2591 2879
2592 return c; 2880 return c;
2593} 2881}
2594 2882
2595unicode_t 2883uint32_t
2596rxvt_term::cmd_get8 () 2884rxvt_term::cmd_get8 () THROW ((class out_of_input))
2597{ 2885{
2598 unicode_t c = next_octet (); 2886 uint32_t c = next_octet ();
2599 2887
2600 if (c == NOCHAR) 2888 if (c == NOCHAR)
2601 throw out_of_input; 2889 throw out_of_input;
2602 2890
2603 return c; 2891 return c;
… …
2703 case C0_ESC: 2991 case C0_ESC:
2704 process_escape_seq (); 2992 process_escape_seq ();
2705 break; 2993 break;
2706 case C0_ENQ: /* terminal Status */ 2994 case C0_ENQ: /* terminal Status */
2707 if (rs[Rs_answerbackstring]) 2995 if (rs[Rs_answerbackstring])
2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2996 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2709 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2710 else 2997 else
2711 tt_write ((unsigned char *)VT100_ANS, 2998 tt_write (VT100_ANS, strlen (VT100_ANS));
2712 (unsigned int)STRLEN (VT100_ANS));
2713 break; 2999 break;
2714 case C0_BEL: /* bell */ 3000 case C0_BEL: /* bell */
2715 scr_bell (); 3001 scr_bell ();
2716 break; 3002 break;
2717 case C0_BS: /* backspace */ 3003 case C0_BS: /* backspace */
… …
2816void 3102void
2817rxvt_term::process_escape_seq () 3103rxvt_term::process_escape_seq ()
2818{ 3104{
2819 unicode_t ch = cmd_getc (); 3105 unicode_t ch = cmd_getc ();
2820 3106
2821 if (PrivateModes & PrivMode_vt52) 3107 if (priv_modes & PrivMode_vt52)
2822 { 3108 {
2823 process_escape_vt52 (ch); 3109 process_escape_vt52 (ch);
2824 return; 3110 return;
2825 } 3111 }
2826 3112
… …
2841 scr_charset_set (2, (unsigned int)cmd_getc ()); 3127 scr_charset_set (2, (unsigned int)cmd_getc ());
2842 break; 3128 break;
2843 case '+': 3129 case '+':
2844 scr_charset_set (3, (unsigned int)cmd_getc ()); 3130 scr_charset_set (3, (unsigned int)cmd_getc ());
2845 break; 3131 break;
2846#ifndef NO_FRILLS 3132#if ENABLE_FRILLS
2847 case '6': 3133 case '6':
2848 scr_backindex (); 3134 scr_backindex ();
2849 break; 3135 break;
2850#endif 3136#endif
2851 case '7': 3137 case '7':
2852 scr_cursor (SAVE); 3138 scr_cursor (SAVE);
2853 break; 3139 break;
2854 case '8': 3140 case '8':
2855 scr_cursor (RESTORE); 3141 scr_cursor (RESTORE);
2856 break; 3142 break;
2857#ifndef NO_FRILLS 3143#if ENABLE_FRILLS
2858 case '9': 3144 case '9':
2859 scr_forwardindex (); 3145 scr_forwardindex ();
2860 break; 3146 break;
2861#endif 3147#endif
2862 case '=': 3148 case '=':
… …
2872 break; 3158 break;
2873 3159
2874 /* 8.3.87: NEXT LINE */ 3160 /* 8.3.87: NEXT LINE */
2875 case C1_NEL: /* ESC E */ 3161 case C1_NEL: /* ESC E */
2876 { 3162 {
2877 unicode_t nlcr[] = { C0_LF, C0_CR }; 3163 wchar_t nlcr[] = { C0_LF, C0_CR };
2878 scr_add_lines (nlcr, 1, 2); 3164 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2879 } 3165 }
2880 break; 3166 break;
2881 3167
2882 /* kidnapped escape sequence: Should be 8.3.48 */ 3168 /* kidnapped escape sequence: Should be 8.3.48 */
2883 case C1_ESA: /* ESC G */ 3169 case C1_ESA: /* ESC G */
… …
2905 process_dcs_seq (); 3191 process_dcs_seq ();
2906 break; 3192 break;
2907 3193
2908 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3194 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2909 case C1_SCI: /* ESC Z */ 3195 case C1_SCI: /* ESC Z */
2910 tt_write ((const unsigned char *)ESCZ_ANSWER, 3196 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2911 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2912 break; /* steal obsolete ESC [ c */ 3197 break; /* steal obsolete ESC [ c */
2913 3198
2914 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3199 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2915 case C1_CSI: /* ESC [ */ 3200 case C1_CSI: /* ESC [ */
2916 process_csi_seq (); 3201 process_csi_seq ();
… …
3041 { 3326 {
3042 switch (priv) 3327 switch (priv)
3043 { 3328 {
3044 case '>': 3329 case '>':
3045 if (ch == CSI_DA) /* secondary device attributes */ 3330 if (ch == CSI_DA) /* secondary device attributes */
3046 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3331 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3047 break; 3332 break;
3048 case '?': 3333 case '?':
3049 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3334 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3050 process_terminal_mode (ch, priv, nargs, arg); 3335 process_terminal_mode (ch, priv, nargs, arg);
3051 break; 3336 break;
… …
3156 3441
3157 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3442 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3158 arg[0] = -arg[0]; 3443 arg[0] = -arg[0];
3159 /* FALLTHROUGH */ 3444 /* FALLTHROUGH */
3160 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3445 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3161 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3446 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3162 break; 3447 break;
3163 3448
3164 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3449 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3165 tt_write ((const unsigned char *)VT100_ANS, 3450 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3166 (unsigned int) (sizeof (VT100_ANS) - 1));
3167 break; 3451 break;
3168 3452
3169 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3453 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3170 process_sgr_mode (nargs, arg); 3454 process_sgr_mode (nargs, arg);
3171 break; 3455 break;
… …
3178 break; 3462 break;
3179 case 6: /* CPR requested */ 3463 case 6: /* CPR requested */
3180 scr_report_position (); 3464 scr_report_position ();
3181 break; 3465 break;
3182 case 7: /* unofficial extension */ 3466 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure) 3467 if (OPTION (Opt_insecure))
3184 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3468 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3185 break; 3469 break;
3186 case 8: /* unofficial extension */ 3470 case 8: /* unofficial extension */
3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3471 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3188 break; 3472 break;
3189 } 3473 }
… …
3225 break; 3509 break;
3226 3510
3227 case CSI_RM: /* 8.3.107: RESET MODE */ 3511 case CSI_RM: /* 8.3.107: RESET MODE */
3228 if (arg[0] == 4) 3512 if (arg[0] == 4)
3229 scr_insert_mode (0); 3513 scr_insert_mode (0);
3514 else if (arg[0] == 20)
3515 priv_modes &= ~PrivMode_LFNL;
3230 break; 3516 break;
3231 3517
3232 case CSI_SM: /* 8.3.126: SET MODE */ 3518 case CSI_SM: /* 8.3.126: SET MODE */
3233 if (arg[0] == 4) 3519 if (arg[0] == 4)
3234 scr_insert_mode (1); 3520 scr_insert_mode (1);
3521 else if (arg[0] == 20)
3522 priv_modes |= PrivMode_LFNL;
3235 break; 3523 break;
3236 3524
3237 /* 3525 /*
3238 * PRIVATE USE beyond this point. All CSI_7? sequences here 3526 * PRIVATE USE beyond this point. All CSI_7? sequences here
3239 */ 3527 */
… …
3251 break; 3539 break;
3252 case CSI_75: 3540 case CSI_75:
3253 scr_cursor (RESTORE); 3541 scr_cursor (RESTORE);
3254 break; 3542 break;
3255 3543
3256#ifndef NO_FRILLS 3544#if ENABLE_FRILLS
3257 case CSI_74: 3545 case CSI_74:
3258 process_window_ops (arg, nargs); 3546 process_window_ops (arg, nargs);
3259 break; 3547 break;
3260#endif 3548#endif
3261 3549
… …
3268 break; 3556 break;
3269 } 3557 }
3270} 3558}
3271/*}}} */ 3559/*}}} */
3272 3560
3273#ifndef NO_FRILLS 3561#if ENABLE_FRILLS
3274/* ARGSUSED */ 3562/* ARGSUSED */
3275void 3563void
3276rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3564rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3277{ 3565{
3278 int x, y; 3566 int x, y;
3279 XWindowAttributes wattr; 3567 XWindowAttributes wattr;
3280 Window wdummy; 3568 Window wdummy;
3569 dDisp;
3281 3570
3282 if (nargs == 0) 3571 if (nargs == 0)
3283 return; 3572 return;
3284 3573
3285 switch (args[0]) 3574 switch (args[0])
3286 { 3575 {
3287 /* 3576 /*
3288 * commands 3577 * commands
3289 */ 3578 */
3290 case 1: /* deiconify window */ 3579 case 1: /* deiconify window */
3291 XMapWindow (display->display, TermWin.parent[0]); 3580 XMapWindow (disp, parent[0]);
3292 break; 3581 break;
3293 case 2: /* iconify window */ 3582 case 2: /* iconify window */
3294 XIconifyWindow (display->display, TermWin.parent[0], 3583 XIconifyWindow (disp, parent[0], display->screen);
3295 DefaultScreen (display->display));
3296 break; 3584 break;
3297 case 3: /* set position (pixels) */ 3585 case 3: /* set position (pixels) */
3298 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3586 XMoveWindow (disp, parent[0], args[1], args[2]);
3299 break; 3587 break;
3300 case 4: /* set size (pixels) */ 3588 case 4: /* set size (pixels) */
3301 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3589 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3302 break; 3590 break;
3303 case 5: /* raise window */ 3591 case 5: /* raise window */
3304 XRaiseWindow (display->display, TermWin.parent[0]); 3592 XRaiseWindow (disp, parent[0]);
3305 break; 3593 break;
3306 case 6: /* lower window */ 3594 case 6: /* lower window */
3307 XLowerWindow (display->display, TermWin.parent[0]); 3595 XLowerWindow (disp, parent[0]);
3308 break; 3596 break;
3309 case 7: /* refresh window */ 3597 case 7: /* refresh window */
3310 scr_touch (true); 3598 scr_touch (true);
3311 break; 3599 break;
3312 case 8: /* set size (chars) */ 3600 case 8: /* set size (chars) */
3313 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3601 set_widthheight ((unsigned int) (args[2] * fwidth),
3314 (unsigned int) (args[1] * TermWin.fheight)); 3602 (unsigned int) (args[1] * fheight));
3315 break; 3603 break;
3316 3604
3317 //case 9: NYI, TODO, restore maximized window or maximize window 3605 //case 9: NYI, TODO, restore maximized window or maximize window
3318 default: 3606 default:
3319 if (args[0] >= 24) /* set height (chars) */ 3607 if (args[0] >= 24) /* set height (chars) */
3320 set_widthheight ((unsigned int)TermWin.width, 3608 set_widthheight ((unsigned int)width,
3321 (unsigned int) (args[1] * TermWin.fheight)); 3609 (unsigned int) (args[1] * fheight));
3322 break; 3610 break;
3323 3611
3324 3612
3325 /* 3613 /*
3326 * reports - some output format copied from XTerm 3614 * reports - some output format copied from XTerm
3327 */ 3615 */
3328 case 11: /* report window state */ 3616 case 11: /* report window state */
3329 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3617 XGetWindowAttributes (disp, parent[0], &wattr);
3330 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3618 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3331 break; 3619 break;
3332 case 13: /* report window position */ 3620 case 13: /* report window position */
3333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3621 XGetWindowAttributes (disp, parent[0], &wattr);
3334 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3622 XTranslateCoordinates (disp, parent[0], wattr.root,
3335 -wattr.border_width, -wattr.border_width, 3623 -wattr.border_width, -wattr.border_width,
3336 &x, &y, &wdummy); 3624 &x, &y, &wdummy);
3337 tt_printf ("\033[3;%d;%dt", x, y); 3625 tt_printf ("\033[3;%d;%dt", x, y);
3338 break; 3626 break;
3339 case 14: /* report window size (pixels) */ 3627 case 14: /* report window size (pixels) */
3340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3628 XGetWindowAttributes (disp, parent[0], &wattr);
3341 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3629 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3342 break; 3630 break;
3343 case 18: /* report text area size (chars) */ 3631 case 18: /* report text area size (chars) */
3344 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3632 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3345 break; 3633 break;
3346 case 19: /* report window size (chars) */ 3634 case 19: /* report window size (chars) */
3347 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3635 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3348 break; 3636 break;
3349 case 20: /* report icon label */ 3637 case 20: /* report icon label */
3350 { 3638 {
3351 char *s; 3639 char *s;
3352 XGetIconName (display->display, TermWin.parent[0], &s); 3640 XGetIconName (disp, parent[0], &s);
3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3641 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s); 3642 XFree (s);
3355 } 3643 }
3356 break; 3644 break;
3357 case 21: /* report window title */ 3645 case 21: /* report window title */
3358 { 3646 {
3359 char *s; 3647 char *s;
3360 XFetchName (display->display, TermWin.parent[0], &s); 3648 XFetchName (disp, parent[0], &s);
3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3649 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s); 3650 XFree (s);
3363 } 3651 }
3364 break; 3652 break;
3365 } 3653 }
3366} 3654}
… …
3369/*----------------------------------------------------------------------*/ 3657/*----------------------------------------------------------------------*/
3370/* 3658/*
3371 * get input up until STRING TERMINATOR (or BEL) 3659 * get input up until STRING TERMINATOR (or BEL)
3372 * ends_how is terminator used. returned input must be free()'d 3660 * ends_how is terminator used. returned input must be free()'d
3373 */ 3661 */
3374unsigned char * 3662char *
3375rxvt_term::get_to_st (unicode_t &ends_how) 3663rxvt_term::get_to_st (unicode_t &ends_how)
3376{ 3664{
3377 unicode_t prev = 0, ch; 3665 unicode_t ch;
3666 bool seen_esc = false;
3378 unsigned int n = 0; 3667 unsigned int n = 0;
3379 unsigned char *s;
3380 unsigned char string[STRING_MAX]; 3668 wchar_t string[STRING_MAX];
3381 3669
3382 while ((ch = cmd_getc ()) != NOCHAR) 3670 while ((ch = cmd_getc ()) != NOCHAR)
3383 { 3671 {
3384 if (prev == C0_ESC) 3672 if (seen_esc)
3385 { 3673 {
3386 if (ch == 0x5c) /* 7bit ST */ 3674 if (ch == 0x5c) /* 7bit ST */
3387 break; 3675 break;
3388 else 3676 else
3389 return NULL; 3677 return NULL;
3390 } 3678 }
3679 else if (ch == C0_ESC)
3680 {
3681 seen_esc = true;
3682 continue;
3683 }
3391 else if (ch == C0_BEL || ch == CHAR_ST) 3684 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break; 3685 break;
3393 else if (ch < 0x20) 3686 else if (ch < 0x20)
3394 return NULL; /* other control character - exit */ 3687 return NULL; /* other control character - exit */
3395 3688
3396 if (n >= sizeof (string) - 1) 3689 seen_esc = false;
3690
3691 if (n >= STRING_MAX - 1)
3397 // stop at some sane length 3692 // stop at some sane length
3398 return NULL; 3693 return NULL;
3399 3694
3400 if (ch == C0_SYN) 3695 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 (); 3696 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else 3697 else
3406 string[n++] = prev = ch; 3698 string[n++] = ch;
3407 } 3699 }
3408 3700
3409 string[n++] = '\0'; 3701 string[n++] = '\0';
3410 3702
3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3412 return NULL;
3413
3414 ends_how = (ch == 0x5c ? C0_ESC : ch); 3703 ends_how = (ch == 0x5c ? C0_ESC : ch);
3415 STRNCPY (s, string, n); 3704
3416 return s; 3705 return rxvt_wcstombs (string);
3417} 3706}
3418 3707
3419/*----------------------------------------------------------------------*/ 3708/*----------------------------------------------------------------------*/
3420/* 3709/*
3421 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3710 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3422 */ 3711 */
3423void 3712void
3424rxvt_term::process_dcs_seq () 3713rxvt_term::process_dcs_seq ()
3425{ 3714{
3426 unsigned char *s; 3715 char *s;
3427 unicode_t eh; 3716 unicode_t eh;
3428 3717
3429 /* 3718 /*
3430 * Not handled yet 3719 * Not handled yet
3431 */ 3720 */
… …
3450 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3739 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3451 arg = arg * 10 + (ch - '0'); 3740 arg = arg * 10 + (ch - '0');
3452 3741
3453 if (ch == ';') 3742 if (ch == ';')
3454 { 3743 {
3455 unsigned char *s = get_to_st (eh); 3744 char *s = get_to_st (eh);
3456 3745
3457 if (s) 3746 if (s)
3458 { 3747 {
3459 process_xterm_seq (arg, (char *)s, eh); 3748 process_xterm_seq (arg, s, eh);
3460 free (s); 3749 free (s);
3461 } 3750 }
3462 } 3751 }
3463} 3752}
3464 3753
3465void 3754void
3466rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3755rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3467{ 3756{
3468 if (str[0] == '?' && !str[1]) 3757 if (str[0] == '?' && !str[1])
3469 { 3758 {
3470 unsigned short r, g, b; 3759 unsigned short r, g, b;
3471 PixColorsFocused[color].get (display, r, g, b); 3760 pix_colors_focused[color].get (display, r, g, b);
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3761 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3473 } 3762 }
3474 else 3763 else
3475 set_window_color (color, str); 3764 set_window_color (color, str);
3476} 3765}
3477 3766
3478/* 3767/*
3479 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3768 * 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 */ 3769 */
3503void 3770void
3504rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3771rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3505{ 3772{
3506 int changed = 0;
3507 int color; 3773 int color;
3508 char *buf, *name; 3774 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1]; 3775 bool query = str[0] == '?' && !str[1];
3776 int saveop = op;
3777 dDisp;
3510 3778
3511 assert (str != NULL); 3779 assert (str != NULL);
3512 switch (op) 3780 switch (op)
3513 { 3781 {
3514 case XTerm_name: 3782 case XTerm_name:
… …
3521 set_title (str); 3789 set_title (str);
3522 break; 3790 break;
3523 case XTerm_property: 3791 case XTerm_property:
3524 if (str[0] == '?') 3792 if (str[0] == '?')
3525 { 3793 {
3526 Atom prop = XInternAtom (display->display, str + 1, True); 3794 Atom prop = display->atom (str + 1);
3527 Atom actual_type; 3795 Atom actual_type;
3528 int actual_format; 3796 int actual_format;
3529 unsigned long nitems; 3797 unsigned long nitems;
3530 unsigned long bytes_after; 3798 unsigned long bytes_after;
3531 unsigned char *value = 0; 3799 unsigned char *value = 0;
3532 const char *str = ""; 3800 const char *str = "";
3533 3801
3534 if (prop 3802 if (prop
3535 && XGetWindowProperty (display->display, TermWin.parent[0], 3803 && XGetWindowProperty (disp, parent[0],
3536 prop, 0, 1<<16, 0, AnyPropertyType, 3804 prop, 0, 1<<16, 0, AnyPropertyType,
3537 &actual_type, &actual_format, 3805 &actual_type, &actual_format,
3538 &nitems, &bytes_after, &value) == Success 3806 &nitems, &bytes_after, &value) == Success
3539 && actual_type != None 3807 && actual_type != None
3540 && actual_format == 8) 3808 && actual_format == 8)
… …
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3817 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550 3818
3551 if (eq) 3819 if (eq)
3552 { 3820 {
3553 *eq = 0; 3821 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0], 3822 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 } 3823 }
3559 else 3824 else
3560 XDeleteProperty (display->display, TermWin.parent[0], 3825 XDeleteProperty (disp, parent[0],
3561 display->atom (str)); 3826 display->atom (str));
3562 } 3827 }
3563 break; 3828 break;
3564 3829
3565 case XTerm_Color: 3830 case XTerm_Color:
3566 for (buf = (char *)str; buf && *buf;) 3831 for (buf = (char *)str; buf && *buf;)
3567 { 3832 {
3568 if ((name = STRCHR (buf, ';')) == NULL) 3833 if ((name = strchr (buf, ';')) == NULL)
3569 break; 3834 break;
3570 3835
3571 *name++ = '\0'; 3836 *name++ = '\0';
3572 color = atoi (buf); 3837 color = atoi (buf) + minCOLOR;
3573 3838
3574 if (color < 0 || color >= TOTAL_COLORS) 3839 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3575 break; 3840 break;
3576 3841
3577 if ((buf = STRCHR (name, ';')) != NULL) 3842 if ((buf = strchr (name, ';')) != NULL)
3578 *buf++ = '\0'; 3843 *buf++ = '\0';
3579 3844
3580 if (name[0] == '?' && !name[1]) 3845 if (name[0] == '?' && !name[1])
3581 { 3846 {
3582 unsigned short r, g, b; 3847 unsigned short r, g, b;
3583 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3848 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); 3849 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3585 } 3850 }
3586 else 3851 else
3587 set_window_color (color + minCOLOR, name); 3852 set_window_color (color, name);
3588 } 3853 }
3589 break; 3854 break;
3590 case XTerm_Color00: 3855 case XTerm_Color00:
3591 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3856 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3592 break; 3857 break;
3593 case XTerm_Color01: 3858 case XTerm_Color01:
3594 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3859 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3595 break; 3860 break;
3596#ifndef NO_CURSORCOLOR 3861#ifndef NO_CURSORCOLOR
3597 case XTerm_Color_cursor: 3862 case XTerm_Color_cursor:
3598 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3863 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3599 break; 3864 break;
… …
3603 break; 3868 break;
3604 case XTerm_Color_pointer_bg: 3869 case XTerm_Color_pointer_bg:
3605 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3870 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3606 break; 3871 break;
3607#ifndef NO_BOLD_UNDERLINE_REVERSE 3872#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: 3873 case XTerm_Color_RV:
3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3874 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3616 break; 3875 break;
3876 case Rxvt_Color_BD:
3877 case URxvt_Color_BD:
3878 process_color_seq (op, Color_BD, str, resp);
3879 break;
3880 case Rxvt_Color_UL:
3881 case URxvt_Color_UL:
3882 process_color_seq (op, Color_UL, str, resp);
3883 break;
3884 case URxvt_Color_IT:
3885 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3886 break;
3617#endif 3887#endif
3888#if TRANSPARENT && TINTING
3889 case URxvt_Color_tint:
3890 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3891 check_our_parents ();
3892 if (am_transparent)
3893 want_full_refresh = want_refresh = 1;
3894 break;
3895#endif
3618 3896
3619 case XTerm_Pixmap: 3897 case Rxvt_Pixmap:
3898 {
3620 if (*str != ';') 3899 if (*str != ';')
3621 { 3900 {
3622#if XPM_BACKGROUND 3901#if XPM_BACKGROUND
3623 scale_pixmap (""); /* reset to default scaling */ 3902 scale_pixmap (""); /* reset to default scaling */
3624 set_bgPixmap (str); /* change pixmap */ 3903 set_bgPixmap (str); /* change pixmap */
3625#endif
3626 scr_touch (true); 3904 scr_touch (true);
3905#endif
3627 } 3906 }
3907
3908 int changed = 0;
3909
3628 while ((str = STRCHR (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3629 { 3911 {
3630 str++; 3912 str++;
3631#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3632 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
3633#endif 3915#endif
3634
3635 } 3916 }
3917
3636 if (changed) 3918 if (changed)
3637 { 3919 {
3638#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3639 resize_pixmap (); 3921 resize_pixmap ();
3640#endif
3641 scr_touch (true); 3922 scr_touch (true);
3923#endif
3642 } 3924 }
3925 }
3643 break; 3926 break;
3644 3927
3645 case XTerm_restoreFG: 3928 case Rxvt_restoreFG:
3646 set_window_color (Color_fg, str); 3929 set_window_color (Color_fg, str);
3647 break; 3930 break;
3648 case XTerm_restoreBG: 3931 case Rxvt_restoreBG:
3649 set_window_color (Color_bg, str); 3932 set_window_color (Color_bg, str);
3650 break; 3933 break;
3651 3934
3652 case XTerm_logfile: 3935 case XTerm_logfile:
3653 // TODO, when secure mode? 3936 // TODO, when secure mode?
3654 break; 3937 break;
3655 3938
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 3939#if 0
3697 case XTerm_dumpscreen: /* no error notices */ 3940 case Rxvt_dumpscreen: /* no error notices */
3698 { 3941 {
3699 int fd; 3942 int fd;
3700 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3943 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3701 { 3944 {
3702 scr_dump (fd); 3945 scr_dump (fd);
3703 close (fd); 3946 close (fd);
3704 } 3947 }
3705 } 3948 }
3949 break;
3950#endif
3951 case XTerm_font:
3952 op = URxvt_font;
3953 case URxvt_font:
3954#if ENABLE_STYLES
3955 case URxvt_boldFont:
3956 case URxvt_italicFont:
3957 case URxvt_boldItalicFont:
3958#endif
3959 if (query)
3960 tt_printf ("\33]%d;%-.250s%c", saveop,
3961 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3962 ? fontset[op - URxvt_font]->fontdesc : "",
3963 resp);
3964 else
3965 {
3966 const char *&res = rs[Rs_font + (op - URxvt_font)];
3967
3968 res = strdup (str);
3969 allocated.push_back ((void *)res);
3970 set_fonts ();
3971 }
3972 break;
3973
3974#if ENABLE_FRILLS
3975 case URxvt_locale:
3976 if (query)
3977 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3978 else
3979 {
3980 set_locale (str);
3981 pty->set_utf8_mode (enc_utf8);
3982 init_xlocale ();
3983 }
3984 break;
3985
3986 case URxvt_view_up:
3987 case URxvt_view_down:
3988 {
3989 int lines = atoi (str);
3990
3991 if (lines)
3992 scr_page (op == URxvt_view_up ? UP : DN, lines);
3993 else
3994 scr_erase_savelines ();
3995 }
3996
3997 break;
3998#endif
3999
4000#if ENABLE_PERL
4001 case URxvt_perl:
4002 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4003 ; // no responses yet
3706 break; 4004 break;
3707#endif 4005#endif
3708 } 4006 }
3709} 4007}
3710/*----------------------------------------------------------------------*/ 4008/*----------------------------------------------------------------------*/
… …
3724{ 4022{
3725 int state; 4023 int state;
3726 4024
3727 if (mode == 's') 4025 if (mode == 's')
3728 { 4026 {
3729 SavedModes |= (PrivateModes & bit); 4027 SavedModes |= (priv_modes & bit);
3730 return -1; 4028 return -1;
3731 } 4029 }
3732 else 4030 else
3733 { 4031 {
3734 if (mode == 'r') 4032 if (mode == 'r')
3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4033 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3736 else 4034 else
3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4035 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3738 PrivMode (state, bit); 4036 PrivMode (state, bit);
3739 } 4037 }
3740 4038
3741 return state; 4039 return state;
3742} 4040}
3743 4041
3744/* we're not using priv _yet_ */ 4042/* we're not using priv _yet_ */
3745void 4043void
3746rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4044rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3747{ 4045{
3748 unsigned int i, j; 4046 unsigned int i, j;
3749 int state; 4047 int state;
3750 4048
3751 static const struct 4049 static const struct
… …
3760 { 3, PrivMode_132 }, 4058 { 3, PrivMode_132 },
3761 { 4, PrivMode_smoothScroll }, 4059 { 4, PrivMode_smoothScroll },
3762 { 5, PrivMode_rVideo }, 4060 { 5, PrivMode_rVideo },
3763 { 6, PrivMode_relOrigin }, 4061 { 6, PrivMode_relOrigin },
3764 { 7, PrivMode_Autowrap }, 4062 { 7, PrivMode_Autowrap },
4063 // 8, bi-directional support mode
3765 { 9, PrivMode_MouseX10 }, 4064 { 9, PrivMode_MouseX10 },
3766#ifdef menuBar_esc 4065 // 18, 19 printing-related
3767 { menuBar_esc, PrivMode_menuBar }, 4066 { 25, PrivMode_VisibleCursor },
3768#endif
3769#ifdef scrollBar_esc 4067#ifdef scrollBar_esc
3770 { scrollBar_esc, PrivMode_scrollBar }, 4068 { scrollBar_esc, PrivMode_scrollBar },
3771#endif 4069#endif
3772 // 18, 19 printing-related
3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3775 { 35, PrivMode_ShiftKeys }, // rxvt extension 4070 { 35, PrivMode_ShiftKeys }, // rxvt extension
3776 { 40, PrivMode_132OK }, 4071 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI 4072 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI 4073 // 45 margin bell NYI
3779 // 46 start logging 4074 // 46 start logging
… …
3819 } 4114 }
3820 4115
3821 /* extra handling for values with state unkept */ 4116 /* extra handling for values with state unkept */
3822 switch (arg[i]) 4117 switch (arg[i])
3823 { 4118 {
4119#if ENABLE_STYLES
4120 case 1021:
4121 set_option (Opt_intensityStyles, mode);
4122
4123 scr_touch (true);
4124 break;
4125#endif
3824 case 1048: /* alternative cursor save */ 4126 case 1048: /* alternative cursor save */
4127 case 1049:
3825 if (Options & Opt_secondaryScreen) 4128 if (OPTION (Opt_secondaryScreen))
3826 if (mode == 0) 4129 if (mode == 0)
3827 scr_cursor (RESTORE); 4130 scr_cursor (RESTORE);
3828 else if (mode == 1) 4131 else if (mode == 1)
3829 scr_cursor (SAVE); 4132 scr_cursor (SAVE);
3830 break; 4133 break;
… …
3841 * within VT52 mode 4144 * within VT52 mode
3842 */ 4145 */
3843 PrivMode (1, PrivMode_vt52); 4146 PrivMode (1, PrivMode_vt52);
3844 break; 4147 break;
3845 case 3: /* 80/132 */ 4148 case 3: /* 80/132 */
3846 if (PrivateModes & PrivMode_132OK) 4149 if (priv_modes & PrivMode_132OK)
3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4150 set_widthheight (((state ? 132 : 80) * fwidth), height);
3848 break; 4151 break;
3849 case 4: /* smooth scrolling */ 4152 case 4: /* smooth scrolling */
3850 if (state) 4153 set_option (Opt_jumpScroll, !state);
3851 Options &= ~Opt_jumpScroll;
3852 else
3853 Options |= Opt_jumpScroll;
3854 break; 4154 break;
3855 case 5: /* reverse video */ 4155 case 5: /* reverse video */
3856 scr_rvideo_mode (state); 4156 scr_rvideo_mode (state);
3857 break; 4157 break;
3858 case 6: /* relative/absolute origins */ 4158 case 6: /* relative/absolute origins */
… …
3862 scr_autowrap (state); 4162 scr_autowrap (state);
3863 break; 4163 break;
3864 /* case 8: - auto repeat, can't do on a per window basis */ 4164 /* case 8: - auto repeat, can't do on a per window basis */
3865 case 9: /* X10 mouse reporting */ 4165 case 9: /* X10 mouse reporting */
3866 if (state) /* orthogonal */ 4166 if (state) /* orthogonal */
3867 PrivateModes &= ~PrivMode_MouseX11; 4167 priv_modes &= ~PrivMode_MouseX11;
3868 break; 4168 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 4169#ifdef scrollBar_esc
3877 case scrollBar_esc: 4170 case scrollBar_esc:
3878 if (scrollbar_mapping (state)) 4171 if (scrollbar_mapping (state))
3879 { 4172 {
3880 resize_all_windows (0, 0, 0); 4173 resize_all_windows (0, 0, 0);
… …
3892 break; 4185 break;
3893 /* case 66: - application key pad */ 4186 /* case 66: - application key pad */
3894 /* case 67: - backspace key */ 4187 /* case 67: - backspace key */
3895 case 1000: /* X11 mouse reporting */ 4188 case 1000: /* X11 mouse reporting */
3896 if (state) /* orthogonal */ 4189 if (state) /* orthogonal */
3897 PrivateModes &= ~PrivMode_MouseX10; 4190 priv_modes &= ~PrivMode_MouseX10;
3898 break; 4191 break;
3899#if 0 4192#if 0
3900 case 1001: 4193 case 1001:
3901 break; /* X11 mouse highlighting */ 4194 break; /* X11 mouse highlighting */
3902#endif 4195#endif
3903 case 1010: /* scroll to bottom on TTY output inhibit */ 4196 case 1010: /* scroll to bottom on TTY output inhibit */
3904 if (state)
3905 Options &= ~Opt_scrollTtyOutput;
3906 else
3907 Options |= Opt_scrollTtyOutput; 4197 set_option (Opt_scrollTtyOutput, !state);
3908 break; 4198 break;
3909 case 1011: /* scroll to bottom on key press */ 4199 case 1011: /* scroll to bottom on key press */
3910 if (state)
3911 Options |= Opt_scrollTtyKeypress; 4200 set_option (Opt_scrollTtyKeypress, state);
3912 else
3913 Options &= ~Opt_scrollTtyKeypress;
3914 break; 4201 break;
3915 case 1047: /* secondary screen w/ clearing last */ 4202 case 1047: /* secondary screen w/ clearing last */
3916 if (Options & Opt_secondaryScreen) 4203 if (OPTION (Opt_secondaryScreen))
3917 if (current_screen != PRIMARY) 4204 if (current_screen != PRIMARY)
3918 scr_erase_screen (2); 4205 scr_erase_screen (2);
3919 scr_change_screen (state); 4206 scr_change_screen (state);
3920 break; 4207 break;
3921 case 1049: /* secondary screen w/ clearing first */ 4208 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state); 4209 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen) 4210 if (OPTION (Opt_secondaryScreen))
3924 if (current_screen != PRIMARY) 4211 if (current_screen != PRIMARY)
3925 scr_erase_screen (2); 4212 scr_erase_screen (2);
3926 break; 4213 break;
3927 default: 4214 default:
3928 break; 4215 break;
… …
3954 rendset = 0, rendstyle = ~RS_None; 4241 rendset = 0, rendstyle = ~RS_None;
3955 break; 4242 break;
3956 case 1: 4243 case 1:
3957 rendset = 1, rendstyle = RS_Bold; 4244 rendset = 1, rendstyle = RS_Bold;
3958 break; 4245 break;
3959 //case 2: // faint or second colour 4246 //case 2: // low intensity
4247 case 3:
4248 rendset = 1, rendstyle = RS_Italic;
4249 break;
3960 case 4: 4250 case 4:
3961 rendset = 1, rendstyle = RS_Uline; 4251 rendset = 1, rendstyle = RS_Uline;
3962 break; 4252 break;
3963 case 5: // slowly blinking 4253 case 5: // slowly blinking
3964 case 6: // rapidly blinking 4254 case 6: // rapidly blinking
… …
3976 //case 11: // scoansi acs on, first alt font 4266 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font 4267 //case 12: // scoansi acs on, |0x80, second alt font
3978 //... 4268 //...
3979 //case 19: // ninth alt font 4269 //case 19: // ninth alt font
3980 //case 20: // gothic 4270 //case 20: // gothic
3981 case 21: // disable bold, faint 4271 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3982 rendset = 0, rendstyle = RS_Bold; 4272 rendset = 0, rendstyle = RS_Bold;
3983 break; 4273 break;
3984 case 22: 4274 case 22: // normal intensity
3985 rendset = 0, rendstyle = RS_Bold; 4275 rendset = 0, rendstyle = RS_Bold;
3986 break; 4276 break;
3987 //case 23: disable italic 4277 case 23: // disable italic
4278 rendset = 0, rendstyle = RS_Italic;
4279 break;
3988 case 24: 4280 case 24:
3989 rendset = 0, rendstyle = RS_Uline; 4281 rendset = 0, rendstyle = RS_Uline;
3990 break; 4282 break;
3991 case 25: 4283 case 25:
4284 rendset = 0, rendstyle = RS_Blink;
4285 break;
4286 case 26: // variable spacing (iso 8613)
3992 rendset = 0, rendstyle = RS_Blink; 4287 rendset = 0, rendstyle = RS_Blink;
3993 break; 4288 break;
3994 case 27: 4289 case 27:
3995 rendset = 0, rendstyle = RS_RVid; 4290 rendset = 0, rendstyle = RS_RVid;
3996 break; 4291 break;
… …
4014 case 35: 4309 case 35:
4015 case 36: 4310 case 36:
4016 case 37: 4311 case 37:
4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4312 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4018 break; 4313 break;
4019#ifdef TTY_256COLOR 4314 case 38: // set fg color, ISO 8613-6
4020 case 38:
4021 if (nargs > i + 2 && arg[i + 1] == 5) 4315 if (nargs > i + 2 && arg[i + 1] == 5)
4022 { 4316 {
4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4317 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4024 i += 2; 4318 i += 2;
4025 } 4319 }
4026 break; 4320 break;
4027#endif
4028 case 39: /* default fg */ 4321 case 39: /* default fg */
4029 scr_color (Color_fg, Color_fg); 4322 scr_color (Color_fg, Color_fg);
4030 break; 4323 break;
4031 4324
4032 case 40: 4325 case 40:
… …
4037 case 45: 4330 case 45:
4038 case 46: 4331 case 46:
4039 case 47: 4332 case 47:
4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4333 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4041 break; 4334 break;
4042#ifdef TTY_256COLOR 4335 case 48: // set bg color, ISO 8613-6
4043 case 48:
4044 if (nargs > i + 2 && arg[i + 1] == 5) 4336 if (nargs > i + 2 && arg[i + 1] == 5)
4045 { 4337 {
4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4338 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4047 i += 2; 4339 i += 2;
4048 } 4340 }
4049 break; 4341 break;
4050#endif
4051 case 49: /* default bg */ 4342 case 49: /* default bg */
4052 scr_color (Color_bg, Color_bg); 4343 scr_color (Color_bg, Color_bg);
4053 break; 4344 break;
4054 4345
4055#ifndef NO_BRIGHTCOLOR 4346 //case 50: // not variable spacing
4347
4348#if ENABLE_FRILLS
4056 case 90: 4349 case 90:
4057 case 91: /* set bright fg color */ 4350 case 91: /* set bright fg color */
4058 case 92: 4351 case 92:
4059 case 93: 4352 case 93:
4060 case 94: 4353 case 94:
4061 case 95: 4354 case 95:
4062 case 96: 4355 case 96:
4063 case 97: 4356 case 97:
4064 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4357 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4065 Color_fg);
4066 break; 4358 break;
4067 case 100: 4359 case 100:
4068 case 101: /* set bright bg color */ 4360 case 101: /* set bright bg color */
4069 case 102: 4361 case 102:
4070 case 103: 4362 case 103:
4071 case 104: 4363 case 104:
4072 case 105: 4364 case 105:
4073 case 106: 4365 case 106:
4074 case 107: 4366 case 107:
4075 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4367 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4076 Color_bg);
4077 break; 4368 break;
4078#endif 4369#endif
4079
4080 } 4370 }
4081 } 4371 }
4082} 4372}
4083/*}}} */ 4373/*}}} */
4084 4374
… …
4088{ 4378{
4089 unicode_t ch, cmd = cmd_getc (); 4379 unicode_t ch, cmd = cmd_getc ();
4090 4380
4091 if (cmd == 'Q') 4381 if (cmd == 'Q')
4092 { /* query graphics */ 4382 { /* query graphics */
4093 tt_printf ("\033G0\n"); /* no graphics */ 4383 tt_printf ("\033G0\012"); /* no graphics */
4094 return; 4384 return;
4095 } 4385 }
4096 /* swallow other graphics sequences until terminating ':' */ 4386 /* swallow other graphics sequences until terminating ':' */
4097 do 4387 do
4098 ch = cmd_getc (); 4388 ch = cmd_getc ();
… …
4108 */ 4398 */
4109void 4399void
4110rxvt_term::tt_printf (const char *fmt,...) 4400rxvt_term::tt_printf (const char *fmt,...)
4111{ 4401{
4112 va_list arg_ptr; 4402 va_list arg_ptr;
4113 unsigned char buf[256]; 4403 char buf[256];
4114 4404
4115 va_start (arg_ptr, fmt); 4405 va_start (arg_ptr, fmt);
4116 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4406 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4117 va_end (arg_ptr); 4407 va_end (arg_ptr);
4118 tt_write (buf, STRLEN (buf)); 4408 tt_write (buf, strlen (buf));
4119} 4409}
4120 4410
4121/* ---------------------------------------------------------------------- */ 4411/* ---------------------------------------------------------------------- */
4122/* Write data to the pty as typed by the user, pasted with the mouse, 4412/* 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. 4413 * or generated by us in response to a query ESC sequence.
4124 */ 4414 */
4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4416
4125void 4417void
4126rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4418rxvt_term::tt_write (const char *data, unsigned int len)
4127{ 4419{
4128 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4420 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4421 return;
4129 4422
4130 if (len) 4423 if (pty->pty < 0)
4424 return;
4425
4426 if (v_buflen == 0)
4427 {
4428 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4429
4430 if ((unsigned int)written == len)
4431 return;
4432
4433 data += written;
4434 len -= written;
4131 { 4435 }
4436
4437 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4438
4439 memcpy (v_buffer + v_buflen, data, len);
4440 v_buflen += len;
4441
4442 pty_ev.set (EVENT_READ | EVENT_WRITE);
4443}
4444
4445void rxvt_term::pty_write ()
4446{
4447 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4448
4449 if (written > 0)
4450 {
4451 v_buflen -= written;
4452
4132 if (v_buflen == 0) 4453 if (v_buflen == 0)
4133 { 4454 {
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); 4455 free (v_buffer);
4161 v_buffer = 0; 4456 v_buffer = 0;
4162 v_buflen = 0; 4457 v_buflen = 0;
4163 4458
4164 pty_ev.set (EVENT_READ); 4459 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; 4460 return;
4177 } 4461 }
4462
4463 memmove (v_buffer, v_buffer + written, v_buflen);
4178 } 4464 }
4465 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4466 pty_ev.set (EVENT_READ);
4179} 4467}
4180 4468
4181/*----------------------- end-of-file (C source) -----------------------*/ 4469/*----------------------- end-of-file (C source) -----------------------*/
4182 4470

Diff Legend

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