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

Diff Legend

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