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

Diff Legend

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