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.57 by pcg, Tue Feb 24 16:25:44 2004 UTC vs.
Revision 1.277 by root, Fri Jan 20 12:16:28 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
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>
7 * - original version 7 * - original version
… …
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
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
53#include <wchar.h> 56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE
60# include "keyboard.h"
61#endif
62
63#include <csignal>
54 64
55/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69#if ENABLE_FRILLS || ISO_14755
70
71#define ISO_14755_STARTED 0x80000000UL
72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
73#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
74#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
75#define ISO_14755_MASK 0x0fffffffUL
76
77#if ISO_14755
78static unsigned short iso14755_symtab[] = {
79 // keysym, unicode
80 XK_Left, 0x2190,
81 XK_KP_Left, 0x2190,
82 XK_Up, 0x2191,
83 XK_KP_Up, 0x2191,
84 XK_Right, 0x2192,
85 XK_KP_Right, 0x2192,
86 XK_Down, 0x2193,
87 XK_KP_Down, 0x2193,
88 XK_Linefeed, 0x21b4,
89 XK_Return, 0x21b5,
90 XK_KP_Enter, 0x21b5,
91
92 XK_Prior, 0x21de,
93 XK_Next, 0x21df,
94 XK_Tab, 0x21e5,
95 XK_ISO_Left_Tab, 0x21e6,
96 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7,
98
99 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0,
107 XK_Home, 0x21f1,
108 XK_End, 0x21f2,
109
110 XK_Execute, 0x2318,
111 XK_Begin, 0x2320,
112 XK_Delete, 0x2326,
113 XK_Clear, 0x2327,
114 XK_BackSpace, 0x232b,
115 XK_Insert, 0x2380,
116 XK_Control_L, 0x2388,
117 XK_Control_R, 0x2388,
118 XK_Pause, 0x2389,
119 XK_Break, 0x238a,
120 XK_Escape, 0x238b,
121 XK_Undo, 0x238c,
122 XK_Print, 0x2399,
123
124 XK_space, 0x2423,
125
126#ifdef XK_KP_Begin
127 XK_KP_Prior, 0x21de,
128 XK_KP_Next, 0x21df,
129 XK_KP_Begin, 0x2320,
130 XK_KP_Insert, 0x2380,
131 XK_KP_Delete, 0x2326,
132 XK_KP_Space, 0x2422,
133#endif
134 0,
135};
136
137void
138rxvt_term::iso14755_54 (int x, int y)
139{
140 x = Pixel2Col (x);
141 y = Pixel2Row (y);
142
143 if (!IN_RANGE_EXC (x, 0, ncol)
144 || !IN_RANGE_EXC (y, 0, nrow))
145 return;
146
147 for (;;)
148 {
149 const line_t &l = ROW(y + view_start);
150
151 text_t t = l.t[x];
152
153 if (t != NOCHAR || !x)
154 {
155 iso14755_51 (l.t[x], l.r[x], x, y);
156 iso14755buf = ISO_14755_54;
157 break;
158 }
159
160 x--;
161 }
162}
163
164void
165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
166{
167 rxvt_fontset *fs = FONTSET (r);
168 rxvt_font *f = (*fs)[fs->find_font (ch)];
169 wchar_t *chr, *alloc, ch2, *fname;
170 int len;
171
172 fname = rxvt_utf8towcs (f->name);
173
174# if ENABLE_COMBINING
175 if (IS_COMPOSE (ch))
176 {
177 len = rxvt_composite.expand (ch, 0);
178 alloc = chr = new wchar_t[len];
179 rxvt_composite.expand (ch, chr);
180 }
181 else
182# endif
183 {
184 ch2 = ch;
185
186 alloc = 0;
187 chr = &ch2;
188 len = 1;
189 }
190
191 char attr[80]; // plenty
192
193 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
194 (int)r,
195 fgcolor_of (r), bgcolor_of (r),
196 r & RS_Bold ? " bold" : "",
197 r & RS_Italic ? " italic" : "",
198 r & RS_Blink ? " blink" : "",
199 r & RS_RVid ? " rvid" : "",
200 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : "");
202
203 int width = wcswidth (fname, wcslen (fname));
204
205 max_it (width, 8+5); // for char + hey
206 max_it (width, strlen (attr));
207
208 if (y >= 0)
209 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
211 x = 0;
212 }
213
214 scr_overlay_new (x, y, width, len + 2);
215
216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
217
218 for (int y = 0; y < len; y++)
219 {
220 char buf[9];
221
222 ch = *chr++;
223
224 sprintf (buf, "%8x", ch);
225 scr_overlay_set (0, y, buf);
226 scr_overlay_set (9, y, '=');
227# if !UNICODE3
228 if (ch >= 0x10000)
229 ch = 0xfffd;
230# endif
231 scr_overlay_set (11, y, ch, r);
232 scr_overlay_set (12, y, NOCHAR, r);
233 }
234
235 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname);
237
238 free (fname);
239
240# if ENABLE_COMBINING
241 if (alloc)
242 delete [] alloc;
243# endif
244}
245#endif
246
247void
248rxvt_term::commit_iso14755 ()
249{
250 wchar_t ch[2];
251
252 ch[0] = iso14755buf & ISO_14755_MASK;
253 ch[1] = 0;
254
255 if (iso14755buf & ISO_14755_51)
256 {
257 char mb[16];
258 int len;
259
260 // allow verbatim 0-bytes and control-bytes to be entered
261 if (ch[0] >= 0x20)
262 len = wcstombs (mb, ch, 16);
263 else
264 {
265 mb[0] = ch[0];
266 len = 1;
267 }
268
269 if (len > 0)
270 tt_write (mb, len);
271 else
272 scr_bell ();
273 }
274
275 iso14755buf = 0;
276}
277
278int
279rxvt_term::hex_keyval (XKeyEvent &ev)
280{
281 // check wether this event corresponds to a hex digit
282 // if the modifiers had not been pressed.
283 for (int index = 0; index < 8; index++)
284 {
285 KeySym k = XLookupKeysym (&ev, index);
286
287 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
288 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
289 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
290 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
291 }
292
293 return -1;
294}
295#endif
56 296
57/*{{{ Convert the keypress event into a string */ 297/*{{{ Convert the keypress event into a string */
58void 298void
59rxvt_term::lookup_key (XKeyEvent &ev) 299rxvt_term::lookup_key (XKeyEvent &ev)
60{ 300{
… …
63 KeySym keysym; 303 KeySym keysym;
64#ifdef DEBUG_CMD 304#ifdef DEBUG_CMD
65 static int debug_key = 1; /* accessible by a debugger only */ 305 static int debug_key = 1; /* accessible by a debugger only */
66#endif 306#endif
67 int valid_keysym; 307 int valid_keysym;
68 unsigned char kbuf[KBUFSZ]; 308 char kbuf[KBUFSZ];
69 309
70 /* 310 /*
71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
72 * escape sequence to toggle the Keypad. 312 * escape sequence to toggle the Keypad.
73 * 313 *
74 * Always permit `shift' to override the current setting 314 * Always permit `shift' to override the current setting
75 */ 315 */
76 shft = (ev.state & ShiftMask); 316 shft = ev.state & ShiftMask;
77 ctrl = (ev.state & ControlMask); 317 ctrl = ev.state & ControlMask;
78 meta = (ev.state & ModMetaMask); 318 meta = ev.state & ModMetaMask;
79 319
80 if (numlock_state || (ev.state & ModNumLockMask)) 320 if (numlock_state || (ev.state & ModNumLockMask))
81 { 321 {
82 numlock_state = (ev.state & ModNumLockMask); 322 numlock_state = (ev.state & ModNumLockMask);
83 PrivMode ((!numlock_state), PrivMode_aplKP); 323 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
88#ifdef USE_XIM 328#ifdef USE_XIM
89 if (Input_Context) 329 if (Input_Context)
90 { 330 {
91 Status status_return; 331 Status status_return;
92 332
333#if 0
93#ifdef X_HAVE_UTF8_STRING 334#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 335 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 336 len = Xutf8LookupString (Input_Context, &ev, kbuf,
96 KBUFSZ, &keysym, &status_return); 337 KBUFSZ, &keysym, &status_return);
97 else 338 else
339#endif
98#endif 340#endif
99 { 341 {
100 wchar_t wkbuf[KBUFSZ + 1]; 342 wchar_t wkbuf[KBUFSZ + 1];
101 343
102 // the XOpenIM manpage lies about hardcoding the locale 344 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 345 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 346 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 347 SET_LOCALE (rs[Rs_imLocale]);
348
106 // assume wchar_t == unicode or better 349 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, &ev, wkbuf, 350 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 351 KBUFSZ, &keysym, &status_return);
352
109 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 354 SET_LOCALE (locale);
111 355
112 if (status_return == XLookupChars 356 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 357 || status_return == XLookupBoth)
… …
134 || status_return == XLookupBoth; 378 || status_return == XLookupBoth;
135 } 379 }
136 else 380 else
137#endif 381#endif
138 { 382 {
139 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 383 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
140 valid_keysym = keysym != NoSymbol; 384 valid_keysym = keysym != NoSymbol;
141 } 385 }
142 386
143 if (valid_keysym) 387 if (valid_keysym)
144 { 388 {
145 /* for some backwards compatibility */ 389#ifdef KEYSYM_RESOURCE
146#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 390 if (keyboard->dispatch (this, keysym, ev.state))
147# ifdef HOTKEY_CTRL 391 return;
148 if (ctrl)
149# else
150 if (meta)
151# endif 392#endif
152 {
153 if (keysym == ks_bigfont)
154 {
155 change_font (FONT_UP);
156 return;
157 }
158 else if (keysym == ks_smallfont)
159 {
160 change_font (FONT_DN);
161 return;
162 }
163 }
164#endif
165 393
166 if (TermWin.saveLines) 394 if (saveLines)
167 { 395 {
168#ifdef UNSHIFTED_SCROLLKEYS 396#ifdef UNSHIFTED_SCROLLKEYS
169 if (!ctrl && !meta) 397 if (!ctrl && !meta)
170 {
171#else 398#else
172 if (IS_SCROLL_MOD) 399 if (IS_SCROLL_MOD)
400#endif
173 { 401 {
174#endif
175 int lnsppg; 402 int lnsppg;
176 403
177#ifdef PAGING_CONTEXT_LINES 404#ifdef PAGING_CONTEXT_LINES
178 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 405 lnsppg = nrow - PAGING_CONTEXT_LINES;
179#else 406#else
180 lnsppg = TermWin.nrow * 4 / 5; 407 lnsppg = nrow * 4 / 5;
181#endif 408#endif
182 if (keysym == XK_Prior) 409 if (keysym == XK_Prior)
183 { 410 {
184 scr_page (UP, lnsppg); 411 scr_page (UP, lnsppg);
185 return; 412 return;
… …
213 scr_move_to (0, 1); 440 scr_move_to (0, 1);
214 return; 441 return;
215 } 442 }
216 else if (keysym == XK_End) 443 else if (keysym == XK_End)
217 { 444 {
218 scr_move_to (1, 0); 445 scr_move_to (1, 1);
219 return; 446 return;
220 } 447 }
221 } 448 }
222#endif 449#endif
223 } 450 }
… …
228 if (keysym >= XK_F1 && keysym <= XK_F10) 455 if (keysym >= XK_F1 && keysym <= XK_F10)
229 { 456 {
230 keysym += (XK_F11 - XK_F1); 457 keysym += (XK_F11 - XK_F1);
231 shft = 0; /* turn off Shift */ 458 shft = 0; /* turn off Shift */
232 } 459 }
233 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 460 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
234 { 461 {
235 switch (keysym) 462 switch (keysym)
236 { 463 {
237 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
238 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
239 selection_request (ev.time, 0, 0); 466 selection_request (ev.time);
240 return; 467 return;
468#if TODO
241 /* rxvt extras */ 469 /* rxvt extras */
242 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
243 change_font (FONT_UP); 471 change_font (FONT_UP);
244 return; 472 return;
245 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 473 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
246 change_font (FONT_DN); 474 change_font (FONT_DN);
247 return; 475 return;
476#endif
248 } 477 }
249 } 478 }
250 } 479 }
251#ifdef PRINTPIPE 480
252 if (keysym == XK_Print) 481#if ENABLE_FRILLS || ISO_14755
253 { 482 // ISO 14755 support
254 scr_printscreen (ctrl | shft); 483 if (shft && ctrl)
255 return;
256 } 484 {
257#endif 485 int hv;
258 486
259 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 487 if (iso14755buf & ISO_14755_51
260 { 488 && (keysym == XK_space || keysym == XK_KP_Space
261#ifdef KEYSYM_RESOURCE 489 || keysym == XK_Return || keysym == XK_KP_Enter))
262 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
263 { 490 {
264 unsigned int l; 491 commit_iso14755 ();
265 const unsigned char *kbuf0; 492 iso14755buf = ISO_14755_51;
266 const unsigned char ch = C0_ESC; 493# if ISO_14755
267 494 iso14755_51 (0);
268 kbuf0 = (Keysym_map[keysym & 0xFF]);
269 l = (unsigned int)*kbuf0++;
270
271 /* escape prefix */
272 if (meta)
273# ifdef META8_OPTION
274 if (meta_char == C0_ESC)
275# endif 495# endif
276 tt_write (&ch, 1); 496 return;
277 tt_write (kbuf0, l); 497 }
498 else if ((hv = hex_keyval (ev)) >= 0)
499 {
500 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
501 | hv | ISO_14755_51;
502# if ISO_14755
503 iso14755_51 (iso14755buf & ISO_14755_MASK);
504# endif
278 return; 505 return;
279 } 506 }
280 else 507 else
508 {
509# if ENABLE_OVERLAY
510 scr_overlay_off ();
281#endif 511# endif
512 iso14755buf = 0;
513 }
514 }
515 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
516 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
517 if (!(iso14755buf & ISO_14755_STARTED))
518 {
519 iso14755buf |= ISO_14755_STARTED;
520# if ENABLE_OVERLAY
521 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
522 scr_overlay_set (0, 0, "ISO 14755 mode");
523# endif
524 }
525#endif
526
527#ifdef PRINTPIPE
528 if (keysym == XK_Print)
529 {
530 scr_printscreen (ctrl | shft);
531 return;
532 }
533#endif
534
535 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
536 {
282 { 537 {
283 newlen = 1; 538 newlen = 1;
284 switch (keysym) 539 switch (keysym)
285 { 540 {
286#ifndef NO_BACKSPACE_KEY 541#ifndef NO_BACKSPACE_KEY
287 case XK_BackSpace: 542 case XK_BackSpace:
288 if (PrivateModes & PrivMode_HaveBackSpace) 543 if (priv_modes & PrivMode_HaveBackSpace)
289 { 544 {
290 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 545 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
291 ^ !!ctrl) ? '\b' : '\177'; 546 ^ !!ctrl) ? '\b' : '\177';
292 kbuf[1] = '\0'; 547 kbuf[1] = '\0';
293 } 548 }
294 else 549 else
295 STRCPY (kbuf, key_backspace); 550 strcpy (kbuf, key_backspace);
296# ifdef MULTICHAR_SET 551 break;
297 if ((Options & Opt_mc_hack) && screen.cur.col > 0) 552#endif
553#ifndef NO_DELETE_KEY
554# ifdef XK_KP_Prior
555 case XK_KP_Delete:
556 /* allow shift to override */
557 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
298 { 558 {
299 int col, row; 559 strcpy (kbuf, "\033On");
300 560 break;
301 newlen = STRLEN (kbuf);
302 col = screen.cur.col - 1;
303 row = screen.cur.row + TermWin.saveLines;
304 if (IS_MULTI2 (screen.rend[row][col]))
305 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
306 } 561 }
562 /* FALLTHROUGH */
307# endif 563# endif
308 break;
309#endif
310#ifndef NO_DELETE_KEY
311 case XK_Delete: 564 case XK_Delete:
312 STRCPY (kbuf, key_delete); 565 strcpy (kbuf, key_delete);
313# ifdef MULTICHAR_SET
314 if (Options & Opt_mc_hack)
315 {
316 int col, row;
317
318 newlen = STRLEN (kbuf);
319 col = screen.cur.col;
320 row = screen.cur.row + TermWin.saveLines;
321 if (IS_MULTI1 (screen.rend[row][col]))
322 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
323 }
324# endif
325 break; 566 break;
326#endif 567#endif
327 case XK_Tab: 568 case XK_Tab:
328 if (shft) 569 if (shft)
329 STRCPY (kbuf, "\033[Z"); 570 strcpy (kbuf, "\033[Z");
330 else 571 else
331 { 572 {
332#ifdef CTRL_TAB_MAKES_META 573#ifdef CTRL_TAB_MAKES_META
333 if (ctrl) 574 if (ctrl)
334 meta = 1; 575 meta = 1;
… …
340 newlen = 0; 581 newlen = 0;
341 } 582 }
342 break; 583 break;
343 584
344#ifdef XK_KP_Left 585#ifdef XK_KP_Left
345 case XK_KP_Up: /* \033Ox or standard */ 586 case XK_KP_Up: /* \033Ox or standard */
346 case XK_KP_Down: /* \033Or or standard */ 587 case XK_KP_Down: /* \033Or or standard */
347 case XK_KP_Right: /* \033Ov or standard */ 588 case XK_KP_Right: /* \033Ov or standard */
348 case XK_KP_Left: /* \033Ot or standard */ 589 case XK_KP_Left: /* \033Ot or standard */
349 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 590 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
350 { 591 {
351 STRCPY (kbuf, "\033OZ"); 592 strcpy (kbuf, "\033OZ");
352 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 593 kbuf[2] = "txvr"[keysym - XK_KP_Left];
353 break; 594 break;
354 } 595 }
355 else 596 else
356 /* translate to std. cursor key */ 597 /* translate to std. cursor key */
… …
359#endif 600#endif
360 case XK_Up: /* "\033[A" */ 601 case XK_Up: /* "\033[A" */
361 case XK_Down: /* "\033[B" */ 602 case XK_Down: /* "\033[B" */
362 case XK_Right: /* "\033[C" */ 603 case XK_Right: /* "\033[C" */
363 case XK_Left: /* "\033[D" */ 604 case XK_Left: /* "\033[D" */
364 STRCPY (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
365 kbuf[2] = "DACB"[keysym - XK_Left]; 606 kbuf[2] = "DACB"[keysym - XK_Left];
366 /* do Shift first */ 607 /* do Shift first */
367 if (shft) 608 if (shft)
368 kbuf[2] = "dacb"[keysym - XK_Left]; 609 kbuf[2] = "dacb"[keysym - XK_Left];
369 else if (ctrl) 610 else if (ctrl)
370 { 611 {
371 kbuf[1] = 'O'; 612 kbuf[1] = 'O';
372 kbuf[2] = "dacb"[keysym - XK_Left]; 613 kbuf[2] = "dacb"[keysym - XK_Left];
373 } 614 }
374 else if (PrivateModes & PrivMode_aplCUR) 615 else if (priv_modes & PrivMode_aplCUR)
375 kbuf[1] = 'O'; 616 kbuf[1] = 'O';
376#ifdef MULTICHAR_SET
377 //TODO: ??
378 if (Options & Opt_mc_hack)
379 {
380 int col, row, m;
381
382 col = screen.cur.col;
383 row = screen.cur.row + TermWin.saveLines;
384 m = 0;
385 if (keysym == XK_Right
386 && IS_MULTI1 (screen.rend[row][col]))
387 m = 1;
388 else if (keysym == XK_Left)
389 {
390 if (col > 0)
391 {
392 if (IS_MULTI2 (screen.rend[row][col - 1]))
393 m = 1;
394 }
395 else if (screen.cur.row > 0)
396 {
397 col = screen.tlen[--row];
398 if (col == -1)
399 col = TermWin.ncol - 1;
400 else
401 col--;
402 if (col > 0
403 && IS_MULTI2 (screen.rend[row][col]))
404 m = 1;
405 }
406 }
407 if (m)
408 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
409 }
410#endif
411 break; 617 break;
412 618
413#ifndef UNSHIFTED_SCROLLKEYS 619#ifndef UNSHIFTED_SCROLLKEYS
414# ifdef XK_KP_Prior 620# ifdef XK_KP_Prior
415 case XK_KP_Prior: 621 case XK_KP_Prior:
416 /* allow shift to override */ 622 /* allow shift to override */
417 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 623 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
418 { 624 {
419 STRCPY (kbuf, "\033Oy"); 625 strcpy (kbuf, "\033Oy");
420 break; 626 break;
421 } 627 }
422 /* FALLTHROUGH */ 628 /* FALLTHROUGH */
423# endif 629# endif
424 case XK_Prior: 630 case XK_Prior:
425 STRCPY (kbuf, "\033[5~"); 631 strcpy (kbuf, "\033[5~");
426 break; 632 break;
427# ifdef XK_KP_Next 633# ifdef XK_KP_Next
428 case XK_KP_Next: 634 case XK_KP_Next:
429 /* allow shift to override */ 635 /* allow shift to override */
430 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 636 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
431 { 637 {
432 STRCPY (kbuf, "\033Os"); 638 strcpy (kbuf, "\033Os");
433 break; 639 break;
434 } 640 }
435 /* FALLTHROUGH */ 641 /* FALLTHROUGH */
436# endif 642# endif
437 case XK_Next: 643 case XK_Next:
438 STRCPY (kbuf, "\033[6~"); 644 strcpy (kbuf, "\033[6~");
439 break; 645 break;
440#endif 646#endif
441 case XK_KP_Enter: 647 case XK_KP_Enter:
442 /* allow shift to override */ 648 /* allow shift to override */
443 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 649 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
444 { 650 {
445 STRCPY (kbuf, "\033OM"); 651 strcpy (kbuf, "\033OM");
652 break;
653 }
654
655 /* FALLTHROUGH */
656
657 case XK_Return:
658 if (priv_modes & PrivMode_LFNL)
659 {
660 kbuf[0] = '\015';
661 kbuf[1] = '\012';
662 kbuf[2] = '\0';
446 } 663 }
447 else 664 else
448 { 665 {
449 kbuf[0] = '\r'; 666 kbuf[0] = '\015';
450 kbuf[1] = '\0'; 667 kbuf[1] = '\0';
451 } 668 }
452 break; 669 break;
453 670
454#ifdef XK_KP_Begin 671#ifdef XK_KP_Begin
455 case XK_KP_Begin: 672 case XK_KP_Begin:
456 STRCPY (kbuf, "\033Ou"); 673 strcpy (kbuf, "\033Ou");
457 break; 674 break;
458 675
459 case XK_KP_Insert:
460 STRCPY (kbuf, "\033Op");
461 break;
462
463 case XK_KP_Delete:
464 STRCPY (kbuf, "\033On");
465 break;
466#endif 676#endif
467 case XK_KP_F1: /* "\033OP" */ 677 case XK_KP_F1: /* "\033OP" */
468 case XK_KP_F2: /* "\033OQ" */ 678 case XK_KP_F2: /* "\033OQ" */
469 case XK_KP_F3: /* "\033OR" */ 679 case XK_KP_F3: /* "\033OR" */
470 case XK_KP_F4: /* "\033OS" */ 680 case XK_KP_F4: /* "\033OS" */
471 STRCPY (kbuf, "\033OP"); 681 strcpy (kbuf, "\033OP");
472 kbuf[2] += (keysym - XK_KP_F1); 682 kbuf[2] += (keysym - XK_KP_F1);
473 break; 683 break;
474 684
475 case XK_KP_Multiply: /* "\033Oj" : "*" */ 685 case XK_KP_Multiply: /* "\033Oj" : "*" */
476 case XK_KP_Add: /* "\033Ok" : "+" */ 686 case XK_KP_Add: /* "\033Ok" : "+" */
… …
487 case XK_KP_6: /* "\033Ov" : "6" */ 697 case XK_KP_6: /* "\033Ov" : "6" */
488 case XK_KP_7: /* "\033Ow" : "7" */ 698 case XK_KP_7: /* "\033Ow" : "7" */
489 case XK_KP_8: /* "\033Ox" : "8" */ 699 case XK_KP_8: /* "\033Ox" : "8" */
490 case XK_KP_9: /* "\033Oy" : "9" */ 700 case XK_KP_9: /* "\033Oy" : "9" */
491 /* allow shift to override */ 701 /* allow shift to override */
492 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 702 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
493 { 703 {
494 STRCPY (kbuf, "\033Oj"); 704 strcpy (kbuf, "\033Oj");
495 kbuf[2] += (keysym - XK_KP_Multiply); 705 kbuf[2] += (keysym - XK_KP_Multiply);
496 } 706 }
497 else 707 else
498 { 708 {
499 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 709 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
500 kbuf[1] = '\0'; 710 kbuf[1] = '\0';
501 } 711 }
502 break; 712 break;
503 713
504 case XK_Find: 714 case XK_Find:
505 STRCPY (kbuf, "\033[1~"); 715 strcpy (kbuf, "\033[1~");
506 break; 716 break;
717
718#ifdef XK_KP_End
719 case XK_KP_Insert:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Op");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
507 case XK_Insert: 728 case XK_Insert:
508 STRCPY (kbuf, "\033[2~"); 729 strcpy (kbuf, "\033[2~");
509 break; 730 break;
510#ifdef DXK_Remove /* support for DEC remove like key */ 731#ifdef DXK_Remove /* support for DEC remove like key */
511 case DXK_Remove: 732 case DXK_Remove:
512 /* FALLTHROUGH */ 733 /* FALLTHROUGH */
513#endif 734#endif
514 case XK_Execute: 735 case XK_Execute:
515 STRCPY (kbuf, "\033[3~"); 736 strcpy (kbuf, "\033[3~");
516 break; 737 break;
517 case XK_Select: 738 case XK_Select:
518 STRCPY (kbuf, "\033[4~"); 739 strcpy (kbuf, "\033[4~");
519 break; 740 break;
520#ifdef XK_KP_End 741#ifdef XK_KP_End
521 case XK_KP_End: 742 case XK_KP_End:
522 /* allow shift to override */ 743 /* allow shift to override */
523 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 744 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
524 { 745 {
525 STRCPY (kbuf, "\033Oq"); 746 strcpy (kbuf, "\033Oq");
526 break; 747 break;
527 } 748 }
528 /* FALLTHROUGH */ 749 /* FALLTHROUGH */
529#endif 750#endif
530 case XK_End: 751 case XK_End:
531 STRCPY (kbuf, KS_END); 752 strcpy (kbuf, KS_END);
532 break; 753 break;
533#ifdef XK_KP_Home 754#ifdef XK_KP_Home
534 case XK_KP_Home: 755 case XK_KP_Home:
535 /* allow shift to override */ 756 /* allow shift to override */
536 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 757 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
537 { 758 {
538 STRCPY (kbuf, "\033Ow"); 759 strcpy (kbuf, "\033Ow");
539 break; 760 break;
540 } 761 }
541 /* FALLTHROUGH */ 762 /* FALLTHROUGH */
542#endif 763#endif
543 case XK_Home: 764 case XK_Home:
544 STRCPY (kbuf, KS_HOME); 765 strcpy (kbuf, KS_HOME);
545 break; 766 break;
546 767
547#define FKEY(n, fkey) \ 768#define FKEY(n, fkey) \
548 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 769 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
549 770
… …
601#undef FKEY 822#undef FKEY
602 default: 823 default:
603 newlen = 0; 824 newlen = 0;
604 break; 825 break;
605 } 826 }
827
606 if (newlen) 828 if (newlen)
607 len = STRLEN (kbuf); 829 len = strlen (kbuf);
608 } 830 }
831
609 /* 832 /*
610 * Pass meta for all function keys, if 'meta' option set 833 * Pass meta for all function keys, if 'meta' option set
611 */ 834 */
612#ifdef META8_OPTION 835#ifdef META8_OPTION
613 if (meta && (meta_char == 0x80) && len > 0) 836 if (meta && (meta_char == 0x80) && len > 0)
… …
618 else if (ctrl && keysym == XK_minus) 841 else if (ctrl && keysym == XK_minus)
619 { 842 {
620 len = 1; 843 len = 1;
621 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 844 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
622 } 845 }
846 else if (keysym == XK_ISO_Left_Tab)
847 {
848 strcpy (kbuf, "\033[Z");
849 len = 3;
850 }
623 else 851 else
624 { 852 {
625#ifdef META8_OPTION 853#ifdef META8_OPTION
626 /* set 8-bit on */ 854 /* set 8-bit on */
627 if (meta && (meta_char == 0x80)) 855 if (meta && (meta_char == 0x80))
628 { 856 {
629 unsigned char *ch; 857 char *ch;
630 858
631 for (ch = kbuf; ch < kbuf + len; ch++) 859 for (ch = kbuf; ch < kbuf + len; ch++)
632 *ch |= 0x80; 860 *ch |= 0x80;
861
633 meta = 0; 862 meta = 0;
634 } 863 }
635#endif 864#endif
636 /* nil */ ; 865 /* nil */ ;
637 } 866 }
638 } 867 }
639 868
869 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
870 return;
871
640 if (len <= 0) 872 if (len <= 0)
641 return; /* not mapped */ 873 return; /* not mapped */
642 874
643 if (Options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
644 if (TermWin.view_start) 876 if (view_start)
645 { 877 {
646 TermWin.view_start = 0; 878 view_start = 0;
647 want_refresh = 1; 879 want_refresh = 1;
648 } 880 }
649 881
650 /* 882 /*
651 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
… …
666#ifdef META8_OPTION 898#ifdef META8_OPTION
667 && meta_char == C0_ESC 899 && meta_char == C0_ESC
668#endif 900#endif
669 ) 901 )
670 { 902 {
671 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
672 tt_write (&ch, 1); 904 tt_write (&ch, 1);
673 } 905 }
674 906
675#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
676 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
684#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
685 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
686} 918}
687/*}}} */ 919/*}}} */
688 920
689#if (MENUBAR_MAX) 921#if defined (KEYSYM_RESOURCE)
690/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
691/* attempt to `write' count to the input buffer */
692unsigned int 922unsigned int
693rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 923rxvt_term::cmd_write (const char *str, unsigned int count)
694{ 924{
695 unsigned int n, s; 925 unsigned int n, s;
696 926
697 n = cmdbuf_ptr - cmdbuf_base; 927 n = cmdbuf_ptr - cmdbuf_base;
698 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
699 929
700 if (n > 0 && s < count) 930 if (n > 0 && s < count)
701 { 931 {
702 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 932 memmove (cmdbuf_base, cmdbuf_ptr,
703 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 933 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
704 cmdbuf_ptr = cmdbuf_base; 934 cmdbuf_ptr = cmdbuf_base;
705 cmdbuf_endp -= n; 935 cmdbuf_endp -= n;
706 s += n; 936 s += n;
707 } 937 }
708 938
709 if (count > s) 939 if (count > s)
710 { 940 {
711 rxvt_print_error ("data loss: cmd_write too large"); 941 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
712 count = s; 942 count = s;
713 } 943 }
714 944
715 for (; count--;) 945 for (; count--;)
716 *cmdbuf_endp++ = *str++; 946 *cmdbuf_endp++ = *str++;
717 947
718 cmd_parse (); 948 cmd_parse ();
719 949
720 return 0; 950 return 0;
721} 951}
722#endif /* MENUBAR_MAX */ 952#endif
723 953
724void 954void
725rxvt_term::flush () 955rxvt_term::flush ()
726{ 956{
957 flush_ev.stop ();
958
727#ifdef TRANSPARENT 959#ifdef TRANSPARENT
728 if (want_full_refresh) 960 if (want_full_refresh)
729 { 961 {
730 want_full_refresh = 0; 962 want_full_refresh = 0;
731 scr_clear (); 963 scr_clear ();
732 scr_touch (false); 964 scr_touch (false);
733 want_refresh = 1;
734 } 965 }
735#endif 966#endif
736 967
737 if (want_refresh) 968 if (want_refresh)
738 { 969 {
970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
971 {
972 int row = view_start;
973 int end_row = row + nrow;
974
975 while (row > top_row && ROW (row - 1).is_longer ())
976 --row;
977
978 do
979 {
980 int start_row = row;
981 line_t *l;
982
983 do
984 {
985 l = &ROW (row++);
986
987 if (!(l->f & LINE_FILTERED))
988 {
989 // line not filtered, mark it as filtered
990 l->f |= LINE_FILTERED;
991 while (l->is_longer ())
992 {
993 l = &ROW (row++);
994 l->f |= LINE_FILTERED;
995 }
996
997 // and filter it
998 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
999
1000 break;
1001 }
1002 }
1003 while (l->is_longer () && row < end_row);
1004 }
1005 while (row < end_row);
1006 }
1007
739 scr_refresh (refresh_type); 1008 scr_refresh ();
740 scrollbar_show (1); 1009 scrollbar_show (1);
741#ifdef USE_XIM 1010#ifdef USE_XIM
742 IMSendSpot (); 1011 IMSendSpot ();
743#endif 1012#endif
744
745 } 1013 }
746 1014
747 display->flush (); 1015 display->flush ();
748} 1016}
749 1017
750void 1018void
751rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
752{ 1020{
753 SET_R (this); 1021 make_current ();
754 SET_LOCALE (locale);
755 1022
1023 display->flush ();
1024
1025 if (want_refresh && !flush_ev.active)
1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1027}
1028
1029void
1030rxvt_term::flush_cb (time_watcher &w)
1031{
1032 make_current ();
1033
1034 refresh_limit = 1;
1035 refresh_count = 0;
756 flush (); 1036 flush ();
757} 1037}
758 1038
759#ifdef CURSOR_BLINK 1039#ifdef CURSOR_BLINK
760void 1040void
761rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
762{ 1042{
763 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
764 want_refresh = 1; 1044 want_refresh = 1;
765 1045
766 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
767} 1047}
768#endif 1048#endif
769 1049
770#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
771void 1051void
… …
778 w.start (w.at + TEXT_BLINK_INTERVAL); 1058 w.start (w.at + TEXT_BLINK_INTERVAL);
779 } 1059 }
780} 1060}
781#endif 1061#endif
782 1062
1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1064void
1065rxvt_term::cont_scroll_cb (time_watcher &w)
1066{
1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
1069 {
1070 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1072 }
1073}
1074#endif
1075
1076#ifdef SELECTION_SCROLLING
1077void
1078rxvt_term::sel_scroll_cb (time_watcher &w)
1079{
1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1081 {
1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1083 want_refresh = 1;
1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1085 }
1086}
1087#endif
1088
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void
1091rxvt_term::slip_wheel_cb (time_watcher &w)
1092{
1093 if (mouse_slip_wheel_speed == 0
1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1095 : scr_page (UP, mouse_slip_wheel_speed))
1096 {
1097 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0;
1099
1100 want_refresh = 1;
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102 }
1103}
1104#endif
1105
1106#if HAVE_SCHED_YIELD
1107static struct event_handler
1108{
1109 check_watcher cw_yield;
1110
1111 void yield (check_watcher &w)
1112 {
1113 sched_yield ();
1114 w.stop ();
1115 }
1116
1117 event_handler ()
1118 : cw_yield (this, &event_handler::yield)
1119 {
1120 }
1121} event_handler;
1122#endif
1123
783bool 1124bool
784rxvt_term::pty_fill () 1125rxvt_term::pty_fill ()
785{ 1126{
786 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1128
1129 if (CBUFSIZ == n)
1130 {
1131 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1132 n = 0;
1133 }
787 1134
788 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
789 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
790 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
791 1138
792 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
793 1140
794 if (n > 0) 1141 if (r > 0)
795 { 1142 {
796 cmdbuf_endp += n; 1143 cmdbuf_endp += r;
797 return true; 1144 return true;
798 } 1145 }
799 else if (n < 0 && errno != EAGAIN) 1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 {
1148#if HAVE_SCHED_YIELD
1149 if (display->is_local)
1150 event_handler.cw_yield.start ();
1151#endif
1152 }
1153 else
1154 {
1155 pty_ev.stop ();
1156
1157 if (!OPTION (Opt_hold))
800 destroy (); 1158 destroy ();
1159 }
801 1160
802 return false; 1161 return false;
803} 1162}
804 1163
805void 1164void
806rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
807{ 1166{
808 SET_R (this); 1167 make_current ();
809 SET_LOCALE (locale); 1168
1169 if (revents & EVENT_READ)
1170 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ())
1172 if (cmd_parse ())
1173 break;
810 1174
811 if (revents & EVENT_WRITE) 1175 if (revents & EVENT_WRITE)
812 tt_write (0, 0); 1176 pty_write ();
813 else if (revents & EVENT_READ)
814 {
815 bool flag = true;
816
817 // loop, but don't allow a single term to monopolize us
818 // the number of loops is fully arbitrary, and thus wrong
819 while (flag && pty_fill ())
820 {
821 if (!seen_input)
822 {
823 seen_input = 1;
824 /* once we know the shell is running, send the screen size. Again! */
825 tt_winch ();
826 }
827
828 if (cmd_parse ())
829 break;
830 }
831 }
832} 1177}
833 1178
834bool 1179void
835rxvt_term::cmd_parse () 1180rxvt_term::pointer_unblank ()
836{ 1181{
837 bool flag = false; 1182 XDefineCursor (display->display, vt, TermWin_cursor);
838 uint32_t ch = NOCHAR; 1183 recolour_cursor ();
839 1184
840 for (;;) 1185#ifdef POINTER_BLANK
841 { 1186 hidden_pointer = 0;
842 if (ch == NOCHAR)
843 ch = next_char ();
844 1187
845 if (ch == NOCHAR) // TODO: improve 1188 if (OPTION (Opt_pointerBlank))
846 break; 1189 pointer_ev.start (NOW + pointerBlankDelay);
847 1190#endif
848 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
849 {
850 /* Read a text string from the input buffer */
851 uint32_t buf[BUFSIZ];
852 bool refreshnow = false;
853 int nlines = 0;
854 uint32_t *str = buf;
855
856 *str++ = ch;
857
858 for (;;)
859 {
860 ch = next_char ();
861
862 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
863 break;
864 else
865 {
866 *str++ = ch;
867
868 if (ch == '\n')
869 {
870 nlines++;
871 refresh_count++;
872
873 if (! (Options & Opt_jumpScroll)
874 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
875 {
876 refreshnow = true;
877 flag = false;
878 ch = NOCHAR;
879 break;
880 }
881
882 // scr_add_lines only works for nlines < TermWin.nrow - 1.
883 if (nlines >= TermWin.nrow - 1)
884 {
885 scr_add_lines (buf, nlines, str - buf);
886 nlines = 0;
887 str = buf;
888 }
889 }
890
891 if (str >= buf + BUFSIZ)
892 {
893 ch = NOCHAR;
894 break;
895 }
896 }
897 }
898
899 scr_add_lines (buf, nlines, str - buf);
900
901 /*
902 * If there have been a lot of new lines, then update the screen
903 * What the heck I'll cheat and only refresh less than every page-full.
904 * the number of pages between refreshes is refresh_limit, which
905 * is incremented here because we must be doing flat-out scrolling.
906 *
907 * refreshing should be correct for small scrolls, because of the
908 * time-out
909 */
910 if (refreshnow)
911 {
912 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
913 refresh_limit++;
914
915 scr_refresh (refresh_type);
916 }
917
918 }
919 else
920 {
921 switch (ch)
922 {
923 default:
924 process_nonprinting (ch);
925 break;
926 case C0_ESC: /* escape char */
927 process_escape_seq ();
928 break;
929 /*case 0x9b: */ /* CSI */
930 /* process_csi_seq (); */
931 }
932
933 ch = NOCHAR;
934 }
935 }
936
937 return flag;
938}
939
940// read the next character, currently handles UTF-8
941// will probably handle all sorts of other stuff in the future
942uint32_t
943rxvt_term::next_char ()
944{
945 while (cmdbuf_ptr < cmdbuf_endp)
946 {
947 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
948 return *cmdbuf_ptr++;
949
950 wchar_t wc;
951 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
952
953 if (len == (size_t)-2)
954 return NOCHAR;
955
956 if (len == (size_t)-1)
957 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
958
959 // assume wchar == unicode
960 cmdbuf_ptr += len;
961 return wc;
962 }
963
964 return NOCHAR;
965}
966
967/* rxvt_cmd_getc () - Return next input character */
968/*
969 * Return the next input character after first passing any keyboard input
970 * to the command.
971 */
972uint32_t
973rxvt_term::cmd_getc ()
974{
975 for (;;)
976 {
977 uint32_t c = next_char ();
978 if (c != NOCHAR)
979 return c;
980
981 // incomplete sequences should occur rarely, still, a better solution
982 // would be preferred. either setjmp/longjmp or better design.
983 fcntl (cmd_fd, F_SETFL, 0);
984 pty_fill ();
985 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
986 }
987} 1191}
988 1192
989#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
990void 1194void
991rxvt_term::pointer_unblank ()
992{
993 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
994 recolour_cursor ();
995
996 hidden_pointer = 0;
997
998 if (Options & Opt_pointerBlank)
999 pointer_ev.start (NOW + pointerBlankDelay);
1000}
1001
1002void
1003rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1004{ 1196{
1005 if (! (Options & Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1006 return; 1198 return;
1007 1199
1008 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1200 XDefineCursor (display->display, vt, display->blank_cursor);
1009 XFlush (display->display); 1201 XFlush (display->display);
1010 1202
1011 hidden_pointer = 1; 1203 hidden_pointer = 1;
1012} 1204}
1013 1205
1014void 1206void
1015rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1016{ 1208{
1017 SET_R (this); 1209 make_current ();
1018 SET_LOCALE (locale);
1019 1210
1020 pointer_blank (); 1211 pointer_blank ();
1021} 1212}
1022#endif 1213#endif
1023 1214
… …
1030 x = ev.x; 1221 x = ev.x;
1031 y = ev.y; 1222 y = ev.y;
1032 pixel_position (&x, &y); 1223 pixel_position (&x, &y);
1033 1224
1034 if (MEvent.button == AnyButton) 1225 if (MEvent.button == AnyButton)
1035 {
1036 button_number = 3; 1226 button_number = 3;
1037 }
1038 else 1227 else
1039 { 1228 {
1040 button_number = MEvent.button - Button1; 1229 button_number = MEvent.button - Button1;
1041 /* add 0x3D for wheel events, like xterm does */ 1230 /* add 0x3D for wheel events, like xterm does */
1042 if (button_number >= 3) 1231 if (button_number >= 3)
1043 button_number += (64 - 3); 1232 button_number += (64 - 3);
1044 } 1233 }
1045 1234
1046 if (PrivateModes & PrivMode_MouseX10) 1235 if (priv_modes & PrivMode_MouseX10)
1047 { 1236 {
1048 /* 1237 /*
1049 * do not report ButtonRelease 1238 * do not report ButtonRelease
1050 * no state info allowed 1239 * no state info allowed
1051 */ 1240 */
… …
1066 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1255 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1067 + ((MEvent.state & ControlMask) ? 16 : 0); 1256 + ((MEvent.state & ControlMask) ? 16 : 0);
1068#ifdef MOUSE_REPORT_DOUBLECLICK 1257#ifdef MOUSE_REPORT_DOUBLECLICK
1069 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1258 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1070#endif 1259#endif
1071
1072 } 1260 }
1073 1261
1074#ifdef DEBUG_MOUSEREPORT 1262#if DEBUG_MOUSEREPORT
1075 fprintf (stderr, "Mouse ["); 1263 fprintf (stderr, "Mouse [");
1076 if (key_state & 16) 1264 if (key_state & 16)
1077 fputc ('C', stderr); 1265 fputc ('C', stderr);
1078 if (key_state & 4) 1266 if (key_state & 4)
1079 fputc ('S', stderr); 1267 fputc ('S', stderr);
… …
1083 fputc ('2', stderr); 1271 fputc ('2', stderr);
1084 fprintf (stderr, "]: <%d>, %d/%d\n", 1272 fprintf (stderr, "]: <%d>, %d/%d\n",
1085 button_number, 1273 button_number,
1086 x + 1, 1274 x + 1,
1087 y + 1); 1275 y + 1);
1088#else 1276#endif
1277
1089 tt_printf ("\033[M%c%c%c", 1278 tt_printf ("\033[M%c%c%c",
1090 (32 + button_number + key_state), 1279 (32 + button_number + key_state),
1091 (32 + x + 1), 1280 (32 + x + 1),
1092 (32 + y + 1)); 1281 (32 + y + 1));
1093#endif
1094} 1282}
1095 1283
1096#ifdef USING_W11LIB 1284#ifdef USING_W11LIB
1097void 1285void
1098rxvt_W11_process_x_event (XEvent *ev) 1286rxvt_W11_process_x_event (XEvent *ev)
… …
1105 1293
1106/*{{{ process an X event */ 1294/*{{{ process an X event */
1107void 1295void
1108rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1109{ 1297{
1110 SET_R (this); 1298 make_current ();
1111 SET_LOCALE (locale);
1112 1299
1113#if defined(CURSOR_BLINK) 1300 dDisp;
1114 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1115 {
1116 if (hidden_cursor)
1117 {
1118 hidden_cursor = 0;
1119 want_refresh = 1;
1120 }
1121 1301
1122 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1302 if (ev.xany.window == vt
1123 } 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1124#endif 1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1125
1126#if defined(POINTER_BLANK)
1127 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1128 {
1129 if (ev.type == MotionNotify
1130 || ev.type == ButtonPress
1131 || ev.type == ButtonRelease)
1132 if (hidden_pointer)
1133 pointer_unblank ();
1134
1135 if (ev.type == KeyPress && hidden_pointer == 0)
1136 pointer_blank ();
1137 }
1138#endif
1139
1140#ifdef USE_XIM
1141 if (XFilterEvent (&ev, None))
1142 return; 1305 return;
1143#endif
1144 1306
1307 // for XQueryPointer
1145 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
1146 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
1147 unsigned int unused_mask; 1310 unsigned int unused_mask;
1148
1149#ifdef DEBUG_X
1150 const char *const eventnames[] =
1151 { /* mason - this matches my system */
1152 "",
1153 "",
1154 "KeyPress",
1155 "KeyRelease",
1156 "ButtonPress",
1157 "ButtonRelease",
1158 "MotionNotify",
1159 "EnterNotify",
1160 "LeaveNotify",
1161 "FocusIn",
1162 "FocusOut",
1163 "KeymapNotify",
1164 "Expose",
1165 "GraphicsExpose",
1166 "NoExpose",
1167 "VisibilityNotify",
1168 "CreateNotify",
1169 "DestroyNotify",
1170 "UnmapNotify",
1171 "MapNotify",
1172 "MapRequest",
1173 "ReparentNotify",
1174 "ConfigureNotify",
1175 "ConfigureRequest",
1176 "GravityNotify",
1177 "ResizeRequest",
1178 "CirculateNotify",
1179 "CirculateRequest",
1180 "PropertyNotify",
1181 "SelectionClear",
1182 "SelectionRequest",
1183 "SelectionNotify",
1184 "ColormapNotify",
1185 "ClientMessage",
1186 "MappingNotify"
1187 };
1188#endif
1189
1190#ifdef DEBUG_X
1191 struct timeval tp;
1192 struct tm *ltt;
1193 (void)gettimeofday (&tp, NULL);
1194 ltt = localtime (& (tp.tv_sec));
1195 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));
1196#endif
1197 1311
1198 switch (ev.type) 1312 switch (ev.type)
1199 { 1313 {
1200 case KeyPress: 1314 case KeyPress:
1315#if ISO_14755
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1201 lookup_key (ev.xkey); 1318 lookup_key (ev.xkey);
1319
1320 break;
1321
1322 case KeyRelease:
1323 {
1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325 KeySym keysym;
1326
1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328#endif
1329
1330#if ENABLE_FRILLS || ISO_14755
1331 // ISO 14755 support
1332 if (iso14755buf)
1333 if (iso14755buf & ISO_14755_52)
1334 {
1335# if ENABLE_OVERLAY
1336 scr_overlay_off ();
1337# endif
1338# if ISO_14755
1339 // iso14755 part 5.2 handling: release time
1340 // first: controls
1341 if ((ev.xkey.state & ControlMask)
1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1344 {
1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346 commit_iso14755 ();
1347 goto skip_switch;
1348 }
1349
1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351 if (i[0] == keysym)
1352 {
1353 iso14755buf = ISO_14755_51 | i[1];
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 scr_bell ();
1359# endif
1360 iso14755buf = 0;
1361 break;
1362 }
1363 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364 {
1365# if ENABLE_OVERLAY
1366 scr_overlay_off ();
1367# endif
1368 if (iso14755buf & ISO_14755_51)
1369 commit_iso14755 ();
1370#if ISO_14755
1371 else if (iso14755buf & ISO_14755_STARTED)
1372 {
1373 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377 }
1378# endif
1379 else
1380 iso14755buf = 0;
1381 }
1382#endif
1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1202 break; 1386 break;
1203 1387
1204#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1205 case KeyRelease:
1206 {
1207 if (! (ev.xkey.state & ControlMask)) 1389 if (!(ev.xkey.state & ControlMask))
1390 slip_wheel_ev.stop ();
1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1208 mouse_slip_wheel_speed = 0; 1392 mouse_slip_wheel_speed = 0;
1209 else 1393#endif
1210 {
1211 KeySym ks;
1212
1213 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1214 if (ks == XK_Control_L || ks == XK_Control_R)
1215 mouse_slip_wheel_speed = 0;
1216 }
1217 break; 1394 break;
1218 } 1395 }
1219#endif
1220 1396
1221 case ButtonPress: 1397 case ButtonPress:
1222 button_press (ev.xbutton); 1398 button_press (ev.xbutton);
1223 break; 1399 break;
1224 1400
… …
1226 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1227 break; 1403 break;
1228 1404
1229 case ClientMessage: 1405 case ClientMessage:
1230 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32
1231 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1407 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1232 destroy ();
1233#ifdef OFFIX_DND
1234 /* OffiX Dnd (drag 'n' drop) protocol */
1235 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1236 && (ev.xclient.data.l[0] == DndFile
1237 || ev.xclient.data.l[0] == DndDir
1238 || ev.xclient.data.l[0] == DndLink))
1239 { 1408 {
1240 /* Get Dnd data */ 1409 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1241 Atom ActualType; 1410 {
1242 int ActualFormat; 1411 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1243 unsigned char *data; 1412 {
1244 unsigned long Size, RemainingBytes; 1413 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1245 1414 {
1246 XGetWindowProperty (display->display, display->root, 1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1247 xa[XA_DNDSELECTION], 1416 destroy ();
1248 0L, 1000000L, 1417 }
1249 False, AnyPropertyType, 1418#if ENABLE_EWMH
1250 &ActualType, &ActualFormat, 1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1251 &Size, &RemainingBytes, 1420 XSendEvent (disp, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1252 &data); 1422 &ev);
1253 XChangeProperty (display->display, display->root, 1423#endif
1254 XA_CUT_BUFFER0, XA_STRING, 1424 }
1255 8, PropModeReplace, 1425 }
1256 data, STRLEN (data)); 1426#if ENABLE_XEMBED
1257 selection_paste (display->root, XA_CUT_BUFFER0, True); 1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1258 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1259 } 1435 }
1260#endif /* OFFIX_DND */
1261 break; 1436 break;
1262 1437
1263 case MappingNotify: 1438 case MappingNotify:
1264 XRefreshKeyboardMapping (& (ev.xmapping)); 1439 XRefreshKeyboardMapping (&ev.xmapping);
1265 break; 1440 break;
1266 1441
1267 /* 1442 /*
1268 * XXX: this is not the _current_ arrangement 1443 * XXX: this is not the _current_ arrangement
1269 * Here's my conclusion: 1444 * Here's my conclusion:
… …
1288 break; 1463 break;
1289 } 1464 }
1290 break; 1465 break;
1291 1466
1292 case FocusIn: 1467 case FocusIn:
1293 if (!TermWin.focus) 1468 focus_in ();
1469 break;
1470
1471 case FocusOut:
1472 focus_out ();
1473 break;
1474
1475 case ConfigureNotify:
1476 if (ev.xconfigure.window == parent[0])
1294 { 1477 {
1295 TermWin.focus = 1; 1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1296 want_refresh = 1; 1479 ;
1297#ifdef USE_XIM
1298 if (Input_Context != NULL)
1299 XSetICFocus (Input_Context);
1300#endif
1301#ifdef CURSOR_BLINK
1302 if (Options & Opt_cursorBlink)
1303 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1304#endif
1305 1480
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 {
1483 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485 }
1486
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1490 if (OPTION (Opt_transparent))
1491 check_our_parents ();
1492#endif
1306 } 1493 }
1307 break; 1494 break;
1308 1495
1309 case FocusOut:
1310 if (TermWin.focus)
1311 {
1312 TermWin.focus = 0;
1313 want_refresh = 1;
1314#ifdef USE_XIM
1315 if (Input_Context != NULL)
1316 XUnsetICFocus (Input_Context);
1317#endif
1318#ifdef CURSOR_BLINK
1319 if (Options & Opt_cursorBlink)
1320 cursor_blink_ev.stop ();
1321 hidden_cursor = 0;
1322#endif
1323
1324 }
1325 break;
1326
1327 case ConfigureNotify: 1496 case PropertyNotify:
1328 if (ev.xconfigure.window == TermWin.parent[0]) 1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1329 { 1498 && ev.xproperty.state == PropertyNewValue)
1330 int height, width; 1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1331 1500
1332 do
1333 { /* Wrap lots of configures into one */
1334 width = ev.xconfigure.width;
1335 height = ev.xconfigure.height;
1336 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1337 }
1338 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1339
1340 if (szHint.width != width || szHint.height != height)
1341 {
1342 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1343 resize_all_windows (width, height, 1);
1344 }
1345#ifdef DEBUG_SIZE
1346 else
1347 {
1348 D_SIZE ((stderr, "Size: Not resizing"));
1349 }
1350#endif
1351#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1352 if (Options & Opt_transparent)
1353 {
1354 check_our_parents ();
1355 if (am_transparent)
1356 want_full_refresh = 1;
1357 }
1358#endif
1359
1360 }
1361 break; 1501 break;
1362 1502
1363 case SelectionClear: 1503 case SelectionClear:
1364 display->set_selection_owner (0); 1504 selection_clear ();
1365 break; 1505 break;
1366 1506
1367 case SelectionNotify: 1507 case SelectionNotify:
1368 if (selection_wait == Sel_normal) 1508 if (selection_wait == Sel_normal)
1369 selection_paste (ev.xselection.requestor, 1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1370 ev.xselection.property, True);
1371 break; 1510 break;
1372 1511
1373 case SelectionRequest: 1512 case SelectionRequest:
1374 selection_send (ev.xselectionrequest); 1513 selection_send (ev.xselectionrequest);
1375 break; 1514 break;
1376 1515
1516 case MapNotify:
1517 mapped = 1;
1518#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1520#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break;
1523
1377 case UnmapNotify: 1524 case UnmapNotify:
1378 TermWin.mapped = 0; 1525 mapped = 0;
1379#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1380 text_blink_ev.stop (); 1527 text_blink_ev.stop ();
1381#endif 1528#endif
1382 break; 1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1383
1384 case MapNotify:
1385 TermWin.mapped = 1;
1386#ifdef TEXT_BLINK
1387 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1388#endif
1389 break; 1530 break;
1390 1531
1391#ifdef TRANSPARENT 1532#ifdef TRANSPARENT
1392 case ReparentNotify: 1533 case ReparentNotify:
1393 rootwin_cb (ev); 1534 rootwin_cb (ev);
1394 break; 1535 break;
1395#endif /* TRANSPARENT */ 1536#endif /* TRANSPARENT */
1396 1537
1397 case GraphicsExpose: 1538 case GraphicsExpose:
1398 case Expose: 1539 case Expose:
1399 if (ev.xany.window == TermWin.vt) 1540 if (ev.xany.window == vt)
1400 { 1541 {
1401#ifdef NO_SLOW_LINK_SUPPORT 1542 do
1402 scr_expose (ev.xexpose.x, ev.xexpose.y, 1543 scr_expose (ev.xexpose.x, ev.xexpose.y,
1403 ev.xexpose.width, ev.xexpose.height, False); 1544 ev.xexpose.width, ev.xexpose.height, False);
1404#else 1545 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1405 // don't understand this, so commented it out 1546
1547 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1548
1549 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1406 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1407 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, False);
1408 //scr_expose (ev.xexpose.x, 0, 1552
1409 // ev.xexpose.width, TermWin.height, False);
1410#endif
1411 want_refresh = 1; 1553 want_refresh = 1;
1412 } 1554 }
1413 else 1555 else
1414 { 1556 {
1415 XEvent unused_event; 1557 XEvent unused_event;
1416 1558
1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1559 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1418 Expose, 1560 ;
1419 &unused_event)) ; 1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1420 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1562 ;
1421 GraphicsExpose, 1563
1422 &unused_event)) ;
1423 if (isScrollbarWindow (ev.xany.window)) 1564 if (isScrollbarWindow (ev.xany.window))
1424 { 1565 {
1425 scrollBar.setIdle (); 1566 scrollBar.setIdle ();
1426 scrollbar_show (0); 1567 scrollbar_show (0);
1427 } 1568 }
1428#ifdef MENUBAR 1569
1429 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1570#ifdef TRANSPARENT
1430 menubar_expose (); 1571 if (am_transparent && ev.xany.window == parent[0])
1572 XClearWindow (disp, ev.xany.window);
1431#endif 1573#endif
1432 } 1574 }
1433 break; 1575 break;
1434 1576
1435 case MotionNotify: 1577 case MotionNotify:
1436#ifdef POINTER_BLANK 1578#ifdef POINTER_BLANK
1437 if (hidden_pointer) 1579 if (hidden_pointer)
1438 pointer_unblank (); 1580 pointer_unblank ();
1439#endif 1581#endif
1440#if MENUBAR 1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1441 if (isMenuBarWindow (ev.xany.window)) 1583 break;
1584
1585 if (ev.xany.window == vt)
1442 { 1586 {
1443 menubar_control (ev.xbutton); 1587 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1444 break; 1588 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1445 } 1589 ; // nop
1446#endif
1447 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1448 break;
1449
1450 if (ev.xany.window == TermWin.vt)
1451 {
1452 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1590 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1453 { 1591 {
1454 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1592 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1455 ; 1593 ;
1456 1594
1457 XQueryPointer (display->display, TermWin.vt, 1595 XQueryPointer (disp, vt,
1458 &unused_root, &unused_child, 1596 &unused_root, &unused_child,
1459 &unused_root_x, &unused_root_y, 1597 &unused_root_x, &unused_root_y,
1460 & (ev.xbutton.x), & (ev.xbutton.y), 1598 &ev.xbutton.x, &ev.xbutton.y,
1461 &unused_mask); 1599 &ev.xbutton.state);
1462#ifdef MOUSE_THRESHOLD 1600#ifdef MOUSE_THRESHOLD
1463 /* deal with a `jumpy' mouse */ 1601 /* deal with a `jumpy' mouse */
1464 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1602 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1465 { 1603 {
1466#endif 1604#endif
1605#if ISO_14755
1606 // 5.4
1607 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1608 {
1609 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1610 break;
1611 }
1612#endif
1467 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1613 selection_extend (ev.xbutton.x, ev.xbutton.y,
1468 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1614 ev.xbutton.state & Button3Mask ? 2 : 0);
1615
1469#ifdef SELECTION_SCROLLING 1616#ifdef SELECTION_SCROLLING
1470 if (ev.xbutton.y < TermWin.int_bwidth 1617 if (ev.xbutton.y < int_bwidth
1471 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1618 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1472 { 1619 {
1473 int dist; 1620 int dist;
1474
1475 pending_scroll_selection=1;
1476 1621
1477 /* don't clobber the current delay if we are 1622 /* don't clobber the current delay if we are
1478 * already in the middle of scrolling. 1623 * already in the middle of scrolling.
1479 */ 1624 */
1480 if (scroll_selection_delay<=0) 1625 if (!sel_scroll_ev.active)
1481 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1626 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1482 1627
1483 /* save the event params so we can highlight 1628 /* save the event params so we can highlight
1484 * the selection in the pending-scroll loop 1629 * the selection in the pending-scroll loop
1485 */ 1630 */
1486 selection_save_x=ev.xbutton.x; 1631 selection_save_x = ev.xbutton.x;
1487 selection_save_y=ev.xbutton.y; 1632 selection_save_y = ev.xbutton.y;
1488 selection_save_state=
1489 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1633 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1490 1634
1491 /* calc number of lines to scroll */ 1635 /* calc number of lines to scroll */
1492 if (ev.xbutton.y<TermWin.int_bwidth) 1636 if (ev.xbutton.y < int_bwidth)
1493 { 1637 {
1494 scroll_selection_dir = UP; 1638 scroll_selection_dir = UP;
1495 dist = TermWin.int_bwidth - ev.xbutton.y; 1639 dist = int_bwidth - ev.xbutton.y;
1496 } 1640 }
1497 else 1641 else
1498 { 1642 {
1499 scroll_selection_dir = DN; 1643 scroll_selection_dir = DN;
1500 dist = ev.xbutton.y - 1644 dist = ev.xbutton.y - (int_bwidth + height);
1501 (TermWin.int_bwidth + TermWin.height);
1502 } 1645 }
1646
1503 scroll_selection_lines= (Pixel2Height (dist)/ 1647 scroll_selection_lines = Pixel2Height (dist)
1504 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1648 / SELECTION_SCROLL_LINE_SPEEDUP
1649 + 1;
1505 MIN_IT (scroll_selection_lines, 1650 min_it (scroll_selection_lines,
1506 SELECTION_SCROLL_MAX_LINES); 1651 SELECTION_SCROLL_MAX_LINES);
1507 } 1652 }
1508 else 1653 else
1509 { 1654 {
1510 /* we are within the text window, so we 1655 /* we are within the text window, so we
1511 * shouldn't be scrolling 1656 * shouldn't be scrolling
1512 */ 1657 */
1513 pending_scroll_selection = 0; 1658 if (sel_scroll_ev.active)
1659 sel_scroll_ev.stop();
1514 } 1660 }
1515#endif 1661#endif
1516#ifdef MOUSE_THRESHOLD 1662#ifdef MOUSE_THRESHOLD
1517
1518 } 1663 }
1519#endif 1664#endif
1520
1521 } 1665 }
1522 } 1666 }
1523 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1667 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1524 { 1668 {
1525 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1669 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1526 MotionNotify, &ev)) ; 1670 MotionNotify, &ev))
1671 ;
1672
1527 XQueryPointer (display->display, scrollBar.win, 1673 XQueryPointer (disp, scrollBar.win,
1528 &unused_root, &unused_child, 1674 &unused_root, &unused_child,
1529 &unused_root_x, &unused_root_y, 1675 &unused_root_x, &unused_root_y,
1530 & (ev.xbutton.x), & (ev.xbutton.y), 1676 &ev.xbutton.x, &ev.xbutton.y,
1531 &unused_mask); 1677 &unused_mask);
1532 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1533 scrollbar_size ()); 1679 scrollbar_size ());
1534 scr_refresh (refresh_type); 1680 want_refresh = 1;
1535 refresh_limit = 0; 1681 refresh_limit = 0;
1536 scrollbar_show (1); 1682 scrollbar_show (1);
1537 } 1683 }
1538 break; 1684 break;
1539 } 1685 }
1540}
1541 1686
1687skip_switch: ;
1688
1689#if defined(CURSOR_BLINK)
1690 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1691 {
1692 if (hidden_cursor)
1693 {
1694 hidden_cursor = 0;
1695 want_refresh = 1;
1696 }
1697
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699 }
1700#endif
1701
1702#if defined(POINTER_BLANK)
1703 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 {
1705 if (ev.type == MotionNotify
1706 || ev.type == ButtonPress
1707 || ev.type == ButtonRelease)
1708 if (hidden_pointer)
1709 pointer_unblank ();
1710
1711 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank ();
1713 }
1714#endif
1715}
1716
1717void
1718rxvt_term::focus_in ()
1719{
1720 if (!focus)
1721 {
1722 focus = 1;
1723 want_refresh = 1;
1724
1725 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1726
1727#if USE_XIM
1728 if (Input_Context != NULL)
1729 {
1730 IMSetStatusPosition ();
1731 XSetICFocus (Input_Context);
1732 }
1733#endif
1734#if CURSOR_BLINK
1735 if (OPTION (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1737#endif
1738#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade])
1740 {
1741 pix_colors = pix_colors_focused;
1742 scr_recolour ();
1743 }
1744#endif
1745 }
1746}
1747
1748void
1749rxvt_term::focus_out ()
1750{
1751 if (focus)
1752 {
1753 focus = 0;
1754 want_refresh = 1;
1755
1756 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1757
1758#if ENABLE_FRILLS || ISO_14755
1759 if (iso14755buf)
1760 {
1761 iso14755buf = 0;
1762# if ENABLE_OVERLAY
1763 scr_overlay_off ();
1764# endif
1765 }
1766#endif
1767#if USE_XIM
1768 if (Input_Context != NULL)
1769 XUnsetICFocus (Input_Context);
1770#endif
1771#if CURSOR_BLINK
1772 if (OPTION (Opt_cursorBlink))
1773 cursor_blink_ev.stop ();
1774 hidden_cursor = 0;
1775#endif
1776#if OFF_FOCUS_FADING
1777 if (rs[Rs_fade])
1778 {
1779 pix_colors = pix_colors_unfocused;
1780 scr_recolour ();
1781 }
1782#endif
1783 }
1784}
1785
1786#if TRANSPARENT
1542void 1787void
1543rxvt_term::rootwin_cb (XEvent &ev) 1788rxvt_term::rootwin_cb (XEvent &ev)
1544{ 1789{
1545 SET_R (this); 1790 make_current ();
1546 SET_LOCALE (locale);
1547 1791
1548 switch (ev.type) 1792 switch (ev.type)
1549 { 1793 {
1550 case PropertyNotify: 1794 case PropertyNotify:
1551 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1552 {
1553 if (ev.xproperty.state == PropertyNewValue)
1554 selection_property (ev.xproperty.window, ev.xproperty.atom);
1555 break;
1556 }
1557#ifdef TRANSPARENT
1558 else
1559 {
1560 /* 1795 /*
1561 * if user used some Esetroot compatible prog to set the root bg, 1796 * if user used some Esetroot compatible prog to set the root bg,
1562 * use the property to determine the pixmap. We use it later on. 1797 * use the property to determine the pixmap. We use it later on.
1563 */ 1798 */
1564 if (xa[XA_XROOTPMAPID] == 0)
1565 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1566
1567 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1799 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1800 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1568 return; 1801 return;
1569 }
1570 1802
1571 /* FALLTHROUGH */ 1803 /* FALLTHROUGH */
1572 case ReparentNotify: 1804 case ReparentNotify:
1573 if ((Options & Opt_transparent) && check_our_parents ()) 1805 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1574 if (am_transparent)
1575 want_full_refresh = 1; 1806 want_refresh = want_full_refresh = 1;
1576 break; 1807 break;
1577#endif
1578 } 1808 }
1579} 1809}
1810#endif
1580 1811
1581void 1812void
1582rxvt_term::button_press (XButtonEvent &ev) 1813rxvt_term::button_press (XButtonEvent &ev)
1583{ 1814{
1584 int reportmode = 0, clickintime; 1815 int reportmode = 0, clickintime;
1585 1816
1586 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1817 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1818
1587 if (!bypass_keystate) 1819 if (!bypass_keystate)
1588 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1820 reportmode = !! (priv_modes & PrivMode_mouse_report);
1821
1589 /* 1822 /*
1590 * VT window processing of button press 1823 * VT window processing of button press
1591 */ 1824 */
1592 if (ev.window == TermWin.vt) 1825 if (ev.window == vt)
1593 { 1826 {
1827#if ISO_14755
1828 // 5.4
1829 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1830 {
1831 iso14755_54 (ev.x, ev.y);
1832 return;
1833 }
1834#endif
1835
1594 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1836 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1837
1595 if (reportmode) 1838 if (reportmode)
1596 { 1839 {
1597 /* mouse report from vt window */ 1840 /* mouse report from vt window */
1598 /* save the xbutton state (for ButtonRelease) */ 1841 /* save the xbutton state (for ButtonRelease) */
1599 MEvent.state = ev.state; 1842 MEvent.state = ev.state;
1600#ifdef MOUSE_REPORT_DOUBLECLICK 1843#ifdef MOUSE_REPORT_DOUBLECLICK
1601 if (ev.button == MEvent.button && clickintime) 1844 if (ev.button == MEvent.button && clickintime)
1602 { 1845 {
1603 /* same button, within alloted time */ 1846 /* same button, within alloted time */
1604 MEvent.clicks++; 1847 MEvent.clicks++;
1848
1605 if (MEvent.clicks > 1) 1849 if (MEvent.clicks > 1)
1606 { 1850 {
1607 /* only report double clicks */ 1851 /* only report double clicks */
1608 MEvent.clicks = 2; 1852 MEvent.clicks = 2;
1609 mouse_report (ev); 1853 mouse_report (ev);
… …
1628 } 1872 }
1629 else 1873 else
1630 { 1874 {
1631 if (ev.button != MEvent.button) 1875 if (ev.button != MEvent.button)
1632 MEvent.clicks = 0; 1876 MEvent.clicks = 0;
1877
1878 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1633 switch (ev.button) 1879 switch (ev.button)
1634 { 1880 {
1635 case Button1: 1881 case Button1:
1882 /* allow meta + click to select rectangular areas */
1883 /* should be done in screen.C */
1884#if ENABLE_FRILLS
1885 selection.rect = !!(ev.state & ModMetaMask);
1886#else
1887 selection.rect = false;
1888#endif
1889
1636 /* allow shift+left click to extend selection */ 1890 /* allow shift+left click to extend selection */
1637 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1891 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1638 { 1892 {
1639 if (MEvent.button == Button1 && clickintime) 1893 if (MEvent.button == Button1 && clickintime)
1640 selection_rotate (ev.x, ev.y); 1894 selection_rotate (ev.x, ev.y);
1641 else 1895 else
1642 selection_extend (ev.x, ev.y, 1); 1896 selection_extend (ev.x, ev.y, 1);
1643 } 1897 }
1644 else 1898 else
1645 { 1899 {
1646 if (MEvent.button == Button1 && clickintime) 1900 if (MEvent.button == Button1 && clickintime)
1647 MEvent.clicks++; 1901 MEvent.clicks++;
1648 else 1902 else
1649 MEvent.clicks = 1; 1903 MEvent.clicks = 1;
1650 1904
1651 selection_click (MEvent.clicks, ev.x, ev.y); 1905 selection_click (MEvent.clicks, ev.x, ev.y);
1652 } 1906 }
1653 1907
1654 MEvent.button = Button1; 1908 MEvent.button = Button1;
1655 break; 1909 break;
1656 1910
1657 case Button3: 1911 case Button3:
1658 if (MEvent.button == Button3 && clickintime) 1912 if (MEvent.button == Button3 && clickintime)
1659 selection_rotate (ev.x, ev.y); 1913 selection_rotate (ev.x, ev.y);
1660 else 1914 else
1661 selection_extend (ev.x, ev.y, 1); 1915 selection_extend (ev.x, ev.y, 1);
1916
1662 MEvent.button = Button3; 1917 MEvent.button = Button3;
1663 break; 1918 break;
1664 } 1919 }
1665 } 1920 }
1921
1666 MEvent.time = ev.time; 1922 MEvent.time = ev.time;
1667 return; 1923 return;
1668 } 1924 }
1669 1925
1670 /* 1926 /*
… …
1736 upordown = 1; /* down */ 1992 upordown = 1; /* down */
1737 } 1993 }
1738 if (upordown) 1994 if (upordown)
1739 { 1995 {
1740#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1996#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1741 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1997 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1742#endif 1998#endif
1743 if (scr_page (upordown < 0 ? UP : DN, 1)) 1999 if (scr_page (upordown < 0 ? UP : DN, 1))
1744 { 2000 {
1745 if (upordown < 0) 2001 if (upordown < 0)
1746 scrollBar.setUp (); 2002 scrollBar.setUp ();
… …
1762 break; 2018 break;
1763 case R_SB_ALIGN_BOTTOM: 2019 case R_SB_ALIGN_BOTTOM:
1764 csrO = scrollBar.bot - scrollBar.top; 2020 csrO = scrollBar.bot - scrollBar.top;
1765 break; 2021 break;
1766 } 2022 }
2023
1767 if (scrollBar.style == R_SB_XTERM 2024 if (scrollBar.style == R_SB_XTERM
1768 || scrollbar_above_slider (ev.y) 2025 || scrollbar_above_slider (ev.y)
1769 || scrollbar_below_slider (ev.y)) 2026 || scrollbar_below_slider (ev.y))
1770 scr_move_to ( scrollbar_position (ev.y) - csrO, 2027 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1771 scrollbar_size ()); 2028
1772 scrollBar.setMotion (); 2029 scrollBar.setMotion ();
1773 break; 2030 break;
1774 2031
1775 case Button1: 2032 case Button1:
1776 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2033 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1780 case Button3: 2037 case Button3:
1781 if (scrollBar.style != R_SB_XTERM) 2038 if (scrollBar.style != R_SB_XTERM)
1782 { 2039 {
1783 if (scrollbar_above_slider (ev.y)) 2040 if (scrollbar_above_slider (ev.y))
1784# ifdef RXVT_SCROLL_FULL 2041# ifdef RXVT_SCROLL_FULL
1785 scr_page (UP, TermWin.nrow - 1); 2042 scr_page (UP, nrow - 1);
1786# else 2043# else
1787 scr_page (UP, TermWin.nrow / 4); 2044 scr_page (UP, nrow / 4);
1788# endif 2045# endif
1789 else if (scrollbar_below_slider (ev.y)) 2046 else if (scrollbar_below_slider (ev.y))
1790# ifdef RXVT_SCROLL_FULL 2047# ifdef RXVT_SCROLL_FULL
1791 scr_page (DN, TermWin.nrow - 1); 2048 scr_page (DN, nrow - 1);
1792# else 2049# else
1793 scr_page (DN, TermWin.nrow / 4); 2050 scr_page (DN, nrow / 4);
1794# endif 2051# endif
1795 else 2052 else
1796 scrollBar.setMotion (); 2053 scrollBar.setMotion ();
1797 } 2054 }
1798 else 2055 else
1799 { 2056 {
1800 scr_page ((ev.button == Button1 ? DN : UP), 2057 scr_page ((ev.button == Button1 ? DN : UP),
1801 (TermWin.nrow 2058 (nrow
1802 * scrollbar_position (ev.y) 2059 * scrollbar_position (ev.y)
1803 / scrollbar_size ())); 2060 / scrollbar_size ()));
1804 } 2061 }
2062
1805 break; 2063 break;
1806 } 2064 }
1807 } 2065 }
2066
1808 return; 2067 return;
1809 } 2068 }
1810#if MENUBAR
1811 /*
1812 * Menubar window processing of button press
1813 */
1814 if (isMenuBarWindow (ev.window))
1815 menubar_control (ev);
1816#endif
1817} 2069}
1818 2070
1819void 2071void
1820rxvt_term::button_release (XButtonEvent &ev) 2072rxvt_term::button_release (XButtonEvent &ev)
1821{ 2073{
1822 int reportmode = 0; 2074 int reportmode = 0;
1823 2075
1824 csrO = 0; /* reset csr Offset */ 2076 csrO = 0; /* reset csr Offset */
1825 if (!bypass_keystate) 2077 if (!bypass_keystate)
1826 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2078 reportmode = !! (priv_modes & PrivMode_mouse_report);
1827 2079
1828 if (scrollbar_isUpDn ()) 2080 if (scrollbar_isUpDn ())
1829 { 2081 {
1830 scrollBar.setIdle (); 2082 scrollBar.setIdle ();
1831 scrollbar_show (0); 2083 scrollbar_show (0);
1832#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1833 refresh_type &= ~SMOOTH_REFRESH;
1834#endif
1835
1836 } 2084 }
2085
1837#ifdef SELECTION_SCROLLING 2086#ifdef SELECTION_SCROLLING
1838 pending_scroll_selection=0; 2087 if (sel_scroll_ev.active)
2088 sel_scroll_ev.stop();
1839#endif 2089#endif
2090
1840 if (ev.window == TermWin.vt) 2091 if (ev.window == vt)
1841 { 2092 {
2093#if ISO_14755
2094 // 5.4
2095 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2096 return;
2097#endif
1842 if (reportmode) 2098 if (reportmode)
1843 { 2099 {
1844 /* mouse report from vt window */ 2100 /* mouse report from vt window */
1845 /* don't report release of wheel "buttons" */ 2101 /* don't report release of wheel "buttons" */
1846 if (ev.button >= 4) 2102 if (ev.button >= 4)
… …
1860 MEvent.button = AnyButton; 2116 MEvent.button = AnyButton;
1861 mouse_report (ev); 2117 mouse_report (ev);
1862#endif /* MOUSE_REPORT_DOUBLECLICK */ 2118#endif /* MOUSE_REPORT_DOUBLECLICK */
1863 return; 2119 return;
1864 } 2120 }
2121
1865 /* 2122 /*
1866 * dumb hack to compensate for the failure of click-and-drag 2123 * dumb hack to compensate for the failure of click-and-drag
1867 * when overriding mouse reporting 2124 * when overriding mouse reporting
1868 */ 2125 */
1869 if (PrivateModes & PrivMode_mouse_report 2126 if (priv_modes & PrivMode_mouse_report
1870 && bypass_keystate 2127 && bypass_keystate
1871 && ev.button == Button1 && MEvent.clicks <= 1) 2128 && ev.button == Button1 && MEvent.clicks <= 1)
1872 selection_extend (ev.x, ev.y, 0); 2129 selection_extend (ev.x, ev.y, 0);
2130
2131 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2132 return;
1873 2133
1874 switch (ev.button) 2134 switch (ev.button)
1875 { 2135 {
1876 case Button1: 2136 case Button1:
1877 case Button3: 2137 case Button3:
1878 selection_make (ev.time); 2138 selection_make (ev.time);
1879 break; 2139 break;
2140
1880 case Button2: 2141 case Button2:
1881 selection_request (ev.time, ev.x, ev.y); 2142 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2143 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
1882 break; 2144 break;
2145
1883#ifdef MOUSE_WHEEL 2146#ifdef MOUSE_WHEEL
1884 case Button4: 2147 case Button4:
1885 case Button5: 2148 case Button5:
1886 { 2149 {
1887 int i; 2150 int i;
1888 page_dirn v; 2151 page_dirn v;
1889 2152
1890 v = (ev.button == Button4) ? UP : DN; 2153 v = ev.button == Button4 ? UP : DN;
2154
1891 if (ev.state & ShiftMask) 2155 if (ev.state & ShiftMask)
1892 i = 1; 2156 i = 1;
1893 else if ((Options & Opt_mouseWheelScrollPage)) 2157 else if (OPTION (Opt_mouseWheelScrollPage))
1894 i = TermWin.nrow - 1; 2158 i = nrow - 1;
1895 else 2159 else
1896 i = 5; 2160 i = 5;
2161
1897# ifdef MOUSE_SLIP_WHEELING 2162# ifdef MOUSE_SLIP_WHEELING
1898 if (ev.state & ControlMask) 2163 if (ev.state & ControlMask)
1899 { 2164 {
1900 mouse_slip_wheel_speed += (v ? -1 : 1); 2165 mouse_slip_wheel_speed += v ? -1 : 1;
2166 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2167 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2168
2169 if (slip_wheel_ev.at < NOW)
1901 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2170 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2171
2172 slip_wheel_ev.start ();
2173 }
2174 else
2175 {
2176# endif
2177 scr_page (v, i);
2178 scrollbar_show (1);
2179# ifdef MOUSE_SLIP_WHEELING
1902 } 2180 }
1903# endif 2181# endif
1904# ifdef JUMP_MOUSE_WHEEL
1905 scr_page (v, i);
1906 scr_refresh (SMOOTH_REFRESH);
1907 scrollbar_show (1);
1908# else
1909 while (i--)
1910 {
1911 scr_page (v, 1);
1912 scr_refresh (SMOOTH_REFRESH);
1913 scrollbar_show (1);
1914 }
1915# endif
1916
1917 } 2182 }
1918 break; 2183 break;
1919#endif 2184#endif
1920
1921 } 2185 }
1922 } 2186 }
1923#ifdef MENUBAR
1924 else if (isMenuBarWindow (ev.window))
1925 menubar_control (ev);
1926#endif
1927} 2187}
1928
1929 2188
1930#ifdef TRANSPARENT 2189#ifdef TRANSPARENT
2190#if TINTING
2191/* taken from aterm-0.4.2 */
2192
2193typedef uint32_t RUINT32T;
2194
2195void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2196{
2197 int sh_r, sh_g, sh_b;
2198 RUINT32T mask_r, mask_g, mask_b;
2199 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2200 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2201 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2202 int i;
2203
2204 Visual *visual = display->visual;
2205
2206 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2207
2208 /* for convenience */
2209 mask_r = visual->red_mask;
2210 mask_g = visual->green_mask;
2211 mask_b = visual->blue_mask;
2212
2213 /* boring lookup table pre-initialization */
2214 switch (srcImage->bits_per_pixel) {
2215 case 15:
2216 if ((mask_r != 0x7c00) ||
2217 (mask_g != 0x03e0) ||
2218 (mask_b != 0x001f))
2219 return;
2220 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2221 lookup_r = lookup;
2222 lookup_g = lookup+32;
2223 lookup_b = lookup+32+32;
2224 sh_r = 10;
2225 sh_g = 5;
2226 sh_b = 0;
2227 break;
2228 case 16:
2229 if ((mask_r != 0xf800) ||
2230 (mask_g != 0x07e0) ||
2231 (mask_b != 0x001f))
2232 return;
2233 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2234 lookup_r = lookup;
2235 lookup_g = lookup+32;
2236 lookup_b = lookup+32+64;
2237 sh_r = 11;
2238 sh_g = 5;
2239 sh_b = 0;
2240 break;
2241 case 24:
2242 if ((mask_r != 0xff0000) ||
2243 (mask_g != 0x00ff00) ||
2244 (mask_b != 0x0000ff))
2245 return;
2246 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2247 lookup_r = lookup;
2248 lookup_g = lookup+256;
2249 lookup_b = lookup+256+256;
2250 sh_r = 16;
2251 sh_g = 8;
2252 sh_b = 0;
2253 break;
2254 case 32:
2255 if ((mask_r != 0xff0000) ||
2256 (mask_g != 0x00ff00) ||
2257 (mask_b != 0x0000ff))
2258 return;
2259 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2260 lookup_r = lookup;
2261 lookup_g = lookup+256;
2262 lookup_b = lookup+256+256;
2263 sh_r = 16;
2264 sh_g = 8;
2265 sh_b = 0;
2266 break;
2267 default:
2268 return; /* we do not support this color depth */
2269 }
2270
2271 /* prepare limits for color transformation (each channel is handled separately) */
2272 if (shade < 0) {
2273 shade = -shade;
2274 if (shade < 0) shade = 0;
2275 if (shade > 100) shade = 100;
2276
2277 lower_lim_r = 65535-rm;
2278 lower_lim_g = 65535-gm;
2279 lower_lim_b = 65535-bm;
2280
2281 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2282 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2283 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2284
2285 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2286 } else {
2287 if (shade < 0) shade = 0;
2288 if (shade > 100) shade = 100;
2289
2290 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2291
2292 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2293 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2294 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2295 }
2296
2297 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2298 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2299 {
2300 unsigned int tmp;
2301
2302 tmp = lower_lim_r;
2303 lower_lim_r = lower_lim_b;
2304 lower_lim_b = tmp;
2305
2306 tmp = upper_lim_r;
2307 upper_lim_r = upper_lim_b;
2308 upper_lim_b = tmp;
2309 }
2310
2311 /* fill our lookup tables */
2312 for (i = 0; i <= mask_r>>sh_r; i++)
2313 {
2314 RUINT32T tmp;
2315 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2316 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2317 lookup_r[i] = (tmp/65535)<<sh_r;
2318 }
2319 for (i = 0; i <= mask_g>>sh_g; i++)
2320 {
2321 RUINT32T tmp;
2322 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2323 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2324 lookup_g[i] = (tmp/65535)<<sh_g;
2325 }
2326 for (i = 0; i <= mask_b>>sh_b; i++)
2327 {
2328 RUINT32T tmp;
2329 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2330 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2331 lookup_b[i] = (tmp/65535)<<sh_b;
2332 }
2333
2334 /* apply table to input image (replacing colors by newly calculated ones) */
2335 switch (srcImage->bits_per_pixel)
2336 {
2337 case 15:
2338 {
2339 unsigned short *p1, *pf, *p, *pl;
2340 p1 = (unsigned short *) srcImage->data;
2341 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2342 while (p1 < pf)
2343 {
2344 p = p1;
2345 pl = p1 + srcImage->width;
2346 for (; p < pl; p++)
2347 {
2348 *p = lookup_r[(*p & 0x7c00)>>10] |
2349 lookup_g[(*p & 0x03e0)>> 5] |
2350 lookup_b[(*p & 0x001f)];
2351 }
2352 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2353 }
2354 break;
2355 }
2356 case 16:
2357 {
2358 unsigned short *p1, *pf, *p, *pl;
2359 p1 = (unsigned short *) srcImage->data;
2360 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2361 while (p1 < pf)
2362 {
2363 p = p1;
2364 pl = p1 + srcImage->width;
2365 for (; p < pl; p++)
2366 {
2367 *p = lookup_r[(*p & 0xf800)>>11] |
2368 lookup_g[(*p & 0x07e0)>> 5] |
2369 lookup_b[(*p & 0x001f)];
2370 }
2371 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2372 }
2373 break;
2374 }
2375 case 24:
2376 {
2377 unsigned char *p1, *pf, *p, *pl;
2378 p1 = (unsigned char *) srcImage->data;
2379 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2380 while (p1 < pf)
2381 {
2382 p = p1;
2383 pl = p1 + srcImage->width * 3;
2384 for (; p < pl; p += 3)
2385 {
2386 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2387 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2388 p[2] = lookup_r[(p[2] & 0x0000ff)];
2389 }
2390 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2391 }
2392 break;
2393 }
2394 case 32:
2395 {
2396 RUINT32T *p1, *pf, *p, *pl;
2397 p1 = (RUINT32T *) srcImage->data;
2398 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2399
2400 while (p1 < pf)
2401 {
2402 p = p1;
2403 pl = p1 + srcImage->width;
2404 for (; p < pl; p++)
2405 {
2406 *p = lookup_r[(*p & 0xff0000)>>16] |
2407 lookup_g[(*p & 0x00ff00)>> 8] |
2408 lookup_b[(*p & 0x0000ff)] |
2409 (*p & ~0xffffff);
2410 }
2411 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2412 }
2413 break;
2414 }
2415 }
2416
2417 free (lookup);
2418}
2419#endif
2420
1931/* 2421/*
1932 * Check our parents are still who we think they are. 2422 * Check our parents are still who we think they are.
1933 * Do transparency updates if required 2423 * Do transparency updates if required
1934 */ 2424 */
1935int 2425int
1936rxvt_term::check_our_parents () 2426rxvt_term::check_our_parents ()
1937{ 2427{
1938 int i, pchanged, aformat, have_pixmap, rootdepth; 2428 int i, pchanged, aformat, have_pixmap, rootdepth;
1939 unsigned long nitems, bytes_after; 2429 unsigned long nitems, bytes_after;
1940 Atom atype; 2430 Atom atype;
1941 unsigned char *prop = NULL; 2431 unsigned char *prop = NULL;
1942 Window root, oldp, *list; 2432 Window root, oldp, *list;
1943 Pixmap rootpixmap = None; 2433 Pixmap rootpixmap = None;
1944 XWindowAttributes wattr, wrootattr; 2434 XWindowAttributes wattr, wrootattr;
2435 dDisp;
1945 2436
1946 pchanged = 0; 2437 pchanged = 0;
1947 2438
1948 if (! (Options & Opt_transparent)) 2439 if (!OPTION (Opt_transparent))
1949 return pchanged; /* Don't try any more */ 2440 return pchanged; /* Don't try any more */
1950 2441
1951 XGetWindowAttributes (display->display, display->root, &wrootattr); 2442 XGetWindowAttributes (disp, display->root, &wrootattr);
1952 rootdepth = wrootattr.depth; 2443 rootdepth = wrootattr.depth;
1953 2444
1954 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2445 XGetWindowAttributes (disp, parent[0], &wattr);
2446
1955 if (rootdepth != wattr.depth) 2447 if (rootdepth != wattr.depth)
1956 { 2448 {
1957 if (am_transparent) 2449 if (am_transparent)
1958 { 2450 {
1959 pchanged = 1; 2451 pchanged = 1;
1960 XSetWindowBackground (display->display, TermWin.vt, 2452 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1961 PixColors[Color_bg]);
1962 am_transparent = am_pixmap_trans = 0; 2453 am_transparent = am_pixmap_trans = 0;
1963 } 2454 }
2455
1964 return pchanged; /* Don't try any more */ 2456 return pchanged; /* Don't try any more */
1965 } 2457 }
1966 2458
1967 /* Get all X ops out of the queue so that our information is up-to-date. */ 2459 /* Get all X ops out of the queue so that our information is up-to-date. */
1968 XSync (display->display, False); 2460 XSync (disp, False);
1969 2461
1970 /* 2462 /*
1971 * Make the frame window set by the window manager have 2463 * Make the frame window set by the window manager have
1972 * the root background. Some window managers put multiple nested frame 2464 * the root background. Some window managers put multiple nested frame
1973 * windows for each client, so we have to take care about that. 2465 * windows for each client, so we have to take care about that.
1974 */ 2466 */
1975 i = (xa[XA_XROOTPMAPID] != 0 2467 i = (xa[XA_XROOTPMAP_ID]
1976 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2468 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1977 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2469 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1978 &nitems, &bytes_after, &prop) == Success)); 2470 &nitems, &bytes_after, &prop) == Success);
2471
1979 if (!i || prop == NULL) 2472 if (!i || prop == NULL)
2473 i = (xa[XA_ESETROOT_PMAP_ID]
2474 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2475 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2476 &nitems, &bytes_after, &prop) == Success);
2477
2478 if (!i || prop == NULL
2479#if TINTING
2480 || !rs[Rs_color + Color_tint]
2481#endif
2482 )
1980 have_pixmap = 0; 2483 have_pixmap = 0;
1981 else 2484 else
1982 { 2485 {
1983 have_pixmap = 1; 2486 have_pixmap = 1;
1984 rootpixmap = * ((Pixmap *)prop); 2487 rootpixmap = *(Pixmap *)prop;
1985 XFree (prop); 2488 XFree (prop);
1986 } 2489 }
2490
1987 if (have_pixmap) 2491 if (have_pixmap)
1988 { 2492 {
1989 /* 2493 /*
1990 * Copy display->root pixmap transparency 2494 * Copy display->root pixmap transparency
1991 */ 2495 */
1992 int sx, sy, nx, ny; 2496 int sx, sy, nx, ny;
1993 unsigned int nw, nh; 2497 unsigned int nw, nh;
1994 Window cr; 2498 Window cr;
1995 XImage *image; 2499 XImage *image;
1996 GC gc; 2500 GC gc;
1997 XGCValues gcvalue; 2501 XGCValues gcvalue;
1998 2502
1999 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2503 XTranslateCoordinates (disp, parent[0], display->root,
2000 0, 0, &sx, &sy, &cr); 2504 0, 0, &sx, &sy, &cr);
2001 nw = (unsigned int)szHint.width; 2505 nw = (unsigned int)szHint.width;
2002 nh = (unsigned int)szHint.height; 2506 nh = (unsigned int)szHint.height;
2003 nx = ny = 0; 2507 nx = ny = 0;
2508
2004 if (sx < 0) 2509 if (sx < 0)
2005 { 2510 {
2006 nw += sx; 2511 nw += sx;
2007 nx = -sx; 2512 nx = -sx;
2008 sx = 0; 2513 sx = 0;
2009 } 2514 }
2515
2010 if (sy < 0) 2516 if (sy < 0)
2011 { 2517 {
2012 nh += sy; 2518 nh += sy;
2013 ny = -sy; 2519 ny = -sy;
2014 sy = 0; 2520 sy = 0;
2015 } 2521 }
2522
2016 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2523 min_it (nw, (unsigned int) (wrootattr.width - sx));
2017 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2524 min_it (nh, (unsigned int) (wrootattr.height - sy));
2525
2526 XSync (disp, False);
2018 allowedxerror = -1; 2527 allowedxerror = -1;
2019 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2528 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2020 ZPixmap); 2529
2021 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2530 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2022 /* XXX: may need a delay here? */ 2531 /* XXX: may need a delay here? */
2023 allowedxerror = 0; 2532 allowedxerror = 0;
2533
2024 if (image == NULL) 2534 if (image == NULL)
2025 { 2535 {
2026 if (am_transparent && am_pixmap_trans) 2536 if (am_transparent && am_pixmap_trans)
2027 { 2537 {
2028 pchanged = 1; 2538 pchanged = 1;
2029 if (TermWin.pixmap != None) 2539 if (pixmap != None)
2030 { 2540 {
2031 XFreePixmap (display->display, TermWin.pixmap); 2541 XFreePixmap (disp, pixmap);
2032 TermWin.pixmap = None; 2542 pixmap = None;
2033 } 2543 }
2034 } 2544 }
2545
2035 am_pixmap_trans = 0; 2546 am_pixmap_trans = 0;
2036 } 2547 }
2037 else 2548 else
2038 { 2549 {
2039 if (TermWin.pixmap != None) 2550 if (pixmap != None)
2040 XFreePixmap (display->display, TermWin.pixmap); 2551 XFreePixmap (disp, pixmap);
2552
2553#if TINTING
2554 if (ISSET_PIXCOLOR (Color_tint))
2555 {
2556 unsigned short rm, gm, bm;
2557 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2558
2559 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2560
2561 ShadeXImage (display, image, shade, rm, gm, bm);
2562 }
2563#endif
2564
2041 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2565 pixmap = XCreatePixmap (disp, vt,
2042 (unsigned int)szHint.width,
2043 (unsigned int)szHint.height, 2566 szHint.width, szHint.height, image->depth);
2044 (unsigned int)image->depth);
2045 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2567 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2046 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2568 XPutImage (disp, pixmap, gc, image, 0, 0,
2047 nx, ny, (unsigned int)image->width,
2048 (unsigned int)image->height); 2569 nx, ny, image->width, image->height);
2049 XFreeGC (display->display, gc); 2570 XFreeGC (disp, gc);
2050 XDestroyImage (image); 2571 XDestroyImage (image);
2051 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2572 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2052 TermWin.pixmap); 2573 XClearWindow (disp, parent[0]);
2574
2053 if (!am_transparent || !am_pixmap_trans) 2575 if (!am_transparent || !am_pixmap_trans)
2054 pchanged = 1; 2576 pchanged = 1;
2577
2055 am_transparent = am_pixmap_trans = 1; 2578 am_transparent = am_pixmap_trans = 1;
2056 } 2579 }
2057 } 2580 }
2581
2058 if (!am_pixmap_trans) 2582 if (am_pixmap_trans)
2583 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2584 else
2059 { 2585 {
2060 unsigned int n; 2586 unsigned int n;
2061 /* 2587 /*
2062 * InheritPixmap transparency 2588 * InheritPixmap transparency
2063 */ 2589 */
2064 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2065 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2590 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2066 i++)
2067 { 2591 {
2068 oldp = TermWin.parent[i]; 2592 oldp = parent[i];
2069 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2593 XQueryTree (disp, parent[i - 1], &root,
2070 &TermWin.parent[i], &list, &n); 2594 &parent[i], &list, &n);
2071 XFree (list); 2595 XFree (list);
2072 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2596
2073 if (TermWin.parent[i] == display->root) 2597 if (parent[i] == display->root)
2074 { 2598 {
2075 if (oldp != None) 2599 if (oldp != None)
2076 pchanged = 1; 2600 pchanged = 1;
2601
2077 break; 2602 break;
2078 } 2603 }
2604
2079 if (oldp != TermWin.parent[i]) 2605 if (oldp != parent[i])
2080 pchanged = 1; 2606 pchanged = 1;
2081 } 2607 }
2608
2082 n = 0; 2609 n = 0;
2610
2083 if (pchanged) 2611 if (pchanged)
2084 { 2612 {
2085 for (; n < (unsigned int)i; n++) 2613 for (; n < (unsigned int)i; n++)
2086 { 2614 {
2087 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2615 XGetWindowAttributes (disp, parent[n], &wattr);
2088 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2089 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2616 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2090 { 2617 {
2091 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2618 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2092 break; 2619 break;
2093 } 2620 }
2094 } 2621 }
2095 } 2622 }
2096 if (n > (int) (sizeof (TermWin.parent) 2623
2097 / sizeof (TermWin.parent[0]))) 2624 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2098 { 2625 {
2099 D_X ((stderr, "InheritPixmap Turning off")); 2626 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2100 XSetWindowBackground (display->display, TermWin.parent[0], 2627 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2101 PixColors[Color_fg]);
2102 XSetWindowBackground (display->display, TermWin.vt,
2103 PixColors[Color_bg]);
2104 am_transparent = 0; 2628 am_transparent = 0;
2105 /* XXX: also turn off Opt_transparent? */ 2629 /* XXX: also turn off Opt_transparent? */
2106 } 2630 }
2107 else 2631 else
2108 { 2632 {
2633#if WAIT_FOR_WM
2109 /* wait (an arbitrary period) for the WM to do its thing 2634 /* wait (an arbitrary period) for the WM to do its thing
2110 * needed for fvwm2.2.2 (and before?) */ 2635 * needed for fvwm2.2.2 (and before?) */
2111# ifdef HAVE_NANOSLEEP
2112 struct timespec rqt;
2113
2114 rqt.tv_sec = 1;
2115 rqt.tv_nsec = 0;
2116 nanosleep (&rqt, NULL);
2117# else
2118 sleep (1); 2636 sleep (1);
2119# endif 2637#endif
2120 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2121 for (n = 0; n < (unsigned int)i; n++) 2638 for (n = 0; n < (unsigned int)i; n++)
2122 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2639 {
2123 ParentRelative); 2640 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2124 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2641 XClearWindow (disp, parent[n]);
2125 ParentRelative); 2642 }
2643
2644 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2126 am_transparent = 1; 2645 am_transparent = 1;
2127 } 2646 }
2647
2128 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2648 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2129 TermWin.parent[i] = None; 2649 parent[i] = None;
2650 }
2651
2652 if (scrollBar.win)
2130 } 2653 {
2654 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2655 scrollBar.setIdle ();
2656 scrollbar_show (0);
2657 }
2658
2659 if (am_transparent)
2660 {
2661 want_refresh = want_full_refresh = 1;
2662 if (am_pixmap_trans)
2663 flush ();
2664 }
2665
2131 return pchanged; 2666 return pchanged;
2132} 2667}
2133#endif 2668#endif
2134 2669
2135/*}}} */ 2670/*}}} */
2671
2672bool
2673rxvt_term::cmd_parse ()
2674{
2675 bool flag = false;
2676 wchar_t ch = NOCHAR;
2677 char *seq_begin; // remember start of esc-sequence here
2678
2679 for (;;)
2680 {
2681 if (ch == NOCHAR)
2682 {
2683 seq_begin = cmdbuf_ptr;
2684 ch = next_char ();
2685
2686 if (ch == NOCHAR)
2687 break;
2688 }
2689
2690 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2691 {
2692 if (!seen_input)
2693 {
2694 seen_input = 1;
2695 // many badly-written programs (e.g. jed) contain a race condition:
2696 // they first read the screensize and then install a SIGWINCH handler.
2697 // some window managers resize the window early, and these programs
2698 // then sometimes get the size wrong.
2699 // unfortunately other programs are even more buggy and dislike
2700 // being sent SIGWINCH, so only do it when we were in fact being
2701 // resized.
2702 if (seen_resize && cmd_pid)
2703 kill (-cmd_pid, SIGWINCH);
2704 }
2705
2706 /* Read a text string from the input buffer */
2707 wchar_t buf[UBUFSIZ];
2708 bool refreshnow = false;
2709 int nlines = 0;
2710 wchar_t *str = buf;
2711 wchar_t *eol = str + min (ncol, UBUFSIZ);
2712
2713 for (;;)
2714 {
2715 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2716 break;
2717
2718 *str++ = ch;
2719
2720 if (ch == C0_LF || str >= eol)
2721 {
2722 if (ch == C0_LF)
2723 nlines++;
2724
2725 refresh_count++;
2726
2727 if (!OPTION (Opt_jumpScroll)
2728 || (refresh_count >= refresh_limit * (nrow - 1)))
2729 {
2730 refreshnow = true;
2731 refresh_count = 0;
2732 ch = NOCHAR;
2733 break;
2734 }
2735
2736 // scr_add_lines only works for nlines <= nrow - 1.
2737 if (nlines >= nrow - 1)
2738 {
2739 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2741 scr_add_lines (buf, str - buf, nlines);
2742
2743 nlines = 0;
2744 str = buf;
2745 eol = str + min (ncol, UBUFSIZ);
2746 }
2747
2748 if (str >= eol)
2749 {
2750 if (eol >= buf + UBUFSIZ)
2751 {
2752 ch = NOCHAR;
2753 break;
2754 }
2755 else
2756 eol = min (eol + ncol, buf + UBUFSIZ);
2757 }
2758
2759 }
2760
2761 seq_begin = cmdbuf_ptr;
2762 ch = next_char ();
2763 }
2764
2765 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2766 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2767 scr_add_lines (buf, str - buf, nlines);
2768
2769 /*
2770 * If there have been a lot of new lines, then update the screen
2771 * What the heck I'll cheat and only refresh less than every page-full.
2772 * the number of pages between refreshes is refresh_limit, which
2773 * is incremented here because we must be doing flat-out scrolling.
2774 */
2775 if (refreshnow)
2776 {
2777 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2778 refresh_limit++;
2779 else
2780 {
2781 flag = true;
2782 scr_refresh ();
2783 want_refresh = 1;
2784 }
2785 }
2786
2787 }
2788 else
2789 {
2790 try
2791 {
2792 process_nonprinting (ch);
2793 }
2794 catch (const class out_of_input &o)
2795 {
2796 // we ran out of input, retry later
2797 cmdbuf_ptr = seq_begin;
2798 break;
2799 }
2800
2801 ch = NOCHAR;
2802 }
2803 }
2804
2805 return flag;
2806}
2807
2808// read the next character
2809wchar_t
2810rxvt_term::next_char () NOTHROW
2811{
2812 while (cmdbuf_ptr < cmdbuf_endp)
2813 {
2814 // assume 7-bit to be ascii ALWAYS
2815 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2816 return *cmdbuf_ptr++;
2817
2818 wchar_t wc;
2819 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2820
2821 if (len == (size_t)-2)
2822 {
2823 // the mbstate stores incomplete sequences. didn't know this :/
2824 cmdbuf_ptr = cmdbuf_endp;
2825 break;
2826 }
2827
2828 if (len == (size_t)-1)
2829 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2830
2831 // assume wchar == unicode
2832 cmdbuf_ptr += len;
2833 return wc & UNICODE_MASK;
2834 }
2835
2836 return NOCHAR;
2837}
2838
2839// read the next octet
2840uint32_t
2841rxvt_term::next_octet () NOTHROW
2842{
2843 return cmdbuf_ptr < cmdbuf_endp
2844 ? (unsigned char)*cmdbuf_ptr++
2845 : NOCHAR;
2846}
2847
2848static class out_of_input out_of_input;
2849
2850/* rxvt_cmd_getc () - Return next input character */
2851/*
2852 * Return the next input character after first passing any keyboard input
2853 * to the command.
2854 */
2855wchar_t
2856rxvt_term::cmd_getc () THROW ((class out_of_input))
2857{
2858 wchar_t c = next_char ();
2859
2860 if (c == NOCHAR)
2861 throw out_of_input;
2862
2863 return c;
2864}
2865
2866uint32_t
2867rxvt_term::cmd_get8 () THROW ((class out_of_input))
2868{
2869 uint32_t c = next_octet ();
2870
2871 if (c == NOCHAR)
2872 throw out_of_input;
2873
2874 return c;
2875}
2136 2876
2137/*{{{ print pipe */ 2877/*{{{ print pipe */
2138/*----------------------------------------------------------------------*/ 2878/*----------------------------------------------------------------------*/
2139#ifdef PRINTPIPE 2879#ifdef PRINTPIPE
2140FILE * 2880FILE *
2141rxvt_term::popen_printer () 2881rxvt_term::popen_printer ()
2142{ 2882{
2143 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2883 FILE *stream = popen (rs[Rs_print_pipe], "w");
2144 2884
2145 if (stream == NULL) 2885 if (stream == NULL)
2146 rxvt_print_error ("can't open printer pipe"); 2886 rxvt_warn ("can't open printer pipe, not printing.\n");
2887
2147 return stream; 2888 return stream;
2148} 2889}
2149 2890
2150int 2891int
2151rxvt_term::pclose_printer (FILE *stream) 2892rxvt_term::pclose_printer (FILE *stream)
2152{ 2893{
2153 fflush (stream); 2894 fflush (stream);
2154 /* pclose () reported not to work on SunOS 4.1.3 */
2155# if defined (__sun__) /* TODO: RESOLVE THIS */
2156 /* pclose works provided SIGCHLD handler uses waitpid */
2157 return pclose (stream); /* return fclose (stream); */
2158# else
2159 return pclose (stream); 2895 return pclose (stream);
2160# endif
2161} 2896}
2162 2897
2163/* 2898/*
2164 * simulate attached vt100 printer 2899 * simulate attached vt100 printer
2165 */ 2900 */
2166void 2901void
2167rxvt_term::process_print_pipe () 2902rxvt_term::process_print_pipe ()
2168{ 2903{
2169 int done; 2904 int done;
2170 FILE *fd; 2905 FILE *fd;
2171 2906
2172 if ((fd = popen_printer ()) == NULL) 2907 if ((fd = popen_printer ()) == NULL)
2173 return; 2908 return;
2174 2909
2175 /* 2910 /*
2176 * Send all input to the printer until either ESC[4i or ESC[?4i 2911 * Send all input to the printer until either ESC[4i or ESC[?4i
2177 * is received. 2912 * is received.
2178 */ 2913 */
2179 for (done = 0; !done;) 2914 for (done = 0; !done;)
2180 { 2915 {
2181 unsigned char buf[8]; 2916 unsigned char buf[8];
2182 unsigned char ch; 2917 unicode_t ch;
2183 unsigned int i, len; 2918 unsigned int i, len;
2184 2919
2185 if ((ch = cmd_getc ()) != C0_ESC) 2920 if ((ch = cmd_getc ()) != C0_ESC)
2186 { 2921 {
2187 if (putc (ch, fd) == EOF) 2922 if (putc (ch, fd) == EOF)
2188 break; /* done = 1 */ 2923 break; /* done = 1 */
… …
2203 { 2938 {
2204 if ((buf[len++] = cmd_getc ()) == 'i') 2939 if ((buf[len++] = cmd_getc ()) == 'i')
2205 break; /* done = 1 */ 2940 break; /* done = 1 */
2206 } 2941 }
2207 } 2942 }
2943
2208 for (i = 0; i < len; i++) 2944 for (i = 0; i < len; i++)
2209 if (putc (buf[i], fd) == EOF) 2945 if (putc (buf[i], fd) == EOF)
2210 { 2946 {
2211 done = 1; 2947 done = 1;
2212 break; 2948 break;
2213 } 2949 }
2214 } 2950 }
2215 } 2951 }
2952
2216 pclose_printer (fd); 2953 pclose_printer (fd);
2217} 2954}
2218#endif /* PRINTPIPE */ 2955#endif /* PRINTPIPE */
2219/*}}} */ 2956/*}}} */
2220 2957
2221/* *INDENT-OFF* */ 2958/* *INDENT-OFF* */
2222enum { 2959enum {
2223 C1_40 = 0x40, 2960 C1_40 = 0x40,
2224 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2961 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2225 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2962 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2226 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2963 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2227 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2964 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2228}; 2965};
2229/* *INDENT-ON* */ 2966/* *INDENT-ON* */
2230 2967
2231/*{{{ process non-printing single characters */ 2968/*{{{ process non-printing single characters */
2232void 2969void
2233rxvt_term::process_nonprinting (unsigned char ch) 2970rxvt_term::process_nonprinting (unicode_t ch)
2234{ 2971{
2235 switch (ch) 2972 switch (ch)
2236 { 2973 {
2974 case C0_ESC:
2975 process_escape_seq ();
2976 break;
2237 case C0_ENQ: /* terminal Status */ 2977 case C0_ENQ: /* terminal Status */
2238 if (rs[Rs_answerbackstring]) 2978 if (rs[Rs_answerbackstring])
2239 tt_write ( 2979 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2240 (const unsigned char *)rs[Rs_answerbackstring],
2241 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2242 else 2980 else
2243 tt_write ((unsigned char *)VT100_ANS, 2981 tt_write (VT100_ANS, strlen (VT100_ANS));
2244 (unsigned int)STRLEN (VT100_ANS));
2245 break; 2982 break;
2246 case C0_BEL: /* bell */ 2983 case C0_BEL: /* bell */
2247 scr_bell (); 2984 scr_bell ();
2248 break; 2985 break;
2249 case C0_BS: /* backspace */ 2986 case C0_BS: /* backspace */
… …
2264 scr_charset_choose (1); 3001 scr_charset_choose (1);
2265 break; 3002 break;
2266 case C0_SI: /* shift in - acs */ 3003 case C0_SI: /* shift in - acs */
2267 scr_charset_choose (0); 3004 scr_charset_choose (0);
2268 break; 3005 break;
3006
3007#ifdef EIGHT_BIT_CONTROLS
3008 // 8-bit controls
3009 case 0x90: /* DCS */
3010 process_dcs_seq ();
3011 break;
3012 case 0x9b: /* CSI */
3013 process_csi_seq ();
3014 break;
3015 case 0x9d: /* CSI */
3016 process_osc_seq ();
3017 break;
3018#endif
2269 } 3019 }
2270} 3020}
2271/*}}} */ 3021/*}}} */
2272 3022
2273 3023
2274/*{{{ process VT52 escape sequences */ 3024/*{{{ process VT52 escape sequences */
2275void 3025void
2276rxvt_term::process_escape_vt52 (unsigned char ch) 3026rxvt_term::process_escape_vt52 (unicode_t ch)
2277{ 3027{
2278 int row, col; 3028 int row, col;
2279 3029
2280 switch (ch) 3030 switch (ch)
2281 { 3031 {
… …
2333 3083
2334/*{{{ process escape sequences */ 3084/*{{{ process escape sequences */
2335void 3085void
2336rxvt_term::process_escape_seq () 3086rxvt_term::process_escape_seq ()
2337{ 3087{
2338 unsigned char ch = cmd_getc (); 3088 unicode_t ch = cmd_getc ();
2339 3089
2340 if (PrivateModes & PrivMode_vt52) 3090 if (priv_modes & PrivMode_vt52)
2341 { 3091 {
2342 process_escape_vt52 (ch); 3092 process_escape_vt52 (ch);
2343 return; 3093 return;
2344 } 3094 }
2345 3095
… …
2360 scr_charset_set (2, (unsigned int)cmd_getc ()); 3110 scr_charset_set (2, (unsigned int)cmd_getc ());
2361 break; 3111 break;
2362 case '+': 3112 case '+':
2363 scr_charset_set (3, (unsigned int)cmd_getc ()); 3113 scr_charset_set (3, (unsigned int)cmd_getc ());
2364 break; 3114 break;
2365#ifdef MULTICHAR_SET 3115#if ENABLE_FRILLS
2366 case '$':
2367 scr_charset_set (-2, (unsigned int)cmd_getc ());
2368 break;
2369#endif
2370#ifndef NO_FRILLS
2371 case '6': 3116 case '6':
2372 scr_backindex (); 3117 scr_backindex ();
2373 break; 3118 break;
2374#endif 3119#endif
2375 case '7': 3120 case '7':
2376 scr_cursor (SAVE); 3121 scr_cursor (SAVE);
2377 break; 3122 break;
2378 case '8': 3123 case '8':
2379 scr_cursor (RESTORE); 3124 scr_cursor (RESTORE);
2380 break; 3125 break;
2381#ifndef NO_FRILLS 3126#if ENABLE_FRILLS
2382 case '9': 3127 case '9':
2383 scr_forwardindex (); 3128 scr_forwardindex ();
2384 break; 3129 break;
2385#endif 3130#endif
2386 case '=': 3131 case '=':
… …
2396 break; 3141 break;
2397 3142
2398 /* 8.3.87: NEXT LINE */ 3143 /* 8.3.87: NEXT LINE */
2399 case C1_NEL: /* ESC E */ 3144 case C1_NEL: /* ESC E */
2400 { 3145 {
2401 uint32_t nlcr[] = { '\n', '\r' }; 3146 wchar_t nlcr[] = { C0_LF, C0_CR };
2402 scr_add_lines (nlcr, 1, 2); 3147 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2403 } 3148 }
2404 break; 3149 break;
2405 3150
2406 /* kidnapped escape sequence: Should be 8.3.48 */ 3151 /* kidnapped escape sequence: Should be 8.3.48 */
2407 case C1_ESA: /* ESC G */ 3152 case C1_ESA: /* ESC G */
… …
2417 case C1_RI: /* ESC M */ 3162 case C1_RI: /* ESC M */
2418 scr_index (DN); 3163 scr_index (DN);
2419 break; 3164 break;
2420 3165
2421 /* 8.3.142: SINGLE-SHIFT TWO */ 3166 /* 8.3.142: SINGLE-SHIFT TWO */
2422 /*case C1_SS2: scr_single_shift (2); break; */ 3167 /*case C1_SS2: scr_single_shift (2); break; */
2423 3168
2424 /* 8.3.143: SINGLE-SHIFT THREE */ 3169 /* 8.3.143: SINGLE-SHIFT THREE */
2425 /*case C1_SS3: scr_single_shift (3); break; */ 3170 /*case C1_SS3: scr_single_shift (3); break; */
2426 3171
2427 /* 8.3.27: DEVICE CONTROL STRING */ 3172 /* 8.3.27: DEVICE CONTROL STRING */
2428 case C1_DCS: /* ESC P */ 3173 case C1_DCS: /* ESC P */
2429 process_dcs_seq (); 3174 process_dcs_seq ();
2430 break; 3175 break;
2431 3176
2432 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3177 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2433 case C1_SCI: /* ESC Z */ 3178 case C1_SCI: /* ESC Z */
2434 tt_write ((const unsigned char *)ESCZ_ANSWER, 3179 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2435 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2436 break; /* steal obsolete ESC [ c */ 3180 break; /* steal obsolete ESC [ c */
2437 3181
2438 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3182 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2439 case C1_CSI: /* ESC [ */ 3183 case C1_CSI: /* ESC [ */
2440 process_csi_seq (); 3184 process_csi_seq ();
… …
2445 process_osc_seq (); 3189 process_osc_seq ();
2446 break; 3190 break;
2447 3191
2448 /* 8.3.106: RESET TO INITIAL STATE */ 3192 /* 8.3.106: RESET TO INITIAL STATE */
2449 case 'c': 3193 case 'c':
3194 mbstate.reset ();
2450 scr_poweron (); 3195 scr_poweron ();
2451 scrollbar_show (1); 3196 scrollbar_show (1);
2452 break; 3197 break;
2453 3198
2454 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3199 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2466 3211
2467/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3212/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2468/* *INDENT-OFF* */ 3213/* *INDENT-OFF* */
2469enum { 3214enum {
2470 CSI_ICH = 0x40, 3215 CSI_ICH = 0x40,
2471 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3216 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2472 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3217 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2473 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3218 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2474 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3219 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2475 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3220 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2476 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3221 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2491 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3236 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2492 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3237 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2493 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3238 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2494 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3239 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2495 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3240 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2496 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3241 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2497 }; 3242 };
2498/* *INDENT-ON* */ 3243/* *INDENT-ON* */
2499 3244
2500void 3245void
2501rxvt_term::process_csi_seq () 3246rxvt_term::process_csi_seq ()
2502{ 3247{
2503 unsigned char ch, priv, i; 3248 unicode_t ch, priv, i;
2504 unsigned int nargs, p; 3249 unsigned int nargs, p;
2505 int n, ndef; 3250 int n, ndef;
2506 int arg[ESC_ARGS]; 3251 int arg[ESC_ARGS];
2507 3252
2508 for (nargs = ESC_ARGS; nargs > 0;) 3253 for (nargs = ESC_ARGS; nargs > 0;)
2509 arg[--nargs] = 0; 3254 arg[--nargs] = 0;
2510 3255
2511 priv = 0; 3256 priv = 0;
… …
2513 if (ch >= '<' && ch <= '?') 3258 if (ch >= '<' && ch <= '?')
2514 { /* '<' '=' '>' '?' */ 3259 { /* '<' '=' '>' '?' */
2515 priv = ch; 3260 priv = ch;
2516 ch = cmd_getc (); 3261 ch = cmd_getc ();
2517 } 3262 }
3263
2518 /* read any numerical arguments */ 3264 /* read any numerical arguments */
2519 for (n = -1; ch < CSI_ICH; ) 3265 for (n = -1; ch < CSI_ICH; )
2520 { 3266 {
2521 if (isdigit (ch)) 3267 if (isdigit (ch))
2522 { 3268 {
… …
2529 { 3275 {
2530 if (nargs < ESC_ARGS) 3276 if (nargs < ESC_ARGS)
2531 arg[nargs++] = n; 3277 arg[nargs++] = n;
2532 n = -1; 3278 n = -1;
2533 } 3279 }
2534 else if (ch == '\b') 3280 else if (IS_CONTROL (ch))
2535 {
2536 scr_backspace ();
2537 }
2538 else if (ch == C0_ESC)
2539 {
2540 process_escape_seq ();
2541 return;
2542 }
2543 else if (ch < ' ')
2544 {
2545 process_nonprinting (ch); 3281 process_nonprinting (ch);
2546 } 3282
2547 ch = cmd_getc (); 3283 ch = cmd_getc ();
2548 } 3284 }
2549 3285
2550 if (ch > CSI_7F) 3286 if (ch > CSI_7F)
2551 return; 3287 return;
… …
2573 { 3309 {
2574 switch (priv) 3310 switch (priv)
2575 { 3311 {
2576 case '>': 3312 case '>':
2577 if (ch == CSI_DA) /* secondary device attributes */ 3313 if (ch == CSI_DA) /* secondary device attributes */
2578 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3314 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2579 break; 3315 break;
2580 case '?': 3316 case '?':
2581 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3317 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2582 process_terminal_mode (ch, priv, nargs, arg); 3318 process_terminal_mode (ch, priv, nargs, arg);
2583 break; 3319 break;
… …
2688 3424
2689 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3425 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2690 arg[0] = -arg[0]; 3426 arg[0] = -arg[0];
2691 /* FALLTHROUGH */ 3427 /* FALLTHROUGH */
2692 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3428 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2693 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3429 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2694 break; 3430 break;
2695 3431
2696 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3432 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2697 tt_write ((const unsigned char *)VT100_ANS, 3433 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2698 (unsigned int) (sizeof (VT100_ANS) - 1));
2699 break; 3434 break;
2700 3435
2701 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3436 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2702 process_sgr_mode (nargs, arg); 3437 process_sgr_mode (nargs, arg);
2703 break; 3438 break;
… …
2709 tt_printf ("\033[0n"); 3444 tt_printf ("\033[0n");
2710 break; 3445 break;
2711 case 6: /* CPR requested */ 3446 case 6: /* CPR requested */
2712 scr_report_position (); 3447 scr_report_position ();
2713 break; 3448 break;
2714#if defined (ENABLE_DISPLAY_ANSWER)
2715 case 7: /* unofficial extension */ 3449 case 7: /* unofficial extension */
3450 if (OPTION (Opt_insecure))
2716 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3451 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2717 break; 3452 break;
2718#endif
2719 case 8: /* unofficial extension */ 3453 case 8: /* unofficial extension */
2720 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3454 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2721 break; 3455 break;
2722 } 3456 }
2723 break; 3457 break;
2724 3458
2725 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3459 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2758 break; 3492 break;
2759 3493
2760 case CSI_RM: /* 8.3.107: RESET MODE */ 3494 case CSI_RM: /* 8.3.107: RESET MODE */
2761 if (arg[0] == 4) 3495 if (arg[0] == 4)
2762 scr_insert_mode (0); 3496 scr_insert_mode (0);
3497 else if (arg[0] == 20)
3498 priv_modes &= ~PrivMode_LFNL;
2763 break; 3499 break;
2764 3500
2765 case CSI_SM: /* 8.3.126: SET MODE */ 3501 case CSI_SM: /* 8.3.126: SET MODE */
2766 if (arg[0] == 4) 3502 if (arg[0] == 4)
2767 scr_insert_mode (1); 3503 scr_insert_mode (1);
3504 else if (arg[0] == 20)
3505 priv_modes |= PrivMode_LFNL;
2768 break; 3506 break;
2769 3507
2770 /* 3508 /*
2771 * PRIVATE USE beyond this point. All CSI_7? sequences here 3509 * PRIVATE USE beyond this point. All CSI_7? sequences here
2772 */ 3510 */
… …
2784 break; 3522 break;
2785 case CSI_75: 3523 case CSI_75:
2786 scr_cursor (RESTORE); 3524 scr_cursor (RESTORE);
2787 break; 3525 break;
2788 3526
2789#ifndef NO_FRILLS 3527#if ENABLE_FRILLS
2790 case CSI_74: 3528 case CSI_74:
2791 process_window_ops (arg, nargs); 3529 process_window_ops (arg, nargs);
2792 break; 3530 break;
2793#endif 3531#endif
2794 3532
2795 case CSI_78: /* DECREQTPARM */ 3533 case CSI_78: /* DECREQTPARM */
2796 if (arg[0] == 0 || arg[0] == 1) 3534 if (arg[0] == 0 || arg[0] == 1)
2797 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3535 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2798 /* FALLTHROUGH */ 3536 break;
2799 3537
2800 default: 3538 default:
2801 break; 3539 break;
2802 } 3540 }
2803} 3541}
2804/*}}} */ 3542/*}}} */
2805 3543
2806#ifndef NO_FRILLS 3544#if ENABLE_FRILLS
2807/* ARGSUSED */ 3545/* ARGSUSED */
2808void 3546void
2809rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3547rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2810{ 3548{
2811 int x, y; 3549 int x, y;
2812#if 0
2813 char *s;
2814#endif
2815 XWindowAttributes wattr; 3550 XWindowAttributes wattr;
2816 Window wdummy; 3551 Window wdummy;
3552 dDisp;
2817 3553
2818 if (nargs == 0) 3554 if (nargs == 0)
2819 return; 3555 return;
3556
2820 switch (args[0]) 3557 switch (args[0])
2821 { 3558 {
2822 /* 3559 /*
2823 * commands 3560 * commands
2824 */ 3561 */
2825 case 1: /* deiconify window */ 3562 case 1: /* deiconify window */
2826 XMapWindow (display->display, TermWin.parent[0]); 3563 XMapWindow (disp, parent[0]);
2827 break; 3564 break;
2828 case 2: /* iconify window */ 3565 case 2: /* iconify window */
2829 XIconifyWindow (display->display, TermWin.parent[0], 3566 XIconifyWindow (disp, parent[0], display->screen);
2830 DefaultScreen (display->display));
2831 break; 3567 break;
2832 case 3: /* set position (pixels) */ 3568 case 3: /* set position (pixels) */
2833 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3569 XMoveWindow (disp, parent[0], args[1], args[2]);
2834 break; 3570 break;
2835 case 4: /* set size (pixels) */ 3571 case 4: /* set size (pixels) */
2836 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3572 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2837 break; 3573 break;
2838 case 5: /* raise window */ 3574 case 5: /* raise window */
2839 XRaiseWindow (display->display, TermWin.parent[0]); 3575 XRaiseWindow (disp, parent[0]);
2840 break; 3576 break;
2841 case 6: /* lower window */ 3577 case 6: /* lower window */
2842 XLowerWindow (display->display, TermWin.parent[0]); 3578 XLowerWindow (disp, parent[0]);
2843 break; 3579 break;
2844 case 7: /* refresh window */ 3580 case 7: /* refresh window */
2845 scr_touch (true); 3581 scr_touch (true);
2846 break; 3582 break;
2847 case 8: /* set size (chars) */ 3583 case 8: /* set size (chars) */
2848 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3584 set_widthheight ((unsigned int) (args[2] * fwidth),
2849 (unsigned int) (args[1] * TermWin.fheight)); 3585 (unsigned int) (args[1] * fheight));
2850 break; 3586 break;
3587
3588 //case 9: NYI, TODO, restore maximized window or maximize window
2851 default: 3589 default:
2852 if (args[0] >= 24) /* set height (chars) */ 3590 if (args[0] >= 24) /* set height (chars) */
2853 set_widthheight ((unsigned int)TermWin.width, 3591 set_widthheight ((unsigned int)width,
2854 (unsigned int) (args[1] * TermWin.fheight)); 3592 (unsigned int) (args[1] * fheight));
2855 break; 3593 break;
3594
3595
2856 /* 3596 /*
2857 * reports - some output format copied from XTerm 3597 * reports - some output format copied from XTerm
2858 */ 3598 */
2859 case 11: /* report window state */ 3599 case 11: /* report window state */
2860 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3600 XGetWindowAttributes (disp, parent[0], &wattr);
2861 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3601 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2862 break; 3602 break;
2863 case 13: /* report window position */ 3603 case 13: /* report window position */
2864 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3604 XGetWindowAttributes (disp, parent[0], &wattr);
2865 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3605 XTranslateCoordinates (disp, parent[0], wattr.root,
2866 -wattr.border_width, -wattr.border_width, 3606 -wattr.border_width, -wattr.border_width,
2867 &x, &y, &wdummy); 3607 &x, &y, &wdummy);
2868 tt_printf ("\033[3;%d;%dt", x, y); 3608 tt_printf ("\033[3;%d;%dt", x, y);
2869 break; 3609 break;
2870 case 14: /* report window size (pixels) */ 3610 case 14: /* report window size (pixels) */
2871 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3611 XGetWindowAttributes (disp, parent[0], &wattr);
2872 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3612 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2873 break; 3613 break;
3614 case 18: /* report text area size (chars) */
3615 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3616 break;
2874 case 18: /* report window size (chars) */ 3617 case 19: /* report window size (chars) */
2875 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3618 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2876 break; 3619 break;
2877#if 0 /* XXX: currently disabled due to security concerns */
2878 case 20: /* report icon label */ 3620 case 20: /* report icon label */
3621 {
3622 char *s;
2879 XGetIconName (display->display, TermWin.parent[0], &s); 3623 XGetIconName (disp, parent[0], &s);
2880 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3624 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3625 XFree (s);
3626 }
2881 break; 3627 break;
2882 case 21: /* report window title */ 3628 case 21: /* report window title */
3629 {
3630 char *s;
2883 XFetchName (display->display, TermWin.parent[0], &s); 3631 XFetchName (disp, parent[0], &s);
2884 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3632 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3633 XFree (s);
3634 }
2885 break; 3635 break;
2886#endif
2887
2888 } 3636 }
2889} 3637}
2890#endif 3638#endif
2891 3639
2892/*----------------------------------------------------------------------*/ 3640/*----------------------------------------------------------------------*/
2893/* 3641/*
2894 * get input up until STRING TERMINATOR (or BEL) 3642 * get input up until STRING TERMINATOR (or BEL)
2895 * ends_how is terminator used. returned input must be free ()d 3643 * ends_how is terminator used. returned input must be free()'d
2896 */ 3644 */
2897unsigned char * 3645char *
2898rxvt_term::get_to_st (unsigned char *ends_how) 3646rxvt_term::get_to_st (unicode_t &ends_how)
2899{ 3647{
2900 int seen_esc = 0; /* seen escape? */ 3648 unicode_t ch;
3649 bool seen_esc = false;
2901 unsigned int n = 0; 3650 unsigned int n = 0;
2902 unsigned char *s; 3651 wchar_t string[STRING_MAX];
2903 unsigned char ch, string[STRING_MAX];
2904 3652
2905 for (; (ch = cmd_getc ());) 3653 while ((ch = cmd_getc ()) != NOCHAR)
2906 { 3654 {
2907 if (ch == C0_BEL 3655 if (seen_esc)
2908 || ch == CHAR_ST 3656 {
2909 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3657 if (ch == 0x5c) /* 7bit ST */
2910 break; 3658 break;
3659 else
3660 return NULL;
3661 }
2911 if (ch == C0_ESC) 3662 else if (ch == C0_ESC)
2912 { 3663 {
2913 seen_esc = 1; 3664 seen_esc = true;
2914 continue; 3665 continue;
2915 } 3666 }
2916 else if (ch == '\t') 3667 else if (ch == C0_BEL || ch == CHAR_ST)
2917 ch = ' '; /* translate '\t' to space */ 3668 break;
2918 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3669 else if (ch < 0x20)
2919 return NULL; /* other control character - exit */ 3670 return NULL; /* other control character - exit */
2920 if (n < sizeof (string) - 1) 3671
3672 seen_esc = false;
3673
3674 if (n >= STRING_MAX - 1)
3675 // stop at some sane length
3676 return NULL;
3677
3678 if (ch == C0_SYN)
3679 string[n++] = cmd_get8 ();
3680 else
2921 string[n++] = ch; 3681 string[n++] = ch;
2922 seen_esc = 0;
2923 } 3682 }
3683
2924 string[n++] = '\0'; 3684 string[n++] = '\0';
2925 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3685
2926 return NULL;
2927 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3686 ends_how = (ch == 0x5c ? C0_ESC : ch);
2928 STRNCPY (s, string, n); 3687
2929 return s; 3688 return rxvt_wcstombs (string);
2930} 3689}
2931 3690
2932/*----------------------------------------------------------------------*/ 3691/*----------------------------------------------------------------------*/
2933/* 3692/*
2934 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3693 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2935 */ 3694 */
2936void 3695void
2937rxvt_term::process_dcs_seq () 3696rxvt_term::process_dcs_seq ()
2938{ 3697{
2939 unsigned char eh, *s; 3698 char *s;
3699 unicode_t eh;
3700
2940 /* 3701 /*
2941 * Not handled yet 3702 * Not handled yet
2942 */ 3703 */
2943 s = get_to_st (&eh); 3704 s = get_to_st (eh);
2944 if (s) 3705 if (s)
2945 free (s); 3706 free (s);
3707
2946 return; 3708 return;
2947} 3709}
2948 3710
2949/*----------------------------------------------------------------------*/ 3711/*----------------------------------------------------------------------*/
2950/* 3712/*
2951 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3713 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2952 */ 3714 */
2953void 3715void
2954rxvt_term::process_osc_seq () 3716rxvt_term::process_osc_seq ()
2955{ 3717{
2956 unsigned char ch, eh, *s; 3718 unicode_t ch, eh;
2957 int arg; 3719 int arg;
2958 3720
2959 ch = cmd_getc (); 3721 ch = cmd_getc ();
2960 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3722 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2961 arg = arg * 10 + (ch - '0'); 3723 arg = arg * 10 + (ch - '0');
2962 3724
2963 if (ch == ';') 3725 if (ch == ';')
2964 { 3726 {
2965 s = get_to_st (&eh); 3727 char *s = get_to_st (eh);
3728
2966 if (s) 3729 if (s)
2967 { 3730 {
2968 /*
2969 * rxvt_menubar_dispatch () violates the constness of the string,
2970 * so do it here
2971 */
2972 if (arg == XTerm_Menu)
2973#if 0 /* XXX: currently disabled due to security concerns */
2974 menubar_dispatch ((char *)s);
2975#else
2976 (void)0;
2977#endif
2978 else
2979 xterm_seq (arg, (char *)s, eh); 3731 process_xterm_seq (arg, s, eh);
2980 free (s); 3732 free (s);
2981 } 3733 }
2982 } 3734 }
2983} 3735}
3736
3737void
3738rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3739{
3740 if (str[0] == '?' && !str[1])
3741 {
3742 unsigned short r, g, b;
3743 pix_colors_focused[color].get (display, r, g, b);
3744 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3745 }
3746 else
3747 set_window_color (color, str);
3748}
3749
2984/* 3750/*
2985 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3751 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2986 * 0 = change iconName/title
2987 * 1 = change iconName
2988 * 2 = change title
2989 * 4 = change color
2990 * 12 = change text color
2991 * 13 = change mouse foreground color
2992 * 17 = change highlight character colour
2993 * 18 = change bold character color
2994 * 19 = change underlined character color
2995 * 46 = change logfile (not implemented)
2996 * 50 = change font
2997 *
2998 * rxvt extensions:
2999 * 9 = change locale (NYI)
3000 * 10 = menu (may change in future)
3001 * 20 = bg pixmap
3002 * 39 = change default fg color
3003 * 49 = change default bg color
3004 * 55 = dump scrollback buffer and all of screen
3005 */ 3752 */
3006void 3753void
3007rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3754rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3008{ 3755{
3009 int changed = 0; 3756 int color;
3010 int color;
3011 char *buf, *name; 3757 char *buf, *name;
3758 bool query = str[0] == '?' && !str[1];
3759 int saveop = op;
3760 dDisp;
3012 3761
3013 assert (str != NULL); 3762 assert (str != NULL);
3014 switch (op) 3763 switch (op)
3015 { 3764 {
3016 case XTerm_name: 3765 case XTerm_name:
3017 set_title (str); 3766 set_title (str);
3018 /* FALLTHROUGH */ 3767 /* FALLTHROUGH */
3019 case XTerm_iconName: 3768 case XTerm_iconName:
3020 set_iconName (str); 3769 set_icon_name (str);
3021 break; 3770 break;
3022 case XTerm_title: 3771 case XTerm_title:
3023 set_title (str); 3772 set_title (str);
3024 break; 3773 break;
3774 case XTerm_property:
3775 if (str[0] == '?')
3776 {
3777 Atom prop = display->atom (str + 1);
3778 Atom actual_type;
3779 int actual_format;
3780 unsigned long nitems;
3781 unsigned long bytes_after;
3782 unsigned char *value = 0;
3783 const char *str = "";
3784
3785 if (prop
3786 && XGetWindowProperty (disp, parent[0],
3787 prop, 0, 1<<16, 0, AnyPropertyType,
3788 &actual_type, &actual_format,
3789 &nitems, &bytes_after, &value) == Success
3790 && actual_type != None
3791 && actual_format == 8)
3792 str = (const char *)(value);
3793
3794 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3795
3796 XFree (value);
3797 }
3798 else
3799 {
3800 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3801
3802 if (eq)
3803 {
3804 *eq = 0;
3805 set_utf8_property (display->atom (str), eq + 1);
3806 }
3807 else
3808 XDeleteProperty (disp, parent[0],
3809 display->atom (str));
3810 }
3811 break;
3812
3025 case XTerm_Color: 3813 case XTerm_Color:
3026 for (buf = (char *)str; buf && *buf;) 3814 for (buf = (char *)str; buf && *buf;)
3027 { 3815 {
3028 if ((name = STRCHR (buf, ';')) == NULL) 3816 if ((name = strchr (buf, ';')) == NULL)
3029 break; 3817 break;
3818
3030 *name++ = '\0'; 3819 *name++ = '\0';
3031 color = atoi (buf); 3820 color = atoi (buf) + minCOLOR;
3032 if (color < 0 || color >= TOTAL_COLORS) 3821
3822 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3033 break; 3823 break;
3824
3034 if ((buf = STRCHR (name, ';')) != NULL) 3825 if ((buf = strchr (name, ';')) != NULL)
3035 *buf++ = '\0'; 3826 *buf++ = '\0';
3827
3828 if (name[0] == '?' && !name[1])
3829 {
3830 unsigned short r, g, b;
3831 pix_colors_focused[color].get (display, r, g, b);
3832 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3833 }
3834 else
3036 set_window_color (color + minCOLOR, name); 3835 set_window_color (color, name);
3037 } 3836 }
3837 break;
3838 case XTerm_Color00:
3839 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3840 break;
3841 case XTerm_Color01:
3842 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3038 break; 3843 break;
3039#ifndef NO_CURSORCOLOR 3844#ifndef NO_CURSORCOLOR
3040 case XTerm_Color_cursor: 3845 case XTerm_Color_cursor:
3041 set_window_color (Color_cursor, str); 3846 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3042 break; 3847 break;
3043#endif 3848#endif
3044 case XTerm_Color_pointer: 3849 case XTerm_Color_pointer_fg:
3045 set_window_color (Color_pointer, str); 3850 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3851 break;
3852 case XTerm_Color_pointer_bg:
3853 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3046 break; 3854 break;
3047#ifndef NO_BOLD_UNDERLINE_REVERSE 3855#ifndef NO_BOLD_UNDERLINE_REVERSE
3048 case XTerm_Color_BD:
3049 set_window_color (Color_BD, str);
3050 break;
3051 case XTerm_Color_UL:
3052 set_window_color (Color_UL, str);
3053 break;
3054 case XTerm_Color_RV: 3856 case XTerm_Color_RV:
3055 set_window_color (Color_RV, str); 3857 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3056 break; 3858 break;
3859 case Rxvt_Color_BD:
3860 case URxvt_Color_BD:
3861 process_color_seq (op, Color_BD, str, resp);
3862 break;
3863 case Rxvt_Color_UL:
3864 case URxvt_Color_UL:
3865 process_color_seq (op, Color_UL, str, resp);
3866 break;
3867 case URxvt_Color_IT:
3868 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3869 break;
3057#endif 3870#endif
3871#if TRANSPARENT && TINTING
3872 case URxvt_Color_tint:
3873 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3874 check_our_parents ();
3875 if (am_transparent)
3876 want_full_refresh = want_refresh = 1;
3877 break;
3878#endif
3058 3879
3059 case XTerm_Menu: 3880 case Rxvt_Pixmap:
3060 /* 3881 {
3061 * rxvt_menubar_dispatch () violates the constness of the string,
3062 * so DON'T do it here
3063 */
3064 break;
3065 case XTerm_Pixmap:
3066 if (*str != ';') 3882 if (*str != ';')
3067 { 3883 {
3068#if XPM_BACKGROUND 3884#if XPM_BACKGROUND
3069 scale_pixmap (""); /* reset to default scaling */ 3885 scale_pixmap (""); /* reset to default scaling */
3070 set_bgPixmap (str); /* change pixmap */ 3886 set_bgPixmap (str); /* change pixmap */
3071#endif
3072 scr_touch (true); 3887 scr_touch (true);
3888#endif
3073 } 3889 }
3890
3891 int changed = 0;
3892
3074 while ((str = STRCHR (str, ';')) != NULL) 3893 while ((str = strchr (str, ';')) != NULL)
3075 { 3894 {
3076 str++; 3895 str++;
3077#if XPM_BACKGROUND 3896#if XPM_BACKGROUND
3078 changed += scale_pixmap (str); 3897 changed += scale_pixmap (str);
3079#endif 3898#endif
3080
3081 } 3899 }
3900
3082 if (changed) 3901 if (changed)
3083 { 3902 {
3084#ifdef XPM_BACKGROUND 3903#ifdef XPM_BACKGROUND
3085 resize_pixmap (); 3904 resize_pixmap ();
3086#endif
3087 scr_touch (true); 3905 scr_touch (true);
3906#endif
3088 } 3907 }
3908 }
3089 break; 3909 break;
3090 3910
3091 case XTerm_restoreFG: 3911 case Rxvt_restoreFG:
3092 set_window_color (Color_fg, str); 3912 set_window_color (Color_fg, str);
3093 break; 3913 break;
3094 case XTerm_restoreBG: 3914 case Rxvt_restoreBG:
3095 set_window_color (Color_bg, str); 3915 set_window_color (Color_bg, str);
3096 break; 3916 break;
3917
3097 case XTerm_logfile: 3918 case XTerm_logfile:
3919 // TODO, when secure mode?
3098 break; 3920 break;
3099 case XTerm_font: 3921
3100 change_font (str);
3101 break;
3102 case XTerm_locale:
3103 if (str[0] == '?' && !str[1])
3104 tt_printf ("%-.250s\n", locale);
3105 else
3106 {
3107 set_locale (str);
3108 im_cb ();
3109 }
3110 break;
3111#if 0 3922#if 0
3112 case XTerm_dumpscreen: /* no error notices */ 3923 case Rxvt_dumpscreen: /* no error notices */
3113 { 3924 {
3114 int fd; 3925 int fd;
3115 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3926 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3116 { 3927 {
3117 scr_dump (fd); 3928 scr_dump (fd);
3118 close (fd); 3929 close (fd);
3119 } 3930 }
3120 } 3931 }
3121 break; 3932 break;
3122#endif 3933#endif
3934 case XTerm_font:
3935 op = URxvt_font;
3936 case URxvt_font:
3937#if ENABLE_STYLES
3938 case URxvt_boldFont:
3939 case URxvt_italicFont:
3940 case URxvt_boldItalicFont:
3941#endif
3942 if (query)
3943 tt_printf ("\33]%d;%-.250s%c", saveop,
3944 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3945 ? fontset[op - URxvt_font]->fontdesc : "",
3946 resp);
3947 else
3948 {
3949 const char *&res = rs[Rs_font + (op - URxvt_font)];
3123 3950
3951 res = strdup (str);
3952 allocated.push_back ((void *)res);
3953 set_fonts ();
3954 }
3955 break;
3956
3957#if ENABLE_FRILLS
3958 case URxvt_locale:
3959 if (query)
3960 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3961 else
3962 {
3963 set_locale (str);
3964 pty->set_utf8_mode (enc_utf8);
3965 init_xlocale ();
3966 }
3967 break;
3968
3969 case URxvt_view_up:
3970 case URxvt_view_down:
3971 {
3972 int lines = atoi (str);
3973
3974 if (lines)
3975 scr_page (op == URxvt_view_up ? UP : DN, lines);
3976 else
3977 scr_erase_savelines ();
3978 }
3979
3980 break;
3981#endif
3982
3983#if ENABLE_PERL
3984 case URxvt_perl:
3985 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3986 ; // no responses yet
3987 break;
3988#endif
3124 } 3989 }
3125} 3990}
3126/*----------------------------------------------------------------------*/ 3991/*----------------------------------------------------------------------*/
3127 3992
3128/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3993/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3136 * so no need for fancy checking 4001 * so no need for fancy checking
3137 */ 4002 */
3138int 4003int
3139rxvt_term::privcases (int mode, unsigned long bit) 4004rxvt_term::privcases (int mode, unsigned long bit)
3140{ 4005{
3141 int state; 4006 int state;
3142 4007
3143 if (mode == 's') 4008 if (mode == 's')
3144 { 4009 {
3145 SavedModes |= (PrivateModes & bit); 4010 SavedModes |= (priv_modes & bit);
3146 return -1; 4011 return -1;
3147 } 4012 }
3148 else 4013 else
3149 { 4014 {
3150 if (mode == 'r') 4015 if (mode == 'r')
3151 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4016 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3152 else 4017 else
3153 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4018 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3154 PrivMode (state, bit); 4019 PrivMode (state, bit);
3155 } 4020 }
4021
3156 return state; 4022 return state;
3157} 4023}
3158 4024
3159/* we're not using priv _yet_ */ 4025/* we're not using priv _yet_ */
3160void 4026void
3161rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4027rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3162{ 4028{
3163 unsigned int i, j; 4029 unsigned int i, j;
3164 int state; 4030 int state;
4031
3165 static const struct 4032 static const struct
3166 { 4033 {
3167 const int argval; 4034 const int argval;
3168 const unsigned long bit; 4035 const unsigned long bit;
3169 } 4036 }
4037
3170 argtopriv[] = { 4038 argtopriv[] = {
3171 { 1, PrivMode_aplCUR }, 4039 { 1, PrivMode_aplCUR },
3172 { 2, PrivMode_vt52 }, 4040 { 2, PrivMode_vt52 },
3173 { 3, PrivMode_132 }, 4041 { 3, PrivMode_132 },
3174 { 4, PrivMode_smoothScroll }, 4042 { 4, PrivMode_smoothScroll },
3175 { 5, PrivMode_rVideo }, 4043 { 5, PrivMode_rVideo },
3176 { 6, PrivMode_relOrigin }, 4044 { 6, PrivMode_relOrigin },
3177 { 7, PrivMode_Autowrap }, 4045 { 7, PrivMode_Autowrap },
4046 // 8, bi-directional support mode
3178 { 9, PrivMode_MouseX10 }, 4047 { 9, PrivMode_MouseX10 },
3179#ifdef menuBar_esc 4048 // 18, 19 printing-related
3180 { menuBar_esc, PrivMode_menuBar }, 4049 { 25, PrivMode_VisibleCursor },
3181#endif
3182#ifdef scrollBar_esc 4050#ifdef scrollBar_esc
3183 { scrollBar_esc, PrivMode_scrollBar }, 4051 { scrollBar_esc, PrivMode_scrollBar },
3184#endif 4052#endif
3185 { 25, PrivMode_VisibleCursor },
3186 { 35, PrivMode_ShiftKeys }, 4053 { 35, PrivMode_ShiftKeys }, // rxvt extension
3187 { 40, PrivMode_132OK }, 4054 { 40, PrivMode_132OK },
4055 // 41 xterm more fixes NYI
4056 // 45 margin bell NYI
4057 // 46 start logging
3188 { 47, PrivMode_Screen }, 4058 { 47, PrivMode_Screen },
3189 { 66, PrivMode_aplKP }, 4059 { 66, PrivMode_aplKP },
3190#ifndef NO_BACKSPACE_KEY 4060#ifndef NO_BACKSPACE_KEY
3191 { 67, PrivMode_BackSpace }, 4061 { 67, PrivMode_BackSpace },
3192#endif 4062#endif
3193 { 1000, PrivMode_MouseX11 }, 4063 { 1000, PrivMode_MouseX11 },
4064 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4065 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
4066 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3194 { 1010, PrivMode_TtyOutputInh }, 4067 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3195 { 1011, PrivMode_Keypress }, 4068 { 1011, PrivMode_Keypress }, // rxvt extension
4069 // 1035 enable modifiers for alt, numlock NYI
4070 // 1036 send ESC for meta keys NYI
4071 // 1037 send DEL for keypad delete NYI
3196 { 1047, PrivMode_Screen }, 4072 { 1047, PrivMode_Screen },
4073 // 1048 save and restore cursor
3197 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4074 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4075 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3198 }; 4076 };
3199 4077
3200 if (nargs == 0) 4078 if (nargs == 0)
3201 return; 4079 return;
3202 4080
… …
3217 state = privcases (mode, argtopriv[j].bit); 4095 state = privcases (mode, argtopriv[j].bit);
3218 break; 4096 break;
3219 } 4097 }
3220 4098
3221 /* extra handling for values with state unkept */ 4099 /* extra handling for values with state unkept */
3222 if (state == -1)
3223 switch (arg[i]) 4100 switch (arg[i])
3224 { 4101 {
4102#if ENABLE_STYLES
4103 case 1021:
4104 set_option (Opt_intensityStyles, mode);
4105
4106 scr_touch (true);
4107 break;
4108#endif
3225 case 1048: /* alternative cursor save */ 4109 case 1048: /* alternative cursor save */
4110 case 1049:
4111 if (OPTION (Opt_secondaryScreen))
3226 if (mode == 0) 4112 if (mode == 0)
3227 scr_cursor (RESTORE); 4113 scr_cursor (RESTORE);
3228 else if (mode == 1) 4114 else if (mode == 1)
3229 scr_cursor (SAVE); 4115 scr_cursor (SAVE);
3230 /* FALLTHROUGH */
3231 default:
3232 continue; /* for (;i;) */
3233 }
3234
3235 /* extra handling for values with valid 0 or 1 state */
3236 switch (arg[i])
3237 {
3238 /* case 1: - application cursor keys */
3239 case 2: /* VT52 mode */
3240 /* oddball mode. should be set regardless of set/reset
3241 * parameter. Return from VT52 mode with an ESC < from
3242 * within VT52 mode
3243 */
3244 PrivMode (1, PrivMode_vt52);
3245 break; 4116 break;
4117 }
4118
4119 if (state >= 0)
4120 /* extra handling for values with valid 0 or 1 state */
4121 switch (arg[i])
4122 {
4123 /* case 1: - application cursor keys */
4124 case 2: /* VT52 mode */
4125 /* oddball mode. should be set regardless of set/reset
4126 * parameter. Return from VT52 mode with an ESC < from
4127 * within VT52 mode
4128 */
4129 PrivMode (1, PrivMode_vt52);
4130 break;
3246 case 3: /* 80/132 */ 4131 case 3: /* 80/132 */
3247 if (PrivateModes & PrivMode_132OK) 4132 if (priv_modes & PrivMode_132OK)
3248 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4133 set_widthheight (((state ? 132 : 80) * fwidth), height);
3249 (unsigned int)TermWin.height);
3250 break; 4134 break;
3251 case 4: /* smooth scrolling */ 4135 case 4: /* smooth scrolling */
3252 if (state)
3253 Options &= ~Opt_jumpScroll;
3254 else
3255 Options |= Opt_jumpScroll; 4136 set_option (Opt_jumpScroll, !state);
3256 break; 4137 break;
3257 case 5: /* reverse video */ 4138 case 5: /* reverse video */
3258 scr_rvideo_mode (state); 4139 scr_rvideo_mode (state);
3259 break; 4140 break;
3260 case 6: /* relative/absolute origins */ 4141 case 6: /* relative/absolute origins */
3261 scr_relative_origin (state); 4142 scr_relative_origin (state);
3262 break; 4143 break;
3263 case 7: /* autowrap */ 4144 case 7: /* autowrap */
3264 scr_autowrap (state); 4145 scr_autowrap (state);
3265 break; 4146 break;
3266 /* case 8: - auto repeat, can't do on a per window basis */ 4147 /* case 8: - auto repeat, can't do on a per window basis */
3267 case 9: /* X10 mouse reporting */ 4148 case 9: /* X10 mouse reporting */
3268 if (state) /* orthogonal */ 4149 if (state) /* orthogonal */
3269 PrivateModes &= ~ (PrivMode_MouseX11); 4150 priv_modes &= ~PrivMode_MouseX11;
3270 break; 4151 break;
3271#ifdef menuBar_esc
3272 case menuBar_esc:
3273#ifdef MENUBAR
3274 map_menuBar (state);
3275#endif
3276 break;
3277#endif
3278#ifdef scrollBar_esc 4152#ifdef scrollBar_esc
3279 case scrollBar_esc: 4153 case scrollBar_esc:
3280 if (scrollbar_mapping (state)) 4154 if (scrollbar_mapping (state))
3281 { 4155 {
3282 resize_all_windows (0, 0, 0); 4156 resize_all_windows (0, 0, 0);
3283 scr_touch (true); 4157 scr_touch (true);
3284 } 4158 }
3285 break; 4159 break;
3286#endif 4160#endif
3287 case 25: /* visible/invisible cursor */ 4161 case 25: /* visible/invisible cursor */
3288 scr_cursor_visible (state); 4162 scr_cursor_visible (state);
3289 break; 4163 break;
3290 /* case 35: - shift keys */ 4164 /* case 35: - shift keys */
3291 /* case 40: - 80 <--> 132 mode */ 4165 /* case 40: - 80 <--> 132 mode */
3292 case 47: /* secondary screen */ 4166 case 47: /* secondary screen */
3293 scr_change_screen (state); 4167 scr_change_screen (state);
3294 break; 4168 break;
3295 /* case 66: - application key pad */ 4169 /* case 66: - application key pad */
3296 /* case 67: - backspace key */ 4170 /* case 67: - backspace key */
3297 case 1000: /* X11 mouse reporting */ 4171 case 1000: /* X11 mouse reporting */
3298 if (state) /* orthogonal */ 4172 if (state) /* orthogonal */
3299 PrivateModes &= ~ (PrivMode_MouseX10); 4173 priv_modes &= ~PrivMode_MouseX10;
3300 break; 4174 break;
3301#if 0 4175#if 0
3302 case 1001: 4176 case 1001:
3303 break; /* X11 mouse highlighting */ 4177 break; /* X11 mouse highlighting */
3304#endif 4178#endif
3305 case 1010: /* scroll to bottom on TTY output inhibit */ 4179 case 1010: /* scroll to bottom on TTY output inhibit */
3306 if (state)
3307 Options &= ~Opt_scrollTtyOutput;
3308 else
3309 Options |= Opt_scrollTtyOutput; 4180 set_option (Opt_scrollTtyOutput, !state);
3310 break; 4181 break;
3311 case 1011: /* scroll to bottom on key press */ 4182 case 1011: /* scroll to bottom on key press */
3312 if (state)
3313 Options |= Opt_scrollTtyKeypress; 4183 set_option (Opt_scrollTtyKeypress, state);
3314 else
3315 Options &= ~Opt_scrollTtyKeypress;
3316 break; 4184 break;
3317 case 1047: /* secondary screen w/ clearing */ 4185 case 1047: /* secondary screen w/ clearing last */
3318 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4186 if (OPTION (Opt_secondaryScreen))
3319 if (current_screen != PRIMARY) 4187 if (current_screen != PRIMARY)
3320 scr_erase_screen (2); 4188 scr_erase_screen (2);
3321 scr_change_screen (state); 4189 scr_change_screen (state);
3322 /* FALLTHROUGH */
3323 default:
3324 break; 4190 break;
4191 case 1049: /* secondary screen w/ clearing first */
4192 scr_change_screen (state);
4193 if (OPTION (Opt_secondaryScreen))
4194 if (current_screen != PRIMARY)
4195 scr_erase_screen (2);
4196 break;
4197 default:
4198 break;
3325 } 4199 }
3326 } 4200 }
3327} 4201}
3328/*}}} */ 4202/*}}} */
3329 4203
3330/*{{{ process sgr sequences */ 4204/*{{{ process sgr sequences */
3331void 4205void
3332rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4206rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3333{ 4207{
3334 unsigned int i; 4208 unsigned int i;
3335 short rendset; 4209 short rendset;
3336 int rendstyle; 4210 int rendstyle;
3337 4211
3338 if (nargs == 0) 4212 if (nargs == 0)
3339 { 4213 {
3340 scr_rendition (0, ~RS_None); 4214 scr_rendition (0, ~RS_None);
3341 return; 4215 return;
3342 } 4216 }
4217
3343 for (i = 0; i < nargs; i++) 4218 for (i = 0; i < nargs; i++)
3344 { 4219 {
3345 rendset = -1; 4220 rendset = -1;
3346 switch (arg[i]) 4221 switch (arg[i])
3347 { 4222 {
… …
3349 rendset = 0, rendstyle = ~RS_None; 4224 rendset = 0, rendstyle = ~RS_None;
3350 break; 4225 break;
3351 case 1: 4226 case 1:
3352 rendset = 1, rendstyle = RS_Bold; 4227 rendset = 1, rendstyle = RS_Bold;
3353 break; 4228 break;
4229 //case 2: // low intensity
4230 case 3:
4231 rendset = 1, rendstyle = RS_Italic;
4232 break;
3354 case 4: 4233 case 4:
3355 rendset = 1, rendstyle = RS_Uline; 4234 rendset = 1, rendstyle = RS_Uline;
3356 break; 4235 break;
3357 case 5: 4236 case 5: // slowly blinking
4237 case 6: // rapidly blinking
3358 rendset = 1, rendstyle = RS_Blink; 4238 rendset = 1, rendstyle = RS_Blink;
3359 break; 4239 break;
4240 //case 6: // scoansi light background
3360 case 7: 4241 case 7:
3361 rendset = 1, rendstyle = RS_RVid; 4242 rendset = 1, rendstyle = RS_RVid;
3362 break; 4243 break;
3363 case 22: 4244 case 8:
4245 // invisible. NYI
4246 break;
4247 //case 9: // crossed out
4248 //case 10: // scoansi acs off, primary font
4249 //case 11: // scoansi acs on, first alt font
4250 //case 12: // scoansi acs on, |0x80, second alt font
4251 //...
4252 //case 19: // ninth alt font
4253 //case 20: // gothic
4254 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3364 rendset = 0, rendstyle = RS_Bold; 4255 rendset = 0, rendstyle = RS_Bold;
4256 break;
4257 case 22: // normal intensity
4258 rendset = 0, rendstyle = RS_Bold;
4259 break;
4260 case 23: // disable italic
4261 rendset = 0, rendstyle = RS_Italic;
3365 break; 4262 break;
3366 case 24: 4263 case 24:
3367 rendset = 0, rendstyle = RS_Uline; 4264 rendset = 0, rendstyle = RS_Uline;
3368 break; 4265 break;
3369 case 25: 4266 case 25:
3370 rendset = 0, rendstyle = RS_Blink; 4267 rendset = 0, rendstyle = RS_Blink;
3371 break; 4268 break;
4269 case 26: // variable spacing (iso 8613)
4270 rendset = 0, rendstyle = RS_Blink;
4271 break;
3372 case 27: 4272 case 27:
3373 rendset = 0, rendstyle = RS_RVid; 4273 rendset = 0, rendstyle = RS_RVid;
3374 break; 4274 break;
4275 //case 28: // visible. NYI
4276 //case 29: // not crossed-out
3375 } 4277 }
4278
3376 if (rendset != -1) 4279 if (rendset != -1)
3377 { 4280 {
3378 scr_rendition (rendset, rendstyle); 4281 scr_rendition (rendset, rendstyle);
3379 continue; /* for (;i;) */ 4282 continue; /* for (;i;) */
3380 } 4283 }
… …
3387 case 33: 4290 case 33:
3388 case 34: 4291 case 34:
3389 case 35: 4292 case 35:
3390 case 36: 4293 case 36:
3391 case 37: 4294 case 37:
3392 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4295 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3393 Color_fg);
3394 break; 4296 break;
3395#ifdef TTY_256COLOR 4297 case 38: // set fg color, ISO 8613-6
3396 case 38:
3397 if (nargs > i + 2 && arg[i + 1] == 5) 4298 if (nargs > i + 2 && arg[i + 1] == 5)
3398 { 4299 {
3399 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4300 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3400 Color_fg);
3401 i += 2; 4301 i += 2;
3402 } 4302 }
3403 break; 4303 break;
3404#endif
3405 case 39: /* default fg */ 4304 case 39: /* default fg */
3406 scr_color (Color_fg, Color_fg); 4305 scr_color (Color_fg, Color_fg);
3407 break; 4306 break;
3408 4307
3409 case 40: 4308 case 40:
… …
3412 case 43: 4311 case 43:
3413 case 44: 4312 case 44:
3414 case 45: 4313 case 45:
3415 case 46: 4314 case 46:
3416 case 47: 4315 case 47:
3417 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4316 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3418 Color_bg);
3419 break; 4317 break;
3420#ifdef TTY_256COLOR 4318 case 48: // set bg color, ISO 8613-6
3421 case 48:
3422 if (nargs > i + 2 && arg[i + 1] == 5) 4319 if (nargs > i + 2 && arg[i + 1] == 5)
3423 { 4320 {
3424 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4321 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3425 Color_bg);
3426 i += 2; 4322 i += 2;
3427 } 4323 }
3428 break; 4324 break;
3429#endif
3430 case 49: /* default bg */ 4325 case 49: /* default bg */
3431 scr_color (Color_bg, Color_bg); 4326 scr_color (Color_bg, Color_bg);
3432 break; 4327 break;
3433 4328
3434#ifndef NO_BRIGHTCOLOR 4329 //case 50: // not variable spacing
4330
4331#if ENABLE_FRILLS
3435 case 90: 4332 case 90:
3436 case 91: /* set bright fg color */ 4333 case 91: /* set bright fg color */
3437 case 92: 4334 case 92:
3438 case 93: 4335 case 93:
3439 case 94: 4336 case 94:
3440 case 95: 4337 case 95:
3441 case 96: 4338 case 96:
3442 case 97: 4339 case 97:
3443 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4340 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3444 Color_fg);
3445 break; 4341 break;
3446 case 100: 4342 case 100:
3447 case 101: /* set bright bg color */ 4343 case 101: /* set bright bg color */
3448 case 102: 4344 case 102:
3449 case 103: 4345 case 103:
3450 case 104: 4346 case 104:
3451 case 105: 4347 case 105:
3452 case 106: 4348 case 106:
3453 case 107: 4349 case 107:
3454 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4350 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3455 Color_bg);
3456 break; 4351 break;
3457#endif 4352#endif
3458
3459 } 4353 }
3460 } 4354 }
3461} 4355}
3462/*}}} */ 4356/*}}} */
3463 4357
3464/*{{{ process Rob Nation's own graphics mode sequences */ 4358/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3465void 4359void
3466rxvt_term::process_graphics () 4360rxvt_term::process_graphics ()
3467{ 4361{
3468 unsigned char ch, cmd = cmd_getc (); 4362 unicode_t ch, cmd = cmd_getc ();
3469 4363
3470 if (cmd == 'Q') 4364 if (cmd == 'Q')
3471 { /* query graphics */ 4365 { /* query graphics */
3472 tt_printf ("\033G0\n"); /* no graphics */ 4366 tt_printf ("\033G0\012"); /* no graphics */
3473 return; 4367 return;
3474 } 4368 }
3475 /* swallow other graphics sequences until terminating ':' */ 4369 /* swallow other graphics sequences until terminating ':' */
3476 do 4370 do
3477 ch = cmd_getc (); 4371 ch = cmd_getc ();
… …
3487 */ 4381 */
3488void 4382void
3489rxvt_term::tt_printf (const char *fmt,...) 4383rxvt_term::tt_printf (const char *fmt,...)
3490{ 4384{
3491 va_list arg_ptr; 4385 va_list arg_ptr;
3492 unsigned char buf[256]; 4386 char buf[256];
3493 4387
3494 va_start (arg_ptr, fmt); 4388 va_start (arg_ptr, fmt);
3495 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4389 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3496 va_end (arg_ptr); 4390 va_end (arg_ptr);
3497 tt_write (buf, STRLEN (buf)); 4391 tt_write (buf, strlen (buf));
3498} 4392}
3499 4393
3500/* ---------------------------------------------------------------------- */ 4394/* ---------------------------------------------------------------------- */
3501/* Write data to the pty as typed by the user, pasted with the mouse, 4395/* Write data to the pty as typed by the user, pasted with the mouse,
3502 * or generated by us in response to a query ESC sequence. 4396 * or generated by us in response to a query ESC sequence.
3503 */ 4397 */
4398const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4399
3504void 4400void
3505rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4401rxvt_term::tt_write (const char *data, unsigned int len)
3506{ 4402{
3507 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4403 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4404 return;
3508 4405
3509 if (len) 4406 if (pty->pty < 0)
4407 return;
4408
4409 if (v_buflen == 0)
4410 {
4411 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4412
4413 if ((unsigned int)written == len)
4414 return;
4415
4416 data += written;
4417 len -= written;
3510 { 4418 }
4419
4420 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4421
4422 memcpy (v_buffer + v_buflen, data, len);
4423 v_buflen += len;
4424
4425 pty_ev.set (EVENT_READ | EVENT_WRITE);
4426}
4427
4428void rxvt_term::pty_write ()
4429{
4430 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4431
4432 if (written > 0)
4433 {
4434 v_buflen -= written;
4435
3511 if (v_buflen == 0) 4436 if (v_buflen == 0)
3512 { 4437 {
3513 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3514
3515 if ((unsigned int)written == len)
3516 return;
3517
3518 data += written;
3519 len -= written;
3520 }
3521
3522
3523 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3524
3525 memcpy (v_buffer + v_buflen, data, len);
3526 v_buflen += len;
3527 }
3528
3529 for (;;)
3530 {
3531 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3532
3533 if (written > 0)
3534 {
3535 v_buflen -= written;
3536
3537 if (v_buflen == 0)
3538 {
3539 free (v_buffer); 4438 free (v_buffer);
3540 v_buffer = 0; 4439 v_buffer = 0;
3541 v_buflen = 0; 4440 v_buflen = 0;
3542 4441
3543 pty_ev.set (EVENT_READ); 4442 pty_ev.set (EVENT_READ);
3544 return;
3545 }
3546
3547 memmove (v_buffer, v_buffer + written, v_buflen);
3548 }
3549 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3550 // original code just ignores this...
3551 destroy ();
3552 else
3553 {
3554 pty_ev.set (EVENT_READ | EVENT_WRITE);
3555 return; 4443 return;
3556 } 4444 }
4445
4446 memmove (v_buffer, v_buffer + written, v_buflen);
3557 } 4447 }
4448 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4449 pty_ev.set (EVENT_READ);
3558} 4450}
3559 4451
3560/*----------------------- end-of-file (C source) -----------------------*/ 4452/*----------------------- end-of-file (C source) -----------------------*/
3561 4453

Diff Legend

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