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

Diff Legend

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