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.347 by sasha, Wed Aug 15 22:41:52 2007 UTC

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

Diff Legend

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