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.90 by pcg, Fri Apr 2 19:09:52 2004 UTC vs.
Revision 1.196 by root, Thu Feb 17 12:23:39 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/*----------------------------------------------------------------------*/
56 60
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 62
59// exception thrown when the command parser runs out of input data 63// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 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
61 269
62/*{{{ Convert the keypress event into a string */ 270/*{{{ Convert the keypress event into a string */
63void 271void
64rxvt_term::lookup_key (XKeyEvent &ev) 272rxvt_term::lookup_key (XKeyEvent &ev)
65{ 273{
… …
76 * 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
77 * escape sequence to toggle the Keypad. 285 * escape sequence to toggle the Keypad.
78 * 286 *
79 * Always permit `shift' to override the current setting 287 * Always permit `shift' to override the current setting
80 */ 288 */
81 shft = (ev.state & ShiftMask); 289 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 290 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 291 meta = ev.state & ModMetaMask;
84 292
85 if (numlock_state || (ev.state & ModNumLockMask)) 293 if (numlock_state || (ev.state & ModNumLockMask))
86 { 294 {
87 numlock_state = (ev.state & ModNumLockMask); 295 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 296 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
147 valid_keysym = keysym != NoSymbol; 355 valid_keysym = keysym != NoSymbol;
148 } 356 }
149 357
150 if (valid_keysym) 358 if (valid_keysym)
151 { 359 {
360#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state))
362 return;
363#endif
364
152 if (TermWin.saveLines) 365 if (TermWin.saveLines)
153 { 366 {
154#ifdef UNSHIFTED_SCROLLKEYS 367#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 368 if (!ctrl && !meta)
156 {
157#else 369#else
158 if (IS_SCROLL_MOD) 370 if (IS_SCROLL_MOD)
371#endif
159 { 372 {
160#endif
161 int lnsppg; 373 int lnsppg;
162 374
163#ifdef PAGING_CONTEXT_LINES 375#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 377#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 426 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 427 {
216 keysym += (XK_F11 - XK_F1); 428 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 429 shft = 0; /* turn off Shift */
218 } 430 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 431 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 432 {
221 switch (keysym) 433 switch (keysym)
222 { 434 {
223 /* normal XTerm key bindings */ 435 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 436 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 437 selection_request (ev.time, 0, 0);
226 return; 438 return;
439#if TODO
227 /* rxvt extras */ 440 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 441 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 442 change_font (FONT_UP);
230 return; 443 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 444 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 445 change_font (FONT_DN);
233 return; 446 return;
447#endif
234 } 448 }
235 } 449 }
236 } 450 }
237#ifdef PRINTPIPE 451
238 if (keysym == XK_Print) 452#if ENABLE_FRILLS || ISO_14755
239 { 453 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 454 if (shft && ctrl)
241 return;
242 } 455 {
243#endif 456 int hv;
244 457
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 458 if (iso14755buf & ISO_14755_51
246 { 459 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 460 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 461 {
250 unsigned int l; 462 commit_iso14755 ();
251 const unsigned char *kbuf0; 463 iso14755buf = ISO_14755_51;
252 464# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 465 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 466# endif
261 ) 467 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 468 }
266 469 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 470 {
471 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
472 | hv | ISO_14755_51;
473# if ISO_14755
474 iso14755_51 (iso14755buf & ISO_14755_MASK);
475# endif
268 return; 476 return;
269 } 477 }
270 else 478 else
479 {
480# if ENABLE_OVERLAY
481 scr_overlay_off ();
271#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 {
272 { 508 {
273 newlen = 1; 509 newlen = 1;
274 switch (keysym) 510 switch (keysym)
275 { 511 {
276#ifndef NO_BACKSPACE_KEY 512#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 513 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 514 if (priv_modes & PrivMode_HaveBackSpace)
279 { 515 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 516 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 517 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 518 kbuf[1] = '\0';
283 } 519 }
284 else 520 else
285 STRCPY (kbuf, key_backspace); 521 strcpy (kbuf, key_backspace);
286 break; 522 break;
287#endif 523#endif
288#ifndef NO_DELETE_KEY 524#ifndef NO_DELETE_KEY
525# ifdef XK_KP_Prior
526 case XK_KP_Delete:
527 /* allow shift to override */
528 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
529 {
530 strcpy (kbuf, "\033On");
531 break;
532 }
533 /* FALLTHROUGH */
534# endif
289 case XK_Delete: 535 case XK_Delete:
290 STRCPY (kbuf, key_delete); 536 strcpy (kbuf, key_delete);
291 break; 537 break;
292#endif 538#endif
293 case XK_Tab: 539 case XK_Tab:
294 if (shft) 540 if (shft)
295 STRCPY (kbuf, "\033[Z"); 541 strcpy (kbuf, "\033[Z");
296 else 542 else
297 { 543 {
298#ifdef CTRL_TAB_MAKES_META 544#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 545 if (ctrl)
300 meta = 1; 546 meta = 1;
… …
306 newlen = 0; 552 newlen = 0;
307 } 553 }
308 break; 554 break;
309 555
310#ifdef XK_KP_Left 556#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 557 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 558 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 559 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 560 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 561 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 562 {
317 STRCPY (kbuf, "\033OZ"); 563 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 564 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 565 break;
320 } 566 }
321 else 567 else
322 /* translate to std. cursor key */ 568 /* translate to std. cursor key */
… …
325#endif 571#endif
326 case XK_Up: /* "\033[A" */ 572 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 573 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 574 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 575 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 576 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 577 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 578 /* do Shift first */
333 if (shft) 579 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 580 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 581 else if (ctrl)
336 { 582 {
337 kbuf[1] = 'O'; 583 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 584 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 585 }
340 else if (PrivateModes & PrivMode_aplCUR) 586 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 587 kbuf[1] = 'O';
342 break; 588 break;
343 589
344#ifndef UNSHIFTED_SCROLLKEYS 590#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 591# ifdef XK_KP_Prior
346 case XK_KP_Prior: 592 case XK_KP_Prior:
347 /* allow shift to override */ 593 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 594 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 595 {
350 STRCPY (kbuf, "\033Oy"); 596 strcpy (kbuf, "\033Oy");
351 break; 597 break;
352 } 598 }
353 /* FALLTHROUGH */ 599 /* FALLTHROUGH */
354# endif 600# endif
355 case XK_Prior: 601 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 602 strcpy (kbuf, "\033[5~");
357 break; 603 break;
358# ifdef XK_KP_Next 604# ifdef XK_KP_Next
359 case XK_KP_Next: 605 case XK_KP_Next:
360 /* allow shift to override */ 606 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 607 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 608 {
363 STRCPY (kbuf, "\033Os"); 609 strcpy (kbuf, "\033Os");
364 break; 610 break;
365 } 611 }
366 /* FALLTHROUGH */ 612 /* FALLTHROUGH */
367# endif 613# endif
368 case XK_Next: 614 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 615 strcpy (kbuf, "\033[6~");
370 break; 616 break;
371#endif 617#endif
372 case XK_KP_Enter: 618 case XK_KP_Enter:
373 /* allow shift to override */ 619 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 620 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 621 {
376 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';
377 } 634 }
378 else 635 else
379 { 636 {
380 kbuf[0] = '\r'; 637 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 638 kbuf[1] = '\0';
382 } 639 }
383 break; 640 break;
384 641
385#ifdef XK_KP_Begin 642#ifdef XK_KP_Begin
386 case XK_KP_Begin: 643 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 644 strcpy (kbuf, "\033Ou");
388 break; 645 break;
389 646
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 647#endif
398 case XK_KP_F1: /* "\033OP" */ 648 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 649 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 650 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 651 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 652 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 653 kbuf[2] += (keysym - XK_KP_F1);
404 break; 654 break;
405 655
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 656 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 657 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 668 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 669 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 670 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 671 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 672 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 673 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 674 {
425 STRCPY (kbuf, "\033Oj"); 675 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 676 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 677 }
428 else 678 else
429 { 679 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 680 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 681 kbuf[1] = '\0';
432 } 682 }
433 break; 683 break;
434 684
435 case XK_Find: 685 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 686 strcpy (kbuf, "\033[1~");
437 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
438 case XK_Insert: 699 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 700 strcpy (kbuf, "\033[2~");
440 break; 701 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 702#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 703 case DXK_Remove:
443 /* FALLTHROUGH */ 704 /* FALLTHROUGH */
444#endif 705#endif
445 case XK_Execute: 706 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 707 strcpy (kbuf, "\033[3~");
447 break; 708 break;
448 case XK_Select: 709 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 710 strcpy (kbuf, "\033[4~");
450 break; 711 break;
451#ifdef XK_KP_End 712#ifdef XK_KP_End
452 case XK_KP_End: 713 case XK_KP_End:
453 /* allow shift to override */ 714 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 715 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 716 {
456 STRCPY (kbuf, "\033Oq"); 717 strcpy (kbuf, "\033Oq");
457 break; 718 break;
458 } 719 }
459 /* FALLTHROUGH */ 720 /* FALLTHROUGH */
460#endif 721#endif
461 case XK_End: 722 case XK_End:
462 STRCPY (kbuf, KS_END); 723 strcpy (kbuf, KS_END);
463 break; 724 break;
464#ifdef XK_KP_Home 725#ifdef XK_KP_Home
465 case XK_KP_Home: 726 case XK_KP_Home:
466 /* allow shift to override */ 727 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 729 {
469 STRCPY (kbuf, "\033Ow"); 730 strcpy (kbuf, "\033Ow");
470 break; 731 break;
471 } 732 }
472 /* FALLTHROUGH */ 733 /* FALLTHROUGH */
473#endif 734#endif
474 case XK_Home: 735 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 736 strcpy (kbuf, KS_HOME);
476 break; 737 break;
477 738
478#define FKEY(n, fkey) \ 739#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 740 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 741
… …
532#undef FKEY 793#undef FKEY
533 default: 794 default:
534 newlen = 0; 795 newlen = 0;
535 break; 796 break;
536 } 797 }
798
537 if (newlen) 799 if (newlen)
538 len = STRLEN (kbuf); 800 len = strlen (kbuf);
539 } 801 }
540 802
541 /* 803 /*
542 * Pass meta for all function keys, if 'meta' option set 804 * Pass meta for all function keys, if 'meta' option set
543 */ 805 */
… …
550 else if (ctrl && keysym == XK_minus) 812 else if (ctrl && keysym == XK_minus)
551 { 813 {
552 len = 1; 814 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 815 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 816 }
817 else if (keysym == XK_ISO_Left_Tab)
818 {
819 strcpy (kbuf, "\033[Z");
820 len = 3;
821 }
555 else 822 else
556 { 823 {
557#ifdef META8_OPTION 824#ifdef META8_OPTION
558 /* set 8-bit on */ 825 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 826 if (meta && (meta_char == 0x80))
… …
571 } 838 }
572 839
573 if (len <= 0) 840 if (len <= 0)
574 return; /* not mapped */ 841 return; /* not mapped */
575 842
576 if (Options & Opt_scrollTtyKeypress) 843 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 844 if (TermWin.view_start)
578 { 845 {
579 TermWin.view_start = 0; 846 TermWin.view_start = 0;
580 want_refresh = 1; 847 want_refresh = 1;
581 } 848 }
… …
617#endif /* DEBUG_CMD */ 884#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 885 tt_write (kbuf, (unsigned int)len);
619} 886}
620/*}}} */ 887/*}}} */
621 888
622#if (MENUBAR_MAX) 889#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 890/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */ 891/* attempt to `write' count to the input buffer */
625unsigned int 892unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 893rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
627{ 894{
… …
630 n = cmdbuf_ptr - cmdbuf_base; 897 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 898 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 899
633 if (n > 0 && s < count) 900 if (n > 0 && s < count)
634 { 901 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 902 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 903 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 904 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 905 cmdbuf_endp -= n;
639 s += n; 906 s += n;
640 } 907 }
… …
650 917
651 cmd_parse (); 918 cmd_parse ();
652 919
653 return 0; 920 return 0;
654} 921}
655#endif /* MENUBAR_MAX */ 922#endif
656 923
657void 924void
658rxvt_term::flush () 925rxvt_term::flush ()
659{ 926{
927 flush_ev.stop ();
928
660#ifdef TRANSPARENT 929#ifdef TRANSPARENT
661 if (want_full_refresh) 930 if (want_full_refresh)
662 { 931 {
663 want_full_refresh = 0; 932 want_full_refresh = 0;
664 scr_clear (); 933 scr_clear ();
665 scr_touch (false); 934 scr_touch (false);
666 want_refresh = 1;
667 } 935 }
668#endif 936#endif
669 937
670 if (want_refresh) 938 if (want_refresh)
671 { 939 {
672 scr_refresh (refresh_type); 940 scr_refresh (refresh_type);
673 scrollbar_show (1); 941 scrollbar_show (1);
674#ifdef USE_XIM 942#ifdef USE_XIM
675 IMSendSpot (); 943 IMSendSpot ();
676#endif 944#endif
677
678 } 945 }
679 946
680 display->flush (); 947 display->flush ();
681} 948}
682 949
… …
684rxvt_term::check_cb (check_watcher &w) 951rxvt_term::check_cb (check_watcher &w)
685{ 952{
686 SET_R (this); 953 SET_R (this);
687 SET_LOCALE (locale); 954 SET_LOCALE (locale);
688 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;
689 flush (); 970 flush ();
690} 971}
691 972
692#ifdef CURSOR_BLINK 973#ifdef CURSOR_BLINK
693void 974void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 992 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 993 }
713} 994}
714#endif 995#endif
715 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
716bool 1044bool
717rxvt_term::pty_fill () 1045rxvt_term::pty_fill ()
718{ 1046{
719 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 }
720 1054
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1055 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1056 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1057 cmdbuf_endp = cmdbuf_ptr + n;
724 1058
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
726 1060
727 if (n > 0) 1061 if (n > 0)
728 { 1062 {
729 cmdbuf_endp += n; 1063 cmdbuf_endp += n;
730 return true; 1064 return true;
… …
739rxvt_term::pty_cb (io_watcher &w, short revents) 1073rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1074{
741 SET_R (this); 1075 SET_R (this);
742 SET_LOCALE (locale); 1076 SET_LOCALE (locale);
743 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
744 if (revents & EVENT_WRITE) 1084 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1085 pty_write ();
746 else if (revents & EVENT_READ) 1086}
747 {
748 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759 1087
760 if (cmd_parse ()) 1088void
761 break; 1089rxvt_term::pointer_unblank ()
762 } 1090{
763 } 1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1092 recolour_cursor ();
1093
1094#ifdef POINTER_BLANK
1095 hidden_pointer = 0;
1096
1097 if (options & Opt_pointerBlank)
1098 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif
764} 1100}
765 1101
766#ifdef POINTER_BLANK 1102#ifdef POINTER_BLANK
767void 1103void
768rxvt_term::pointer_unblank ()
769{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor ();
772
773 hidden_pointer = 0;
774
775 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay);
777}
778
779void
780rxvt_term::pointer_blank () 1104rxvt_term::pointer_blank ()
781{ 1105{
782 if (! (Options & Opt_pointerBlank)) 1106 if (! (options & Opt_pointerBlank))
783 return; 1107 return;
784 1108
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
786 XFlush (display->display); 1110 XFlush (display->display);
787 1111
788 hidden_pointer = 1; 1112 hidden_pointer = 1;
789} 1113}
790 1114
… …
807 x = ev.x; 1131 x = ev.x;
808 y = ev.y; 1132 y = ev.y;
809 pixel_position (&x, &y); 1133 pixel_position (&x, &y);
810 1134
811 if (MEvent.button == AnyButton) 1135 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1136 button_number = 3;
814 }
815 else 1137 else
816 { 1138 {
817 button_number = MEvent.button - Button1; 1139 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1140 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1141 if (button_number >= 3)
820 button_number += (64 - 3); 1142 button_number += (64 - 3);
821 } 1143 }
822 1144
823 if (PrivateModes & PrivMode_MouseX10) 1145 if (priv_modes & PrivMode_MouseX10)
824 { 1146 {
825 /* 1147 /*
826 * do not report ButtonRelease 1148 * do not report ButtonRelease
827 * no state info allowed 1149 * no state info allowed
828 */ 1150 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1165 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1166 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1167#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1168 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1169#endif
848
849 } 1170 }
850 1171
851#ifdef DEBUG_MOUSEREPORT 1172#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1173 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1174 if (key_state & 16)
854 fputc ('C', stderr); 1175 fputc ('C', stderr);
855 if (key_state & 4) 1176 if (key_state & 4)
856 fputc ('S', stderr); 1177 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1181 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1182 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1183 button_number,
863 x + 1, 1184 x + 1,
864 y + 1); 1185 y + 1);
865#else 1186#endif
1187
866 tt_printf ("\033[M%c%c%c", 1188 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1189 (32 + button_number + key_state),
868 (32 + x + 1), 1190 (32 + x + 1),
869 (32 + y + 1)); 1191 (32 + y + 1));
870#endif
871} 1192}
872 1193
873#ifdef USING_W11LIB 1194#ifdef USING_W11LIB
874void 1195void
875rxvt_W11_process_x_event (XEvent *ev) 1196rxvt_W11_process_x_event (XEvent *ev)
… …
882 1203
883/*{{{ process an X event */ 1204/*{{{ process an X event */
884void 1205void
885rxvt_term::x_cb (XEvent &ev) 1206rxvt_term::x_cb (XEvent &ev)
886{ 1207{
1208 dDisp;
1209
887 SET_R (this); 1210 SET_R (this);
888 SET_LOCALE (locale); 1211 SET_LOCALE (locale);
889 1212
890#if defined(CURSOR_BLINK) 1213#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
892 { 1215 {
893 if (hidden_cursor) 1216 if (hidden_cursor)
894 { 1217 {
895 hidden_cursor = 0; 1218 hidden_cursor = 0;
896 want_refresh = 1; 1219 want_refresh = 1;
… …
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 } 1223 }
901#endif 1224#endif
902 1225
903#if defined(POINTER_BLANK) 1226#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 { 1228 {
906 if (ev.type == MotionNotify 1229 if (ev.type == MotionNotify
907 || ev.type == ButtonPress 1230 || ev.type == ButtonPress
908 || ev.type == ButtonRelease) 1231 || ev.type == ButtonRelease)
909 if (hidden_pointer) 1232 if (hidden_pointer)
… …
912 if (ev.type == KeyPress && hidden_pointer == 0) 1235 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank (); 1236 pointer_blank ();
914 } 1237 }
915#endif 1238#endif
916 1239
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return;
920#endif
921
922 Window unused_root, unused_child; 1240 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1241 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1242 unsigned int unused_mask;
925
926#ifdef DEBUG_X
927 const char *const eventnames[] =
928 { /* mason - this matches my system */
929 "",
930 "",
931 "KeyPress",
932 "KeyRelease",
933 "ButtonPress",
934 "ButtonRelease",
935 "MotionNotify",
936 "EnterNotify",
937 "LeaveNotify",
938 "FocusIn",
939 "FocusOut",
940 "KeymapNotify",
941 "Expose",
942 "GraphicsExpose",
943 "NoExpose",
944 "VisibilityNotify",
945 "CreateNotify",
946 "DestroyNotify",
947 "UnmapNotify",
948 "MapNotify",
949 "MapRequest",
950 "ReparentNotify",
951 "ConfigureNotify",
952 "ConfigureRequest",
953 "GravityNotify",
954 "ResizeRequest",
955 "CirculateNotify",
956 "CirculateRequest",
957 "PropertyNotify",
958 "SelectionClear",
959 "SelectionRequest",
960 "SelectionNotify",
961 "ColormapNotify",
962 "ClientMessage",
963 "MappingNotify"
964 };
965#endif
966
967#ifdef DEBUG_X
968 struct timeval tp;
969 struct tm *ltt;
970 (void)gettimeofday (&tp, NULL);
971 ltt = localtime (& (tp.tv_sec));
972 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));
973#endif
974 1243
975 switch (ev.type) 1244 switch (ev.type)
976 { 1245 {
977 case KeyPress: 1246 case KeyPress:
1247#if ISO_14755
1248 if (!(iso14755buf & ISO_14755_52))
1249#endif
978 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;
979 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
980 1315
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 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)
985 mouse_slip_wheel_speed = 0; 1320 mouse_slip_wheel_speed = 0;
986 else 1321#endif
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1322 break;
995 } 1323 }
996#endif
997 1324
998 case ButtonPress: 1325 case ButtonPress:
999 button_press (ev.xbutton); 1326 button_press (ev.xbutton);
1000 break; 1327 break;
1001 1328
… …
1013 && (ev.xclient.data.l[0] == DndFile 1340 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1341 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1342 || ev.xclient.data.l[0] == DndLink))
1016 { 1343 {
1017 /* Get Dnd data */ 1344 /* Get Dnd data */
1018 Atom ActualType; 1345 Atom ActualType;
1019 int ActualFormat; 1346 int ActualFormat;
1020 unsigned char *data; 1347 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1348 unsigned long Size, RemainingBytes;
1022 1349
1023 XGetWindowProperty (display->display, display->root, 1350 XGetWindowProperty (disp, display->root,
1024 xa[XA_DNDSELECTION], 1351 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1352 0L, 1000000L,
1026 False, AnyPropertyType, 1353 False, AnyPropertyType,
1027 &ActualType, &ActualFormat, 1354 &ActualType, &ActualFormat,
1028 &Size, &RemainingBytes, 1355 &Size, &RemainingBytes,
1029 &data); 1356 &data);
1030 XChangeProperty (display->display, display->root, 1357 set_string_property (XA_CUT_BUFFER0, data);
1031 XA_CUT_BUFFER0, XA_STRING, 1358 XFree (data);
1032 8, PropModeReplace,
1033 data, STRLEN (data));
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1359 selection_paste (display->root, XA_CUT_BUFFER0, true);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1360 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1036 } 1361 }
1037#endif /* OFFIX_DND */ 1362#endif /* OFFIX_DND */
1038 break; 1363 break;
1039 1364
1040 case MappingNotify: 1365 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1366 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1367 break;
1043 1368
1044 /* 1369 /*
1045 * XXX: this is not the _current_ arrangement 1370 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1371 * Here's my conclusion:
… …
1071 { 1396 {
1072 TermWin.focus = 1; 1397 TermWin.focus = 1;
1073 want_refresh = 1; 1398 want_refresh = 1;
1074#ifdef USE_XIM 1399#ifdef USE_XIM
1075 if (Input_Context != NULL) 1400 if (Input_Context != NULL)
1401 {
1402 IMSetStatusPosition ();
1076 XSetICFocus (Input_Context); 1403 XSetICFocus (Input_Context);
1404 }
1077#endif 1405#endif
1078#ifdef CURSOR_BLINK 1406#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink) 1407 if (options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1408 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1409#endif
1410#ifdef OFF_FOCUS_FADING
1411 if (rs[Rs_fade])
1412 {
1413 pix_colors = pix_colors_focused;
1414 scr_recolour ();
1415 }
1081#endif 1416#endif
1082 1417
1083 } 1418 }
1084 break; 1419 break;
1085 1420
1086 case FocusOut: 1421 case FocusOut:
1087 if (TermWin.focus) 1422 if (TermWin.focus)
1088 { 1423 {
1089 TermWin.focus = 0; 1424 TermWin.focus = 0;
1090 want_refresh = 1; 1425 want_refresh = 1;
1426
1427#if ENABLE_FRILLS || ISO_14755
1428 iso14755buf = 0;
1429#endif
1430#if ENABLE_OVERLAY
1431 scr_overlay_off ();
1432#endif
1091#ifdef USE_XIM 1433#ifdef USE_XIM
1092 if (Input_Context != NULL) 1434 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context); 1435 XUnsetICFocus (Input_Context);
1094#endif 1436#endif
1095#ifdef CURSOR_BLINK 1437#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink) 1438 if (options & Opt_cursorBlink)
1097 cursor_blink_ev.stop (); 1439 cursor_blink_ev.stop ();
1098 hidden_cursor = 0; 1440 hidden_cursor = 0;
1099#endif 1441#endif
1100 1442#ifdef OFF_FOCUS_FADING
1443 if (rs[Rs_fade])
1444 {
1445 pix_colors = pix_colors_unfocused;
1446 scr_recolour ();
1447 }
1448#endif
1101 } 1449 }
1102 break; 1450 break;
1103 1451
1104 case ConfigureNotify: 1452 case ConfigureNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1453 if (ev.xconfigure.window == TermWin.parent[0])
… …
1110 { /* Wrap lots of configures into one */ 1458 { /* Wrap lots of configures into one */
1111 width = ev.xconfigure.width; 1459 width = ev.xconfigure.width;
1112 height = ev.xconfigure.height; 1460 height = ev.xconfigure.height;
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 } 1462 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1116 1464
1117 if (szHint.width != width || szHint.height != height) 1465 if (szHint.width != width || szHint.height != height)
1118 { 1466 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1467 seen_resize = 1;
1120 resize_all_windows (width, height, 1); 1468 resize_all_windows (width, height, 1);
1121 } 1469 }
1122#ifdef DEBUG_SIZE 1470
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent) 1472 if (options & Opt_transparent)
1130 {
1131 check_our_parents (); 1473 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif 1474#endif
1136 } 1475 }
1476 break;
1477
1478 case PropertyNotify:
1479 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1480 && ev.xproperty.state == PropertyNewValue)
1481 selection_property (ev.xproperty.window, ev.xproperty.atom);
1482
1137 break; 1483 break;
1138 1484
1139 case SelectionClear: 1485 case SelectionClear:
1140 selection_clear (); 1486 selection_clear ();
1141 break; 1487 break;
1142 1488
1143 case SelectionNotify: 1489 case SelectionNotify:
1144 if (selection_wait == Sel_normal) 1490 if (selection_wait == Sel_normal)
1145 selection_paste (ev.xselection.requestor, 1491 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1146 ev.xselection.property, True);
1147 break; 1492 break;
1148 1493
1149 case SelectionRequest: 1494 case SelectionRequest:
1150 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1151 break; 1496 break;
… …
1172 1517
1173 case GraphicsExpose: 1518 case GraphicsExpose:
1174 case Expose: 1519 case Expose:
1175 if (ev.xany.window == TermWin.vt) 1520 if (ev.xany.window == TermWin.vt)
1176 { 1521 {
1177#ifdef NO_SLOW_LINK_SUPPORT 1522 do
1178 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1179 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1180#else 1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1181 // don't understand this, so commented it out 1526
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528
1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1182 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1183 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1184 //scr_expose (ev.xexpose.x, 0, 1532
1185 // ev.xexpose.width, TermWin.height, False); 1533 scr_refresh (refresh_type);
1186#endif
1187 want_refresh = 1;
1188 } 1534 }
1189 else 1535 else
1190 { 1536 {
1191 XEvent unused_event; 1537 XEvent unused_event;
1192 1538
1193 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1539 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1194 Expose, 1540 ;
1195 &unused_event)) ; 1541 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1196 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1542 ;
1197 GraphicsExpose, 1543
1198 &unused_event)) ;
1199 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1200 { 1545 {
1201 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
1202 scrollbar_show (0); 1547 scrollbar_show (0);
1203 } 1548 }
1204#ifdef MENUBAR 1549#ifdef MENUBAR
1205 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1206 menubar_expose (); 1551 menubar_expose ();
1207#endif 1552#endif
1553
1554#ifdef TRANSPARENT
1555 if (am_transparent && ev.xany.window == TermWin.parent[0])
1556 XClearWindow (disp, ev.xany.window);
1557#endif
1208 } 1558 }
1209 break; 1559 break;
1210 1560
1211 case MotionNotify: 1561 case MotionNotify:
1212#ifdef POINTER_BLANK 1562#ifdef POINTER_BLANK
… …
1218 { 1568 {
1219 menubar_control (ev.xbutton); 1569 menubar_control (ev.xbutton);
1220 break; 1570 break;
1221 } 1571 }
1222#endif 1572#endif
1223 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1224 break; 1574 break;
1225 1575
1226 if (ev.xany.window == TermWin.vt) 1576 if (ev.xany.window == TermWin.vt)
1227 { 1577 {
1228 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1578 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1229 { 1579 {
1230 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1231 ; 1581 ;
1232 1582
1233 XQueryPointer (display->display, TermWin.vt, 1583 XQueryPointer (disp, TermWin.vt,
1234 &unused_root, &unused_child, 1584 &unused_root, &unused_child,
1235 &unused_root_x, &unused_root_y, 1585 &unused_root_x, &unused_root_y,
1236 & (ev.xbutton.x), & (ev.xbutton.y), 1586 &ev.xbutton.x, &ev.xbutton.y,
1237 &unused_mask); 1587 &ev.xbutton.state);
1238#ifdef MOUSE_THRESHOLD 1588#ifdef MOUSE_THRESHOLD
1239 /* deal with a `jumpy' mouse */ 1589 /* deal with a `jumpy' mouse */
1240 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1590 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1241 { 1591 {
1242#endif 1592#endif
1593#if ISO_14755
1594 // 5.4
1595 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1596 {
1597 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1598 break;
1599 }
1600#endif
1243 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1601 selection_extend (ev.xbutton.x, ev.xbutton.y,
1244 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1602 ev.xbutton.state & Button3Mask ? 2 : 0);
1603
1245#ifdef SELECTION_SCROLLING 1604#ifdef SELECTION_SCROLLING
1246 if (ev.xbutton.y < TermWin.int_bwidth 1605 if (ev.xbutton.y < TermWin.int_bwidth
1247 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1248 { 1607 {
1249 int dist; 1608 int dist;
1250 1609
1251 pending_scroll_selection=1;
1252
1253 /* don't clobber the current delay if we are 1610 /* don't clobber the current delay if we are
1254 * already in the middle of scrolling. 1611 * already in the middle of scrolling.
1255 */ 1612 */
1256 if (scroll_selection_delay<=0) 1613 if (!sel_scroll_ev.active)
1257 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1614 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1258 1615
1259 /* save the event params so we can highlight 1616 /* save the event params so we can highlight
1260 * the selection in the pending-scroll loop 1617 * the selection in the pending-scroll loop
1261 */ 1618 */
1262 selection_save_x=ev.xbutton.x; 1619 selection_save_x = ev.xbutton.x;
1263 selection_save_y=ev.xbutton.y; 1620 selection_save_y = ev.xbutton.y;
1264 selection_save_state=
1265 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1266 1622
1267 /* calc number of lines to scroll */ 1623 /* calc number of lines to scroll */
1268 if (ev.xbutton.y<TermWin.int_bwidth) 1624 if (ev.xbutton.y < TermWin.int_bwidth)
1269 { 1625 {
1270 scroll_selection_dir = UP; 1626 scroll_selection_dir = UP;
1271 dist = TermWin.int_bwidth - ev.xbutton.y; 1627 dist = TermWin.int_bwidth - ev.xbutton.y;
1272 } 1628 }
1273 else 1629 else
1274 { 1630 {
1275 scroll_selection_dir = DN; 1631 scroll_selection_dir = DN;
1276 dist = ev.xbutton.y -
1277 (TermWin.int_bwidth + TermWin.height); 1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1278 } 1633 }
1634
1279 scroll_selection_lines= (Pixel2Height (dist)/ 1635 scroll_selection_lines = Pixel2Height (dist)
1280 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1636 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1;
1281 MIN_IT (scroll_selection_lines, 1638 MIN_IT (scroll_selection_lines,
1282 SELECTION_SCROLL_MAX_LINES); 1639 SELECTION_SCROLL_MAX_LINES);
1283 } 1640 }
1284 else 1641 else
1285 { 1642 {
1286 /* we are within the text window, so we 1643 /* we are within the text window, so we
1287 * shouldn't be scrolling 1644 * shouldn't be scrolling
1288 */ 1645 */
1289 pending_scroll_selection = 0; 1646 if (sel_scroll_ev.active)
1647 sel_scroll_ev.stop();
1290 } 1648 }
1291#endif 1649#endif
1292#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
1293
1294 } 1651 }
1295#endif 1652#endif
1296
1297 } 1653 }
1298 } 1654 }
1299 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1300 { 1656 {
1301 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1657 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1302 MotionNotify, &ev)) ; 1658 MotionNotify, &ev))
1659 ;
1660
1303 XQueryPointer (display->display, scrollBar.win, 1661 XQueryPointer (disp, scrollBar.win,
1304 &unused_root, &unused_child, 1662 &unused_root, &unused_child,
1305 &unused_root_x, &unused_root_y, 1663 &unused_root_x, &unused_root_y,
1306 & (ev.xbutton.x), & (ev.xbutton.y), 1664 &ev.xbutton.x, &ev.xbutton.y,
1307 &unused_mask); 1665 &unused_mask);
1308 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1309 scrollbar_size ()); 1667 scrollbar_size ());
1310 scr_refresh (refresh_type); 1668 scr_refresh (refresh_type);
1311 refresh_limit = 0; 1669 refresh_limit = 0;
… …
1313 } 1671 }
1314 break; 1672 break;
1315 } 1673 }
1316} 1674}
1317 1675
1676#if TRANSPARENT
1318void 1677void
1319rxvt_term::rootwin_cb (XEvent &ev) 1678rxvt_term::rootwin_cb (XEvent &ev)
1320{ 1679{
1321 SET_R (this); 1680 SET_R (this);
1322 SET_LOCALE (locale); 1681 SET_LOCALE (locale);
1323 1682
1324 switch (ev.type) 1683 switch (ev.type)
1325 { 1684 {
1326 case PropertyNotify: 1685 case PropertyNotify:
1327 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1328 {
1329 if (ev.xproperty.state == PropertyNewValue)
1330 selection_property (ev.xproperty.window, ev.xproperty.atom);
1331 break;
1332 }
1333#ifdef TRANSPARENT
1334 else
1335 {
1336 /* 1686 /*
1337 * if user used some Esetroot compatible prog to set the root bg, 1687 * if user used some Esetroot compatible prog to set the root bg,
1338 * use the property to determine the pixmap. We use it later on. 1688 * use the property to determine the pixmap. We use it later on.
1339 */ 1689 */
1340 if (xa[XA_XROOTPMAPID] == 0)
1341 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1342
1343 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1690 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1691 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1344 return; 1692 return;
1345 }
1346 1693
1347 /* FALLTHROUGH */ 1694 /* FALLTHROUGH */
1348 case ReparentNotify: 1695 case ReparentNotify:
1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1350 want_full_refresh = 1; 1697 want_refresh = want_full_refresh = 1;
1351 break; 1698 break;
1352#endif
1353 } 1699 }
1354} 1700}
1701#endif
1355 1702
1356void 1703void
1357rxvt_term::button_press (XButtonEvent &ev) 1704rxvt_term::button_press (XButtonEvent &ev)
1358{ 1705{
1359 int reportmode = 0, clickintime; 1706 int reportmode = 0, clickintime;
1360 1707
1361 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1708 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1362 if (!bypass_keystate) 1709 if (!bypass_keystate)
1363 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1710 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711
1364 /* 1712 /*
1365 * VT window processing of button press 1713 * VT window processing of button press
1366 */ 1714 */
1367 if (ev.window == TermWin.vt) 1715 if (ev.window == TermWin.vt)
1368 { 1716 {
1717#if ISO_14755
1718 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 {
1721 iso14755_54 (ev.x, ev.y);
1722 return;
1723 }
1724#endif
1725
1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1726 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1727
1370 if (reportmode) 1728 if (reportmode)
1371 { 1729 {
1372 /* mouse report from vt window */ 1730 /* mouse report from vt window */
1373 /* save the xbutton state (for ButtonRelease) */ 1731 /* save the xbutton state (for ButtonRelease) */
1374 MEvent.state = ev.state; 1732 MEvent.state = ev.state;
… …
1403 } 1761 }
1404 else 1762 else
1405 { 1763 {
1406 if (ev.button != MEvent.button) 1764 if (ev.button != MEvent.button)
1407 MEvent.clicks = 0; 1765 MEvent.clicks = 0;
1766
1408 switch (ev.button) 1767 switch (ev.button)
1409 { 1768 {
1410 case Button1: 1769 case Button1:
1770 /* allow meta + click to select rectangular areas */
1771 /* should be done in screen.C */
1772#if ENABLE_FRILLS
1773 selection.rect = !!(ev.state & ModMetaMask);
1774#else
1775 selection.rect = false;
1776#endif
1777
1411 /* allow shift+left click to extend selection */ 1778 /* allow shift+left click to extend selection */
1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1779 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1413 { 1780 {
1414 if (MEvent.button == Button1 && clickintime) 1781 if (MEvent.button == Button1 && clickintime)
1415 selection_rotate (ev.x, ev.y); 1782 selection_rotate (ev.x, ev.y);
1416 else 1783 else
1417 selection_extend (ev.x, ev.y, 1); 1784 selection_extend (ev.x, ev.y, 1);
… …
1432 case Button3: 1799 case Button3:
1433 if (MEvent.button == Button3 && clickintime) 1800 if (MEvent.button == Button3 && clickintime)
1434 selection_rotate (ev.x, ev.y); 1801 selection_rotate (ev.x, ev.y);
1435 else 1802 else
1436 selection_extend (ev.x, ev.y, 1); 1803 selection_extend (ev.x, ev.y, 1);
1804
1437 MEvent.button = Button3; 1805 MEvent.button = Button3;
1438 break; 1806 break;
1439 } 1807 }
1440 } 1808 }
1809
1441 MEvent.time = ev.time; 1810 MEvent.time = ev.time;
1442 return; 1811 return;
1443 } 1812 }
1444 1813
1445 /* 1814 /*
… …
1511 upordown = 1; /* down */ 1880 upordown = 1; /* down */
1512 } 1881 }
1513 if (upordown) 1882 if (upordown)
1514 { 1883 {
1515#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1884#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1516 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1885 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1517#endif 1886#endif
1518 if (scr_page (upordown < 0 ? UP : DN, 1)) 1887 if (scr_page (upordown < 0 ? UP : DN, 1))
1519 { 1888 {
1520 if (upordown < 0) 1889 if (upordown < 0)
1521 scrollBar.setUp (); 1890 scrollBar.setUp ();
… …
1537 break; 1906 break;
1538 case R_SB_ALIGN_BOTTOM: 1907 case R_SB_ALIGN_BOTTOM:
1539 csrO = scrollBar.bot - scrollBar.top; 1908 csrO = scrollBar.bot - scrollBar.top;
1540 break; 1909 break;
1541 } 1910 }
1911
1542 if (scrollBar.style == R_SB_XTERM 1912 if (scrollBar.style == R_SB_XTERM
1543 || scrollbar_above_slider (ev.y) 1913 || scrollbar_above_slider (ev.y)
1544 || scrollbar_below_slider (ev.y)) 1914 || scrollbar_below_slider (ev.y))
1545 scr_move_to ( scrollbar_position (ev.y) - csrO, 1915 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1546 scrollbar_size ()); 1916
1547 scrollBar.setMotion (); 1917 scrollBar.setMotion ();
1548 break; 1918 break;
1549 1919
1550 case Button1: 1920 case Button1:
1551 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1921 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1575 scr_page ((ev.button == Button1 ? DN : UP), 1945 scr_page ((ev.button == Button1 ? DN : UP),
1576 (TermWin.nrow 1946 (TermWin.nrow
1577 * scrollbar_position (ev.y) 1947 * scrollbar_position (ev.y)
1578 / scrollbar_size ())); 1948 / scrollbar_size ()));
1579 } 1949 }
1950
1580 break; 1951 break;
1581 } 1952 }
1582 } 1953 }
1583 return; 1954 return;
1584 } 1955 }
… …
1596{ 1967{
1597 int reportmode = 0; 1968 int reportmode = 0;
1598 1969
1599 csrO = 0; /* reset csr Offset */ 1970 csrO = 0; /* reset csr Offset */
1600 if (!bypass_keystate) 1971 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1972 reportmode = !! (priv_modes & PrivMode_mouse_report);
1602 1973
1603 if (scrollbar_isUpDn ()) 1974 if (scrollbar_isUpDn ())
1604 { 1975 {
1605 scrollBar.setIdle (); 1976 scrollBar.setIdle ();
1606 scrollbar_show (0); 1977 scrollbar_show (0);
1607#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1978#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1608 refresh_type &= ~SMOOTH_REFRESH; 1979 refresh_type &= ~SMOOTH_REFRESH;
1609#endif 1980#endif
1610
1611 } 1981 }
1982
1612#ifdef SELECTION_SCROLLING 1983#ifdef SELECTION_SCROLLING
1613 pending_scroll_selection=0; 1984 if (sel_scroll_ev.active)
1985 sel_scroll_ev.stop();
1614#endif 1986#endif
1987
1615 if (ev.window == TermWin.vt) 1988 if (ev.window == TermWin.vt)
1616 { 1989 {
1990#if ISO_14755
1991 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return;
1994#endif
1617 if (reportmode) 1995 if (reportmode)
1618 { 1996 {
1619 /* mouse report from vt window */ 1997 /* mouse report from vt window */
1620 /* don't report release of wheel "buttons" */ 1998 /* don't report release of wheel "buttons" */
1621 if (ev.button >= 4) 1999 if (ev.button >= 4)
… …
1635 MEvent.button = AnyButton; 2013 MEvent.button = AnyButton;
1636 mouse_report (ev); 2014 mouse_report (ev);
1637#endif /* MOUSE_REPORT_DOUBLECLICK */ 2015#endif /* MOUSE_REPORT_DOUBLECLICK */
1638 return; 2016 return;
1639 } 2017 }
2018
1640 /* 2019 /*
1641 * dumb hack to compensate for the failure of click-and-drag 2020 * dumb hack to compensate for the failure of click-and-drag
1642 * when overriding mouse reporting 2021 * when overriding mouse reporting
1643 */ 2022 */
1644 if (PrivateModes & PrivMode_mouse_report 2023 if (priv_modes & PrivMode_mouse_report
1645 && bypass_keystate 2024 && bypass_keystate
1646 && ev.button == Button1 && MEvent.clicks <= 1) 2025 && ev.button == Button1 && MEvent.clicks <= 1)
1647 selection_extend (ev.x, ev.y, 0); 2026 selection_extend (ev.x, ev.y, 0);
1648 2027
1649 switch (ev.button) 2028 switch (ev.button)
… …
1660 case Button5: 2039 case Button5:
1661 { 2040 {
1662 int i; 2041 int i;
1663 page_dirn v; 2042 page_dirn v;
1664 2043
1665 v = (ev.button == Button4) ? UP : DN; 2044 v = ev.button == Button4 ? UP : DN;
2045
1666 if (ev.state & ShiftMask) 2046 if (ev.state & ShiftMask)
1667 i = 1; 2047 i = 1;
1668 else if ((Options & Opt_mouseWheelScrollPage)) 2048 else if (options & Opt_mouseWheelScrollPage)
1669 i = TermWin.nrow - 1; 2049 i = TermWin.nrow - 1;
1670 else 2050 else
1671 i = 5; 2051 i = 5;
2052
1672# ifdef MOUSE_SLIP_WHEELING 2053# ifdef MOUSE_SLIP_WHEELING
1673 if (ev.state & ControlMask) 2054 if (ev.state & ControlMask)
1674 { 2055 {
1675 mouse_slip_wheel_speed += (v ? -1 : 1); 2056 mouse_slip_wheel_speed += v ? -1 : 1;
2057 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2058 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2059
2060 if (slip_wheel_ev.at < NOW)
1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062
2063 slip_wheel_ev.start ();
1677 } 2064 }
2065 else
2066 {
1678# endif 2067# endif
1679# ifdef JUMP_MOUSE_WHEEL 2068# ifdef JUMP_MOUSE_WHEEL
1680 scr_page (v, i);
1681 scr_refresh (SMOOTH_REFRESH);
1682 scrollbar_show (1);
1683# else
1684 while (i--)
1685 {
1686 scr_page (v, 1); 2069 scr_page (v, i);
1687 scr_refresh (SMOOTH_REFRESH); 2070 scr_refresh (SMOOTH_REFRESH);
1688 scrollbar_show (1); 2071 scrollbar_show (1);
2072# else
2073 while (i--)
2074 {
2075 scr_page (v, 1);
2076 scr_refresh (SMOOTH_REFRESH);
2077 scrollbar_show (1);
2078 }
2079# endif
2080# ifdef MOUSE_SLIP_WHEELING
1689 } 2081 }
1690# endif 2082#endif
1691
1692 } 2083 }
1693 break; 2084 break;
1694#endif 2085#endif
1695
1696 } 2086 }
1697 } 2087 }
1698#ifdef MENUBAR 2088#ifdef MENUBAR
1699 else if (isMenuBarWindow (ev.window)) 2089 else if (isMenuBarWindow (ev.window))
1700 menubar_control (ev); 2090 menubar_control (ev);
1701#endif 2091#endif
1702} 2092}
1703 2093
1704#ifdef TRANSPARENT 2094#ifdef TRANSPARENT
1705#if TINTING 2095#if TINTING
1706/* shading taken from eterm-0.9.2 */ 2096/* taken from aterm-0.4.2 */
1707/* RGB 15 */
1708 2097
1709static void 2098typedef uint32_t RUINT32T;
1710shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1711{
1712 unsigned char *ptr;
1713 int x, y;
1714 2099
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2100void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2101{
1717 /* No saturation */ 2102 int sh_r, sh_g, sh_b;
1718 for (y = h; --y >= 0;) { 2103 RUINT32T mask_r, mask_g, mask_b;
1719 for (x = -w; x < 0; x++) { 2104 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1720 int r, g, b; 2105 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2106 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2107 int i;
1721 2108
1722 b = ((uint16_t *) ptr)[x]; 2109 Visual *visual = display->visual;
1723 r = (b & 0x7c00) * rm; 2110
1724 g = (b & 0x3e0) * gm; 2111 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1725 b = (b & 0x1f) * bm; 2112
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2113 /* for convenience */
1727 | ((g >> 8) & 0x3e0) 2114 mask_r = visual->red_mask;
1728 | ((b >> 8) & 0x1f); 2115 mask_g = visual->green_mask;
1729 } 2116 mask_b = visual->blue_mask;
1730 ptr += bpl; 2117
1731 } 2118 /* boring lookup table pre-initialization */
2119 switch (srcImage->bits_per_pixel) {
2120 case 15:
2121 if ((mask_r != 0x7c00) ||
2122 (mask_g != 0x03e0) ||
2123 (mask_b != 0x001f))
2124 return;
2125 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2126 lookup_r = lookup;
2127 lookup_g = lookup+32;
2128 lookup_b = lookup+32+32;
2129 sh_r = 10;
2130 sh_g = 5;
2131 sh_b = 0;
2132 break;
2133 case 16:
2134 if ((mask_r != 0xf800) ||
2135 (mask_g != 0x07e0) ||
2136 (mask_b != 0x001f))
2137 return;
2138 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2139 lookup_r = lookup;
2140 lookup_g = lookup+32;
2141 lookup_b = lookup+32+64;
2142 sh_r = 11;
2143 sh_g = 5;
2144 sh_b = 0;
2145 break;
2146 case 24:
2147 if ((mask_r != 0xff0000) ||
2148 (mask_g != 0x00ff00) ||
2149 (mask_b != 0x0000ff))
2150 return;
2151 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2152 lookup_r = lookup;
2153 lookup_g = lookup+256;
2154 lookup_b = lookup+256+256;
2155 sh_r = 16;
2156 sh_g = 8;
2157 sh_b = 0;
2158 break;
2159 case 32:
2160 if ((mask_r != 0xff0000) ||
2161 (mask_g != 0x00ff00) ||
2162 (mask_b != 0x0000ff))
2163 return;
2164 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2165 lookup_r = lookup;
2166 lookup_g = lookup+256;
2167 lookup_b = lookup+256+256;
2168 sh_r = 16;
2169 sh_g = 8;
2170 sh_b = 0;
2171 break;
2172 default:
2173 return; /* we do not support this color depth */
2174 }
2175
2176 /* prepare limits for color transformation (each channel is handled separately) */
2177 if (shade < 0) {
2178 shade = -shade;
2179 if (shade < 0) shade = 0;
2180 if (shade > 100) shade = 100;
2181
2182 lower_lim_r = 65535-rm;
2183 lower_lim_g = 65535-gm;
2184 lower_lim_b = 65535-bm;
2185
2186 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2187 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2188 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2189
2190 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1732 } else { 2191 } else {
1733 for (y = h; --y >= 0;) { 2192 if (shade < 0) shade = 0;
1734 for (x = -w; x < 0; x++) { 2193 if (shade > 100) shade = 100;
1735 int r, g, b;
1736 2194
1737 b = ((uint16_t *) ptr)[x]; 2195 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1738 r = (b & 0x7c00) * rm; 2196
1739 g = (b & 0x3e0) * gm; 2197 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1740 b = (b & 0x1f) * bm; 2198 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1741 r |= (!(r >> 15) - 1); 2199 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1742 g |= (!(g >> 10) - 1); 2200 }
1743 b |= (!(b >> 5) - 1); 2201
1744 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2202 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1745 | ((g >> 8) & 0x3e0) 2203 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1746 | ((b >> 8) & 0x1f); 2204 {
1747 } 2205 unsigned int tmp;
1748 ptr += bpl; 2206
2207 tmp = lower_lim_r;
2208 lower_lim_r = lower_lim_b;
2209 lower_lim_b = tmp;
2210
2211 tmp = upper_lim_r;
2212 upper_lim_r = upper_lim_b;
2213 upper_lim_b = tmp;
2214 }
2215
2216 /* fill our lookup tables */
2217 for (i = 0; i <= mask_r>>sh_r; i++)
2218 {
2219 RUINT32T tmp;
2220 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2221 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2222 lookup_r[i] = (tmp/65535)<<sh_r;
2223 }
2224 for (i = 0; i <= mask_g>>sh_g; i++)
2225 {
2226 RUINT32T tmp;
2227 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2228 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2229 lookup_g[i] = (tmp/65535)<<sh_g;
2230 }
2231 for (i = 0; i <= mask_b>>sh_b; i++)
2232 {
2233 RUINT32T tmp;
2234 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2235 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2236 lookup_b[i] = (tmp/65535)<<sh_b;
2237 }
2238
2239 /* apply table to input image (replacing colors by newly calculated ones) */
2240 switch (srcImage->bits_per_pixel)
2241 {
2242 case 15:
2243 {
2244 unsigned short *p1, *pf, *p, *pl;
2245 p1 = (unsigned short *) srcImage->data;
2246 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2247 while (p1 < pf)
2248 {
2249 p = p1;
2250 pl = p1 + srcImage->width;
2251 for (; p < pl; p++)
1749 } 2252 {
2253 *p = lookup_r[(*p & 0x7c00)>>10] |
2254 lookup_g[(*p & 0x03e0)>> 5] |
2255 lookup_b[(*p & 0x001f)];
2256 }
2257 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1750 } 2258 }
1751} 2259 break;
1752 2260 }
1753/* RGB 16 */ 2261 case 16:
1754static void 2262 {
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2263 unsigned short *p1, *pf, *p, *pl;
1756{ 2264 p1 = (unsigned short *) srcImage->data;
1757 unsigned char *ptr; 2265 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1758 int x, y; 2266 while (p1 < pf)
1759 2267 {
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2268 p = p1;
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2269 pl = p1 + srcImage->width;
1762 /* No saturation */ 2270 for (; p < pl; p++)
1763 for (y = h; --y >= 0;) {
1764 for (x = -w; x < 0; x++) {
1765 int r, g, b;
1766
1767 b = ((uint16_t *) ptr)[x];
1768 r = (b & 0xf800) * rm;
1769 g = (b & 0x7e0) * gm;
1770 b = (b & 0x1f) * bm;
1771 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1772 | ((g >> 8) & 0x7e0)
1773 | ((b >> 8) & 0x1f);
1774 }
1775 ptr += bpl;
1776 } 2271 {
1777 } else { 2272 *p = lookup_r[(*p & 0xf800)>>11] |
1778 for (y = h; --y >= 0;) { 2273 lookup_g[(*p & 0x07e0)>> 5] |
1779 for (x = -w; x < 0; x++) { 2274 lookup_b[(*p & 0x001f)];
1780 int r, g, b;
1781
1782 b = ((uint16_t *) ptr)[x];
1783 r = (b & 0xf800) * rm;
1784 g = (b & 0x7e0) * gm;
1785 b = (b & 0x1f) * bm;
1786 r |= (!(r >> 16) - 1);
1787 g |= (!(g >> 11) - 1);
1788 b |= (!(b >> 5) - 1);
1789 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1790 | ((g >> 8) & 0x7e0)
1791 | ((b >> 8) & 0x1f);
1792 } 2275 }
1793 ptr += bpl; 2276 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2277 }
2278 break;
2279 }
2280 case 24:
2281 {
2282 unsigned char *p1, *pf, *p, *pl;
2283 p1 = (unsigned char *) srcImage->data;
2284 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2285 while (p1 < pf)
2286 {
2287 p = p1;
2288 pl = p1 + srcImage->width * 3;
2289 for (; p < pl; p += 3)
1794 } 2290 {
2291 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2292 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2293 p[2] = lookup_r[(p[2] & 0x0000ff)];
2294 }
2295 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1795 } 2296 }
1796} 2297 break;
2298 }
2299 case 32:
2300 {
2301 RUINT32T *p1, *pf, *p, *pl;
2302 p1 = (RUINT32T *) srcImage->data;
2303 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1797 2304
1798/* RGB 24 */ 2305 while (p1 < pf)
1799static void 2306 {
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2307 p = p1;
1801{ 2308 pl = p1 + srcImage->width;
1802 unsigned char *ptr; 2309 for (; p < pl; p++)
1803 int x, y;
1804
1805 ptr = (unsigned char *)data + (w * 3);
1806 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1807 /* No saturation */
1808 for (y = h; --y >= 0;) {
1809 for (x = -(w * 3); x < 0; x += 3) {
1810 int r, g, b;
1811
1812 if (byteorder.big_endian()) {
1813 r = (ptr[x + 0] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 2] * bm) >> 8;
1816 ptr[x + 0] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 2] = b;
1819 } else {
1820 r = (ptr[x + 2] * rm) >> 8;
1821 g = (ptr[x + 1] * gm) >> 8;
1822 b = (ptr[x + 0] * bm) >> 8;
1823 ptr[x + 2] = r;
1824 ptr[x + 1] = g;
1825 ptr[x + 0] = b;
1826 }
1827 }
1828 ptr += bpl;
1829 } 2310 {
1830 } else { 2311 *p = lookup_r[(*p & 0xff0000)>>16] |
1831 for (y = h; --y >= 0;) { 2312 lookup_g[(*p & 0x00ff00)>> 8] |
1832 for (x = -(w * 3); x < 0; x += 3) { 2313 lookup_b[(*p & 0x0000ff)] |
1833 int r, g, b; 2314 (*p & ~0xffffff);
1834
1835 if (byteorder.big_endian()) {
1836 r = (ptr[x + 0] * rm) >> 8;
1837 g = (ptr[x + 1] * gm) >> 8;
1838 b = (ptr[x + 2] * bm) >> 8;
1839
1840 r |= (!(r >> 8) - 1);
1841 g |= (!(g >> 8) - 1);
1842 b |= (!(b >> 8) - 1);
1843
1844 ptr[x + 0] = r;
1845 ptr[x + 1] = g;
1846 ptr[x + 2] = b;
1847 } else {
1848 r = (ptr[x + 2] * rm) >> 8;
1849 g = (ptr[x + 1] * gm) >> 8;
1850 b = (ptr[x + 0] * bm) >> 8;
1851
1852 r |= (!(r >> 8) - 1);
1853 g |= (!(g >> 8) - 1);
1854 b |= (!(b >> 8) - 1);
1855
1856 ptr[x + 2] = r;
1857 ptr[x + 1] = g;
1858 ptr[x + 0] = b;
1859 }
1860 } 2315 }
1861 ptr += bpl; 2316 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1862 } 2317 }
2318 break;
2319 }
1863 } 2320 }
1864}
1865 2321
1866/* RGB 32 */ 2322 free (lookup);
1867static void
1868shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1869{
1870 unsigned char *ptr;
1871 int x, y;
1872
1873 ptr = (unsigned char *)data + (w * 4);
1874 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1875 /* No saturation */
1876 for (y = h; --y >= 0;) {
1877 if (byteorder.big_endian()) {
1878 for (x = -(w * 4); x < 0; x += 4) {
1879 int r, g, b;
1880
1881 r = (ptr[x + 1] * rm) >> 8;
1882 g = (ptr[x + 2] * gm) >> 8;
1883 b = (ptr[x + 3] * bm) >> 8;
1884 ptr[x + 1] = r;
1885 ptr[x + 2] = g;
1886 ptr[x + 3] = b;
1887 }
1888 } else {
1889 for (x = -(w * 4); x < 0; x += 4) {
1890 int r, g, b;
1891
1892 r = (ptr[x + 2] * rm) >> 8;
1893 g = (ptr[x + 1] * gm) >> 8;
1894 b = (ptr[x + 0] * bm) >> 8;
1895 ptr[x + 2] = r;
1896 ptr[x + 1] = g;
1897 ptr[x + 0] = b;
1898 }
1899 }
1900 ptr += bpl;
1901 }
1902 } else {
1903 for (y = h; --y >= 0;) {
1904 for (x = -(w * 4); x < 0; x += 4) {
1905 int r, g, b;
1906
1907 if (byteorder.big_endian()) {
1908 r = (ptr[x + 1] * rm) >> 8;
1909 g = (ptr[x + 2] * gm) >> 8;
1910 b = (ptr[x + 3] * bm) >> 8;
1911
1912 r |= (!(r >> 8) - 1);
1913 g |= (!(g >> 8) - 1);
1914 b |= (!(b >> 8) - 1);
1915
1916 ptr[x + 1] = r;
1917 ptr[x + 2] = g;
1918 ptr[x + 3] = b;
1919 } else {
1920 r = (ptr[x + 2] * rm) >> 8;
1921 g = (ptr[x + 1] * gm) >> 8;
1922 b = (ptr[x + 0] * bm) >> 8;
1923
1924 r |= (!(r >> 8) - 1);
1925 g |= (!(g >> 8) - 1);
1926 b |= (!(b >> 8) - 1);
1927
1928 ptr[x + 2] = r;
1929 ptr[x + 1] = g;
1930 ptr[x + 0] = b;
1931 }
1932 }
1933 ptr += bpl;
1934 }
1935 }
1936} 2323}
1937
1938#endif 2324#endif
1939 2325
1940/* 2326/*
1941 * Check our parents are still who we think they are. 2327 * Check our parents are still who we think they are.
1942 * Do transparency updates if required 2328 * Do transparency updates if required
… …
1949 Atom atype; 2335 Atom atype;
1950 unsigned char *prop = NULL; 2336 unsigned char *prop = NULL;
1951 Window root, oldp, *list; 2337 Window root, oldp, *list;
1952 Pixmap rootpixmap = None; 2338 Pixmap rootpixmap = None;
1953 XWindowAttributes wattr, wrootattr; 2339 XWindowAttributes wattr, wrootattr;
2340 dDisp;
1954 2341
1955 pchanged = 0; 2342 pchanged = 0;
1956 2343
1957 if (!(Options & Opt_transparent)) 2344 if (!(options & Opt_transparent))
1958 return pchanged; /* Don't try any more */ 2345 return pchanged; /* Don't try any more */
1959 2346
1960 XGetWindowAttributes (display->display, display->root, &wrootattr); 2347 XGetWindowAttributes (disp, display->root, &wrootattr);
1961 rootdepth = wrootattr.depth; 2348 rootdepth = wrootattr.depth;
1962 2349
1963 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
1964 2351
1965 if (rootdepth != wattr.depth) 2352 if (rootdepth != wattr.depth)
1966 { 2353 {
1967 if (am_transparent) 2354 if (am_transparent)
1968 { 2355 {
1969 pchanged = 1; 2356 pchanged = 1;
1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1971 am_transparent = am_pixmap_trans = 0; 2358 am_transparent = am_pixmap_trans = 0;
1972 } 2359 }
1973 2360
1974 return pchanged; /* Don't try any more */ 2361 return pchanged; /* Don't try any more */
1975 } 2362 }
1976 2363
1977 /* Get all X ops out of the queue so that our information is up-to-date. */ 2364 /* Get all X ops out of the queue so that our information is up-to-date. */
1978 XSync (display->display, False); 2365 XSync (disp, False);
1979 2366
1980 /* 2367 /*
1981 * Make the frame window set by the window manager have 2368 * Make the frame window set by the window manager have
1982 * the root background. Some window managers put multiple nested frame 2369 * the root background. Some window managers put multiple nested frame
1983 * windows for each client, so we have to take care about that. 2370 * windows for each client, so we have to take care about that.
1984 */ 2371 */
1985 i = (xa[XA_XROOTPMAPID] 2372 i = (xa[XA_XROOTPMAP_ID]
1986 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2373 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1987 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2374 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1988 &nitems, &bytes_after, &prop) == Success); 2375 &nitems, &bytes_after, &prop) == Success);
1989 2376
1990 if (!i || prop == NULL) 2377 if (!i || prop == NULL)
1991 i = (xa[XA_XSETROOTID] 2378 i = (xa[XA_ESETROOT_PMAP_ID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2379 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2380 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success); 2381 &nitems, &bytes_after, &prop) == Success);
1995 2382
1996 if (!i || prop == NULL) 2383 if (!i || prop == NULL
2384#if TINTING
2385 || !rs[Rs_color + Color_tint]
2386#endif
2387 )
1997 have_pixmap = 0; 2388 have_pixmap = 0;
1998 else 2389 else
1999 { 2390 {
2000 have_pixmap = 1; 2391 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2392 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2393 XFree (prop);
2003 } 2394 }
2004 2395
2005 if (have_pixmap) 2396 if (have_pixmap)
2006 { 2397 {
… …
2012 Window cr; 2403 Window cr;
2013 XImage *image; 2404 XImage *image;
2014 GC gc; 2405 GC gc;
2015 XGCValues gcvalue; 2406 XGCValues gcvalue;
2016 2407
2017 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2018 0, 0, &sx, &sy, &cr); 2409 0, 0, &sx, &sy, &cr);
2019 nw = (unsigned int)szHint.width; 2410 nw = (unsigned int)szHint.width;
2020 nh = (unsigned int)szHint.height; 2411 nh = (unsigned int)szHint.height;
2021 nx = ny = 0; 2412 nx = ny = 0;
2022 2413
… …
2034 sy = 0; 2425 sy = 0;
2035 } 2426 }
2036 2427
2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2430
2431 XSync (disp, False);
2039 allowedxerror = -1; 2432 allowedxerror = -1;
2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2041 2434
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2435 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */ 2436 /* XXX: may need a delay here? */
2044 allowedxerror = 0; 2437 allowedxerror = 0;
2045 2438
… …
2048 if (am_transparent && am_pixmap_trans) 2441 if (am_transparent && am_pixmap_trans)
2049 { 2442 {
2050 pchanged = 1; 2443 pchanged = 1;
2051 if (TermWin.pixmap != None) 2444 if (TermWin.pixmap != None)
2052 { 2445 {
2053 XFreePixmap (display->display, TermWin.pixmap); 2446 XFreePixmap (disp, TermWin.pixmap);
2054 TermWin.pixmap = None; 2447 TermWin.pixmap = None;
2055 } 2448 }
2056 } 2449 }
2057 2450
2058 am_pixmap_trans = 0; 2451 am_pixmap_trans = 0;
2059 } 2452 }
2060 else 2453 else
2061 { 2454 {
2062 if (TermWin.pixmap != None) 2455 if (TermWin.pixmap != None)
2063 XFreePixmap (display->display, TermWin.pixmap); 2456 XFreePixmap (disp, TermWin.pixmap);
2064 2457
2065#if TINTING 2458#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint)) 2459 if (ISSET_PIXCOLOR (Color_tint))
2067 { 2460 {
2068 unsigned short shade, rm, gm, bm; 2461 unsigned short rm, gm, bm;
2462 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2069 2463
2070 PixColors[Color_tint].get (display, rm, gm, bm); 2464 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2071 2465
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2466 ShadeXImage (display, image, shade, rm, gm, bm);
2073
2074 /* Determine bitshift and bitmask values */
2075 switch (image->bits_per_pixel)
2076 {
2077 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2078 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2079 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2080 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2081 }
2082 } 2467 }
2083#endif 2468#endif
2084 2469
2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2086 szHint.width, szHint.height, image->depth); 2471 szHint.width, szHint.height, image->depth);
2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2089 nx, ny, image->width, image->height); 2474 nx, ny, image->width, image->height);
2090 XFreeGC (display->display, gc); 2475 XFreeGC (disp, gc);
2091 XDestroyImage (image); 2476 XDestroyImage (image);
2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2093 TermWin.pixmap); 2478 XClearWindow (disp, TermWin.parent[0]);
2094 2479
2095 if (!am_transparent || !am_pixmap_trans) 2480 if (!am_transparent || !am_pixmap_trans)
2096 pchanged = 1; 2481 pchanged = 1;
2097 2482
2098 am_transparent = am_pixmap_trans = 1; 2483 am_transparent = am_pixmap_trans = 1;
2099 } 2484 }
2100 } 2485 }
2101 2486
2102 if (!am_pixmap_trans) 2487 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2489 else
2103 { 2490 {
2104 unsigned int n; 2491 unsigned int n;
2105 /* 2492 /*
2106 * InheritPixmap transparency 2493 * InheritPixmap transparency
2107 */ 2494 */
2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2110 { 2496 {
2111 oldp = TermWin.parent[i]; 2497 oldp = TermWin.parent[i];
2112 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2498 XQueryTree (disp, TermWin.parent[i - 1], &root,
2113 &TermWin.parent[i], &list, &n); 2499 &TermWin.parent[i], &list, &n);
2114 XFree (list); 2500 XFree (list);
2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116 2501
2117 if (TermWin.parent[i] == display->root) 2502 if (TermWin.parent[i] == display->root)
2118 { 2503 {
2119 if (oldp != None) 2504 if (oldp != None)
2120 pchanged = 1; 2505 pchanged = 1;
… …
2130 2515
2131 if (pchanged) 2516 if (pchanged)
2132 { 2517 {
2133 for (; n < (unsigned int)i; n++) 2518 for (; n < (unsigned int)i; n++)
2134 { 2519 {
2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2136 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2137 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2138 { 2522 {
2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2140 break; 2524 break;
2141 } 2525 }
2142 } 2526 }
2143 } 2527 }
2144 2528
2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2146 { 2530 {
2147 D_X ((stderr, "InheritPixmap Turning off"));
2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2150 am_transparent = 0; 2533 am_transparent = 0;
2151 /* XXX: also turn off Opt_transparent? */ 2534 /* XXX: also turn off Opt_transparent? */
2152 } 2535 }
2153 else 2536 else
2154 { 2537 {
2155#if WAIT_FOR_WM 2538#if WAIT_FOR_WM
2156 /* wait (an arbitrary period) for the WM to do its thing 2539 /* wait (an arbitrary period) for the WM to do its thing
2157 * needed for fvwm2.2.2 (and before?) */ 2540 * needed for fvwm2.2.2 (and before?) */
2158 sleep (1); 2541 sleep (1);
2159#endif 2542#endif
2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2161 for (n = 0; n < (unsigned int)i; n++) 2543 for (n = 0; n < (unsigned int)i; n++)
2544 {
2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2546 XClearWindow (disp, TermWin.parent[n]);
2547 }
2163 2548
2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2165 am_transparent = 1; 2550 am_transparent = 1;
2166 } 2551 }
2167 2552
2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2169 TermWin.parent[i] = None; 2554 TermWin.parent[i] = None;
2555 }
2556
2557 if (scrollBar.win)
2558 {
2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2560 scrollBar.setIdle ();
2561 scrollbar_show (0);
2562 }
2563
2564 if (am_transparent)
2565 {
2566 want_refresh = want_full_refresh = 1;
2567 if (am_pixmap_trans)
2568 flush ();
2170 } 2569 }
2171 2570
2172 return pchanged; 2571 return pchanged;
2173} 2572}
2174#endif 2573#endif
… …
2191 } 2590 }
2192 2591
2193 if (ch == NOCHAR) // TODO: improve 2592 if (ch == NOCHAR) // TODO: improve
2194 break; 2593 break;
2195 2594
2196 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2595 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2596 {
2597 if (!seen_input)
2197 { 2598 {
2599 seen_input = 1;
2600 // many badly-written programs (e.g. jed) contain a race condition:
2601 // they first read the screensize and then install a SIGWINCH handler.
2602 // some window managers resize the window early, and these programs
2603 // then sometimes get the size wrong.
2604 // unfortunately other programs are even more buggy and dislike
2605 // being sent SIGWINCH, so only do it when we were in fact being
2606 // resized.
2607 if (seen_resize)
2608 kill (-cmd_pid, SIGWINCH);
2609 }
2610
2198 /* Read a text string from the input buffer */ 2611 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ]; 2612 unicode_t buf[UBUFSIZ];
2200 bool refreshnow = false; 2613 bool refreshnow = false;
2201 int nlines = 0; 2614 int nlines = 0;
2202 unicode_t *str = buf; 2615 unicode_t *str = buf;
2203 2616
2204 *str++ = ch;
2205
2206 for (;;) 2617 for (;;)
2207 { 2618 {
2208 seq_begin = cmdbuf_ptr;
2209 ch = next_char ();
2210
2211 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2619 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2212 break; 2620 break;
2213 2621
2214 *str++ = ch; 2622 *str++ = ch;
2215 2623
2216 if (ch == '\n') 2624 if (ch == C0_LF)
2217 { 2625 {
2218 nlines++; 2626 nlines++;
2219 refresh_count++; 2627 refresh_count++;
2220 2628
2221 if (! (Options & Opt_jumpScroll) 2629 if (!(options & Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2223 { 2631 {
2224 refreshnow = true; 2632 refreshnow = true;
2225 flag = true;
2226 ch = NOCHAR; 2633 ch = NOCHAR;
2227 break; 2634 break;
2228 } 2635 }
2229 2636
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2231 if (nlines >= TermWin.nrow - 1) 2638 if (nlines >= TermWin.nrow - 1)
2232 { 2639 {
2233 scr_add_lines (buf, nlines, str - buf); 2640 scr_add_lines (buf, nlines, str - buf);
2234 nlines = 0; 2641 nlines = 0;
2235 str = buf; 2642 str = buf;
… …
2239 if (str >= buf + UBUFSIZ) 2646 if (str >= buf + UBUFSIZ)
2240 { 2647 {
2241 ch = NOCHAR; 2648 ch = NOCHAR;
2242 break; 2649 break;
2243 } 2650 }
2651
2652 seq_begin = cmdbuf_ptr;
2653 ch = next_char ();
2244 } 2654 }
2245 2655
2246 scr_add_lines (buf, nlines, str - buf); 2656 scr_add_lines (buf, nlines, str - buf);
2247 2657
2248 /* 2658 /*
2249 * If there have been a lot of new lines, then update the screen 2659 * If there have been a lot of new lines, then update the screen
2250 * What the heck I'll cheat and only refresh less than every page-full. 2660 * What the heck I'll cheat and only refresh less than every page-full.
2251 * the number of pages between refreshes is refresh_limit, which 2661 * the number of pages between refreshes is refresh_limit, which
2252 * is incremented here because we must be doing flat-out scrolling. 2662 * is incremented here because we must be doing flat-out scrolling.
2253 *
2254 * refreshing should be correct for small scrolls, because of the
2255 * time-out
2256 */ 2663 */
2257 if (refreshnow) 2664 if (refreshnow)
2258 { 2665 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2666 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2260 refresh_limit++; 2667 refresh_limit++;
2261 2668 else
2669 {
2670 flag = true;
2262 scr_refresh (refresh_type); 2671 scr_refresh (refresh_type);
2672 }
2263 } 2673 }
2264 2674
2265 } 2675 }
2266 else 2676 else
2267 { 2677 {
… …
2281 } 2691 }
2282 2692
2283 return flag; 2693 return flag;
2284} 2694}
2285 2695
2696// read the next octet
2697unicode_t
2698rxvt_term::next_octet ()
2699{
2700 return cmdbuf_ptr < cmdbuf_endp
2701 ? *cmdbuf_ptr++
2702 : NOCHAR;
2703}
2704
2286// read the next character 2705// read the next character
2287unicode_t 2706unicode_t
2288rxvt_term::next_char () 2707rxvt_term::next_char ()
2289{ 2708{
2290 while (cmdbuf_ptr < cmdbuf_endp) 2709 while (cmdbuf_ptr < cmdbuf_endp)
… …
2306 if (len == (size_t)-1) 2725 if (len == (size_t)-1)
2307 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2726 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2308 2727
2309 // assume wchar == unicode 2728 // assume wchar == unicode
2310 cmdbuf_ptr += len; 2729 cmdbuf_ptr += len;
2311 return wc; 2730 return wc & UNICODE_MASK;
2312 } 2731 }
2313 2732
2314 return NOCHAR; 2733 return NOCHAR;
2315} 2734}
2316 2735
… …
2321 */ 2740 */
2322unicode_t 2741unicode_t
2323rxvt_term::cmd_getc () 2742rxvt_term::cmd_getc ()
2324{ 2743{
2325 unicode_t c = next_char (); 2744 unicode_t c = next_char ();
2745
2746 if (c == NOCHAR)
2747 throw out_of_input;
2748
2749 return c;
2750}
2751
2752unicode_t
2753rxvt_term::cmd_get8 ()
2754{
2755 unicode_t c = next_octet ();
2326 2756
2327 if (c == NOCHAR) 2757 if (c == NOCHAR)
2328 throw out_of_input; 2758 throw out_of_input;
2329 2759
2330 return c; 2760 return c;
… …
2431 process_escape_seq (); 2861 process_escape_seq ();
2432 break; 2862 break;
2433 case C0_ENQ: /* terminal Status */ 2863 case C0_ENQ: /* terminal Status */
2434 if (rs[Rs_answerbackstring]) 2864 if (rs[Rs_answerbackstring])
2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2865 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2436 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2866 (unsigned int)strlen (rs[Rs_answerbackstring]));
2437 else 2867 else
2438 tt_write ((unsigned char *)VT100_ANS, 2868 tt_write ((unsigned char *)VT100_ANS,
2439 (unsigned int)STRLEN (VT100_ANS)); 2869 (unsigned int)strlen (VT100_ANS));
2440 break; 2870 break;
2441 case C0_BEL: /* bell */ 2871 case C0_BEL: /* bell */
2442 scr_bell (); 2872 scr_bell ();
2443 break; 2873 break;
2444 case C0_BS: /* backspace */ 2874 case C0_BS: /* backspace */
… …
2460 break; 2890 break;
2461 case C0_SI: /* shift in - acs */ 2891 case C0_SI: /* shift in - acs */
2462 scr_charset_choose (0); 2892 scr_charset_choose (0);
2463 break; 2893 break;
2464 2894
2895#ifdef EIGHT_BIT_CONTROLS
2465 // 8-bit controls 2896 // 8-bit controls
2466 case 0x90: /* DCS */ 2897 case 0x90: /* DCS */
2467 process_dcs_seq (); 2898 process_dcs_seq ();
2468 break; 2899 break;
2469 case 0x9b: /* CSI */ 2900 case 0x9b: /* CSI */
2470 process_csi_seq (); 2901 process_csi_seq ();
2471 break; 2902 break;
2472 case 0x9d: /* CSI */ 2903 case 0x9d: /* CSI */
2473 process_osc_seq (); 2904 process_osc_seq ();
2474 break; 2905 break;
2906#endif
2475 } 2907 }
2476} 2908}
2477/*}}} */ 2909/*}}} */
2478 2910
2479 2911
… …
2541void 2973void
2542rxvt_term::process_escape_seq () 2974rxvt_term::process_escape_seq ()
2543{ 2975{
2544 unicode_t ch = cmd_getc (); 2976 unicode_t ch = cmd_getc ();
2545 2977
2546 if (PrivateModes & PrivMode_vt52) 2978 if (priv_modes & PrivMode_vt52)
2547 { 2979 {
2548 process_escape_vt52 (ch); 2980 process_escape_vt52 (ch);
2549 return; 2981 return;
2550 } 2982 }
2551 2983
… …
2566 scr_charset_set (2, (unsigned int)cmd_getc ()); 2998 scr_charset_set (2, (unsigned int)cmd_getc ());
2567 break; 2999 break;
2568 case '+': 3000 case '+':
2569 scr_charset_set (3, (unsigned int)cmd_getc ()); 3001 scr_charset_set (3, (unsigned int)cmd_getc ());
2570 break; 3002 break;
2571#ifndef NO_FRILLS 3003#if ENABLE_FRILLS
2572 case '6': 3004 case '6':
2573 scr_backindex (); 3005 scr_backindex ();
2574 break; 3006 break;
2575#endif 3007#endif
2576 case '7': 3008 case '7':
2577 scr_cursor (SAVE); 3009 scr_cursor (SAVE);
2578 break; 3010 break;
2579 case '8': 3011 case '8':
2580 scr_cursor (RESTORE); 3012 scr_cursor (RESTORE);
2581 break; 3013 break;
2582#ifndef NO_FRILLS 3014#if ENABLE_FRILLS
2583 case '9': 3015 case '9':
2584 scr_forwardindex (); 3016 scr_forwardindex ();
2585 break; 3017 break;
2586#endif 3018#endif
2587 case '=': 3019 case '=':
… …
2597 break; 3029 break;
2598 3030
2599 /* 8.3.87: NEXT LINE */ 3031 /* 8.3.87: NEXT LINE */
2600 case C1_NEL: /* ESC E */ 3032 case C1_NEL: /* ESC E */
2601 { 3033 {
2602 unicode_t nlcr[] = { L'\n', L'\r' }; 3034 unicode_t nlcr[] = { C0_LF, C0_CR };
2603 scr_add_lines (nlcr, 1, 2); 3035 scr_add_lines (nlcr, 1, 2);
2604 } 3036 }
2605 break; 3037 break;
2606 3038
2607 /* kidnapped escape sequence: Should be 8.3.48 */ 3039 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2668 3100
2669/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3101/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2670/* *INDENT-OFF* */ 3102/* *INDENT-OFF* */
2671enum { 3103enum {
2672 CSI_ICH = 0x40, 3104 CSI_ICH = 0x40,
2673 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3105 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2674 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3106 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2675 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3107 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2676 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3108 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2677 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3109 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2678 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3110 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2766 { 3198 {
2767 switch (priv) 3199 switch (priv)
2768 { 3200 {
2769 case '>': 3201 case '>':
2770 if (ch == CSI_DA) /* secondary device attributes */ 3202 if (ch == CSI_DA) /* secondary device attributes */
2771 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3203 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2772 break; 3204 break;
2773 case '?': 3205 case '?':
2774 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3206 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2775 process_terminal_mode (ch, priv, nargs, arg); 3207 process_terminal_mode (ch, priv, nargs, arg);
2776 break; 3208 break;
… …
2886 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2887 break; 3319 break;
2888 3320
2889 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2890 tt_write ((const unsigned char *)VT100_ANS, 3322 tt_write ((const unsigned char *)VT100_ANS,
2891 (unsigned int) (sizeof (VT100_ANS) - 1)); 3323 (unsigned int) (sizeof (VT100_ANS) - 1));
2892 break; 3324 break;
2893 3325
2894 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3326 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2895 process_sgr_mode (nargs, arg); 3327 process_sgr_mode (nargs, arg);
2896 break; 3328 break;
… …
2903 break; 3335 break;
2904 case 6: /* CPR requested */ 3336 case 6: /* CPR requested */
2905 scr_report_position (); 3337 scr_report_position ();
2906 break; 3338 break;
2907 case 7: /* unofficial extension */ 3339 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure) 3340 if (options & Opt_insecure)
2909 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3341 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2910 break; 3342 break;
2911 case 8: /* unofficial extension */ 3343 case 8: /* unofficial extension */
2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3344 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2913 break; 3345 break;
2914 } 3346 }
… …
2950 break; 3382 break;
2951 3383
2952 case CSI_RM: /* 8.3.107: RESET MODE */ 3384 case CSI_RM: /* 8.3.107: RESET MODE */
2953 if (arg[0] == 4) 3385 if (arg[0] == 4)
2954 scr_insert_mode (0); 3386 scr_insert_mode (0);
3387 else if (arg[0] == 20)
3388 priv_modes &= ~PrivMode_LFNL;
2955 break; 3389 break;
2956 3390
2957 case CSI_SM: /* 8.3.126: SET MODE */ 3391 case CSI_SM: /* 8.3.126: SET MODE */
2958 if (arg[0] == 4) 3392 if (arg[0] == 4)
2959 scr_insert_mode (1); 3393 scr_insert_mode (1);
3394 else if (arg[0] == 20)
3395 priv_modes |= PrivMode_LFNL;
2960 break; 3396 break;
2961 3397
2962 /* 3398 /*
2963 * PRIVATE USE beyond this point. All CSI_7? sequences here 3399 * PRIVATE USE beyond this point. All CSI_7? sequences here
2964 */ 3400 */
… …
2976 break; 3412 break;
2977 case CSI_75: 3413 case CSI_75:
2978 scr_cursor (RESTORE); 3414 scr_cursor (RESTORE);
2979 break; 3415 break;
2980 3416
2981#ifndef NO_FRILLS 3417#if ENABLE_FRILLS
2982 case CSI_74: 3418 case CSI_74:
2983 process_window_ops (arg, nargs); 3419 process_window_ops (arg, nargs);
2984 break; 3420 break;
2985#endif 3421#endif
2986 3422
… …
2993 break; 3429 break;
2994 } 3430 }
2995} 3431}
2996/*}}} */ 3432/*}}} */
2997 3433
2998#ifndef NO_FRILLS 3434#if ENABLE_FRILLS
2999/* ARGSUSED */ 3435/* ARGSUSED */
3000void 3436void
3001rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3437rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3002{ 3438{
3003 int x, y; 3439 int x, y;
3004 XWindowAttributes wattr; 3440 XWindowAttributes wattr;
3005 Window wdummy; 3441 Window wdummy;
3442 dDisp;
3006 3443
3007 if (nargs == 0) 3444 if (nargs == 0)
3008 return; 3445 return;
3009 3446
3010 switch (args[0]) 3447 switch (args[0])
3011 { 3448 {
3012 /* 3449 /*
3013 * commands 3450 * commands
3014 */ 3451 */
3015 case 1: /* deiconify window */ 3452 case 1: /* deiconify window */
3016 XMapWindow (display->display, TermWin.parent[0]); 3453 XMapWindow (disp, TermWin.parent[0]);
3017 break; 3454 break;
3018 case 2: /* iconify window */ 3455 case 2: /* iconify window */
3019 XIconifyWindow (display->display, TermWin.parent[0], 3456 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3020 DefaultScreen (display->display));
3021 break; 3457 break;
3022 case 3: /* set position (pixels) */ 3458 case 3: /* set position (pixels) */
3023 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3024 break; 3460 break;
3025 case 4: /* set size (pixels) */ 3461 case 4: /* set size (pixels) */
3026 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3027 break; 3463 break;
3028 case 5: /* raise window */ 3464 case 5: /* raise window */
3029 XRaiseWindow (display->display, TermWin.parent[0]); 3465 XRaiseWindow (disp, TermWin.parent[0]);
3030 break; 3466 break;
3031 case 6: /* lower window */ 3467 case 6: /* lower window */
3032 XLowerWindow (display->display, TermWin.parent[0]); 3468 XLowerWindow (disp, TermWin.parent[0]);
3033 break; 3469 break;
3034 case 7: /* refresh window */ 3470 case 7: /* refresh window */
3035 scr_touch (true); 3471 scr_touch (true);
3036 break; 3472 break;
3037 case 8: /* set size (chars) */ 3473 case 8: /* set size (chars) */
… …
3049 3485
3050 /* 3486 /*
3051 * reports - some output format copied from XTerm 3487 * reports - some output format copied from XTerm
3052 */ 3488 */
3053 case 11: /* report window state */ 3489 case 11: /* report window state */
3054 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3055 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3056 break; 3492 break;
3057 case 13: /* report window position */ 3493 case 13: /* report window position */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3059 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3060 -wattr.border_width, -wattr.border_width, 3496 -wattr.border_width, -wattr.border_width,
3061 &x, &y, &wdummy); 3497 &x, &y, &wdummy);
3062 tt_printf ("\033[3;%d;%dt", x, y); 3498 tt_printf ("\033[3;%d;%dt", x, y);
3063 break; 3499 break;
3064 case 14: /* report window size (pixels) */ 3500 case 14: /* report window size (pixels) */
3065 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3066 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3067 break; 3503 break;
3068 case 18: /* report text area size (chars) */ 3504 case 18: /* report text area size (chars) */
3069 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3070 break; 3506 break;
3071 case 19: /* report window size (chars) */ 3507 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3073 break; 3509 break;
3074 case 20: /* report icon label */ 3510 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 { 3511 {
3077 char *s; 3512 char *s;
3078 XGetIconName (display->display, TermWin.parent[0], &s); 3513 XGetIconName (disp, TermWin.parent[0], &s);
3079 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3514 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3515 XFree (s);
3080 } 3516 }
3081 break; 3517 break;
3082 case 21: /* report window title */ 3518 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 { 3519 {
3085 char *s; 3520 char *s;
3086 XFetchName (display->display, TermWin.parent[0], &s); 3521 XFetchName (disp, TermWin.parent[0], &s);
3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3522 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3523 XFree (s);
3088 } 3524 }
3089 break; 3525 break;
3090 } 3526 }
3091} 3527}
3092#endif 3528#endif
3093 3529
3094/*----------------------------------------------------------------------*/ 3530/*----------------------------------------------------------------------*/
3095/* 3531/*
3096 * get input up until STRING TERMINATOR (or BEL) 3532 * get input up until STRING TERMINATOR (or BEL)
3097 * ends_how is terminator used. returned input must be free ()d 3533 * ends_how is terminator used. returned input must be free()'d
3098 */ 3534 */
3099unsigned char * 3535unsigned char *
3100rxvt_term::get_to_st (unicode_t &ends_how) 3536rxvt_term::get_to_st (unicode_t &ends_how)
3101{ 3537{
3102 int seen_esc = 0; /* seen escape? */ 3538 unicode_t ch;
3539 bool seen_esc = false;
3103 unsigned int n = 0; 3540 unsigned int n = 0;
3104 unsigned char *s;
3105 unicode_t ch;
3106 unsigned char string[STRING_MAX]; 3541 wchar_t string[STRING_MAX];
3107 3542
3108 while ((ch = cmd_getc ())) 3543 while ((ch = cmd_getc ()) != NOCHAR)
3109 { 3544 {
3110 if (ch == C0_BEL || ch == CHAR_ST)
3111 break;
3112
3113 if (seen_esc) 3545 if (seen_esc)
3546 {
3114 if (ch == 0x5c) /* 7bit ST */ 3547 if (ch == 0x5c) /* 7bit ST */
3115 break; 3548 break;
3116 else 3549 else
3117 return NULL; 3550 return NULL;
3118 3551 }
3119 if (ch == C0_ESC) 3552 else if (ch == C0_ESC)
3120 { 3553 {
3121 seen_esc = 1; 3554 seen_esc = true;
3122 continue; 3555 continue;
3123 } 3556 }
3124 else if (ch == '\t') 3557 else if (ch == C0_BEL || ch == CHAR_ST)
3125 ch = ' '; /* translate '\t' to space */ 3558 break;
3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d)) 3559 else if (ch < 0x20)
3127 return NULL; /* other control character - exit */ 3560 return NULL; /* other control character - exit */
3561
3562 seen_esc = false;
3128 3563
3129 if (n >= sizeof (string) - 1) 3564 if (n >= sizeof (string) - 1)
3130 // stop at some sane length 3565 // stop at some sane length
3131 return NULL; 3566 return NULL;
3132 3567
3568 if (ch == C0_SYN)
3569 string[n++] = cmd_get8 ();
3570 else
3133 string[n++] = ch; 3571 string[n++] = ch;
3134 seen_esc = 0;
3135 } 3572 }
3136 3573
3137 string[n++] = '\0'; 3574 string[n++] = '\0';
3138 3575
3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3140 return NULL;
3141
3142 ends_how = (ch == 0x5c ? C0_ESC : ch); 3576 ends_how = (ch == 0x5c ? C0_ESC : ch);
3143 STRNCPY (s, string, n); 3577
3144 return s; 3578 return (unsigned char *)rxvt_wcstombs (string);
3145} 3579}
3146 3580
3147/*----------------------------------------------------------------------*/ 3581/*----------------------------------------------------------------------*/
3148/* 3582/*
3149 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3583 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3193void 3627void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3628rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3195{ 3629{
3196 if (str[0] == '?' && !str[1]) 3630 if (str[0] == '?' && !str[1])
3197 { 3631 {
3198 if (Options & Opt_insecure)
3199 {
3200 unsigned short r, g, b; 3632 unsigned short r, g, b;
3201 PixColors[color].get (display, r, g, b); 3633 pix_colors_focused[color].get (display, r, g, b);
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3634 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3203 }
3204 } 3635 }
3205 else 3636 else
3206 set_window_color (color, str); 3637 set_window_color (color, str);
3207} 3638}
3208 3639
… …
3236{ 3667{
3237 int changed = 0; 3668 int changed = 0;
3238 int color; 3669 int color;
3239 char *buf, *name; 3670 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1]; 3671 bool query = str[0] == '?' && !str[1];
3672 int saveop = op;
3673 dDisp;
3241 3674
3242 assert (str != NULL); 3675 assert (str != NULL);
3243 switch (op) 3676 switch (op)
3244 { 3677 {
3245 case XTerm_name: 3678 case XTerm_name:
… …
3252 set_title (str); 3685 set_title (str);
3253 break; 3686 break;
3254 case XTerm_property: 3687 case XTerm_property:
3255 if (str[0] == '?') 3688 if (str[0] == '?')
3256 { 3689 {
3257 Atom prop = XInternAtom (display->display, str + 1, True); 3690 Atom prop = display->atom (str + 1);
3258 Atom actual_type; 3691 Atom actual_type;
3259 int actual_format; 3692 int actual_format;
3260 unsigned long nitems; 3693 unsigned long nitems;
3261 unsigned long bytes_after; 3694 unsigned long bytes_after;
3262 unsigned char *value = 0; 3695 unsigned char *value = 0;
3263 const char *str = ""; 3696 const char *str = "";
3264 3697
3265 if (prop 3698 if (prop
3266 && XGetWindowProperty (display->display, TermWin.parent[0], 3699 && XGetWindowProperty (disp, TermWin.parent[0],
3267 prop, 0, 1<<16, 0, AnyPropertyType, 3700 prop, 0, 1<<16, 0, AnyPropertyType,
3268 &actual_type, &actual_format, 3701 &actual_type, &actual_format,
3269 &nitems, &bytes_after, &value) == Success 3702 &nitems, &bytes_after, &value) == Success
3270 && actual_type != None 3703 && actual_type != None
3271 && actual_format == 8) 3704 && actual_format == 8)
… …
3280 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3713 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3281 3714
3282 if (eq) 3715 if (eq)
3283 { 3716 {
3284 *eq = 0; 3717 *eq = 0;
3285 XChangeProperty (display->display, TermWin.parent[0], 3718 set_utf8_property (display->atom (str), eq + 1);
3286 display->atom (str), XA_STRING, 8,
3287 PropModeReplace, (unsigned char *)eq + 1,
3288 strlen (eq + 1));
3289 } 3719 }
3290 else 3720 else
3291 XDeleteProperty (display->display, TermWin.parent[0], 3721 XDeleteProperty (disp, TermWin.parent[0],
3292 display->atom (str)); 3722 display->atom (str));
3293 } 3723 }
3294 break; 3724 break;
3295 3725
3296 case XTerm_Color: 3726 case XTerm_Color:
3297 for (buf = (char *)str; buf && *buf;) 3727 for (buf = (char *)str; buf && *buf;)
3298 { 3728 {
3299 if ((name = STRCHR (buf, ';')) == NULL) 3729 if ((name = strchr (buf, ';')) == NULL)
3300 break; 3730 break;
3301 3731
3302 *name++ = '\0'; 3732 *name++ = '\0';
3303 color = atoi (buf); 3733 color = atoi (buf);
3304 3734
3305 if (color < 0 || color >= TOTAL_COLORS) 3735 if (color < 0 || color >= TOTAL_COLORS)
3306 break; 3736 break;
3307 3737
3308 if ((buf = STRCHR (name, ';')) != NULL) 3738 if ((buf = strchr (name, ';')) != NULL)
3309 *buf++ = '\0'; 3739 *buf++ = '\0';
3310 3740
3311 if (name[0] == '?' && !name[1]) 3741 if (name[0] == '?' && !name[1])
3312 { 3742 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b; 3743 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b); 3744 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3317 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3745 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 } 3746 }
3320 else 3747 else
3321 set_window_color (color + minCOLOR, name); 3748 set_window_color (color + minCOLOR, name);
3322 } 3749 }
3323 break; 3750 break;
… …
3340 break; 3767 break;
3341#ifndef NO_BOLD_UNDERLINE_REVERSE 3768#ifndef NO_BOLD_UNDERLINE_REVERSE
3342 case XTerm_Color_BD: 3769 case XTerm_Color_BD:
3343 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3344 break; 3771 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3774 break;
3345 case XTerm_Color_UL: 3775 case XTerm_Color_UL:
3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3347 break; 3777 break;
3348 case XTerm_Color_RV: 3778 case XTerm_Color_RV:
3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3780 break;
3781#endif
3782#if TRANSPARENT && TINTING
3783 case XTerm_Color_tint:
3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3785 check_our_parents ();
3786 if (am_transparent)
3787 want_full_refresh = want_refresh = 1;
3350 break; 3788 break;
3351#endif 3789#endif
3352 3790
3353 case XTerm_Pixmap: 3791 case XTerm_Pixmap:
3354 if (*str != ';') 3792 if (*str != ';')
… …
3357 scale_pixmap (""); /* reset to default scaling */ 3795 scale_pixmap (""); /* reset to default scaling */
3358 set_bgPixmap (str); /* change pixmap */ 3796 set_bgPixmap (str); /* change pixmap */
3359#endif 3797#endif
3360 scr_touch (true); 3798 scr_touch (true);
3361 } 3799 }
3362 while ((str = STRCHR (str, ';')) != NULL) 3800 while ((str = strchr (str, ';')) != NULL)
3363 { 3801 {
3364 str++; 3802 str++;
3365#if XPM_BACKGROUND 3803#if XPM_BACKGROUND
3366 changed += scale_pixmap (str); 3804 changed += scale_pixmap (str);
3367#endif 3805#endif
3368
3369 } 3806 }
3807
3370 if (changed) 3808 if (changed)
3371 { 3809 {
3372#ifdef XPM_BACKGROUND 3810#ifdef XPM_BACKGROUND
3373 resize_pixmap (); 3811 resize_pixmap ();
3374#endif 3812#endif
… …
3386 case XTerm_logfile: 3824 case XTerm_logfile:
3387 // TODO, when secure mode? 3825 // TODO, when secure mode?
3388 break; 3826 break;
3389 3827
3390 case XTerm_font: 3828 case XTerm_font:
3829 op = URxvt_font;
3830 case URxvt_font:
3831#if ENABLE_STYLES
3832 case URxvt_boldFont:
3833 case URxvt_italicFont:
3834 case URxvt_boldItalicFont:
3835#endif
3391 if (query) 3836 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", saveop,
3838 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3839 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3840 resp);
3841 else
3392 { 3842 {
3393 if (Options & Opt_insecure) 3843 const char *&res = rs[Rs_font + (op - URxvt_font)];
3394 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3844
3395 TermWin.fontset->fontdesc 3845 res = strdup (str);
3396 ? TermWin.fontset->fontdesc 3846 allocated.push_back ((void *)res);
3397 : "", 3847 set_fonts ();
3398 resp);
3399 } 3848 }
3400 else
3401 change_font (str);
3402 break; 3849 break;
3403 3850
3404#ifndef NO_FRILLS 3851#if ENABLE_FRILLS
3405 case XTerm_locale: 3852 case XTerm_locale:
3406 if (query) 3853 if (query)
3407 {
3408 if (Options & Opt_insecure)
3409 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3854 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3410 }
3411 else 3855 else
3412 { 3856 {
3413 set_locale (str); 3857 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8);
3414# ifdef USE_XIM 3859# ifdef USE_XIM
3415 im_cb (); 3860 im_cb ();
3416# endif 3861# endif
3417 } 3862 }
3418 break; 3863 break;
3419
3420 case XTerm_findfont:
3421 if (Options & Opt_insecure)
3422 {
3423 int fid = TermWin.fontset->find_font (atoi (str));
3424 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3425 fid, (*TermWin.fontset)[fid]->name, resp);
3426 }
3427 break;
3428#endif 3864#endif
3429 3865
3430#ifdef MENUBAR 3866#ifdef MENUBAR
3431 case XTerm_Menu: 3867 case XTerm_Menu:
3432 if (Options & Opt_insecure) 3868 if (options & Opt_insecure)
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3869 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3434 break; 3870 break;
3435#endif 3871#endif
3436#if 0 3872#if 0
3437 case XTerm_dumpscreen: /* no error notices */ 3873 case XTerm_dumpscreen: /* no error notices */
… …
3464{ 3900{
3465 int state; 3901 int state;
3466 3902
3467 if (mode == 's') 3903 if (mode == 's')
3468 { 3904 {
3469 SavedModes |= (PrivateModes & bit); 3905 SavedModes |= (priv_modes & bit);
3470 return -1; 3906 return -1;
3471 } 3907 }
3472 else 3908 else
3473 { 3909 {
3474 if (mode == 'r') 3910 if (mode == 'r')
3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3911 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3476 else 3912 else
3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3913 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3478 PrivMode (state, bit); 3914 PrivMode (state, bit);
3479 } 3915 }
3480 3916
3481 return state; 3917 return state;
3482} 3918}
… …
3500 { 3, PrivMode_132 }, 3936 { 3, PrivMode_132 },
3501 { 4, PrivMode_smoothScroll }, 3937 { 4, PrivMode_smoothScroll },
3502 { 5, PrivMode_rVideo }, 3938 { 5, PrivMode_rVideo },
3503 { 6, PrivMode_relOrigin }, 3939 { 6, PrivMode_relOrigin },
3504 { 7, PrivMode_Autowrap }, 3940 { 7, PrivMode_Autowrap },
3941 // 8, bi-directional support mode
3505 { 9, PrivMode_MouseX10 }, 3942 { 9, PrivMode_MouseX10 },
3506#ifdef menuBar_esc 3943#ifdef menuBar_esc
3507 { menuBar_esc, PrivMode_menuBar }, 3944 { menuBar_esc, PrivMode_menuBar },
3508#endif 3945#endif
3946 // 18, 19 printing-related
3947 { 25, PrivMode_VisibleCursor },
3509#ifdef scrollBar_esc 3948#ifdef scrollBar_esc
3510 { scrollBar_esc, PrivMode_scrollBar }, 3949 { scrollBar_esc, PrivMode_scrollBar },
3511#endif 3950#endif
3512 // 18, 19 printing-related
3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3515 { 35, PrivMode_ShiftKeys }, // rxvt extension 3951 { 35, PrivMode_ShiftKeys }, // rxvt extension
3516 { 40, PrivMode_132OK }, 3952 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI 3953 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI 3954 // 45 margin bell NYI
3519 // 46 start logging 3955 // 46 start logging
… …
3560 3996
3561 /* extra handling for values with state unkept */ 3997 /* extra handling for values with state unkept */
3562 switch (arg[i]) 3998 switch (arg[i])
3563 { 3999 {
3564 case 1048: /* alternative cursor save */ 4000 case 1048: /* alternative cursor save */
4001 case 1049:
3565 if (Options & Opt_secondaryScreen) 4002 if (options & Opt_secondaryScreen)
3566 if (mode == 0) 4003 if (mode == 0)
3567 scr_cursor (RESTORE); 4004 scr_cursor (RESTORE);
3568 else if (mode == 1) 4005 else if (mode == 1)
3569 scr_cursor (SAVE); 4006 scr_cursor (SAVE);
3570 break; 4007 break;
… …
3581 * within VT52 mode 4018 * within VT52 mode
3582 */ 4019 */
3583 PrivMode (1, PrivMode_vt52); 4020 PrivMode (1, PrivMode_vt52);
3584 break; 4021 break;
3585 case 3: /* 80/132 */ 4022 case 3: /* 80/132 */
3586 if (PrivateModes & PrivMode_132OK) 4023 if (priv_modes & PrivMode_132OK)
3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3588 break; 4025 break;
3589 case 4: /* smooth scrolling */ 4026 case 4: /* smooth scrolling */
3590 if (state) 4027 if (state)
3591 Options &= ~Opt_jumpScroll; 4028 options &= ~Opt_jumpScroll;
3592 else 4029 else
3593 Options |= Opt_jumpScroll; 4030 options |= Opt_jumpScroll;
3594 break; 4031 break;
3595 case 5: /* reverse video */ 4032 case 5: /* reverse video */
3596 scr_rvideo_mode (state); 4033 scr_rvideo_mode (state);
3597 break; 4034 break;
3598 case 6: /* relative/absolute origins */ 4035 case 6: /* relative/absolute origins */
… …
3602 scr_autowrap (state); 4039 scr_autowrap (state);
3603 break; 4040 break;
3604 /* case 8: - auto repeat, can't do on a per window basis */ 4041 /* case 8: - auto repeat, can't do on a per window basis */
3605 case 9: /* X10 mouse reporting */ 4042 case 9: /* X10 mouse reporting */
3606 if (state) /* orthogonal */ 4043 if (state) /* orthogonal */
3607 PrivateModes &= ~PrivMode_MouseX11; 4044 priv_modes &= ~PrivMode_MouseX11;
3608 break; 4045 break;
3609#ifdef menuBar_esc 4046#ifdef menuBar_esc
3610 case menuBar_esc: 4047 case menuBar_esc:
3611#ifdef MENUBAR 4048#ifdef MENUBAR
3612 map_menuBar (state); 4049 map_menuBar (state);
… …
3632 break; 4069 break;
3633 /* case 66: - application key pad */ 4070 /* case 66: - application key pad */
3634 /* case 67: - backspace key */ 4071 /* case 67: - backspace key */
3635 case 1000: /* X11 mouse reporting */ 4072 case 1000: /* X11 mouse reporting */
3636 if (state) /* orthogonal */ 4073 if (state) /* orthogonal */
3637 PrivateModes &= ~PrivMode_MouseX10; 4074 priv_modes &= ~PrivMode_MouseX10;
3638 break; 4075 break;
3639#if 0 4076#if 0
3640 case 1001: 4077 case 1001:
3641 break; /* X11 mouse highlighting */ 4078 break; /* X11 mouse highlighting */
3642#endif 4079#endif
3643 case 1010: /* scroll to bottom on TTY output inhibit */ 4080 case 1010: /* scroll to bottom on TTY output inhibit */
3644 if (state) 4081 if (state)
3645 Options &= ~Opt_scrollTtyOutput; 4082 options &= ~Opt_scrollTtyOutput;
3646 else 4083 else
3647 Options |= Opt_scrollTtyOutput; 4084 options |= Opt_scrollTtyOutput;
3648 break; 4085 break;
3649 case 1011: /* scroll to bottom on key press */ 4086 case 1011: /* scroll to bottom on key press */
3650 if (state) 4087 if (state)
3651 Options |= Opt_scrollTtyKeypress; 4088 options |= Opt_scrollTtyKeypress;
3652 else 4089 else
3653 Options &= ~Opt_scrollTtyKeypress; 4090 options &= ~Opt_scrollTtyKeypress;
3654 break; 4091 break;
3655 case 1047: /* secondary screen w/ clearing last */ 4092 case 1047: /* secondary screen w/ clearing last */
3656 if (Options & Opt_secondaryScreen) 4093 if (options & Opt_secondaryScreen)
3657 if (current_screen != PRIMARY) 4094 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4095 scr_erase_screen (2);
3659 scr_change_screen (state); 4096 scr_change_screen (state);
3660 break; 4097 break;
3661 case 1049: /* secondary screen w/ clearing first */ 4098 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state); 4099 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen) 4100 if (options & Opt_secondaryScreen)
3664 if (current_screen != PRIMARY) 4101 if (current_screen != PRIMARY)
3665 scr_erase_screen (2); 4102 scr_erase_screen (2);
3666 break; 4103 break;
3667 default: 4104 default:
3668 break; 4105 break;
… …
3694 rendset = 0, rendstyle = ~RS_None; 4131 rendset = 0, rendstyle = ~RS_None;
3695 break; 4132 break;
3696 case 1: 4133 case 1:
3697 rendset = 1, rendstyle = RS_Bold; 4134 rendset = 1, rendstyle = RS_Bold;
3698 break; 4135 break;
4136 //case 2: // low intensity
4137 case 3:
4138 rendset = 1, rendstyle = RS_Italic;
4139 break;
3699 case 4: 4140 case 4:
3700 rendset = 1, rendstyle = RS_Uline; 4141 rendset = 1, rendstyle = RS_Uline;
3701 break; 4142 break;
3702 case 5: 4143 case 5: // slowly blinking
4144 case 6: // rapidly blinking
3703 rendset = 1, rendstyle = RS_Blink; 4145 rendset = 1, rendstyle = RS_Blink;
3704 break; 4146 break;
4147 //case 6: // scoansi light background
3705 case 7: 4148 case 7:
3706 rendset = 1, rendstyle = RS_RVid; 4149 rendset = 1, rendstyle = RS_RVid;
3707 break; 4150 break;
3708 case 8: 4151 case 8:
3709 // invisible. NYI 4152 // invisible. NYI
3710 break; 4153 break;
3711 case 22: 4154 //case 9: // crossed out
4155 //case 10: // scoansi acs off, primary font
4156 //case 11: // scoansi acs on, first alt font
4157 //case 12: // scoansi acs on, |0x80, second alt font
4158 //...
4159 //case 19: // ninth alt font
4160 //case 20: // gothic
4161 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3712 rendset = 0, rendstyle = RS_Bold; 4162 rendset = 0, rendstyle = RS_Bold;
4163 break;
4164 case 22: // normal intensity
4165 rendset = 0, rendstyle = RS_Bold;
4166 break;
4167 case 23: // disable italic
4168 rendset = 0, rendstyle = RS_Italic;
3713 break; 4169 break;
3714 case 24: 4170 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4171 rendset = 0, rendstyle = RS_Uline;
3716 break; 4172 break;
3717 case 25: 4173 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4174 rendset = 0, rendstyle = RS_Blink;
3719 break; 4175 break;
4176 case 26: // variable spacing (iso 8613)
4177 rendset = 0, rendstyle = RS_Blink;
4178 break;
3720 case 27: 4179 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4180 rendset = 0, rendstyle = RS_RVid;
3722 break; 4181 break;
3723 case 28:
3724 // visible. NYI 4182 //case 28: // visible. NYI
3725 break; 4183 //case 29: // not crossed-out
3726 } 4184 }
3727 4185
3728 if (rendset != -1) 4186 if (rendset != -1)
3729 { 4187 {
3730 scr_rendition (rendset, rendstyle); 4188 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4199 case 35:
3742 case 36: 4200 case 36:
3743 case 37: 4201 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4202 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4203 break;
3746#ifdef TTY_256COLOR 4204 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4205 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4206 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4207 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4208 i += 2;
3752 } 4209 }
3753 break; 4210 break;
3754#endif
3755 case 39: /* default fg */ 4211 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4212 scr_color (Color_fg, Color_fg);
3757 break; 4213 break;
3758 4214
3759 case 40: 4215 case 40:
… …
3764 case 45: 4220 case 45:
3765 case 46: 4221 case 46:
3766 case 47: 4222 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4223 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4224 break;
3769#ifdef TTY_256COLOR 4225 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4226 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4227 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4228 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4229 i += 2;
3775 } 4230 }
3776 break; 4231 break;
3777#endif
3778 case 49: /* default bg */ 4232 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4233 scr_color (Color_bg, Color_bg);
3780 break; 4234 break;
4235
4236 //case 50: // not variable spacing
3781 4237
3782#ifndef NO_BRIGHTCOLOR 4238#ifndef NO_BRIGHTCOLOR
3783 case 90: 4239 case 90:
3784 case 91: /* set bright fg color */ 4240 case 91: /* set bright fg color */
3785 case 92: 4241 case 92:
3786 case 93: 4242 case 93:
3787 case 94: 4243 case 94:
3788 case 95: 4244 case 95:
3789 case 96: 4245 case 96:
3790 case 97: 4246 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4247 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4248 break;
3794 case 100: 4249 case 100:
3795 case 101: /* set bright bg color */ 4250 case 101: /* set bright bg color */
3796 case 102: 4251 case 102:
3797 case 103: 4252 case 103:
3798 case 104: 4253 case 104:
3799 case 105: 4254 case 105:
3800 case 106: 4255 case 106:
3801 case 107: 4256 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4257 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4258 break;
3805#endif 4259#endif
3806 4260
3807 } 4261 }
3808 } 4262 }
3809} 4263}
3810/*}}} */ 4264/*}}} */
3811 4265
3812/*{{{ process Rob Nation's own graphics mode sequences */ 4266/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3813void 4267void
3814rxvt_term::process_graphics () 4268rxvt_term::process_graphics ()
3815{ 4269{
3816 unicode_t ch, cmd = cmd_getc (); 4270 unicode_t ch, cmd = cmd_getc ();
3817 4271
3818 if (cmd == 'Q') 4272 if (cmd == 'Q')
3819 { /* query graphics */ 4273 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4274 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4275 return;
3822 } 4276 }
3823 /* swallow other graphics sequences until terminating ':' */ 4277 /* swallow other graphics sequences until terminating ':' */
3824 do 4278 do
3825 ch = cmd_getc (); 4279 ch = cmd_getc ();
… …
3840 unsigned char buf[256]; 4294 unsigned char buf[256];
3841 4295
3842 va_start (arg_ptr, fmt); 4296 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4297 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4298 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4299 tt_write (buf, strlen (buf));
3846} 4300}
3847 4301
3848/* ---------------------------------------------------------------------- */ 4302/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4303/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 4304 * or generated by us in response to a query ESC sequence.
3851 */ 4305 */
4306const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4307
3852void 4308void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4309rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3854{ 4310{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4311 if (v_buflen == 0)
4312 {
4313 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3856 4314
3857 if (len) 4315 if ((unsigned int)written == len)
4316 return;
4317
4318 data += written;
4319 len -= written;
3858 { 4320 }
4321
4322 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4323
4324 memcpy (v_buffer + v_buflen, data, len);
4325 v_buflen += len;
4326
4327 pty_ev.set (EVENT_READ | EVENT_WRITE);
4328}
4329
4330void rxvt_term::pty_write ()
4331{
4332 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4333
4334 if (written > 0)
4335 {
4336 v_buflen -= written;
4337
3859 if (v_buflen == 0) 4338 if (v_buflen == 0)
3860 { 4339 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3862
3863 if ((unsigned int)written == len)
3864 return;
3865
3866 data += written;
3867 len -= written;
3868 }
3869
3870
3871 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3872
3873 memcpy (v_buffer + v_buflen, data, len);
3874 v_buflen += len;
3875 }
3876
3877 for (;;)
3878 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880
3881 if (written > 0)
3882 {
3883 v_buflen -= written;
3884
3885 if (v_buflen == 0)
3886 {
3887 free (v_buffer); 4340 free (v_buffer);
3888 v_buffer = 0; 4341 v_buffer = 0;
3889 v_buflen = 0; 4342 v_buflen = 0;
3890 4343
3891 pty_ev.set (EVENT_READ); 4344 pty_ev.set (EVENT_READ);
3892 return;
3893 }
3894
3895 memmove (v_buffer, v_buffer + written, v_buflen);
3896 }
3897 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3898 // original code just ignores this...
3899 destroy ();
3900 else
3901 {
3902 pty_ev.set (EVENT_READ | EVENT_WRITE);
3903 return; 4345 return;
3904 } 4346 }
4347
4348 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4349 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this...
4352 destroy ();
3906} 4353}
3907 4354
3908/*----------------------- end-of-file (C source) -----------------------*/ 4355/*----------------------- end-of-file (C source) -----------------------*/
3909 4356

Diff Legend

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