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.60 by pcg, Fri Feb 27 02:52:51 2004 UTC vs.
Revision 1.201 by root, Mon Feb 21 19:26:07 2005 UTC

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

Diff Legend

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