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

Diff Legend

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