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.202 by root, Sat Mar 12 23:35:14 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);
… …
108 316
109 // the XOpenIM manpage lies about hardcoding the locale 317 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 318 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 319 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 320 SET_LOCALE (rs[Rs_imLocale]);
321
113 // assume wchar_t == unicode or better 322 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 323 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 324 KBUFSZ, &keysym, &status_return);
325
116 if (rs[Rs_imLocale]) 326 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 327 SET_LOCALE (locale);
118 328
119 if (status_return == XLookupChars 329 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 330 || status_return == XLookupBoth)
… …
147 valid_keysym = keysym != NoSymbol; 357 valid_keysym = keysym != NoSymbol;
148 } 358 }
149 359
150 if (valid_keysym) 360 if (valid_keysym)
151 { 361 {
362#ifdef KEYSYM_RESOURCE
363 if (keyboard->dispatch (this, keysym, ev.state))
364 return;
365#endif
366
152 if (TermWin.saveLines) 367 if (TermWin.saveLines)
153 { 368 {
154#ifdef UNSHIFTED_SCROLLKEYS 369#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 370 if (!ctrl && !meta)
156 {
157#else 371#else
158 if (IS_SCROLL_MOD) 372 if (IS_SCROLL_MOD)
373#endif
159 { 374 {
160#endif
161 int lnsppg; 375 int lnsppg;
162 376
163#ifdef PAGING_CONTEXT_LINES 377#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 378 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 379#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 428 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 429 {
216 keysym += (XK_F11 - XK_F1); 430 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 431 shft = 0; /* turn off Shift */
218 } 432 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 433 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 434 {
221 switch (keysym) 435 switch (keysym)
222 { 436 {
223 /* normal XTerm key bindings */ 437 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 438 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 439 selection_request (ev.time, 0, 0);
226 return; 440 return;
441#if TODO
227 /* rxvt extras */ 442 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 443 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 444 change_font (FONT_UP);
230 return; 445 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 446 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 447 change_font (FONT_DN);
233 return; 448 return;
449#endif
234 } 450 }
235 } 451 }
236 } 452 }
237#ifdef PRINTPIPE 453
238 if (keysym == XK_Print) 454#if ENABLE_FRILLS || ISO_14755
239 { 455 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 456 if (shft && ctrl)
241 return;
242 } 457 {
243#endif 458 int hv;
244 459
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 460 if (iso14755buf & ISO_14755_51
246 { 461 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 462 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 463 {
250 unsigned int l; 464 commit_iso14755 ();
251 const unsigned char *kbuf0; 465 iso14755buf = ISO_14755_51;
252 466# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 467 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 468# endif
261 ) 469 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 470 }
266 471 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 472 {
473 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
474 | hv | ISO_14755_51;
475# if ISO_14755
476 iso14755_51 (iso14755buf & ISO_14755_MASK);
477# endif
268 return; 478 return;
269 } 479 }
270 else 480 else
481 {
482# if ENABLE_OVERLAY
483 scr_overlay_off ();
271#endif 484# endif
485 iso14755buf = 0;
486 }
487 }
488 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
489 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
490 if (!(iso14755buf & ISO_14755_STARTED))
491 {
492 iso14755buf |= ISO_14755_STARTED;
493# if ENABLE_OVERLAY
494 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
495 scr_overlay_set (0, 0, "ISO 14755 mode");
496# endif
497 }
498#endif
499
500#ifdef PRINTPIPE
501 if (keysym == XK_Print)
502 {
503 scr_printscreen (ctrl | shft);
504 return;
505 }
506#endif
507
508 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
509 {
272 { 510 {
273 newlen = 1; 511 newlen = 1;
274 switch (keysym) 512 switch (keysym)
275 { 513 {
276#ifndef NO_BACKSPACE_KEY 514#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 515 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 516 if (priv_modes & PrivMode_HaveBackSpace)
279 { 517 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 518 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 519 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 520 kbuf[1] = '\0';
283 } 521 }
284 else 522 else
285 STRCPY (kbuf, key_backspace); 523 strcpy (kbuf, key_backspace);
286 break; 524 break;
287#endif 525#endif
288#ifndef NO_DELETE_KEY 526#ifndef NO_DELETE_KEY
527# ifdef XK_KP_Prior
528 case XK_KP_Delete:
529 /* allow shift to override */
530 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
531 {
532 strcpy (kbuf, "\033On");
533 break;
534 }
535 /* FALLTHROUGH */
536# endif
289 case XK_Delete: 537 case XK_Delete:
290 STRCPY (kbuf, key_delete); 538 strcpy (kbuf, key_delete);
291 break; 539 break;
292#endif 540#endif
293 case XK_Tab: 541 case XK_Tab:
294 if (shft) 542 if (shft)
295 STRCPY (kbuf, "\033[Z"); 543 strcpy (kbuf, "\033[Z");
296 else 544 else
297 { 545 {
298#ifdef CTRL_TAB_MAKES_META 546#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 547 if (ctrl)
300 meta = 1; 548 meta = 1;
… …
306 newlen = 0; 554 newlen = 0;
307 } 555 }
308 break; 556 break;
309 557
310#ifdef XK_KP_Left 558#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 559 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 560 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 561 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 562 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 563 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 564 {
317 STRCPY (kbuf, "\033OZ"); 565 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 566 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 567 break;
320 } 568 }
321 else 569 else
322 /* translate to std. cursor key */ 570 /* translate to std. cursor key */
… …
325#endif 573#endif
326 case XK_Up: /* "\033[A" */ 574 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 575 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 576 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 577 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 578 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 579 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 580 /* do Shift first */
333 if (shft) 581 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 582 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 583 else if (ctrl)
336 { 584 {
337 kbuf[1] = 'O'; 585 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 586 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 587 }
340 else if (PrivateModes & PrivMode_aplCUR) 588 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 589 kbuf[1] = 'O';
342 break; 590 break;
343 591
344#ifndef UNSHIFTED_SCROLLKEYS 592#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 593# ifdef XK_KP_Prior
346 case XK_KP_Prior: 594 case XK_KP_Prior:
347 /* allow shift to override */ 595 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 596 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 597 {
350 STRCPY (kbuf, "\033Oy"); 598 strcpy (kbuf, "\033Oy");
351 break; 599 break;
352 } 600 }
353 /* FALLTHROUGH */ 601 /* FALLTHROUGH */
354# endif 602# endif
355 case XK_Prior: 603 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 604 strcpy (kbuf, "\033[5~");
357 break; 605 break;
358# ifdef XK_KP_Next 606# ifdef XK_KP_Next
359 case XK_KP_Next: 607 case XK_KP_Next:
360 /* allow shift to override */ 608 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 609 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 610 {
363 STRCPY (kbuf, "\033Os"); 611 strcpy (kbuf, "\033Os");
364 break; 612 break;
365 } 613 }
366 /* FALLTHROUGH */ 614 /* FALLTHROUGH */
367# endif 615# endif
368 case XK_Next: 616 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 617 strcpy (kbuf, "\033[6~");
370 break; 618 break;
371#endif 619#endif
372 case XK_KP_Enter: 620 case XK_KP_Enter:
373 /* allow shift to override */ 621 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 622 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 623 {
376 STRCPY (kbuf, "\033OM"); 624 strcpy (kbuf, "\033OM");
625 break;
626 }
627
628 /* FALLTHROUGH */
629
630 case XK_Return:
631 if (priv_modes & PrivMode_LFNL)
632 {
633 kbuf[0] = '\015';
634 kbuf[1] = '\012';
635 kbuf[2] = '\0';
377 } 636 }
378 else 637 else
379 { 638 {
380 kbuf[0] = '\r'; 639 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 640 kbuf[1] = '\0';
382 } 641 }
383 break; 642 break;
384 643
385#ifdef XK_KP_Begin 644#ifdef XK_KP_Begin
386 case XK_KP_Begin: 645 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 646 strcpy (kbuf, "\033Ou");
388 break; 647 break;
389 648
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 649#endif
398 case XK_KP_F1: /* "\033OP" */ 650 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 651 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 652 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 653 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 654 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 655 kbuf[2] += (keysym - XK_KP_F1);
404 break; 656 break;
405 657
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 658 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 659 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 670 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 671 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 672 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 673 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 674 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 675 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 676 {
425 STRCPY (kbuf, "\033Oj"); 677 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 678 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 679 }
428 else 680 else
429 { 681 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 682 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 683 kbuf[1] = '\0';
432 } 684 }
433 break; 685 break;
434 686
435 case XK_Find: 687 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 688 strcpy (kbuf, "\033[1~");
437 break; 689 break;
690
691#ifdef XK_KP_End
692 case XK_KP_Insert:
693 /* allow shift to override */
694 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
695 {
696 strcpy (kbuf, "\033Op");
697 break;
698 }
699 /* FALLTHROUGH */
700#endif
438 case XK_Insert: 701 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 702 strcpy (kbuf, "\033[2~");
440 break; 703 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 704#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 705 case DXK_Remove:
443 /* FALLTHROUGH */ 706 /* FALLTHROUGH */
444#endif 707#endif
445 case XK_Execute: 708 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 709 strcpy (kbuf, "\033[3~");
447 break; 710 break;
448 case XK_Select: 711 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 712 strcpy (kbuf, "\033[4~");
450 break; 713 break;
451#ifdef XK_KP_End 714#ifdef XK_KP_End
452 case XK_KP_End: 715 case XK_KP_End:
453 /* allow shift to override */ 716 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 718 {
456 STRCPY (kbuf, "\033Oq"); 719 strcpy (kbuf, "\033Oq");
457 break; 720 break;
458 } 721 }
459 /* FALLTHROUGH */ 722 /* FALLTHROUGH */
460#endif 723#endif
461 case XK_End: 724 case XK_End:
462 STRCPY (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
463 break; 726 break;
464#ifdef XK_KP_Home 727#ifdef XK_KP_Home
465 case XK_KP_Home: 728 case XK_KP_Home:
466 /* allow shift to override */ 729 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 730 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 731 {
469 STRCPY (kbuf, "\033Ow"); 732 strcpy (kbuf, "\033Ow");
470 break; 733 break;
471 } 734 }
472 /* FALLTHROUGH */ 735 /* FALLTHROUGH */
473#endif 736#endif
474 case XK_Home: 737 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 738 strcpy (kbuf, KS_HOME);
476 break; 739 break;
477 740
478#define FKEY(n, fkey) \ 741#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 742 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 743
… …
532#undef FKEY 795#undef FKEY
533 default: 796 default:
534 newlen = 0; 797 newlen = 0;
535 break; 798 break;
536 } 799 }
800
537 if (newlen) 801 if (newlen)
538 len = STRLEN (kbuf); 802 len = strlen (kbuf);
539 } 803 }
540 804
541 /* 805 /*
542 * Pass meta for all function keys, if 'meta' option set 806 * Pass meta for all function keys, if 'meta' option set
543 */ 807 */
… …
550 else if (ctrl && keysym == XK_minus) 814 else if (ctrl && keysym == XK_minus)
551 { 815 {
552 len = 1; 816 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 817 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 818 }
819 else if (keysym == XK_ISO_Left_Tab)
820 {
821 strcpy (kbuf, "\033[Z");
822 len = 3;
823 }
555 else 824 else
556 { 825 {
557#ifdef META8_OPTION 826#ifdef META8_OPTION
558 /* set 8-bit on */ 827 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 828 if (meta && (meta_char == 0x80))
… …
571 } 840 }
572 841
573 if (len <= 0) 842 if (len <= 0)
574 return; /* not mapped */ 843 return; /* not mapped */
575 844
576 if (Options & Opt_scrollTtyKeypress) 845 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 846 if (TermWin.view_start)
578 { 847 {
579 TermWin.view_start = 0; 848 TermWin.view_start = 0;
580 want_refresh = 1; 849 want_refresh = 1;
581 } 850 }
… …
617#endif /* DEBUG_CMD */ 886#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 887 tt_write (kbuf, (unsigned int)len);
619} 888}
620/*}}} */ 889/*}}} */
621 890
622#if (MENUBAR_MAX) 891#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 892/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */ 893/* attempt to `write' count to the input buffer */
625unsigned int 894unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 895rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
627{ 896{
… …
630 n = cmdbuf_ptr - cmdbuf_base; 899 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 900 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 901
633 if (n > 0 && s < count) 902 if (n > 0 && s < count)
634 { 903 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 904 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 905 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 906 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 907 cmdbuf_endp -= n;
639 s += n; 908 s += n;
640 } 909 }
… …
650 919
651 cmd_parse (); 920 cmd_parse ();
652 921
653 return 0; 922 return 0;
654} 923}
655#endif /* MENUBAR_MAX */ 924#endif
656 925
657void 926void
658rxvt_term::flush () 927rxvt_term::flush ()
659{ 928{
929 flush_ev.stop ();
930
660#ifdef TRANSPARENT 931#ifdef TRANSPARENT
661 if (want_full_refresh) 932 if (want_full_refresh)
662 { 933 {
663 want_full_refresh = 0; 934 want_full_refresh = 0;
664 scr_clear (); 935 scr_clear ();
665 scr_touch (false); 936 scr_touch (false);
666 want_refresh = 1;
667 } 937 }
668#endif 938#endif
669 939
670 if (want_refresh) 940 if (want_refresh)
671 { 941 {
… …
683rxvt_term::check_cb (check_watcher &w) 953rxvt_term::check_cb (check_watcher &w)
684{ 954{
685 SET_R (this); 955 SET_R (this);
686 SET_LOCALE (locale); 956 SET_LOCALE (locale);
687 957
958 display->flush ();
959
960 if (want_refresh && !flush_ev.active)
961 flush_ev.start (NOW + 0.01);
962}
963
964void
965rxvt_term::flush_cb (time_watcher &w)
966{
967 SET_R (this);
968 SET_LOCALE (locale);
969
970 refresh_limit = 1;
971 refresh_count = 0;
688 flush (); 972 flush ();
689} 973}
690 974
691#ifdef CURSOR_BLINK 975#ifdef CURSOR_BLINK
692void 976void
… …
746{ 1030{
747 if (mouse_slip_wheel_speed == 0 1031 if (mouse_slip_wheel_speed == 0
748 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1032 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
749 : scr_page (UP, mouse_slip_wheel_speed)) 1033 : scr_page (UP, mouse_slip_wheel_speed))
750 { 1034 {
1035 if (TermWin.view_start == TermWin.nscrolled ||
1036 TermWin.view_start == 0)
1037 mouse_slip_wheel_speed = 0;
1038
751 refresh_type |= SMOOTH_REFRESH; 1039 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1040 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1041 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 } 1042 }
755} 1043}
… …
768 1056
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1057 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1058 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1059 cmdbuf_endp = cmdbuf_ptr + n;
772 1060
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1061 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
774 1062
775 if (n > 0) 1063 if (n > 0)
776 { 1064 {
777 cmdbuf_endp += n; 1065 cmdbuf_endp += n;
778 return true; 1066 return true;
… …
787rxvt_term::pty_cb (io_watcher &w, short revents) 1075rxvt_term::pty_cb (io_watcher &w, short revents)
788{ 1076{
789 SET_R (this); 1077 SET_R (this);
790 SET_LOCALE (locale); 1078 SET_LOCALE (locale);
791 1079
792 if (revents & EVENT_WRITE)
793 tt_write (0, 0);
794 else if (revents & EVENT_READ) 1080 if (revents & EVENT_READ)
795 // loop, but don't allow a single term to monopolize us 1081 // loop, but don't allow a single term to monopolize us
796 while (pty_fill ()) 1082 while (pty_fill ())
797 if (cmd_parse ()) 1083 if (cmd_parse ())
798 break; 1084 break;
1085
1086 if (revents & EVENT_WRITE)
1087 pty_write ();
799} 1088}
800 1089
801void 1090void
802rxvt_term::pointer_unblank () 1091rxvt_term::pointer_unblank ()
803{ 1092{
… …
805 recolour_cursor (); 1094 recolour_cursor ();
806 1095
807#ifdef POINTER_BLANK 1096#ifdef POINTER_BLANK
808 hidden_pointer = 0; 1097 hidden_pointer = 0;
809 1098
810 if (Options & Opt_pointerBlank) 1099 if (options & Opt_pointerBlank)
811 pointer_ev.start (NOW + pointerBlankDelay); 1100 pointer_ev.start (NOW + pointerBlankDelay);
812#endif 1101#endif
813} 1102}
814 1103
815#ifdef POINTER_BLANK 1104#ifdef POINTER_BLANK
816void 1105void
817rxvt_term::pointer_blank () 1106rxvt_term::pointer_blank ()
818{ 1107{
819 if (! (Options & Opt_pointerBlank)) 1108 if (! (options & Opt_pointerBlank))
820 return; 1109 return;
821 1110
822 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1111 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
823 XFlush (display->display); 1112 XFlush (display->display);
824 1113
825 hidden_pointer = 1; 1114 hidden_pointer = 1;
826} 1115}
827 1116
… …
844 x = ev.x; 1133 x = ev.x;
845 y = ev.y; 1134 y = ev.y;
846 pixel_position (&x, &y); 1135 pixel_position (&x, &y);
847 1136
848 if (MEvent.button == AnyButton) 1137 if (MEvent.button == AnyButton)
849 {
850 button_number = 3; 1138 button_number = 3;
851 }
852 else 1139 else
853 { 1140 {
854 button_number = MEvent.button - Button1; 1141 button_number = MEvent.button - Button1;
855 /* add 0x3D for wheel events, like xterm does */ 1142 /* add 0x3D for wheel events, like xterm does */
856 if (button_number >= 3) 1143 if (button_number >= 3)
857 button_number += (64 - 3); 1144 button_number += (64 - 3);
858 } 1145 }
859 1146
860 if (PrivateModes & PrivMode_MouseX10) 1147 if (priv_modes & PrivMode_MouseX10)
861 { 1148 {
862 /* 1149 /*
863 * do not report ButtonRelease 1150 * do not report ButtonRelease
864 * no state info allowed 1151 * no state info allowed
865 */ 1152 */
… …
880 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1167 + ((MEvent.state & ModMetaMask) ? 8 : 0)
881 + ((MEvent.state & ControlMask) ? 16 : 0); 1168 + ((MEvent.state & ControlMask) ? 16 : 0);
882#ifdef MOUSE_REPORT_DOUBLECLICK 1169#ifdef MOUSE_REPORT_DOUBLECLICK
883 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1170 key_state += ((MEvent.clicks > 1) ? 32 : 0);
884#endif 1171#endif
885
886 } 1172 }
887 1173
888#ifdef DEBUG_MOUSEREPORT 1174#if DEBUG_MOUSEREPORT
889 fprintf (stderr, "Mouse ["); 1175 fprintf (stderr, "Mouse [");
890 if (key_state & 16) 1176 if (key_state & 16)
891 fputc ('C', stderr); 1177 fputc ('C', stderr);
892 if (key_state & 4) 1178 if (key_state & 4)
893 fputc ('S', stderr); 1179 fputc ('S', stderr);
… …
897 fputc ('2', stderr); 1183 fputc ('2', stderr);
898 fprintf (stderr, "]: <%d>, %d/%d\n", 1184 fprintf (stderr, "]: <%d>, %d/%d\n",
899 button_number, 1185 button_number,
900 x + 1, 1186 x + 1,
901 y + 1); 1187 y + 1);
902#else 1188#endif
1189
903 tt_printf ("\033[M%c%c%c", 1190 tt_printf ("\033[M%c%c%c",
904 (32 + button_number + key_state), 1191 (32 + button_number + key_state),
905 (32 + x + 1), 1192 (32 + x + 1),
906 (32 + y + 1)); 1193 (32 + y + 1));
907#endif
908} 1194}
909 1195
910#ifdef USING_W11LIB 1196#ifdef USING_W11LIB
911void 1197void
912rxvt_W11_process_x_event (XEvent *ev) 1198rxvt_W11_process_x_event (XEvent *ev)
… …
919 1205
920/*{{{ process an X event */ 1206/*{{{ process an X event */
921void 1207void
922rxvt_term::x_cb (XEvent &ev) 1208rxvt_term::x_cb (XEvent &ev)
923{ 1209{
1210 dDisp;
1211
924 SET_R (this); 1212 SET_R (this);
925 SET_LOCALE (locale); 1213 SET_LOCALE (locale);
926 1214
927#if defined(CURSOR_BLINK) 1215#if defined(CURSOR_BLINK)
928 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1216 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
929 { 1217 {
930 if (hidden_cursor) 1218 if (hidden_cursor)
931 { 1219 {
932 hidden_cursor = 0; 1220 hidden_cursor = 0;
933 want_refresh = 1; 1221 want_refresh = 1;
… …
936 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1224 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
937 } 1225 }
938#endif 1226#endif
939 1227
940#if defined(POINTER_BLANK) 1228#if defined(POINTER_BLANK)
941 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1229 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
942 { 1230 {
943 if (ev.type == MotionNotify 1231 if (ev.type == MotionNotify
944 || ev.type == ButtonPress 1232 || ev.type == ButtonPress
945 || ev.type == ButtonRelease) 1233 || ev.type == ButtonRelease)
946 if (hidden_pointer) 1234 if (hidden_pointer)
… …
949 if (ev.type == KeyPress && hidden_pointer == 0) 1237 if (ev.type == KeyPress && hidden_pointer == 0)
950 pointer_blank (); 1238 pointer_blank ();
951 } 1239 }
952#endif 1240#endif
953 1241
954#ifdef USE_XIM
955 if (XFilterEvent (&ev, None))
956 return;
957#endif
958
959 Window unused_root, unused_child; 1242 Window unused_root, unused_child;
960 int unused_root_x, unused_root_y; 1243 int unused_root_x, unused_root_y;
961 unsigned int unused_mask; 1244 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 1245
1012 switch (ev.type) 1246 switch (ev.type)
1013 { 1247 {
1014 case KeyPress: 1248 case KeyPress:
1249#if ISO_14755
1250 if (!(iso14755buf & ISO_14755_52))
1251#endif
1015 lookup_key (ev.xkey); 1252 lookup_key (ev.xkey);
1253
1254 break;
1255
1256 case KeyRelease:
1257 {
1258#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1259 KeySym ks;
1260
1261 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1262#endif
1263
1264#if ENABLE_FRILLS || ISO_14755
1265 // ISO 14755 support
1266 if (iso14755buf)
1267 if (iso14755buf & ISO_14755_52)
1268 {
1269# if ENABLE_OVERLAY
1270 scr_overlay_off ();
1271# endif
1272# if ISO_14755
1273 // iso14755 part 5.2 handling: release time
1274 // first: controls
1275 if ((ev.xkey.state & ControlMask)
1276 && ((ks >= 0x40 && ks <= 0x5f)
1277 || (ks >= 0x61 && ks <= 0x7f)))
1278 {
1279 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1280 commit_iso14755 ();
1281 return; // case-break;
1282 }
1283
1284 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1285 if (i[0] == ks)
1286 {
1287 iso14755buf = ISO_14755_51 | i[1];
1288 commit_iso14755 ();
1289 return; // case-break;
1290 }
1291
1292 scr_bell ();
1293# endif
1294 iso14755buf = 0;
1016 break; 1295 break;
1296 }
1297 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1298 {
1299# if ENABLE_OVERLAY
1300 scr_overlay_off ();
1301# endif
1302 if (iso14755buf & ISO_14755_51)
1303 commit_iso14755 ();
1304#if ISO_14755
1305 else if (iso14755buf & ISO_14755_STARTED)
1306 {
1307 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1308
1309 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1310 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1311 }
1312# endif
1313 else
1314 iso14755buf = 0;
1315 }
1316#endif
1017 1317
1018#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1318#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1019 case KeyRelease:
1020 {
1021 if (!(ev.xkey.state & ControlMask)) 1319 if (!(ev.xkey.state & ControlMask))
1022 slip_wheel_ev.stop (); 1320 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) 1321 else if (ks == XK_Control_L || ks == XK_Control_R)
1029 mouse_slip_wheel_speed = 0; 1322 mouse_slip_wheel_speed = 0;
1030 } 1323#endif
1031 break; 1324 break;
1032 } 1325 }
1033#endif
1034 1326
1035 case ButtonPress: 1327 case ButtonPress:
1036 button_press (ev.xbutton); 1328 button_press (ev.xbutton);
1037 break; 1329 break;
1038 1330
… …
1040 button_release (ev.xbutton); 1332 button_release (ev.xbutton);
1041 break; 1333 break;
1042 1334
1043 case ClientMessage: 1335 case ClientMessage:
1044 if (ev.xclient.format == 32 1336 if (ev.xclient.format == 32
1337 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1338 {
1045 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1339 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1046 destroy (); 1340 destroy ();
1341#if ENABLE_EWMH
1342 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1343 XSendEvent (disp, ev.xclient.window = display->root,
1344 False, SubstructureRedirectMask | SubstructureNotifyMask,
1345 &ev);
1346#endif
1347 }
1348#if ENABLE_XEMBED
1349 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1350 {
1351 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1352 focus_in ();
1353 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1354 focus_out ();
1355 }
1356#endif
1047#ifdef OFFIX_DND 1357#ifdef OFFIX_DND
1048 /* OffiX Dnd (drag 'n' drop) protocol */ 1358 /* OffiX Dnd (drag 'n' drop) protocol */
1049 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1359 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1050 && (ev.xclient.data.l[0] == DndFile 1360 && (ev.xclient.data.l[0] == DndFile
1051 || ev.xclient.data.l[0] == DndDir 1361 || ev.xclient.data.l[0] == DndDir
1052 || ev.xclient.data.l[0] == DndLink)) 1362 || ev.xclient.data.l[0] == DndLink))
1053 { 1363 {
1054 /* Get Dnd data */ 1364 /* Get Dnd data */
1055 Atom ActualType; 1365 Atom ActualType;
1056 int ActualFormat; 1366 int ActualFormat;
1057 unsigned char *data; 1367 unsigned char *data;
1058 unsigned long Size, RemainingBytes; 1368 unsigned long Size, RemainingBytes;
1059 1369
1060 XGetWindowProperty (display->display, display->root, 1370 XGetWindowProperty (disp, display->root,
1061 xa[XA_DNDSELECTION], 1371 xa[XA_DNDSELECTION],
1062 0L, 1000000L, 1372 0L, 1000000L,
1063 False, AnyPropertyType, 1373 False, AnyPropertyType,
1064 &ActualType, &ActualFormat, 1374 &ActualType, &ActualFormat,
1065 &Size, &RemainingBytes, 1375 &Size, &RemainingBytes,
1066 &data); 1376 &data);
1067 XChangeProperty (display->display, display->root, 1377 set_string_property (XA_CUT_BUFFER0, data);
1068 XA_CUT_BUFFER0, XA_STRING,
1069 8, PropModeReplace,
1070 data, STRLEN (data));
1071 XFree (data); 1378 XFree (data);
1072 selection_paste (display->root, XA_CUT_BUFFER0, True); 1379 selection_paste (display->root, XA_CUT_BUFFER0, true);
1073 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1380 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1074 } 1381 }
1075#endif /* OFFIX_DND */ 1382#endif /* OFFIX_DND */
1076 break; 1383 break;
1077 1384
1078 case MappingNotify: 1385 case MappingNotify:
1079 XRefreshKeyboardMapping (& (ev.xmapping)); 1386 XRefreshKeyboardMapping (&ev.xmapping);
1080 break; 1387 break;
1081 1388
1082 /* 1389 /*
1083 * XXX: this is not the _current_ arrangement 1390 * XXX: this is not the _current_ arrangement
1084 * Here's my conclusion: 1391 * Here's my conclusion:
… …
1103 break; 1410 break;
1104 } 1411 }
1105 break; 1412 break;
1106 1413
1107 case FocusIn: 1414 case FocusIn:
1108 if (!TermWin.focus) 1415 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; 1416 break;
1132 1417
1133 case FocusOut: 1418 case FocusOut:
1134 if (TermWin.focus) 1419 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; 1420 break;
1159 1421
1160 case ConfigureNotify: 1422 case ConfigureNotify:
1161 if (ev.xconfigure.window == TermWin.parent[0]) 1423 if (ev.xconfigure.window == TermWin.parent[0])
1162 { 1424 {
… …
1166 { /* Wrap lots of configures into one */ 1428 { /* Wrap lots of configures into one */
1167 width = ev.xconfigure.width; 1429 width = ev.xconfigure.width;
1168 height = ev.xconfigure.height; 1430 height = ev.xconfigure.height;
1169 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1431 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1170 } 1432 }
1171 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1433 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1172 1434
1173 if (szHint.width != width || szHint.height != height) 1435 if (szHint.width != width || szHint.height != height)
1174 { 1436 {
1175 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1437 seen_resize = 1;
1176 resize_all_windows (width, height, 1); 1438 resize_all_windows (width, height, 1);
1177 } 1439 }
1178#ifdef DEBUG_SIZE 1440
1179 else
1180 {
1181 D_SIZE ((stderr, "Size: Not resizing"));
1182 }
1183#endif
1184#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1441#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1185 if (Options & Opt_transparent) 1442 if (options & Opt_transparent)
1186 {
1187 check_our_parents (); 1443 check_our_parents ();
1188 if (am_transparent)
1189 want_full_refresh = 1;
1190 }
1191#endif 1444#endif
1192 } 1445 }
1446 break;
1447
1448 case PropertyNotify:
1449 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1450 && ev.xproperty.state == PropertyNewValue)
1451 selection_property (ev.xproperty.window, ev.xproperty.atom);
1452
1193 break; 1453 break;
1194 1454
1195 case SelectionClear: 1455 case SelectionClear:
1196 selection_clear (); 1456 selection_clear ();
1197 break; 1457 break;
1198 1458
1199 case SelectionNotify: 1459 case SelectionNotify:
1200 if (selection_wait == Sel_normal) 1460 if (selection_wait == Sel_normal)
1201 selection_paste (ev.xselection.requestor, 1461 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1202 ev.xselection.property, True);
1203 break; 1462 break;
1204 1463
1205 case SelectionRequest: 1464 case SelectionRequest:
1206 selection_send (ev.xselectionrequest); 1465 selection_send (ev.xselectionrequest);
1207 break; 1466 break;
… …
1228 1487
1229 case GraphicsExpose: 1488 case GraphicsExpose:
1230 case Expose: 1489 case Expose:
1231 if (ev.xany.window == TermWin.vt) 1490 if (ev.xany.window == TermWin.vt)
1232 { 1491 {
1233#ifdef NO_SLOW_LINK_SUPPORT 1492 do
1234 scr_expose (ev.xexpose.x, ev.xexpose.y, 1493 scr_expose (ev.xexpose.x, ev.xexpose.y,
1235 ev.xexpose.width, ev.xexpose.height, False); 1494 ev.xexpose.width, ev.xexpose.height, False);
1236#else 1495 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1237 // I don't understand this, so I changed it :) 1496
1497 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1498
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1238 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1239 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1240 //scr_expose (ev.xexpose.x, 0, 1502
1241 // ev.xexpose.width, TermWin.height, False); 1503 scr_refresh (refresh_type);
1242#endif
1243 want_refresh = 1;
1244 } 1504 }
1245 else 1505 else
1246 { 1506 {
1247 XEvent unused_event; 1507 XEvent unused_event;
1248 1508
1249 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1250 ; 1510 ;
1251 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1511 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1252 ; 1512 ;
1253 1513
1254 if (isScrollbarWindow (ev.xany.window)) 1514 if (isScrollbarWindow (ev.xany.window))
1255 { 1515 {
1256 scrollBar.setIdle (); 1516 scrollBar.setIdle ();
… …
1258 } 1518 }
1259#ifdef MENUBAR 1519#ifdef MENUBAR
1260 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1520 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1261 menubar_expose (); 1521 menubar_expose ();
1262#endif 1522#endif
1523
1524#ifdef TRANSPARENT
1525 if (am_transparent && ev.xany.window == TermWin.parent[0])
1526 XClearWindow (disp, ev.xany.window);
1527#endif
1263 } 1528 }
1264 break; 1529 break;
1265 1530
1266 case MotionNotify: 1531 case MotionNotify:
1267#ifdef POINTER_BLANK 1532#ifdef POINTER_BLANK
… …
1273 { 1538 {
1274 menubar_control (ev.xbutton); 1539 menubar_control (ev.xbutton);
1275 break; 1540 break;
1276 } 1541 }
1277#endif 1542#endif
1278 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1543 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1279 break; 1544 break;
1280 1545
1281 if (ev.xany.window == TermWin.vt) 1546 if (ev.xany.window == TermWin.vt)
1282 { 1547 {
1283 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1548 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1284 { 1549 {
1285 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1550 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1286 ; 1551 ;
1287 1552
1288 XQueryPointer (display->display, TermWin.vt, 1553 XQueryPointer (disp, TermWin.vt,
1289 &unused_root, &unused_child, 1554 &unused_root, &unused_child,
1290 &unused_root_x, &unused_root_y, 1555 &unused_root_x, &unused_root_y,
1291 & (ev.xbutton.x), & (ev.xbutton.y), 1556 &ev.xbutton.x, &ev.xbutton.y,
1292 &unused_mask); 1557 &ev.xbutton.state);
1293#ifdef MOUSE_THRESHOLD 1558#ifdef MOUSE_THRESHOLD
1294 /* deal with a `jumpy' mouse */ 1559 /* deal with a `jumpy' mouse */
1295 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1560 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1296 { 1561 {
1297#endif 1562#endif
1563#if ISO_14755
1564 // 5.4
1565 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1566 {
1567 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1568 break;
1569 }
1570#endif
1298 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1571 selection_extend (ev.xbutton.x, ev.xbutton.y,
1299 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1572 ev.xbutton.state & Button3Mask ? 2 : 0);
1573
1300#ifdef SELECTION_SCROLLING 1574#ifdef SELECTION_SCROLLING
1301 if (ev.xbutton.y < TermWin.int_bwidth 1575 if (ev.xbutton.y < TermWin.int_bwidth
1302 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1576 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1303 { 1577 {
1304 int dist; 1578 int dist;
… …
1310 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1584 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1311 1585
1312 /* save the event params so we can highlight 1586 /* save the event params so we can highlight
1313 * the selection in the pending-scroll loop 1587 * the selection in the pending-scroll loop
1314 */ 1588 */
1315 selection_save_x=ev.xbutton.x; 1589 selection_save_x = ev.xbutton.x;
1316 selection_save_y=ev.xbutton.y; 1590 selection_save_y = ev.xbutton.y;
1317 selection_save_state=
1318 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1591 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1319 1592
1320 /* calc number of lines to scroll */ 1593 /* calc number of lines to scroll */
1321 if (ev.xbutton.y<TermWin.int_bwidth) 1594 if (ev.xbutton.y < TermWin.int_bwidth)
1322 { 1595 {
1323 scroll_selection_dir = UP; 1596 scroll_selection_dir = UP;
1324 dist = TermWin.int_bwidth - ev.xbutton.y; 1597 dist = TermWin.int_bwidth - ev.xbutton.y;
1325 } 1598 }
1326 else 1599 else
1327 { 1600 {
1328 scroll_selection_dir = DN; 1601 scroll_selection_dir = DN;
1329 dist = ev.xbutton.y -
1330 (TermWin.int_bwidth + TermWin.height); 1602 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1331 } 1603 }
1604
1332 scroll_selection_lines= (Pixel2Height (dist)/ 1605 scroll_selection_lines = Pixel2Height (dist)
1333 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1606 / SELECTION_SCROLL_LINE_SPEEDUP
1607 + 1;
1334 MIN_IT (scroll_selection_lines, 1608 MIN_IT (scroll_selection_lines,
1335 SELECTION_SCROLL_MAX_LINES); 1609 SELECTION_SCROLL_MAX_LINES);
1336 } 1610 }
1337 else 1611 else
1338 { 1612 {
1339 /* we are within the text window, so we 1613 /* we are within the text window, so we
1340 * shouldn't be scrolling 1614 * shouldn't be scrolling
… …
1342 if (sel_scroll_ev.active) 1616 if (sel_scroll_ev.active)
1343 sel_scroll_ev.stop(); 1617 sel_scroll_ev.stop();
1344 } 1618 }
1345#endif 1619#endif
1346#ifdef MOUSE_THRESHOLD 1620#ifdef MOUSE_THRESHOLD
1347
1348 } 1621 }
1349#endif 1622#endif
1350
1351 } 1623 }
1352 } 1624 }
1353 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1625 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1354 { 1626 {
1355 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1627 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1356 MotionNotify, &ev)) ; 1628 MotionNotify, &ev))
1629 ;
1630
1357 XQueryPointer (display->display, scrollBar.win, 1631 XQueryPointer (disp, scrollBar.win,
1358 &unused_root, &unused_child, 1632 &unused_root, &unused_child,
1359 &unused_root_x, &unused_root_y, 1633 &unused_root_x, &unused_root_y,
1360 & (ev.xbutton.x), & (ev.xbutton.y), 1634 &ev.xbutton.x, &ev.xbutton.y,
1361 &unused_mask); 1635 &unused_mask);
1362 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1636 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1363 scrollbar_size ()); 1637 scrollbar_size ());
1364 scr_refresh (refresh_type); 1638 scr_refresh (refresh_type);
1365 refresh_limit = 0; 1639 refresh_limit = 0;
… …
1368 break; 1642 break;
1369 } 1643 }
1370} 1644}
1371 1645
1372void 1646void
1647rxvt_term::focus_in ()
1648{
1649 if (!TermWin.focus)
1650 {
1651 TermWin.focus = 1;
1652 want_refresh = 1;
1653#ifdef USE_XIM
1654 if (Input_Context != NULL)
1655 {
1656 IMSetStatusPosition ();
1657 XSetICFocus (Input_Context);
1658 }
1659#endif
1660#ifdef CURSOR_BLINK
1661 if (options & Opt_cursorBlink)
1662 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1663#endif
1664#ifdef OFF_FOCUS_FADING
1665 if (rs[Rs_fade])
1666 {
1667 pix_colors = pix_colors_focused;
1668 scr_recolour ();
1669 }
1670#endif
1671 }
1672}
1673
1674void
1675rxvt_term::focus_out ()
1676{
1677 if (TermWin.focus)
1678 {
1679 TermWin.focus = 0;
1680 want_refresh = 1;
1681
1682#if ENABLE_FRILLS || ISO_14755
1683 iso14755buf = 0;
1684#endif
1685#if ENABLE_OVERLAY
1686 scr_overlay_off ();
1687#endif
1688#ifdef USE_XIM
1689 if (Input_Context != NULL)
1690 XUnsetICFocus (Input_Context);
1691#endif
1692#ifdef CURSOR_BLINK
1693 if (options & Opt_cursorBlink)
1694 cursor_blink_ev.stop ();
1695 hidden_cursor = 0;
1696#endif
1697#ifdef OFF_FOCUS_FADING
1698 if (rs[Rs_fade])
1699 {
1700 pix_colors = pix_colors_unfocused;
1701 scr_recolour ();
1702 }
1703#endif
1704 }
1705}
1706
1707#if TRANSPARENT
1708void
1373rxvt_term::rootwin_cb (XEvent &ev) 1709rxvt_term::rootwin_cb (XEvent &ev)
1374{ 1710{
1375 SET_R (this); 1711 SET_R (this);
1376 SET_LOCALE (locale); 1712 SET_LOCALE (locale);
1377 1713
1378 switch (ev.type) 1714 switch (ev.type)
1379 { 1715 {
1380 case PropertyNotify: 1716 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 /* 1717 /*
1391 * if user used some Esetroot compatible prog to set the root bg, 1718 * 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. 1719 * use the property to determine the pixmap. We use it later on.
1393 */ 1720 */
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]) 1721 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1722 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1398 return; 1723 return;
1399 }
1400 1724
1401 /* FALLTHROUGH */ 1725 /* FALLTHROUGH */
1402 case ReparentNotify: 1726 case ReparentNotify:
1403 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1727 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1404 want_full_refresh = 1; 1728 want_refresh = want_full_refresh = 1;
1405 break; 1729 break;
1406#endif
1407 } 1730 }
1408} 1731}
1732#endif
1409 1733
1410void 1734void
1411rxvt_term::button_press (XButtonEvent &ev) 1735rxvt_term::button_press (XButtonEvent &ev)
1412{ 1736{
1413 int reportmode = 0, clickintime; 1737 int reportmode = 0, clickintime;
1414 1738
1415 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1739 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1416 if (!bypass_keystate) 1740 if (!bypass_keystate)
1417 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1741 reportmode = !! (priv_modes & PrivMode_mouse_report);
1742
1418 /* 1743 /*
1419 * VT window processing of button press 1744 * VT window processing of button press
1420 */ 1745 */
1421 if (ev.window == TermWin.vt) 1746 if (ev.window == TermWin.vt)
1422 { 1747 {
1748#if ISO_14755
1749 // 5.4
1750 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1751 {
1752 iso14755_54 (ev.x, ev.y);
1753 return;
1754 }
1755#endif
1756
1423 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1757 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1758
1424 if (reportmode) 1759 if (reportmode)
1425 { 1760 {
1426 /* mouse report from vt window */ 1761 /* mouse report from vt window */
1427 /* save the xbutton state (for ButtonRelease) */ 1762 /* save the xbutton state (for ButtonRelease) */
1428 MEvent.state = ev.state; 1763 MEvent.state = ev.state;
… …
1457 } 1792 }
1458 else 1793 else
1459 { 1794 {
1460 if (ev.button != MEvent.button) 1795 if (ev.button != MEvent.button)
1461 MEvent.clicks = 0; 1796 MEvent.clicks = 0;
1797
1462 switch (ev.button) 1798 switch (ev.button)
1463 { 1799 {
1464 case Button1: 1800 case Button1:
1801 /* allow meta + click to select rectangular areas */
1802 /* should be done in screen.C */
1803#if ENABLE_FRILLS
1804 selection.rect = !!(ev.state & ModMetaMask);
1805#else
1806 selection.rect = false;
1807#endif
1808
1465 /* allow shift+left click to extend selection */ 1809 /* allow shift+left click to extend selection */
1466 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1810 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1467 { 1811 {
1468 if (MEvent.button == Button1 && clickintime) 1812 if (MEvent.button == Button1 && clickintime)
1469 selection_rotate (ev.x, ev.y); 1813 selection_rotate (ev.x, ev.y);
1470 else 1814 else
1471 selection_extend (ev.x, ev.y, 1); 1815 selection_extend (ev.x, ev.y, 1);
… …
1486 case Button3: 1830 case Button3:
1487 if (MEvent.button == Button3 && clickintime) 1831 if (MEvent.button == Button3 && clickintime)
1488 selection_rotate (ev.x, ev.y); 1832 selection_rotate (ev.x, ev.y);
1489 else 1833 else
1490 selection_extend (ev.x, ev.y, 1); 1834 selection_extend (ev.x, ev.y, 1);
1835
1491 MEvent.button = Button3; 1836 MEvent.button = Button3;
1492 break; 1837 break;
1493 } 1838 }
1494 } 1839 }
1840
1495 MEvent.time = ev.time; 1841 MEvent.time = ev.time;
1496 return; 1842 return;
1497 } 1843 }
1498 1844
1499 /* 1845 /*
… …
1591 break; 1937 break;
1592 case R_SB_ALIGN_BOTTOM: 1938 case R_SB_ALIGN_BOTTOM:
1593 csrO = scrollBar.bot - scrollBar.top; 1939 csrO = scrollBar.bot - scrollBar.top;
1594 break; 1940 break;
1595 } 1941 }
1942
1596 if (scrollBar.style == R_SB_XTERM 1943 if (scrollBar.style == R_SB_XTERM
1597 || scrollbar_above_slider (ev.y) 1944 || scrollbar_above_slider (ev.y)
1598 || scrollbar_below_slider (ev.y)) 1945 || scrollbar_below_slider (ev.y))
1599 scr_move_to ( scrollbar_position (ev.y) - csrO, 1946 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1600 scrollbar_size ()); 1947
1601 scrollBar.setMotion (); 1948 scrollBar.setMotion ();
1602 break; 1949 break;
1603 1950
1604 case Button1: 1951 case Button1:
1605 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1952 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1629 scr_page ((ev.button == Button1 ? DN : UP), 1976 scr_page ((ev.button == Button1 ? DN : UP),
1630 (TermWin.nrow 1977 (TermWin.nrow
1631 * scrollbar_position (ev.y) 1978 * scrollbar_position (ev.y)
1632 / scrollbar_size ())); 1979 / scrollbar_size ()));
1633 } 1980 }
1981
1634 break; 1982 break;
1635 } 1983 }
1636 } 1984 }
1637 return; 1985 return;
1638 } 1986 }
… …
1650{ 1998{
1651 int reportmode = 0; 1999 int reportmode = 0;
1652 2000
1653 csrO = 0; /* reset csr Offset */ 2001 csrO = 0; /* reset csr Offset */
1654 if (!bypass_keystate) 2002 if (!bypass_keystate)
1655 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2003 reportmode = !! (priv_modes & PrivMode_mouse_report);
1656 2004
1657 if (scrollbar_isUpDn ()) 2005 if (scrollbar_isUpDn ())
1658 { 2006 {
1659 scrollBar.setIdle (); 2007 scrollBar.setIdle ();
1660 scrollbar_show (0); 2008 scrollbar_show (0);
1661#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2009#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1662 refresh_type &= ~SMOOTH_REFRESH; 2010 refresh_type &= ~SMOOTH_REFRESH;
1663#endif 2011#endif
1664
1665 } 2012 }
2013
1666#ifdef SELECTION_SCROLLING 2014#ifdef SELECTION_SCROLLING
1667 if (sel_scroll_ev.active) 2015 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop(); 2016 sel_scroll_ev.stop();
1669#endif 2017#endif
2018
1670 if (ev.window == TermWin.vt) 2019 if (ev.window == TermWin.vt)
1671 { 2020 {
2021#if ISO_14755
2022 // 5.4
2023 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2024 return;
2025#endif
1672 if (reportmode) 2026 if (reportmode)
1673 { 2027 {
1674 /* mouse report from vt window */ 2028 /* mouse report from vt window */
1675 /* don't report release of wheel "buttons" */ 2029 /* don't report release of wheel "buttons" */
1676 if (ev.button >= 4) 2030 if (ev.button >= 4)
… …
1690 MEvent.button = AnyButton; 2044 MEvent.button = AnyButton;
1691 mouse_report (ev); 2045 mouse_report (ev);
1692#endif /* MOUSE_REPORT_DOUBLECLICK */ 2046#endif /* MOUSE_REPORT_DOUBLECLICK */
1693 return; 2047 return;
1694 } 2048 }
2049
1695 /* 2050 /*
1696 * dumb hack to compensate for the failure of click-and-drag 2051 * dumb hack to compensate for the failure of click-and-drag
1697 * when overriding mouse reporting 2052 * when overriding mouse reporting
1698 */ 2053 */
1699 if (PrivateModes & PrivMode_mouse_report 2054 if (priv_modes & PrivMode_mouse_report
1700 && bypass_keystate 2055 && bypass_keystate
1701 && ev.button == Button1 && MEvent.clicks <= 1) 2056 && ev.button == Button1 && MEvent.clicks <= 1)
1702 selection_extend (ev.x, ev.y, 0); 2057 selection_extend (ev.x, ev.y, 0);
1703 2058
1704 switch (ev.button) 2059 switch (ev.button)
… …
1719 2074
1720 v = ev.button == Button4 ? UP : DN; 2075 v = ev.button == Button4 ? UP : DN;
1721 2076
1722 if (ev.state & ShiftMask) 2077 if (ev.state & ShiftMask)
1723 i = 1; 2078 i = 1;
1724 else if (Options & Opt_mouseWheelScrollPage) 2079 else if (options & Opt_mouseWheelScrollPage)
1725 i = TermWin.nrow - 1; 2080 i = TermWin.nrow - 1;
1726 else 2081 else
1727 i = 5; 2082 i = 5;
1728 2083
1729# ifdef MOUSE_SLIP_WHEELING 2084# ifdef MOUSE_SLIP_WHEELING
… …
1767#endif 2122#endif
1768} 2123}
1769 2124
1770#ifdef TRANSPARENT 2125#ifdef TRANSPARENT
1771#if TINTING 2126#if TINTING
1772/* shading taken from eterm-0.9.2 */ 2127/* taken from aterm-0.4.2 */
1773/* RGB 15 */
1774 2128
1775static void 2129typedef 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 2130
1781 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2131void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1782 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2132{
1783 /* No saturation */ 2133 int sh_r, sh_g, sh_b;
1784 for (y = h; --y >= 0;) { 2134 RUINT32T mask_r, mask_g, mask_b;
1785 for (x = -w; x < 0; x++) { 2135 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1786 int r, g, b; 2136 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2137 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2138 int i;
1787 2139
1788 b = ((uint16_t *) ptr)[x]; 2140 Visual *visual = display->visual;
1789 r = (b & 0x7c00) * rm; 2141
1790 g = (b & 0x3e0) * gm; 2142 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1791 b = (b & 0x1f) * bm; 2143
1792 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2144 /* for convenience */
1793 | ((g >> 8) & 0x3e0) 2145 mask_r = visual->red_mask;
1794 | ((b >> 8) & 0x1f); 2146 mask_g = visual->green_mask;
1795 } 2147 mask_b = visual->blue_mask;
1796 ptr += bpl; 2148
1797 } 2149 /* boring lookup table pre-initialization */
2150 switch (srcImage->bits_per_pixel) {
2151 case 15:
2152 if ((mask_r != 0x7c00) ||
2153 (mask_g != 0x03e0) ||
2154 (mask_b != 0x001f))
2155 return;
2156 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2157 lookup_r = lookup;
2158 lookup_g = lookup+32;
2159 lookup_b = lookup+32+32;
2160 sh_r = 10;
2161 sh_g = 5;
2162 sh_b = 0;
2163 break;
2164 case 16:
2165 if ((mask_r != 0xf800) ||
2166 (mask_g != 0x07e0) ||
2167 (mask_b != 0x001f))
2168 return;
2169 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2170 lookup_r = lookup;
2171 lookup_g = lookup+32;
2172 lookup_b = lookup+32+64;
2173 sh_r = 11;
2174 sh_g = 5;
2175 sh_b = 0;
2176 break;
2177 case 24:
2178 if ((mask_r != 0xff0000) ||
2179 (mask_g != 0x00ff00) ||
2180 (mask_b != 0x0000ff))
2181 return;
2182 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2183 lookup_r = lookup;
2184 lookup_g = lookup+256;
2185 lookup_b = lookup+256+256;
2186 sh_r = 16;
2187 sh_g = 8;
2188 sh_b = 0;
2189 break;
2190 case 32:
2191 if ((mask_r != 0xff0000) ||
2192 (mask_g != 0x00ff00) ||
2193 (mask_b != 0x0000ff))
2194 return;
2195 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2196 lookup_r = lookup;
2197 lookup_g = lookup+256;
2198 lookup_b = lookup+256+256;
2199 sh_r = 16;
2200 sh_g = 8;
2201 sh_b = 0;
2202 break;
2203 default:
2204 return; /* we do not support this color depth */
2205 }
2206
2207 /* prepare limits for color transformation (each channel is handled separately) */
2208 if (shade < 0) {
2209 shade = -shade;
2210 if (shade < 0) shade = 0;
2211 if (shade > 100) shade = 100;
2212
2213 lower_lim_r = 65535-rm;
2214 lower_lim_g = 65535-gm;
2215 lower_lim_b = 65535-bm;
2216
2217 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2218 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2219 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2220
2221 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1798 } else { 2222 } else {
1799 for (y = h; --y >= 0;) { 2223 if (shade < 0) shade = 0;
1800 for (x = -w; x < 0; x++) { 2224 if (shade > 100) shade = 100;
1801 int r, g, b;
1802 2225
1803 b = ((uint16_t *) ptr)[x]; 2226 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1804 r = (b & 0x7c00) * rm; 2227
1805 g = (b & 0x3e0) * gm; 2228 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1806 b = (b & 0x1f) * bm; 2229 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1807 r |= (!(r >> 15) - 1); 2230 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1808 g |= (!(g >> 10) - 1); 2231 }
1809 b |= (!(b >> 5) - 1); 2232
1810 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2233 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1811 | ((g >> 8) & 0x3e0) 2234 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1812 | ((b >> 8) & 0x1f); 2235 {
1813 } 2236 unsigned int tmp;
1814 ptr += bpl; 2237
2238 tmp = lower_lim_r;
2239 lower_lim_r = lower_lim_b;
2240 lower_lim_b = tmp;
2241
2242 tmp = upper_lim_r;
2243 upper_lim_r = upper_lim_b;
2244 upper_lim_b = tmp;
2245 }
2246
2247 /* fill our lookup tables */
2248 for (i = 0; i <= mask_r>>sh_r; i++)
2249 {
2250 RUINT32T tmp;
2251 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2252 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2253 lookup_r[i] = (tmp/65535)<<sh_r;
2254 }
2255 for (i = 0; i <= mask_g>>sh_g; i++)
2256 {
2257 RUINT32T tmp;
2258 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2259 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2260 lookup_g[i] = (tmp/65535)<<sh_g;
2261 }
2262 for (i = 0; i <= mask_b>>sh_b; i++)
2263 {
2264 RUINT32T tmp;
2265 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2266 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2267 lookup_b[i] = (tmp/65535)<<sh_b;
2268 }
2269
2270 /* apply table to input image (replacing colors by newly calculated ones) */
2271 switch (srcImage->bits_per_pixel)
2272 {
2273 case 15:
2274 {
2275 unsigned short *p1, *pf, *p, *pl;
2276 p1 = (unsigned short *) srcImage->data;
2277 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2278 while (p1 < pf)
2279 {
2280 p = p1;
2281 pl = p1 + srcImage->width;
2282 for (; p < pl; p++)
1815 } 2283 {
2284 *p = lookup_r[(*p & 0x7c00)>>10] |
2285 lookup_g[(*p & 0x03e0)>> 5] |
2286 lookup_b[(*p & 0x001f)];
2287 }
2288 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1816 } 2289 }
1817} 2290 break;
1818 2291 }
1819/* RGB 16 */ 2292 case 16:
1820static void 2293 {
1821shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2294 unsigned short *p1, *pf, *p, *pl;
1822{ 2295 p1 = (unsigned short *) srcImage->data;
1823 unsigned char *ptr; 2296 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1824 int x, y; 2297 while (p1 < pf)
1825 2298 {
1826 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2299 p = p1;
1827 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2300 pl = p1 + srcImage->width;
1828 /* No saturation */ 2301 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 } 2302 {
1843 } else { 2303 *p = lookup_r[(*p & 0xf800)>>11] |
1844 for (y = h; --y >= 0;) { 2304 lookup_g[(*p & 0x07e0)>> 5] |
1845 for (x = -w; x < 0; x++) { 2305 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 } 2306 }
1859 ptr += bpl; 2307 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2308 }
2309 break;
2310 }
2311 case 24:
2312 {
2313 unsigned char *p1, *pf, *p, *pl;
2314 p1 = (unsigned char *) srcImage->data;
2315 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2316 while (p1 < pf)
2317 {
2318 p = p1;
2319 pl = p1 + srcImage->width * 3;
2320 for (; p < pl; p += 3)
1860 } 2321 {
2322 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2323 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2324 p[2] = lookup_r[(p[2] & 0x0000ff)];
2325 }
2326 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1861 } 2327 }
1862} 2328 break;
2329 }
2330 case 32:
2331 {
2332 RUINT32T *p1, *pf, *p, *pl;
2333 p1 = (RUINT32T *) srcImage->data;
2334 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1863 2335
1864/* RGB 24 */ 2336 while (p1 < pf)
1865static void 2337 {
1866shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2338 p = p1;
1867{ 2339 pl = p1 + srcImage->width;
1868 unsigned char *ptr; 2340 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 } 2341 {
1896 } else { 2342 *p = lookup_r[(*p & 0xff0000)>>16] |
1897 for (y = h; --y >= 0;) { 2343 lookup_g[(*p & 0x00ff00)>> 8] |
1898 for (x = -(w * 3); x < 0; x += 3) { 2344 lookup_b[(*p & 0x0000ff)] |
1899 int r, g, b; 2345 (*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 } 2346 }
1927 ptr += bpl; 2347 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1928 } 2348 }
2349 break;
2350 }
1929 } 2351 }
1930}
1931 2352
1932/* RGB 32 */ 2353 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} 2354}
2003
2004#endif 2355#endif
2005 2356
2006/* 2357/*
2007 * Check our parents are still who we think they are. 2358 * Check our parents are still who we think they are.
2008 * Do transparency updates if required 2359 * Do transparency updates if required
… …
2015 Atom atype; 2366 Atom atype;
2016 unsigned char *prop = NULL; 2367 unsigned char *prop = NULL;
2017 Window root, oldp, *list; 2368 Window root, oldp, *list;
2018 Pixmap rootpixmap = None; 2369 Pixmap rootpixmap = None;
2019 XWindowAttributes wattr, wrootattr; 2370 XWindowAttributes wattr, wrootattr;
2371 dDisp;
2020 2372
2021 pchanged = 0; 2373 pchanged = 0;
2022 2374
2023 if (!(Options & Opt_transparent)) 2375 if (!(options & Opt_transparent))
2024 return pchanged; /* Don't try any more */ 2376 return pchanged; /* Don't try any more */
2025 2377
2026 XGetWindowAttributes (display->display, display->root, &wrootattr); 2378 XGetWindowAttributes (disp, display->root, &wrootattr);
2027 rootdepth = wrootattr.depth; 2379 rootdepth = wrootattr.depth;
2028 2380
2029 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2381 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2030 2382
2031 if (rootdepth != wattr.depth) 2383 if (rootdepth != wattr.depth)
2032 { 2384 {
2033 if (am_transparent) 2385 if (am_transparent)
2034 { 2386 {
2035 pchanged = 1; 2387 pchanged = 1;
2036 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2388 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2037 am_transparent = am_pixmap_trans = 0; 2389 am_transparent = am_pixmap_trans = 0;
2038 } 2390 }
2039 2391
2040 return pchanged; /* Don't try any more */ 2392 return pchanged; /* Don't try any more */
2041 } 2393 }
2042 2394
2043 /* Get all X ops out of the queue so that our information is up-to-date. */ 2395 /* Get all X ops out of the queue so that our information is up-to-date. */
2044 XSync (display->display, False); 2396 XSync (disp, False);
2045 2397
2046 /* 2398 /*
2047 * Make the frame window set by the window manager have 2399 * Make the frame window set by the window manager have
2048 * the root background. Some window managers put multiple nested frame 2400 * the root background. Some window managers put multiple nested frame
2049 * windows for each client, so we have to take care about that. 2401 * windows for each client, so we have to take care about that.
2050 */ 2402 */
2051 i = (xa[XA_XROOTPMAPID] 2403 i = (xa[XA_XROOTPMAP_ID]
2052 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2404 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2053 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2405 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2054 &nitems, &bytes_after, &prop) == Success); 2406 &nitems, &bytes_after, &prop) == Success);
2055 2407
2056 if (!i || prop == NULL) 2408 if (!i || prop == NULL)
2057 i = (xa[XA_XSETROOTID] 2409 i = (xa[XA_ESETROOT_PMAP_ID]
2058 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2410 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2059 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2411 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2060 &nitems, &bytes_after, &prop) == Success); 2412 &nitems, &bytes_after, &prop) == Success);
2061 2413
2062 if (!i || prop == NULL || !rs[Rs_color + Color_tint]) 2414 if (!i || prop == NULL
2415#if TINTING
2416 || !rs[Rs_color + Color_tint]
2417#endif
2418 )
2063 have_pixmap = 0; 2419 have_pixmap = 0;
2064 else 2420 else
2065 { 2421 {
2066 have_pixmap = 1; 2422 have_pixmap = 1;
2067 rootpixmap = *(Pixmap *)prop; 2423 rootpixmap = *(Pixmap *)prop;
… …
2078 Window cr; 2434 Window cr;
2079 XImage *image; 2435 XImage *image;
2080 GC gc; 2436 GC gc;
2081 XGCValues gcvalue; 2437 XGCValues gcvalue;
2082 2438
2083 XTranslateCoordinates (display->display, TermWin.vt, display->root, 2439 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2084 0, 0, &sx, &sy, &cr); 2440 0, 0, &sx, &sy, &cr);
2085 nw = (unsigned int)szHint.width; 2441 nw = (unsigned int)szHint.width;
2086 nh = (unsigned int)szHint.height; 2442 nh = (unsigned int)szHint.height;
2087 nx = ny = 0; 2443 nx = ny = 0;
2088 2444
… …
2100 sy = 0; 2456 sy = 0;
2101 } 2457 }
2102 2458
2103 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2459 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2104 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2460 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2461
2462 XSync (disp, False);
2105 allowedxerror = -1; 2463 allowedxerror = -1;
2106 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2464 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2107 2465
2108 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2466 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2109 /* XXX: may need a delay here? */ 2467 /* XXX: may need a delay here? */
2110 allowedxerror = 0; 2468 allowedxerror = 0;
2111 2469
… …
2114 if (am_transparent && am_pixmap_trans) 2472 if (am_transparent && am_pixmap_trans)
2115 { 2473 {
2116 pchanged = 1; 2474 pchanged = 1;
2117 if (TermWin.pixmap != None) 2475 if (TermWin.pixmap != None)
2118 { 2476 {
2119 XFreePixmap (display->display, TermWin.pixmap); 2477 XFreePixmap (disp, TermWin.pixmap);
2120 TermWin.pixmap = None; 2478 TermWin.pixmap = None;
2121 } 2479 }
2122 } 2480 }
2123 2481
2124 am_pixmap_trans = 0; 2482 am_pixmap_trans = 0;
2125 } 2483 }
2126 else 2484 else
2127 { 2485 {
2128 if (TermWin.pixmap != None) 2486 if (TermWin.pixmap != None)
2129 XFreePixmap (display->display, TermWin.pixmap); 2487 XFreePixmap (disp, TermWin.pixmap);
2130 2488
2131#if TINTING 2489#if TINTING
2132 if (ISSET_PIXCOLOR (Color_tint)) 2490 if (ISSET_PIXCOLOR (Color_tint))
2133 { 2491 {
2134 unsigned short rm, gm, bm; 2492 unsigned short rm, gm, bm;
2135 if (rs[Rs_shade]) 2493 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); 2494
2137 else
2138 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2495 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2139 2496
2140 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2497 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 } 2498 }
2151#endif 2499#endif
2152 2500
2153 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2501 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2154 szHint.width, szHint.height, image->depth); 2502 szHint.width, szHint.height, image->depth);
2155 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2503 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2156 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2504 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2157 nx, ny, image->width, image->height); 2505 nx, ny, image->width, image->height);
2158 XFreeGC (display->display, gc); 2506 XFreeGC (disp, gc);
2159 XDestroyImage (image); 2507 XDestroyImage (image);
2160 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap); 2508 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2509 XClearWindow (disp, TermWin.parent[0]);
2161 2510
2162 if (!am_transparent || !am_pixmap_trans) 2511 if (!am_transparent || !am_pixmap_trans)
2163 pchanged = 1; 2512 pchanged = 1;
2164 2513
2165 am_transparent = am_pixmap_trans = 1; 2514 am_transparent = am_pixmap_trans = 1;
2166 } 2515 }
2167 } 2516 }
2168 2517
2169 if (!am_pixmap_trans) 2518 if (am_pixmap_trans)
2519 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2520 else
2170 { 2521 {
2171 unsigned int n; 2522 unsigned int n;
2172 /* 2523 /*
2173 * InheritPixmap transparency 2524 * InheritPixmap transparency
2174 */ 2525 */
2175 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2176 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2526 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2177 { 2527 {
2178 oldp = TermWin.parent[i]; 2528 oldp = TermWin.parent[i];
2179 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2529 XQueryTree (disp, TermWin.parent[i - 1], &root,
2180 &TermWin.parent[i], &list, &n); 2530 &TermWin.parent[i], &list, &n);
2181 XFree (list); 2531 XFree (list);
2182 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2183 2532
2184 if (TermWin.parent[i] == display->root) 2533 if (TermWin.parent[i] == display->root)
2185 { 2534 {
2186 if (oldp != None) 2535 if (oldp != None)
2187 pchanged = 1; 2536 pchanged = 1;
… …
2197 2546
2198 if (pchanged) 2547 if (pchanged)
2199 { 2548 {
2200 for (; n < (unsigned int)i; n++) 2549 for (; n < (unsigned int)i; n++)
2201 { 2550 {
2202 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2551 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) 2552 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2205 { 2553 {
2206 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2554 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2207 break; 2555 break;
2208 } 2556 }
2209 } 2557 }
2210 } 2558 }
2211 2559
2212 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2560 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2213 { 2561 {
2214 D_X ((stderr, "InheritPixmap Turning off")); /* Mikachu? */
2215 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2562 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2216 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2563 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2217 am_transparent = 0; 2564 am_transparent = 0;
2218 /* XXX: also turn off Opt_transparent? */ 2565 /* XXX: also turn off Opt_transparent? */
2219 } 2566 }
2220 else 2567 else
2221 { 2568 {
2222#if WAIT_FOR_WM 2569#if WAIT_FOR_WM
2223 /* wait (an arbitrary period) for the WM to do its thing 2570 /* wait (an arbitrary period) for the WM to do its thing
2224 * needed for fvwm2.2.2 (and before?) */ 2571 * needed for fvwm2.2.2 (and before?) */
2225 sleep (1); 2572 sleep (1);
2226#endif 2573#endif
2227 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2228 for (n = 0; n < (unsigned int)i; n++) 2574 for (n = 0; n < (unsigned int)i; n++)
2575 {
2229 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2576 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2577 XClearWindow (disp, TermWin.parent[n]);
2578 }
2230 2579
2231 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2580 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2232 am_transparent = 1; 2581 am_transparent = 1;
2233 } 2582 }
2234 2583
2235 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2584 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2236 TermWin.parent[i] = None; 2585 TermWin.parent[i] = None;
2586 }
2587
2588 if (scrollBar.win)
2589 {
2590 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2591 scrollBar.setIdle ();
2592 scrollbar_show (0);
2593 }
2594
2595 if (am_transparent)
2596 {
2597 want_refresh = want_full_refresh = 1;
2598 if (am_pixmap_trans)
2599 flush ();
2237 } 2600 }
2238 2601
2239 return pchanged; 2602 return pchanged;
2240} 2603}
2241#endif 2604#endif
… …
2260 if (ch == NOCHAR) // TODO: improve 2623 if (ch == NOCHAR) // TODO: improve
2261 break; 2624 break;
2262 2625
2263 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2626 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2264 { 2627 {
2628 if (!seen_input)
2629 {
2630 seen_input = 1;
2631 // many badly-written programs (e.g. jed) contain a race condition:
2632 // they first read the screensize and then install a SIGWINCH handler.
2633 // some window managers resize the window early, and these programs
2634 // then sometimes get the size wrong.
2635 // unfortunately other programs are even more buggy and dislike
2636 // being sent SIGWINCH, so only do it when we were in fact being
2637 // resized.
2638 if (seen_resize && cmd_pid)
2639 kill (-cmd_pid, SIGWINCH);
2640 }
2641
2265 /* Read a text string from the input buffer */ 2642 /* Read a text string from the input buffer */
2266 unicode_t buf[UBUFSIZ]; 2643 unicode_t buf[UBUFSIZ];
2267 bool refreshnow = false; 2644 bool refreshnow = false;
2268 int nlines = 0; 2645 int nlines = 0;
2269 unicode_t *str = buf; 2646 unicode_t *str = buf;
2270 2647
2271 *str++ = ch;
2272
2273 for (;;) 2648 for (;;)
2274 { 2649 {
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)) 2650 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2279 break; 2651 break;
2280 2652
2281 *str++ = ch; 2653 *str++ = ch;
2282 2654
2283 if (ch == C0_LF) 2655 if (ch == C0_LF)
2284 { 2656 {
2285 nlines++; 2657 nlines++;
2286 refresh_count++; 2658 refresh_count++;
2287 2659
2288 if (! (Options & Opt_jumpScroll) 2660 if (!(options & Opt_jumpScroll)
2289 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2661 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2290 { 2662 {
2291 refreshnow = true; 2663 refreshnow = true;
2292 flag = true;
2293 ch = NOCHAR; 2664 ch = NOCHAR;
2294 break; 2665 break;
2295 } 2666 }
2296 2667
2297 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2668 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2298 if (nlines >= TermWin.nrow - 1) 2669 if (nlines >= TermWin.nrow - 1)
2299 { 2670 {
2300 scr_add_lines (buf, nlines, str - buf); 2671 scr_add_lines (buf, nlines, str - buf);
2301 nlines = 0; 2672 nlines = 0;
2302 str = buf; 2673 str = buf;
… …
2306 if (str >= buf + UBUFSIZ) 2677 if (str >= buf + UBUFSIZ)
2307 { 2678 {
2308 ch = NOCHAR; 2679 ch = NOCHAR;
2309 break; 2680 break;
2310 } 2681 }
2682
2683 seq_begin = cmdbuf_ptr;
2684 ch = next_char ();
2311 } 2685 }
2312 2686
2313 scr_add_lines (buf, nlines, str - buf); 2687 scr_add_lines (buf, nlines, str - buf);
2314 2688
2315 /* 2689 /*
2316 * If there have been a lot of new lines, then update the screen 2690 * 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. 2691 * 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 2692 * the number of pages between refreshes is refresh_limit, which
2319 * is incremented here because we must be doing flat-out scrolling. 2693 * 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 */ 2694 */
2324 if (refreshnow) 2695 if (refreshnow)
2325 { 2696 {
2326 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2697 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2327 refresh_limit++; 2698 refresh_limit++;
2328 else 2699 else
2700 {
2701 flag = true;
2329 scr_refresh (refresh_type); 2702 scr_refresh (refresh_type);
2703 }
2330 } 2704 }
2331 2705
2332 } 2706 }
2333 else 2707 else
2334 { 2708 {
… …
2382 if (len == (size_t)-1) 2756 if (len == (size_t)-1)
2383 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2757 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2384 2758
2385 // assume wchar == unicode 2759 // assume wchar == unicode
2386 cmdbuf_ptr += len; 2760 cmdbuf_ptr += len;
2387 return wc; 2761 return wc & UNICODE_MASK;
2388 } 2762 }
2389 2763
2390 return NOCHAR; 2764 return NOCHAR;
2391} 2765}
2392 2766
… …
2518 process_escape_seq (); 2892 process_escape_seq ();
2519 break; 2893 break;
2520 case C0_ENQ: /* terminal Status */ 2894 case C0_ENQ: /* terminal Status */
2521 if (rs[Rs_answerbackstring]) 2895 if (rs[Rs_answerbackstring])
2522 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2896 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2523 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2897 (unsigned int)strlen (rs[Rs_answerbackstring]));
2524 else 2898 else
2525 tt_write ((unsigned char *)VT100_ANS, 2899 tt_write ((unsigned char *)VT100_ANS,
2526 (unsigned int)STRLEN (VT100_ANS)); 2900 (unsigned int)strlen (VT100_ANS));
2527 break; 2901 break;
2528 case C0_BEL: /* bell */ 2902 case C0_BEL: /* bell */
2529 scr_bell (); 2903 scr_bell ();
2530 break; 2904 break;
2531 case C0_BS: /* backspace */ 2905 case C0_BS: /* backspace */
… …
2630void 3004void
2631rxvt_term::process_escape_seq () 3005rxvt_term::process_escape_seq ()
2632{ 3006{
2633 unicode_t ch = cmd_getc (); 3007 unicode_t ch = cmd_getc ();
2634 3008
2635 if (PrivateModes & PrivMode_vt52) 3009 if (priv_modes & PrivMode_vt52)
2636 { 3010 {
2637 process_escape_vt52 (ch); 3011 process_escape_vt52 (ch);
2638 return; 3012 return;
2639 } 3013 }
2640 3014
… …
2655 scr_charset_set (2, (unsigned int)cmd_getc ()); 3029 scr_charset_set (2, (unsigned int)cmd_getc ());
2656 break; 3030 break;
2657 case '+': 3031 case '+':
2658 scr_charset_set (3, (unsigned int)cmd_getc ()); 3032 scr_charset_set (3, (unsigned int)cmd_getc ());
2659 break; 3033 break;
2660#ifndef NO_FRILLS 3034#if ENABLE_FRILLS
2661 case '6': 3035 case '6':
2662 scr_backindex (); 3036 scr_backindex ();
2663 break; 3037 break;
2664#endif 3038#endif
2665 case '7': 3039 case '7':
2666 scr_cursor (SAVE); 3040 scr_cursor (SAVE);
2667 break; 3041 break;
2668 case '8': 3042 case '8':
2669 scr_cursor (RESTORE); 3043 scr_cursor (RESTORE);
2670 break; 3044 break;
2671#ifndef NO_FRILLS 3045#if ENABLE_FRILLS
2672 case '9': 3046 case '9':
2673 scr_forwardindex (); 3047 scr_forwardindex ();
2674 break; 3048 break;
2675#endif 3049#endif
2676 case '=': 3050 case '=':
… …
2855 { 3229 {
2856 switch (priv) 3230 switch (priv)
2857 { 3231 {
2858 case '>': 3232 case '>':
2859 if (ch == CSI_DA) /* secondary device attributes */ 3233 if (ch == CSI_DA) /* secondary device attributes */
2860 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3234 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2861 break; 3235 break;
2862 case '?': 3236 case '?':
2863 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3237 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2864 process_terminal_mode (ch, priv, nargs, arg); 3238 process_terminal_mode (ch, priv, nargs, arg);
2865 break; 3239 break;
… …
2975 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3349 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2976 break; 3350 break;
2977 3351
2978 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3352 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2979 tt_write ((const unsigned char *)VT100_ANS, 3353 tt_write ((const unsigned char *)VT100_ANS,
2980 (unsigned int) (sizeof (VT100_ANS) - 1)); 3354 (unsigned int) (sizeof (VT100_ANS) - 1));
2981 break; 3355 break;
2982 3356
2983 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3357 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2984 process_sgr_mode (nargs, arg); 3358 process_sgr_mode (nargs, arg);
2985 break; 3359 break;
… …
2992 break; 3366 break;
2993 case 6: /* CPR requested */ 3367 case 6: /* CPR requested */
2994 scr_report_position (); 3368 scr_report_position ();
2995 break; 3369 break;
2996 case 7: /* unofficial extension */ 3370 case 7: /* unofficial extension */
2997 if (Options & Opt_insecure) 3371 if (options & Opt_insecure)
2998 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3372 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2999 break; 3373 break;
3000 case 8: /* unofficial extension */ 3374 case 8: /* unofficial extension */
3001 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3375 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3002 break; 3376 break;
3003 } 3377 }
… …
3039 break; 3413 break;
3040 3414
3041 case CSI_RM: /* 8.3.107: RESET MODE */ 3415 case CSI_RM: /* 8.3.107: RESET MODE */
3042 if (arg[0] == 4) 3416 if (arg[0] == 4)
3043 scr_insert_mode (0); 3417 scr_insert_mode (0);
3418 else if (arg[0] == 20)
3419 priv_modes &= ~PrivMode_LFNL;
3044 break; 3420 break;
3045 3421
3046 case CSI_SM: /* 8.3.126: SET MODE */ 3422 case CSI_SM: /* 8.3.126: SET MODE */
3047 if (arg[0] == 4) 3423 if (arg[0] == 4)
3048 scr_insert_mode (1); 3424 scr_insert_mode (1);
3425 else if (arg[0] == 20)
3426 priv_modes |= PrivMode_LFNL;
3049 break; 3427 break;
3050 3428
3051 /* 3429 /*
3052 * PRIVATE USE beyond this point. All CSI_7? sequences here 3430 * PRIVATE USE beyond this point. All CSI_7? sequences here
3053 */ 3431 */
… …
3065 break; 3443 break;
3066 case CSI_75: 3444 case CSI_75:
3067 scr_cursor (RESTORE); 3445 scr_cursor (RESTORE);
3068 break; 3446 break;
3069 3447
3070#ifndef NO_FRILLS 3448#if ENABLE_FRILLS
3071 case CSI_74: 3449 case CSI_74:
3072 process_window_ops (arg, nargs); 3450 process_window_ops (arg, nargs);
3073 break; 3451 break;
3074#endif 3452#endif
3075 3453
… …
3082 break; 3460 break;
3083 } 3461 }
3084} 3462}
3085/*}}} */ 3463/*}}} */
3086 3464
3087#ifndef NO_FRILLS 3465#if ENABLE_FRILLS
3088/* ARGSUSED */ 3466/* ARGSUSED */
3089void 3467void
3090rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3468rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3091{ 3469{
3092 int x, y; 3470 int x, y;
3093 XWindowAttributes wattr; 3471 XWindowAttributes wattr;
3094 Window wdummy; 3472 Window wdummy;
3473 dDisp;
3095 3474
3096 if (nargs == 0) 3475 if (nargs == 0)
3097 return; 3476 return;
3098 3477
3099 switch (args[0]) 3478 switch (args[0])
3100 { 3479 {
3101 /* 3480 /*
3102 * commands 3481 * commands
3103 */ 3482 */
3104 case 1: /* deiconify window */ 3483 case 1: /* deiconify window */
3105 XMapWindow (display->display, TermWin.parent[0]); 3484 XMapWindow (disp, TermWin.parent[0]);
3106 break; 3485 break;
3107 case 2: /* iconify window */ 3486 case 2: /* iconify window */
3108 XIconifyWindow (display->display, TermWin.parent[0], 3487 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3109 DefaultScreen (display->display));
3110 break; 3488 break;
3111 case 3: /* set position (pixels) */ 3489 case 3: /* set position (pixels) */
3112 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3490 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3113 break; 3491 break;
3114 case 4: /* set size (pixels) */ 3492 case 4: /* set size (pixels) */
3115 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3493 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3116 break; 3494 break;
3117 case 5: /* raise window */ 3495 case 5: /* raise window */
3118 XRaiseWindow (display->display, TermWin.parent[0]); 3496 XRaiseWindow (disp, TermWin.parent[0]);
3119 break; 3497 break;
3120 case 6: /* lower window */ 3498 case 6: /* lower window */
3121 XLowerWindow (display->display, TermWin.parent[0]); 3499 XLowerWindow (disp, TermWin.parent[0]);
3122 break; 3500 break;
3123 case 7: /* refresh window */ 3501 case 7: /* refresh window */
3124 scr_touch (true); 3502 scr_touch (true);
3125 break; 3503 break;
3126 case 8: /* set size (chars) */ 3504 case 8: /* set size (chars) */
… …
3138 3516
3139 /* 3517 /*
3140 * reports - some output format copied from XTerm 3518 * reports - some output format copied from XTerm
3141 */ 3519 */
3142 case 11: /* report window state */ 3520 case 11: /* report window state */
3143 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3521 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3522 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3145 break; 3523 break;
3146 case 13: /* report window position */ 3524 case 13: /* report window position */
3147 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3525 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3148 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3526 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3149 -wattr.border_width, -wattr.border_width, 3527 -wattr.border_width, -wattr.border_width,
3150 &x, &y, &wdummy); 3528 &x, &y, &wdummy);
3151 tt_printf ("\033[3;%d;%dt", x, y); 3529 tt_printf ("\033[3;%d;%dt", x, y);
3152 break; 3530 break;
3153 case 14: /* report window size (pixels) */ 3531 case 14: /* report window size (pixels) */
3154 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3532 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3533 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3156 break; 3534 break;
3157 case 18: /* report text area size (chars) */ 3535 case 18: /* report text area size (chars) */
3158 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3536 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3159 break; 3537 break;
3160 case 19: /* report window size (chars) */ 3538 case 19: /* report window size (chars) */
3161 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3539 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3162 break; 3540 break;
3163 case 20: /* report icon label */ 3541 case 20: /* report icon label */
3164 if (Options & Opt_insecure)
3165 { 3542 {
3166 char *s; 3543 char *s;
3167 XGetIconName (display->display, TermWin.parent[0], &s); 3544 XGetIconName (disp, TermWin.parent[0], &s);
3168 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3545 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3546 XFree (s);
3169 } 3547 }
3170 break; 3548 break;
3171 case 21: /* report window title */ 3549 case 21: /* report window title */
3172 if (Options & Opt_insecure)
3173 { 3550 {
3174 char *s; 3551 char *s;
3175 XFetchName (display->display, TermWin.parent[0], &s); 3552 XFetchName (disp, TermWin.parent[0], &s);
3176 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3553 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3554 XFree (s);
3177 } 3555 }
3178 break; 3556 break;
3179 } 3557 }
3180} 3558}
3181#endif 3559#endif
3182 3560
… …
3186 * ends_how is terminator used. returned input must be free()'d 3564 * ends_how is terminator used. returned input must be free()'d
3187 */ 3565 */
3188unsigned char * 3566unsigned char *
3189rxvt_term::get_to_st (unicode_t &ends_how) 3567rxvt_term::get_to_st (unicode_t &ends_how)
3190{ 3568{
3191 unicode_t prev = 0, ch; 3569 unicode_t ch;
3570 bool seen_esc = false;
3192 unsigned int n = 0; 3571 unsigned int n = 0;
3193 unsigned char *s;
3194 unsigned char string[STRING_MAX]; 3572 wchar_t string[STRING_MAX];
3195 3573
3196 while ((ch = cmd_getc ()) != NOCHAR) 3574 while ((ch = cmd_getc ()) != NOCHAR)
3197 { 3575 {
3198 if (prev == C0_ESC) 3576 if (seen_esc)
3199 { 3577 {
3200 if (ch == 0x5c) /* 7bit ST */ 3578 if (ch == 0x5c) /* 7bit ST */
3201 break; 3579 break;
3202 else 3580 else
3203 return NULL; 3581 return NULL;
3204 } 3582 }
3583 else if (ch == C0_ESC)
3584 {
3585 seen_esc = true;
3586 continue;
3587 }
3205 else if (ch == C0_BEL || ch == CHAR_ST) 3588 else if (ch == C0_BEL || ch == CHAR_ST)
3206 break; 3589 break;
3207 else if (ch < 0x20) 3590 else if (ch < 0x20)
3208 return NULL; /* other control character - exit */ 3591 return NULL; /* other control character - exit */
3209 3592
3210 if (n >= sizeof (string) - 1) 3593 seen_esc = false;
3594
3595 if (n >= STRING_MAX - 1)
3211 // stop at some sane length 3596 // stop at some sane length
3212 return NULL; 3597 return NULL;
3213 3598
3214 if (ch == C0_SYN) 3599 if (ch == C0_SYN)
3215 {
3216 string[n++] = cmd_get8 (); 3600 string[n++] = cmd_get8 ();
3217 prev = 0;
3218 }
3219 else 3601 else
3220 string[n++] = prev = ch; 3602 string[n++] = ch;
3221 } 3603 }
3222 3604
3223 string[n++] = '\0'; 3605 string[n++] = '\0';
3224 3606
3225 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3226 return NULL;
3227
3228 ends_how = (ch == 0x5c ? C0_ESC : ch); 3607 ends_how = (ch == 0x5c ? C0_ESC : ch);
3229 STRNCPY (s, string, n); 3608
3230 return s; 3609 return (unsigned char *)rxvt_wcstombs (string);
3231} 3610}
3232 3611
3233/*----------------------------------------------------------------------*/ 3612/*----------------------------------------------------------------------*/
3234/* 3613/*
3235 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3614 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3279void 3658void
3280rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3659rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3281{ 3660{
3282 if (str[0] == '?' && !str[1]) 3661 if (str[0] == '?' && !str[1])
3283 { 3662 {
3284 if (Options & Opt_insecure)
3285 {
3286 unsigned short r, g, b; 3663 unsigned short r, g, b;
3287 PixColorsFocused[color].get (display, r, g, b); 3664 pix_colors_focused[color].get (display, r, g, b);
3288 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3665 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3289 }
3290 } 3666 }
3291 else 3667 else
3292 set_window_color (color, str); 3668 set_window_color (color, str);
3293} 3669}
3294 3670
3295/* 3671/*
3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3672 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3297 * 0 = change iconName/title
3298 * 1 = change iconName
3299 * 2 = change title
3300 * 4 = change color
3301 * 10 = change fg color
3302 * 11 = change bg color
3303 * 12 = change text color
3304 * 13 = change mouse foreground color
3305 * 17 = change highlight character colour
3306 * 18 = change bold character color
3307 * 19 = change underlined character color
3308 * 46 = change logfile (not implemented)
3309 * 50 = change font
3310 *
3311 * rxvt extensions:
3312 * 20 = bg pixmap
3313 * 39 = change default fg color
3314 * 49 = change default bg color
3315 * 55 = dump scrollback buffer and all of screen
3316 * 701 = change locale
3317 * 702 = find font
3318 * 703 = menu
3319 */ 3673 */
3320void 3674void
3321rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3675rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3322{ 3676{
3323 int changed = 0; 3677 int changed = 0;
3324 int color; 3678 int color;
3325 char *buf, *name; 3679 char *buf, *name;
3326 bool query = str[0] == '?' && !str[1]; 3680 bool query = str[0] == '?' && !str[1];
3681 int saveop = op;
3682 dDisp;
3327 3683
3328 assert (str != NULL); 3684 assert (str != NULL);
3329 switch (op) 3685 switch (op)
3330 { 3686 {
3331 case XTerm_name: 3687 case XTerm_name:
… …
3338 set_title (str); 3694 set_title (str);
3339 break; 3695 break;
3340 case XTerm_property: 3696 case XTerm_property:
3341 if (str[0] == '?') 3697 if (str[0] == '?')
3342 { 3698 {
3343 Atom prop = XInternAtom (display->display, str + 1, True); 3699 Atom prop = display->atom (str + 1);
3344 Atom actual_type; 3700 Atom actual_type;
3345 int actual_format; 3701 int actual_format;
3346 unsigned long nitems; 3702 unsigned long nitems;
3347 unsigned long bytes_after; 3703 unsigned long bytes_after;
3348 unsigned char *value = 0; 3704 unsigned char *value = 0;
3349 const char *str = ""; 3705 const char *str = "";
3350 3706
3351 if (prop 3707 if (prop
3352 && XGetWindowProperty (display->display, TermWin.parent[0], 3708 && XGetWindowProperty (disp, TermWin.parent[0],
3353 prop, 0, 1<<16, 0, AnyPropertyType, 3709 prop, 0, 1<<16, 0, AnyPropertyType,
3354 &actual_type, &actual_format, 3710 &actual_type, &actual_format,
3355 &nitems, &bytes_after, &value) == Success 3711 &nitems, &bytes_after, &value) == Success
3356 && actual_type != None 3712 && actual_type != None
3357 && actual_format == 8) 3713 && actual_format == 8)
… …
3366 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3722 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3367 3723
3368 if (eq) 3724 if (eq)
3369 { 3725 {
3370 *eq = 0; 3726 *eq = 0;
3371 XChangeProperty (display->display, TermWin.parent[0], 3727 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 } 3728 }
3376 else 3729 else
3377 XDeleteProperty (display->display, TermWin.parent[0], 3730 XDeleteProperty (disp, TermWin.parent[0],
3378 display->atom (str)); 3731 display->atom (str));
3379 } 3732 }
3380 break; 3733 break;
3381 3734
3382 case XTerm_Color: 3735 case XTerm_Color:
3383 for (buf = (char *)str; buf && *buf;) 3736 for (buf = (char *)str; buf && *buf;)
3384 { 3737 {
3385 if ((name = STRCHR (buf, ';')) == NULL) 3738 if ((name = strchr (buf, ';')) == NULL)
3386 break; 3739 break;
3387 3740
3388 *name++ = '\0'; 3741 *name++ = '\0';
3389 color = atoi (buf); 3742 color = atoi (buf);
3390 3743
3391 if (color < 0 || color >= TOTAL_COLORS) 3744 if (color < 0 || color >= TOTAL_COLORS)
3392 break; 3745 break;
3393 3746
3394 if ((buf = STRCHR (name, ';')) != NULL) 3747 if ((buf = strchr (name, ';')) != NULL)
3395 *buf++ = '\0'; 3748 *buf++ = '\0';
3396 3749
3397 if (name[0] == '?' && !name[1]) 3750 if (name[0] == '?' && !name[1])
3398 { 3751 {
3399 if (Options & Opt_insecure)
3400 {
3401 unsigned short r, g, b; 3752 unsigned short r, g, b;
3402 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3753 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); 3754 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3404 }
3405 } 3755 }
3406 else 3756 else
3407 set_window_color (color + minCOLOR, name); 3757 set_window_color (color + minCOLOR, name);
3408 } 3758 }
3409 break; 3759 break;
… …
3431 case XTerm_Color_UL: 3781 case XTerm_Color_UL:
3432 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3782 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3433 break; 3783 break;
3434 case XTerm_Color_RV: 3784 case XTerm_Color_RV:
3435 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3785 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3786 break;
3787 case URxvt_Color_IT:
3788 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3789 break;
3790#endif
3791#if TRANSPARENT && TINTING
3792 case URxvt_Color_tint:
3793 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3794 check_our_parents ();
3795 if (am_transparent)
3796 want_full_refresh = want_refresh = 1;
3436 break; 3797 break;
3437#endif 3798#endif
3438 3799
3439 case XTerm_Pixmap: 3800 case XTerm_Pixmap:
3440 if (*str != ';') 3801 if (*str != ';')
… …
3443 scale_pixmap (""); /* reset to default scaling */ 3804 scale_pixmap (""); /* reset to default scaling */
3444 set_bgPixmap (str); /* change pixmap */ 3805 set_bgPixmap (str); /* change pixmap */
3445#endif 3806#endif
3446 scr_touch (true); 3807 scr_touch (true);
3447 } 3808 }
3448 while ((str = STRCHR (str, ';')) != NULL) 3809 while ((str = strchr (str, ';')) != NULL)
3449 { 3810 {
3450 str++; 3811 str++;
3451#if XPM_BACKGROUND 3812#if XPM_BACKGROUND
3452 changed += scale_pixmap (str); 3813 changed += scale_pixmap (str);
3453#endif 3814#endif
3454
3455 } 3815 }
3816
3456 if (changed) 3817 if (changed)
3457 { 3818 {
3458#ifdef XPM_BACKGROUND 3819#ifdef XPM_BACKGROUND
3459 resize_pixmap (); 3820 resize_pixmap ();
3460#endif 3821#endif
… …
3471 3832
3472 case XTerm_logfile: 3833 case XTerm_logfile:
3473 // TODO, when secure mode? 3834 // TODO, when secure mode?
3474 break; 3835 break;
3475 3836
3476 case XTerm_font:
3477 if (query)
3478 {
3479 if (Options & Opt_insecure)
3480 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3481 TermWin.fontset->fontdesc
3482 ? TermWin.fontset->fontdesc
3483 : "",
3484 resp);
3485 }
3486 else
3487 change_font (str);
3488 break;
3489
3490#ifndef NO_FRILLS
3491 case XTerm_locale:
3492 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3496 }
3497 else
3498 {
3499 set_locale (str);
3500# ifdef USE_XIM
3501 im_cb ();
3502# endif
3503 }
3504 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
3515
3516#ifdef MENUBAR 3837#ifdef MENUBAR
3517 case XTerm_Menu: 3838 case URxvt_Menu:
3518 if (Options & Opt_insecure) 3839 if (options & Opt_insecure)
3519 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3840 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3520 break; 3841 break;
3521#endif 3842#endif
3522#if 0 3843#if 0
3523 case XTerm_dumpscreen: /* no error notices */ 3844 case XTerm_dumpscreen: /* no error notices */
… …
3527 { 3848 {
3528 scr_dump (fd); 3849 scr_dump (fd);
3529 close (fd); 3850 close (fd);
3530 } 3851 }
3531 } 3852 }
3853 break;
3854#endif
3855 case XTerm_font:
3856 op = URxvt_font;
3857 case URxvt_font:
3858#if ENABLE_STYLES
3859 case URxvt_boldFont:
3860 case URxvt_italicFont:
3861 case URxvt_boldItalicFont:
3862#endif
3863 if (query)
3864 tt_printf ("\33]%d;%-.250s%c", saveop,
3865 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3866 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3867 resp);
3868 else
3869 {
3870 const char *&res = rs[Rs_font + (op - URxvt_font)];
3871
3872 res = strdup (str);
3873 allocated.push_back ((void *)res);
3874 set_fonts ();
3875 }
3876 break;
3877
3878#if ENABLE_FRILLS
3879 case URxvt_locale:
3880 if (query)
3881 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3882 else
3883 {
3884 set_locale (str);
3885 pty.set_utf8_mode (enc_utf8);
3886 init_xlocale ();
3887 }
3888 break;
3889
3890 case URxvt_view_up:
3891 case URxvt_view_down:
3892 int lines = atoi (str);
3893
3894 if (lines)
3895 scr_page (op == URxvt_view_up ? UP : DN, lines);
3896 else
3897 {
3898 scr_erase_savelines ();
3899 }
3900
3532 break; 3901 break;
3533#endif 3902#endif
3534 } 3903 }
3535} 3904}
3536/*----------------------------------------------------------------------*/ 3905/*----------------------------------------------------------------------*/
… …
3550{ 3919{
3551 int state; 3920 int state;
3552 3921
3553 if (mode == 's') 3922 if (mode == 's')
3554 { 3923 {
3555 SavedModes |= (PrivateModes & bit); 3924 SavedModes |= (priv_modes & bit);
3556 return -1; 3925 return -1;
3557 } 3926 }
3558 else 3927 else
3559 { 3928 {
3560 if (mode == 'r') 3929 if (mode == 'r')
3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3930 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562 else 3931 else
3563 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3932 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564 PrivMode (state, bit); 3933 PrivMode (state, bit);
3565 } 3934 }
3566 3935
3567 return state; 3936 return state;
3568} 3937}
… …
3586 { 3, PrivMode_132 }, 3955 { 3, PrivMode_132 },
3587 { 4, PrivMode_smoothScroll }, 3956 { 4, PrivMode_smoothScroll },
3588 { 5, PrivMode_rVideo }, 3957 { 5, PrivMode_rVideo },
3589 { 6, PrivMode_relOrigin }, 3958 { 6, PrivMode_relOrigin },
3590 { 7, PrivMode_Autowrap }, 3959 { 7, PrivMode_Autowrap },
3960 // 8, bi-directional support mode
3591 { 9, PrivMode_MouseX10 }, 3961 { 9, PrivMode_MouseX10 },
3592#ifdef menuBar_esc 3962#ifdef menuBar_esc
3593 { menuBar_esc, PrivMode_menuBar }, 3963 { menuBar_esc, PrivMode_menuBar },
3594#endif 3964#endif
3965 // 18, 19 printing-related
3966 { 25, PrivMode_VisibleCursor },
3595#ifdef scrollBar_esc 3967#ifdef scrollBar_esc
3596 { scrollBar_esc, PrivMode_scrollBar }, 3968 { scrollBar_esc, PrivMode_scrollBar },
3597#endif 3969#endif
3598 // 18, 19 printing-related
3599 { 25, PrivMode_VisibleCursor },
3600 // 30 show scrollbar rxvt. extension
3601 { 35, PrivMode_ShiftKeys }, // rxvt extension 3970 { 35, PrivMode_ShiftKeys }, // rxvt extension
3602 { 40, PrivMode_132OK }, 3971 { 40, PrivMode_132OK },
3603 // 41 xterm more fixes NYI 3972 // 41 xterm more fixes NYI
3604 // 45 margin bell NYI 3973 // 45 margin bell NYI
3605 // 46 start logging 3974 // 46 start logging
… …
3646 4015
3647 /* extra handling for values with state unkept */ 4016 /* extra handling for values with state unkept */
3648 switch (arg[i]) 4017 switch (arg[i])
3649 { 4018 {
3650 case 1048: /* alternative cursor save */ 4019 case 1048: /* alternative cursor save */
4020 case 1049:
3651 if (Options & Opt_secondaryScreen) 4021 if (options & Opt_secondaryScreen)
3652 if (mode == 0) 4022 if (mode == 0)
3653 scr_cursor (RESTORE); 4023 scr_cursor (RESTORE);
3654 else if (mode == 1) 4024 else if (mode == 1)
3655 scr_cursor (SAVE); 4025 scr_cursor (SAVE);
3656 break; 4026 break;
… …
3667 * within VT52 mode 4037 * within VT52 mode
3668 */ 4038 */
3669 PrivMode (1, PrivMode_vt52); 4039 PrivMode (1, PrivMode_vt52);
3670 break; 4040 break;
3671 case 3: /* 80/132 */ 4041 case 3: /* 80/132 */
3672 if (PrivateModes & PrivMode_132OK) 4042 if (priv_modes & PrivMode_132OK)
3673 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4043 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3674 break; 4044 break;
3675 case 4: /* smooth scrolling */ 4045 case 4: /* smooth scrolling */
3676 if (state) 4046 if (state)
3677 Options &= ~Opt_jumpScroll; 4047 options &= ~Opt_jumpScroll;
3678 else 4048 else
3679 Options |= Opt_jumpScroll; 4049 options |= Opt_jumpScroll;
3680 break; 4050 break;
3681 case 5: /* reverse video */ 4051 case 5: /* reverse video */
3682 scr_rvideo_mode (state); 4052 scr_rvideo_mode (state);
3683 break; 4053 break;
3684 case 6: /* relative/absolute origins */ 4054 case 6: /* relative/absolute origins */
… …
3688 scr_autowrap (state); 4058 scr_autowrap (state);
3689 break; 4059 break;
3690 /* case 8: - auto repeat, can't do on a per window basis */ 4060 /* case 8: - auto repeat, can't do on a per window basis */
3691 case 9: /* X10 mouse reporting */ 4061 case 9: /* X10 mouse reporting */
3692 if (state) /* orthogonal */ 4062 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX11; 4063 priv_modes &= ~PrivMode_MouseX11;
3694 break; 4064 break;
3695#ifdef menuBar_esc 4065#ifdef menuBar_esc
3696 case menuBar_esc: 4066 case menuBar_esc:
3697#ifdef MENUBAR 4067#ifdef MENUBAR
3698 map_menuBar (state); 4068 map_menuBar (state);
… …
3718 break; 4088 break;
3719 /* case 66: - application key pad */ 4089 /* case 66: - application key pad */
3720 /* case 67: - backspace key */ 4090 /* case 67: - backspace key */
3721 case 1000: /* X11 mouse reporting */ 4091 case 1000: /* X11 mouse reporting */
3722 if (state) /* orthogonal */ 4092 if (state) /* orthogonal */
3723 PrivateModes &= ~PrivMode_MouseX10; 4093 priv_modes &= ~PrivMode_MouseX10;
3724 break; 4094 break;
3725#if 0 4095#if 0
3726 case 1001: 4096 case 1001:
3727 break; /* X11 mouse highlighting */ 4097 break; /* X11 mouse highlighting */
3728#endif 4098#endif
3729 case 1010: /* scroll to bottom on TTY output inhibit */ 4099 case 1010: /* scroll to bottom on TTY output inhibit */
3730 if (state) 4100 if (state)
3731 Options &= ~Opt_scrollTtyOutput; 4101 options &= ~Opt_scrollTtyOutput;
3732 else 4102 else
3733 Options |= Opt_scrollTtyOutput; 4103 options |= Opt_scrollTtyOutput;
3734 break; 4104 break;
3735 case 1011: /* scroll to bottom on key press */ 4105 case 1011: /* scroll to bottom on key press */
3736 if (state) 4106 if (state)
3737 Options |= Opt_scrollTtyKeypress; 4107 options |= Opt_scrollTtyKeypress;
3738 else 4108 else
3739 Options &= ~Opt_scrollTtyKeypress; 4109 options &= ~Opt_scrollTtyKeypress;
3740 break; 4110 break;
3741 case 1047: /* secondary screen w/ clearing last */ 4111 case 1047: /* secondary screen w/ clearing last */
3742 if (Options & Opt_secondaryScreen) 4112 if (options & Opt_secondaryScreen)
3743 if (current_screen != PRIMARY) 4113 if (current_screen != PRIMARY)
3744 scr_erase_screen (2); 4114 scr_erase_screen (2);
3745 scr_change_screen (state); 4115 scr_change_screen (state);
3746 break; 4116 break;
3747 case 1049: /* secondary screen w/ clearing first */ 4117 case 1049: /* secondary screen w/ clearing first */
3748 scr_change_screen (state); 4118 scr_change_screen (state);
3749 if (Options & Opt_secondaryScreen) 4119 if (options & Opt_secondaryScreen)
3750 if (current_screen != PRIMARY) 4120 if (current_screen != PRIMARY)
3751 scr_erase_screen (2); 4121 scr_erase_screen (2);
3752 break; 4122 break;
3753 default: 4123 default:
3754 break; 4124 break;
… …
3780 rendset = 0, rendstyle = ~RS_None; 4150 rendset = 0, rendstyle = ~RS_None;
3781 break; 4151 break;
3782 case 1: 4152 case 1:
3783 rendset = 1, rendstyle = RS_Bold; 4153 rendset = 1, rendstyle = RS_Bold;
3784 break; 4154 break;
3785 //case 2: // faint or second colour 4155 //case 2: // low intensity
4156 case 3:
4157 rendset = 1, rendstyle = RS_Italic;
4158 break;
3786 case 4: 4159 case 4:
3787 rendset = 1, rendstyle = RS_Uline; 4160 rendset = 1, rendstyle = RS_Uline;
3788 break; 4161 break;
3789 case 5: // slowly blinking 4162 case 5: // slowly blinking
3790 case 6: // rapidly blinking 4163 case 6: // rapidly blinking
… …
3802 //case 11: // scoansi acs on, first alt font 4175 //case 11: // scoansi acs on, first alt font
3803 //case 12: // scoansi acs on, |0x80, second alt font 4176 //case 12: // scoansi acs on, |0x80, second alt font
3804 //... 4177 //...
3805 //case 19: // ninth alt font 4178 //case 19: // ninth alt font
3806 //case 20: // gothic 4179 //case 20: // gothic
3807 case 21: // disable bold, faint 4180 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3808 rendset = 0, rendstyle = RS_Bold; 4181 rendset = 0, rendstyle = RS_Bold;
3809 break; 4182 break;
3810 case 22: 4183 case 22: // normal intensity
3811 rendset = 0, rendstyle = RS_Bold; 4184 rendset = 0, rendstyle = RS_Bold;
3812 break; 4185 break;
3813 //case 23: disable italic 4186 case 23: // disable italic
4187 rendset = 0, rendstyle = RS_Italic;
4188 break;
3814 case 24: 4189 case 24:
3815 rendset = 0, rendstyle = RS_Uline; 4190 rendset = 0, rendstyle = RS_Uline;
3816 break; 4191 break;
3817 case 25: 4192 case 25:
4193 rendset = 0, rendstyle = RS_Blink;
4194 break;
4195 case 26: // variable spacing (iso 8613)
3818 rendset = 0, rendstyle = RS_Blink; 4196 rendset = 0, rendstyle = RS_Blink;
3819 break; 4197 break;
3820 case 27: 4198 case 27:
3821 rendset = 0, rendstyle = RS_RVid; 4199 rendset = 0, rendstyle = RS_RVid;
3822 break; 4200 break;
… …
3840 case 35: 4218 case 35:
3841 case 36: 4219 case 36:
3842 case 37: 4220 case 37:
3843 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4221 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3844 break; 4222 break;
3845#ifdef TTY_256COLOR 4223 case 38: // set fg color, ISO 8613-6
3846 case 38:
3847 if (nargs > i + 2 && arg[i + 1] == 5) 4224 if (nargs > i + 2 && arg[i + 1] == 5)
3848 { 4225 {
3849 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4226 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3850 i += 2; 4227 i += 2;
3851 } 4228 }
3852 break; 4229 break;
3853#endif
3854 case 39: /* default fg */ 4230 case 39: /* default fg */
3855 scr_color (Color_fg, Color_fg); 4231 scr_color (Color_fg, Color_fg);
3856 break; 4232 break;
3857 4233
3858 case 40: 4234 case 40:
… …
3863 case 45: 4239 case 45:
3864 case 46: 4240 case 46:
3865 case 47: 4241 case 47:
3866 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4242 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3867 break; 4243 break;
3868#ifdef TTY_256COLOR 4244 case 48: // set bg color, ISO 8613-6
3869 case 48:
3870 if (nargs > i + 2 && arg[i + 1] == 5) 4245 if (nargs > i + 2 && arg[i + 1] == 5)
3871 { 4246 {
3872 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4247 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3873 i += 2; 4248 i += 2;
3874 } 4249 }
3875 break; 4250 break;
3876#endif
3877 case 49: /* default bg */ 4251 case 49: /* default bg */
3878 scr_color (Color_bg, Color_bg); 4252 scr_color (Color_bg, Color_bg);
3879 break; 4253 break;
4254
4255 //case 50: // not variable spacing
3880 4256
3881#ifndef NO_BRIGHTCOLOR 4257#ifndef NO_BRIGHTCOLOR
3882 case 90: 4258 case 90:
3883 case 91: /* set bright fg color */ 4259 case 91: /* set bright fg color */
3884 case 92: 4260 case 92:
3885 case 93: 4261 case 93:
3886 case 94: 4262 case 94:
3887 case 95: 4263 case 95:
3888 case 96: 4264 case 96:
3889 case 97: 4265 case 97:
3890 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4266 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3891 Color_fg);
3892 break; 4267 break;
3893 case 100: 4268 case 100:
3894 case 101: /* set bright bg color */ 4269 case 101: /* set bright bg color */
3895 case 102: 4270 case 102:
3896 case 103: 4271 case 103:
3897 case 104: 4272 case 104:
3898 case 105: 4273 case 105:
3899 case 106: 4274 case 106:
3900 case 107: 4275 case 107:
3901 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4276 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3902 Color_bg);
3903 break; 4277 break;
3904#endif 4278#endif
3905 4279
3906 } 4280 }
3907 } 4281 }
… …
3914{ 4288{
3915 unicode_t ch, cmd = cmd_getc (); 4289 unicode_t ch, cmd = cmd_getc ();
3916 4290
3917 if (cmd == 'Q') 4291 if (cmd == 'Q')
3918 { /* query graphics */ 4292 { /* query graphics */
3919 tt_printf ("\033G0\n"); /* no graphics */ 4293 tt_printf ("\033G0\012"); /* no graphics */
3920 return; 4294 return;
3921 } 4295 }
3922 /* swallow other graphics sequences until terminating ':' */ 4296 /* swallow other graphics sequences until terminating ':' */
3923 do 4297 do
3924 ch = cmd_getc (); 4298 ch = cmd_getc ();
… …
3939 unsigned char buf[256]; 4313 unsigned char buf[256];
3940 4314
3941 va_start (arg_ptr, fmt); 4315 va_start (arg_ptr, fmt);
3942 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4316 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3943 va_end (arg_ptr); 4317 va_end (arg_ptr);
3944 tt_write (buf, STRLEN (buf)); 4318 tt_write (buf, strlen (buf));
3945} 4319}
3946 4320
3947/* ---------------------------------------------------------------------- */ 4321/* ---------------------------------------------------------------------- */
3948/* Write data to the pty as typed by the user, pasted with the mouse, 4322/* 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. 4323 * or generated by us in response to a query ESC sequence.
3950 */ 4324 */
4325const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4326
3951void 4327void
3952rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4328rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3953{ 4329{
3954 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4330 if (v_buflen == 0)
4331 {
4332 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3955 4333
3956 if (len) 4334 if ((unsigned int)written == len)
4335 return;
4336
4337 data += written;
4338 len -= written;
3957 { 4339 }
4340
4341 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4342
4343 memcpy (v_buffer + v_buflen, data, len);
4344 v_buflen += len;
4345
4346 pty_ev.set (EVENT_READ | EVENT_WRITE);
4347}
4348
4349void rxvt_term::pty_write ()
4350{
4351 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4352
4353 if (written > 0)
4354 {
4355 v_buflen -= written;
4356
3958 if (v_buflen == 0) 4357 if (v_buflen == 0)
3959 { 4358 {
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); 4359 free (v_buffer);
3987 v_buffer = 0; 4360 v_buffer = 0;
3988 v_buflen = 0; 4361 v_buflen = 0;
3989 4362
3990 pty_ev.set (EVENT_READ); 4363 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; 4364 return;
4003 } 4365 }
4366
4367 memmove (v_buffer, v_buffer + written, v_buflen);
4004 } 4368 }
4369 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4370 // original code just ignores this...
4371 destroy ();
4005} 4372}
4006 4373
4007/*----------------------- end-of-file (C source) -----------------------*/ 4374/*----------------------- end-of-file (C source) -----------------------*/
4008 4375

Diff Legend

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