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

Diff Legend

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