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.329 by ayin, Mon Jun 11 19:57:28 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 ENABLE_OVERLAY
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 ENABLE_OVERLAY
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_End
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 ENABLE_OVERLAY
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 ENABLE_OVERLAY
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 TRANSPARENT
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 ();
… …
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; 1115 refresh_limit = 1;
836 refresh_count = 0; 1116 refresh_count = 0;
837 flush (); 1117 flush ();
838} 1118}
… …
842rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
843{ 1123{
844 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
845 want_refresh = 1; 1125 want_refresh = 1;
846 1126
847 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
848} 1128}
849#endif 1129#endif
850 1130
851#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
852void 1132void
… …
866rxvt_term::cont_scroll_cb (time_watcher &w) 1146rxvt_term::cont_scroll_cb (time_watcher &w)
867{ 1147{
868 if ((scrollbar_isUp() || scrollbar_isDn()) && 1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
869 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
870 { 1150 {
871 refresh_type |= SMOOTH_REFRESH;
872 want_refresh = 1; 1151 want_refresh = 1;
873 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
874 } 1153 }
875} 1154}
876#endif 1155#endif
… …
880rxvt_term::sel_scroll_cb (time_watcher &w) 1159rxvt_term::sel_scroll_cb (time_watcher &w)
881{ 1160{
882 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
883 { 1162 {
884 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
885 refresh_type |= SMOOTH_REFRESH;
886 want_refresh = 1; 1164 want_refresh = 1;
887 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
888 } 1166 }
889} 1167}
890#endif 1168#endif
… …
895{ 1173{
896 if (mouse_slip_wheel_speed == 0 1174 if (mouse_slip_wheel_speed == 0
897 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
898 : scr_page (UP, mouse_slip_wheel_speed)) 1176 : scr_page (UP, mouse_slip_wheel_speed))
899 { 1177 {
900 refresh_type |= SMOOTH_REFRESH; 1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
901 want_refresh = 1; 1181 want_refresh = 1;
902 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
903 } 1183 }
904} 1184}
905#endif 1185#endif
906 1186
1187#if LINUX_YIELD_HACK
1188static struct event_handler
1189{
1190 check_watcher yield_ev;
1191
1192 void yield_cb (check_watcher &w)
1193 {
1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1202 w.stop ();
1203 }
1204
1205 event_handler ()
1206 : yield_ev (this, &event_handler::yield_cb)
1207 {
1208 }
1209} event_handler;
1210#endif
1211
907bool 1212bool
908rxvt_term::pty_fill () 1213rxvt_term::pty_fill ()
909{ 1214{
910 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
911 1216
912 if (CBUFSIZ == n) 1217 if (CBUFSIZ == n)
913 { 1218 {
914 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1219 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
915 n = 0; 1220 n = 0;
916 } 1221 }
917 1222
918 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
919 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
920 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
921 1226
922 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
923 1228
924 if (n > 0) 1229 if (r > 0)
925 { 1230 {
926 cmdbuf_endp += n; 1231 cmdbuf_endp += r;
927 return true; 1232 return true;
928 } 1233 }
929 else if (n < 0 && errno != EAGAIN) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1235 {
1236#if LINUX_YIELD_HACK
1237 if (display->is_local)
1238 event_handler.yield_ev.start ();
1239#endif
1240 }
1241 else
1242 {
1243 pty_ev.stop ();
1244
1245 if (!option (Opt_hold))
930 destroy (); 1246 destroy ();
931 1247 }
1248
932 return false; 1249 return false;
933} 1250}
934 1251
935void 1252void
936rxvt_term::pty_cb (io_watcher &w, short revents) 1253rxvt_term::pty_cb (io_watcher &w, short revents)
937{ 1254{
938 SET_R (this); 1255 make_current ();
939 SET_LOCALE (locale);
940 1256
941 if (revents & EVENT_WRITE)
942 tt_write (0, 0);
943 else if (revents & EVENT_READ) 1257 if (revents & EVENT_READ)
944 // loop, but don't allow a single term to monopolize us 1258 // loop, but don't allow a single term to monopolize us
945 while (pty_fill ()) 1259 while (pty_fill ())
946 if (cmd_parse ()) 1260 if (cmd_parse ())
947 break; 1261 break;
1262
1263 if (revents & EVENT_WRITE)
1264 pty_write ();
948} 1265}
949 1266
950void 1267void
951rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
952{ 1269{
953 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
954 recolour_cursor (); 1271 recolour_cursor ();
955 1272
956#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
957 hidden_pointer = 0; 1274 hidden_pointer = 0;
958 1275
959 if (Options & Opt_pointerBlank) 1276 if (option (Opt_pointerBlank))
960 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
961#endif 1278#endif
962} 1279}
963 1280
964#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
965void 1282void
966rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
967{ 1284{
968 if (! (Options & Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
969 return; 1286 return;
970 1287
971 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
972 XFlush (display->display); 1289 XFlush (dpy);
973 1290
974 hidden_pointer = 1; 1291 hidden_pointer = 1;
975} 1292}
976 1293
977void 1294void
978rxvt_term::pointer_cb (time_watcher &w) 1295rxvt_term::pointer_cb (time_watcher &w)
979{ 1296{
980 SET_R (this); 1297 make_current ();
981 SET_LOCALE (locale);
982 1298
983 pointer_blank (); 1299 pointer_blank ();
984} 1300}
985#endif 1301#endif
986 1302
… …
993 x = ev.x; 1309 x = ev.x;
994 y = ev.y; 1310 y = ev.y;
995 pixel_position (&x, &y); 1311 pixel_position (&x, &y);
996 1312
997 if (MEvent.button == AnyButton) 1313 if (MEvent.button == AnyButton)
998 {
999 button_number = 3; 1314 button_number = 3;
1000 }
1001 else 1315 else
1002 { 1316 {
1003 button_number = MEvent.button - Button1; 1317 button_number = MEvent.button - Button1;
1004 /* add 0x3D for wheel events, like xterm does */ 1318 /* add 0x3D for wheel events, like xterm does */
1005 if (button_number >= 3) 1319 if (button_number >= 3)
1006 button_number += (64 - 3); 1320 button_number += (64 - 3);
1007 } 1321 }
1008 1322
1009 if (PrivateModes & PrivMode_MouseX10) 1323 if (priv_modes & PrivMode_MouseX10)
1010 { 1324 {
1011 /* 1325 /*
1012 * do not report ButtonRelease 1326 * do not report ButtonRelease
1013 * no state info allowed 1327 * no state info allowed
1014 */ 1328 */
… …
1029 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1343 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1030 + ((MEvent.state & ControlMask) ? 16 : 0); 1344 + ((MEvent.state & ControlMask) ? 16 : 0);
1031#ifdef MOUSE_REPORT_DOUBLECLICK 1345#ifdef MOUSE_REPORT_DOUBLECLICK
1032 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1346 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1033#endif 1347#endif
1034
1035 } 1348 }
1036 1349
1037#ifdef DEBUG_MOUSEREPORT 1350#if DEBUG_MOUSEREPORT
1038 fprintf (stderr, "Mouse ["); 1351 fprintf (stderr, "Mouse [");
1039 if (key_state & 16) 1352 if (key_state & 16)
1040 fputc ('C', stderr); 1353 fputc ('C', stderr);
1041 if (key_state & 4) 1354 if (key_state & 4)
1042 fputc ('S', stderr); 1355 fputc ('S', stderr);
… …
1046 fputc ('2', stderr); 1359 fputc ('2', stderr);
1047 fprintf (stderr, "]: <%d>, %d/%d\n", 1360 fprintf (stderr, "]: <%d>, %d/%d\n",
1048 button_number, 1361 button_number,
1049 x + 1, 1362 x + 1,
1050 y + 1); 1363 y + 1);
1051#else 1364#endif
1365
1052 tt_printf ("\033[M%c%c%c", 1366 tt_printf ("\033[M%c%c%c",
1053 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1054 (32 + x + 1), 1368 (32 + x + 1),
1055 (32 + y + 1)); 1369 (32 + y + 1));
1056#endif
1057} 1370}
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 1371
1069/*{{{ process an X event */ 1372/*{{{ process an X event */
1070void 1373void
1071rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1072{ 1375{
1073 SET_R (this); 1376 make_current ();
1074 SET_LOCALE (locale);
1075 1377
1076#if defined(CURSOR_BLINK) 1378 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 1379
1085 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1380 if (ev.xany.window == vt
1086 } 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1087#endif 1382 && 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; 1383 return;
1106#endif
1107 1384
1385 // for XQueryPointer
1108 Window unused_root, unused_child; 1386 Window unused_root, unused_child;
1109 int unused_root_x, unused_root_y; 1387 int unused_root_x, unused_root_y;
1110 unsigned int unused_mask; 1388 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 1389
1161 switch (ev.type) 1390 switch (ev.type)
1162 { 1391 {
1163 case KeyPress: 1392 case KeyPress:
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT)) 1393 key_press (ev.xkey);
1165 lookup_key (ev.xkey);
1166
1167 break; 1394 break;
1168 1395
1169 case KeyRelease: 1396 case KeyRelease:
1170 { 1397 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; 1398 break;
1221 }
1222 1399
1223 case ButtonPress: 1400 case ButtonPress:
1224 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1225 break; 1402 break;
1226 1403
… …
1228 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1229 break; 1406 break;
1230 1407
1231 case ClientMessage: 1408 case ClientMessage:
1232 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1233 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1410 && !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 { 1411 {
1242 /* Get Dnd data */ 1412 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1243 Atom ActualType; 1413 {
1244 int ActualFormat; 1414 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1245 unsigned char *data; 1415 {
1246 unsigned long Size, RemainingBytes; 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1247 1417 {
1248 XGetWindowProperty (display->display, display->root, 1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1249 xa[XA_DNDSELECTION], 1419 destroy ();
1250 0L, 1000000L, 1420 }
1251 False, AnyPropertyType, 1421#if ENABLE_EWMH
1252 &ActualType, &ActualFormat, 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1253 &Size, &RemainingBytes, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1254 &data); 1425 &ev);
1255 XChangeProperty (display->display, display->root, 1426#endif
1256 XA_CUT_BUFFER0, XA_STRING, 1427 }
1257 8, PropModeReplace, 1428 }
1258 data, STRLEN (data)); 1429#if ENABLE_XEMBED
1259 XFree (data); 1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1260 selection_paste (display->root, XA_CUT_BUFFER0, True); 1431 {
1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1432 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1433 focus_in ();
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out ();
1436 }
1437#endif
1262 } 1438 }
1263#endif /* OFFIX_DND */
1264 break; 1439 break;
1265 1440
1266 case MappingNotify: 1441 case MappingNotify:
1267 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1268 break; 1443 break;
… …
1291 break; 1466 break;
1292 } 1467 }
1293 break; 1468 break;
1294 1469
1295 case FocusIn: 1470 case FocusIn:
1296 if (!TermWin.focus) 1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1474 focus_in ();
1475 break;
1476
1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1481 focus_out ();
1482 break;
1483
1484 case ConfigureNotify:
1485 if (ev.xconfigure.window == parent[0])
1297 { 1486 {
1298 TermWin.focus = 1; 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1299 want_refresh = 1; 1488 ;
1300#ifdef USE_XIM 1489
1301 if (Input_Context != NULL) 1490 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 { 1491 {
1311 PixColors = PixColorsFocused; 1492 seen_resize = 1;
1312 set_colorfgbg (); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1313 scr_clear (); 1494#ifdef XPM_BACKGROUND
1495 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1314 scr_touch (true); 1498 scr_touch (true);
1499 }
1500#endif
1315 } 1501 }
1316#endif
1317 1502
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1506 if (option (Opt_transparent))
1507 check_our_parents ();
1508#endif
1318 } 1509 }
1319 break; 1510 break;
1320 1511
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: 1512 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1376 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1377 && ev.xproperty.state == PropertyNewValue) 1515 && ev.xproperty.state == PropertyNewValue)
1378 selection_property (ev.xproperty.window, ev.xproperty.atom); 1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1379 1517
1380 break; 1518 break;
1381 1519
1382 case SelectionClear: 1520 case SelectionClear:
1383 selection_clear (); 1521 selection_clear ();
1384 break; 1522 break;
1385 1523
1386 case SelectionNotify: 1524 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1525 if (selection_wait == Sel_normal)
1388 selection_paste (ev.xselection.requestor, 1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1389 ev.xselection.property, True);
1390 break; 1527 break;
1391 1528
1392 case SelectionRequest: 1529 case SelectionRequest:
1393 selection_send (ev.xselectionrequest); 1530 selection_send (ev.xselectionrequest);
1394 break; 1531 break;
1395 1532
1533 case MapNotify:
1534 mapped = 1;
1535#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1537#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break;
1540
1396 case UnmapNotify: 1541 case UnmapNotify:
1397 TermWin.mapped = 0; 1542 mapped = 0;
1398#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1399 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1400#endif 1545#endif
1401 break; 1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1402
1403 case MapNotify:
1404 TermWin.mapped = 1;
1405#ifdef TEXT_BLINK
1406 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1407#endif
1408 break; 1547 break;
1409 1548
1410#ifdef TRANSPARENT 1549#ifdef TRANSPARENT
1411 case ReparentNotify: 1550 case ReparentNotify:
1412 rootwin_cb (ev); 1551 rootwin_cb (ev);
1413 break; 1552 break;
1414#endif /* TRANSPARENT */ 1553#endif /* TRANSPARENT */
1415 1554
1416 case GraphicsExpose: 1555 case GraphicsExpose:
1417 case Expose: 1556 case Expose:
1418 if (ev.xany.window == TermWin.vt) 1557 if (ev.xany.window == vt)
1419 { 1558 {
1420 do 1559 do
1421 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1422 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1424 1563
1425 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1426 1565
1427 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1428 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1429 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1430 1569
1431 scr_refresh (refresh_type); 1570 want_refresh = 1;
1432 } 1571 }
1433 else 1572 else
1434 { 1573 {
1435 XEvent unused_event; 1574 XEvent unused_event;
1436 1575
1437 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1438 ; 1577 ;
1439 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1440 ; 1579 ;
1441 1580
1442 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1443 { 1582 {
1444 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1445 scrollbar_show (0); 1584 scrollbar_show (0);
1446 } 1585 }
1447#ifdef MENUBAR
1448 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1449 menubar_expose ();
1450#endif
1451 1586
1452#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1453 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1454 XClearWindow (display->display, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1455#endif 1590#endif
1456 } 1591 }
1457 break; 1592 break;
1458 1593
1459 case MotionNotify: 1594 case MotionNotify:
1460#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1461 if (hidden_pointer) 1596 if (hidden_pointer)
1462 pointer_unblank (); 1597 pointer_unblank ();
1463#endif 1598#endif
1464#if MENUBAR 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1465 if (isMenuBarWindow (ev.xany.window)) 1600 break;
1601
1602 if (ev.xany.window == vt)
1466 { 1603 {
1467 menubar_control (ev.xbutton); 1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1468 break; 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1469 } 1606 ; // nop
1470#endif
1471 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1472 break;
1473
1474 if (ev.xany.window == TermWin.vt)
1475 {
1476 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1477 { 1608 {
1478 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1479 ; 1610 ;
1480 1611
1481 XQueryPointer (display->display, TermWin.vt, 1612 XQueryPointer (dpy, vt,
1482 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1483 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1484 & (ev.xbutton.x), & (ev.xbutton.y), 1615 &ev.xbutton.x, &ev.xbutton.y,
1485 &unused_mask); 1616 &ev.xbutton.state);
1486#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
1487 /* deal with a `jumpy' mouse */ 1618 /* deal with a `jumpy' mouse */
1488 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1619 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1489 { 1620 {
1490#endif 1621#endif
1622#if ISO_14755
1623 // 5.4
1624 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1625 {
1626 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1627 break;
1628 }
1629#endif
1491 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1630 selection_extend (ev.xbutton.x, ev.xbutton.y,
1492 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1631 ev.xbutton.state & Button3Mask ? 2 : 0);
1632
1493#ifdef SELECTION_SCROLLING 1633#ifdef SELECTION_SCROLLING
1494 if (ev.xbutton.y < TermWin.int_bwidth 1634 if (ev.xbutton.y < int_bwidth
1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1635 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1496 { 1636 {
1497 int dist; 1637 int dist;
1498 1638
1499 /* don't clobber the current delay if we are 1639 /* don't clobber the current delay if we are
1500 * already in the middle of scrolling. 1640 * already in the middle of scrolling.
… …
1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1504 1644
1505 /* save the event params so we can highlight 1645 /* save the event params so we can highlight
1506 * the selection in the pending-scroll loop 1646 * the selection in the pending-scroll loop
1507 */ 1647 */
1508 selection_save_x=ev.xbutton.x; 1648 selection_save_x = ev.xbutton.x;
1509 selection_save_y=ev.xbutton.y; 1649 selection_save_y = ev.xbutton.y;
1510 selection_save_state=
1511 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1650 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1512 1651
1513 /* calc number of lines to scroll */ 1652 /* calc number of lines to scroll */
1514 if (ev.xbutton.y<TermWin.int_bwidth) 1653 if (ev.xbutton.y < int_bwidth)
1515 { 1654 {
1516 scroll_selection_dir = UP; 1655 scroll_selection_dir = UP;
1517 dist = TermWin.int_bwidth - ev.xbutton.y; 1656 dist = int_bwidth - ev.xbutton.y;
1518 } 1657 }
1519 else 1658 else
1520 { 1659 {
1521 scroll_selection_dir = DN; 1660 scroll_selection_dir = DN;
1522 dist = ev.xbutton.y - 1661 dist = ev.xbutton.y - (int_bwidth + height);
1523 (TermWin.int_bwidth + TermWin.height);
1524 } 1662 }
1663
1525 scroll_selection_lines= (Pixel2Height (dist)/ 1664 scroll_selection_lines = Pixel2Height (dist)
1526 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1665 / SELECTION_SCROLL_LINE_SPEEDUP
1666 + 1;
1527 MIN_IT (scroll_selection_lines, 1667 min_it (scroll_selection_lines,
1528 SELECTION_SCROLL_MAX_LINES); 1668 SELECTION_SCROLL_MAX_LINES);
1529 } 1669 }
1530 else 1670 else
1531 { 1671 {
1532 /* we are within the text window, so we 1672 /* we are within the text window, so we
1533 * shouldn't be scrolling 1673 * shouldn't be scrolling
… …
1535 if (sel_scroll_ev.active) 1675 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop(); 1676 sel_scroll_ev.stop();
1537 } 1677 }
1538#endif 1678#endif
1539#ifdef MOUSE_THRESHOLD 1679#ifdef MOUSE_THRESHOLD
1540
1541 } 1680 }
1542#endif 1681#endif
1543
1544 } 1682 }
1545 } 1683 }
1546 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1547 { 1685 {
1548 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1549 MotionNotify, &ev)) ; 1687 MotionNotify, &ev))
1688 ;
1689
1550 XQueryPointer (display->display, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1551 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1553 & (ev.xbutton.x), & (ev.xbutton.y), 1693 &ev.xbutton.x, &ev.xbutton.y,
1554 &unused_mask); 1694 &unused_mask);
1555 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1556 scrollbar_size ()); 1696 scrollbar_size ());
1557 scr_refresh (refresh_type); 1697 want_refresh = 1;
1558 refresh_limit = 0; 1698 refresh_limit = 0;
1559 scrollbar_show (1); 1699 scrollbar_show (1);
1560 } 1700 }
1561 break; 1701 break;
1562 } 1702 }
1563}
1564 1703
1565#if TRANSPARENT 1704#if defined(CURSOR_BLINK)
1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1706 {
1707 if (hidden_cursor)
1708 {
1709 hidden_cursor = 0;
1710 want_refresh = 1;
1711 }
1712
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1714 }
1715#endif
1716
1717#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1719 {
1720 if (ev.type == MotionNotify
1721 || ev.type == ButtonPress
1722 || ev.type == ButtonRelease)
1723 if (hidden_pointer)
1724 pointer_unblank ();
1725
1726 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank ();
1728 }
1729#endif
1730}
1731
1732void
1733rxvt_term::focus_in ()
1734{
1735 if (!focus)
1736 {
1737 focus = 1;
1738 want_refresh = 1;
1739
1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741
1742#if USE_XIM
1743 if (Input_Context != NULL)
1744 {
1745 IMSetPosition ();
1746 XSetICFocus (Input_Context);
1747 }
1748#endif
1749#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1752#endif
1753#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade])
1755 {
1756 pix_colors = pix_colors_focused;
1757 scr_recolour ();
1758 }
1759#endif
1760#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell))
1762 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1771 }
1772#endif
1773 }
1774}
1775
1776void
1777rxvt_term::focus_out ()
1778{
1779 if (focus)
1780 {
1781 focus = 0;
1782 want_refresh = 1;
1783
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1785
1786#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf)
1788 {
1789 iso14755buf = 0;
1790# if ENABLE_OVERLAY
1791 scr_overlay_off ();
1792# endif
1793 }
1794#endif
1795#if USE_XIM
1796 if (Input_Context != NULL)
1797 XUnsetICFocus (Input_Context);
1798#endif
1799#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop ();
1802 hidden_cursor = 0;
1803#endif
1804#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade])
1806 {
1807 pix_colors = pix_colors_unfocused;
1808 scr_recolour ();
1809 }
1810#endif
1811 }
1812}
1813
1814void
1815rxvt_term::update_fade_color (unsigned int idx)
1816{
1817#if OFF_FOCUS_FADING
1818 if (rs[Rs_fade])
1819 {
1820 rgba c;
1821 pix_colors [Color_fade].get (c);
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 }
1824#endif
1825}
1826
1827#if TRANSPARENT || ENABLE_PERL
1566void 1828void
1567rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1568{ 1830{
1569 SET_R (this); 1831 make_current ();
1570 SET_LOCALE (locale);
1571 1832
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return;
1836
1837# if TRANSPARENT
1572 switch (ev.type) 1838 switch (ev.type)
1573 { 1839 {
1574 case PropertyNotify: 1840 case PropertyNotify:
1575 /* 1841 /*
1576 * if user used some Esetroot compatible prog to set the root bg, 1842 * 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. 1843 * use the property to determine the pixmap. We use it later on.
1578 */ 1844 */
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]) 1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1583 return; 1847 return;
1584 1848
1585 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1586 case ReparentNotify: 1850 case ReparentNotify:
1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1588 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1589 break; 1853 break;
1590 } 1854 }
1855# endif
1591} 1856}
1592#endif 1857#endif
1593 1858
1594void 1859void
1595rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
1596{ 1861{
1597 int reportmode = 0, clickintime; 1862 int reportmode = 0, clickintime;
1598 1863
1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1864 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1865
1600 if (!bypass_keystate) 1866 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1867 reportmode = !! (priv_modes & PrivMode_mouse_report);
1868
1602 /* 1869 /*
1603 * VT window processing of button press 1870 * VT window processing of button press
1604 */ 1871 */
1605 if (ev.window == TermWin.vt) 1872 if (ev.window == vt)
1606 { 1873 {
1874 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1875 return;
1876
1877#if ISO_14755
1878 // 5.4
1879 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1880 {
1881 iso14755_54 (ev.x, ev.y);
1882 return;
1883 }
1884#endif
1885
1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1886 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1887
1608 if (reportmode) 1888 if (reportmode)
1609 { 1889 {
1610 /* mouse report from vt window */ 1890 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1613#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1614 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1615 { 1895 {
1616 /* same button, within alloted time */ 1896 /* same button, within alloted time */
1617 MEvent.clicks++; 1897 MEvent.clicks++;
1898
1618 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1619 { 1900 {
1620 /* only report double clicks */ 1901 /* only report double clicks */
1621 MEvent.clicks = 2; 1902 MEvent.clicks = 2;
1622 mouse_report (ev); 1903 mouse_report (ev);
… …
1641 } 1922 }
1642 else 1923 else
1643 { 1924 {
1644 if (ev.button != MEvent.button) 1925 if (ev.button != MEvent.button)
1645 MEvent.clicks = 0; 1926 MEvent.clicks = 0;
1927
1646 switch (ev.button) 1928 switch (ev.button)
1647 { 1929 {
1648 case Button1: 1930 case Button1:
1931 /* allow meta + click to select rectangular areas */
1932 /* should be done in screen.C */
1933#if ENABLE_FRILLS
1934 selection.rect = !!(ev.state & ModMetaMask);
1935#else
1936 selection.rect = false;
1937#endif
1938
1649 /* allow shift+left click to extend selection */ 1939 /* allow shift+left click to extend selection */
1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1940 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1651 { 1941 {
1652 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1653 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1654 else 1944 else
1655 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
… …
1670 case Button3: 1960 case Button3:
1671 if (MEvent.button == Button3 && clickintime) 1961 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y); 1962 selection_rotate (ev.x, ev.y);
1673 else 1963 else
1674 selection_extend (ev.x, ev.y, 1); 1964 selection_extend (ev.x, ev.y, 1);
1965
1675 MEvent.button = Button3; 1966 MEvent.button = Button3;
1676 break; 1967 break;
1677 } 1968 }
1678 } 1969 }
1970
1679 MEvent.time = ev.time; 1971 MEvent.time = ev.time;
1680 return; 1972 return;
1681 } 1973 }
1682 1974
1683 /* 1975 /*
… …
1794 case Button3: 2086 case Button3:
1795 if (scrollBar.style != R_SB_XTERM) 2087 if (scrollBar.style != R_SB_XTERM)
1796 { 2088 {
1797 if (scrollbar_above_slider (ev.y)) 2089 if (scrollbar_above_slider (ev.y))
1798# ifdef RXVT_SCROLL_FULL 2090# ifdef RXVT_SCROLL_FULL
1799 scr_page (UP, TermWin.nrow - 1); 2091 scr_page (UP, nrow - 1);
1800# else 2092# else
1801 scr_page (UP, TermWin.nrow / 4); 2093 scr_page (UP, nrow / 4);
1802# endif 2094# endif
1803 else if (scrollbar_below_slider (ev.y)) 2095 else if (scrollbar_below_slider (ev.y))
1804# ifdef RXVT_SCROLL_FULL 2096# ifdef RXVT_SCROLL_FULL
1805 scr_page (DN, TermWin.nrow - 1); 2097 scr_page (DN, nrow - 1);
1806# else 2098# else
1807 scr_page (DN, TermWin.nrow / 4); 2099 scr_page (DN, nrow / 4);
1808# endif 2100# endif
1809 else 2101 else
1810 scrollBar.setMotion (); 2102 scrollBar.setMotion ();
1811 } 2103 }
1812 else 2104 else
1813 { 2105 {
1814 scr_page ((ev.button == Button1 ? DN : UP), 2106 scr_page ((ev.button == Button1 ? DN : UP),
1815 (TermWin.nrow 2107 (nrow
1816 * scrollbar_position (ev.y) 2108 * scrollbar_position (ev.y)
1817 / scrollbar_size ())); 2109 / scrollbar_size ()));
1818 } 2110 }
1819 2111
1820 break; 2112 break;
1821 } 2113 }
1822 } 2114 }
2115
1823 return; 2116 return;
1824 } 2117 }
1825#if MENUBAR
1826 /*
1827 * Menubar window processing of button press
1828 */
1829 if (isMenuBarWindow (ev.window))
1830 menubar_control (ev);
1831#endif
1832} 2118}
1833 2119
1834void 2120void
1835rxvt_term::button_release (XButtonEvent &ev) 2121rxvt_term::button_release (XButtonEvent &ev)
1836{ 2122{
1837 int reportmode = 0; 2123 int reportmode = 0;
1838 2124
1839 csrO = 0; /* reset csr Offset */ 2125 csrO = 0; /* reset csr Offset */
1840 if (!bypass_keystate) 2126 if (!bypass_keystate)
1841 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2127 reportmode = !! (priv_modes & PrivMode_mouse_report);
1842 2128
1843 if (scrollbar_isUpDn ()) 2129 if (scrollbar_isUpDn ())
1844 { 2130 {
1845 scrollBar.setIdle (); 2131 scrollBar.setIdle ();
1846 scrollbar_show (0); 2132 scrollbar_show (0);
1847#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1848 refresh_type &= ~SMOOTH_REFRESH;
1849#endif
1850
1851 } 2133 }
2134
1852#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
1853 if (sel_scroll_ev.active) 2136 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
1855#endif 2138#endif
2139
1856 if (ev.window == TermWin.vt) 2140 if (ev.window == vt)
1857 { 2141 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2143 return;
2144
2145#if ISO_14755
2146 // 5.4
2147 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2148 return;
2149#endif
2150
1858 if (reportmode) 2151 if (reportmode)
1859 { 2152 {
1860 /* mouse report from vt window */ 2153 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */ 2154 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4) 2155 if (ev.button >= 4)
… …
1876 MEvent.button = AnyButton; 2169 MEvent.button = AnyButton;
1877 mouse_report (ev); 2170 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2171#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2172 return;
1880 } 2173 }
2174
1881 /* 2175 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2176 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2177 * when overriding mouse reporting
1884 */ 2178 */
1885 if (PrivateModes & PrivMode_mouse_report 2179 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2180 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2181 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2182 selection_extend (ev.x, ev.y, 0);
1889 2183
1890 switch (ev.button) 2184 switch (ev.button)
1891 { 2185 {
1892 case Button1: 2186 case Button1:
1893 case Button3: 2187 case Button3:
1894 selection_make (ev.time); 2188 selection_make (ev.time);
1895 break; 2189 break;
2190
1896 case Button2: 2191 case Button2:
1897 selection_request (ev.time, ev.x, ev.y); 2192 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1898 break; 2194 break;
2195
1899#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
1900 case Button4: 2197 case Button4:
1901 case Button5: 2198 case Button5:
1902 { 2199 {
1903 int i; 2200 int i;
… …
1905 2202
1906 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
1907 2204
1908 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
1909 i = 1; 2206 i = 1;
1910 else if (Options & Opt_mouseWheelScrollPage) 2207 else if (option (Opt_mouseWheelScrollPage))
1911 i = TermWin.nrow - 1; 2208 i = nrow - 1;
1912 else 2209 else
1913 i = 5; 2210 i = 5;
1914 2211
1915# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
1916 if (ev.state & ControlMask) 2213 if (ev.state & ControlMask)
1917 { 2214 {
1918 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += v ? -1 : 1;
1919 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2216 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; 2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1921 2218
1922 if (slip_wheel_ev.at < NOW) 2219 if (slip_wheel_ev.at < NOW)
1923 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1924 2221
1925 slip_wheel_ev.start (); 2222 slip_wheel_ev.start ();
1926 } 2223 }
1927 else 2224 else
1928 { 2225 {
1929# endif 2226# endif
1930# ifdef JUMP_MOUSE_WHEEL
1931 scr_page (v, i); 2227 scr_page (v, i);
1932 scr_refresh (SMOOTH_REFRESH);
1933 scrollbar_show (1); 2228 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 2229# ifdef MOUSE_SLIP_WHEELING
1943 } 2230 }
1944#endif 2231# endif
1945 } 2232 }
1946 break; 2233 break;
1947#endif 2234#endif
1948 } 2235 }
1949 } 2236 }
1950#ifdef MENUBAR
1951 else if (isMenuBarWindow (ev.window))
1952 menubar_control (ev);
1953#endif
1954} 2237}
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 2238
2432/*}}} */ 2239/*}}} */
2433 2240
2434bool 2241bool
2435rxvt_term::cmd_parse () 2242rxvt_term::cmd_parse ()
2436{ 2243{
2437 bool flag = false; 2244 bool flag = false;
2438 unicode_t ch = NOCHAR; 2245 wchar_t ch = NOCHAR;
2439 unsigned char *seq_begin; // remember start of esc-sequence here 2246 char *seq_begin; // remember start of esc-sequence here
2440 2247
2441 for (;;) 2248 for (;;)
2442 { 2249 {
2443 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2444 { 2251 {
2445 seq_begin = cmdbuf_ptr; 2252 seq_begin = cmdbuf_ptr;
2446 ch = next_char (); 2253 ch = next_char ();
2447 }
2448 2254
2449 if (ch == NOCHAR) // TODO: improve 2255 if (ch == NOCHAR)
2450 break; 2256 break;
2257 }
2451 2258
2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2259 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2453 { 2260 {
2261 if (!seen_input)
2262 {
2263 seen_input = 1;
2264 // many badly-written programs (e.g. jed) contain a race condition:
2265 // they first read the screensize and then install a SIGWINCH handler.
2266 // some window managers resize the window early, and these programs
2267 // then sometimes get the size wrong.
2268 // unfortunately other programs are even more buggy and dislike
2269 // being sent SIGWINCH, so only do it when we were in fact being
2270 // resized.
2271 if (seen_resize && cmd_pid)
2272 kill (-cmd_pid, SIGWINCH);
2273 }
2274
2454 /* Read a text string from the input buffer */ 2275 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ]; 2276 wchar_t buf[UBUFSIZ];
2456 bool refreshnow = false; 2277 bool refreshnow = false;
2457 int nlines = 0; 2278 int nlines = 0;
2458 unicode_t *str = buf; 2279 wchar_t *str = buf;
2280 wchar_t *eol = str + min (ncol, UBUFSIZ);
2459 2281
2460 for (;;) 2282 for (;;)
2461 { 2283 {
2462 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2284 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2463 break; 2285 break;
2464 2286
2465 *str++ = ch; 2287 *str++ = ch;
2466 2288
2467 if (ch == C0_LF) 2289 if (ch == C0_LF || str >= eol)
2468 { 2290 {
2291 if (ch == C0_LF)
2469 nlines++; 2292 nlines++;
2293
2470 refresh_count++; 2294 refresh_count++;
2471 2295
2472 if (!(Options & Opt_jumpScroll) 2296 if (!option (Opt_jumpScroll)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2297 || (refresh_count >= refresh_limit * (nrow - 1)))
2474 { 2298 {
2475 refreshnow = true; 2299 refreshnow = true;
2300 refresh_count = 0;
2476 ch = NOCHAR; 2301 ch = NOCHAR;
2477 break; 2302 break;
2478 } 2303 }
2479 2304
2480 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2305 // scr_add_lines only works for nlines <= nrow - 1.
2481 if (nlines >= TermWin.nrow - 1) 2306 if (nlines >= nrow - 1)
2482 { 2307 {
2308 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2309 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2483 scr_add_lines (buf, nlines, str - buf); 2310 scr_add_lines (buf, str - buf, nlines);
2311
2484 nlines = 0; 2312 nlines = 0;
2485 str = buf; 2313 str = buf;
2314 eol = str + min (ncol, UBUFSIZ);
2486 } 2315 }
2487 }
2488 2316
2489 if (str >= buf + UBUFSIZ) 2317 if (str >= eol)
2490 { 2318 {
2319 if (eol >= buf + UBUFSIZ)
2320 {
2491 ch = NOCHAR; 2321 ch = NOCHAR;
2492 break; 2322 break;
2323 }
2324 else
2325 eol = min (eol + ncol, buf + UBUFSIZ);
2326 }
2327
2493 } 2328 }
2494 2329
2495 seq_begin = cmdbuf_ptr; 2330 seq_begin = cmdbuf_ptr;
2496 ch = next_char (); 2331 ch = next_char ();
2497 } 2332 }
2498 2333
2334 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2335 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2499 scr_add_lines (buf, nlines, str - buf); 2336 scr_add_lines (buf, str - buf, nlines);
2500 2337
2501 /* 2338 /*
2502 * If there have been a lot of new lines, then update the screen 2339 * 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. 2340 * What the heck I'll cheat and only refresh less than every page-full.
2504 * the number of pages between refreshes is refresh_limit, which 2341 * the number of pages between refreshes is refresh_limit, which
2505 * is incremented here because we must be doing flat-out scrolling. 2342 * is incremented here because we must be doing flat-out scrolling.
2506 */ 2343 */
2507 if (refreshnow) 2344 if (refreshnow)
2508 { 2345 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2346 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++; 2347 refresh_limit++;
2511 else 2348 else
2512 { 2349 {
2513 flag = true; 2350 flag = true;
2351 //TODO: due to popular request, implement "skipscroll" option here
2514 scr_refresh (refresh_type); 2352 scr_refresh ();
2353 want_refresh = 1;
2515 } 2354 }
2516 } 2355 }
2517 2356
2518 } 2357 }
2519 else 2358 else
… …
2534 } 2373 }
2535 2374
2536 return flag; 2375 return flag;
2537} 2376}
2538 2377
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 2378// read the next character
2549unicode_t 2379wchar_t
2550rxvt_term::next_char () 2380rxvt_term::next_char () NOTHROW
2551{ 2381{
2552 while (cmdbuf_ptr < cmdbuf_endp) 2382 while (cmdbuf_ptr < cmdbuf_endp)
2553 { 2383 {
2554 // assume 7-bit to be ascii ALWAYS 2384 // assume 7-bit to be ascii ALWAYS
2555 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2385 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2556 return *cmdbuf_ptr++; 2386 return *cmdbuf_ptr++;
2557 2387
2558 wchar_t wc; 2388 wchar_t wc;
2559 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2389 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2560 2390
2561 if (len == (size_t)-2) 2391 if (len == (size_t)-2)
2562 { 2392 {
2563 // the mbstate stores incomplete sequences. didn't know this :/ 2393 // the mbstate stores incomplete sequences. didn't know this :/
2564 cmdbuf_ptr = cmdbuf_endp; 2394 cmdbuf_ptr = cmdbuf_endp;
2565 break; 2395 break;
2566 } 2396 }
2567 2397
2568 if (len == (size_t)-1) 2398 if (len == (size_t)-1)
2569 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2399 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2570 2400
2571 // assume wchar == unicode 2401 // assume wchar == unicode
2572 cmdbuf_ptr += len; 2402 cmdbuf_ptr += len;
2573 return wc; 2403 return wc & UNICODE_MASK;
2574 } 2404 }
2575 2405
2576 return NOCHAR; 2406 return NOCHAR;
2577} 2407}
2408
2409// read the next octet
2410uint32_t
2411rxvt_term::next_octet () NOTHROW
2412{
2413 return cmdbuf_ptr < cmdbuf_endp
2414 ? (unsigned char)*cmdbuf_ptr++
2415 : NOCHAR;
2416}
2417
2418static class out_of_input out_of_input;
2578 2419
2579/* rxvt_cmd_getc () - Return next input character */ 2420/* rxvt_cmd_getc () - Return next input character */
2580/* 2421/*
2581 * Return the next input character after first passing any keyboard input 2422 * Return the next input character after first passing any keyboard input
2582 * to the command. 2423 * to the command.
2583 */ 2424 */
2584unicode_t 2425wchar_t
2585rxvt_term::cmd_getc () 2426rxvt_term::cmd_getc () THROW ((class out_of_input))
2586{ 2427{
2587 unicode_t c = next_char (); 2428 wchar_t c = next_char ();
2588 2429
2589 if (c == NOCHAR) 2430 if (c == NOCHAR)
2590 throw out_of_input; 2431 throw out_of_input;
2591 2432
2592 return c; 2433 return c;
2593} 2434}
2594 2435
2595unicode_t 2436uint32_t
2596rxvt_term::cmd_get8 () 2437rxvt_term::cmd_get8 () THROW ((class out_of_input))
2597{ 2438{
2598 unicode_t c = next_octet (); 2439 uint32_t c = next_octet ();
2599 2440
2600 if (c == NOCHAR) 2441 if (c == NOCHAR)
2601 throw out_of_input; 2442 throw out_of_input;
2602 2443
2603 return c; 2444 return c;
… …
2667 { 2508 {
2668 if ((buf[len++] = cmd_getc ()) == 'i') 2509 if ((buf[len++] = cmd_getc ()) == 'i')
2669 break; /* done = 1 */ 2510 break; /* done = 1 */
2670 } 2511 }
2671 } 2512 }
2672 2513
2673 for (i = 0; i < len; i++) 2514 for (i = 0; i < len; i++)
2674 if (putc (buf[i], fd) == EOF) 2515 if (putc (buf[i], fd) == EOF)
2675 { 2516 {
2676 done = 1; 2517 done = 1;
2677 break; 2518 break;
… …
2703 case C0_ESC: 2544 case C0_ESC:
2704 process_escape_seq (); 2545 process_escape_seq ();
2705 break; 2546 break;
2706 case C0_ENQ: /* terminal Status */ 2547 case C0_ENQ: /* terminal Status */
2707 if (rs[Rs_answerbackstring]) 2548 if (rs[Rs_answerbackstring])
2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2549 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2709 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2710 else 2550 else
2711 tt_write ((unsigned char *)VT100_ANS, 2551 tt_write (VT100_ANS, strlen (VT100_ANS));
2712 (unsigned int)STRLEN (VT100_ANS));
2713 break; 2552 break;
2714 case C0_BEL: /* bell */ 2553 case C0_BEL: /* bell */
2715 scr_bell (); 2554 scr_bell ();
2716 break; 2555 break;
2717 case C0_BS: /* backspace */ 2556 case C0_BS: /* backspace */
… …
2816void 2655void
2817rxvt_term::process_escape_seq () 2656rxvt_term::process_escape_seq ()
2818{ 2657{
2819 unicode_t ch = cmd_getc (); 2658 unicode_t ch = cmd_getc ();
2820 2659
2821 if (PrivateModes & PrivMode_vt52) 2660 if (priv_modes & PrivMode_vt52)
2822 { 2661 {
2823 process_escape_vt52 (ch); 2662 process_escape_vt52 (ch);
2824 return; 2663 return;
2825 } 2664 }
2826 2665
… …
2841 scr_charset_set (2, (unsigned int)cmd_getc ()); 2680 scr_charset_set (2, (unsigned int)cmd_getc ());
2842 break; 2681 break;
2843 case '+': 2682 case '+':
2844 scr_charset_set (3, (unsigned int)cmd_getc ()); 2683 scr_charset_set (3, (unsigned int)cmd_getc ());
2845 break; 2684 break;
2846#ifndef NO_FRILLS 2685#if !ENABLE_MINIMAL
2847 case '6': 2686 case '6':
2848 scr_backindex (); 2687 scr_backindex ();
2849 break; 2688 break;
2850#endif 2689#endif
2851 case '7': 2690 case '7':
2852 scr_cursor (SAVE); 2691 scr_cursor (SAVE);
2853 break; 2692 break;
2854 case '8': 2693 case '8':
2855 scr_cursor (RESTORE); 2694 scr_cursor (RESTORE);
2856 break; 2695 break;
2857#ifndef NO_FRILLS 2696#if !ENABLE_MINIMAL
2858 case '9': 2697 case '9':
2859 scr_forwardindex (); 2698 scr_forwardindex ();
2860 break; 2699 break;
2861#endif 2700#endif
2862 case '=': 2701 case '=':
… …
2872 break; 2711 break;
2873 2712
2874 /* 8.3.87: NEXT LINE */ 2713 /* 8.3.87: NEXT LINE */
2875 case C1_NEL: /* ESC E */ 2714 case C1_NEL: /* ESC E */
2876 { 2715 {
2877 unicode_t nlcr[] = { C0_LF, C0_CR }; 2716 wchar_t nlcr[] = { C0_LF, C0_CR };
2878 scr_add_lines (nlcr, 1, 2); 2717 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2879 } 2718 }
2880 break; 2719 break;
2881 2720
2882 /* kidnapped escape sequence: Should be 8.3.48 */ 2721 /* kidnapped escape sequence: Should be 8.3.48 */
2883 case C1_ESA: /* ESC G */ 2722 case C1_ESA: /* ESC G */
… …
2905 process_dcs_seq (); 2744 process_dcs_seq ();
2906 break; 2745 break;
2907 2746
2908 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2747 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2909 case C1_SCI: /* ESC Z */ 2748 case C1_SCI: /* ESC Z */
2910 tt_write ((const unsigned char *)ESCZ_ANSWER, 2749 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2911 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2912 break; /* steal obsolete ESC [ c */ 2750 break; /* steal obsolete ESC [ c */
2913 2751
2914 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2752 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2915 case C1_CSI: /* ESC [ */ 2753 case C1_CSI: /* ESC [ */
2916 process_csi_seq (); 2754 process_csi_seq ();
… …
3025 ndef = get_byte_array_bit (csi_defaults, i); 2863 ndef = get_byte_array_bit (csi_defaults, i);
3026 for (p = 0; p < nargs; p++) 2864 for (p = 0; p < nargs; p++)
3027 if (arg[p] == -1) 2865 if (arg[p] == -1)
3028 arg[p] = ndef; 2866 arg[p] = ndef;
3029 2867
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 /* 2868 /*
3038 * private mode handling 2869 * private mode handling
3039 */ 2870 */
3040 if (priv) 2871 if (priv)
3041 { 2872 {
3042 switch (priv) 2873 switch (priv)
3043 { 2874 {
3044 case '>': 2875 case '>':
3045 if (ch == CSI_DA) /* secondary device attributes */ 2876 if (ch == CSI_DA) /* secondary device attributes */
2877 {
2878 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
2879 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2880 //
2881 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2882 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2883 // that we do not support xterm mouse reporting (should be 95 when we do).
2884 //
3046 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2885 tt_printf ("\033[>%d;94;0c", 'U');
2886 }
3047 break; 2887 break;
3048 case '?': 2888 case '?':
3049 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2889 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3050 process_terminal_mode (ch, priv, nargs, arg); 2890 process_terminal_mode (ch, priv, nargs, arg);
3051 break; 2891 break;
… …
3156 2996
3157 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2997 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3158 arg[0] = -arg[0]; 2998 arg[0] = -arg[0];
3159 /* FALLTHROUGH */ 2999 /* FALLTHROUGH */
3160 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3000 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3161 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3001 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3162 break; 3002 break;
3163 3003
3164 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3004 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3165 tt_write ((const unsigned char *)VT100_ANS, 3005 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3166 (unsigned int) (sizeof (VT100_ANS) - 1));
3167 break; 3006 break;
3168 3007
3169 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3008 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3170 process_sgr_mode (nargs, arg); 3009 process_sgr_mode (nargs, arg);
3171 break; 3010 break;
… …
3178 break; 3017 break;
3179 case 6: /* CPR requested */ 3018 case 6: /* CPR requested */
3180 scr_report_position (); 3019 scr_report_position ();
3181 break; 3020 break;
3182 case 7: /* unofficial extension */ 3021 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure) 3022 if (option (Opt_insecure))
3184 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3023 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3185 break; 3024 break;
3186 case 8: /* unofficial extension */ 3025 case 8: /* unofficial extension */
3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3026 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3188 break; 3027 break;
3189 } 3028 }
… …
3225 break; 3064 break;
3226 3065
3227 case CSI_RM: /* 8.3.107: RESET MODE */ 3066 case CSI_RM: /* 8.3.107: RESET MODE */
3228 if (arg[0] == 4) 3067 if (arg[0] == 4)
3229 scr_insert_mode (0); 3068 scr_insert_mode (0);
3069 else if (arg[0] == 20)
3070 priv_modes &= ~PrivMode_LFNL;
3230 break; 3071 break;
3231 3072
3232 case CSI_SM: /* 8.3.126: SET MODE */ 3073 case CSI_SM: /* 8.3.126: SET MODE */
3233 if (arg[0] == 4) 3074 if (arg[0] == 4)
3234 scr_insert_mode (1); 3075 scr_insert_mode (1);
3076 else if (arg[0] == 20)
3077 priv_modes |= PrivMode_LFNL;
3235 break; 3078 break;
3236 3079
3237 /* 3080 /*
3238 * PRIVATE USE beyond this point. All CSI_7? sequences here 3081 * PRIVATE USE beyond this point. All CSI_7? sequences here
3239 */ 3082 */
… …
3251 break; 3094 break;
3252 case CSI_75: 3095 case CSI_75:
3253 scr_cursor (RESTORE); 3096 scr_cursor (RESTORE);
3254 break; 3097 break;
3255 3098
3256#ifndef NO_FRILLS 3099#if !ENABLE_MINIMAL
3257 case CSI_74: 3100 case CSI_74:
3258 process_window_ops (arg, nargs); 3101 process_window_ops (arg, nargs);
3259 break; 3102 break;
3260#endif 3103#endif
3261 3104
… …
3268 break; 3111 break;
3269 } 3112 }
3270} 3113}
3271/*}}} */ 3114/*}}} */
3272 3115
3273#ifndef NO_FRILLS 3116#if !ENABLE_MINIMAL
3274/* ARGSUSED */ 3117/* ARGSUSED */
3275void 3118void
3276rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3119rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3277{ 3120{
3278 int x, y; 3121 int x, y;
3279 XWindowAttributes wattr; 3122 XWindowAttributes wattr;
3280 Window wdummy; 3123 Window wdummy;
3124
3125 dLocal (Display *, dpy);
3281 3126
3282 if (nargs == 0) 3127 if (nargs == 0)
3283 return; 3128 return;
3284 3129
3285 switch (args[0]) 3130 switch (args[0])
3286 { 3131 {
3287 /* 3132 /*
3288 * commands 3133 * commands
3289 */ 3134 */
3290 case 1: /* deiconify window */ 3135 case 1: /* deiconify window */
3291 XMapWindow (display->display, TermWin.parent[0]); 3136 XMapWindow (dpy, parent[0]);
3292 break; 3137 break;
3293 case 2: /* iconify window */ 3138 case 2: /* iconify window */
3294 XIconifyWindow (display->display, TermWin.parent[0], 3139 XIconifyWindow (dpy, parent[0], display->screen);
3295 DefaultScreen (display->display));
3296 break; 3140 break;
3297 case 3: /* set position (pixels) */ 3141 case 3: /* set position (pixels) */
3298 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3142 XMoveWindow (dpy, parent[0], args[1], args[2]);
3299 break; 3143 break;
3300 case 4: /* set size (pixels) */ 3144 case 4: /* set size (pixels) */
3301 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3145 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3302 break; 3146 break;
3303 case 5: /* raise window */ 3147 case 5: /* raise window */
3304 XRaiseWindow (display->display, TermWin.parent[0]); 3148 XRaiseWindow (dpy, parent[0]);
3305 break; 3149 break;
3306 case 6: /* lower window */ 3150 case 6: /* lower window */
3307 XLowerWindow (display->display, TermWin.parent[0]); 3151 XLowerWindow (dpy, parent[0]);
3308 break; 3152 break;
3309 case 7: /* refresh window */ 3153 case 7: /* refresh window */
3310 scr_touch (true); 3154 scr_touch (true);
3311 break; 3155 break;
3312 case 8: /* set size (chars) */ 3156 case 8: /* set size (chars) */
3313 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3157 set_widthheight ((unsigned int) (args[2] * fwidth),
3314 (unsigned int) (args[1] * TermWin.fheight)); 3158 (unsigned int) (args[1] * fheight));
3315 break; 3159 break;
3316 3160
3317 //case 9: NYI, TODO, restore maximized window or maximize window 3161 //case 9: NYI, TODO, restore maximized window or maximize window
3318 default: 3162 default:
3319 if (args[0] >= 24) /* set height (chars) */ 3163 if (args[0] >= 24) /* set height (chars) */
3320 set_widthheight ((unsigned int)TermWin.width, 3164 set_widthheight ((unsigned int)width,
3321 (unsigned int) (args[1] * TermWin.fheight)); 3165 (unsigned int) (args[1] * fheight));
3322 break; 3166 break;
3323
3324 3167
3325 /* 3168 /*
3326 * reports - some output format copied from XTerm 3169 * reports - some output format copied from XTerm
3327 */ 3170 */
3328 case 11: /* report window state */ 3171 case 11: /* report window state */
3329 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent[0], &wattr);
3330 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3173 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3331 break; 3174 break;
3332 case 13: /* report window position */ 3175 case 13: /* report window position */
3333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3176 XGetWindowAttributes (dpy, parent[0], &wattr);
3334 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3177 XTranslateCoordinates (dpy, parent[0], wattr.root,
3335 -wattr.border_width, -wattr.border_width, 3178 -wattr.border_width, -wattr.border_width,
3336 &x, &y, &wdummy); 3179 &x, &y, &wdummy);
3337 tt_printf ("\033[3;%d;%dt", x, y); 3180 tt_printf ("\033[3;%d;%dt", x, y);
3338 break; 3181 break;
3339 case 14: /* report window size (pixels) */ 3182 case 14: /* report window size (pixels) */
3340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3183 XGetWindowAttributes (dpy, parent[0], &wattr);
3341 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3184 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3342 break; 3185 break;
3343 case 18: /* report text area size (chars) */ 3186 case 18: /* report text area size (chars) */
3344 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3187 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3345 break; 3188 break;
3346 case 19: /* report window size (chars) */ 3189 case 19: /* report window size (chars) */
3347 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3190 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3348 break; 3191 break;
3349 case 20: /* report icon label */ 3192 case 20: /* report icon label */
3350 { 3193 {
3351 char *s; 3194 char *s;
3352 XGetIconName (display->display, TermWin.parent[0], &s); 3195 XGetIconName (dpy, parent[0], &s);
3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3196 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s); 3197 XFree (s);
3355 } 3198 }
3356 break; 3199 break;
3357 case 21: /* report window title */ 3200 case 21: /* report window title */
3358 { 3201 {
3359 char *s; 3202 char *s;
3360 XFetchName (display->display, TermWin.parent[0], &s); 3203 XFetchName (dpy, parent[0], &s);
3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3204 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s); 3205 XFree (s);
3363 } 3206 }
3364 break; 3207 break;
3365 } 3208 }
3366} 3209}
… …
3369/*----------------------------------------------------------------------*/ 3212/*----------------------------------------------------------------------*/
3370/* 3213/*
3371 * get input up until STRING TERMINATOR (or BEL) 3214 * get input up until STRING TERMINATOR (or BEL)
3372 * ends_how is terminator used. returned input must be free()'d 3215 * ends_how is terminator used. returned input must be free()'d
3373 */ 3216 */
3374unsigned char * 3217char *
3375rxvt_term::get_to_st (unicode_t &ends_how) 3218rxvt_term::get_to_st (unicode_t &ends_how)
3376{ 3219{
3377 unicode_t prev = 0, ch; 3220 unicode_t ch;
3221 bool seen_esc = false;
3378 unsigned int n = 0; 3222 unsigned int n = 0;
3379 unsigned char *s;
3380 unsigned char string[STRING_MAX]; 3223 wchar_t string[STRING_MAX];
3381 3224
3382 while ((ch = cmd_getc ()) != NOCHAR) 3225 while ((ch = cmd_getc ()) != NOCHAR)
3383 { 3226 {
3384 if (prev == C0_ESC) 3227 if (seen_esc)
3385 { 3228 {
3386 if (ch == 0x5c) /* 7bit ST */ 3229 if (ch == 0x5c) /* 7bit ST */
3387 break; 3230 break;
3388 else 3231 else
3389 return NULL; 3232 return NULL;
3390 } 3233 }
3234 else if (ch == C0_ESC)
3235 {
3236 seen_esc = true;
3237 continue;
3238 }
3391 else if (ch == C0_BEL || ch == CHAR_ST) 3239 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break; 3240 break;
3241 else if (ch == C0_SYN)
3242 ch = cmd_get8 ();
3393 else if (ch < 0x20) 3243 else if (ch < 0x20)
3394 return NULL; /* other control character - exit */ 3244 return NULL; /* other control character - exit */
3395 3245
3396 if (n >= sizeof (string) - 1) 3246 seen_esc = false;
3247
3248 if (n >= STRING_MAX - 1)
3397 // stop at some sane length 3249 // stop at some sane length
3398 return NULL; 3250 return NULL;
3399 3251
3400 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else
3406 string[n++] = prev = ch; 3252 string[n++] = ch;
3407 } 3253 }
3408 3254
3409 string[n++] = '\0'; 3255 string[n++] = '\0';
3410 3256
3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3412 return NULL;
3413
3414 ends_how = (ch == 0x5c ? C0_ESC : ch); 3257 ends_how = (ch == 0x5c ? C0_ESC : ch);
3415 STRNCPY (s, string, n); 3258
3416 return s; 3259 return rxvt_wcstombs (string);
3417} 3260}
3418 3261
3419/*----------------------------------------------------------------------*/ 3262/*----------------------------------------------------------------------*/
3420/* 3263/*
3421 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3264 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3422 */ 3265 */
3423void 3266void
3424rxvt_term::process_dcs_seq () 3267rxvt_term::process_dcs_seq ()
3425{ 3268{
3426 unsigned char *s; 3269 char *s;
3427 unicode_t eh; 3270 unicode_t eh;
3428 3271
3429 /* 3272 /*
3430 * Not handled yet 3273 * Not handled yet
3431 */ 3274 */
… …
3450 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3293 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3451 arg = arg * 10 + (ch - '0'); 3294 arg = arg * 10 + (ch - '0');
3452 3295
3453 if (ch == ';') 3296 if (ch == ';')
3454 { 3297 {
3455 unsigned char *s = get_to_st (eh); 3298 char *s = get_to_st (eh);
3456 3299
3457 if (s) 3300 if (s)
3458 { 3301 {
3459 process_xterm_seq (arg, (char *)s, eh); 3302 process_xterm_seq (arg, s, eh);
3460 free (s); 3303 free (s);
3461 } 3304 }
3462 } 3305 }
3463} 3306}
3464 3307
3465void 3308void
3466rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3309rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3467{ 3310{
3468 if (str[0] == '?' && !str[1]) 3311 if (str[0] == '?' && !str[1])
3469 { 3312 {
3470 unsigned short r, g, b; 3313 rgba c;
3471 PixColorsFocused[color].get (display, r, g, b); 3314 pix_colors_focused[color].get (c);
3315
3316#if XFT
3317 if (c.a != rgba::MAX_CC)
3318 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3319 else
3320#endif
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3321 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3473 } 3322 }
3474 else 3323 else
3475 set_window_color (color, str); 3324 set_window_color (color, str);
3476} 3325}
3477 3326
3478/* 3327/*
3479 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3328 * 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 */ 3329 */
3503void 3330void
3504rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3331rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3505{ 3332{
3506 int changed = 0;
3507 int color; 3333 int color;
3508 char *buf, *name; 3334 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1]; 3335 bool query = str[0] == '?' && !str[1];
3336 int saveop = op;
3337
3338 dLocal (Display *, dpy);
3510 3339
3511 assert (str != NULL); 3340 assert (str != NULL);
3341
3342 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3343 return;
3344
3512 switch (op) 3345 switch (op)
3513 { 3346 {
3514 case XTerm_name: 3347 case XTerm_name:
3515 set_title (str); 3348 set_title (str);
3516 /* FALLTHROUGH */ 3349 /* FALLTHROUGH */
… …
3521 set_title (str); 3354 set_title (str);
3522 break; 3355 break;
3523 case XTerm_property: 3356 case XTerm_property:
3524 if (str[0] == '?') 3357 if (str[0] == '?')
3525 { 3358 {
3526 Atom prop = XInternAtom (display->display, str + 1, True); 3359 Atom prop = display->atom (str + 1);
3527 Atom actual_type; 3360 Atom actual_type;
3528 int actual_format; 3361 int actual_format;
3529 unsigned long nitems; 3362 unsigned long nitems;
3530 unsigned long bytes_after; 3363 unsigned long bytes_after;
3531 unsigned char *value = 0; 3364 unsigned char *value = 0;
3532 const char *str = ""; 3365 const char *str = "";
3533 3366
3534 if (prop 3367 if (prop
3535 && XGetWindowProperty (display->display, TermWin.parent[0], 3368 && XGetWindowProperty (dpy, parent[0],
3536 prop, 0, 1<<16, 0, AnyPropertyType, 3369 prop, 0, 1<<16, 0, AnyPropertyType,
3537 &actual_type, &actual_format, 3370 &actual_type, &actual_format,
3538 &nitems, &bytes_after, &value) == Success 3371 &nitems, &bytes_after, &value) == Success
3539 && actual_type != None 3372 && actual_type != None
3540 && actual_format == 8) 3373 && actual_format == 8)
3541 str = (const char *)(value); 3374 str = (const char *)(value);
3542 3375
3543 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3376 tt_printf ("\033]%d;%s%c", op, str, resp);
3544 3377
3545 XFree (value); 3378 XFree (value);
3546 } 3379 }
3547 else 3380 else
3548 { 3381 {
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550 3383
3551 if (eq) 3384 if (eq)
3552 { 3385 {
3553 *eq = 0; 3386 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0], 3387 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 } 3388 }
3559 else 3389 else
3560 XDeleteProperty (display->display, TermWin.parent[0], 3390 XDeleteProperty (dpy, parent[0],
3561 display->atom (str)); 3391 display->atom (str));
3562 } 3392 }
3563 break; 3393 break;
3564 3394
3565 case XTerm_Color: 3395 case XTerm_Color:
3566 for (buf = (char *)str; buf && *buf;) 3396 for (buf = (char *)str; buf && *buf;)
3567 { 3397 {
3568 if ((name = STRCHR (buf, ';')) == NULL) 3398 if ((name = strchr (buf, ';')) == NULL)
3569 break; 3399 break;
3570 3400
3571 *name++ = '\0'; 3401 *name++ = '\0';
3572 color = atoi (buf); 3402 color = atoi (buf) + minCOLOR;
3573 3403
3574 if (color < 0 || color >= TOTAL_COLORS) 3404 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3575 break; 3405 break;
3576 3406
3577 if ((buf = STRCHR (name, ';')) != NULL) 3407 if ((buf = strchr (name, ';')) != NULL)
3578 *buf++ = '\0'; 3408 *buf++ = '\0';
3579 3409
3580 if (name[0] == '?' && !name[1]) 3410 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 } 3411 }
3589 break; 3412 break;
3590 case XTerm_Color00: 3413 case XTerm_Color00:
3591 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3414 process_color_seq (op, Color_fg, str, resp);
3592 break; 3415 break;
3593 case XTerm_Color01: 3416 case XTerm_Color01:
3594 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3417 process_color_seq (op, Color_bg, str, resp);
3595 break; 3418 break;
3596#ifndef NO_CURSORCOLOR 3419#ifndef NO_CURSORCOLOR
3597 case XTerm_Color_cursor: 3420 case XTerm_Color_cursor:
3598 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3421 process_color_seq (op, Color_cursor, str, resp);
3599 break; 3422 break;
3600#endif 3423#endif
3601 case XTerm_Color_pointer_fg: 3424 case XTerm_Color_pointer_fg:
3602 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3603 break; 3426 break;
3604 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3605 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3606 break; 3429 break;
3607#ifndef NO_BOLD_UNDERLINE_REVERSE 3430#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: 3431 case XTerm_Color_RV:
3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3432 process_color_seq (op, Color_RV, str, resp);
3616 break; 3433 break;
3434 case Rxvt_Color_BD:
3435 case URxvt_Color_BD:
3436 process_color_seq (op, Color_BD, str, resp);
3437 break;
3438 case Rxvt_Color_UL:
3439 case URxvt_Color_UL:
3440 process_color_seq (op, Color_UL, str, resp);
3441 break;
3442 case URxvt_Color_IT:
3443 process_color_seq (op, Color_IT, str, resp);
3444 break;
3617#endif 3445#endif
3446#if TRANSPARENT && TINTING
3447 case URxvt_Color_tint:
3448 process_color_seq (op, Color_tint, str, resp);
3618 3449
3450 check_our_parents ();
3451
3452 if (am_transparent)
3453 want_full_refresh = want_refresh = 1;
3454
3455 break;
3456#endif
3457
3619 case XTerm_Pixmap: 3458 case Rxvt_Pixmap:
3459 {
3620 if (*str != ';') 3460 if (*str != ';')
3621 { 3461 {
3622#if XPM_BACKGROUND 3462#if XPM_BACKGROUND
3623 scale_pixmap (""); /* reset to default scaling */ 3463 scale_pixmap (""); /* reset to default scaling */
3624 set_bgPixmap (str); /* change pixmap */ 3464 set_bgPixmap (str); /* change pixmap */
3625#endif
3626 scr_touch (true); 3465 scr_touch (true);
3466#endif
3627 } 3467 }
3468
3469 int changed = 0;
3470
3628 while ((str = STRCHR (str, ';')) != NULL) 3471 while ((str = strchr (str, ';')) != NULL)
3629 { 3472 {
3630 str++; 3473 str++;
3631#if XPM_BACKGROUND 3474#if XPM_BACKGROUND
3632 changed += scale_pixmap (str); 3475 changed += scale_pixmap (str);
3633#endif 3476#endif
3634
3635 } 3477 }
3478
3636 if (changed) 3479 if (changed)
3637 { 3480 {
3638#ifdef XPM_BACKGROUND 3481#ifdef XPM_BACKGROUND
3639 resize_pixmap (); 3482 resize_pixmap ();
3640#endif
3641 scr_touch (true); 3483 scr_touch (true);
3484#endif
3642 } 3485 }
3486#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3487 if (option (Opt_transparent))
3488 check_our_parents ();
3489#endif
3490 }
3643 break; 3491 break;
3644 3492
3645 case XTerm_restoreFG: 3493 case Rxvt_restoreFG:
3646 set_window_color (Color_fg, str); 3494 set_window_color (Color_fg, str);
3647 break; 3495 break;
3648 case XTerm_restoreBG: 3496 case Rxvt_restoreBG:
3649 set_window_color (Color_bg, str); 3497 set_window_color (Color_bg, str);
3650 break; 3498 break;
3651 3499
3652 case XTerm_logfile: 3500 case XTerm_logfile:
3653 // TODO, when secure mode? 3501 // TODO, when secure mode?
3654 break; 3502 break;
3655 3503
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 3504#if 0
3697 case XTerm_dumpscreen: /* no error notices */ 3505 case Rxvt_dumpscreen: /* no error notices */
3698 { 3506 {
3699 int fd; 3507 int fd;
3700 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3508 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3701 { 3509 {
3702 scr_dump (fd); 3510 scr_dump (fd);
3703 close (fd); 3511 close (fd);
3704 } 3512 }
3705 } 3513 }
3514 break;
3515#endif
3516 case XTerm_font:
3517 op = URxvt_font;
3518 case URxvt_font:
3519#if ENABLE_STYLES
3520 case URxvt_boldFont:
3521 case URxvt_italicFont:
3522 case URxvt_boldItalicFont:
3523#endif
3524 if (query)
3525 tt_printf ("\33]%d;%-.250s%c", saveop,
3526 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3527 ? fontset[op - URxvt_font]->fontdesc : "",
3528 resp);
3529 else
3530 {
3531 const char *&res = rs[Rs_font + (op - URxvt_font)];
3532
3533 res = strdup (str);
3534 allocated.push_back ((void *)res);
3535 set_fonts ();
3536 }
3537 break;
3538
3539 case URxvt_version:
3540 if (query)
3541 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3542 op,
3543 rs[Rs_name], VERSION[0], VERSION[2],
3544 resp);
3545 break;
3546
3547#if !ENABLE_MINIMAL
3548 case URxvt_locale:
3549 if (query)
3550 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3551 else
3552 {
3553 set_locale (str);
3554 pty->set_utf8_mode (enc_utf8);
3555 init_xlocale ();
3556 }
3557 break;
3558
3559 case URxvt_view_up:
3560 case URxvt_view_down:
3561 {
3562 int lines = atoi (str);
3563
3564 if (lines)
3565 scr_page (op == URxvt_view_up ? UP : DN, lines);
3566 else
3567 scr_erase_savelines ();
3568 }
3569
3570 break;
3571#endif
3572
3573#if ENABLE_PERL
3574 case URxvt_perl:
3575 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3576 ; // no responses yet
3706 break; 3577 break;
3707#endif 3578#endif
3708 } 3579 }
3709} 3580}
3710/*----------------------------------------------------------------------*/ 3581/*----------------------------------------------------------------------*/
… …
3724{ 3595{
3725 int state; 3596 int state;
3726 3597
3727 if (mode == 's') 3598 if (mode == 's')
3728 { 3599 {
3729 SavedModes |= (PrivateModes & bit); 3600 SavedModes |= (priv_modes & bit);
3730 return -1; 3601 return -1;
3731 } 3602 }
3732 else 3603 else
3733 { 3604 {
3734 if (mode == 'r') 3605 if (mode == 'r')
3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3606 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3736 else 3607 else
3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3608 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3738 PrivMode (state, bit); 3609 PrivMode (state, bit);
3739 } 3610 }
3740 3611
3741 return state; 3612 return state;
3742} 3613}
3743 3614
3744/* we're not using priv _yet_ */ 3615/* we're not using priv _yet_ */
3745void 3616void
3746rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3617rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3747{ 3618{
3748 unsigned int i, j; 3619 unsigned int i, j;
3749 int state; 3620 int state;
3750 3621
3751 static const struct 3622 static const struct
… …
3760 { 3, PrivMode_132 }, 3631 { 3, PrivMode_132 },
3761 { 4, PrivMode_smoothScroll }, 3632 { 4, PrivMode_smoothScroll },
3762 { 5, PrivMode_rVideo }, 3633 { 5, PrivMode_rVideo },
3763 { 6, PrivMode_relOrigin }, 3634 { 6, PrivMode_relOrigin },
3764 { 7, PrivMode_Autowrap }, 3635 { 7, PrivMode_Autowrap },
3636 // 8, bi-directional support mode
3765 { 9, PrivMode_MouseX10 }, 3637 { 9, PrivMode_MouseX10 },
3766#ifdef menuBar_esc 3638 // 18, 19 printing-related
3767 { menuBar_esc, PrivMode_menuBar }, 3639 { 25, PrivMode_VisibleCursor },
3768#endif
3769#ifdef scrollBar_esc 3640#ifdef scrollBar_esc
3770 { scrollBar_esc, PrivMode_scrollBar }, 3641 { scrollBar_esc, PrivMode_scrollBar },
3771#endif 3642#endif
3772 // 18, 19 printing-related
3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3775 { 35, PrivMode_ShiftKeys }, // rxvt extension 3643 { 35, PrivMode_ShiftKeys }, // rxvt extension
3776 { 40, PrivMode_132OK }, 3644 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI 3645 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI 3646 // 45 margin bell NYI
3779 // 46 start logging 3647 // 46 start logging
… …
3819 } 3687 }
3820 3688
3821 /* extra handling for values with state unkept */ 3689 /* extra handling for values with state unkept */
3822 switch (arg[i]) 3690 switch (arg[i])
3823 { 3691 {
3692#if ENABLE_STYLES
3693 case 1021:
3694 set_option (Opt_intensityStyles, mode);
3695
3696 scr_touch (true);
3697 break;
3698#endif
3824 case 1048: /* alternative cursor save */ 3699 case 1048: /* alternative cursor save */
3700 case 1049:
3825 if (Options & Opt_secondaryScreen) 3701 if (option (Opt_secondaryScreen))
3826 if (mode == 0) 3702 if (mode == 0)
3827 scr_cursor (RESTORE); 3703 scr_cursor (RESTORE);
3828 else if (mode == 1) 3704 else if (mode == 1)
3829 scr_cursor (SAVE); 3705 scr_cursor (SAVE);
3830 break; 3706 break;
… …
3841 * within VT52 mode 3717 * within VT52 mode
3842 */ 3718 */
3843 PrivMode (1, PrivMode_vt52); 3719 PrivMode (1, PrivMode_vt52);
3844 break; 3720 break;
3845 case 3: /* 80/132 */ 3721 case 3: /* 80/132 */
3846 if (PrivateModes & PrivMode_132OK) 3722 if (priv_modes & PrivMode_132OK)
3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3723 set_widthheight (((state ? 132 : 80) * fwidth), height);
3848 break; 3724 break;
3849 case 4: /* smooth scrolling */ 3725 case 4: /* smooth scrolling */
3850 if (state) 3726 set_option (Opt_jumpScroll, !state);
3851 Options &= ~Opt_jumpScroll;
3852 else
3853 Options |= Opt_jumpScroll;
3854 break; 3727 break;
3855 case 5: /* reverse video */ 3728 case 5: /* reverse video */
3856 scr_rvideo_mode (state); 3729 scr_rvideo_mode (state);
3857 break; 3730 break;
3858 case 6: /* relative/absolute origins */ 3731 case 6: /* relative/absolute origins */
… …
3862 scr_autowrap (state); 3735 scr_autowrap (state);
3863 break; 3736 break;
3864 /* case 8: - auto repeat, can't do on a per window basis */ 3737 /* case 8: - auto repeat, can't do on a per window basis */
3865 case 9: /* X10 mouse reporting */ 3738 case 9: /* X10 mouse reporting */
3866 if (state) /* orthogonal */ 3739 if (state) /* orthogonal */
3867 PrivateModes &= ~PrivMode_MouseX11; 3740 priv_modes &= ~PrivMode_MouseX11;
3868 break; 3741 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 3742#ifdef scrollBar_esc
3877 case scrollBar_esc: 3743 case scrollBar_esc:
3878 if (scrollbar_mapping (state)) 3744 if (scrollbar_mapping (state))
3879 { 3745 {
3880 resize_all_windows (0, 0, 0); 3746 resize_all_windows (0, 0, 0);
… …
3892 break; 3758 break;
3893 /* case 66: - application key pad */ 3759 /* case 66: - application key pad */
3894 /* case 67: - backspace key */ 3760 /* case 67: - backspace key */
3895 case 1000: /* X11 mouse reporting */ 3761 case 1000: /* X11 mouse reporting */
3896 if (state) /* orthogonal */ 3762 if (state) /* orthogonal */
3897 PrivateModes &= ~PrivMode_MouseX10; 3763 priv_modes &= ~PrivMode_MouseX10;
3898 break; 3764 break;
3899#if 0 3765#if 0
3900 case 1001: 3766 case 1001:
3901 break; /* X11 mouse highlighting */ 3767 break; /* X11 mouse highlighting */
3902#endif 3768#endif
3903 case 1010: /* scroll to bottom on TTY output inhibit */ 3769 case 1010: /* scroll to bottom on TTY output inhibit */
3904 if (state)
3905 Options &= ~Opt_scrollTtyOutput;
3906 else
3907 Options |= Opt_scrollTtyOutput; 3770 set_option (Opt_scrollTtyOutput, !state);
3908 break; 3771 break;
3909 case 1011: /* scroll to bottom on key press */ 3772 case 1011: /* scroll to bottom on key press */
3910 if (state)
3911 Options |= Opt_scrollTtyKeypress; 3773 set_option (Opt_scrollTtyKeypress, state);
3912 else
3913 Options &= ~Opt_scrollTtyKeypress;
3914 break; 3774 break;
3915 case 1047: /* secondary screen w/ clearing last */ 3775 case 1047: /* secondary screen w/ clearing last */
3916 if (Options & Opt_secondaryScreen) 3776 if (option (Opt_secondaryScreen))
3917 if (current_screen != PRIMARY) 3777 if (current_screen != PRIMARY)
3918 scr_erase_screen (2); 3778 scr_erase_screen (2);
3919 scr_change_screen (state); 3779 scr_change_screen (state);
3920 break; 3780 break;
3921 case 1049: /* secondary screen w/ clearing first */ 3781 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state); 3782 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen) 3783 if (option (Opt_secondaryScreen))
3924 if (current_screen != PRIMARY) 3784 if (current_screen != PRIMARY)
3925 scr_erase_screen (2); 3785 scr_erase_screen (2);
3926 break; 3786 break;
3927 default: 3787 default:
3928 break; 3788 break;
… …
3954 rendset = 0, rendstyle = ~RS_None; 3814 rendset = 0, rendstyle = ~RS_None;
3955 break; 3815 break;
3956 case 1: 3816 case 1:
3957 rendset = 1, rendstyle = RS_Bold; 3817 rendset = 1, rendstyle = RS_Bold;
3958 break; 3818 break;
3959 //case 2: // faint or second colour 3819 //case 2: // low intensity
3820 case 3:
3821 rendset = 1, rendstyle = RS_Italic;
3822 break;
3960 case 4: 3823 case 4:
3961 rendset = 1, rendstyle = RS_Uline; 3824 rendset = 1, rendstyle = RS_Uline;
3962 break; 3825 break;
3963 case 5: // slowly blinking 3826 case 5: // slowly blinking
3964 case 6: // rapidly blinking 3827 case 6: // rapidly blinking
… …
3976 //case 11: // scoansi acs on, first alt font 3839 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font 3840 //case 12: // scoansi acs on, |0x80, second alt font
3978 //... 3841 //...
3979 //case 19: // ninth alt font 3842 //case 19: // ninth alt font
3980 //case 20: // gothic 3843 //case 20: // gothic
3981 case 21: // disable bold, faint 3844 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3982 rendset = 0, rendstyle = RS_Bold; 3845 rendset = 0, rendstyle = RS_Bold;
3983 break; 3846 break;
3984 case 22: 3847 case 22: // normal intensity
3985 rendset = 0, rendstyle = RS_Bold; 3848 rendset = 0, rendstyle = RS_Bold;
3986 break; 3849 break;
3987 //case 23: disable italic 3850 case 23: // disable italic
3851 rendset = 0, rendstyle = RS_Italic;
3852 break;
3988 case 24: 3853 case 24:
3989 rendset = 0, rendstyle = RS_Uline; 3854 rendset = 0, rendstyle = RS_Uline;
3990 break; 3855 break;
3991 case 25: 3856 case 25:
3857 rendset = 0, rendstyle = RS_Blink;
3858 break;
3859 case 26: // variable spacing (iso 8613)
3992 rendset = 0, rendstyle = RS_Blink; 3860 rendset = 0, rendstyle = RS_Blink;
3993 break; 3861 break;
3994 case 27: 3862 case 27:
3995 rendset = 0, rendstyle = RS_RVid; 3863 rendset = 0, rendstyle = RS_RVid;
3996 break; 3864 break;
… …
4014 case 35: 3882 case 35:
4015 case 36: 3883 case 36:
4016 case 37: 3884 case 37:
4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3885 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4018 break; 3886 break;
4019#ifdef TTY_256COLOR 3887 case 38: // set fg color, ISO 8613-6
4020 case 38:
4021 if (nargs > i + 2 && arg[i + 1] == 5) 3888 if (nargs > i + 2 && arg[i + 1] == 5)
4022 { 3889 {
4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3890 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4024 i += 2; 3891 i += 2;
4025 } 3892 }
4026 break; 3893 break;
4027#endif
4028 case 39: /* default fg */ 3894 case 39: /* default fg */
4029 scr_color (Color_fg, Color_fg); 3895 scr_color (Color_fg, Color_fg);
4030 break; 3896 break;
4031 3897
4032 case 40: 3898 case 40:
… …
4037 case 45: 3903 case 45:
4038 case 46: 3904 case 46:
4039 case 47: 3905 case 47:
4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3906 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4041 break; 3907 break;
4042#ifdef TTY_256COLOR 3908 case 48: // set bg color, ISO 8613-6
4043 case 48:
4044 if (nargs > i + 2 && arg[i + 1] == 5) 3909 if (nargs > i + 2 && arg[i + 1] == 5)
4045 { 3910 {
4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3911 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4047 i += 2; 3912 i += 2;
4048 } 3913 }
4049 break; 3914 break;
4050#endif
4051 case 49: /* default bg */ 3915 case 49: /* default bg */
4052 scr_color (Color_bg, Color_bg); 3916 scr_color (Color_bg, Color_bg);
4053 break; 3917 break;
4054 3918
4055#ifndef NO_BRIGHTCOLOR 3919 //case 50: // not variable spacing
3920
3921#if !ENABLE_MINIMAL
4056 case 90: 3922 case 90:
4057 case 91: /* set bright fg color */ 3923 case 91: /* set bright fg color */
4058 case 92: 3924 case 92:
4059 case 93: 3925 case 93:
4060 case 94: 3926 case 94:
4061 case 95: 3927 case 95:
4062 case 96: 3928 case 96:
4063 case 97: 3929 case 97:
4064 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3930 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4065 Color_fg);
4066 break; 3931 break;
4067 case 100: 3932 case 100:
4068 case 101: /* set bright bg color */ 3933 case 101: /* set bright bg color */
4069 case 102: 3934 case 102:
4070 case 103: 3935 case 103:
4071 case 104: 3936 case 104:
4072 case 105: 3937 case 105:
4073 case 106: 3938 case 106:
4074 case 107: 3939 case 107:
4075 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3940 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4076 Color_bg);
4077 break; 3941 break;
4078#endif 3942#endif
4079
4080 } 3943 }
4081 } 3944 }
4082} 3945}
4083/*}}} */ 3946/*}}} */
4084 3947
… …
4088{ 3951{
4089 unicode_t ch, cmd = cmd_getc (); 3952 unicode_t ch, cmd = cmd_getc ();
4090 3953
4091 if (cmd == 'Q') 3954 if (cmd == 'Q')
4092 { /* query graphics */ 3955 { /* query graphics */
4093 tt_printf ("\033G0\n"); /* no graphics */ 3956 tt_printf ("\033G0\012"); /* no graphics */
4094 return; 3957 return;
4095 } 3958 }
4096 /* swallow other graphics sequences until terminating ':' */ 3959 /* swallow other graphics sequences until terminating ':' */
4097 do 3960 do
4098 ch = cmd_getc (); 3961 ch = cmd_getc ();
… …
4108 */ 3971 */
4109void 3972void
4110rxvt_term::tt_printf (const char *fmt,...) 3973rxvt_term::tt_printf (const char *fmt,...)
4111{ 3974{
4112 va_list arg_ptr; 3975 va_list arg_ptr;
4113 unsigned char buf[256]; 3976 char buf[256];
4114 3977
4115 va_start (arg_ptr, fmt); 3978 va_start (arg_ptr, fmt);
4116 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3979 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4117 va_end (arg_ptr); 3980 va_end (arg_ptr);
4118 tt_write (buf, STRLEN (buf)); 3981 tt_write (buf, strlen (buf));
4119} 3982}
4120 3983
4121/* ---------------------------------------------------------------------- */ 3984/* ---------------------------------------------------------------------- */
4122/* Write data to the pty as typed by the user, pasted with the mouse, 3985/* 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. 3986 * or generated by us in response to a query ESC sequence.
4124 */ 3987 */
3988const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3989
4125void 3990void
4126rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3991rxvt_term::tt_write (const char *data, unsigned int len)
4127{ 3992{
4128 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3993 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3994 return;
4129 3995
4130 if (len) 3996 if (pty->pty < 0)
3997 return;
3998
3999 if (v_buflen == 0)
4000 {
4001 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4002
4003 if ((unsigned int)written == len)
4004 return;
4005
4006 data += written;
4007 len -= written;
4131 { 4008 }
4009
4010 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4011
4012 memcpy (v_buffer + v_buflen, data, len);
4013 v_buflen += len;
4014
4015 pty_ev.set (EVENT_READ | EVENT_WRITE);
4016}
4017
4018void rxvt_term::pty_write ()
4019{
4020 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4021
4022 if (written > 0)
4023 {
4024 v_buflen -= written;
4025
4132 if (v_buflen == 0) 4026 if (v_buflen == 0)
4133 { 4027 {
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); 4028 free (v_buffer);
4161 v_buffer = 0; 4029 v_buffer = 0;
4162 v_buflen = 0; 4030 v_buflen = 0;
4163 4031
4164 pty_ev.set (EVENT_READ); 4032 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; 4033 return;
4177 } 4034 }
4035
4036 memmove (v_buffer, v_buffer + written, v_buflen);
4178 } 4037 }
4038 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4039 pty_ev.set (EVENT_READ);
4179} 4040}
4180 4041
4181/*----------------------- end-of-file (C source) -----------------------*/ 4042/*----------------------- end-of-file (C source) -----------------------*/
4182 4043

Diff Legend

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