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.107 by root, Sat Jul 31 00:01:12 2004 UTC vs.
Revision 1.198 by root, Sat Feb 19 01:07:58 2005 UTC

… …
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 {
… …
683rxvt_term::check_cb (check_watcher &w) 951rxvt_term::check_cb (check_watcher &w)
684{ 952{
685 SET_R (this); 953 SET_R (this);
686 SET_LOCALE (locale); 954 SET_LOCALE (locale);
687 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;
688 flush (); 970 flush ();
689} 971}
690 972
691#ifdef CURSOR_BLINK 973#ifdef CURSOR_BLINK
692void 974void
… …
746{ 1028{
747 if (mouse_slip_wheel_speed == 0 1029 if (mouse_slip_wheel_speed == 0
748 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
749 : scr_page (UP, mouse_slip_wheel_speed)) 1031 : scr_page (UP, mouse_slip_wheel_speed))
750 { 1032 {
1033 if (TermWin.view_start == TermWin.nscrolled ||
1034 TermWin.view_start == 0)
1035 mouse_slip_wheel_speed = 0;
1036
751 refresh_type |= SMOOTH_REFRESH; 1037 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1038 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 } 1040 }
755} 1041}
… …
768 1054
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1055 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1056 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1057 cmdbuf_endp = cmdbuf_ptr + n;
772 1058
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
774 1060
775 if (n > 0) 1061 if (n > 0)
776 { 1062 {
777 cmdbuf_endp += n; 1063 cmdbuf_endp += n;
778 return true; 1064 return true;
… …
787rxvt_term::pty_cb (io_watcher &w, short revents) 1073rxvt_term::pty_cb (io_watcher &w, short revents)
788{ 1074{
789 SET_R (this); 1075 SET_R (this);
790 SET_LOCALE (locale); 1076 SET_LOCALE (locale);
791 1077
792 if (revents & EVENT_WRITE)
793 tt_write (0, 0);
794 else if (revents & EVENT_READ) 1078 if (revents & EVENT_READ)
795 // loop, but don't allow a single term to monopolize us 1079 // loop, but don't allow a single term to monopolize us
796 while (pty_fill ()) 1080 while (pty_fill ())
797 if (cmd_parse ()) 1081 if (cmd_parse ())
798 break; 1082 break;
1083
1084 if (revents & EVENT_WRITE)
1085 pty_write ();
799} 1086}
800 1087
801void 1088void
802rxvt_term::pointer_unblank () 1089rxvt_term::pointer_unblank ()
803{ 1090{
… …
805 recolour_cursor (); 1092 recolour_cursor ();
806 1093
807#ifdef POINTER_BLANK 1094#ifdef POINTER_BLANK
808 hidden_pointer = 0; 1095 hidden_pointer = 0;
809 1096
810 if (Options & Opt_pointerBlank) 1097 if (options & Opt_pointerBlank)
811 pointer_ev.start (NOW + pointerBlankDelay); 1098 pointer_ev.start (NOW + pointerBlankDelay);
812#endif 1099#endif
813} 1100}
814 1101
815#ifdef POINTER_BLANK 1102#ifdef POINTER_BLANK
816void 1103void
817rxvt_term::pointer_blank () 1104rxvt_term::pointer_blank ()
818{ 1105{
819 if (! (Options & Opt_pointerBlank)) 1106 if (! (options & Opt_pointerBlank))
820 return; 1107 return;
821 1108
822 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
823 XFlush (display->display); 1110 XFlush (display->display);
824 1111
825 hidden_pointer = 1; 1112 hidden_pointer = 1;
826} 1113}
827 1114
… …
844 x = ev.x; 1131 x = ev.x;
845 y = ev.y; 1132 y = ev.y;
846 pixel_position (&x, &y); 1133 pixel_position (&x, &y);
847 1134
848 if (MEvent.button == AnyButton) 1135 if (MEvent.button == AnyButton)
849 {
850 button_number = 3; 1136 button_number = 3;
851 }
852 else 1137 else
853 { 1138 {
854 button_number = MEvent.button - Button1; 1139 button_number = MEvent.button - Button1;
855 /* add 0x3D for wheel events, like xterm does */ 1140 /* add 0x3D for wheel events, like xterm does */
856 if (button_number >= 3) 1141 if (button_number >= 3)
857 button_number += (64 - 3); 1142 button_number += (64 - 3);
858 } 1143 }
859 1144
860 if (PrivateModes & PrivMode_MouseX10) 1145 if (priv_modes & PrivMode_MouseX10)
861 { 1146 {
862 /* 1147 /*
863 * do not report ButtonRelease 1148 * do not report ButtonRelease
864 * no state info allowed 1149 * no state info allowed
865 */ 1150 */
… …
880 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1165 + ((MEvent.state & ModMetaMask) ? 8 : 0)
881 + ((MEvent.state & ControlMask) ? 16 : 0); 1166 + ((MEvent.state & ControlMask) ? 16 : 0);
882#ifdef MOUSE_REPORT_DOUBLECLICK 1167#ifdef MOUSE_REPORT_DOUBLECLICK
883 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1168 key_state += ((MEvent.clicks > 1) ? 32 : 0);
884#endif 1169#endif
885
886 } 1170 }
887 1171
888#ifdef DEBUG_MOUSEREPORT 1172#if DEBUG_MOUSEREPORT
889 fprintf (stderr, "Mouse ["); 1173 fprintf (stderr, "Mouse [");
890 if (key_state & 16) 1174 if (key_state & 16)
891 fputc ('C', stderr); 1175 fputc ('C', stderr);
892 if (key_state & 4) 1176 if (key_state & 4)
893 fputc ('S', stderr); 1177 fputc ('S', stderr);
… …
897 fputc ('2', stderr); 1181 fputc ('2', stderr);
898 fprintf (stderr, "]: <%d>, %d/%d\n", 1182 fprintf (stderr, "]: <%d>, %d/%d\n",
899 button_number, 1183 button_number,
900 x + 1, 1184 x + 1,
901 y + 1); 1185 y + 1);
902#else 1186#endif
1187
903 tt_printf ("\033[M%c%c%c", 1188 tt_printf ("\033[M%c%c%c",
904 (32 + button_number + key_state), 1189 (32 + button_number + key_state),
905 (32 + x + 1), 1190 (32 + x + 1),
906 (32 + y + 1)); 1191 (32 + y + 1));
907#endif
908} 1192}
909 1193
910#ifdef USING_W11LIB 1194#ifdef USING_W11LIB
911void 1195void
912rxvt_W11_process_x_event (XEvent *ev) 1196rxvt_W11_process_x_event (XEvent *ev)
… …
919 1203
920/*{{{ process an X event */ 1204/*{{{ process an X event */
921void 1205void
922rxvt_term::x_cb (XEvent &ev) 1206rxvt_term::x_cb (XEvent &ev)
923{ 1207{
1208 dDisp;
1209
924 SET_R (this); 1210 SET_R (this);
925 SET_LOCALE (locale); 1211 SET_LOCALE (locale);
926 1212
927#if defined(CURSOR_BLINK) 1213#if defined(CURSOR_BLINK)
928 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
929 { 1215 {
930 if (hidden_cursor) 1216 if (hidden_cursor)
931 { 1217 {
932 hidden_cursor = 0; 1218 hidden_cursor = 0;
933 want_refresh = 1; 1219 want_refresh = 1;
… …
936 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
937 } 1223 }
938#endif 1224#endif
939 1225
940#if defined(POINTER_BLANK) 1226#if defined(POINTER_BLANK)
941 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
942 { 1228 {
943 if (ev.type == MotionNotify 1229 if (ev.type == MotionNotify
944 || ev.type == ButtonPress 1230 || ev.type == ButtonPress
945 || ev.type == ButtonRelease) 1231 || ev.type == ButtonRelease)
946 if (hidden_pointer) 1232 if (hidden_pointer)
… …
949 if (ev.type == KeyPress && hidden_pointer == 0) 1235 if (ev.type == KeyPress && hidden_pointer == 0)
950 pointer_blank (); 1236 pointer_blank ();
951 } 1237 }
952#endif 1238#endif
953 1239
954#ifdef USE_XIM
955 if (XFilterEvent (&ev, None))
956 return;
957#endif
958
959 Window unused_root, unused_child; 1240 Window unused_root, unused_child;
960 int unused_root_x, unused_root_y; 1241 int unused_root_x, unused_root_y;
961 unsigned int unused_mask; 1242 unsigned int unused_mask;
962
963#ifdef DEBUG_X
964 const char *const eventnames[] =
965 { /* mason - this matches my system */
966 "",
967 "",
968 "KeyPress",
969 "KeyRelease",
970 "ButtonPress",
971 "ButtonRelease",
972 "MotionNotify",
973 "EnterNotify",
974 "LeaveNotify",
975 "FocusIn",
976 "FocusOut",
977 "KeymapNotify",
978 "Expose",
979 "GraphicsExpose",
980 "NoExpose",
981 "VisibilityNotify",
982 "CreateNotify",
983 "DestroyNotify",
984 "UnmapNotify",
985 "MapNotify",
986 "MapRequest",
987 "ReparentNotify",
988 "ConfigureNotify",
989 "ConfigureRequest",
990 "GravityNotify",
991 "ResizeRequest",
992 "CirculateNotify",
993 "CirculateRequest",
994 "PropertyNotify",
995 "SelectionClear",
996 "SelectionRequest",
997 "SelectionNotify",
998 "ColormapNotify",
999 "ClientMessage",
1000 "MappingNotify"
1001 };
1002#endif
1003
1004#ifdef DEBUG_X
1005 struct timeval tp;
1006 struct tm *ltt;
1007 (void)gettimeofday (&tp, NULL);
1008 ltt = localtime (& (tp.tv_sec));
1009 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));
1010#endif
1011 1243
1012 switch (ev.type) 1244 switch (ev.type)
1013 { 1245 {
1014 case KeyPress: 1246 case KeyPress:
1247#if ISO_14755
1248 if (!(iso14755buf & ISO_14755_52))
1249#endif
1015 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;
1016 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
1017 1315
1018#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1019 case KeyRelease:
1020 {
1021 if (!(ev.xkey.state & ControlMask)) 1317 if (!(ev.xkey.state & ControlMask))
1022 slip_wheel_ev.stop (); 1318 slip_wheel_ev.stop ();
1023 else
1024 {
1025 KeySym ks;
1026
1027 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1028 if (ks == XK_Control_L || ks == XK_Control_R) 1319 else if (ks == XK_Control_L || ks == XK_Control_R)
1029 mouse_slip_wheel_speed = 0; 1320 mouse_slip_wheel_speed = 0;
1030 } 1321#endif
1031 break; 1322 break;
1032 } 1323 }
1033#endif
1034 1324
1035 case ButtonPress: 1325 case ButtonPress:
1036 button_press (ev.xbutton); 1326 button_press (ev.xbutton);
1037 break; 1327 break;
1038 1328
… …
1040 button_release (ev.xbutton); 1330 button_release (ev.xbutton);
1041 break; 1331 break;
1042 1332
1043 case ClientMessage: 1333 case ClientMessage:
1044 if (ev.xclient.format == 32 1334 if (ev.xclient.format == 32
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]
1045 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1046 destroy (); 1337 destroy ();
1338#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32
1340 && ev.xclient.message_type == xa[XA_XEMBED])
1341 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out ();
1346 }
1347#endif
1047#ifdef OFFIX_DND 1348#ifdef OFFIX_DND
1048 /* OffiX Dnd (drag 'n' drop) protocol */ 1349 /* OffiX Dnd (drag 'n' drop) protocol */
1049 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1350 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1050 && (ev.xclient.data.l[0] == DndFile 1351 && (ev.xclient.data.l[0] == DndFile
1051 || ev.xclient.data.l[0] == DndDir 1352 || ev.xclient.data.l[0] == DndDir
1052 || ev.xclient.data.l[0] == DndLink)) 1353 || ev.xclient.data.l[0] == DndLink))
1053 { 1354 {
1054 /* Get Dnd data */ 1355 /* Get Dnd data */
1055 Atom ActualType; 1356 Atom ActualType;
1056 int ActualFormat; 1357 int ActualFormat;
1057 unsigned char *data; 1358 unsigned char *data;
1058 unsigned long Size, RemainingBytes; 1359 unsigned long Size, RemainingBytes;
1059 1360
1060 XGetWindowProperty (display->display, display->root, 1361 XGetWindowProperty (disp, display->root,
1061 xa[XA_DNDSELECTION], 1362 xa[XA_DNDSELECTION],
1062 0L, 1000000L, 1363 0L, 1000000L,
1063 False, AnyPropertyType, 1364 False, AnyPropertyType,
1064 &ActualType, &ActualFormat, 1365 &ActualType, &ActualFormat,
1065 &Size, &RemainingBytes, 1366 &Size, &RemainingBytes,
1066 &data); 1367 &data);
1067 XChangeProperty (display->display, display->root, 1368 set_string_property (XA_CUT_BUFFER0, data);
1068 XA_CUT_BUFFER0, XA_STRING,
1069 8, PropModeReplace,
1070 data, STRLEN (data));
1071 XFree (data); 1369 XFree (data);
1072 selection_paste (display->root, XA_CUT_BUFFER0, True); 1370 selection_paste (display->root, XA_CUT_BUFFER0, true);
1073 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1371 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1074 } 1372 }
1075#endif /* OFFIX_DND */ 1373#endif /* OFFIX_DND */
1076 break; 1374 break;
1077 1375
1078 case MappingNotify: 1376 case MappingNotify:
1079 XRefreshKeyboardMapping (& (ev.xmapping)); 1377 XRefreshKeyboardMapping (&ev.xmapping);
1080 break; 1378 break;
1081 1379
1082 /* 1380 /*
1083 * XXX: this is not the _current_ arrangement 1381 * XXX: this is not the _current_ arrangement
1084 * Here's my conclusion: 1382 * Here's my conclusion:
… …
1103 break; 1401 break;
1104 } 1402 }
1105 break; 1403 break;
1106 1404
1107 case FocusIn: 1405 case FocusIn:
1108 if (!TermWin.focus) 1406 focus_in ();
1109 {
1110 TermWin.focus = 1;
1111 want_refresh = 1;
1112#ifdef USE_XIM
1113 if (Input_Context != NULL)
1114 XSetICFocus (Input_Context);
1115#endif
1116#ifdef CURSOR_BLINK
1117 if (Options & Opt_cursorBlink)
1118 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1119#endif
1120#ifdef OFF_FOCUS_FADING
1121 if (rs[Rs_fade])
1122 {
1123 PixColors = PixColorsFocused;
1124 set_colorfgbg ();
1125 scr_clear ();
1126 scr_touch (true);
1127 }
1128#endif
1129
1130 }
1131 break; 1407 break;
1132 1408
1133 case FocusOut: 1409 case FocusOut:
1134 if (TermWin.focus) 1410 focus_out ();
1135 {
1136 TermWin.focus = 0;
1137 want_refresh = 1;
1138#ifdef USE_XIM
1139 if (Input_Context != NULL)
1140 XUnsetICFocus (Input_Context);
1141#endif
1142#ifdef CURSOR_BLINK
1143 if (Options & Opt_cursorBlink)
1144 cursor_blink_ev.stop ();
1145 hidden_cursor = 0;
1146#endif
1147#ifdef OFF_FOCUS_FADING
1148 if (rs[Rs_fade])
1149 {
1150 PixColors = PixColorsUnFocused;
1151 set_colorfgbg ();
1152 scr_clear ();
1153 scr_touch (true);
1154 }
1155#endif
1156
1157 }
1158 break; 1411 break;
1159 1412
1160 case ConfigureNotify: 1413 case ConfigureNotify:
1161 if (ev.xconfigure.window == TermWin.parent[0]) 1414 if (ev.xconfigure.window == TermWin.parent[0])
1162 { 1415 {
… …
1166 { /* Wrap lots of configures into one */ 1419 { /* Wrap lots of configures into one */
1167 width = ev.xconfigure.width; 1420 width = ev.xconfigure.width;
1168 height = ev.xconfigure.height; 1421 height = ev.xconfigure.height;
1169 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1422 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1170 } 1423 }
1171 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1424 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1172 1425
1173 if (szHint.width != width || szHint.height != height) 1426 if (szHint.width != width || szHint.height != height)
1174 { 1427 {
1175 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1428 seen_resize = 1;
1176 resize_all_windows (width, height, 1); 1429 resize_all_windows (width, height, 1);
1177 } 1430 }
1178#ifdef DEBUG_SIZE 1431
1179 else
1180 {
1181 D_SIZE ((stderr, "Size: Not resizing"));
1182 }
1183#endif
1184#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1432#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1185 if (Options & Opt_transparent) 1433 if (options & Opt_transparent)
1186 {
1187 check_our_parents (); 1434 check_our_parents ();
1188 if (am_transparent)
1189 want_full_refresh = 1;
1190 }
1191#endif 1435#endif
1192 } 1436 }
1437 break;
1438
1439 case PropertyNotify:
1440 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1441 && ev.xproperty.state == PropertyNewValue)
1442 selection_property (ev.xproperty.window, ev.xproperty.atom);
1443
1193 break; 1444 break;
1194 1445
1195 case SelectionClear: 1446 case SelectionClear:
1196 selection_clear (); 1447 selection_clear ();
1197 break; 1448 break;
1198 1449
1199 case SelectionNotify: 1450 case SelectionNotify:
1200 if (selection_wait == Sel_normal) 1451 if (selection_wait == Sel_normal)
1201 selection_paste (ev.xselection.requestor, 1452 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1202 ev.xselection.property, True);
1203 break; 1453 break;
1204 1454
1205 case SelectionRequest: 1455 case SelectionRequest:
1206 selection_send (ev.xselectionrequest); 1456 selection_send (ev.xselectionrequest);
1207 break; 1457 break;
… …
1228 1478
1229 case GraphicsExpose: 1479 case GraphicsExpose:
1230 case Expose: 1480 case Expose:
1231 if (ev.xany.window == TermWin.vt) 1481 if (ev.xany.window == TermWin.vt)
1232 { 1482 {
1233#ifdef NO_SLOW_LINK_SUPPORT 1483 do
1234 scr_expose (ev.xexpose.x, ev.xexpose.y, 1484 scr_expose (ev.xexpose.x, ev.xexpose.y,
1235 ev.xexpose.width, ev.xexpose.height, False); 1485 ev.xexpose.width, ev.xexpose.height, False);
1236#else 1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1237 // I don't understand this, so I changed it :) 1487
1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1489
1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1238 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1239 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1240 //scr_expose (ev.xexpose.x, 0, 1493
1241 // ev.xexpose.width, TermWin.height, False); 1494 scr_refresh (refresh_type);
1242#endif
1243 want_refresh = 1;
1244 } 1495 }
1245 else 1496 else
1246 { 1497 {
1247 XEvent unused_event; 1498 XEvent unused_event;
1248 1499
1249 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1500 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1250 ; 1501 ;
1251 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1502 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1252 ; 1503 ;
1253 1504
1254 if (isScrollbarWindow (ev.xany.window)) 1505 if (isScrollbarWindow (ev.xany.window))
1255 { 1506 {
1256 scrollBar.setIdle (); 1507 scrollBar.setIdle ();
… …
1258 } 1509 }
1259#ifdef MENUBAR 1510#ifdef MENUBAR
1260 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1511 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1261 menubar_expose (); 1512 menubar_expose ();
1262#endif 1513#endif
1514
1515#ifdef TRANSPARENT
1516 if (am_transparent && ev.xany.window == TermWin.parent[0])
1517 XClearWindow (disp, ev.xany.window);
1518#endif
1263 } 1519 }
1264 break; 1520 break;
1265 1521
1266 case MotionNotify: 1522 case MotionNotify:
1267#ifdef POINTER_BLANK 1523#ifdef POINTER_BLANK
… …
1273 { 1529 {
1274 menubar_control (ev.xbutton); 1530 menubar_control (ev.xbutton);
1275 break; 1531 break;
1276 } 1532 }
1277#endif 1533#endif
1278 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1534 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1279 break; 1535 break;
1280 1536
1281 if (ev.xany.window == TermWin.vt) 1537 if (ev.xany.window == TermWin.vt)
1282 { 1538 {
1283 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1539 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1284 { 1540 {
1285 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1286 ; 1542 ;
1287 1543
1288 XQueryPointer (display->display, TermWin.vt, 1544 XQueryPointer (disp, TermWin.vt,
1289 &unused_root, &unused_child, 1545 &unused_root, &unused_child,
1290 &unused_root_x, &unused_root_y, 1546 &unused_root_x, &unused_root_y,
1291 & (ev.xbutton.x), & (ev.xbutton.y), 1547 &ev.xbutton.x, &ev.xbutton.y,
1292 &unused_mask); 1548 &ev.xbutton.state);
1293#ifdef MOUSE_THRESHOLD 1549#ifdef MOUSE_THRESHOLD
1294 /* deal with a `jumpy' mouse */ 1550 /* deal with a `jumpy' mouse */
1295 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1551 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1296 { 1552 {
1297#endif 1553#endif
1554#if ISO_14755
1555 // 5.4
1556 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1557 {
1558 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1559 break;
1560 }
1561#endif
1298 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1562 selection_extend (ev.xbutton.x, ev.xbutton.y,
1299 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1563 ev.xbutton.state & Button3Mask ? 2 : 0);
1564
1300#ifdef SELECTION_SCROLLING 1565#ifdef SELECTION_SCROLLING
1301 if (ev.xbutton.y < TermWin.int_bwidth 1566 if (ev.xbutton.y < TermWin.int_bwidth
1302 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1567 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1303 { 1568 {
1304 int dist; 1569 int dist;
… …
1310 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1575 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1311 1576
1312 /* save the event params so we can highlight 1577 /* save the event params so we can highlight
1313 * the selection in the pending-scroll loop 1578 * the selection in the pending-scroll loop
1314 */ 1579 */
1315 selection_save_x=ev.xbutton.x; 1580 selection_save_x = ev.xbutton.x;
1316 selection_save_y=ev.xbutton.y; 1581 selection_save_y = ev.xbutton.y;
1317 selection_save_state=
1318 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1582 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1319 1583
1320 /* calc number of lines to scroll */ 1584 /* calc number of lines to scroll */
1321 if (ev.xbutton.y<TermWin.int_bwidth) 1585 if (ev.xbutton.y < TermWin.int_bwidth)
1322 { 1586 {
1323 scroll_selection_dir = UP; 1587 scroll_selection_dir = UP;
1324 dist = TermWin.int_bwidth - ev.xbutton.y; 1588 dist = TermWin.int_bwidth - ev.xbutton.y;
1325 } 1589 }
1326 else 1590 else
1327 { 1591 {
1328 scroll_selection_dir = DN; 1592 scroll_selection_dir = DN;
1329 dist = ev.xbutton.y -
1330 (TermWin.int_bwidth + TermWin.height); 1593 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1331 } 1594 }
1595
1332 scroll_selection_lines= (Pixel2Height (dist)/ 1596 scroll_selection_lines = Pixel2Height (dist)
1333 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1597 / SELECTION_SCROLL_LINE_SPEEDUP
1598 + 1;
1334 MIN_IT (scroll_selection_lines, 1599 MIN_IT (scroll_selection_lines,
1335 SELECTION_SCROLL_MAX_LINES); 1600 SELECTION_SCROLL_MAX_LINES);
1336 } 1601 }
1337 else 1602 else
1338 { 1603 {
1339 /* we are within the text window, so we 1604 /* we are within the text window, so we
1340 * shouldn't be scrolling 1605 * shouldn't be scrolling
… …
1342 if (sel_scroll_ev.active) 1607 if (sel_scroll_ev.active)
1343 sel_scroll_ev.stop(); 1608 sel_scroll_ev.stop();
1344 } 1609 }
1345#endif 1610#endif
1346#ifdef MOUSE_THRESHOLD 1611#ifdef MOUSE_THRESHOLD
1347
1348 } 1612 }
1349#endif 1613#endif
1350
1351 } 1614 }
1352 } 1615 }
1353 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1616 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1354 { 1617 {
1355 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1618 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1356 MotionNotify, &ev)) ; 1619 MotionNotify, &ev))
1620 ;
1621
1357 XQueryPointer (display->display, scrollBar.win, 1622 XQueryPointer (disp, scrollBar.win,
1358 &unused_root, &unused_child, 1623 &unused_root, &unused_child,
1359 &unused_root_x, &unused_root_y, 1624 &unused_root_x, &unused_root_y,
1360 & (ev.xbutton.x), & (ev.xbutton.y), 1625 &ev.xbutton.x, &ev.xbutton.y,
1361 &unused_mask); 1626 &unused_mask);
1362 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1627 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1363 scrollbar_size ()); 1628 scrollbar_size ());
1364 scr_refresh (refresh_type); 1629 scr_refresh (refresh_type);
1365 refresh_limit = 0; 1630 refresh_limit = 0;
… …
1368 break; 1633 break;
1369 } 1634 }
1370} 1635}
1371 1636
1372void 1637void
1638rxvt_term::focus_in ()
1639{
1640 if (!TermWin.focus)
1641 {
1642 TermWin.focus = 1;
1643 want_refresh = 1;
1644#ifdef USE_XIM
1645 if (Input_Context != NULL)
1646 {
1647 IMSetStatusPosition ();
1648 XSetICFocus (Input_Context);
1649 }
1650#endif
1651#ifdef CURSOR_BLINK
1652 if (options & Opt_cursorBlink)
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1654#endif
1655#ifdef OFF_FOCUS_FADING
1656 if (rs[Rs_fade])
1657 {
1658 pix_colors = pix_colors_focused;
1659 scr_recolour ();
1660 }
1661#endif
1662 }
1663}
1664
1665void
1666rxvt_term::focus_out ()
1667{
1668 if (TermWin.focus)
1669 {
1670 TermWin.focus = 0;
1671 want_refresh = 1;
1672
1673#if ENABLE_FRILLS || ISO_14755
1674 iso14755buf = 0;
1675#endif
1676#if ENABLE_OVERLAY
1677 scr_overlay_off ();
1678#endif
1679#ifdef USE_XIM
1680 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context);
1682#endif
1683#ifdef CURSOR_BLINK
1684 if (options & Opt_cursorBlink)
1685 cursor_blink_ev.stop ();
1686 hidden_cursor = 0;
1687#endif
1688#ifdef OFF_FOCUS_FADING
1689 if (rs[Rs_fade])
1690 {
1691 pix_colors = pix_colors_unfocused;
1692 scr_recolour ();
1693 }
1694#endif
1695 }
1696}
1697
1698#if TRANSPARENT
1699void
1373rxvt_term::rootwin_cb (XEvent &ev) 1700rxvt_term::rootwin_cb (XEvent &ev)
1374{ 1701{
1375 SET_R (this); 1702 SET_R (this);
1376 SET_LOCALE (locale); 1703 SET_LOCALE (locale);
1377 1704
1378 switch (ev.type) 1705 switch (ev.type)
1379 { 1706 {
1380 case PropertyNotify: 1707 case PropertyNotify:
1381 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1382 {
1383 if (ev.xproperty.state == PropertyNewValue)
1384 selection_property (ev.xproperty.window, ev.xproperty.atom);
1385 break;
1386 }
1387#ifdef TRANSPARENT
1388 else
1389 {
1390 /* 1708 /*
1391 * if user used some Esetroot compatible prog to set the root bg, 1709 * if user used some Esetroot compatible prog to set the root bg,
1392 * use the property to determine the pixmap. We use it later on. 1710 * use the property to determine the pixmap. We use it later on.
1393 */ 1711 */
1394 if (xa[XA_XROOTPMAPID] == 0)
1395 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1396
1397 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1712 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1713 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1398 return; 1714 return;
1399 }
1400 1715
1401 /* FALLTHROUGH */ 1716 /* FALLTHROUGH */
1402 case ReparentNotify: 1717 case ReparentNotify:
1403 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1718 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1404 want_full_refresh = 1; 1719 want_refresh = want_full_refresh = 1;
1405 break; 1720 break;
1406#endif
1407 } 1721 }
1408} 1722}
1723#endif
1409 1724
1410void 1725void
1411rxvt_term::button_press (XButtonEvent &ev) 1726rxvt_term::button_press (XButtonEvent &ev)
1412{ 1727{
1413 int reportmode = 0, clickintime; 1728 int reportmode = 0, clickintime;
1414 1729
1415 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1730 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1416 if (!bypass_keystate) 1731 if (!bypass_keystate)
1417 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1732 reportmode = !! (priv_modes & PrivMode_mouse_report);
1733
1418 /* 1734 /*
1419 * VT window processing of button press 1735 * VT window processing of button press
1420 */ 1736 */
1421 if (ev.window == TermWin.vt) 1737 if (ev.window == TermWin.vt)
1422 { 1738 {
1739#if ISO_14755
1740 // 5.4
1741 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742 {
1743 iso14755_54 (ev.x, ev.y);
1744 return;
1745 }
1746#endif
1747
1423 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1748 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1749
1424 if (reportmode) 1750 if (reportmode)
1425 { 1751 {
1426 /* mouse report from vt window */ 1752 /* mouse report from vt window */
1427 /* save the xbutton state (for ButtonRelease) */ 1753 /* save the xbutton state (for ButtonRelease) */
1428 MEvent.state = ev.state; 1754 MEvent.state = ev.state;
… …
1457 } 1783 }
1458 else 1784 else
1459 { 1785 {
1460 if (ev.button != MEvent.button) 1786 if (ev.button != MEvent.button)
1461 MEvent.clicks = 0; 1787 MEvent.clicks = 0;
1788
1462 switch (ev.button) 1789 switch (ev.button)
1463 { 1790 {
1464 case Button1: 1791 case Button1:
1792 /* allow meta + click to select rectangular areas */
1793 /* should be done in screen.C */
1794#if ENABLE_FRILLS
1795 selection.rect = !!(ev.state & ModMetaMask);
1796#else
1797 selection.rect = false;
1798#endif
1799
1465 /* allow shift+left click to extend selection */ 1800 /* allow shift+left click to extend selection */
1466 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1801 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1467 { 1802 {
1468 if (MEvent.button == Button1 && clickintime) 1803 if (MEvent.button == Button1 && clickintime)
1469 selection_rotate (ev.x, ev.y); 1804 selection_rotate (ev.x, ev.y);
1470 else 1805 else
1471 selection_extend (ev.x, ev.y, 1); 1806 selection_extend (ev.x, ev.y, 1);
… …
1486 case Button3: 1821 case Button3:
1487 if (MEvent.button == Button3 && clickintime) 1822 if (MEvent.button == Button3 && clickintime)
1488 selection_rotate (ev.x, ev.y); 1823 selection_rotate (ev.x, ev.y);
1489 else 1824 else
1490 selection_extend (ev.x, ev.y, 1); 1825 selection_extend (ev.x, ev.y, 1);
1826
1491 MEvent.button = Button3; 1827 MEvent.button = Button3;
1492 break; 1828 break;
1493 } 1829 }
1494 } 1830 }
1831
1495 MEvent.time = ev.time; 1832 MEvent.time = ev.time;
1496 return; 1833 return;
1497 } 1834 }
1498 1835
1499 /* 1836 /*
… …
1591 break; 1928 break;
1592 case R_SB_ALIGN_BOTTOM: 1929 case R_SB_ALIGN_BOTTOM:
1593 csrO = scrollBar.bot - scrollBar.top; 1930 csrO = scrollBar.bot - scrollBar.top;
1594 break; 1931 break;
1595 } 1932 }
1933
1596 if (scrollBar.style == R_SB_XTERM 1934 if (scrollBar.style == R_SB_XTERM
1597 || scrollbar_above_slider (ev.y) 1935 || scrollbar_above_slider (ev.y)
1598 || scrollbar_below_slider (ev.y)) 1936 || scrollbar_below_slider (ev.y))
1599 scr_move_to ( scrollbar_position (ev.y) - csrO, 1937 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1600 scrollbar_size ()); 1938
1601 scrollBar.setMotion (); 1939 scrollBar.setMotion ();
1602 break; 1940 break;
1603 1941
1604 case Button1: 1942 case Button1:
1605 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1943 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1629 scr_page ((ev.button == Button1 ? DN : UP), 1967 scr_page ((ev.button == Button1 ? DN : UP),
1630 (TermWin.nrow 1968 (TermWin.nrow
1631 * scrollbar_position (ev.y) 1969 * scrollbar_position (ev.y)
1632 / scrollbar_size ())); 1970 / scrollbar_size ()));
1633 } 1971 }
1972
1634 break; 1973 break;
1635 } 1974 }
1636 } 1975 }
1637 return; 1976 return;
1638 } 1977 }
… …
1650{ 1989{
1651 int reportmode = 0; 1990 int reportmode = 0;
1652 1991
1653 csrO = 0; /* reset csr Offset */ 1992 csrO = 0; /* reset csr Offset */
1654 if (!bypass_keystate) 1993 if (!bypass_keystate)
1655 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1994 reportmode = !! (priv_modes & PrivMode_mouse_report);
1656 1995
1657 if (scrollbar_isUpDn ()) 1996 if (scrollbar_isUpDn ())
1658 { 1997 {
1659 scrollBar.setIdle (); 1998 scrollBar.setIdle ();
1660 scrollbar_show (0); 1999 scrollbar_show (0);
1661#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1662 refresh_type &= ~SMOOTH_REFRESH; 2001 refresh_type &= ~SMOOTH_REFRESH;
1663#endif 2002#endif
1664
1665 } 2003 }
2004
1666#ifdef SELECTION_SCROLLING 2005#ifdef SELECTION_SCROLLING
1667 if (sel_scroll_ev.active) 2006 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop(); 2007 sel_scroll_ev.stop();
1669#endif 2008#endif
2009
1670 if (ev.window == TermWin.vt) 2010 if (ev.window == TermWin.vt)
1671 { 2011 {
2012#if ISO_14755
2013 // 5.4
2014 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015 return;
2016#endif
1672 if (reportmode) 2017 if (reportmode)
1673 { 2018 {
1674 /* mouse report from vt window */ 2019 /* mouse report from vt window */
1675 /* don't report release of wheel "buttons" */ 2020 /* don't report release of wheel "buttons" */
1676 if (ev.button >= 4) 2021 if (ev.button >= 4)
… …
1690 MEvent.button = AnyButton; 2035 MEvent.button = AnyButton;
1691 mouse_report (ev); 2036 mouse_report (ev);
1692#endif /* MOUSE_REPORT_DOUBLECLICK */ 2037#endif /* MOUSE_REPORT_DOUBLECLICK */
1693 return; 2038 return;
1694 } 2039 }
2040
1695 /* 2041 /*
1696 * dumb hack to compensate for the failure of click-and-drag 2042 * dumb hack to compensate for the failure of click-and-drag
1697 * when overriding mouse reporting 2043 * when overriding mouse reporting
1698 */ 2044 */
1699 if (PrivateModes & PrivMode_mouse_report 2045 if (priv_modes & PrivMode_mouse_report
1700 && bypass_keystate 2046 && bypass_keystate
1701 && ev.button == Button1 && MEvent.clicks <= 1) 2047 && ev.button == Button1 && MEvent.clicks <= 1)
1702 selection_extend (ev.x, ev.y, 0); 2048 selection_extend (ev.x, ev.y, 0);
1703 2049
1704 switch (ev.button) 2050 switch (ev.button)
… …
1719 2065
1720 v = ev.button == Button4 ? UP : DN; 2066 v = ev.button == Button4 ? UP : DN;
1721 2067
1722 if (ev.state & ShiftMask) 2068 if (ev.state & ShiftMask)
1723 i = 1; 2069 i = 1;
1724 else if (Options & Opt_mouseWheelScrollPage) 2070 else if (options & Opt_mouseWheelScrollPage)
1725 i = TermWin.nrow - 1; 2071 i = TermWin.nrow - 1;
1726 else 2072 else
1727 i = 5; 2073 i = 5;
1728 2074
1729# ifdef MOUSE_SLIP_WHEELING 2075# ifdef MOUSE_SLIP_WHEELING
… …
1767#endif 2113#endif
1768} 2114}
1769 2115
1770#ifdef TRANSPARENT 2116#ifdef TRANSPARENT
1771#if TINTING 2117#if TINTING
1772/* shading taken from eterm-0.9.2 */ 2118/* taken from aterm-0.4.2 */
1773/* RGB 15 */
1774 2119
1775static void 2120typedef uint32_t RUINT32T;
1776shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1777{
1778 unsigned char *ptr;
1779 int x, y;
1780 2121
1781 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2122void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1782 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2123{
1783 /* No saturation */ 2124 int sh_r, sh_g, sh_b;
1784 for (y = h; --y >= 0;) { 2125 RUINT32T mask_r, mask_g, mask_b;
1785 for (x = -w; x < 0; x++) { 2126 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1786 int r, g, b; 2127 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2128 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2129 int i;
1787 2130
1788 b = ((uint16_t *) ptr)[x]; 2131 Visual *visual = display->visual;
1789 r = (b & 0x7c00) * rm; 2132
1790 g = (b & 0x3e0) * gm; 2133 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1791 b = (b & 0x1f) * bm; 2134
1792 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2135 /* for convenience */
1793 | ((g >> 8) & 0x3e0) 2136 mask_r = visual->red_mask;
1794 | ((b >> 8) & 0x1f); 2137 mask_g = visual->green_mask;
1795 } 2138 mask_b = visual->blue_mask;
1796 ptr += bpl; 2139
1797 } 2140 /* boring lookup table pre-initialization */
2141 switch (srcImage->bits_per_pixel) {
2142 case 15:
2143 if ((mask_r != 0x7c00) ||
2144 (mask_g != 0x03e0) ||
2145 (mask_b != 0x001f))
2146 return;
2147 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2148 lookup_r = lookup;
2149 lookup_g = lookup+32;
2150 lookup_b = lookup+32+32;
2151 sh_r = 10;
2152 sh_g = 5;
2153 sh_b = 0;
2154 break;
2155 case 16:
2156 if ((mask_r != 0xf800) ||
2157 (mask_g != 0x07e0) ||
2158 (mask_b != 0x001f))
2159 return;
2160 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2161 lookup_r = lookup;
2162 lookup_g = lookup+32;
2163 lookup_b = lookup+32+64;
2164 sh_r = 11;
2165 sh_g = 5;
2166 sh_b = 0;
2167 break;
2168 case 24:
2169 if ((mask_r != 0xff0000) ||
2170 (mask_g != 0x00ff00) ||
2171 (mask_b != 0x0000ff))
2172 return;
2173 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2174 lookup_r = lookup;
2175 lookup_g = lookup+256;
2176 lookup_b = lookup+256+256;
2177 sh_r = 16;
2178 sh_g = 8;
2179 sh_b = 0;
2180 break;
2181 case 32:
2182 if ((mask_r != 0xff0000) ||
2183 (mask_g != 0x00ff00) ||
2184 (mask_b != 0x0000ff))
2185 return;
2186 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2187 lookup_r = lookup;
2188 lookup_g = lookup+256;
2189 lookup_b = lookup+256+256;
2190 sh_r = 16;
2191 sh_g = 8;
2192 sh_b = 0;
2193 break;
2194 default:
2195 return; /* we do not support this color depth */
2196 }
2197
2198 /* prepare limits for color transformation (each channel is handled separately) */
2199 if (shade < 0) {
2200 shade = -shade;
2201 if (shade < 0) shade = 0;
2202 if (shade > 100) shade = 100;
2203
2204 lower_lim_r = 65535-rm;
2205 lower_lim_g = 65535-gm;
2206 lower_lim_b = 65535-bm;
2207
2208 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2209 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2210 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2211
2212 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1798 } else { 2213 } else {
1799 for (y = h; --y >= 0;) { 2214 if (shade < 0) shade = 0;
1800 for (x = -w; x < 0; x++) { 2215 if (shade > 100) shade = 100;
1801 int r, g, b;
1802 2216
1803 b = ((uint16_t *) ptr)[x]; 2217 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1804 r = (b & 0x7c00) * rm; 2218
1805 g = (b & 0x3e0) * gm; 2219 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1806 b = (b & 0x1f) * bm; 2220 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1807 r |= (!(r >> 15) - 1); 2221 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1808 g |= (!(g >> 10) - 1); 2222 }
1809 b |= (!(b >> 5) - 1); 2223
1810 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2224 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1811 | ((g >> 8) & 0x3e0) 2225 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1812 | ((b >> 8) & 0x1f); 2226 {
1813 } 2227 unsigned int tmp;
1814 ptr += bpl; 2228
2229 tmp = lower_lim_r;
2230 lower_lim_r = lower_lim_b;
2231 lower_lim_b = tmp;
2232
2233 tmp = upper_lim_r;
2234 upper_lim_r = upper_lim_b;
2235 upper_lim_b = tmp;
2236 }
2237
2238 /* fill our lookup tables */
2239 for (i = 0; i <= mask_r>>sh_r; i++)
2240 {
2241 RUINT32T tmp;
2242 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2243 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2244 lookup_r[i] = (tmp/65535)<<sh_r;
2245 }
2246 for (i = 0; i <= mask_g>>sh_g; i++)
2247 {
2248 RUINT32T tmp;
2249 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2250 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2251 lookup_g[i] = (tmp/65535)<<sh_g;
2252 }
2253 for (i = 0; i <= mask_b>>sh_b; i++)
2254 {
2255 RUINT32T tmp;
2256 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2257 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2258 lookup_b[i] = (tmp/65535)<<sh_b;
2259 }
2260
2261 /* apply table to input image (replacing colors by newly calculated ones) */
2262 switch (srcImage->bits_per_pixel)
2263 {
2264 case 15:
2265 {
2266 unsigned short *p1, *pf, *p, *pl;
2267 p1 = (unsigned short *) srcImage->data;
2268 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2269 while (p1 < pf)
2270 {
2271 p = p1;
2272 pl = p1 + srcImage->width;
2273 for (; p < pl; p++)
1815 } 2274 {
2275 *p = lookup_r[(*p & 0x7c00)>>10] |
2276 lookup_g[(*p & 0x03e0)>> 5] |
2277 lookup_b[(*p & 0x001f)];
2278 }
2279 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1816 } 2280 }
1817} 2281 break;
1818 2282 }
1819/* RGB 16 */ 2283 case 16:
1820static void 2284 {
1821shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2285 unsigned short *p1, *pf, *p, *pl;
1822{ 2286 p1 = (unsigned short *) srcImage->data;
1823 unsigned char *ptr; 2287 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1824 int x, y; 2288 while (p1 < pf)
1825 2289 {
1826 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2290 p = p1;
1827 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2291 pl = p1 + srcImage->width;
1828 /* No saturation */ 2292 for (; p < pl; p++)
1829 for (y = h; --y >= 0;) {
1830 for (x = -w; x < 0; x++) {
1831 int r, g, b;
1832
1833 b = ((uint16_t *) ptr)[x];
1834 r = (b & 0xf800) * rm;
1835 g = (b & 0x7e0) * gm;
1836 b = (b & 0x1f) * bm;
1837 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1838 | ((g >> 8) & 0x7e0)
1839 | ((b >> 8) & 0x1f);
1840 }
1841 ptr += bpl;
1842 } 2293 {
1843 } else { 2294 *p = lookup_r[(*p & 0xf800)>>11] |
1844 for (y = h; --y >= 0;) { 2295 lookup_g[(*p & 0x07e0)>> 5] |
1845 for (x = -w; x < 0; x++) { 2296 lookup_b[(*p & 0x001f)];
1846 int r, g, b;
1847
1848 b = ((uint16_t *) ptr)[x];
1849 r = (b & 0xf800) * rm;
1850 g = (b & 0x7e0) * gm;
1851 b = (b & 0x1f) * bm;
1852 r |= (!(r >> 16) - 1);
1853 g |= (!(g >> 11) - 1);
1854 b |= (!(b >> 5) - 1);
1855 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1856 | ((g >> 8) & 0x7e0)
1857 | ((b >> 8) & 0x1f);
1858 } 2297 }
1859 ptr += bpl; 2298 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2299 }
2300 break;
2301 }
2302 case 24:
2303 {
2304 unsigned char *p1, *pf, *p, *pl;
2305 p1 = (unsigned char *) srcImage->data;
2306 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2307 while (p1 < pf)
2308 {
2309 p = p1;
2310 pl = p1 + srcImage->width * 3;
2311 for (; p < pl; p += 3)
1860 } 2312 {
2313 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2314 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2315 p[2] = lookup_r[(p[2] & 0x0000ff)];
2316 }
2317 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1861 } 2318 }
1862} 2319 break;
2320 }
2321 case 32:
2322 {
2323 RUINT32T *p1, *pf, *p, *pl;
2324 p1 = (RUINT32T *) srcImage->data;
2325 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1863 2326
1864/* RGB 24 */ 2327 while (p1 < pf)
1865static void 2328 {
1866shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2329 p = p1;
1867{ 2330 pl = p1 + srcImage->width;
1868 unsigned char *ptr; 2331 for (; p < pl; p++)
1869 int x, y;
1870
1871 ptr = (unsigned char *)data + (w * 3);
1872 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1873 /* No saturation */
1874 for (y = h; --y >= 0;) {
1875 for (x = -(w * 3); x < 0; x += 3) {
1876 int r, g, b;
1877
1878 if (byteorder.big_endian()) {
1879 r = (ptr[x + 0] * rm) >> 8;
1880 g = (ptr[x + 1] * gm) >> 8;
1881 b = (ptr[x + 2] * bm) >> 8;
1882 ptr[x + 0] = r;
1883 ptr[x + 1] = g;
1884 ptr[x + 2] = b;
1885 } else {
1886 r = (ptr[x + 2] * rm) >> 8;
1887 g = (ptr[x + 1] * gm) >> 8;
1888 b = (ptr[x + 0] * bm) >> 8;
1889 ptr[x + 2] = r;
1890 ptr[x + 1] = g;
1891 ptr[x + 0] = b;
1892 }
1893 }
1894 ptr += bpl;
1895 } 2332 {
1896 } else { 2333 *p = lookup_r[(*p & 0xff0000)>>16] |
1897 for (y = h; --y >= 0;) { 2334 lookup_g[(*p & 0x00ff00)>> 8] |
1898 for (x = -(w * 3); x < 0; x += 3) { 2335 lookup_b[(*p & 0x0000ff)] |
1899 int r, g, b; 2336 (*p & ~0xffffff);
1900
1901 if (byteorder.big_endian()) {
1902 r = (ptr[x + 0] * rm) >> 8;
1903 g = (ptr[x + 1] * gm) >> 8;
1904 b = (ptr[x + 2] * bm) >> 8;
1905
1906 r |= (!(r >> 8) - 1);
1907 g |= (!(g >> 8) - 1);
1908 b |= (!(b >> 8) - 1);
1909
1910 ptr[x + 0] = r;
1911 ptr[x + 1] = g;
1912 ptr[x + 2] = b;
1913 } else {
1914 r = (ptr[x + 2] * rm) >> 8;
1915 g = (ptr[x + 1] * gm) >> 8;
1916 b = (ptr[x + 0] * bm) >> 8;
1917
1918 r |= (!(r >> 8) - 1);
1919 g |= (!(g >> 8) - 1);
1920 b |= (!(b >> 8) - 1);
1921
1922 ptr[x + 2] = r;
1923 ptr[x + 1] = g;
1924 ptr[x + 0] = b;
1925 }
1926 } 2337 }
1927 ptr += bpl; 2338 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1928 } 2339 }
2340 break;
2341 }
1929 } 2342 }
1930}
1931 2343
1932/* RGB 32 */ 2344 free (lookup);
1933static void
1934shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1935{
1936 unsigned char *ptr;
1937 int x, y;
1938
1939 ptr = (unsigned char *)data + (w * 4);
1940 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1941 /* No saturation */
1942 for (y = h; --y >= 0;) {
1943 if (byteorder.big_endian()) {
1944 for (x = -(w * 4); x < 0; x += 4) {
1945 int r, g, b;
1946
1947 r = (ptr[x + 1] * rm) >> 8;
1948 g = (ptr[x + 2] * gm) >> 8;
1949 b = (ptr[x + 3] * bm) >> 8;
1950 ptr[x + 1] = r;
1951 ptr[x + 2] = g;
1952 ptr[x + 3] = b;
1953 }
1954 } else {
1955 for (x = -(w * 4); x < 0; x += 4) {
1956 int r, g, b;
1957
1958 r = (ptr[x + 2] * rm) >> 8;
1959 g = (ptr[x + 1] * gm) >> 8;
1960 b = (ptr[x + 0] * bm) >> 8;
1961 ptr[x + 2] = r;
1962 ptr[x + 1] = g;
1963 ptr[x + 0] = b;
1964 }
1965 }
1966 ptr += bpl;
1967 }
1968 } else {
1969 for (y = h; --y >= 0;) {
1970 for (x = -(w * 4); x < 0; x += 4) {
1971 int r, g, b;
1972
1973 if (byteorder.big_endian()) {
1974 r = (ptr[x + 1] * rm) >> 8;
1975 g = (ptr[x + 2] * gm) >> 8;
1976 b = (ptr[x + 3] * bm) >> 8;
1977
1978 r |= (!(r >> 8) - 1);
1979 g |= (!(g >> 8) - 1);
1980 b |= (!(b >> 8) - 1);
1981
1982 ptr[x + 1] = r;
1983 ptr[x + 2] = g;
1984 ptr[x + 3] = b;
1985 } else {
1986 r = (ptr[x + 2] * rm) >> 8;
1987 g = (ptr[x + 1] * gm) >> 8;
1988 b = (ptr[x + 0] * bm) >> 8;
1989
1990 r |= (!(r >> 8) - 1);
1991 g |= (!(g >> 8) - 1);
1992 b |= (!(b >> 8) - 1);
1993
1994 ptr[x + 2] = r;
1995 ptr[x + 1] = g;
1996 ptr[x + 0] = b;
1997 }
1998 }
1999 ptr += bpl;
2000 }
2001 }
2002} 2345}
2003
2004#endif 2346#endif
2005 2347
2006/* 2348/*
2007 * Check our parents are still who we think they are. 2349 * Check our parents are still who we think they are.
2008 * Do transparency updates if required 2350 * Do transparency updates if required
… …
2015 Atom atype; 2357 Atom atype;
2016 unsigned char *prop = NULL; 2358 unsigned char *prop = NULL;
2017 Window root, oldp, *list; 2359 Window root, oldp, *list;
2018 Pixmap rootpixmap = None; 2360 Pixmap rootpixmap = None;
2019 XWindowAttributes wattr, wrootattr; 2361 XWindowAttributes wattr, wrootattr;
2362 dDisp;
2020 2363
2021 pchanged = 0; 2364 pchanged = 0;
2022 2365
2023 if (!(Options & Opt_transparent)) 2366 if (!(options & Opt_transparent))
2024 return pchanged; /* Don't try any more */ 2367 return pchanged; /* Don't try any more */
2025 2368
2026 XGetWindowAttributes (display->display, display->root, &wrootattr); 2369 XGetWindowAttributes (disp, display->root, &wrootattr);
2027 rootdepth = wrootattr.depth; 2370 rootdepth = wrootattr.depth;
2028 2371
2029 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2372 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2030 2373
2031 if (rootdepth != wattr.depth) 2374 if (rootdepth != wattr.depth)
2032 { 2375 {
2033 if (am_transparent) 2376 if (am_transparent)
2034 { 2377 {
2035 pchanged = 1; 2378 pchanged = 1;
2036 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2379 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2037 am_transparent = am_pixmap_trans = 0; 2380 am_transparent = am_pixmap_trans = 0;
2038 } 2381 }
2039 2382
2040 return pchanged; /* Don't try any more */ 2383 return pchanged; /* Don't try any more */
2041 } 2384 }
2042 2385
2043 /* Get all X ops out of the queue so that our information is up-to-date. */ 2386 /* Get all X ops out of the queue so that our information is up-to-date. */
2044 XSync (display->display, False); 2387 XSync (disp, False);
2045 2388
2046 /* 2389 /*
2047 * Make the frame window set by the window manager have 2390 * Make the frame window set by the window manager have
2048 * the root background. Some window managers put multiple nested frame 2391 * the root background. Some window managers put multiple nested frame
2049 * windows for each client, so we have to take care about that. 2392 * windows for each client, so we have to take care about that.
2050 */ 2393 */
2051 i = (xa[XA_XROOTPMAPID] 2394 i = (xa[XA_XROOTPMAP_ID]
2052 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2395 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2053 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2396 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2054 &nitems, &bytes_after, &prop) == Success); 2397 &nitems, &bytes_after, &prop) == Success);
2055 2398
2056 if (!i || prop == NULL) 2399 if (!i || prop == NULL)
2057 i = (xa[XA_XSETROOTID] 2400 i = (xa[XA_ESETROOT_PMAP_ID]
2058 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2401 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2059 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2060 &nitems, &bytes_after, &prop) == Success); 2403 &nitems, &bytes_after, &prop) == Success);
2061 2404
2062 if (!i || prop == NULL || !rs[Rs_color + Color_tint]) 2405 if (!i || prop == NULL
2406#if TINTING
2407 || !rs[Rs_color + Color_tint]
2408#endif
2409 )
2063 have_pixmap = 0; 2410 have_pixmap = 0;
2064 else 2411 else
2065 { 2412 {
2066 have_pixmap = 1; 2413 have_pixmap = 1;
2067 rootpixmap = *(Pixmap *)prop; 2414 rootpixmap = *(Pixmap *)prop;
… …
2078 Window cr; 2425 Window cr;
2079 XImage *image; 2426 XImage *image;
2080 GC gc; 2427 GC gc;
2081 XGCValues gcvalue; 2428 XGCValues gcvalue;
2082 2429
2083 XTranslateCoordinates (display->display, TermWin.vt, display->root, 2430 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2084 0, 0, &sx, &sy, &cr); 2431 0, 0, &sx, &sy, &cr);
2085 nw = (unsigned int)szHint.width; 2432 nw = (unsigned int)szHint.width;
2086 nh = (unsigned int)szHint.height; 2433 nh = (unsigned int)szHint.height;
2087 nx = ny = 0; 2434 nx = ny = 0;
2088 2435
… …
2100 sy = 0; 2447 sy = 0;
2101 } 2448 }
2102 2449
2103 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2450 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2104 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2451 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2452
2453 XSync (disp, False);
2105 allowedxerror = -1; 2454 allowedxerror = -1;
2106 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2455 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2107 2456
2108 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2457 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2109 /* XXX: may need a delay here? */ 2458 /* XXX: may need a delay here? */
2110 allowedxerror = 0; 2459 allowedxerror = 0;
2111 2460
… …
2114 if (am_transparent && am_pixmap_trans) 2463 if (am_transparent && am_pixmap_trans)
2115 { 2464 {
2116 pchanged = 1; 2465 pchanged = 1;
2117 if (TermWin.pixmap != None) 2466 if (TermWin.pixmap != None)
2118 { 2467 {
2119 XFreePixmap (display->display, TermWin.pixmap); 2468 XFreePixmap (disp, TermWin.pixmap);
2120 TermWin.pixmap = None; 2469 TermWin.pixmap = None;
2121 } 2470 }
2122 } 2471 }
2123 2472
2124 am_pixmap_trans = 0; 2473 am_pixmap_trans = 0;
2125 } 2474 }
2126 else 2475 else
2127 { 2476 {
2128 if (TermWin.pixmap != None) 2477 if (TermWin.pixmap != None)
2129 XFreePixmap (display->display, TermWin.pixmap); 2478 XFreePixmap (disp, TermWin.pixmap);
2130 2479
2131#if TINTING 2480#if TINTING
2132 if (ISSET_PIXCOLOR (Color_tint)) 2481 if (ISSET_PIXCOLOR (Color_tint))
2133 { 2482 {
2134 unsigned short rm, gm, bm; 2483 unsigned short rm, gm, bm;
2135 if (rs[Rs_shade]) 2484 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2136 PixColorsFocused[Color_tint].fade (display, atoi (rs[Rs_shade])).get (display, rm, gm, bm); 2485
2137 else
2138 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2486 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2139 2487
2140 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2488 ShadeXImage (display, image, shade, rm, gm, bm);
2141
2142 /* Determine bitshift and bitmask values */
2143 switch (image->bits_per_pixel)
2144 {
2145 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2146 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2147 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2148 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2149 }
2150 } 2489 }
2151#endif 2490#endif
2152 2491
2153 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2492 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2154 szHint.width, szHint.height, image->depth); 2493 szHint.width, szHint.height, image->depth);
2155 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2494 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2156 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2495 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2157 nx, ny, image->width, image->height); 2496 nx, ny, image->width, image->height);
2158 XFreeGC (display->display, gc); 2497 XFreeGC (disp, gc);
2159 XDestroyImage (image); 2498 XDestroyImage (image);
2160 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap); 2499 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2500 XClearWindow (disp, TermWin.parent[0]);
2161 2501
2162 if (!am_transparent || !am_pixmap_trans) 2502 if (!am_transparent || !am_pixmap_trans)
2163 pchanged = 1; 2503 pchanged = 1;
2164 2504
2165 am_transparent = am_pixmap_trans = 1; 2505 am_transparent = am_pixmap_trans = 1;
2166 } 2506 }
2167 } 2507 }
2168 2508
2169 if (!am_pixmap_trans) 2509 if (am_pixmap_trans)
2510 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2511 else
2170 { 2512 {
2171 unsigned int n; 2513 unsigned int n;
2172 /* 2514 /*
2173 * InheritPixmap transparency 2515 * InheritPixmap transparency
2174 */ 2516 */
2175 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2176 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2517 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2177 { 2518 {
2178 oldp = TermWin.parent[i]; 2519 oldp = TermWin.parent[i];
2179 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2520 XQueryTree (disp, TermWin.parent[i - 1], &root,
2180 &TermWin.parent[i], &list, &n); 2521 &TermWin.parent[i], &list, &n);
2181 XFree (list); 2522 XFree (list);
2182 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2183 2523
2184 if (TermWin.parent[i] == display->root) 2524 if (TermWin.parent[i] == display->root)
2185 { 2525 {
2186 if (oldp != None) 2526 if (oldp != None)
2187 pchanged = 1; 2527 pchanged = 1;
… …
2197 2537
2198 if (pchanged) 2538 if (pchanged)
2199 { 2539 {
2200 for (; n < (unsigned int)i; n++) 2540 for (; n < (unsigned int)i; n++)
2201 { 2541 {
2202 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2542 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2203 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2204 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2543 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2205 { 2544 {
2206 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2545 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2207 break; 2546 break;
2208 } 2547 }
2209 } 2548 }
2210 } 2549 }
2211 2550
2212 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2551 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2213 { 2552 {
2214 D_X ((stderr, "InheritPixmap Turning off")); /* Mikachu? */
2215 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2553 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2216 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2554 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2217 am_transparent = 0; 2555 am_transparent = 0;
2218 /* XXX: also turn off Opt_transparent? */ 2556 /* XXX: also turn off Opt_transparent? */
2219 } 2557 }
2220 else 2558 else
2221 { 2559 {
2222#if WAIT_FOR_WM 2560#if WAIT_FOR_WM
2223 /* wait (an arbitrary period) for the WM to do its thing 2561 /* wait (an arbitrary period) for the WM to do its thing
2224 * needed for fvwm2.2.2 (and before?) */ 2562 * needed for fvwm2.2.2 (and before?) */
2225 sleep (1); 2563 sleep (1);
2226#endif 2564#endif
2227 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2228 for (n = 0; n < (unsigned int)i; n++) 2565 for (n = 0; n < (unsigned int)i; n++)
2566 {
2229 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2567 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2568 XClearWindow (disp, TermWin.parent[n]);
2569 }
2230 2570
2231 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2571 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2232 am_transparent = 1; 2572 am_transparent = 1;
2233 } 2573 }
2234 2574
2235 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2575 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2236 TermWin.parent[i] = None; 2576 TermWin.parent[i] = None;
2577 }
2578
2579 if (scrollBar.win)
2580 {
2581 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2582 scrollBar.setIdle ();
2583 scrollbar_show (0);
2584 }
2585
2586 if (am_transparent)
2587 {
2588 want_refresh = want_full_refresh = 1;
2589 if (am_pixmap_trans)
2590 flush ();
2237 } 2591 }
2238 2592
2239 return pchanged; 2593 return pchanged;
2240} 2594}
2241#endif 2595#endif
… …
2260 if (ch == NOCHAR) // TODO: improve 2614 if (ch == NOCHAR) // TODO: improve
2261 break; 2615 break;
2262 2616
2263 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2617 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2264 { 2618 {
2619 if (!seen_input)
2620 {
2621 seen_input = 1;
2622 // many badly-written programs (e.g. jed) contain a race condition:
2623 // they first read the screensize and then install a SIGWINCH handler.
2624 // some window managers resize the window early, and these programs
2625 // then sometimes get the size wrong.
2626 // unfortunately other programs are even more buggy and dislike
2627 // being sent SIGWINCH, so only do it when we were in fact being
2628 // resized.
2629 if (seen_resize && cmd_pid)
2630 kill (-cmd_pid, SIGWINCH);
2631 }
2632
2265 /* Read a text string from the input buffer */ 2633 /* Read a text string from the input buffer */
2266 unicode_t buf[UBUFSIZ]; 2634 unicode_t buf[UBUFSIZ];
2267 bool refreshnow = false; 2635 bool refreshnow = false;
2268 int nlines = 0; 2636 int nlines = 0;
2269 unicode_t *str = buf; 2637 unicode_t *str = buf;
2270 2638
2271 *str++ = ch;
2272
2273 for (;;) 2639 for (;;)
2274 { 2640 {
2275 seq_begin = cmdbuf_ptr;
2276 ch = next_char ();
2277
2278 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2641 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2279 break; 2642 break;
2280 2643
2281 *str++ = ch; 2644 *str++ = ch;
2282 2645
2283 if (ch == C0_LF) 2646 if (ch == C0_LF)
2284 { 2647 {
2285 nlines++; 2648 nlines++;
2286 refresh_count++; 2649 refresh_count++;
2287 2650
2288 if (! (Options & Opt_jumpScroll) 2651 if (!(options & Opt_jumpScroll)
2289 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2290 { 2653 {
2291 refreshnow = true; 2654 refreshnow = true;
2292 flag = true;
2293 ch = NOCHAR; 2655 ch = NOCHAR;
2294 break; 2656 break;
2295 } 2657 }
2296 2658
2297 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2659 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2298 if (nlines >= TermWin.nrow - 1) 2660 if (nlines >= TermWin.nrow - 1)
2299 { 2661 {
2300 scr_add_lines (buf, nlines, str - buf); 2662 scr_add_lines (buf, nlines, str - buf);
2301 nlines = 0; 2663 nlines = 0;
2302 str = buf; 2664 str = buf;
… …
2306 if (str >= buf + UBUFSIZ) 2668 if (str >= buf + UBUFSIZ)
2307 { 2669 {
2308 ch = NOCHAR; 2670 ch = NOCHAR;
2309 break; 2671 break;
2310 } 2672 }
2673
2674 seq_begin = cmdbuf_ptr;
2675 ch = next_char ();
2311 } 2676 }
2312 2677
2313 scr_add_lines (buf, nlines, str - buf); 2678 scr_add_lines (buf, nlines, str - buf);
2314 2679
2315 /* 2680 /*
2316 * If there have been a lot of new lines, then update the screen 2681 * If there have been a lot of new lines, then update the screen
2317 * What the heck I'll cheat and only refresh less than every page-full. 2682 * What the heck I'll cheat and only refresh less than every page-full.
2318 * the number of pages between refreshes is refresh_limit, which 2683 * the number of pages between refreshes is refresh_limit, which
2319 * is incremented here because we must be doing flat-out scrolling. 2684 * is incremented here because we must be doing flat-out scrolling.
2320 *
2321 * refreshing should be correct for small scrolls, because of the
2322 * time-out
2323 */ 2685 */
2324 if (refreshnow) 2686 if (refreshnow)
2325 { 2687 {
2326 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2688 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2327 refresh_limit++; 2689 refresh_limit++;
2328 else 2690 else
2691 {
2692 flag = true;
2329 scr_refresh (refresh_type); 2693 scr_refresh (refresh_type);
2694 }
2330 } 2695 }
2331 2696
2332 } 2697 }
2333 else 2698 else
2334 { 2699 {
… …
2382 if (len == (size_t)-1) 2747 if (len == (size_t)-1)
2383 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2748 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2384 2749
2385 // assume wchar == unicode 2750 // assume wchar == unicode
2386 cmdbuf_ptr += len; 2751 cmdbuf_ptr += len;
2387 return wc; 2752 return wc & UNICODE_MASK;
2388 } 2753 }
2389 2754
2390 return NOCHAR; 2755 return NOCHAR;
2391} 2756}
2392 2757
… …
2518 process_escape_seq (); 2883 process_escape_seq ();
2519 break; 2884 break;
2520 case C0_ENQ: /* terminal Status */ 2885 case C0_ENQ: /* terminal Status */
2521 if (rs[Rs_answerbackstring]) 2886 if (rs[Rs_answerbackstring])
2522 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2887 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2523 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2888 (unsigned int)strlen (rs[Rs_answerbackstring]));
2524 else 2889 else
2525 tt_write ((unsigned char *)VT100_ANS, 2890 tt_write ((unsigned char *)VT100_ANS,
2526 (unsigned int)STRLEN (VT100_ANS)); 2891 (unsigned int)strlen (VT100_ANS));
2527 break; 2892 break;
2528 case C0_BEL: /* bell */ 2893 case C0_BEL: /* bell */
2529 scr_bell (); 2894 scr_bell ();
2530 break; 2895 break;
2531 case C0_BS: /* backspace */ 2896 case C0_BS: /* backspace */
… …
2630void 2995void
2631rxvt_term::process_escape_seq () 2996rxvt_term::process_escape_seq ()
2632{ 2997{
2633 unicode_t ch = cmd_getc (); 2998 unicode_t ch = cmd_getc ();
2634 2999
2635 if (PrivateModes & PrivMode_vt52) 3000 if (priv_modes & PrivMode_vt52)
2636 { 3001 {
2637 process_escape_vt52 (ch); 3002 process_escape_vt52 (ch);
2638 return; 3003 return;
2639 } 3004 }
2640 3005
… …
2655 scr_charset_set (2, (unsigned int)cmd_getc ()); 3020 scr_charset_set (2, (unsigned int)cmd_getc ());
2656 break; 3021 break;
2657 case '+': 3022 case '+':
2658 scr_charset_set (3, (unsigned int)cmd_getc ()); 3023 scr_charset_set (3, (unsigned int)cmd_getc ());
2659 break; 3024 break;
2660#ifndef NO_FRILLS 3025#if ENABLE_FRILLS
2661 case '6': 3026 case '6':
2662 scr_backindex (); 3027 scr_backindex ();
2663 break; 3028 break;
2664#endif 3029#endif
2665 case '7': 3030 case '7':
2666 scr_cursor (SAVE); 3031 scr_cursor (SAVE);
2667 break; 3032 break;
2668 case '8': 3033 case '8':
2669 scr_cursor (RESTORE); 3034 scr_cursor (RESTORE);
2670 break; 3035 break;
2671#ifndef NO_FRILLS 3036#if ENABLE_FRILLS
2672 case '9': 3037 case '9':
2673 scr_forwardindex (); 3038 scr_forwardindex ();
2674 break; 3039 break;
2675#endif 3040#endif
2676 case '=': 3041 case '=':
… …
2855 { 3220 {
2856 switch (priv) 3221 switch (priv)
2857 { 3222 {
2858 case '>': 3223 case '>':
2859 if (ch == CSI_DA) /* secondary device attributes */ 3224 if (ch == CSI_DA) /* secondary device attributes */
2860 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3225 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2861 break; 3226 break;
2862 case '?': 3227 case '?':
2863 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3228 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2864 process_terminal_mode (ch, priv, nargs, arg); 3229 process_terminal_mode (ch, priv, nargs, arg);
2865 break; 3230 break;
… …
2975 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3340 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2976 break; 3341 break;
2977 3342
2978 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3343 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2979 tt_write ((const unsigned char *)VT100_ANS, 3344 tt_write ((const unsigned char *)VT100_ANS,
2980 (unsigned int) (sizeof (VT100_ANS) - 1)); 3345 (unsigned int) (sizeof (VT100_ANS) - 1));
2981 break; 3346 break;
2982 3347
2983 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3348 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2984 process_sgr_mode (nargs, arg); 3349 process_sgr_mode (nargs, arg);
2985 break; 3350 break;
… …
2992 break; 3357 break;
2993 case 6: /* CPR requested */ 3358 case 6: /* CPR requested */
2994 scr_report_position (); 3359 scr_report_position ();
2995 break; 3360 break;
2996 case 7: /* unofficial extension */ 3361 case 7: /* unofficial extension */
2997 if (Options & Opt_insecure) 3362 if (options & Opt_insecure)
2998 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3363 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2999 break; 3364 break;
3000 case 8: /* unofficial extension */ 3365 case 8: /* unofficial extension */
3001 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3366 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3002 break; 3367 break;
3003 } 3368 }
… …
3039 break; 3404 break;
3040 3405
3041 case CSI_RM: /* 8.3.107: RESET MODE */ 3406 case CSI_RM: /* 8.3.107: RESET MODE */
3042 if (arg[0] == 4) 3407 if (arg[0] == 4)
3043 scr_insert_mode (0); 3408 scr_insert_mode (0);
3409 else if (arg[0] == 20)
3410 priv_modes &= ~PrivMode_LFNL;
3044 break; 3411 break;
3045 3412
3046 case CSI_SM: /* 8.3.126: SET MODE */ 3413 case CSI_SM: /* 8.3.126: SET MODE */
3047 if (arg[0] == 4) 3414 if (arg[0] == 4)
3048 scr_insert_mode (1); 3415 scr_insert_mode (1);
3416 else if (arg[0] == 20)
3417 priv_modes |= PrivMode_LFNL;
3049 break; 3418 break;
3050 3419
3051 /* 3420 /*
3052 * PRIVATE USE beyond this point. All CSI_7? sequences here 3421 * PRIVATE USE beyond this point. All CSI_7? sequences here
3053 */ 3422 */
… …
3065 break; 3434 break;
3066 case CSI_75: 3435 case CSI_75:
3067 scr_cursor (RESTORE); 3436 scr_cursor (RESTORE);
3068 break; 3437 break;
3069 3438
3070#ifndef NO_FRILLS 3439#if ENABLE_FRILLS
3071 case CSI_74: 3440 case CSI_74:
3072 process_window_ops (arg, nargs); 3441 process_window_ops (arg, nargs);
3073 break; 3442 break;
3074#endif 3443#endif
3075 3444
… …
3082 break; 3451 break;
3083 } 3452 }
3084} 3453}
3085/*}}} */ 3454/*}}} */
3086 3455
3087#ifndef NO_FRILLS 3456#if ENABLE_FRILLS
3088/* ARGSUSED */ 3457/* ARGSUSED */
3089void 3458void
3090rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3459rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3091{ 3460{
3092 int x, y; 3461 int x, y;
3093 XWindowAttributes wattr; 3462 XWindowAttributes wattr;
3094 Window wdummy; 3463 Window wdummy;
3464 dDisp;
3095 3465
3096 if (nargs == 0) 3466 if (nargs == 0)
3097 return; 3467 return;
3098 3468
3099 switch (args[0]) 3469 switch (args[0])
3100 { 3470 {
3101 /* 3471 /*
3102 * commands 3472 * commands
3103 */ 3473 */
3104 case 1: /* deiconify window */ 3474 case 1: /* deiconify window */
3105 XMapWindow (display->display, TermWin.parent[0]); 3475 XMapWindow (disp, TermWin.parent[0]);
3106 break; 3476 break;
3107 case 2: /* iconify window */ 3477 case 2: /* iconify window */
3108 XIconifyWindow (display->display, TermWin.parent[0], 3478 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3109 DefaultScreen (display->display));
3110 break; 3479 break;
3111 case 3: /* set position (pixels) */ 3480 case 3: /* set position (pixels) */
3112 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3113 break; 3482 break;
3114 case 4: /* set size (pixels) */ 3483 case 4: /* set size (pixels) */
3115 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3116 break; 3485 break;
3117 case 5: /* raise window */ 3486 case 5: /* raise window */
3118 XRaiseWindow (display->display, TermWin.parent[0]); 3487 XRaiseWindow (disp, TermWin.parent[0]);
3119 break; 3488 break;
3120 case 6: /* lower window */ 3489 case 6: /* lower window */
3121 XLowerWindow (display->display, TermWin.parent[0]); 3490 XLowerWindow (disp, TermWin.parent[0]);
3122 break; 3491 break;
3123 case 7: /* refresh window */ 3492 case 7: /* refresh window */
3124 scr_touch (true); 3493 scr_touch (true);
3125 break; 3494 break;
3126 case 8: /* set size (chars) */ 3495 case 8: /* set size (chars) */
… …
3138 3507
3139 /* 3508 /*
3140 * reports - some output format copied from XTerm 3509 * reports - some output format copied from XTerm
3141 */ 3510 */
3142 case 11: /* report window state */ 3511 case 11: /* report window state */
3143 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3145 break; 3514 break;
3146 case 13: /* report window position */ 3515 case 13: /* report window position */
3147 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3148 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3149 -wattr.border_width, -wattr.border_width, 3518 -wattr.border_width, -wattr.border_width,
3150 &x, &y, &wdummy); 3519 &x, &y, &wdummy);
3151 tt_printf ("\033[3;%d;%dt", x, y); 3520 tt_printf ("\033[3;%d;%dt", x, y);
3152 break; 3521 break;
3153 case 14: /* report window size (pixels) */ 3522 case 14: /* report window size (pixels) */
3154 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3156 break; 3525 break;
3157 case 18: /* report text area size (chars) */ 3526 case 18: /* report text area size (chars) */
3158 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3159 break; 3528 break;
3160 case 19: /* report window size (chars) */ 3529 case 19: /* report window size (chars) */
3161 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3162 break; 3531 break;
3163 case 20: /* report icon label */ 3532 case 20: /* report icon label */
3164 if (Options & Opt_insecure)
3165 { 3533 {
3166 char *s; 3534 char *s;
3167 XGetIconName (display->display, TermWin.parent[0], &s); 3535 XGetIconName (disp, TermWin.parent[0], &s);
3168 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3536 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3537 XFree (s);
3169 } 3538 }
3170 break; 3539 break;
3171 case 21: /* report window title */ 3540 case 21: /* report window title */
3172 if (Options & Opt_insecure)
3173 { 3541 {
3174 char *s; 3542 char *s;
3175 XFetchName (display->display, TermWin.parent[0], &s); 3543 XFetchName (disp, TermWin.parent[0], &s);
3176 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3544 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3545 XFree (s);
3177 } 3546 }
3178 break; 3547 break;
3179 } 3548 }
3180} 3549}
3181#endif 3550#endif
3182 3551
… …
3186 * ends_how is terminator used. returned input must be free()'d 3555 * ends_how is terminator used. returned input must be free()'d
3187 */ 3556 */
3188unsigned char * 3557unsigned char *
3189rxvt_term::get_to_st (unicode_t &ends_how) 3558rxvt_term::get_to_st (unicode_t &ends_how)
3190{ 3559{
3191 unicode_t prev = 0, ch; 3560 unicode_t ch;
3561 bool seen_esc = false;
3192 unsigned int n = 0; 3562 unsigned int n = 0;
3193 unsigned char *s;
3194 unsigned char string[STRING_MAX]; 3563 wchar_t string[STRING_MAX];
3195 3564
3196 while ((ch = cmd_getc ()) != NOCHAR) 3565 while ((ch = cmd_getc ()) != NOCHAR)
3197 { 3566 {
3198 if (prev == C0_ESC) 3567 if (seen_esc)
3199 { 3568 {
3200 if (ch == 0x5c) /* 7bit ST */ 3569 if (ch == 0x5c) /* 7bit ST */
3201 break; 3570 break;
3202 else 3571 else
3203 return NULL; 3572 return NULL;
3204 } 3573 }
3574 else if (ch == C0_ESC)
3575 {
3576 seen_esc = true;
3577 continue;
3578 }
3205 else if (ch == C0_BEL || ch == CHAR_ST) 3579 else if (ch == C0_BEL || ch == CHAR_ST)
3206 break; 3580 break;
3207 else if (ch < 0x20) 3581 else if (ch < 0x20)
3208 return NULL; /* other control character - exit */ 3582 return NULL; /* other control character - exit */
3583
3584 seen_esc = false;
3209 3585
3210 if (n >= sizeof (string) - 1) 3586 if (n >= sizeof (string) - 1)
3211 // stop at some sane length 3587 // stop at some sane length
3212 return NULL; 3588 return NULL;
3213 3589
3214 if (ch == C0_SYN) 3590 if (ch == C0_SYN)
3215 {
3216 string[n++] = cmd_get8 (); 3591 string[n++] = cmd_get8 ();
3217 prev = 0;
3218 }
3219 else 3592 else
3220 string[n++] = prev = ch; 3593 string[n++] = ch;
3221 } 3594 }
3222 3595
3223 string[n++] = '\0'; 3596 string[n++] = '\0';
3224 3597
3225 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3226 return NULL;
3227
3228 ends_how = (ch == 0x5c ? C0_ESC : ch); 3598 ends_how = (ch == 0x5c ? C0_ESC : ch);
3229 STRNCPY (s, string, n); 3599
3230 return s; 3600 return (unsigned char *)rxvt_wcstombs (string);
3231} 3601}
3232 3602
3233/*----------------------------------------------------------------------*/ 3603/*----------------------------------------------------------------------*/
3234/* 3604/*
3235 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3605 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3279void 3649void
3280rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3650rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3281{ 3651{
3282 if (str[0] == '?' && !str[1]) 3652 if (str[0] == '?' && !str[1])
3283 { 3653 {
3284 if (Options & Opt_insecure)
3285 {
3286 unsigned short r, g, b; 3654 unsigned short r, g, b;
3287 PixColorsFocused[color].get (display, r, g, b); 3655 pix_colors_focused[color].get (display, r, g, b);
3288 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3656 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3289 }
3290 } 3657 }
3291 else 3658 else
3292 set_window_color (color, str); 3659 set_window_color (color, str);
3293} 3660}
3294 3661
… …
3322{ 3689{
3323 int changed = 0; 3690 int changed = 0;
3324 int color; 3691 int color;
3325 char *buf, *name; 3692 char *buf, *name;
3326 bool query = str[0] == '?' && !str[1]; 3693 bool query = str[0] == '?' && !str[1];
3694 int saveop = op;
3695 dDisp;
3327 3696
3328 assert (str != NULL); 3697 assert (str != NULL);
3329 switch (op) 3698 switch (op)
3330 { 3699 {
3331 case XTerm_name: 3700 case XTerm_name:
… …
3338 set_title (str); 3707 set_title (str);
3339 break; 3708 break;
3340 case XTerm_property: 3709 case XTerm_property:
3341 if (str[0] == '?') 3710 if (str[0] == '?')
3342 { 3711 {
3343 Atom prop = XInternAtom (display->display, str + 1, True); 3712 Atom prop = display->atom (str + 1);
3344 Atom actual_type; 3713 Atom actual_type;
3345 int actual_format; 3714 int actual_format;
3346 unsigned long nitems; 3715 unsigned long nitems;
3347 unsigned long bytes_after; 3716 unsigned long bytes_after;
3348 unsigned char *value = 0; 3717 unsigned char *value = 0;
3349 const char *str = ""; 3718 const char *str = "";
3350 3719
3351 if (prop 3720 if (prop
3352 && XGetWindowProperty (display->display, TermWin.parent[0], 3721 && XGetWindowProperty (disp, TermWin.parent[0],
3353 prop, 0, 1<<16, 0, AnyPropertyType, 3722 prop, 0, 1<<16, 0, AnyPropertyType,
3354 &actual_type, &actual_format, 3723 &actual_type, &actual_format,
3355 &nitems, &bytes_after, &value) == Success 3724 &nitems, &bytes_after, &value) == Success
3356 && actual_type != None 3725 && actual_type != None
3357 && actual_format == 8) 3726 && actual_format == 8)
… …
3366 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3735 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3367 3736
3368 if (eq) 3737 if (eq)
3369 { 3738 {
3370 *eq = 0; 3739 *eq = 0;
3371 XChangeProperty (display->display, TermWin.parent[0], 3740 set_utf8_property (display->atom (str), eq + 1);
3372 display->atom (str), XA_STRING, 8,
3373 PropModeReplace, (unsigned char *)eq + 1,
3374 strlen (eq + 1));
3375 } 3741 }
3376 else 3742 else
3377 XDeleteProperty (display->display, TermWin.parent[0], 3743 XDeleteProperty (disp, TermWin.parent[0],
3378 display->atom (str)); 3744 display->atom (str));
3379 } 3745 }
3380 break; 3746 break;
3381 3747
3382 case XTerm_Color: 3748 case XTerm_Color:
3383 for (buf = (char *)str; buf && *buf;) 3749 for (buf = (char *)str; buf && *buf;)
3384 { 3750 {
3385 if ((name = STRCHR (buf, ';')) == NULL) 3751 if ((name = strchr (buf, ';')) == NULL)
3386 break; 3752 break;
3387 3753
3388 *name++ = '\0'; 3754 *name++ = '\0';
3389 color = atoi (buf); 3755 color = atoi (buf);
3390 3756
3391 if (color < 0 || color >= TOTAL_COLORS) 3757 if (color < 0 || color >= TOTAL_COLORS)
3392 break; 3758 break;
3393 3759
3394 if ((buf = STRCHR (name, ';')) != NULL) 3760 if ((buf = strchr (name, ';')) != NULL)
3395 *buf++ = '\0'; 3761 *buf++ = '\0';
3396 3762
3397 if (name[0] == '?' && !name[1]) 3763 if (name[0] == '?' && !name[1])
3398 { 3764 {
3399 if (Options & Opt_insecure)
3400 {
3401 unsigned short r, g, b; 3765 unsigned short r, g, b;
3402 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3766 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3403 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3767 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3404 }
3405 } 3768 }
3406 else 3769 else
3407 set_window_color (color + minCOLOR, name); 3770 set_window_color (color + minCOLOR, name);
3408 } 3771 }
3409 break; 3772 break;
… …
3426 break; 3789 break;
3427#ifndef NO_BOLD_UNDERLINE_REVERSE 3790#ifndef NO_BOLD_UNDERLINE_REVERSE
3428 case XTerm_Color_BD: 3791 case XTerm_Color_BD:
3429 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3792 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3430 break; 3793 break;
3794 case XTerm_Color_IT:
3795 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3796 break;
3431 case XTerm_Color_UL: 3797 case XTerm_Color_UL:
3432 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3798 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3433 break; 3799 break;
3434 case XTerm_Color_RV: 3800 case XTerm_Color_RV:
3435 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3801 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3802 break;
3803#endif
3804#if TRANSPARENT && TINTING
3805 case XTerm_Color_tint:
3806 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3807 check_our_parents ();
3808 if (am_transparent)
3809 want_full_refresh = want_refresh = 1;
3436 break; 3810 break;
3437#endif 3811#endif
3438 3812
3439 case XTerm_Pixmap: 3813 case XTerm_Pixmap:
3440 if (*str != ';') 3814 if (*str != ';')
… …
3443 scale_pixmap (""); /* reset to default scaling */ 3817 scale_pixmap (""); /* reset to default scaling */
3444 set_bgPixmap (str); /* change pixmap */ 3818 set_bgPixmap (str); /* change pixmap */
3445#endif 3819#endif
3446 scr_touch (true); 3820 scr_touch (true);
3447 } 3821 }
3448 while ((str = STRCHR (str, ';')) != NULL) 3822 while ((str = strchr (str, ';')) != NULL)
3449 { 3823 {
3450 str++; 3824 str++;
3451#if XPM_BACKGROUND 3825#if XPM_BACKGROUND
3452 changed += scale_pixmap (str); 3826 changed += scale_pixmap (str);
3453#endif 3827#endif
3454
3455 } 3828 }
3829
3456 if (changed) 3830 if (changed)
3457 { 3831 {
3458#ifdef XPM_BACKGROUND 3832#ifdef XPM_BACKGROUND
3459 resize_pixmap (); 3833 resize_pixmap ();
3460#endif 3834#endif
… …
3472 case XTerm_logfile: 3846 case XTerm_logfile:
3473 // TODO, when secure mode? 3847 // TODO, when secure mode?
3474 break; 3848 break;
3475 3849
3476 case XTerm_font: 3850 case XTerm_font:
3851 op = URxvt_font;
3852 case URxvt_font:
3853#if ENABLE_STYLES
3854 case URxvt_boldFont:
3855 case URxvt_italicFont:
3856 case URxvt_boldItalicFont:
3857#endif
3477 if (query) 3858 if (query)
3859 tt_printf ("\33]%d;%-.250s%c", saveop,
3860 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3861 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3862 resp);
3863 else
3478 { 3864 {
3479 if (Options & Opt_insecure) 3865 const char *&res = rs[Rs_font + (op - URxvt_font)];
3480 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3866
3481 TermWin.fontset->fontdesc 3867 res = strdup (str);
3482 ? TermWin.fontset->fontdesc 3868 allocated.push_back ((void *)res);
3483 : "", 3869 set_fonts ();
3484 resp);
3485 } 3870 }
3486 else
3487 change_font (str);
3488 break; 3871 break;
3489 3872
3490#ifndef NO_FRILLS 3873#if ENABLE_FRILLS
3491 case XTerm_locale: 3874 case XTerm_locale:
3492 if (query) 3875 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3876 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3496 }
3497 else 3877 else
3498 { 3878 {
3499 set_locale (str); 3879 set_locale (str);
3880 pty.set_utf8_mode (enc_utf8);
3500# ifdef USE_XIM 3881# ifdef USE_XIM
3501 im_cb (); 3882 im_cb ();
3502# endif 3883# endif
3503 } 3884 }
3504 break; 3885 break;
3505
3506 case XTerm_findfont:
3507 if (Options & Opt_insecure)
3508 {
3509 int fid = TermWin.fontset->find_font (atoi (str));
3510 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3511 fid, (*TermWin.fontset)[fid]->name, resp);
3512 }
3513 break;
3514#endif 3886#endif
3515 3887
3516#ifdef MENUBAR 3888#ifdef MENUBAR
3517 case XTerm_Menu: 3889 case XTerm_Menu:
3518 if (Options & Opt_insecure) 3890 if (options & Opt_insecure)
3519 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3891 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3520 break; 3892 break;
3521#endif 3893#endif
3522#if 0 3894#if 0
3523 case XTerm_dumpscreen: /* no error notices */ 3895 case XTerm_dumpscreen: /* no error notices */
… …
3550{ 3922{
3551 int state; 3923 int state;
3552 3924
3553 if (mode == 's') 3925 if (mode == 's')
3554 { 3926 {
3555 SavedModes |= (PrivateModes & bit); 3927 SavedModes |= (priv_modes & bit);
3556 return -1; 3928 return -1;
3557 } 3929 }
3558 else 3930 else
3559 { 3931 {
3560 if (mode == 'r') 3932 if (mode == 'r')
3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3933 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562 else 3934 else
3563 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3935 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564 PrivMode (state, bit); 3936 PrivMode (state, bit);
3565 } 3937 }
3566 3938
3567 return state; 3939 return state;
3568} 3940}
… …
3586 { 3, PrivMode_132 }, 3958 { 3, PrivMode_132 },
3587 { 4, PrivMode_smoothScroll }, 3959 { 4, PrivMode_smoothScroll },
3588 { 5, PrivMode_rVideo }, 3960 { 5, PrivMode_rVideo },
3589 { 6, PrivMode_relOrigin }, 3961 { 6, PrivMode_relOrigin },
3590 { 7, PrivMode_Autowrap }, 3962 { 7, PrivMode_Autowrap },
3963 // 8, bi-directional support mode
3591 { 9, PrivMode_MouseX10 }, 3964 { 9, PrivMode_MouseX10 },
3592#ifdef menuBar_esc 3965#ifdef menuBar_esc
3593 { menuBar_esc, PrivMode_menuBar }, 3966 { menuBar_esc, PrivMode_menuBar },
3594#endif 3967#endif
3968 // 18, 19 printing-related
3969 { 25, PrivMode_VisibleCursor },
3595#ifdef scrollBar_esc 3970#ifdef scrollBar_esc
3596 { scrollBar_esc, PrivMode_scrollBar }, 3971 { scrollBar_esc, PrivMode_scrollBar },
3597#endif 3972#endif
3598 // 18, 19 printing-related
3599 { 25, PrivMode_VisibleCursor },
3600 // 30 show scrollbar rxvt. extension
3601 { 35, PrivMode_ShiftKeys }, // rxvt extension 3973 { 35, PrivMode_ShiftKeys }, // rxvt extension
3602 { 40, PrivMode_132OK }, 3974 { 40, PrivMode_132OK },
3603 // 41 xterm more fixes NYI 3975 // 41 xterm more fixes NYI
3604 // 45 margin bell NYI 3976 // 45 margin bell NYI
3605 // 46 start logging 3977 // 46 start logging
… …
3646 4018
3647 /* extra handling for values with state unkept */ 4019 /* extra handling for values with state unkept */
3648 switch (arg[i]) 4020 switch (arg[i])
3649 { 4021 {
3650 case 1048: /* alternative cursor save */ 4022 case 1048: /* alternative cursor save */
4023 case 1049:
3651 if (Options & Opt_secondaryScreen) 4024 if (options & Opt_secondaryScreen)
3652 if (mode == 0) 4025 if (mode == 0)
3653 scr_cursor (RESTORE); 4026 scr_cursor (RESTORE);
3654 else if (mode == 1) 4027 else if (mode == 1)
3655 scr_cursor (SAVE); 4028 scr_cursor (SAVE);
3656 break; 4029 break;
… …
3667 * within VT52 mode 4040 * within VT52 mode
3668 */ 4041 */
3669 PrivMode (1, PrivMode_vt52); 4042 PrivMode (1, PrivMode_vt52);
3670 break; 4043 break;
3671 case 3: /* 80/132 */ 4044 case 3: /* 80/132 */
3672 if (PrivateModes & PrivMode_132OK) 4045 if (priv_modes & PrivMode_132OK)
3673 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4046 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3674 break; 4047 break;
3675 case 4: /* smooth scrolling */ 4048 case 4: /* smooth scrolling */
3676 if (state) 4049 if (state)
3677 Options &= ~Opt_jumpScroll; 4050 options &= ~Opt_jumpScroll;
3678 else 4051 else
3679 Options |= Opt_jumpScroll; 4052 options |= Opt_jumpScroll;
3680 break; 4053 break;
3681 case 5: /* reverse video */ 4054 case 5: /* reverse video */
3682 scr_rvideo_mode (state); 4055 scr_rvideo_mode (state);
3683 break; 4056 break;
3684 case 6: /* relative/absolute origins */ 4057 case 6: /* relative/absolute origins */
… …
3688 scr_autowrap (state); 4061 scr_autowrap (state);
3689 break; 4062 break;
3690 /* case 8: - auto repeat, can't do on a per window basis */ 4063 /* case 8: - auto repeat, can't do on a per window basis */
3691 case 9: /* X10 mouse reporting */ 4064 case 9: /* X10 mouse reporting */
3692 if (state) /* orthogonal */ 4065 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX11; 4066 priv_modes &= ~PrivMode_MouseX11;
3694 break; 4067 break;
3695#ifdef menuBar_esc 4068#ifdef menuBar_esc
3696 case menuBar_esc: 4069 case menuBar_esc:
3697#ifdef MENUBAR 4070#ifdef MENUBAR
3698 map_menuBar (state); 4071 map_menuBar (state);
… …
3718 break; 4091 break;
3719 /* case 66: - application key pad */ 4092 /* case 66: - application key pad */
3720 /* case 67: - backspace key */ 4093 /* case 67: - backspace key */
3721 case 1000: /* X11 mouse reporting */ 4094 case 1000: /* X11 mouse reporting */
3722 if (state) /* orthogonal */ 4095 if (state) /* orthogonal */
3723 PrivateModes &= ~PrivMode_MouseX10; 4096 priv_modes &= ~PrivMode_MouseX10;
3724 break; 4097 break;
3725#if 0 4098#if 0
3726 case 1001: 4099 case 1001:
3727 break; /* X11 mouse highlighting */ 4100 break; /* X11 mouse highlighting */
3728#endif 4101#endif
3729 case 1010: /* scroll to bottom on TTY output inhibit */ 4102 case 1010: /* scroll to bottom on TTY output inhibit */
3730 if (state) 4103 if (state)
3731 Options &= ~Opt_scrollTtyOutput; 4104 options &= ~Opt_scrollTtyOutput;
3732 else 4105 else
3733 Options |= Opt_scrollTtyOutput; 4106 options |= Opt_scrollTtyOutput;
3734 break; 4107 break;
3735 case 1011: /* scroll to bottom on key press */ 4108 case 1011: /* scroll to bottom on key press */
3736 if (state) 4109 if (state)
3737 Options |= Opt_scrollTtyKeypress; 4110 options |= Opt_scrollTtyKeypress;
3738 else 4111 else
3739 Options &= ~Opt_scrollTtyKeypress; 4112 options &= ~Opt_scrollTtyKeypress;
3740 break; 4113 break;
3741 case 1047: /* secondary screen w/ clearing last */ 4114 case 1047: /* secondary screen w/ clearing last */
3742 if (Options & Opt_secondaryScreen) 4115 if (options & Opt_secondaryScreen)
3743 if (current_screen != PRIMARY) 4116 if (current_screen != PRIMARY)
3744 scr_erase_screen (2); 4117 scr_erase_screen (2);
3745 scr_change_screen (state); 4118 scr_change_screen (state);
3746 break; 4119 break;
3747 case 1049: /* secondary screen w/ clearing first */ 4120 case 1049: /* secondary screen w/ clearing first */
3748 scr_change_screen (state); 4121 scr_change_screen (state);
3749 if (Options & Opt_secondaryScreen) 4122 if (options & Opt_secondaryScreen)
3750 if (current_screen != PRIMARY) 4123 if (current_screen != PRIMARY)
3751 scr_erase_screen (2); 4124 scr_erase_screen (2);
3752 break; 4125 break;
3753 default: 4126 default:
3754 break; 4127 break;
… …
3780 rendset = 0, rendstyle = ~RS_None; 4153 rendset = 0, rendstyle = ~RS_None;
3781 break; 4154 break;
3782 case 1: 4155 case 1:
3783 rendset = 1, rendstyle = RS_Bold; 4156 rendset = 1, rendstyle = RS_Bold;
3784 break; 4157 break;
3785 //case 2: // faint or second colour 4158 //case 2: // low intensity
4159 case 3:
4160 rendset = 1, rendstyle = RS_Italic;
4161 break;
3786 case 4: 4162 case 4:
3787 rendset = 1, rendstyle = RS_Uline; 4163 rendset = 1, rendstyle = RS_Uline;
3788 break; 4164 break;
3789 case 5: // slowly blinking 4165 case 5: // slowly blinking
3790 case 6: // rapidly blinking 4166 case 6: // rapidly blinking
… …
3802 //case 11: // scoansi acs on, first alt font 4178 //case 11: // scoansi acs on, first alt font
3803 //case 12: // scoansi acs on, |0x80, second alt font 4179 //case 12: // scoansi acs on, |0x80, second alt font
3804 //... 4180 //...
3805 //case 19: // ninth alt font 4181 //case 19: // ninth alt font
3806 //case 20: // gothic 4182 //case 20: // gothic
3807 case 21: // disable bold, faint 4183 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3808 rendset = 0, rendstyle = RS_Bold; 4184 rendset = 0, rendstyle = RS_Bold;
3809 break; 4185 break;
3810 case 22: 4186 case 22: // normal intensity
3811 rendset = 0, rendstyle = RS_Bold; 4187 rendset = 0, rendstyle = RS_Bold;
3812 break; 4188 break;
3813 //case 23: disable italic 4189 case 23: // disable italic
4190 rendset = 0, rendstyle = RS_Italic;
4191 break;
3814 case 24: 4192 case 24:
3815 rendset = 0, rendstyle = RS_Uline; 4193 rendset = 0, rendstyle = RS_Uline;
3816 break; 4194 break;
3817 case 25: 4195 case 25:
4196 rendset = 0, rendstyle = RS_Blink;
4197 break;
4198 case 26: // variable spacing (iso 8613)
3818 rendset = 0, rendstyle = RS_Blink; 4199 rendset = 0, rendstyle = RS_Blink;
3819 break; 4200 break;
3820 case 27: 4201 case 27:
3821 rendset = 0, rendstyle = RS_RVid; 4202 rendset = 0, rendstyle = RS_RVid;
3822 break; 4203 break;
… …
3840 case 35: 4221 case 35:
3841 case 36: 4222 case 36:
3842 case 37: 4223 case 37:
3843 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4224 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3844 break; 4225 break;
3845#ifdef TTY_256COLOR 4226 case 38: // set fg color, ISO 8613-6
3846 case 38:
3847 if (nargs > i + 2 && arg[i + 1] == 5) 4227 if (nargs > i + 2 && arg[i + 1] == 5)
3848 { 4228 {
3849 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4229 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3850 i += 2; 4230 i += 2;
3851 } 4231 }
3852 break; 4232 break;
3853#endif
3854 case 39: /* default fg */ 4233 case 39: /* default fg */
3855 scr_color (Color_fg, Color_fg); 4234 scr_color (Color_fg, Color_fg);
3856 break; 4235 break;
3857 4236
3858 case 40: 4237 case 40:
… …
3863 case 45: 4242 case 45:
3864 case 46: 4243 case 46:
3865 case 47: 4244 case 47:
3866 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4245 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3867 break; 4246 break;
3868#ifdef TTY_256COLOR 4247 case 48: // set bg color, ISO 8613-6
3869 case 48:
3870 if (nargs > i + 2 && arg[i + 1] == 5) 4248 if (nargs > i + 2 && arg[i + 1] == 5)
3871 { 4249 {
3872 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4250 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3873 i += 2; 4251 i += 2;
3874 } 4252 }
3875 break; 4253 break;
3876#endif
3877 case 49: /* default bg */ 4254 case 49: /* default bg */
3878 scr_color (Color_bg, Color_bg); 4255 scr_color (Color_bg, Color_bg);
3879 break; 4256 break;
4257
4258 //case 50: // not variable spacing
3880 4259
3881#ifndef NO_BRIGHTCOLOR 4260#ifndef NO_BRIGHTCOLOR
3882 case 90: 4261 case 90:
3883 case 91: /* set bright fg color */ 4262 case 91: /* set bright fg color */
3884 case 92: 4263 case 92:
3885 case 93: 4264 case 93:
3886 case 94: 4265 case 94:
3887 case 95: 4266 case 95:
3888 case 96: 4267 case 96:
3889 case 97: 4268 case 97:
3890 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4269 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3891 Color_fg);
3892 break; 4270 break;
3893 case 100: 4271 case 100:
3894 case 101: /* set bright bg color */ 4272 case 101: /* set bright bg color */
3895 case 102: 4273 case 102:
3896 case 103: 4274 case 103:
3897 case 104: 4275 case 104:
3898 case 105: 4276 case 105:
3899 case 106: 4277 case 106:
3900 case 107: 4278 case 107:
3901 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4279 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3902 Color_bg);
3903 break; 4280 break;
3904#endif 4281#endif
3905 4282
3906 } 4283 }
3907 } 4284 }
… …
3914{ 4291{
3915 unicode_t ch, cmd = cmd_getc (); 4292 unicode_t ch, cmd = cmd_getc ();
3916 4293
3917 if (cmd == 'Q') 4294 if (cmd == 'Q')
3918 { /* query graphics */ 4295 { /* query graphics */
3919 tt_printf ("\033G0\n"); /* no graphics */ 4296 tt_printf ("\033G0\012"); /* no graphics */
3920 return; 4297 return;
3921 } 4298 }
3922 /* swallow other graphics sequences until terminating ':' */ 4299 /* swallow other graphics sequences until terminating ':' */
3923 do 4300 do
3924 ch = cmd_getc (); 4301 ch = cmd_getc ();
… …
3939 unsigned char buf[256]; 4316 unsigned char buf[256];
3940 4317
3941 va_start (arg_ptr, fmt); 4318 va_start (arg_ptr, fmt);
3942 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4319 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3943 va_end (arg_ptr); 4320 va_end (arg_ptr);
3944 tt_write (buf, STRLEN (buf)); 4321 tt_write (buf, strlen (buf));
3945} 4322}
3946 4323
3947/* ---------------------------------------------------------------------- */ 4324/* ---------------------------------------------------------------------- */
3948/* Write data to the pty as typed by the user, pasted with the mouse, 4325/* Write data to the pty as typed by the user, pasted with the mouse,
3949 * or generated by us in response to a query ESC sequence. 4326 * or generated by us in response to a query ESC sequence.
3950 */ 4327 */
4328const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4329
3951void 4330void
3952rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4331rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3953{ 4332{
3954 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4333 if (v_buflen == 0)
4334 {
4335 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3955 4336
3956 if (len) 4337 if ((unsigned int)written == len)
4338 return;
4339
4340 data += written;
4341 len -= written;
3957 { 4342 }
4343
4344 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4345
4346 memcpy (v_buffer + v_buflen, data, len);
4347 v_buflen += len;
4348
4349 pty_ev.set (EVENT_READ | EVENT_WRITE);
4350}
4351
4352void rxvt_term::pty_write ()
4353{
4354 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4355
4356 if (written > 0)
4357 {
4358 v_buflen -= written;
4359
3958 if (v_buflen == 0) 4360 if (v_buflen == 0)
3959 { 4361 {
3960 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3961
3962 if ((unsigned int)written == len)
3963 return;
3964
3965 data += written;
3966 len -= written;
3967 }
3968
3969
3970 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3971
3972 memcpy (v_buffer + v_buflen, data, len);
3973 v_buflen += len;
3974 }
3975
3976 for (;;)
3977 {
3978 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3979
3980 if (written > 0)
3981 {
3982 v_buflen -= written;
3983
3984 if (v_buflen == 0)
3985 {
3986 free (v_buffer); 4362 free (v_buffer);
3987 v_buffer = 0; 4363 v_buffer = 0;
3988 v_buflen = 0; 4364 v_buflen = 0;
3989 4365
3990 pty_ev.set (EVENT_READ); 4366 pty_ev.set (EVENT_READ);
3991 return;
3992 }
3993
3994 memmove (v_buffer, v_buffer + written, v_buflen);
3995 }
3996 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3997 // original code just ignores this...
3998 destroy ();
3999 else
4000 {
4001 pty_ev.set (EVENT_READ | EVENT_WRITE);
4002 return; 4367 return;
4003 } 4368 }
4369
4370 memmove (v_buffer, v_buffer + written, v_buflen);
4004 } 4371 }
4372 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4373 // original code just ignores this...
4374 destroy ();
4005} 4375}
4006 4376
4007/*----------------------- end-of-file (C source) -----------------------*/ 4377/*----------------------- end-of-file (C source) -----------------------*/
4008 4378

Diff Legend

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