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.55 by pcg, Sun Feb 22 20:08:18 2004 UTC vs.
Revision 1.210 by root, Tue Dec 20 20:58:31 2005 UTC

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

Diff Legend

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