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

Diff Legend

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