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

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

Diff Legend

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