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.344 by root, Fri Aug 10 23:52:12 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
510# endif
356 return; 511 return;
357 } 512 }
358 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
359 { 514 {
360 iso14755buf = (iso14755buf << 4) | hv | ISO_14755_KEYCODE_VALID; 515 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
516 | hv | ISO_14755_51;
517# if ISO_14755
518 iso14755_51 (iso14755buf & ISO_14755_MASK);
519# endif
361 return; 520 return;
362 } 521 }
363 else 522 else
523 {
524# if ISO_14755
525 scr_overlay_off ();
526# endif
364 iso14755buf = 0; 527 iso14755buf = 0;
528 }
365 } 529 }
366 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
367 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
532 if (!(iso14755buf & ISO_14755_STARTED))
533 {
368 iso14755buf |= ISO_14755_ACTIVE; 534 iso14755buf |= ISO_14755_STARTED;
535# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode");
369#endif 538# endif
370 539 }
540#endif
541
371#ifdef PRINTPIPE 542#ifdef PRINTPIPE
372 if (keysym == XK_Print) 543 if (keysym == XK_Print)
373 { 544 {
374 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
375 return; 546 return;
376 } 547 }
377#endif 548#endif
378 549
379 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
380 { 551 {
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 { 552 {
407 newlen = 1; 553 newlen = 1;
408 switch (keysym) 554 switch (keysym)
409 { 555 {
410#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
411 case XK_BackSpace: 557 case XK_BackSpace:
412 if (PrivateModes & PrivMode_HaveBackSpace) 558 if (priv_modes & PrivMode_HaveBackSpace)
413 { 559 {
414 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
415 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
416 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
417 } 563 }
418 else 564 else
419 STRCPY (kbuf, key_backspace); 565 strcpy (kbuf, key_backspace);
420 break; 566 break;
421#endif 567#endif
422#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
423 case XK_Delete: 579 case XK_Delete:
424 STRCPY (kbuf, key_delete); 580 strcpy (kbuf, key_delete);
425 break; 581 break;
426#endif 582#endif
427 case XK_Tab: 583 case XK_Tab:
428 if (shft) 584 if (shft)
429 STRCPY (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
430 else 586 else
431 { 587 {
432#ifdef CTRL_TAB_MAKES_META 588#ifdef CTRL_TAB_MAKES_META
433 if (ctrl) 589 if (ctrl)
434 meta = 1; 590 meta = 1;
… …
444#ifdef XK_KP_Left 600#ifdef XK_KP_Left
445 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
446 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
447 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
448 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
449 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
450 { 606 {
451 STRCPY (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
452 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
453 break; 609 break;
454 } 610 }
455 else 611 else
456 /* translate to std. cursor key */ 612 /* translate to std. cursor key */
… …
459#endif 615#endif
460 case XK_Up: /* "\033[A" */ 616 case XK_Up: /* "\033[A" */
461 case XK_Down: /* "\033[B" */ 617 case XK_Down: /* "\033[B" */
462 case XK_Right: /* "\033[C" */ 618 case XK_Right: /* "\033[C" */
463 case XK_Left: /* "\033[D" */ 619 case XK_Left: /* "\033[D" */
464 STRCPY (kbuf, "\033[Z"); 620 strcpy (kbuf, "\033[Z");
465 kbuf[2] = "DACB"[keysym - XK_Left]; 621 kbuf[2] = "DACB"[keysym - XK_Left];
466 /* do Shift first */ 622 /* do Shift first */
467 if (shft) 623 if (shft)
468 kbuf[2] = "dacb"[keysym - XK_Left]; 624 kbuf[2] = "dacb"[keysym - XK_Left];
469 else if (ctrl) 625 else if (ctrl)
470 { 626 {
471 kbuf[1] = 'O'; 627 kbuf[1] = 'O';
472 kbuf[2] = "dacb"[keysym - XK_Left]; 628 kbuf[2] = "dacb"[keysym - XK_Left];
473 } 629 }
474 else if (PrivateModes & PrivMode_aplCUR) 630 else if (priv_modes & PrivMode_aplCUR)
475 kbuf[1] = 'O'; 631 kbuf[1] = 'O';
476 break; 632 break;
477 633
478#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
479# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
480 case XK_KP_Prior: 636 case XK_KP_Prior:
481 /* allow shift to override */ 637 /* allow shift to override */
482 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
483 { 639 {
484 STRCPY (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
485 break; 641 break;
486 } 642 }
487 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
488# endif 644# endif
489 case XK_Prior: 645 case XK_Prior:
490 STRCPY (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
491 break; 647 break;
492# ifdef XK_KP_Next 648# ifdef XK_KP_Next
493 case XK_KP_Next: 649 case XK_KP_Next:
494 /* allow shift to override */ 650 /* allow shift to override */
495 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
496 { 652 {
497 STRCPY (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
498 break; 654 break;
499 } 655 }
500 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
501# endif 657# endif
502 case XK_Next: 658 case XK_Next:
503 STRCPY (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
504 break; 660 break;
505#endif 661#endif
506 case XK_KP_Enter: 662 case XK_KP_Enter:
507 /* allow shift to override */ 663 /* allow shift to override */
508 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
509 { 665 {
510 STRCPY (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
511 } 678 }
512 else 679 else
513 { 680 {
514 kbuf[0] = '\r'; 681 kbuf[0] = '\015';
515 kbuf[1] = '\0'; 682 kbuf[1] = '\0';
516 } 683 }
517 break; 684 break;
518 685
519#ifdef XK_KP_Begin 686#ifdef XK_KP_Begin
520 case XK_KP_Begin: 687 case XK_KP_Begin:
521 STRCPY (kbuf, "\033Ou"); 688 strcpy (kbuf, "\033Ou");
522 break; 689 break;
523 690
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 691#endif
532 case XK_KP_F1: /* "\033OP" */ 692 case XK_KP_F1: /* "\033OP" */
533 case XK_KP_F2: /* "\033OQ" */ 693 case XK_KP_F2: /* "\033OQ" */
534 case XK_KP_F3: /* "\033OR" */ 694 case XK_KP_F3: /* "\033OR" */
535 case XK_KP_F4: /* "\033OS" */ 695 case XK_KP_F4: /* "\033OS" */
536 STRCPY (kbuf, "\033OP"); 696 strcpy (kbuf, "\033OP");
537 kbuf[2] += (keysym - XK_KP_F1); 697 kbuf[2] += (keysym - XK_KP_F1);
538 break; 698 break;
539 699
540 case XK_KP_Multiply: /* "\033Oj" : "*" */ 700 case XK_KP_Multiply: /* "\033Oj" : "*" */
541 case XK_KP_Add: /* "\033Ok" : "+" */ 701 case XK_KP_Add: /* "\033Ok" : "+" */
… …
552 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
553 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
554 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
555 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
556 /* allow shift to override */ 716 /* allow shift to override */
557 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 { 718 {
559 STRCPY (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
560 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
561 } 721 }
562 else 722 else
563 { 723 {
564 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
565 kbuf[1] = '\0'; 725 kbuf[1] = '\0';
566 } 726 }
567 break; 727 break;
568 728
569 case XK_Find: 729 case XK_Find:
570 STRCPY (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
571 break; 731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
572 case XK_Insert: 743 case XK_Insert:
573 STRCPY (kbuf, "\033[2~"); 744 strcpy (kbuf, "\033[2~");
574 break; 745 break;
575#ifdef DXK_Remove /* support for DEC remove like key */ 746#ifdef DXK_Remove /* support for DEC remove like key */
576 case DXK_Remove: 747 case DXK_Remove:
577 /* FALLTHROUGH */ 748 /* FALLTHROUGH */
578#endif 749#endif
579 case XK_Execute: 750 case XK_Execute:
580 STRCPY (kbuf, "\033[3~"); 751 strcpy (kbuf, "\033[3~");
581 break; 752 break;
582 case XK_Select: 753 case XK_Select:
583 STRCPY (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
584 break; 755 break;
585#ifdef XK_KP_End 756#ifdef XK_KP_End
586 case XK_KP_End: 757 case XK_KP_End:
587 /* allow shift to override */ 758 /* allow shift to override */
588 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
589 { 760 {
590 STRCPY (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
591 break; 762 break;
592 } 763 }
593 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
594#endif 765#endif
595 case XK_End: 766 case XK_End:
596 STRCPY (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
597 break; 768 break;
598#ifdef XK_KP_Home 769#ifdef XK_KP_Home
599 case XK_KP_Home: 770 case XK_KP_Home:
600 /* allow shift to override */ 771 /* allow shift to override */
601 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
602 { 773 {
603 STRCPY (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
604 break; 775 break;
605 } 776 }
606 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
607#endif 778#endif
608 case XK_Home: 779 case XK_Home:
609 STRCPY (kbuf, KS_HOME); 780 strcpy (kbuf, KS_HOME);
610 break; 781 break;
611 782
612#define FKEY(n, fkey) \ 783#define FKEY(n, fkey) \
613 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
614 785
… …
666#undef FKEY 837#undef FKEY
667 default: 838 default:
668 newlen = 0; 839 newlen = 0;
669 break; 840 break;
670 } 841 }
842
671 if (newlen) 843 if (newlen)
672 len = STRLEN (kbuf); 844 len = strlen (kbuf);
673 } 845 }
674 846
675 /* 847 /*
676 * Pass meta for all function keys, if 'meta' option set 848 * Pass meta for all function keys, if 'meta' option set
677 */ 849 */
… …
684 else if (ctrl && keysym == XK_minus) 856 else if (ctrl && keysym == XK_minus)
685 { 857 {
686 len = 1; 858 len = 1;
687 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 859 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
688 } 860 }
861 else if (keysym == XK_ISO_Left_Tab)
862 {
863 strcpy (kbuf, "\033[Z");
864 len = 3;
865 }
689 else 866 else
690 { 867 {
691#ifdef META8_OPTION 868#ifdef META8_OPTION
692 /* set 8-bit on */ 869 /* set 8-bit on */
693 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
694 { 871 {
695 unsigned char *ch; 872 char *ch;
696 873
697 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
698 *ch |= 0x80; 875 *ch |= 0x80;
699 876
700 meta = 0; 877 meta = 0;
… …
702#endif 879#endif
703 /* nil */ ; 880 /* nil */ ;
704 } 881 }
705 } 882 }
706 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
707 if (len <= 0) 887 if (len <= 0)
708 return; /* not mapped */ 888 return; /* not mapped */
709 889
710 if (Options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
711 if (TermWin.view_start) 891 if (view_start)
712 { 892 {
713 TermWin.view_start = 0; 893 view_start = 0;
714 want_refresh = 1; 894 want_refresh = 1;
715 } 895 }
716 896
717 /* 897 /*
718 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
733#ifdef META8_OPTION 913#ifdef META8_OPTION
734 && meta_char == C0_ESC 914 && meta_char == C0_ESC
735#endif 915#endif
736 ) 916 )
737 { 917 {
738 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
739 tt_write (&ch, 1); 919 tt_write (&ch, 1);
740 } 920 }
741 921
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); 922 tt_write (kbuf, (unsigned int)len);
753} 923}
754/*}}} */
755 924
756#if (MENUBAR_MAX) 925void
757/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 926rxvt_term::key_release (XKeyEvent &ev)
758/* attempt to `write' count to the input buffer */ 927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
1002#if defined (KEYSYM_RESOURCE)
759unsigned int 1003unsigned int
760rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
761{ 1005{
762 unsigned int n, s; 1006 unsigned int n, s;
763 1007
764 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
765 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
766 1010
767 if (n > 0 && s < count) 1011 if (n > 0 && s < count)
768 { 1012 {
769 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 1013 memmove (cmdbuf_base, cmdbuf_ptr,
770 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
771 cmdbuf_ptr = cmdbuf_base; 1015 cmdbuf_ptr = cmdbuf_base;
772 cmdbuf_endp -= n; 1016 cmdbuf_endp -= n;
773 s += n; 1017 s += n;
774 } 1018 }
… …
784 1028
785 cmd_parse (); 1029 cmd_parse ();
786 1030
787 return 0; 1031 return 0;
788} 1032}
789#endif /* MENUBAR_MAX */ 1033#endif
790 1034
791void 1035void
792rxvt_term::flush () 1036rxvt_term::flush ()
793{ 1037{
1038 flush_ev.stop ();
1039
794#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
795 if (want_full_refresh) 1041 if (want_full_refresh)
796 { 1042 {
797 want_full_refresh = 0; 1043 want_full_refresh = 0;
798 scr_clear (); 1044 scr_clear ();
799 scr_touch (false); 1045 scr_touch (false);
800 } 1046 }
801#endif 1047#endif
802 1048
803 if (want_refresh) 1049 if (want_refresh)
804 { 1050 {
1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1052 {
1053 int row = view_start;
1054 int end_row = row + nrow;
1055
1056 while (row > top_row && ROW (row - 1).is_longer ())
1057 --row;
1058
1059 do
1060 {
1061 int start_row = row;
1062 line_t *l;
1063
1064 do
1065 {
1066 l = &ROW (row++);
1067
1068 if (!(l->f & LINE_FILTERED))
1069 {
1070 // line not filtered, mark it as filtered
1071 l->f |= LINE_FILTERED;
1072 while (l->is_longer ())
1073 {
1074 l = &ROW (row++);
1075 l->f |= LINE_FILTERED;
1076 }
1077
1078 // and filter it
1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1080
1081 break;
1082 }
1083 }
1084 while (l->is_longer () && row < end_row);
1085 }
1086 while (row < end_row);
1087 }
1088
805 scr_refresh (refresh_type); 1089 scr_refresh ();
806 scrollbar_show (1); 1090 scrollbar_show (1);
807#ifdef USE_XIM 1091#ifdef USE_XIM
808 IMSendSpot (); 1092 IMSendSpot ();
809#endif 1093#endif
810 } 1094 }
811 1095
812 display->flush (); 1096 display->flush ();
813
814 flush_ev.stop ();
815} 1097}
816 1098
817void 1099void
818rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
819{ 1101{
820 SET_R (this); 1102 make_current ();
821 SET_LOCALE (locale);
822 1103
823 display->flush (); 1104 display->flush ();
824 1105
825 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
826 flush_ev.start (NOW + 0.01); 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
827} 1108}
828 1109
829void 1110void
830rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
831{ 1112{
832 SET_R (this); 1113 make_current ();
833 SET_LOCALE (locale);
834 1114
835 refresh_limit = 1;
836 refresh_count = 0; 1115 refresh_count = 0;
837 flush (); 1116 flush ();
838} 1117}
839 1118
840#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
842rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
843{ 1122{
844 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
845 want_refresh = 1; 1124 want_refresh = 1;
846 1125
847 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
848} 1127}
849#endif 1128#endif
850 1129
851#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
852void 1131void
… …
866rxvt_term::cont_scroll_cb (time_watcher &w) 1145rxvt_term::cont_scroll_cb (time_watcher &w)
867{ 1146{
868 if ((scrollbar_isUp() || scrollbar_isDn()) && 1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
869 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
870 { 1149 {
871 refresh_type |= SMOOTH_REFRESH;
872 want_refresh = 1; 1150 want_refresh = 1;
873 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
874 } 1152 }
875} 1153}
876#endif 1154#endif
… …
880rxvt_term::sel_scroll_cb (time_watcher &w) 1158rxvt_term::sel_scroll_cb (time_watcher &w)
881{ 1159{
882 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
883 { 1161 {
884 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
885 refresh_type |= SMOOTH_REFRESH;
886 want_refresh = 1; 1163 want_refresh = 1;
887 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
888 } 1165 }
889} 1166}
890#endif 1167#endif
… …
895{ 1172{
896 if (mouse_slip_wheel_speed == 0 1173 if (mouse_slip_wheel_speed == 0
897 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
898 : scr_page (UP, mouse_slip_wheel_speed)) 1175 : scr_page (UP, mouse_slip_wheel_speed))
899 { 1176 {
900 refresh_type |= SMOOTH_REFRESH; 1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
901 want_refresh = 1; 1180 want_refresh = 1;
902 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
903 } 1182 }
904} 1183}
905#endif 1184#endif
906 1185
1186#if LINUX_YIELD_HACK
1187static struct event_handler
1188{
1189 check_watcher yield_ev;
1190
1191 void yield_cb (check_watcher &w)
1192 {
1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1201 w.stop ();
1202 }
1203
1204 event_handler ()
1205 : yield_ev (this, &event_handler::yield_cb)
1206 {
1207 }
1208} event_handler;
1209#endif
1210
907bool 1211bool
908rxvt_term::pty_fill () 1212rxvt_term::pty_fill ()
909{ 1213{
910 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
911 1215
912 if (CBUFSIZ == n) 1216 if (CBUFSIZ == n)
913 { 1217 {
914 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1218 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
915 n = 0; 1219 n = 0;
916 } 1220 }
917 1221
918 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
919 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
920 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
921 1225
922 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
923 1227
924 if (n > 0) 1228 if (r > 0)
925 { 1229 {
926 cmdbuf_endp += n; 1230 cmdbuf_endp += r;
927 return true; 1231 return true;
928 } 1232 }
929 else if (n < 0 && errno != EAGAIN) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1234 {
1235#if LINUX_YIELD_HACK
1236 if (display->is_local)
1237 event_handler.yield_ev.start ();
1238#endif
1239 }
1240 else
1241 {
1242 pty_ev.stop ();
1243
1244 if (!option (Opt_hold))
930 destroy (); 1245 destroy ();
931 1246 }
1247
932 return false; 1248 return false;
933} 1249}
934 1250
935void 1251void
936rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
937{ 1253{
938 SET_R (this); 1254 make_current ();
939 SET_LOCALE (locale);
940 1255
941 if (revents & EVENT_WRITE)
942 tt_write (0, 0);
943 else if (revents & EVENT_READ) 1256 if (revents & EVENT_READ)
944 // loop, but don't allow a single term to monopolize us 1257 // loop, but don't allow a single term to monopolize us
945 while (pty_fill ()) 1258 while (pty_fill ())
946 if (cmd_parse ()) 1259 if (cmd_parse ())
947 break; 1260 break;
1261
1262 if (revents & EVENT_WRITE)
1263 pty_write ();
948} 1264}
949 1265
950void 1266void
951rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
952{ 1268{
953 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
954 recolour_cursor (); 1270 recolour_cursor ();
955 1271
956#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
957 hidden_pointer = 0; 1273 hidden_pointer = 0;
958 1274
959 if (Options & Opt_pointerBlank) 1275 if (option (Opt_pointerBlank))
960 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
961#endif 1277#endif
962} 1278}
963 1279
964#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
965void 1281void
966rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
967{ 1283{
968 if (! (Options & Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
969 return; 1285 return;
970 1286
971 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
972 XFlush (display->display); 1288 XFlush (dpy);
973 1289
974 hidden_pointer = 1; 1290 hidden_pointer = 1;
975} 1291}
976 1292
977void 1293void
978rxvt_term::pointer_cb (time_watcher &w) 1294rxvt_term::pointer_cb (time_watcher &w)
979{ 1295{
980 SET_R (this); 1296 make_current ();
981 SET_LOCALE (locale);
982 1297
983 pointer_blank (); 1298 pointer_blank ();
984} 1299}
985#endif 1300#endif
986 1301
… …
993 x = ev.x; 1308 x = ev.x;
994 y = ev.y; 1309 y = ev.y;
995 pixel_position (&x, &y); 1310 pixel_position (&x, &y);
996 1311
997 if (MEvent.button == AnyButton) 1312 if (MEvent.button == AnyButton)
998 {
999 button_number = 3; 1313 button_number = 3;
1000 }
1001 else 1314 else
1002 { 1315 {
1003 button_number = MEvent.button - Button1; 1316 button_number = MEvent.button - Button1;
1004 /* add 0x3D for wheel events, like xterm does */ 1317 /* add 0x3D for wheel events, like xterm does */
1005 if (button_number >= 3) 1318 if (button_number >= 3)
1006 button_number += (64 - 3); 1319 button_number += (64 - 3);
1007 } 1320 }
1008 1321
1009 if (PrivateModes & PrivMode_MouseX10) 1322 if (priv_modes & PrivMode_MouseX10)
1010 { 1323 {
1011 /* 1324 /*
1012 * do not report ButtonRelease 1325 * do not report ButtonRelease
1013 * no state info allowed 1326 * no state info allowed
1014 */ 1327 */
… …
1029 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1342 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1030 + ((MEvent.state & ControlMask) ? 16 : 0); 1343 + ((MEvent.state & ControlMask) ? 16 : 0);
1031#ifdef MOUSE_REPORT_DOUBLECLICK 1344#ifdef MOUSE_REPORT_DOUBLECLICK
1032 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1345 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1033#endif 1346#endif
1034
1035 } 1347 }
1036 1348
1037#ifdef DEBUG_MOUSEREPORT 1349#if DEBUG_MOUSEREPORT
1038 fprintf (stderr, "Mouse ["); 1350 fprintf (stderr, "Mouse [");
1039 if (key_state & 16) 1351 if (key_state & 16)
1040 fputc ('C', stderr); 1352 fputc ('C', stderr);
1041 if (key_state & 4) 1353 if (key_state & 4)
1042 fputc ('S', stderr); 1354 fputc ('S', stderr);
… …
1046 fputc ('2', stderr); 1358 fputc ('2', stderr);
1047 fprintf (stderr, "]: <%d>, %d/%d\n", 1359 fprintf (stderr, "]: <%d>, %d/%d\n",
1048 button_number, 1360 button_number,
1049 x + 1, 1361 x + 1,
1050 y + 1); 1362 y + 1);
1051#else 1363#endif
1364
1052 tt_printf ("\033[M%c%c%c", 1365 tt_printf ("\033[M%c%c%c",
1053 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1054 (32 + x + 1), 1367 (32 + x + 1),
1055 (32 + y + 1)); 1368 (32 + y + 1));
1056#endif
1057} 1369}
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 1370
1069/*{{{ process an X event */ 1371/*{{{ process an X event */
1070void 1372void
1071rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1072{ 1374{
1073 SET_R (this); 1375 make_current ();
1074 SET_LOCALE (locale);
1075 1376
1076#if defined(CURSOR_BLINK) 1377 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 1378
1085 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1379 if (ev.xany.window == vt
1086 } 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1087#endif 1381 && 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; 1382 return;
1106#endif
1107 1383
1384 // for XQueryPointer
1108 Window unused_root, unused_child; 1385 Window unused_root, unused_child;
1109 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
1110 unsigned int unused_mask; 1387 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 1388
1161 switch (ev.type) 1389 switch (ev.type)
1162 { 1390 {
1163 case KeyPress: 1391 case KeyPress:
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT)) 1392 key_press (ev.xkey);
1165 lookup_key (ev.xkey);
1166
1167 break; 1393 break;
1168 1394
1169 case KeyRelease: 1395 case KeyRelease:
1170 { 1396 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; 1397 break;
1221 }
1222 1398
1223 case ButtonPress: 1399 case ButtonPress:
1224 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1225 break; 1401 break;
1226 1402
… …
1228 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1229 break; 1405 break;
1230 1406
1231 case ClientMessage: 1407 case ClientMessage:
1232 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1233 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1409 && !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 { 1410 {
1242 /* Get Dnd data */ 1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1243 Atom ActualType; 1412 {
1244 int ActualFormat; 1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1245 unsigned char *data; 1414 {
1246 unsigned long Size, RemainingBytes; 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1247 1416 {
1248 XGetWindowProperty (display->display, display->root, 1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1249 xa[XA_DNDSELECTION], 1418 destroy ();
1250 0L, 1000000L, 1419 }
1251 False, AnyPropertyType, 1420#if ENABLE_EWMH
1252 &ActualType, &ActualFormat, 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1253 &Size, &RemainingBytes, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1254 &data); 1424 &ev);
1255 XChangeProperty (display->display, display->root, 1425#endif
1256 XA_CUT_BUFFER0, XA_STRING, 1426 }
1257 8, PropModeReplace, 1427 }
1258 data, STRLEN (data)); 1428#if ENABLE_XEMBED
1259 XFree (data); 1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1260 selection_paste (display->root, XA_CUT_BUFFER0, True); 1430 {
1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1436#endif
1262 } 1437 }
1263#endif /* OFFIX_DND */
1264 break;
1265
1266 case MappingNotify:
1267 XRefreshKeyboardMapping (&ev.xmapping);
1268 break; 1438 break;
1269 1439
1270 /* 1440 /*
1271 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1272 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1291 break; 1461 break;
1292 } 1462 }
1293 break; 1463 break;
1294 1464
1295 case FocusIn: 1465 case FocusIn:
1296 if (!TermWin.focus) 1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1469 focus_in ();
1470 break;
1471
1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1476 focus_out ();
1477 break;
1478
1479 case ConfigureNotify:
1480 if (ev.xconfigure.window == parent[0])
1297 { 1481 {
1298 TermWin.focus = 1; 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1299 want_refresh = 1; 1483 ;
1300#ifdef USE_XIM 1484
1301 if (Input_Context != NULL) 1485 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 { 1486 {
1311 PixColors = PixColorsFocused; 1487 seen_resize = 1;
1312 set_colorfgbg (); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1313 scr_clear (); 1489#ifdef XPM_BACKGROUND
1490 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1491 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1492 {
1493 bgPixmap.render_background ();
1314 scr_touch (true); 1494 scr_touch (true);
1495 }
1496#endif
1315 } 1497 }
1316#endif
1317 1498
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500
1501#ifdef ENABLE_TRANSPARENCY
1502 if (option (Opt_transparent))
1503 bgPixmap.render_background ();
1504#endif
1318 } 1505 }
1319 break; 1506 break;
1320 1507
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: 1508 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1376 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1510 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1377 && ev.xproperty.state == PropertyNewValue) 1511 && ev.xproperty.state == PropertyNewValue)
1378 selection_property (ev.xproperty.window, ev.xproperty.atom); 1512 selection_property (ev.xproperty.window, ev.xproperty.atom);
1379 1513
1380 break; 1514 break;
1381 1515
1382 case SelectionClear: 1516 case SelectionClear:
1383 selection_clear (); 1517 selection_clear ();
1384 break; 1518 break;
1385 1519
1386 case SelectionNotify: 1520 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1521 if (selection_wait == Sel_normal)
1388 selection_paste (ev.xselection.requestor, 1522 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1389 ev.xselection.property, True);
1390 break; 1523 break;
1391 1524
1392 case SelectionRequest: 1525 case SelectionRequest:
1393 selection_send (ev.xselectionrequest); 1526 selection_send (ev.xselectionrequest);
1394 break; 1527 break;
1395 1528
1529 case MapNotify:
1530 mapped = 1;
1531#ifdef TEXT_BLINK
1532 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1533#endif
1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1535 break;
1536
1396 case UnmapNotify: 1537 case UnmapNotify:
1397 TermWin.mapped = 0; 1538 mapped = 0;
1398#ifdef TEXT_BLINK 1539#ifdef TEXT_BLINK
1399 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1400#endif 1541#endif
1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1401 break; 1543 break;
1402 1544
1403 case MapNotify:
1404 TermWin.mapped = 1;
1405#ifdef TEXT_BLINK
1406 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1407#endif
1408 break;
1409
1410#ifdef TRANSPARENT 1545#ifdef ENABLE_TRANSPARENCY
1411 case ReparentNotify: 1546 case ReparentNotify:
1412 rootwin_cb (ev); 1547 rootwin_cb (ev);
1413 break; 1548 break;
1414#endif /* TRANSPARENT */ 1549#endif /* ENABLE_TRANSPARENCY */
1415 1550
1416 case GraphicsExpose: 1551 case GraphicsExpose:
1417 case Expose: 1552 case Expose:
1418 if (ev.xany.window == TermWin.vt) 1553 if (ev.xany.window == vt)
1419 { 1554 {
1420 do 1555 do
1421 scr_expose (ev.xexpose.x, ev.xexpose.y, 1556 scr_expose (ev.xexpose.x, ev.xexpose.y,
1422 ev.xexpose.width, ev.xexpose.height, False); 1557 ev.xexpose.width, ev.xexpose.height, False);
1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1424 1559
1425 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1426 1561
1427 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1428 scr_expose (ev.xexpose.x, ev.xexpose.y, 1563 scr_expose (ev.xexpose.x, ev.xexpose.y,
1429 ev.xexpose.width, ev.xexpose.height, False); 1564 ev.xexpose.width, ev.xexpose.height, False);
1430 1565
1431 scr_refresh (refresh_type); 1566 want_refresh = 1;
1432 } 1567 }
1433 else 1568 else
1434 { 1569 {
1435 XEvent unused_event; 1570 XEvent unused_event;
1436 1571
1437 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1572 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1438 ; 1573 ;
1439 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1440 ; 1575 ;
1441 1576
1442 if (isScrollbarWindow (ev.xany.window)) 1577 if (isScrollbarWindow (ev.xany.window))
1443 { 1578 {
1444 scrollBar.setIdle (); 1579 scrollBar.setIdle ();
1445 scrollbar_show (0); 1580 scrollbar_show (0);
1446 } 1581 }
1447#ifdef MENUBAR
1448 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1449 menubar_expose ();
1450#endif
1451 1582
1452#ifdef TRANSPARENT 1583#ifdef ENABLE_TRANSPARENCY
1453 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1584 if (am_transparent && ev.xany.window == parent[0])
1454 XClearWindow (display->display, ev.xany.window); 1585 XClearWindow (dpy, ev.xany.window);
1455#endif 1586#endif
1456 } 1587 }
1457 break; 1588 break;
1458 1589
1459 case MotionNotify: 1590 case MotionNotify:
1460#ifdef POINTER_BLANK 1591#ifdef POINTER_BLANK
1461 if (hidden_pointer) 1592 if (hidden_pointer)
1462 pointer_unblank (); 1593 pointer_unblank ();
1463#endif 1594#endif
1464#if MENUBAR 1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1465 if (isMenuBarWindow (ev.xany.window)) 1596 break;
1597
1598 if (ev.xany.window == vt)
1466 { 1599 {
1467 menubar_control (ev.xbutton); 1600 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1468 break; 1601 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1469 } 1602 ; // 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))) 1603 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1477 { 1604 {
1478 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1605 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1479 ; 1606 ;
1480 1607
1481 XQueryPointer (display->display, TermWin.vt, 1608 XQueryPointer (dpy, vt,
1482 &unused_root, &unused_child, 1609 &unused_root, &unused_child,
1483 &unused_root_x, &unused_root_y, 1610 &unused_root_x, &unused_root_y,
1484 & (ev.xbutton.x), & (ev.xbutton.y), 1611 &ev.xbutton.x, &ev.xbutton.y,
1485 &unused_mask); 1612 &ev.xbutton.state);
1486#ifdef MOUSE_THRESHOLD 1613#ifdef MOUSE_THRESHOLD
1487 /* deal with a `jumpy' mouse */ 1614 /* deal with a `jumpy' mouse */
1488 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1615 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1489 { 1616 {
1490#endif 1617#endif
1618#if ISO_14755
1619 // 5.4
1620 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1621 {
1622 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1623 break;
1624 }
1625#endif
1491 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1626 selection_extend (ev.xbutton.x, ev.xbutton.y,
1492 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1627 ev.xbutton.state & Button3Mask ? 2 : 0);
1628
1493#ifdef SELECTION_SCROLLING 1629#ifdef SELECTION_SCROLLING
1494 if (ev.xbutton.y < TermWin.int_bwidth 1630 if (ev.xbutton.y < int_bwidth
1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1631 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1496 { 1632 {
1497 int dist; 1633 int dist;
1498 1634
1499 /* don't clobber the current delay if we are 1635 /* don't clobber the current delay if we are
1500 * already in the middle of scrolling. 1636 * already in the middle of scrolling.
… …
1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1639 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1504 1640
1505 /* save the event params so we can highlight 1641 /* save the event params so we can highlight
1506 * the selection in the pending-scroll loop 1642 * the selection in the pending-scroll loop
1507 */ 1643 */
1508 selection_save_x=ev.xbutton.x; 1644 selection_save_x = ev.xbutton.x;
1509 selection_save_y=ev.xbutton.y; 1645 selection_save_y = ev.xbutton.y;
1510 selection_save_state=
1511 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1646 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1512 1647
1513 /* calc number of lines to scroll */ 1648 /* calc number of lines to scroll */
1514 if (ev.xbutton.y<TermWin.int_bwidth) 1649 if (ev.xbutton.y < int_bwidth)
1515 { 1650 {
1516 scroll_selection_dir = UP; 1651 scroll_selection_dir = UP;
1517 dist = TermWin.int_bwidth - ev.xbutton.y; 1652 dist = int_bwidth - ev.xbutton.y;
1518 } 1653 }
1519 else 1654 else
1520 { 1655 {
1521 scroll_selection_dir = DN; 1656 scroll_selection_dir = DN;
1522 dist = ev.xbutton.y - 1657 dist = ev.xbutton.y - (int_bwidth + height);
1523 (TermWin.int_bwidth + TermWin.height);
1524 } 1658 }
1659
1525 scroll_selection_lines= (Pixel2Height (dist)/ 1660 scroll_selection_lines = Pixel2Height (dist)
1526 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1661 / SELECTION_SCROLL_LINE_SPEEDUP
1662 + 1;
1527 MIN_IT (scroll_selection_lines, 1663 min_it (scroll_selection_lines,
1528 SELECTION_SCROLL_MAX_LINES); 1664 SELECTION_SCROLL_MAX_LINES);
1529 } 1665 }
1530 else 1666 else
1531 { 1667 {
1532 /* we are within the text window, so we 1668 /* we are within the text window, so we
1533 * shouldn't be scrolling 1669 * shouldn't be scrolling
… …
1535 if (sel_scroll_ev.active) 1671 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop(); 1672 sel_scroll_ev.stop();
1537 } 1673 }
1538#endif 1674#endif
1539#ifdef MOUSE_THRESHOLD 1675#ifdef MOUSE_THRESHOLD
1540
1541 } 1676 }
1542#endif 1677#endif
1543
1544 } 1678 }
1545 } 1679 }
1546 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1680 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1547 { 1681 {
1548 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1682 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1549 MotionNotify, &ev)) ; 1683 MotionNotify, &ev))
1684 ;
1685
1550 XQueryPointer (display->display, scrollBar.win, 1686 XQueryPointer (dpy, scrollBar.win,
1551 &unused_root, &unused_child, 1687 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1688 &unused_root_x, &unused_root_y,
1553 & (ev.xbutton.x), & (ev.xbutton.y), 1689 &ev.xbutton.x, &ev.xbutton.y,
1554 &unused_mask); 1690 &unused_mask);
1555 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1556 scrollbar_size ()); 1692 scrollbar_size ());
1557 scr_refresh (refresh_type);
1558 refresh_limit = 0; 1693 want_refresh = 1;
1559 scrollbar_show (1); 1694 scrollbar_show (1);
1560 } 1695 }
1561 break; 1696 break;
1562 } 1697 }
1563}
1564 1698
1565#if TRANSPARENT 1699#if defined(CURSOR_BLINK)
1700 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1701 {
1702 if (hidden_cursor)
1703 {
1704 hidden_cursor = 0;
1705 want_refresh = 1;
1706 }
1707
1708 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1709 }
1710#endif
1711
1712#if defined(POINTER_BLANK)
1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1714 {
1715 if (ev.type == MotionNotify
1716 || ev.type == ButtonPress
1717 || ev.type == ButtonRelease)
1718 if (hidden_pointer)
1719 pointer_unblank ();
1720
1721 if (ev.type == KeyPress && hidden_pointer == 0)
1722 pointer_blank ();
1723 }
1724#endif
1725}
1726
1727void
1728rxvt_term::focus_in ()
1729{
1730 if (!focus)
1731 {
1732 focus = 1;
1733 want_refresh = 1;
1734
1735 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1736
1737#if USE_XIM
1738 if (Input_Context != NULL)
1739 {
1740 IMSetPosition ();
1741 XSetICFocus (Input_Context);
1742 }
1743#endif
1744#if CURSOR_BLINK
1745 if (option (Opt_cursorBlink))
1746 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1747#endif
1748#if OFF_FOCUS_FADING
1749 if (rs[Rs_fade])
1750 {
1751 pix_colors = pix_colors_focused;
1752 scr_recolour ();
1753 }
1754#endif
1755#if ENABLE_FRILLS
1756 if (option (Opt_urgentOnBell))
1757 {
1758 XWMHints *h;
1759
1760 h = XGetWMHints(dpy, parent[0]);
1761 if (h != NULL)
1762 {
1763 h->flags &= ~XUrgencyHint;
1764 XSetWMHints(dpy, parent[0], h);
1765 }
1766 }
1767#endif
1768 }
1769}
1770
1771void
1772rxvt_term::focus_out ()
1773{
1774 if (focus)
1775 {
1776 focus = 0;
1777 want_refresh = 1;
1778
1779 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1780
1781#if ENABLE_FRILLS || ISO_14755
1782 if (iso14755buf)
1783 {
1784 iso14755buf = 0;
1785# if ISO_14755
1786 scr_overlay_off ();
1787# endif
1788 }
1789#endif
1790#if USE_XIM
1791 if (Input_Context != NULL)
1792 XUnsetICFocus (Input_Context);
1793#endif
1794#if CURSOR_BLINK
1795 if (option (Opt_cursorBlink))
1796 cursor_blink_ev.stop ();
1797 hidden_cursor = 0;
1798#endif
1799#if OFF_FOCUS_FADING
1800 if (rs[Rs_fade])
1801 {
1802 pix_colors = pix_colors_unfocused;
1803 scr_recolour ();
1804 }
1805#endif
1806 }
1807}
1808
1809void
1810rxvt_term::update_fade_color (unsigned int idx)
1811{
1812#if OFF_FOCUS_FADING
1813 if (rs[Rs_fade])
1814 {
1815 rgba c;
1816 pix_colors [Color_fade].get (c);
1817 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1818 }
1819#endif
1820}
1821
1822#if ENABLE_TRANSPARENCY || ENABLE_PERL
1566void 1823void
1567rxvt_term::rootwin_cb (XEvent &ev) 1824rxvt_term::rootwin_cb (XEvent &ev)
1568{ 1825{
1569 SET_R (this); 1826 make_current ();
1570 SET_LOCALE (locale);
1571 1827
1828 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1829 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1830 return;
1831
1832# if ENABLE_TRANSPARENCY
1572 switch (ev.type) 1833 switch (ev.type)
1573 { 1834 {
1574 case PropertyNotify: 1835 case PropertyNotify:
1575 /* 1836 /*
1576 * if user used some Esetroot compatible prog to set the root bg, 1837 * 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. 1838 * use the property to determine the pixmap. We use it later on.
1578 */ 1839 */
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]) 1840 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1583 return; 1841 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1584 1842 {
1585 /* FALLTHROUGH */ 1843 bgPixmap.set_root_pixmap ();
1586 case ReparentNotify: 1844 bgPixmap.render_background ();
1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1845 }
1588 want_refresh = want_full_refresh = 1;
1589 break; 1846 break;
1590 } 1847 }
1848# endif
1591} 1849}
1592#endif 1850#endif
1593 1851
1594void 1852void
1595rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
1596{ 1854{
1597 int reportmode = 0, clickintime; 1855 int reportmode = 0, clickintime;
1598 1856
1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1857 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1858
1600 if (!bypass_keystate) 1859 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1860 reportmode = !! (priv_modes & PrivMode_mouse_report);
1861
1602 /* 1862 /*
1603 * VT window processing of button press 1863 * VT window processing of button press
1604 */ 1864 */
1605 if (ev.window == TermWin.vt) 1865 if (ev.window == vt)
1606 { 1866 {
1867 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1868 return;
1869
1870#if ISO_14755
1871 // 5.4
1872 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1873 {
1874 iso14755_54 (ev.x, ev.y);
1875 return;
1876 }
1877#endif
1878
1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1879 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1880
1608 if (reportmode) 1881 if (reportmode)
1609 { 1882 {
1610 /* mouse report from vt window */ 1883 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */ 1884 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state; 1885 MEvent.state = ev.state;
1613#ifdef MOUSE_REPORT_DOUBLECLICK 1886#ifdef MOUSE_REPORT_DOUBLECLICK
1614 if (ev.button == MEvent.button && clickintime) 1887 if (ev.button == MEvent.button && clickintime)
1615 { 1888 {
1616 /* same button, within alloted time */ 1889 /* same button, within alloted time */
1617 MEvent.clicks++; 1890 MEvent.clicks++;
1891
1618 if (MEvent.clicks > 1) 1892 if (MEvent.clicks > 1)
1619 { 1893 {
1620 /* only report double clicks */ 1894 /* only report double clicks */
1621 MEvent.clicks = 2; 1895 MEvent.clicks = 2;
1622 mouse_report (ev); 1896 mouse_report (ev);
… …
1641 } 1915 }
1642 else 1916 else
1643 { 1917 {
1644 if (ev.button != MEvent.button) 1918 if (ev.button != MEvent.button)
1645 MEvent.clicks = 0; 1919 MEvent.clicks = 0;
1920
1646 switch (ev.button) 1921 switch (ev.button)
1647 { 1922 {
1648 case Button1: 1923 case Button1:
1924 /* allow meta + click to select rectangular areas */
1925 /* should be done in screen.C */
1926#if ENABLE_FRILLS
1927 selection.rect = !!(ev.state & ModMetaMask);
1928#else
1929 selection.rect = false;
1930#endif
1931
1649 /* allow shift+left click to extend selection */ 1932 /* allow shift+left click to extend selection */
1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1933 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1651 { 1934 {
1652 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1653 selection_rotate (ev.x, ev.y); 1936 selection_rotate (ev.x, ev.y);
1654 else 1937 else
1655 selection_extend (ev.x, ev.y, 1); 1938 selection_extend (ev.x, ev.y, 1);
… …
1670 case Button3: 1953 case Button3:
1671 if (MEvent.button == Button3 && clickintime) 1954 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y); 1955 selection_rotate (ev.x, ev.y);
1673 else 1956 else
1674 selection_extend (ev.x, ev.y, 1); 1957 selection_extend (ev.x, ev.y, 1);
1958
1675 MEvent.button = Button3; 1959 MEvent.button = Button3;
1676 break; 1960 break;
1677 } 1961 }
1678 } 1962 }
1963
1679 MEvent.time = ev.time; 1964 MEvent.time = ev.time;
1680 return; 1965 return;
1681 } 1966 }
1682 1967
1683 /* 1968 /*
… …
1794 case Button3: 2079 case Button3:
1795 if (scrollBar.style != R_SB_XTERM) 2080 if (scrollBar.style != R_SB_XTERM)
1796 { 2081 {
1797 if (scrollbar_above_slider (ev.y)) 2082 if (scrollbar_above_slider (ev.y))
1798# ifdef RXVT_SCROLL_FULL 2083# ifdef RXVT_SCROLL_FULL
1799 scr_page (UP, TermWin.nrow - 1); 2084 scr_page (UP, nrow - 1);
1800# else 2085# else
1801 scr_page (UP, TermWin.nrow / 4); 2086 scr_page (UP, nrow / 4);
1802# endif 2087# endif
1803 else if (scrollbar_below_slider (ev.y)) 2088 else if (scrollbar_below_slider (ev.y))
1804# ifdef RXVT_SCROLL_FULL 2089# ifdef RXVT_SCROLL_FULL
1805 scr_page (DN, TermWin.nrow - 1); 2090 scr_page (DN, nrow - 1);
1806# else 2091# else
1807 scr_page (DN, TermWin.nrow / 4); 2092 scr_page (DN, nrow / 4);
1808# endif 2093# endif
1809 else 2094 else
1810 scrollBar.setMotion (); 2095 scrollBar.setMotion ();
1811 } 2096 }
1812 else 2097 else
1813 { 2098 {
1814 scr_page ((ev.button == Button1 ? DN : UP), 2099 scr_page ((ev.button == Button1 ? DN : UP),
1815 (TermWin.nrow 2100 (nrow
1816 * scrollbar_position (ev.y) 2101 * scrollbar_position (ev.y)
1817 / scrollbar_size ())); 2102 / scrollbar_size ()));
1818 } 2103 }
1819 2104
1820 break; 2105 break;
1821 } 2106 }
1822 } 2107 }
2108
1823 return; 2109 return;
1824 } 2110 }
1825#if MENUBAR
1826 /*
1827 * Menubar window processing of button press
1828 */
1829 if (isMenuBarWindow (ev.window))
1830 menubar_control (ev);
1831#endif
1832} 2111}
1833 2112
1834void 2113void
1835rxvt_term::button_release (XButtonEvent &ev) 2114rxvt_term::button_release (XButtonEvent &ev)
1836{ 2115{
1837 int reportmode = 0; 2116 int reportmode = 0;
1838 2117
1839 csrO = 0; /* reset csr Offset */ 2118 csrO = 0; /* reset csr Offset */
1840 if (!bypass_keystate) 2119 if (!bypass_keystate)
1841 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2120 reportmode = !! (priv_modes & PrivMode_mouse_report);
1842 2121
1843 if (scrollbar_isUpDn ()) 2122 if (scrollbar_isUpDn ())
1844 { 2123 {
1845 scrollBar.setIdle (); 2124 scrollBar.setIdle ();
1846 scrollbar_show (0); 2125 scrollbar_show (0);
1847#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1848 refresh_type &= ~SMOOTH_REFRESH;
1849#endif
1850
1851 } 2126 }
2127
1852#ifdef SELECTION_SCROLLING 2128#ifdef SELECTION_SCROLLING
1853 if (sel_scroll_ev.active) 2129 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
1855#endif 2131#endif
2132
1856 if (ev.window == TermWin.vt) 2133 if (ev.window == vt)
1857 { 2134 {
2135 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2136 return;
2137
2138#if ISO_14755
2139 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return;
2142#endif
2143
1858 if (reportmode) 2144 if (reportmode)
1859 { 2145 {
1860 /* mouse report from vt window */ 2146 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */ 2147 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4) 2148 if (ev.button >= 4)
… …
1876 MEvent.button = AnyButton; 2162 MEvent.button = AnyButton;
1877 mouse_report (ev); 2163 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2164#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2165 return;
1880 } 2166 }
2167
1881 /* 2168 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2169 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2170 * when overriding mouse reporting
1884 */ 2171 */
1885 if (PrivateModes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2173 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
1889 2176
1890 switch (ev.button) 2177 switch (ev.button)
1891 { 2178 {
1892 case Button1: 2179 case Button1:
1893 case Button3: 2180 case Button3:
1894 selection_make (ev.time); 2181 selection_make (ev.time);
1895 break; 2182 break;
2183
1896 case Button2: 2184 case Button2:
1897 selection_request (ev.time, ev.x, ev.y); 2185 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1898 break; 2187 break;
2188
1899#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
1900 case Button4: 2190 case Button4:
1901 case Button5: 2191 case Button5:
1902 { 2192 {
1903 int i; 2193 int i;
… …
1905 2195
1906 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
1907 2197
1908 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
1909 i = 1; 2199 i = 1;
1910 else if (Options & Opt_mouseWheelScrollPage) 2200 else if (option (Opt_mouseWheelScrollPage))
1911 i = TermWin.nrow - 1; 2201 i = nrow - 1;
1912 else 2202 else
1913 i = 5; 2203 i = 5;
1914 2204
1915# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
1916 if (ev.state & ControlMask) 2206 if (ev.state & ControlMask)
1917 { 2207 {
1918 mouse_slip_wheel_speed += v ? -1 : 1; 2208 mouse_slip_wheel_speed += v ? -1 : 1;
1919 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2209 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; 2210 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1921 2211
1922 if (slip_wheel_ev.at < NOW) 2212 if (slip_wheel_ev.at < NOW)
1923 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2213 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1924 2214
1925 slip_wheel_ev.start (); 2215 slip_wheel_ev.start ();
1926 } 2216 }
1927 else 2217 else
1928 { 2218 {
1929# endif 2219# endif
1930# ifdef JUMP_MOUSE_WHEEL
1931 scr_page (v, i); 2220 scr_page (v, i);
1932 scr_refresh (SMOOTH_REFRESH);
1933 scrollbar_show (1); 2221 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 2222# ifdef MOUSE_SLIP_WHEELING
1943 } 2223 }
1944#endif 2224# endif
1945 } 2225 }
1946 break; 2226 break;
1947#endif 2227#endif
1948 } 2228 }
1949 } 2229 }
1950#ifdef MENUBAR
1951 else if (isMenuBarWindow (ev.window))
1952 menubar_control (ev);
1953#endif
1954} 2230}
1955
1956#ifdef TRANSPARENT
1957#if TINTING
1958/* taken from aterm-0.4.2 */
1959
1960typedef uint32_t RUINT32T;
1961
1962void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1963{
1964 int sh_r, sh_g, sh_b;
1965 RUINT32T mask_r, mask_g, mask_b;
1966 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1967 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1968 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1969 int i;
1970
1971 Visual* visual = display->visual;
1972
1973 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1974
1975 /* for convenience */
1976 mask_r = visual->red_mask;
1977 mask_g = visual->green_mask;
1978 mask_b = visual->blue_mask;
1979
1980 /* boring lookup table pre-initialization */
1981 switch (srcImage->bits_per_pixel) {
1982 case 15:
1983 if ((mask_r != 0x7c00) ||
1984 (mask_g != 0x03e0) ||
1985 (mask_b != 0x001f))
1986 return;
1987 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1988 lookup_r = lookup;
1989 lookup_g = lookup+32;
1990 lookup_b = lookup+32+32;
1991 sh_r = 10;
1992 sh_g = 5;
1993 sh_b = 0;
1994 break;
1995 case 16:
1996 if ((mask_r != 0xf800) ||
1997 (mask_g != 0x07e0) ||
1998 (mask_b != 0x001f))
1999 return;
2000 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2001 lookup_r = lookup;
2002 lookup_g = lookup+32;
2003 lookup_b = lookup+32+64;
2004 sh_r = 11;
2005 sh_g = 5;
2006 sh_b = 0;
2007 break;
2008 case 24:
2009 if ((mask_r != 0xff0000) ||
2010 (mask_g != 0x00ff00) ||
2011 (mask_b != 0x0000ff))
2012 return;
2013 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2014 lookup_r = lookup;
2015 lookup_g = lookup+256;
2016 lookup_b = lookup+256+256;
2017 sh_r = 16;
2018 sh_g = 8;
2019 sh_b = 0;
2020 break;
2021 case 32:
2022 if ((mask_r != 0xff0000) ||
2023 (mask_g != 0x00ff00) ||
2024 (mask_b != 0x0000ff))
2025 return;
2026 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2027 lookup_r = lookup;
2028 lookup_g = lookup+256;
2029 lookup_b = lookup+256+256;
2030 sh_r = 16;
2031 sh_g = 8;
2032 sh_b = 0;
2033 break;
2034 default:
2035 return; /* we do not support this color depth */
2036 }
2037
2038 /* prepare limits for color transformation (each channel is handled separately) */
2039 if (shade < 0) {
2040 shade = -shade;
2041 if (shade < 0) shade = 0;
2042 if (shade > 100) shade = 100;
2043
2044 lower_lim_r = 65535-rm;
2045 lower_lim_g = 65535-gm;
2046 lower_lim_b = 65535-bm;
2047
2048 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2049 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2050 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2051
2052 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2053 } else {
2054 if (shade < 0) shade = 0;
2055 if (shade > 100) shade = 100;
2056
2057 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2058
2059 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2060 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2061 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2062 }
2063
2064 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2065 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2066 {
2067 unsigned int tmp;
2068
2069 tmp = lower_lim_r;
2070 lower_lim_r = lower_lim_b;
2071 lower_lim_b = tmp;
2072
2073 tmp = upper_lim_r;
2074 upper_lim_r = upper_lim_b;
2075 upper_lim_b = tmp;
2076 }
2077
2078 /* fill our lookup tables */
2079 for (i = 0; i <= mask_r>>sh_r; i++)
2080 {
2081 RUINT32T tmp;
2082 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2083 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2084 lookup_r[i] = (tmp/65535)<<sh_r;
2085 }
2086 for (i = 0; i <= mask_g>>sh_g; i++)
2087 {
2088 RUINT32T tmp;
2089 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2090 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2091 lookup_g[i] = (tmp/65535)<<sh_g;
2092 }
2093 for (i = 0; i <= mask_b>>sh_b; i++)
2094 {
2095 RUINT32T tmp;
2096 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2097 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2098 lookup_b[i] = (tmp/65535)<<sh_b;
2099 }
2100
2101 /* apply table to input image (replacing colors by newly calculated ones) */
2102 switch (srcImage->bits_per_pixel)
2103 {
2104 case 15:
2105 {
2106 unsigned short *p1, *pf, *p, *pl;
2107 p1 = (unsigned short *) srcImage->data;
2108 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2109 while (p1 < pf)
2110 {
2111 p = p1;
2112 pl = p1 + srcImage->width;
2113 for (; p < pl; p++)
2114 {
2115 *p = lookup_r[(*p & 0x7c00)>>10] |
2116 lookup_g[(*p & 0x03e0)>> 5] |
2117 lookup_b[(*p & 0x001f)];
2118 }
2119 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2120 }
2121 break;
2122 }
2123 case 16:
2124 {
2125 unsigned short *p1, *pf, *p, *pl;
2126 p1 = (unsigned short *) srcImage->data;
2127 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2128 while (p1 < pf)
2129 {
2130 p = p1;
2131 pl = p1 + srcImage->width;
2132 for (; p < pl; p++)
2133 {
2134 *p = lookup_r[(*p & 0xf800)>>11] |
2135 lookup_g[(*p & 0x07e0)>> 5] |
2136 lookup_b[(*p & 0x001f)];
2137 }
2138 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2139 }
2140 break;
2141 }
2142 case 24:
2143 {
2144 unsigned char *p1, *pf, *p, *pl;
2145 p1 = (unsigned char *) srcImage->data;
2146 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2147 while (p1 < pf)
2148 {
2149 p = p1;
2150 pl = p1 + srcImage->width * 3;
2151 for (; p < pl; p += 3)
2152 {
2153 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2154 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2155 p[2] = lookup_r[(p[2] & 0x0000ff)];
2156 }
2157 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2158 }
2159 break;
2160 }
2161 case 32:
2162 {
2163 RUINT32T *p1, *pf, *p, *pl;
2164 p1 = (RUINT32T *) srcImage->data;
2165 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2166
2167 while (p1 < pf)
2168 {
2169 p = p1;
2170 pl = p1 + srcImage->width;
2171 for (; p < pl; p++)
2172 {
2173 *p = lookup_r[(*p & 0xff0000)>>16] |
2174 lookup_g[(*p & 0x00ff00)>> 8] |
2175 lookup_b[(*p & 0x0000ff)] |
2176 (*p & ~0xffffff);
2177 }
2178 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2179 }
2180 break;
2181 }
2182 }
2183
2184 free (lookup);
2185}
2186#endif
2187
2188/*
2189 * Check our parents are still who we think they are.
2190 * Do transparency updates if required
2191 */
2192int
2193rxvt_term::check_our_parents ()
2194{
2195 int i, pchanged, aformat, have_pixmap, rootdepth;
2196 unsigned long nitems, bytes_after;
2197 Atom atype;
2198 unsigned char *prop = NULL;
2199 Window root, oldp, *list;
2200 Pixmap rootpixmap = None;
2201 XWindowAttributes wattr, wrootattr;
2202
2203 pchanged = 0;
2204
2205 if (!(Options & Opt_transparent))
2206 return pchanged; /* Don't try any more */
2207
2208 XGetWindowAttributes (display->display, display->root, &wrootattr);
2209 rootdepth = wrootattr.depth;
2210
2211 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2212
2213 if (rootdepth != wattr.depth)
2214 {
2215 if (am_transparent)
2216 {
2217 pchanged = 1;
2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2219 am_transparent = am_pixmap_trans = 0;
2220 }
2221
2222 return pchanged; /* Don't try any more */
2223 }
2224
2225 /* Get all X ops out of the queue so that our information is up-to-date. */
2226 XSync (display->display, False);
2227
2228 /*
2229 * Make the frame window set by the window manager have
2230 * the root background. Some window managers put multiple nested frame
2231 * windows for each client, so we have to take care about that.
2232 */
2233 i = (xa[XA_XROOTPMAPID]
2234 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
2235 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2236 &nitems, &bytes_after, &prop) == Success);
2237
2238 if (!i || prop == NULL)
2239 i = (xa[XA_XSETROOTID]
2240 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2241 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2242 &nitems, &bytes_after, &prop) == Success);
2243
2244 if (!i || prop == NULL
2245#if TINTING
2246 || !rs[Rs_color + Color_tint]
2247#endif
2248 )
2249 have_pixmap = 0;
2250 else
2251 {
2252 have_pixmap = 1;
2253 rootpixmap = *(Pixmap *)prop;
2254 XFree (prop);
2255 }
2256
2257 if (have_pixmap)
2258 {
2259 /*
2260 * Copy display->root pixmap transparency
2261 */
2262 int sx, sy, nx, ny;
2263 unsigned int nw, nh;
2264 Window cr;
2265 XImage *image;
2266 GC gc;
2267 XGCValues gcvalue;
2268
2269 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2270 0, 0, &sx, &sy, &cr);
2271 nw = (unsigned int)szHint.width;
2272 nh = (unsigned int)szHint.height;
2273 nx = ny = 0;
2274
2275 if (sx < 0)
2276 {
2277 nw += sx;
2278 nx = -sx;
2279 sx = 0;
2280 }
2281
2282 if (sy < 0)
2283 {
2284 nh += sy;
2285 ny = -sy;
2286 sy = 0;
2287 }
2288
2289 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2290 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2291 allowedxerror = -1;
2292 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2293
2294 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2295 /* XXX: may need a delay here? */
2296 allowedxerror = 0;
2297
2298 if (image == NULL)
2299 {
2300 if (am_transparent && am_pixmap_trans)
2301 {
2302 pchanged = 1;
2303 if (TermWin.pixmap != None)
2304 {
2305 XFreePixmap (display->display, TermWin.pixmap);
2306 TermWin.pixmap = None;
2307 }
2308 }
2309
2310 am_pixmap_trans = 0;
2311 }
2312 else
2313 {
2314 if (TermWin.pixmap != None)
2315 XFreePixmap (display->display, TermWin.pixmap);
2316
2317#if TINTING
2318 if (ISSET_PIXCOLOR (Color_tint))
2319 {
2320 unsigned short rm, gm, bm;
2321 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2322
2323 PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2324
2325 ShadeXImage (display, image, shade, rm, gm, bm);
2326 }
2327#endif
2328
2329 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2330 szHint.width, szHint.height, image->depth);
2331 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2332 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2333 nx, ny, image->width, image->height);
2334 XFreeGC (display->display, gc);
2335 XDestroyImage (image);
2336 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2337 XClearWindow (display->display, TermWin.parent[0]);
2338
2339 if (!am_transparent || !am_pixmap_trans)
2340 pchanged = 1;
2341
2342 am_transparent = am_pixmap_trans = 1;
2343 }
2344 }
2345
2346 if (!am_pixmap_trans)
2347 {
2348 unsigned int n;
2349 /*
2350 * InheritPixmap transparency
2351 */
2352 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2353 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2354 {
2355 oldp = TermWin.parent[i];
2356 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2357 &TermWin.parent[i], &list, &n);
2358 XFree (list);
2359 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2360
2361 if (TermWin.parent[i] == display->root)
2362 {
2363 if (oldp != None)
2364 pchanged = 1;
2365
2366 break;
2367 }
2368
2369 if (oldp != TermWin.parent[i])
2370 pchanged = 1;
2371 }
2372
2373 n = 0;
2374
2375 if (pchanged)
2376 {
2377 for (; n < (unsigned int)i; n++)
2378 {
2379 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2380 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2381 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2382 {
2383 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2384 break;
2385 }
2386 }
2387 }
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]);
2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2394 am_transparent = 0;
2395 /* XXX: also turn off Opt_transparent? */
2396 }
2397 else
2398 {
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++)
2406 {
2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2408 XClearWindow (display->display, TermWin.parent[n]);
2409 }
2410
2411 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2412 am_transparent = 1;
2413 }
2414
2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2416 TermWin.parent[i] = None;
2417 }
2418
2419 // this is experimental
2420 if (scrollBar.win)
2421 {
2422 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2423 XClearWindow (display->display, scrollBar.win);
2424 scrollBar.setIdle ();
2425 scrollbar_show (0);
2426 }
2427
2428 return pchanged;
2429}
2430#endif
2431 2231
2432/*}}} */ 2232/*}}} */
2433 2233
2434bool 2234bool
2435rxvt_term::cmd_parse () 2235rxvt_term::cmd_parse ()
2436{ 2236{
2437 bool flag = false; 2237 bool flag = false;
2438 unicode_t ch = NOCHAR; 2238 wchar_t ch = NOCHAR;
2439 unsigned char *seq_begin; // remember start of esc-sequence here 2239 char *seq_begin; // remember start of esc-sequence here
2440 2240
2441 for (;;) 2241 for (;;)
2442 { 2242 {
2443 if (ch == NOCHAR) 2243 if (ch == NOCHAR)
2444 { 2244 {
2445 seq_begin = cmdbuf_ptr; 2245 seq_begin = cmdbuf_ptr;
2446 ch = next_char (); 2246 ch = next_char ();
2447 }
2448 2247
2449 if (ch == NOCHAR) // TODO: improve 2248 if (ch == NOCHAR)
2450 break; 2249 break;
2250 }
2451 2251
2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2252 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2453 { 2253 {
2254 if (!seen_input)
2255 {
2256 seen_input = 1;
2257 // many badly-written programs (e.g. jed) contain a race condition:
2258 // they first read the screensize and then install a SIGWINCH handler.
2259 // some window managers resize the window early, and these programs
2260 // then sometimes get the size wrong.
2261 // unfortunately other programs are even more buggy and dislike
2262 // being sent SIGWINCH, so only do it when we were in fact being
2263 // resized.
2264 if (seen_resize && cmd_pid)
2265 kill (-cmd_pid, SIGWINCH);
2266 }
2267
2454 /* Read a text string from the input buffer */ 2268 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ]; 2269 wchar_t buf[UBUFSIZ];
2456 bool refreshnow = false; 2270 bool refreshnow = false;
2457 int nlines = 0; 2271 int nlines = 0;
2458 unicode_t *str = buf; 2272 wchar_t *str = buf;
2273 wchar_t *eol = str + min (ncol, UBUFSIZ);
2459 2274
2460 for (;;) 2275 for (;;)
2461 { 2276 {
2462 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2277 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2463 break; 2278 break;
2464 2279
2465 *str++ = ch; 2280 *str++ = ch;
2466 2281
2467 if (ch == C0_LF) 2282 if (ch == C0_LF || str >= eol)
2468 { 2283 {
2284 if (ch == C0_LF)
2469 nlines++; 2285 nlines++;
2286
2470 refresh_count++; 2287 refresh_count++;
2471 2288
2472 if (!(Options & Opt_jumpScroll) 2289 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2474 { 2290 {
2291 refresh_count = 0;
2292
2293 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2294 {
2475 refreshnow = true; 2295 refreshnow = true;
2476 ch = NOCHAR; 2296 ch = NOCHAR;
2477 break; 2297 break;
2298 }
2478 } 2299 }
2479 2300
2480 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2301 // scr_add_lines only works for nlines <= nrow - 1.
2481 if (nlines >= TermWin.nrow - 1) 2302 if (nlines >= nrow - 1)
2482 { 2303 {
2304 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2305 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2483 scr_add_lines (buf, nlines, str - buf); 2306 scr_add_lines (buf, str - buf, nlines);
2307
2484 nlines = 0; 2308 nlines = 0;
2485 str = buf; 2309 str = buf;
2310 eol = str + min (ncol, UBUFSIZ);
2486 } 2311 }
2487 }
2488 2312
2489 if (str >= buf + UBUFSIZ) 2313 if (str >= eol)
2490 { 2314 {
2315 if (eol >= buf + UBUFSIZ)
2316 {
2491 ch = NOCHAR; 2317 ch = NOCHAR;
2492 break; 2318 break;
2319 }
2320 else
2321 eol = min (eol + ncol, buf + UBUFSIZ);
2322 }
2323
2493 } 2324 }
2494 2325
2495 seq_begin = cmdbuf_ptr; 2326 seq_begin = cmdbuf_ptr;
2496 ch = next_char (); 2327 ch = next_char ();
2497 } 2328 }
2498 2329
2330 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2331 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2499 scr_add_lines (buf, nlines, str - buf); 2332 scr_add_lines (buf, str - buf, nlines);
2500 2333
2501 /* 2334 /*
2502 * If there have been a lot of new lines, then update the screen 2335 * 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. 2336 * What the heck we'll cheat and only refresh less than every page-full.
2504 * the number of pages between refreshes is refresh_limit, which 2337 * if skipScroll is enabled.
2505 * is incremented here because we must be doing flat-out scrolling.
2506 */ 2338 */
2507 if (refreshnow) 2339 if (refreshnow)
2508 { 2340 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++;
2511 else
2512 {
2513 flag = true; 2341 flag = true;
2514 scr_refresh (refresh_type); 2342 scr_refresh ();
2515 } 2343 want_refresh = 1;
2516 } 2344 }
2517 2345
2518 } 2346 }
2519 else 2347 else
2520 { 2348 {
… …
2534 } 2362 }
2535 2363
2536 return flag; 2364 return flag;
2537} 2365}
2538 2366
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 2367// read the next character
2549unicode_t 2368wchar_t
2550rxvt_term::next_char () 2369rxvt_term::next_char () NOTHROW
2551{ 2370{
2552 while (cmdbuf_ptr < cmdbuf_endp) 2371 while (cmdbuf_ptr < cmdbuf_endp)
2553 { 2372 {
2554 // assume 7-bit to be ascii ALWAYS 2373 // assume 7-bit to be ascii ALWAYS
2555 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2374 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2556 return *cmdbuf_ptr++; 2375 return *cmdbuf_ptr++;
2557 2376
2558 wchar_t wc; 2377 wchar_t wc;
2559 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2378 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2560 2379
2561 if (len == (size_t)-2) 2380 if (len == (size_t)-2)
2562 { 2381 {
2563 // the mbstate stores incomplete sequences. didn't know this :/ 2382 // the mbstate stores incomplete sequences. didn't know this :/
2564 cmdbuf_ptr = cmdbuf_endp; 2383 cmdbuf_ptr = cmdbuf_endp;
2565 break; 2384 break;
2566 } 2385 }
2567 2386
2568 if (len == (size_t)-1) 2387 if (len == (size_t)-1)
2569 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2388 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2570 2389
2571 // assume wchar == unicode 2390 // assume wchar == unicode
2572 cmdbuf_ptr += len; 2391 cmdbuf_ptr += len;
2573 return wc; 2392 return wc & UNICODE_MASK;
2574 } 2393 }
2575 2394
2576 return NOCHAR; 2395 return NOCHAR;
2577} 2396}
2397
2398// read the next octet
2399uint32_t
2400rxvt_term::next_octet () NOTHROW
2401{
2402 return cmdbuf_ptr < cmdbuf_endp
2403 ? (unsigned char)*cmdbuf_ptr++
2404 : NOCHAR;
2405}
2406
2407static class out_of_input out_of_input;
2578 2408
2579/* rxvt_cmd_getc () - Return next input character */ 2409/* rxvt_cmd_getc () - Return next input character */
2580/* 2410/*
2581 * Return the next input character after first passing any keyboard input 2411 * Return the next input character after first passing any keyboard input
2582 * to the command. 2412 * to the command.
2583 */ 2413 */
2584unicode_t 2414wchar_t
2585rxvt_term::cmd_getc () 2415rxvt_term::cmd_getc () THROW ((class out_of_input))
2586{ 2416{
2587 unicode_t c = next_char (); 2417 wchar_t c = next_char ();
2588 2418
2589 if (c == NOCHAR) 2419 if (c == NOCHAR)
2590 throw out_of_input; 2420 throw out_of_input;
2591 2421
2592 return c; 2422 return c;
2593} 2423}
2594 2424
2595unicode_t 2425uint32_t
2596rxvt_term::cmd_get8 () 2426rxvt_term::cmd_get8 () THROW ((class out_of_input))
2597{ 2427{
2598 unicode_t c = next_octet (); 2428 uint32_t c = next_octet ();
2599 2429
2600 if (c == NOCHAR) 2430 if (c == NOCHAR)
2601 throw out_of_input; 2431 throw out_of_input;
2602 2432
2603 return c; 2433 return c;
… …
2667 { 2497 {
2668 if ((buf[len++] = cmd_getc ()) == 'i') 2498 if ((buf[len++] = cmd_getc ()) == 'i')
2669 break; /* done = 1 */ 2499 break; /* done = 1 */
2670 } 2500 }
2671 } 2501 }
2672 2502
2673 for (i = 0; i < len; i++) 2503 for (i = 0; i < len; i++)
2674 if (putc (buf[i], fd) == EOF) 2504 if (putc (buf[i], fd) == EOF)
2675 { 2505 {
2676 done = 1; 2506 done = 1;
2677 break; 2507 break;
… …
2703 case C0_ESC: 2533 case C0_ESC:
2704 process_escape_seq (); 2534 process_escape_seq ();
2705 break; 2535 break;
2706 case C0_ENQ: /* terminal Status */ 2536 case C0_ENQ: /* terminal Status */
2707 if (rs[Rs_answerbackstring]) 2537 if (rs[Rs_answerbackstring])
2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2538 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2709 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2710 else 2539 else
2711 tt_write ((unsigned char *)VT100_ANS, 2540 tt_write (VT100_ANS, strlen (VT100_ANS));
2712 (unsigned int)STRLEN (VT100_ANS));
2713 break; 2541 break;
2714 case C0_BEL: /* bell */ 2542 case C0_BEL: /* bell */
2715 scr_bell (); 2543 scr_bell ();
2716 break; 2544 break;
2717 case C0_BS: /* backspace */ 2545 case C0_BS: /* backspace */
… …
2741 process_dcs_seq (); 2569 process_dcs_seq ();
2742 break; 2570 break;
2743 case 0x9b: /* CSI */ 2571 case 0x9b: /* CSI */
2744 process_csi_seq (); 2572 process_csi_seq ();
2745 break; 2573 break;
2746 case 0x9d: /* CSI */ 2574 case 0x9d: /* OSC */
2747 process_osc_seq (); 2575 process_osc_seq ();
2748 break; 2576 break;
2749#endif 2577#endif
2750 } 2578 }
2751} 2579}
… …
2816void 2644void
2817rxvt_term::process_escape_seq () 2645rxvt_term::process_escape_seq ()
2818{ 2646{
2819 unicode_t ch = cmd_getc (); 2647 unicode_t ch = cmd_getc ();
2820 2648
2821 if (PrivateModes & PrivMode_vt52) 2649 if (priv_modes & PrivMode_vt52)
2822 { 2650 {
2823 process_escape_vt52 (ch); 2651 process_escape_vt52 (ch);
2824 return; 2652 return;
2825 } 2653 }
2826 2654
… …
2841 scr_charset_set (2, (unsigned int)cmd_getc ()); 2669 scr_charset_set (2, (unsigned int)cmd_getc ());
2842 break; 2670 break;
2843 case '+': 2671 case '+':
2844 scr_charset_set (3, (unsigned int)cmd_getc ()); 2672 scr_charset_set (3, (unsigned int)cmd_getc ());
2845 break; 2673 break;
2846#ifndef NO_FRILLS 2674#if !ENABLE_MINIMAL
2847 case '6': 2675 case '6':
2848 scr_backindex (); 2676 scr_backindex ();
2849 break; 2677 break;
2850#endif 2678#endif
2851 case '7': 2679 case '7':
2852 scr_cursor (SAVE); 2680 scr_cursor (SAVE);
2853 break; 2681 break;
2854 case '8': 2682 case '8':
2855 scr_cursor (RESTORE); 2683 scr_cursor (RESTORE);
2856 break; 2684 break;
2857#ifndef NO_FRILLS 2685#if !ENABLE_MINIMAL
2858 case '9': 2686 case '9':
2859 scr_forwardindex (); 2687 scr_forwardindex ();
2860 break; 2688 break;
2861#endif 2689#endif
2862 case '=': 2690 case '=':
… …
2872 break; 2700 break;
2873 2701
2874 /* 8.3.87: NEXT LINE */ 2702 /* 8.3.87: NEXT LINE */
2875 case C1_NEL: /* ESC E */ 2703 case C1_NEL: /* ESC E */
2876 { 2704 {
2877 unicode_t nlcr[] = { C0_LF, C0_CR }; 2705 wchar_t nlcr[] = { C0_LF, C0_CR };
2878 scr_add_lines (nlcr, 1, 2); 2706 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2879 } 2707 }
2880 break; 2708 break;
2881 2709
2882 /* kidnapped escape sequence: Should be 8.3.48 */ 2710 /* kidnapped escape sequence: Should be 8.3.48 */
2883 case C1_ESA: /* ESC G */ 2711 case C1_ESA: /* ESC G */
… …
2905 process_dcs_seq (); 2733 process_dcs_seq ();
2906 break; 2734 break;
2907 2735
2908 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2736 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2909 case C1_SCI: /* ESC Z */ 2737 case C1_SCI: /* ESC Z */
2910 tt_write ((const unsigned char *)ESCZ_ANSWER, 2738 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2911 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2912 break; /* steal obsolete ESC [ c */ 2739 break; /* steal obsolete ESC [ c */
2913 2740
2914 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2741 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2915 case C1_CSI: /* ESC [ */ 2742 case C1_CSI: /* ESC [ */
2916 process_csi_seq (); 2743 process_csi_seq ();
… …
2980 unicode_t ch, priv, i; 2807 unicode_t ch, priv, i;
2981 unsigned int nargs, p; 2808 unsigned int nargs, p;
2982 int n, ndef; 2809 int n, ndef;
2983 int arg[ESC_ARGS]; 2810 int arg[ESC_ARGS];
2984 2811
2985 for (nargs = ESC_ARGS; nargs > 0;) 2812 memset (arg, 0, sizeof (arg));
2986 arg[--nargs] = 0; 2813 nargs = 0;
2987 2814
2988 priv = 0; 2815 priv = 0;
2989 ch = cmd_getc (); 2816 ch = cmd_getc ();
2990 if (ch >= '<' && ch <= '?') 2817 if (ch >= '<' && ch <= '?')
2991 { /* '<' '=' '>' '?' */ 2818 { /* '<' '=' '>' '?' */
… …
3025 ndef = get_byte_array_bit (csi_defaults, i); 2852 ndef = get_byte_array_bit (csi_defaults, i);
3026 for (p = 0; p < nargs; p++) 2853 for (p = 0; p < nargs; p++)
3027 if (arg[p] == -1) 2854 if (arg[p] == -1)
3028 arg[p] = ndef; 2855 arg[p] = ndef;
3029 2856
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 /* 2857 /*
3038 * private mode handling 2858 * private mode handling
3039 */ 2859 */
3040 if (priv) 2860 if (priv)
3041 { 2861 {
3042 switch (priv) 2862 switch (priv)
3043 { 2863 {
3044 case '>': 2864 case '>':
3045 if (ch == CSI_DA) /* secondary device attributes */ 2865 if (ch == CSI_DA) /* secondary device attributes */
2866 {
2867 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2868 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2869 //
2870 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2871 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2872 // that we do not support xterm mouse reporting (should be 95 when we do).
2873 //
3046 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2874 tt_printf ("\033[>%d;94;0c", 'U');
2875 }
3047 break; 2876 break;
3048 case '?': 2877 case '?':
3049 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3050 process_terminal_mode (ch, priv, nargs, arg); 2879 process_terminal_mode (ch, priv, nargs, arg);
3051 break; 2880 break;
… …
3156 2985
3157 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2986 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3158 arg[0] = -arg[0]; 2987 arg[0] = -arg[0];
3159 /* FALLTHROUGH */ 2988 /* FALLTHROUGH */
3160 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2989 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3161 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2990 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3162 break; 2991 break;
3163 2992
3164 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2993 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3165 tt_write ((const unsigned char *)VT100_ANS, 2994 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3166 (unsigned int) (sizeof (VT100_ANS) - 1));
3167 break; 2995 break;
3168 2996
3169 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2997 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3170 process_sgr_mode (nargs, arg); 2998 process_sgr_mode (nargs, arg);
3171 break; 2999 break;
… …
3178 break; 3006 break;
3179 case 6: /* CPR requested */ 3007 case 6: /* CPR requested */
3180 scr_report_position (); 3008 scr_report_position ();
3181 break; 3009 break;
3182 case 7: /* unofficial extension */ 3010 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure) 3011 if (option (Opt_insecure))
3184 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3012 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3185 break; 3013 break;
3186 case 8: /* unofficial extension */ 3014 case 8: /* unofficial extension */
3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3015 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3188 break; 3016 break;
3189 } 3017 }
… …
3225 break; 3053 break;
3226 3054
3227 case CSI_RM: /* 8.3.107: RESET MODE */ 3055 case CSI_RM: /* 8.3.107: RESET MODE */
3228 if (arg[0] == 4) 3056 if (arg[0] == 4)
3229 scr_insert_mode (0); 3057 scr_insert_mode (0);
3058 else if (arg[0] == 20)
3059 priv_modes &= ~PrivMode_LFNL;
3230 break; 3060 break;
3231 3061
3232 case CSI_SM: /* 8.3.126: SET MODE */ 3062 case CSI_SM: /* 8.3.126: SET MODE */
3233 if (arg[0] == 4) 3063 if (arg[0] == 4)
3234 scr_insert_mode (1); 3064 scr_insert_mode (1);
3065 else if (arg[0] == 20)
3066 priv_modes |= PrivMode_LFNL;
3235 break; 3067 break;
3236 3068
3237 /* 3069 /*
3238 * PRIVATE USE beyond this point. All CSI_7? sequences here 3070 * PRIVATE USE beyond this point. All CSI_7? sequences here
3239 */ 3071 */
… …
3251 break; 3083 break;
3252 case CSI_75: 3084 case CSI_75:
3253 scr_cursor (RESTORE); 3085 scr_cursor (RESTORE);
3254 break; 3086 break;
3255 3087
3256#ifndef NO_FRILLS 3088#if !ENABLE_MINIMAL
3257 case CSI_74: 3089 case CSI_74:
3258 process_window_ops (arg, nargs); 3090 process_window_ops (arg, nargs);
3259 break; 3091 break;
3260#endif 3092#endif
3261 3093
… …
3268 break; 3100 break;
3269 } 3101 }
3270} 3102}
3271/*}}} */ 3103/*}}} */
3272 3104
3273#ifndef NO_FRILLS 3105#if !ENABLE_MINIMAL
3274/* ARGSUSED */ 3106/* ARGSUSED */
3275void 3107void
3276rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3108rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3277{ 3109{
3278 int x, y; 3110 int x, y;
3279 XWindowAttributes wattr; 3111 XWindowAttributes wattr;
3280 Window wdummy; 3112 Window wdummy;
3113
3114 dLocal (Display *, dpy);
3281 3115
3282 if (nargs == 0) 3116 if (nargs == 0)
3283 return; 3117 return;
3284 3118
3285 switch (args[0]) 3119 switch (args[0])
3286 { 3120 {
3287 /* 3121 /*
3288 * commands 3122 * commands
3289 */ 3123 */
3290 case 1: /* deiconify window */ 3124 case 1: /* deiconify window */
3291 XMapWindow (display->display, TermWin.parent[0]); 3125 XMapWindow (dpy, parent[0]);
3292 break; 3126 break;
3293 case 2: /* iconify window */ 3127 case 2: /* iconify window */
3294 XIconifyWindow (display->display, TermWin.parent[0], 3128 XIconifyWindow (dpy, parent[0], display->screen);
3295 DefaultScreen (display->display));
3296 break; 3129 break;
3297 case 3: /* set position (pixels) */ 3130 case 3: /* set position (pixels) */
3298 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3131 XMoveWindow (dpy, parent[0], args[1], args[2]);
3299 break; 3132 break;
3300 case 4: /* set size (pixels) */ 3133 case 4: /* set size (pixels) */
3301 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3134 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3302 break; 3135 break;
3303 case 5: /* raise window */ 3136 case 5: /* raise window */
3304 XRaiseWindow (display->display, TermWin.parent[0]); 3137 XRaiseWindow (dpy, parent[0]);
3305 break; 3138 break;
3306 case 6: /* lower window */ 3139 case 6: /* lower window */
3307 XLowerWindow (display->display, TermWin.parent[0]); 3140 XLowerWindow (dpy, parent[0]);
3308 break; 3141 break;
3309 case 7: /* refresh window */ 3142 case 7: /* refresh window */
3310 scr_touch (true); 3143 scr_touch (true);
3311 break; 3144 break;
3312 case 8: /* set size (chars) */ 3145 case 8: /* set size (chars) */
3313 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3146 set_widthheight ((unsigned int) (args[2] * fwidth),
3314 (unsigned int) (args[1] * TermWin.fheight)); 3147 (unsigned int) (args[1] * fheight));
3315 break; 3148 break;
3316 3149
3317 //case 9: NYI, TODO, restore maximized window or maximize window 3150 //case 9: NYI, TODO, restore maximized window or maximize window
3318 default: 3151 default:
3319 if (args[0] >= 24) /* set height (chars) */ 3152 if (args[0] >= 24) /* set height (chars) */
3320 set_widthheight ((unsigned int)TermWin.width, 3153 set_widthheight ((unsigned int)width,
3321 (unsigned int) (args[1] * TermWin.fheight)); 3154 (unsigned int) (args[1] * fheight));
3322 break; 3155 break;
3323
3324 3156
3325 /* 3157 /*
3326 * reports - some output format copied from XTerm 3158 * reports - some output format copied from XTerm
3327 */ 3159 */
3328 case 11: /* report window state */ 3160 case 11: /* report window state */
3329 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3161 XGetWindowAttributes (dpy, parent[0], &wattr);
3330 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3162 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3331 break; 3163 break;
3332 case 13: /* report window position */ 3164 case 13: /* report window position */
3333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent[0], &wattr);
3334 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3166 XTranslateCoordinates (dpy, parent[0], wattr.root,
3335 -wattr.border_width, -wattr.border_width, 3167 -wattr.border_width, -wattr.border_width,
3336 &x, &y, &wdummy); 3168 &x, &y, &wdummy);
3337 tt_printf ("\033[3;%d;%dt", x, y); 3169 tt_printf ("\033[3;%d;%dt", x, y);
3338 break; 3170 break;
3339 case 14: /* report window size (pixels) */ 3171 case 14: /* report window size (pixels) */
3340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent[0], &wattr);
3341 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3173 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3342 break; 3174 break;
3343 case 18: /* report text area size (chars) */ 3175 case 18: /* report text area size (chars) */
3344 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3176 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3345 break; 3177 break;
3346 case 19: /* report window size (chars) */ 3178 case 19: /* report window size (chars) */
3347 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3179 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3348 break; 3180 break;
3349 case 20: /* report icon label */ 3181 case 20: /* report icon label */
3350 { 3182 {
3351 char *s; 3183 char *s;
3352 XGetIconName (display->display, TermWin.parent[0], &s); 3184 XGetIconName (dpy, parent[0], &s);
3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3185 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s); 3186 XFree (s);
3355 } 3187 }
3356 break; 3188 break;
3357 case 21: /* report window title */ 3189 case 21: /* report window title */
3358 { 3190 {
3359 char *s; 3191 char *s;
3360 XFetchName (display->display, TermWin.parent[0], &s); 3192 XFetchName (dpy, parent[0], &s);
3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3193 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s); 3194 XFree (s);
3363 } 3195 }
3364 break; 3196 break;
3365 } 3197 }
3366} 3198}
… …
3369/*----------------------------------------------------------------------*/ 3201/*----------------------------------------------------------------------*/
3370/* 3202/*
3371 * get input up until STRING TERMINATOR (or BEL) 3203 * get input up until STRING TERMINATOR (or BEL)
3372 * ends_how is terminator used. returned input must be free()'d 3204 * ends_how is terminator used. returned input must be free()'d
3373 */ 3205 */
3374unsigned char * 3206char *
3375rxvt_term::get_to_st (unicode_t &ends_how) 3207rxvt_term::get_to_st (unicode_t &ends_how)
3376{ 3208{
3377 unicode_t prev = 0, ch; 3209 unicode_t ch;
3210 bool seen_esc = false;
3378 unsigned int n = 0; 3211 unsigned int n = 0;
3379 unsigned char *s;
3380 unsigned char string[STRING_MAX]; 3212 wchar_t string[STRING_MAX];
3381 3213
3382 while ((ch = cmd_getc ()) != NOCHAR) 3214 while ((ch = cmd_getc ()) != NOCHAR)
3383 { 3215 {
3384 if (prev == C0_ESC) 3216 if (seen_esc)
3385 { 3217 {
3386 if (ch == 0x5c) /* 7bit ST */ 3218 if (ch == 0x5c) /* 7bit ST */
3387 break; 3219 break;
3388 else 3220 else
3389 return NULL; 3221 return NULL;
3390 } 3222 }
3223 else if (ch == C0_ESC)
3224 {
3225 seen_esc = true;
3226 continue;
3227 }
3391 else if (ch == C0_BEL || ch == CHAR_ST) 3228 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break; 3229 break;
3230 else if (ch == C0_SYN)
3231 ch = cmd_get8 ();
3393 else if (ch < 0x20) 3232 else if (ch < 0x20)
3394 return NULL; /* other control character - exit */ 3233 return NULL; /* other control character - exit */
3395 3234
3396 if (n >= sizeof (string) - 1) 3235 seen_esc = false;
3236
3237 if (n >= STRING_MAX - 1)
3397 // stop at some sane length 3238 // stop at some sane length
3398 return NULL; 3239 return NULL;
3399 3240
3400 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else
3406 string[n++] = prev = ch; 3241 string[n++] = ch;
3407 } 3242 }
3408 3243
3409 string[n++] = '\0'; 3244 string[n++] = '\0';
3410 3245
3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3412 return NULL;
3413
3414 ends_how = (ch == 0x5c ? C0_ESC : ch); 3246 ends_how = (ch == 0x5c ? C0_ESC : ch);
3415 STRNCPY (s, string, n); 3247
3416 return s; 3248 return rxvt_wcstombs (string);
3417} 3249}
3418 3250
3419/*----------------------------------------------------------------------*/ 3251/*----------------------------------------------------------------------*/
3420/* 3252/*
3421 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3253 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3422 */ 3254 */
3423void 3255void
3424rxvt_term::process_dcs_seq () 3256rxvt_term::process_dcs_seq ()
3425{ 3257{
3426 unsigned char *s; 3258 char *s;
3427 unicode_t eh; 3259 unicode_t eh;
3428 3260
3429 /* 3261 /*
3430 * Not handled yet 3262 * Not handled yet
3431 */ 3263 */
… …
3450 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3282 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3451 arg = arg * 10 + (ch - '0'); 3283 arg = arg * 10 + (ch - '0');
3452 3284
3453 if (ch == ';') 3285 if (ch == ';')
3454 { 3286 {
3455 unsigned char *s = get_to_st (eh); 3287 char *s = get_to_st (eh);
3456 3288
3457 if (s) 3289 if (s)
3458 { 3290 {
3459 process_xterm_seq (arg, (char *)s, eh); 3291 process_xterm_seq (arg, s, eh);
3460 free (s); 3292 free (s);
3461 } 3293 }
3462 } 3294 }
3463} 3295}
3464 3296
3465void 3297void
3466rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3298rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3467{ 3299{
3468 if (str[0] == '?' && !str[1]) 3300 if (str[0] == '?' && !str[1])
3469 { 3301 {
3470 unsigned short r, g, b; 3302 rgba c;
3471 PixColorsFocused[color].get (display, r, g, b); 3303 pix_colors_focused[color].get (c);
3304
3305#if XFT
3306 if (c.a != rgba::MAX_CC)
3307 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3308 else
3309#endif
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3310 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3473 } 3311 }
3474 else 3312 else
3475 set_window_color (color, str); 3313 set_window_color (color, str);
3476} 3314}
3477 3315
3478/* 3316/*
3479 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3317 * 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 */ 3318 */
3503void 3319void
3504rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3320rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3505{ 3321{
3506 int changed = 0;
3507 int color; 3322 int color;
3508 char *buf, *name; 3323 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1]; 3324 bool query = str[0] == '?' && !str[1];
3325 int saveop = op;
3326
3327 dLocal (Display *, dpy);
3510 3328
3511 assert (str != NULL); 3329 assert (str != NULL);
3330
3331 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3332 return;
3333
3512 switch (op) 3334 switch (op)
3513 { 3335 {
3514 case XTerm_name: 3336 case XTerm_name:
3515 set_title (str); 3337 set_title (str);
3516 /* FALLTHROUGH */ 3338 /* FALLTHROUGH */
… …
3521 set_title (str); 3343 set_title (str);
3522 break; 3344 break;
3523 case XTerm_property: 3345 case XTerm_property:
3524 if (str[0] == '?') 3346 if (str[0] == '?')
3525 { 3347 {
3526 Atom prop = XInternAtom (display->display, str + 1, True); 3348 Atom prop = display->atom (str + 1);
3527 Atom actual_type; 3349 Atom actual_type;
3528 int actual_format; 3350 int actual_format;
3529 unsigned long nitems; 3351 unsigned long nitems;
3530 unsigned long bytes_after; 3352 unsigned long bytes_after;
3531 unsigned char *value = 0; 3353 unsigned char *value = 0;
3532 const char *str = ""; 3354 const char *str = "";
3533 3355
3534 if (prop 3356 if (prop
3535 && XGetWindowProperty (display->display, TermWin.parent[0], 3357 && XGetWindowProperty (dpy, parent[0],
3536 prop, 0, 1<<16, 0, AnyPropertyType, 3358 prop, 0, 1<<16, 0, AnyPropertyType,
3537 &actual_type, &actual_format, 3359 &actual_type, &actual_format,
3538 &nitems, &bytes_after, &value) == Success 3360 &nitems, &bytes_after, &value) == Success
3539 && actual_type != None 3361 && actual_type != None
3540 && actual_format == 8) 3362 && actual_format == 8)
3541 str = (const char *)(value); 3363 str = (const char *)(value);
3542 3364
3543 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3365 tt_printf ("\033]%d;%s%c", op, str, resp);
3544 3366
3545 XFree (value); 3367 XFree (value);
3546 } 3368 }
3547 else 3369 else
3548 { 3370 {
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3371 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550 3372
3551 if (eq) 3373 if (eq)
3552 { 3374 {
3553 *eq = 0; 3375 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0], 3376 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 } 3377 }
3559 else 3378 else
3560 XDeleteProperty (display->display, TermWin.parent[0], 3379 XDeleteProperty (dpy, parent[0],
3561 display->atom (str)); 3380 display->atom (str));
3562 } 3381 }
3563 break; 3382 break;
3564 3383
3565 case XTerm_Color: 3384 case XTerm_Color:
3566 for (buf = (char *)str; buf && *buf;) 3385 for (buf = (char *)str; buf && *buf;)
3567 { 3386 {
3568 if ((name = STRCHR (buf, ';')) == NULL) 3387 if ((name = strchr (buf, ';')) == NULL)
3569 break; 3388 break;
3570 3389
3571 *name++ = '\0'; 3390 *name++ = '\0';
3572 color = atoi (buf); 3391 color = atoi (buf) + minCOLOR;
3573 3392
3574 if (color < 0 || color >= TOTAL_COLORS) 3393 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3575 break; 3394 break;
3576 3395
3577 if ((buf = STRCHR (name, ';')) != NULL) 3396 if ((buf = strchr (name, ';')) != NULL)
3578 *buf++ = '\0'; 3397 *buf++ = '\0';
3579 3398
3580 if (name[0] == '?' && !name[1]) 3399 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 } 3400 }
3589 break; 3401 break;
3590 case XTerm_Color00: 3402 case XTerm_Color00:
3591 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3403 process_color_seq (op, Color_fg, str, resp);
3592 break; 3404 break;
3593 case XTerm_Color01: 3405 case XTerm_Color01:
3594 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3406 process_color_seq (op, Color_bg, str, resp);
3595 break; 3407 break;
3596#ifndef NO_CURSORCOLOR 3408#ifndef NO_CURSORCOLOR
3597 case XTerm_Color_cursor: 3409 case XTerm_Color_cursor:
3598 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3410 process_color_seq (op, Color_cursor, str, resp);
3599 break; 3411 break;
3600#endif 3412#endif
3601 case XTerm_Color_pointer_fg: 3413 case XTerm_Color_pointer_fg:
3602 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3414 process_color_seq (op, Color_pointer_fg, str, resp);
3603 break; 3415 break;
3604 case XTerm_Color_pointer_bg: 3416 case XTerm_Color_pointer_bg:
3605 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3417 process_color_seq (op, Color_pointer_bg, str, resp);
3606 break; 3418 break;
3607#ifndef NO_BOLD_UNDERLINE_REVERSE 3419#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: 3420 case XTerm_Color_RV:
3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3421 process_color_seq (op, Color_RV, str, resp);
3616 break; 3422 break;
3423 case Rxvt_Color_BD:
3424 case URxvt_Color_BD:
3425 process_color_seq (op, Color_BD, str, resp);
3426 break;
3427 case Rxvt_Color_UL:
3428 case URxvt_Color_UL:
3429 process_color_seq (op, Color_UL, str, resp);
3430 break;
3431 case URxvt_Color_IT:
3432 process_color_seq (op, Color_IT, str, resp);
3433 break;
3617#endif 3434#endif
3435#if ENABLE_TRANSPARENCY
3436 case URxvt_Color_tint:
3437 process_color_seq (op, Color_tint, str, resp);
3438 {
3439 bool changed = false;
3440 if (ISSET_PIXCOLOR (Color_tint))
3441 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3442 else
3443 changed = bgPixmap.unset_tint ();
3444 if (changed)
3445 {
3446 bgPixmap.render_background ();
3447 if (am_transparent)
3448 want_full_refresh = want_refresh = 1;
3449 }
3450 }
3618 3451
3452 break;
3453#endif
3454
3455#if XPM_BACKGROUND
3619 case XTerm_Pixmap: 3456 case Rxvt_Pixmap:
3620 if (*str != ';') 3457 if (!strcmp (str, "?"))
3621 { 3458 {
3622#if XPM_BACKGROUND 3459 char str[256];
3623 scale_pixmap (""); /* reset to default scaling */ 3460
3624 set_bgPixmap (str); /* change pixmap */ 3461 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3625#endif 3462 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3626 scr_touch (true); 3463 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3627 } 3465 }
3628 while ((str = STRCHR (str, ';')) != NULL) 3466 else
3629 { 3467 {
3468 int changed = 0;
3469
3470 if (*str != ';')
3471 {
3472 /* reset to default scaling :*/
3473 bgPixmap.unset_geometry ();
3474 if (bgPixmap.set_file (str)) /* change pixmap */
3475 changed++;
3476 str = strchr (str, ';');
3477 if (str == NULL)
3478 bgPixmap.set_defaultGeometry ();
3479 }
3480 while (str)
3481 {
3630 str++; 3482 str++;
3631#if XPM_BACKGROUND 3483 if (bgPixmap.set_geometry (str))
3632 changed += scale_pixmap (str); 3484 changed++;
3633#endif 3485 str = strchr (str, ';');
3634 3486 }
3487 if (changed)
3488 {
3489 bgPixmap.render_background ();
3490 scr_touch (true);
3491 }
3635 } 3492 }
3636 if (changed)
3637 {
3638#ifdef XPM_BACKGROUND
3639 resize_pixmap ();
3640#endif
3641 scr_touch (true);
3642 }
3643 break; 3493 break;
3494#endif
3644 3495
3645 case XTerm_restoreFG: 3496 case Rxvt_restoreFG:
3646 set_window_color (Color_fg, str); 3497 set_window_color (Color_fg, str);
3647 break; 3498 break;
3648 case XTerm_restoreBG: 3499 case Rxvt_restoreBG:
3649 set_window_color (Color_bg, str); 3500 set_window_color (Color_bg, str);
3650 break; 3501 break;
3651 3502
3652 case XTerm_logfile: 3503 case XTerm_logfile:
3653 // TODO, when secure mode? 3504 // TODO, when secure mode?
3654 break; 3505 break;
3655 3506
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 3507#if 0
3697 case XTerm_dumpscreen: /* no error notices */ 3508 case Rxvt_dumpscreen: /* no error notices */
3698 { 3509 {
3699 int fd; 3510 int fd;
3700 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3511 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3701 { 3512 {
3702 scr_dump (fd); 3513 scr_dump (fd);
3703 close (fd); 3514 close (fd);
3704 } 3515 }
3705 } 3516 }
3517 break;
3518#endif
3519 case XTerm_font:
3520 op = URxvt_font;
3521 case URxvt_font:
3522#if ENABLE_STYLES
3523 case URxvt_boldFont:
3524 case URxvt_italicFont:
3525 case URxvt_boldItalicFont:
3526#endif
3527 if (query)
3528 tt_printf ("\33]%d;%-.250s%c", saveop,
3529 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3530 ? fontset[op - URxvt_font]->fontdesc : "",
3531 resp);
3532 else
3533 {
3534 const char *&res = rs[Rs_font + (op - URxvt_font)];
3535
3536 res = strdup (str);
3537 allocated.push_back ((void *)res);
3538 set_fonts ();
3539 }
3540 break;
3541
3542 case URxvt_version:
3543 if (query)
3544 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3545 op,
3546 rs[Rs_name], VERSION[0], VERSION[2],
3547 resp);
3548 break;
3549
3550#if !ENABLE_MINIMAL
3551 case URxvt_locale:
3552 if (query)
3553 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3554 else
3555 {
3556 set_locale (str);
3557 pty->set_utf8_mode (enc_utf8);
3558 init_xlocale ();
3559 }
3560 break;
3561
3562 case URxvt_view_up:
3563 case URxvt_view_down:
3564 {
3565 int lines = atoi (str);
3566
3567 if (lines)
3568 scr_page (op == URxvt_view_up ? UP : DN, lines);
3569 else
3570 scr_erase_savelines ();
3571 }
3572
3573 break;
3574#endif
3575
3576#if ENABLE_PERL
3577 case URxvt_perl:
3578 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3579 ; // no responses yet
3706 break; 3580 break;
3707#endif 3581#endif
3708 } 3582 }
3709} 3583}
3710/*----------------------------------------------------------------------*/ 3584/*----------------------------------------------------------------------*/
… …
3724{ 3598{
3725 int state; 3599 int state;
3726 3600
3727 if (mode == 's') 3601 if (mode == 's')
3728 { 3602 {
3729 SavedModes |= (PrivateModes & bit); 3603 SavedModes |= (priv_modes & bit);
3730 return -1; 3604 return -1;
3731 } 3605 }
3732 else 3606 else
3733 { 3607 {
3734 if (mode == 'r') 3608 if (mode == 'r')
3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3609 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3736 else 3610 else
3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3611 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3738 PrivMode (state, bit); 3612 PrivMode (state, bit);
3739 } 3613 }
3740 3614
3741 return state; 3615 return state;
3742} 3616}
3743 3617
3744/* we're not using priv _yet_ */ 3618/* we're not using priv _yet_ */
3745void 3619void
3746rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3620rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3747{ 3621{
3748 unsigned int i, j; 3622 unsigned int i, j;
3749 int state; 3623 int state;
3750 3624
3751 static const struct 3625 static const struct
3752 { 3626 {
3753 const int argval; 3627 const int argval;
3754 const unsigned long bit; 3628 const unsigned long bit;
3755 }
3756
3757 argtopriv[] = { 3629 } argtopriv[] = {
3758 { 1, PrivMode_aplCUR }, 3630 { 1, PrivMode_aplCUR },
3759 { 2, PrivMode_vt52 }, 3631 { 2, PrivMode_vt52 },
3760 { 3, PrivMode_132 }, 3632 { 3, PrivMode_132 },
3761 { 4, PrivMode_smoothScroll }, 3633 { 4, PrivMode_smoothScroll },
3762 { 5, PrivMode_rVideo }, 3634 { 5, PrivMode_rVideo },
3763 { 6, PrivMode_relOrigin }, 3635 { 6, PrivMode_relOrigin },
3764 { 7, PrivMode_Autowrap }, 3636 { 7, PrivMode_Autowrap },
3637 // 8, bi-directional support mode
3765 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3766#ifdef menuBar_esc 3639 // 18, 19 printing-related
3767 { menuBar_esc, PrivMode_menuBar }, 3640 { 25, PrivMode_VisibleCursor },
3768#endif
3769#ifdef scrollBar_esc 3641#ifdef scrollBar_esc
3770 { scrollBar_esc, PrivMode_scrollBar }, 3642 { scrollBar_esc, PrivMode_scrollBar },
3771#endif 3643#endif
3772 // 18, 19 printing-related
3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3775 { 35, PrivMode_ShiftKeys }, // rxvt extension 3644 { 35, PrivMode_ShiftKeys }, // rxvt extension
3776 { 40, PrivMode_132OK }, 3645 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI 3646 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI 3647 // 45 margin bell NYI
3779 // 46 start logging 3648 // 46 start logging
… …
3819 } 3688 }
3820 3689
3821 /* extra handling for values with state unkept */ 3690 /* extra handling for values with state unkept */
3822 switch (arg[i]) 3691 switch (arg[i])
3823 { 3692 {
3693#if ENABLE_STYLES
3694 case 1021:
3695 set_option (Opt_intensityStyles, mode);
3696
3697 scr_touch (true);
3698 break;
3699#endif
3824 case 1048: /* alternative cursor save */ 3700 case 1048: /* alternative cursor save */
3701 case 1049:
3825 if (Options & Opt_secondaryScreen) 3702 if (option (Opt_secondaryScreen))
3826 if (mode == 0) 3703 if (mode == 0)
3827 scr_cursor (RESTORE); 3704 scr_cursor (RESTORE);
3828 else if (mode == 1) 3705 else if (mode == 1)
3829 scr_cursor (SAVE); 3706 scr_cursor (SAVE);
3830 break; 3707 break;
… …
3841 * within VT52 mode 3718 * within VT52 mode
3842 */ 3719 */
3843 PrivMode (1, PrivMode_vt52); 3720 PrivMode (1, PrivMode_vt52);
3844 break; 3721 break;
3845 case 3: /* 80/132 */ 3722 case 3: /* 80/132 */
3846 if (PrivateModes & PrivMode_132OK) 3723 if (priv_modes & PrivMode_132OK)
3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3724 set_widthheight (((state ? 132 : 80) * fwidth), height);
3848 break; 3725 break;
3849 case 4: /* smooth scrolling */ 3726 case 4: /* smooth scrolling */
3850 if (state) 3727 set_option (Opt_jumpScroll, !state);
3851 Options &= ~Opt_jumpScroll;
3852 else
3853 Options |= Opt_jumpScroll;
3854 break; 3728 break;
3855 case 5: /* reverse video */ 3729 case 5: /* reverse video */
3856 scr_rvideo_mode (state); 3730 scr_rvideo_mode (state);
3857 break; 3731 break;
3858 case 6: /* relative/absolute origins */ 3732 case 6: /* relative/absolute origins */
… …
3862 scr_autowrap (state); 3736 scr_autowrap (state);
3863 break; 3737 break;
3864 /* case 8: - auto repeat, can't do on a per window basis */ 3738 /* case 8: - auto repeat, can't do on a per window basis */
3865 case 9: /* X10 mouse reporting */ 3739 case 9: /* X10 mouse reporting */
3866 if (state) /* orthogonal */ 3740 if (state) /* orthogonal */
3867 PrivateModes &= ~PrivMode_MouseX11; 3741 priv_modes &= ~PrivMode_MouseX11;
3868 break; 3742 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 3743#ifdef scrollBar_esc
3877 case scrollBar_esc: 3744 case scrollBar_esc:
3878 if (scrollbar_mapping (state)) 3745 if (scrollbar_mapping (state))
3879 { 3746 {
3880 resize_all_windows (0, 0, 0); 3747 resize_all_windows (0, 0, 0);
… …
3892 break; 3759 break;
3893 /* case 66: - application key pad */ 3760 /* case 66: - application key pad */
3894 /* case 67: - backspace key */ 3761 /* case 67: - backspace key */
3895 case 1000: /* X11 mouse reporting */ 3762 case 1000: /* X11 mouse reporting */
3896 if (state) /* orthogonal */ 3763 if (state) /* orthogonal */
3897 PrivateModes &= ~PrivMode_MouseX10; 3764 priv_modes &= ~PrivMode_MouseX10;
3898 break; 3765 break;
3899#if 0 3766#if 0
3900 case 1001: 3767 case 1001:
3901 break; /* X11 mouse highlighting */ 3768 break; /* X11 mouse highlighting */
3902#endif 3769#endif
3903 case 1010: /* scroll to bottom on TTY output inhibit */ 3770 case 1010: /* scroll to bottom on TTY output inhibit */
3904 if (state)
3905 Options &= ~Opt_scrollTtyOutput;
3906 else
3907 Options |= Opt_scrollTtyOutput; 3771 set_option (Opt_scrollTtyOutput, !state);
3908 break; 3772 break;
3909 case 1011: /* scroll to bottom on key press */ 3773 case 1011: /* scroll to bottom on key press */
3910 if (state)
3911 Options |= Opt_scrollTtyKeypress; 3774 set_option (Opt_scrollTtyKeypress, state);
3912 else
3913 Options &= ~Opt_scrollTtyKeypress;
3914 break; 3775 break;
3915 case 1047: /* secondary screen w/ clearing last */ 3776 case 1047: /* secondary screen w/ clearing last */
3916 if (Options & Opt_secondaryScreen) 3777 if (option (Opt_secondaryScreen))
3917 if (current_screen != PRIMARY) 3778 if (current_screen != PRIMARY)
3918 scr_erase_screen (2); 3779 scr_erase_screen (2);
3919 scr_change_screen (state); 3780 scr_change_screen (state);
3920 break; 3781 break;
3921 case 1049: /* secondary screen w/ clearing first */ 3782 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state); 3783 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen) 3784 if (option (Opt_secondaryScreen))
3924 if (current_screen != PRIMARY) 3785 if (current_screen != PRIMARY)
3925 scr_erase_screen (2); 3786 scr_erase_screen (2);
3926 break; 3787 break;
3927 default: 3788 default:
3928 break; 3789 break;
… …
3954 rendset = 0, rendstyle = ~RS_None; 3815 rendset = 0, rendstyle = ~RS_None;
3955 break; 3816 break;
3956 case 1: 3817 case 1:
3957 rendset = 1, rendstyle = RS_Bold; 3818 rendset = 1, rendstyle = RS_Bold;
3958 break; 3819 break;
3959 //case 2: // faint or second colour 3820 //case 2: // low intensity
3821 case 3:
3822 rendset = 1, rendstyle = RS_Italic;
3823 break;
3960 case 4: 3824 case 4:
3961 rendset = 1, rendstyle = RS_Uline; 3825 rendset = 1, rendstyle = RS_Uline;
3962 break; 3826 break;
3963 case 5: // slowly blinking 3827 case 5: // slowly blinking
3964 case 6: // rapidly blinking 3828 case 6: // rapidly blinking
… …
3976 //case 11: // scoansi acs on, first alt font 3840 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font 3841 //case 12: // scoansi acs on, |0x80, second alt font
3978 //... 3842 //...
3979 //case 19: // ninth alt font 3843 //case 19: // ninth alt font
3980 //case 20: // gothic 3844 //case 20: // gothic
3981 case 21: // disable bold, faint 3845 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3982 rendset = 0, rendstyle = RS_Bold; 3846 rendset = 0, rendstyle = RS_Bold;
3983 break; 3847 break;
3984 case 22: 3848 case 22: // normal intensity
3985 rendset = 0, rendstyle = RS_Bold; 3849 rendset = 0, rendstyle = RS_Bold;
3986 break; 3850 break;
3987 //case 23: disable italic 3851 case 23: // disable italic
3852 rendset = 0, rendstyle = RS_Italic;
3853 break;
3988 case 24: 3854 case 24:
3989 rendset = 0, rendstyle = RS_Uline; 3855 rendset = 0, rendstyle = RS_Uline;
3990 break; 3856 break;
3991 case 25: 3857 case 25:
3858 rendset = 0, rendstyle = RS_Blink;
3859 break;
3860 case 26: // variable spacing (iso 8613)
3992 rendset = 0, rendstyle = RS_Blink; 3861 rendset = 0, rendstyle = RS_Blink;
3993 break; 3862 break;
3994 case 27: 3863 case 27:
3995 rendset = 0, rendstyle = RS_RVid; 3864 rendset = 0, rendstyle = RS_RVid;
3996 break; 3865 break;
… …
4014 case 35: 3883 case 35:
4015 case 36: 3884 case 36:
4016 case 37: 3885 case 37:
4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3886 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4018 break; 3887 break;
4019#ifdef TTY_256COLOR 3888 case 38: // set fg color, ISO 8613-6
4020 case 38:
4021 if (nargs > i + 2 && arg[i + 1] == 5) 3889 if (nargs > i + 2 && arg[i + 1] == 5)
4022 { 3890 {
4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3891 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4024 i += 2; 3892 i += 2;
4025 } 3893 }
4026 break; 3894 break;
4027#endif
4028 case 39: /* default fg */ 3895 case 39: /* default fg */
4029 scr_color (Color_fg, Color_fg); 3896 scr_color (Color_fg, Color_fg);
4030 break; 3897 break;
4031 3898
4032 case 40: 3899 case 40:
… …
4037 case 45: 3904 case 45:
4038 case 46: 3905 case 46:
4039 case 47: 3906 case 47:
4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3907 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4041 break; 3908 break;
4042#ifdef TTY_256COLOR 3909 case 48: // set bg color, ISO 8613-6
4043 case 48:
4044 if (nargs > i + 2 && arg[i + 1] == 5) 3910 if (nargs > i + 2 && arg[i + 1] == 5)
4045 { 3911 {
4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3912 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4047 i += 2; 3913 i += 2;
4048 } 3914 }
4049 break; 3915 break;
4050#endif
4051 case 49: /* default bg */ 3916 case 49: /* default bg */
4052 scr_color (Color_bg, Color_bg); 3917 scr_color (Color_bg, Color_bg);
4053 break; 3918 break;
4054 3919
4055#ifndef NO_BRIGHTCOLOR 3920 //case 50: // not variable spacing
3921
3922#if !ENABLE_MINIMAL
4056 case 90: 3923 case 90:
4057 case 91: /* set bright fg color */ 3924 case 91: /* set bright fg color */
4058 case 92: 3925 case 92:
4059 case 93: 3926 case 93:
4060 case 94: 3927 case 94:
4061 case 95: 3928 case 95:
4062 case 96: 3929 case 96:
4063 case 97: 3930 case 97:
4064 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3931 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4065 Color_fg);
4066 break; 3932 break;
4067 case 100: 3933 case 100:
4068 case 101: /* set bright bg color */ 3934 case 101: /* set bright bg color */
4069 case 102: 3935 case 102:
4070 case 103: 3936 case 103:
4071 case 104: 3937 case 104:
4072 case 105: 3938 case 105:
4073 case 106: 3939 case 106:
4074 case 107: 3940 case 107:
4075 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3941 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4076 Color_bg);
4077 break; 3942 break;
4078#endif 3943#endif
4079
4080 } 3944 }
4081 } 3945 }
4082} 3946}
4083/*}}} */ 3947/*}}} */
4084 3948
… …
4088{ 3952{
4089 unicode_t ch, cmd = cmd_getc (); 3953 unicode_t ch, cmd = cmd_getc ();
4090 3954
4091 if (cmd == 'Q') 3955 if (cmd == 'Q')
4092 { /* query graphics */ 3956 { /* query graphics */
4093 tt_printf ("\033G0\n"); /* no graphics */ 3957 tt_printf ("\033G0\012"); /* no graphics */
4094 return; 3958 return;
4095 } 3959 }
4096 /* swallow other graphics sequences until terminating ':' */ 3960 /* swallow other graphics sequences until terminating ':' */
4097 do 3961 do
4098 ch = cmd_getc (); 3962 ch = cmd_getc ();
… …
4108 */ 3972 */
4109void 3973void
4110rxvt_term::tt_printf (const char *fmt,...) 3974rxvt_term::tt_printf (const char *fmt,...)
4111{ 3975{
4112 va_list arg_ptr; 3976 va_list arg_ptr;
4113 unsigned char buf[256]; 3977 char buf[256];
4114 3978
4115 va_start (arg_ptr, fmt); 3979 va_start (arg_ptr, fmt);
4116 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3980 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4117 va_end (arg_ptr); 3981 va_end (arg_ptr);
4118 tt_write (buf, STRLEN (buf)); 3982 tt_write (buf, strlen (buf));
4119} 3983}
4120 3984
4121/* ---------------------------------------------------------------------- */ 3985/* ---------------------------------------------------------------------- */
4122/* Write data to the pty as typed by the user, pasted with the mouse, 3986/* 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. 3987 * or generated by us in response to a query ESC sequence.
4124 */ 3988 */
3989const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3990
4125void 3991void
4126rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3992rxvt_term::tt_write (const char *data, unsigned int len)
4127{ 3993{
4128 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3994 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3995 return;
4129 3996
4130 if (len) 3997 if (pty->pty < 0)
3998 return;
3999
4000 if (v_buflen == 0)
4001 {
4002 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4003
4004 if ((unsigned int)written == len)
4005 return;
4006
4007 data += written;
4008 len -= written;
4131 { 4009 }
4010
4011 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4012
4013 memcpy (v_buffer + v_buflen, data, len);
4014 v_buflen += len;
4015
4016 pty_ev.set (EVENT_READ | EVENT_WRITE);
4017}
4018
4019void rxvt_term::pty_write ()
4020{
4021 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4022
4023 if (written > 0)
4024 {
4025 v_buflen -= written;
4026
4132 if (v_buflen == 0) 4027 if (v_buflen == 0)
4133 { 4028 {
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); 4029 free (v_buffer);
4161 v_buffer = 0; 4030 v_buffer = 0;
4162 v_buflen = 0; 4031 v_buflen = 0;
4163 4032
4164 pty_ev.set (EVENT_READ); 4033 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; 4034 return;
4177 } 4035 }
4036
4037 memmove (v_buffer, v_buffer + written, v_buflen);
4178 } 4038 }
4039 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4040 pty_ev.set (EVENT_READ);
4179} 4041}
4180 4042
4181/*----------------------- end-of-file (C source) -----------------------*/ 4043/*----------------------- end-of-file (C source) -----------------------*/
4182 4044

Diff Legend

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