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

Diff Legend

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