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

Diff Legend

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