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

Diff Legend

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