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.120 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.199 by root, Sun Feb 20 02:00:43 2005 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
57#include <csignal>
54 58
55/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
56 60
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 62
59// exception thrown when the command parser runs out of input data 63// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 64class out_of_input { } out_of_input;
65
66#if ENABLE_FRILLS || ISO_14755
67
68#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1)
70#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
71#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
72#define ISO_14755_MASK 0x0fffffffUL
73
74#if ISO_14755
75static unsigned short iso14755_symtab[] = {
76 // keysym, unicode
77 XK_Left, 0x2190,
78 XK_KP_Left, 0x2190,
79 XK_Up, 0x2191,
80 XK_KP_Up, 0x2191,
81 XK_Right, 0x2192,
82 XK_KP_Right, 0x2192,
83 XK_Down, 0x2193,
84 XK_KP_Down, 0x2193,
85 XK_Linefeed, 0x21b4,
86 XK_Return, 0x21b5,
87 XK_KP_Enter, 0x21b5,
88
89 XK_Prior, 0x21de,
90 XK_Next, 0x21df,
91 XK_Tab, 0x21e5,
92 XK_ISO_Left_Tab, 0x21e6,
93 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7,
95
96 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef,
103 XK_ISO_Group_Lock, 0x21f0,
104 XK_Home, 0x21f1,
105 XK_End, 0x21f2,
106
107 XK_Execute, 0x2318,
108 XK_Begin, 0x2320,
109 XK_Delete, 0x2326,
110 XK_Clear, 0x2327,
111 XK_BackSpace, 0x232b,
112 XK_Insert, 0x2380,
113 XK_Control_L, 0x2388,
114 XK_Control_R, 0x2388,
115 XK_Pause, 0x2389,
116 XK_Break, 0x238a,
117 XK_Escape, 0x238b,
118 XK_Undo, 0x238c,
119 XK_Print, 0x2399,
120
121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
129 XK_KP_Space, 0x2422,
130#endif
131 0,
132};
133
134void
135rxvt_term::iso14755_54 (int x, int y)
136{
137 x = Pixel2Col (x);
138 y = Pixel2Row (y);
139
140 if (x < 0 || x >= TermWin.ncol
141 || y < 0 || y >= TermWin.nrow)
142 return;
143
144 for (;;)
145 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
147
148 if (t != NOCHAR || !x)
149 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54;
153 break;
154 }
155
156 x--;
157 }
158
159}
160#endif
161
162#if ENABLE_OVERLAY
163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
165{
166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2;
169 int len;
170
171#if ENABLE_COMBINING
172 if (IS_COMPOSE (ch))
173 {
174 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr);
177 }
178 else
179#endif
180 {
181 ch2 = ch;
182
183 alloc = 0;
184 chr = &ch2;
185 len = 1;
186 }
187
188 int width = strlen (f->name);
189
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
191
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193
194 for (int y = 0; y < len; y++)
195 {
196 char buf[9];
197
198 ch = *chr++;
199
200 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '=');
203#if !UNICODE3
204 if (ch >= 0x10000)
205 ch = 0xfffd;
206#endif
207 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r);
209 }
210
211 scr_overlay_set (0, len, f->name);
212
213#if ENABLE_COMBINING
214 if (alloc)
215 delete [] alloc;
216#endif
217}
218#endif
219
220void
221rxvt_term::commit_iso14755 ()
222{
223 wchar_t ch[2];
224
225 ch[0] = iso14755buf & ISO_14755_MASK;
226 ch[1] = 0;
227
228 if (iso14755buf & ISO_14755_51)
229 {
230 char mb[16];
231 int len;
232
233 // allow verbatim 0-bytes and control-bytes to be entered
234 if (ch[0] >= 0x20)
235 len = wcstombs (mb, ch, 16);
236 else
237 {
238 mb[0] = ch[0];
239 len = 1;
240 }
241
242 if (len > 0)
243 tt_write ((unsigned char *)mb, len);
244 else
245 scr_bell ();
246 }
247
248 iso14755buf = 0;
249}
250
251int
252rxvt_term::hex_keyval (XKeyEvent &ev)
253{
254 // check wether this event corresponds to a hex digit
255 // if the modifiers had not been pressed.
256 for (int index = 0; index < 8; index++)
257 {
258 KeySym k = XLookupKeysym (&ev, index);
259
260 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
261 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
262 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
263 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
264 }
265
266 return -1;
267}
268#endif
61 269
62/*{{{ Convert the keypress event into a string */ 270/*{{{ Convert the keypress event into a string */
63void 271void
64rxvt_term::lookup_key (XKeyEvent &ev) 272rxvt_term::lookup_key (XKeyEvent &ev)
65{ 273{
… …
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 284 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 285 * escape sequence to toggle the Keypad.
78 * 286 *
79 * Always permit `shift' to override the current setting 287 * Always permit `shift' to override the current setting
80 */ 288 */
81 shft = (ev.state & ShiftMask); 289 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 290 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 291 meta = ev.state & ModMetaMask;
84 292
85 if (numlock_state || (ev.state & ModNumLockMask)) 293 if (numlock_state || (ev.state & ModNumLockMask))
86 { 294 {
87 numlock_state = (ev.state & ModNumLockMask); 295 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 296 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
147 valid_keysym = keysym != NoSymbol; 355 valid_keysym = keysym != NoSymbol;
148 } 356 }
149 357
150 if (valid_keysym) 358 if (valid_keysym)
151 { 359 {
360#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state))
362 return;
363#endif
364
152 if (TermWin.saveLines) 365 if (TermWin.saveLines)
153 { 366 {
154#ifdef UNSHIFTED_SCROLLKEYS 367#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 368 if (!ctrl && !meta)
156 {
157#else 369#else
158 if (IS_SCROLL_MOD) 370 if (IS_SCROLL_MOD)
371#endif
159 { 372 {
160#endif
161 int lnsppg; 373 int lnsppg;
162 374
163#ifdef PAGING_CONTEXT_LINES 375#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 377#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 426 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 427 {
216 keysym += (XK_F11 - XK_F1); 428 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 429 shft = 0; /* turn off Shift */
218 } 430 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 431 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 432 {
221 switch (keysym) 433 switch (keysym)
222 { 434 {
223 /* normal XTerm key bindings */ 435 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 436 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 437 selection_request (ev.time, 0, 0);
226 return; 438 return;
439#if TODO
227 /* rxvt extras */ 440 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 441 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 442 change_font (FONT_UP);
230 return; 443 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 444 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 445 change_font (FONT_DN);
233 return; 446 return;
447#endif
234 } 448 }
235 } 449 }
236 } 450 }
237#ifdef PRINTPIPE 451
238 if (keysym == XK_Print) 452#if ENABLE_FRILLS || ISO_14755
239 { 453 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 454 if (shft && ctrl)
241 return;
242 } 455 {
243#endif 456 int hv;
244 457
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 458 if (iso14755buf & ISO_14755_51
246 { 459 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 460 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 461 {
250 unsigned int l; 462 commit_iso14755 ();
251 const unsigned char *kbuf0; 463 iso14755buf = ISO_14755_51;
252 464# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 465 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 466# endif
261 ) 467 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 468 }
266 469 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 470 {
471 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
472 | hv | ISO_14755_51;
473# if ISO_14755
474 iso14755_51 (iso14755buf & ISO_14755_MASK);
475# endif
268 return; 476 return;
269 } 477 }
270 else 478 else
479 {
480# if ENABLE_OVERLAY
481 scr_overlay_off ();
271#endif 482# endif
483 iso14755buf = 0;
484 }
485 }
486 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
487 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
488 if (!(iso14755buf & ISO_14755_STARTED))
489 {
490 iso14755buf |= ISO_14755_STARTED;
491# if ENABLE_OVERLAY
492 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
493 scr_overlay_set (0, 0, "ISO 14755 mode");
494# endif
495 }
496#endif
497
498#ifdef PRINTPIPE
499 if (keysym == XK_Print)
500 {
501 scr_printscreen (ctrl | shft);
502 return;
503 }
504#endif
505
506 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
507 {
272 { 508 {
273 newlen = 1; 509 newlen = 1;
274 switch (keysym) 510 switch (keysym)
275 { 511 {
276#ifndef NO_BACKSPACE_KEY 512#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 513 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 514 if (priv_modes & PrivMode_HaveBackSpace)
279 { 515 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 516 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 517 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 518 kbuf[1] = '\0';
283 } 519 }
284 else 520 else
285 STRCPY (kbuf, key_backspace); 521 strcpy (kbuf, key_backspace);
286 break; 522 break;
287#endif 523#endif
288#ifndef NO_DELETE_KEY 524#ifndef NO_DELETE_KEY
525# ifdef XK_KP_Prior
526 case XK_KP_Delete:
527 /* allow shift to override */
528 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
529 {
530 strcpy (kbuf, "\033On");
531 break;
532 }
533 /* FALLTHROUGH */
534# endif
289 case XK_Delete: 535 case XK_Delete:
290 STRCPY (kbuf, key_delete); 536 strcpy (kbuf, key_delete);
291 break; 537 break;
292#endif 538#endif
293 case XK_Tab: 539 case XK_Tab:
294 if (shft) 540 if (shft)
295 STRCPY (kbuf, "\033[Z"); 541 strcpy (kbuf, "\033[Z");
296 else 542 else
297 { 543 {
298#ifdef CTRL_TAB_MAKES_META 544#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 545 if (ctrl)
300 meta = 1; 546 meta = 1;
… …
310#ifdef XK_KP_Left 556#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 557 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 558 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 559 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 560 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 561 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 562 {
317 STRCPY (kbuf, "\033OZ"); 563 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 564 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 565 break;
320 } 566 }
321 else 567 else
322 /* translate to std. cursor key */ 568 /* translate to std. cursor key */
… …
325#endif 571#endif
326 case XK_Up: /* "\033[A" */ 572 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 573 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 574 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 575 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 576 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 577 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 578 /* do Shift first */
333 if (shft) 579 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 580 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 581 else if (ctrl)
336 { 582 {
337 kbuf[1] = 'O'; 583 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 584 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 585 }
340 else if (PrivateModes & PrivMode_aplCUR) 586 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 587 kbuf[1] = 'O';
342 break; 588 break;
343 589
344#ifndef UNSHIFTED_SCROLLKEYS 590#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 591# ifdef XK_KP_Prior
346 case XK_KP_Prior: 592 case XK_KP_Prior:
347 /* allow shift to override */ 593 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 594 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 595 {
350 STRCPY (kbuf, "\033Oy"); 596 strcpy (kbuf, "\033Oy");
351 break; 597 break;
352 } 598 }
353 /* FALLTHROUGH */ 599 /* FALLTHROUGH */
354# endif 600# endif
355 case XK_Prior: 601 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 602 strcpy (kbuf, "\033[5~");
357 break; 603 break;
358# ifdef XK_KP_Next 604# ifdef XK_KP_Next
359 case XK_KP_Next: 605 case XK_KP_Next:
360 /* allow shift to override */ 606 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 607 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 608 {
363 STRCPY (kbuf, "\033Os"); 609 strcpy (kbuf, "\033Os");
364 break; 610 break;
365 } 611 }
366 /* FALLTHROUGH */ 612 /* FALLTHROUGH */
367# endif 613# endif
368 case XK_Next: 614 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 615 strcpy (kbuf, "\033[6~");
370 break; 616 break;
371#endif 617#endif
372 case XK_KP_Enter: 618 case XK_KP_Enter:
373 /* allow shift to override */ 619 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 620 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 621 {
376 STRCPY (kbuf, "\033OM"); 622 strcpy (kbuf, "\033OM");
623 break;
624 }
625
626 /* FALLTHROUGH */
627
628 case XK_Return:
629 if (priv_modes & PrivMode_LFNL)
630 {
631 kbuf[0] = '\015';
632 kbuf[1] = '\012';
633 kbuf[2] = '\0';
377 } 634 }
378 else 635 else
379 { 636 {
380 kbuf[0] = '\r'; 637 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 638 kbuf[1] = '\0';
382 } 639 }
383 break; 640 break;
384 641
385#ifdef XK_KP_Begin 642#ifdef XK_KP_Begin
386 case XK_KP_Begin: 643 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 644 strcpy (kbuf, "\033Ou");
388 break; 645 break;
389 646
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 647#endif
398 case XK_KP_F1: /* "\033OP" */ 648 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 649 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 650 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 651 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 652 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 653 kbuf[2] += (keysym - XK_KP_F1);
404 break; 654 break;
405 655
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 656 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 657 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 668 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 669 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 670 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 671 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 672 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 673 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 674 {
425 STRCPY (kbuf, "\033Oj"); 675 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 676 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 677 }
428 else 678 else
429 { 679 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 680 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 681 kbuf[1] = '\0';
432 } 682 }
433 break; 683 break;
434 684
435 case XK_Find: 685 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 686 strcpy (kbuf, "\033[1~");
437 break; 687 break;
688
689#ifdef XK_KP_End
690 case XK_KP_Insert:
691 /* allow shift to override */
692 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
693 {
694 strcpy (kbuf, "\033Op");
695 break;
696 }
697 /* FALLTHROUGH */
698#endif
438 case XK_Insert: 699 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 700 strcpy (kbuf, "\033[2~");
440 break; 701 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 702#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 703 case DXK_Remove:
443 /* FALLTHROUGH */ 704 /* FALLTHROUGH */
444#endif 705#endif
445 case XK_Execute: 706 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 707 strcpy (kbuf, "\033[3~");
447 break; 708 break;
448 case XK_Select: 709 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 710 strcpy (kbuf, "\033[4~");
450 break; 711 break;
451#ifdef XK_KP_End 712#ifdef XK_KP_End
452 case XK_KP_End: 713 case XK_KP_End:
453 /* allow shift to override */ 714 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 715 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 716 {
456 STRCPY (kbuf, "\033Oq"); 717 strcpy (kbuf, "\033Oq");
457 break; 718 break;
458 } 719 }
459 /* FALLTHROUGH */ 720 /* FALLTHROUGH */
460#endif 721#endif
461 case XK_End: 722 case XK_End:
462 STRCPY (kbuf, KS_END); 723 strcpy (kbuf, KS_END);
463 break; 724 break;
464#ifdef XK_KP_Home 725#ifdef XK_KP_Home
465 case XK_KP_Home: 726 case XK_KP_Home:
466 /* allow shift to override */ 727 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 729 {
469 STRCPY (kbuf, "\033Ow"); 730 strcpy (kbuf, "\033Ow");
470 break; 731 break;
471 } 732 }
472 /* FALLTHROUGH */ 733 /* FALLTHROUGH */
473#endif 734#endif
474 case XK_Home: 735 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 736 strcpy (kbuf, KS_HOME);
476 break; 737 break;
477 738
478#define FKEY(n, fkey) \ 739#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 740 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 741
… …
532#undef FKEY 793#undef FKEY
533 default: 794 default:
534 newlen = 0; 795 newlen = 0;
535 break; 796 break;
536 } 797 }
798
537 if (newlen) 799 if (newlen)
538 len = STRLEN (kbuf); 800 len = strlen (kbuf);
539 } 801 }
540 802
541 /* 803 /*
542 * Pass meta for all function keys, if 'meta' option set 804 * Pass meta for all function keys, if 'meta' option set
543 */ 805 */
… …
550 else if (ctrl && keysym == XK_minus) 812 else if (ctrl && keysym == XK_minus)
551 { 813 {
552 len = 1; 814 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 815 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 816 }
817 else if (keysym == XK_ISO_Left_Tab)
818 {
819 strcpy (kbuf, "\033[Z");
820 len = 3;
821 }
555 else 822 else
556 { 823 {
557#ifdef META8_OPTION 824#ifdef META8_OPTION
558 /* set 8-bit on */ 825 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 826 if (meta && (meta_char == 0x80))
… …
571 } 838 }
572 839
573 if (len <= 0) 840 if (len <= 0)
574 return; /* not mapped */ 841 return; /* not mapped */
575 842
576 if (Options & Opt_scrollTtyKeypress) 843 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 844 if (TermWin.view_start)
578 { 845 {
579 TermWin.view_start = 0; 846 TermWin.view_start = 0;
580 want_refresh = 1; 847 want_refresh = 1;
581 } 848 }
… …
617#endif /* DEBUG_CMD */ 884#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 885 tt_write (kbuf, (unsigned int)len);
619} 886}
620/*}}} */ 887/*}}} */
621 888
622#if (MENUBAR_MAX) 889#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 890/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */ 891/* attempt to `write' count to the input buffer */
625unsigned int 892unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 893rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
627{ 894{
… …
630 n = cmdbuf_ptr - cmdbuf_base; 897 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 898 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 899
633 if (n > 0 && s < count) 900 if (n > 0 && s < count)
634 { 901 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 902 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 903 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 904 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 905 cmdbuf_endp -= n;
639 s += n; 906 s += n;
640 } 907 }
… …
650 917
651 cmd_parse (); 918 cmd_parse ();
652 919
653 return 0; 920 return 0;
654} 921}
655#endif /* MENUBAR_MAX */ 922#endif
656 923
657void 924void
658rxvt_term::flush () 925rxvt_term::flush ()
659{ 926{
927 flush_ev.stop ();
928
660#ifdef TRANSPARENT 929#ifdef TRANSPARENT
661 if (want_full_refresh) 930 if (want_full_refresh)
662 { 931 {
663 want_full_refresh = 0; 932 want_full_refresh = 0;
664 scr_clear (); 933 scr_clear ();
… …
674 IMSendSpot (); 943 IMSendSpot ();
675#endif 944#endif
676 } 945 }
677 946
678 display->flush (); 947 display->flush ();
679
680 flush_ev.stop ();
681} 948}
682 949
683void 950void
684rxvt_term::check_cb (check_watcher &w) 951rxvt_term::check_cb (check_watcher &w)
685{ 952{
… …
761{ 1028{
762 if (mouse_slip_wheel_speed == 0 1029 if (mouse_slip_wheel_speed == 0
763 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
764 : scr_page (UP, mouse_slip_wheel_speed)) 1031 : scr_page (UP, mouse_slip_wheel_speed))
765 { 1032 {
1033 if (TermWin.view_start == TermWin.nscrolled ||
1034 TermWin.view_start == 0)
1035 mouse_slip_wheel_speed = 0;
1036
766 refresh_type |= SMOOTH_REFRESH; 1037 refresh_type |= SMOOTH_REFRESH;
767 want_refresh = 1; 1038 want_refresh = 1;
768 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
769 } 1040 }
770} 1041}
… …
783 1054
784 memmove (cmdbuf_base, cmdbuf_ptr, n); 1055 memmove (cmdbuf_base, cmdbuf_ptr, n);
785 cmdbuf_ptr = cmdbuf_base; 1056 cmdbuf_ptr = cmdbuf_base;
786 cmdbuf_endp = cmdbuf_ptr + n; 1057 cmdbuf_endp = cmdbuf_ptr + n;
787 1058
788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
789 1060
790 if (n > 0) 1061 if (n > 0)
791 { 1062 {
792 cmdbuf_endp += n; 1063 cmdbuf_endp += n;
793 return true; 1064 return true;
… …
802rxvt_term::pty_cb (io_watcher &w, short revents) 1073rxvt_term::pty_cb (io_watcher &w, short revents)
803{ 1074{
804 SET_R (this); 1075 SET_R (this);
805 SET_LOCALE (locale); 1076 SET_LOCALE (locale);
806 1077
807 if (revents & EVENT_WRITE)
808 tt_write (0, 0);
809 else if (revents & EVENT_READ) 1078 if (revents & EVENT_READ)
810 // loop, but don't allow a single term to monopolize us 1079 // loop, but don't allow a single term to monopolize us
811 while (pty_fill ()) 1080 while (pty_fill ())
812 if (cmd_parse ()) 1081 if (cmd_parse ())
813 break; 1082 break;
1083
1084 if (revents & EVENT_WRITE)
1085 pty_write ();
814} 1086}
815 1087
816void 1088void
817rxvt_term::pointer_unblank () 1089rxvt_term::pointer_unblank ()
818{ 1090{
… …
820 recolour_cursor (); 1092 recolour_cursor ();
821 1093
822#ifdef POINTER_BLANK 1094#ifdef POINTER_BLANK
823 hidden_pointer = 0; 1095 hidden_pointer = 0;
824 1096
825 if (Options & Opt_pointerBlank) 1097 if (options & Opt_pointerBlank)
826 pointer_ev.start (NOW + pointerBlankDelay); 1098 pointer_ev.start (NOW + pointerBlankDelay);
827#endif 1099#endif
828} 1100}
829 1101
830#ifdef POINTER_BLANK 1102#ifdef POINTER_BLANK
831void 1103void
832rxvt_term::pointer_blank () 1104rxvt_term::pointer_blank ()
833{ 1105{
834 if (! (Options & Opt_pointerBlank)) 1106 if (! (options & Opt_pointerBlank))
835 return; 1107 return;
836 1108
837 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
838 XFlush (display->display); 1110 XFlush (display->display);
839 1111
840 hidden_pointer = 1; 1112 hidden_pointer = 1;
841} 1113}
842 1114
… …
859 x = ev.x; 1131 x = ev.x;
860 y = ev.y; 1132 y = ev.y;
861 pixel_position (&x, &y); 1133 pixel_position (&x, &y);
862 1134
863 if (MEvent.button == AnyButton) 1135 if (MEvent.button == AnyButton)
864 {
865 button_number = 3; 1136 button_number = 3;
866 }
867 else 1137 else
868 { 1138 {
869 button_number = MEvent.button - Button1; 1139 button_number = MEvent.button - Button1;
870 /* add 0x3D for wheel events, like xterm does */ 1140 /* add 0x3D for wheel events, like xterm does */
871 if (button_number >= 3) 1141 if (button_number >= 3)
872 button_number += (64 - 3); 1142 button_number += (64 - 3);
873 } 1143 }
874 1144
875 if (PrivateModes & PrivMode_MouseX10) 1145 if (priv_modes & PrivMode_MouseX10)
876 { 1146 {
877 /* 1147 /*
878 * do not report ButtonRelease 1148 * do not report ButtonRelease
879 * no state info allowed 1149 * no state info allowed
880 */ 1150 */
… …
895 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1165 + ((MEvent.state & ModMetaMask) ? 8 : 0)
896 + ((MEvent.state & ControlMask) ? 16 : 0); 1166 + ((MEvent.state & ControlMask) ? 16 : 0);
897#ifdef MOUSE_REPORT_DOUBLECLICK 1167#ifdef MOUSE_REPORT_DOUBLECLICK
898 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1168 key_state += ((MEvent.clicks > 1) ? 32 : 0);
899#endif 1169#endif
900
901 } 1170 }
902 1171
903#ifdef DEBUG_MOUSEREPORT 1172#if DEBUG_MOUSEREPORT
904 fprintf (stderr, "Mouse ["); 1173 fprintf (stderr, "Mouse [");
905 if (key_state & 16) 1174 if (key_state & 16)
906 fputc ('C', stderr); 1175 fputc ('C', stderr);
907 if (key_state & 4) 1176 if (key_state & 4)
908 fputc ('S', stderr); 1177 fputc ('S', stderr);
… …
912 fputc ('2', stderr); 1181 fputc ('2', stderr);
913 fprintf (stderr, "]: <%d>, %d/%d\n", 1182 fprintf (stderr, "]: <%d>, %d/%d\n",
914 button_number, 1183 button_number,
915 x + 1, 1184 x + 1,
916 y + 1); 1185 y + 1);
917#else 1186#endif
1187
918 tt_printf ("\033[M%c%c%c", 1188 tt_printf ("\033[M%c%c%c",
919 (32 + button_number + key_state), 1189 (32 + button_number + key_state),
920 (32 + x + 1), 1190 (32 + x + 1),
921 (32 + y + 1)); 1191 (32 + y + 1));
922#endif
923} 1192}
924 1193
925#ifdef USING_W11LIB 1194#ifdef USING_W11LIB
926void 1195void
927rxvt_W11_process_x_event (XEvent *ev) 1196rxvt_W11_process_x_event (XEvent *ev)
… …
934 1203
935/*{{{ process an X event */ 1204/*{{{ process an X event */
936void 1205void
937rxvt_term::x_cb (XEvent &ev) 1206rxvt_term::x_cb (XEvent &ev)
938{ 1207{
1208 dDisp;
1209
939 SET_R (this); 1210 SET_R (this);
940 SET_LOCALE (locale); 1211 SET_LOCALE (locale);
941 1212
942#if defined(CURSOR_BLINK) 1213#if defined(CURSOR_BLINK)
943 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
944 { 1215 {
945 if (hidden_cursor) 1216 if (hidden_cursor)
946 { 1217 {
947 hidden_cursor = 0; 1218 hidden_cursor = 0;
948 want_refresh = 1; 1219 want_refresh = 1;
… …
951 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
952 } 1223 }
953#endif 1224#endif
954 1225
955#if defined(POINTER_BLANK) 1226#if defined(POINTER_BLANK)
956 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
957 { 1228 {
958 if (ev.type == MotionNotify 1229 if (ev.type == MotionNotify
959 || ev.type == ButtonPress 1230 || ev.type == ButtonPress
960 || ev.type == ButtonRelease) 1231 || ev.type == ButtonRelease)
961 if (hidden_pointer) 1232 if (hidden_pointer)
… …
964 if (ev.type == KeyPress && hidden_pointer == 0) 1235 if (ev.type == KeyPress && hidden_pointer == 0)
965 pointer_blank (); 1236 pointer_blank ();
966 } 1237 }
967#endif 1238#endif
968 1239
969#ifdef USE_XIM
970 if (XFilterEvent (&ev, None))
971 return;
972#endif
973
974 Window unused_root, unused_child; 1240 Window unused_root, unused_child;
975 int unused_root_x, unused_root_y; 1241 int unused_root_x, unused_root_y;
976 unsigned int unused_mask; 1242 unsigned int unused_mask;
977
978#ifdef DEBUG_X
979 const char *const eventnames[] =
980 { /* mason - this matches my system */
981 "",
982 "",
983 "KeyPress",
984 "KeyRelease",
985 "ButtonPress",
986 "ButtonRelease",
987 "MotionNotify",
988 "EnterNotify",
989 "LeaveNotify",
990 "FocusIn",
991 "FocusOut",
992 "KeymapNotify",
993 "Expose",
994 "GraphicsExpose",
995 "NoExpose",
996 "VisibilityNotify",
997 "CreateNotify",
998 "DestroyNotify",
999 "UnmapNotify",
1000 "MapNotify",
1001 "MapRequest",
1002 "ReparentNotify",
1003 "ConfigureNotify",
1004 "ConfigureRequest",
1005 "GravityNotify",
1006 "ResizeRequest",
1007 "CirculateNotify",
1008 "CirculateRequest",
1009 "PropertyNotify",
1010 "SelectionClear",
1011 "SelectionRequest",
1012 "SelectionNotify",
1013 "ColormapNotify",
1014 "ClientMessage",
1015 "MappingNotify"
1016 };
1017#endif
1018
1019#ifdef DEBUG_X
1020 struct timeval tp;
1021 struct tm *ltt;
1022 (void)gettimeofday (&tp, NULL);
1023 ltt = localtime (& (tp.tv_sec));
1024 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));
1025#endif
1026 1243
1027 switch (ev.type) 1244 switch (ev.type)
1028 { 1245 {
1029 case KeyPress: 1246 case KeyPress:
1247#if ISO_14755
1248 if (!(iso14755buf & ISO_14755_52))
1249#endif
1030 lookup_key (ev.xkey); 1250 lookup_key (ev.xkey);
1251
1252 break;
1253
1254 case KeyRelease:
1255 {
1256#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1257 KeySym ks;
1258
1259 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1260#endif
1261
1262#if ENABLE_FRILLS || ISO_14755
1263 // ISO 14755 support
1264 if (iso14755buf)
1265 if (iso14755buf & ISO_14755_52)
1266 {
1267# if ENABLE_OVERLAY
1268 scr_overlay_off ();
1269# endif
1270# if ISO_14755
1271 // iso14755 part 5.2 handling: release time
1272 // first: controls
1273 if ((ev.xkey.state & ControlMask)
1274 && ((ks >= 0x40 && ks <= 0x5f)
1275 || (ks >= 0x61 && ks <= 0x7f)))
1276 {
1277 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1278 commit_iso14755 ();
1279 return; // case-break;
1280 }
1281
1282 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1283 if (i[0] == ks)
1284 {
1285 iso14755buf = ISO_14755_51 | i[1];
1286 commit_iso14755 ();
1287 return; // case-break;
1288 }
1289
1290 scr_bell ();
1291# endif
1292 iso14755buf = 0;
1031 break; 1293 break;
1294 }
1295 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1296 {
1297# if ENABLE_OVERLAY
1298 scr_overlay_off ();
1299# endif
1300 if (iso14755buf & ISO_14755_51)
1301 commit_iso14755 ();
1302#if ISO_14755
1303 else if (iso14755buf & ISO_14755_STARTED)
1304 {
1305 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1306
1307 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1308 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1309 }
1310# endif
1311 else
1312 iso14755buf = 0;
1313 }
1314#endif
1032 1315
1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1034 case KeyRelease:
1035 {
1036 if (!(ev.xkey.state & ControlMask)) 1317 if (!(ev.xkey.state & ControlMask))
1037 slip_wheel_ev.stop (); 1318 slip_wheel_ev.stop ();
1038 else
1039 {
1040 KeySym ks;
1041
1042 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1043 if (ks == XK_Control_L || ks == XK_Control_R) 1319 else if (ks == XK_Control_L || ks == XK_Control_R)
1044 mouse_slip_wheel_speed = 0; 1320 mouse_slip_wheel_speed = 0;
1045 } 1321#endif
1046 break; 1322 break;
1047 } 1323 }
1048#endif
1049 1324
1050 case ButtonPress: 1325 case ButtonPress:
1051 button_press (ev.xbutton); 1326 button_press (ev.xbutton);
1052 break; 1327 break;
1053 1328
… …
1055 button_release (ev.xbutton); 1330 button_release (ev.xbutton);
1056 break; 1331 break;
1057 1332
1058 case ClientMessage: 1333 case ClientMessage:
1059 if (ev.xclient.format == 32 1334 if (ev.xclient.format == 32
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]
1060 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1061 destroy (); 1337 destroy ();
1338#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32
1340 && ev.xclient.message_type == xa[XA_XEMBED])
1341 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out ();
1346 }
1347#endif
1062#ifdef OFFIX_DND 1348#ifdef OFFIX_DND
1063 /* OffiX Dnd (drag 'n' drop) protocol */ 1349 /* OffiX Dnd (drag 'n' drop) protocol */
1064 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1350 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1065 && (ev.xclient.data.l[0] == DndFile 1351 && (ev.xclient.data.l[0] == DndFile
1066 || ev.xclient.data.l[0] == DndDir 1352 || ev.xclient.data.l[0] == DndDir
1067 || ev.xclient.data.l[0] == DndLink)) 1353 || ev.xclient.data.l[0] == DndLink))
1068 { 1354 {
1069 /* Get Dnd data */ 1355 /* Get Dnd data */
1070 Atom ActualType; 1356 Atom ActualType;
1071 int ActualFormat; 1357 int ActualFormat;
1072 unsigned char *data; 1358 unsigned char *data;
1073 unsigned long Size, RemainingBytes; 1359 unsigned long Size, RemainingBytes;
1074 1360
1075 XGetWindowProperty (display->display, display->root, 1361 XGetWindowProperty (disp, display->root,
1076 xa[XA_DNDSELECTION], 1362 xa[XA_DNDSELECTION],
1077 0L, 1000000L, 1363 0L, 1000000L,
1078 False, AnyPropertyType, 1364 False, AnyPropertyType,
1079 &ActualType, &ActualFormat, 1365 &ActualType, &ActualFormat,
1080 &Size, &RemainingBytes, 1366 &Size, &RemainingBytes,
1081 &data); 1367 &data);
1082 XChangeProperty (display->display, display->root, 1368 set_string_property (XA_CUT_BUFFER0, data);
1083 XA_CUT_BUFFER0, XA_STRING,
1084 8, PropModeReplace,
1085 data, STRLEN (data));
1086 XFree (data); 1369 XFree (data);
1087 selection_paste (display->root, XA_CUT_BUFFER0, True); 1370 selection_paste (display->root, XA_CUT_BUFFER0, true);
1088 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1371 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1089 } 1372 }
1090#endif /* OFFIX_DND */ 1373#endif /* OFFIX_DND */
1091 break; 1374 break;
1092 1375
1093 case MappingNotify: 1376 case MappingNotify:
… …
1118 break; 1401 break;
1119 } 1402 }
1120 break; 1403 break;
1121 1404
1122 case FocusIn: 1405 case FocusIn:
1123 if (!TermWin.focus) 1406 focus_in ();
1124 {
1125 TermWin.focus = 1;
1126 want_refresh = 1;
1127#ifdef USE_XIM
1128 if (Input_Context != NULL)
1129 XSetICFocus (Input_Context);
1130#endif
1131#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink)
1133 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1134#endif
1135#ifdef OFF_FOCUS_FADING
1136 if (rs[Rs_fade])
1137 {
1138 PixColors = PixColorsFocused;
1139 set_colorfgbg ();
1140 scr_clear ();
1141 scr_touch (true);
1142 }
1143#endif
1144
1145 }
1146 break; 1407 break;
1147 1408
1148 case FocusOut: 1409 case FocusOut:
1149 if (TermWin.focus) 1410 focus_out ();
1150 {
1151 TermWin.focus = 0;
1152 want_refresh = 1;
1153#ifdef USE_XIM
1154 if (Input_Context != NULL)
1155 XUnsetICFocus (Input_Context);
1156#endif
1157#ifdef CURSOR_BLINK
1158 if (Options & Opt_cursorBlink)
1159 cursor_blink_ev.stop ();
1160 hidden_cursor = 0;
1161#endif
1162#ifdef OFF_FOCUS_FADING
1163 if (rs[Rs_fade])
1164 {
1165 PixColors = PixColorsUnFocused;
1166 set_colorfgbg ();
1167 scr_clear ();
1168 scr_touch (true);
1169 }
1170#endif
1171
1172 }
1173 break; 1411 break;
1174 1412
1175 case ConfigureNotify: 1413 case ConfigureNotify:
1176 if (ev.xconfigure.window == TermWin.parent[0]) 1414 if (ev.xconfigure.window == TermWin.parent[0])
1177 { 1415 {
… …
1181 { /* Wrap lots of configures into one */ 1419 { /* Wrap lots of configures into one */
1182 width = ev.xconfigure.width; 1420 width = ev.xconfigure.width;
1183 height = ev.xconfigure.height; 1421 height = ev.xconfigure.height;
1184 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1422 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1185 } 1423 }
1186 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1424 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1187 1425
1188 if (szHint.width != width || szHint.height != height) 1426 if (szHint.width != width || szHint.height != height)
1427 {
1428 seen_resize = 1;
1189 resize_all_windows (width, height, 1); 1429 resize_all_windows (width, height, 1);
1430 }
1190 1431
1191#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1432#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1192 if (Options & Opt_transparent) 1433 if (options & Opt_transparent)
1193 {
1194 check_our_parents (); 1434 check_our_parents ();
1195 if (am_transparent)
1196 want_refresh = want_full_refresh = 1;
1197 }
1198#endif 1435#endif
1199 } 1436 }
1437 break;
1438
1439 case PropertyNotify:
1440 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1441 && ev.xproperty.state == PropertyNewValue)
1442 selection_property (ev.xproperty.window, ev.xproperty.atom);
1443
1200 break; 1444 break;
1201 1445
1202 case SelectionClear: 1446 case SelectionClear:
1203 selection_clear (); 1447 selection_clear ();
1204 break; 1448 break;
1205 1449
1206 case SelectionNotify: 1450 case SelectionNotify:
1207 if (selection_wait == Sel_normal) 1451 if (selection_wait == Sel_normal)
1208 selection_paste (ev.xselection.requestor, 1452 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1209 ev.xselection.property, True);
1210 break; 1453 break;
1211 1454
1212 case SelectionRequest: 1455 case SelectionRequest:
1213 selection_send (ev.xselectionrequest); 1456 selection_send (ev.xselectionrequest);
1214 break; 1457 break;
… …
1238 if (ev.xany.window == TermWin.vt) 1481 if (ev.xany.window == TermWin.vt)
1239 { 1482 {
1240 do 1483 do
1241 scr_expose (ev.xexpose.x, ev.xexpose.y, 1484 scr_expose (ev.xexpose.x, ev.xexpose.y,
1242 ev.xexpose.width, ev.xexpose.height, False); 1485 ev.xexpose.width, ev.xexpose.height, False);
1243 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1244 1487
1245 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1246 1489
1247 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1248 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1249 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1250 1493
1251 scr_refresh (refresh_type); 1494 scr_refresh (refresh_type);
1252 } 1495 }
1253 else 1496 else
1254 { 1497 {
1255 XEvent unused_event; 1498 XEvent unused_event;
1256 1499
1257 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1500 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1258 ; 1501 ;
1259 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1502 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1260 ; 1503 ;
1261 1504
1262 if (isScrollbarWindow (ev.xany.window)) 1505 if (isScrollbarWindow (ev.xany.window))
1263 { 1506 {
1264 scrollBar.setIdle (); 1507 scrollBar.setIdle ();
… …
1269 menubar_expose (); 1512 menubar_expose ();
1270#endif 1513#endif
1271 1514
1272#ifdef TRANSPARENT 1515#ifdef TRANSPARENT
1273 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1516 if (am_transparent && ev.xany.window == TermWin.parent[0])
1274 XClearWindow (display->display, ev.xany.window); 1517 XClearWindow (disp, ev.xany.window);
1275#endif 1518#endif
1276 } 1519 }
1277 break; 1520 break;
1278 1521
1279 case MotionNotify: 1522 case MotionNotify:
… …
1286 { 1529 {
1287 menubar_control (ev.xbutton); 1530 menubar_control (ev.xbutton);
1288 break; 1531 break;
1289 } 1532 }
1290#endif 1533#endif
1291 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1534 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1292 break; 1535 break;
1293 1536
1294 if (ev.xany.window == TermWin.vt) 1537 if (ev.xany.window == TermWin.vt)
1295 { 1538 {
1296 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1539 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1297 { 1540 {
1298 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1299 ; 1542 ;
1300 1543
1301 XQueryPointer (display->display, TermWin.vt, 1544 XQueryPointer (disp, TermWin.vt,
1302 &unused_root, &unused_child, 1545 &unused_root, &unused_child,
1303 &unused_root_x, &unused_root_y, 1546 &unused_root_x, &unused_root_y,
1304 & (ev.xbutton.x), & (ev.xbutton.y), 1547 &ev.xbutton.x, &ev.xbutton.y,
1305 &unused_mask); 1548 &ev.xbutton.state);
1306#ifdef MOUSE_THRESHOLD 1549#ifdef MOUSE_THRESHOLD
1307 /* deal with a `jumpy' mouse */ 1550 /* deal with a `jumpy' mouse */
1308 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1551 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1309 { 1552 {
1310#endif 1553#endif
1554#if ISO_14755
1555 // 5.4
1556 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1557 {
1558 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1559 break;
1560 }
1561#endif
1311 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1562 selection_extend (ev.xbutton.x, ev.xbutton.y,
1312 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1563 ev.xbutton.state & Button3Mask ? 2 : 0);
1564
1313#ifdef SELECTION_SCROLLING 1565#ifdef SELECTION_SCROLLING
1314 if (ev.xbutton.y < TermWin.int_bwidth 1566 if (ev.xbutton.y < TermWin.int_bwidth
1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1567 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1316 { 1568 {
1317 int dist; 1569 int dist;
… …
1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1575 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1324 1576
1325 /* save the event params so we can highlight 1577 /* save the event params so we can highlight
1326 * the selection in the pending-scroll loop 1578 * the selection in the pending-scroll loop
1327 */ 1579 */
1328 selection_save_x=ev.xbutton.x; 1580 selection_save_x = ev.xbutton.x;
1329 selection_save_y=ev.xbutton.y; 1581 selection_save_y = ev.xbutton.y;
1330 selection_save_state=
1331 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1582 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1332 1583
1333 /* calc number of lines to scroll */ 1584 /* calc number of lines to scroll */
1334 if (ev.xbutton.y<TermWin.int_bwidth) 1585 if (ev.xbutton.y < TermWin.int_bwidth)
1335 { 1586 {
1336 scroll_selection_dir = UP; 1587 scroll_selection_dir = UP;
1337 dist = TermWin.int_bwidth - ev.xbutton.y; 1588 dist = TermWin.int_bwidth - ev.xbutton.y;
1338 } 1589 }
1339 else 1590 else
1340 { 1591 {
1341 scroll_selection_dir = DN; 1592 scroll_selection_dir = DN;
1342 dist = ev.xbutton.y -
1343 (TermWin.int_bwidth + TermWin.height); 1593 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1344 } 1594 }
1595
1345 scroll_selection_lines= (Pixel2Height (dist)/ 1596 scroll_selection_lines = Pixel2Height (dist)
1346 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1597 / SELECTION_SCROLL_LINE_SPEEDUP
1598 + 1;
1347 MIN_IT (scroll_selection_lines, 1599 MIN_IT (scroll_selection_lines,
1348 SELECTION_SCROLL_MAX_LINES); 1600 SELECTION_SCROLL_MAX_LINES);
1349 } 1601 }
1350 else 1602 else
1351 { 1603 {
1352 /* we are within the text window, so we 1604 /* we are within the text window, so we
1353 * shouldn't be scrolling 1605 * shouldn't be scrolling
… …
1355 if (sel_scroll_ev.active) 1607 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop(); 1608 sel_scroll_ev.stop();
1357 } 1609 }
1358#endif 1610#endif
1359#ifdef MOUSE_THRESHOLD 1611#ifdef MOUSE_THRESHOLD
1360
1361 } 1612 }
1362#endif 1613#endif
1363
1364 } 1614 }
1365 } 1615 }
1366 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1616 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1367 { 1617 {
1368 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1618 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1369 MotionNotify, &ev)) ; 1619 MotionNotify, &ev))
1620 ;
1621
1370 XQueryPointer (display->display, scrollBar.win, 1622 XQueryPointer (disp, scrollBar.win,
1371 &unused_root, &unused_child, 1623 &unused_root, &unused_child,
1372 &unused_root_x, &unused_root_y, 1624 &unused_root_x, &unused_root_y,
1373 & (ev.xbutton.x), & (ev.xbutton.y), 1625 &ev.xbutton.x, &ev.xbutton.y,
1374 &unused_mask); 1626 &unused_mask);
1375 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1627 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1376 scrollbar_size ()); 1628 scrollbar_size ());
1377 scr_refresh (refresh_type); 1629 scr_refresh (refresh_type);
1378 refresh_limit = 0; 1630 refresh_limit = 0;
… …
1381 break; 1633 break;
1382 } 1634 }
1383} 1635}
1384 1636
1385void 1637void
1638rxvt_term::focus_in ()
1639{
1640 if (!TermWin.focus)
1641 {
1642 TermWin.focus = 1;
1643 want_refresh = 1;
1644#ifdef USE_XIM
1645 if (Input_Context != NULL)
1646 {
1647 IMSetStatusPosition ();
1648 XSetICFocus (Input_Context);
1649 }
1650#endif
1651#ifdef CURSOR_BLINK
1652 if (options & Opt_cursorBlink)
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1654#endif
1655#ifdef OFF_FOCUS_FADING
1656 if (rs[Rs_fade])
1657 {
1658 pix_colors = pix_colors_focused;
1659 scr_recolour ();
1660 }
1661#endif
1662 }
1663}
1664
1665void
1666rxvt_term::focus_out ()
1667{
1668 if (TermWin.focus)
1669 {
1670 TermWin.focus = 0;
1671 want_refresh = 1;
1672
1673#if ENABLE_FRILLS || ISO_14755
1674 iso14755buf = 0;
1675#endif
1676#if ENABLE_OVERLAY
1677 scr_overlay_off ();
1678#endif
1679#ifdef USE_XIM
1680 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context);
1682#endif
1683#ifdef CURSOR_BLINK
1684 if (options & Opt_cursorBlink)
1685 cursor_blink_ev.stop ();
1686 hidden_cursor = 0;
1687#endif
1688#ifdef OFF_FOCUS_FADING
1689 if (rs[Rs_fade])
1690 {
1691 pix_colors = pix_colors_unfocused;
1692 scr_recolour ();
1693 }
1694#endif
1695 }
1696}
1697
1698#if TRANSPARENT
1699void
1386rxvt_term::rootwin_cb (XEvent &ev) 1700rxvt_term::rootwin_cb (XEvent &ev)
1387{ 1701{
1388 SET_R (this); 1702 SET_R (this);
1389 SET_LOCALE (locale); 1703 SET_LOCALE (locale);
1390 1704
1391 switch (ev.type) 1705 switch (ev.type)
1392 { 1706 {
1393 case PropertyNotify: 1707 case PropertyNotify:
1394 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1395 {
1396 if (ev.xproperty.state == PropertyNewValue)
1397 selection_property (ev.xproperty.window, ev.xproperty.atom);
1398 break;
1399 }
1400#ifdef TRANSPARENT
1401 else
1402 {
1403 /* 1708 /*
1404 * if user used some Esetroot compatible prog to set the root bg, 1709 * if user used some Esetroot compatible prog to set the root bg,
1405 * use the property to determine the pixmap. We use it later on. 1710 * use the property to determine the pixmap. We use it later on.
1406 */ 1711 */
1407 if (xa[XA_XROOTPMAPID] == 0)
1408 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1409
1410 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1712 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1713 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1411 return; 1714 return;
1412 }
1413 1715
1414 /* FALLTHROUGH */ 1716 /* FALLTHROUGH */
1415 case ReparentNotify: 1717 case ReparentNotify:
1416 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1718 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1417 want_refresh = want_full_refresh = 1; 1719 want_refresh = want_full_refresh = 1;
1418 break; 1720 break;
1419#endif
1420 } 1721 }
1421} 1722}
1723#endif
1422 1724
1423void 1725void
1424rxvt_term::button_press (XButtonEvent &ev) 1726rxvt_term::button_press (XButtonEvent &ev)
1425{ 1727{
1426 int reportmode = 0, clickintime; 1728 int reportmode = 0, clickintime;
1427 1729
1428 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1730 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1429 if (!bypass_keystate) 1731 if (!bypass_keystate)
1430 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1732 reportmode = !! (priv_modes & PrivMode_mouse_report);
1733
1431 /* 1734 /*
1432 * VT window processing of button press 1735 * VT window processing of button press
1433 */ 1736 */
1434 if (ev.window == TermWin.vt) 1737 if (ev.window == TermWin.vt)
1435 { 1738 {
1739#if ISO_14755
1740 // 5.4
1741 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742 {
1743 iso14755_54 (ev.x, ev.y);
1744 return;
1745 }
1746#endif
1747
1436 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1748 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1749
1437 if (reportmode) 1750 if (reportmode)
1438 { 1751 {
1439 /* mouse report from vt window */ 1752 /* mouse report from vt window */
1440 /* save the xbutton state (for ButtonRelease) */ 1753 /* save the xbutton state (for ButtonRelease) */
1441 MEvent.state = ev.state; 1754 MEvent.state = ev.state;
… …
1470 } 1783 }
1471 else 1784 else
1472 { 1785 {
1473 if (ev.button != MEvent.button) 1786 if (ev.button != MEvent.button)
1474 MEvent.clicks = 0; 1787 MEvent.clicks = 0;
1788
1475 switch (ev.button) 1789 switch (ev.button)
1476 { 1790 {
1477 case Button1: 1791 case Button1:
1792 /* allow meta + click to select rectangular areas */
1793 /* should be done in screen.C */
1794#if ENABLE_FRILLS
1795 selection.rect = !!(ev.state & ModMetaMask);
1796#else
1797 selection.rect = false;
1798#endif
1799
1478 /* allow shift+left click to extend selection */ 1800 /* allow shift+left click to extend selection */
1479 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1801 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1480 { 1802 {
1481 if (MEvent.button == Button1 && clickintime) 1803 if (MEvent.button == Button1 && clickintime)
1482 selection_rotate (ev.x, ev.y); 1804 selection_rotate (ev.x, ev.y);
1483 else 1805 else
1484 selection_extend (ev.x, ev.y, 1); 1806 selection_extend (ev.x, ev.y, 1);
… …
1499 case Button3: 1821 case Button3:
1500 if (MEvent.button == Button3 && clickintime) 1822 if (MEvent.button == Button3 && clickintime)
1501 selection_rotate (ev.x, ev.y); 1823 selection_rotate (ev.x, ev.y);
1502 else 1824 else
1503 selection_extend (ev.x, ev.y, 1); 1825 selection_extend (ev.x, ev.y, 1);
1826
1504 MEvent.button = Button3; 1827 MEvent.button = Button3;
1505 break; 1828 break;
1506 } 1829 }
1507 } 1830 }
1831
1508 MEvent.time = ev.time; 1832 MEvent.time = ev.time;
1509 return; 1833 return;
1510 } 1834 }
1511 1835
1512 /* 1836 /*
… …
1665{ 1989{
1666 int reportmode = 0; 1990 int reportmode = 0;
1667 1991
1668 csrO = 0; /* reset csr Offset */ 1992 csrO = 0; /* reset csr Offset */
1669 if (!bypass_keystate) 1993 if (!bypass_keystate)
1670 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1994 reportmode = !! (priv_modes & PrivMode_mouse_report);
1671 1995
1672 if (scrollbar_isUpDn ()) 1996 if (scrollbar_isUpDn ())
1673 { 1997 {
1674 scrollBar.setIdle (); 1998 scrollBar.setIdle ();
1675 scrollbar_show (0); 1999 scrollbar_show (0);
1676#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1677 refresh_type &= ~SMOOTH_REFRESH; 2001 refresh_type &= ~SMOOTH_REFRESH;
1678#endif 2002#endif
1679
1680 } 2003 }
2004
1681#ifdef SELECTION_SCROLLING 2005#ifdef SELECTION_SCROLLING
1682 if (sel_scroll_ev.active) 2006 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop(); 2007 sel_scroll_ev.stop();
1684#endif 2008#endif
2009
1685 if (ev.window == TermWin.vt) 2010 if (ev.window == TermWin.vt)
1686 { 2011 {
2012#if ISO_14755
2013 // 5.4
2014 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015 return;
2016#endif
1687 if (reportmode) 2017 if (reportmode)
1688 { 2018 {
1689 /* mouse report from vt window */ 2019 /* mouse report from vt window */
1690 /* don't report release of wheel "buttons" */ 2020 /* don't report release of wheel "buttons" */
1691 if (ev.button >= 4) 2021 if (ev.button >= 4)
… …
1705 MEvent.button = AnyButton; 2035 MEvent.button = AnyButton;
1706 mouse_report (ev); 2036 mouse_report (ev);
1707#endif /* MOUSE_REPORT_DOUBLECLICK */ 2037#endif /* MOUSE_REPORT_DOUBLECLICK */
1708 return; 2038 return;
1709 } 2039 }
2040
1710 /* 2041 /*
1711 * dumb hack to compensate for the failure of click-and-drag 2042 * dumb hack to compensate for the failure of click-and-drag
1712 * when overriding mouse reporting 2043 * when overriding mouse reporting
1713 */ 2044 */
1714 if (PrivateModes & PrivMode_mouse_report 2045 if (priv_modes & PrivMode_mouse_report
1715 && bypass_keystate 2046 && bypass_keystate
1716 && ev.button == Button1 && MEvent.clicks <= 1) 2047 && ev.button == Button1 && MEvent.clicks <= 1)
1717 selection_extend (ev.x, ev.y, 0); 2048 selection_extend (ev.x, ev.y, 0);
1718 2049
1719 switch (ev.button) 2050 switch (ev.button)
… …
1734 2065
1735 v = ev.button == Button4 ? UP : DN; 2066 v = ev.button == Button4 ? UP : DN;
1736 2067
1737 if (ev.state & ShiftMask) 2068 if (ev.state & ShiftMask)
1738 i = 1; 2069 i = 1;
1739 else if (Options & Opt_mouseWheelScrollPage) 2070 else if (options & Opt_mouseWheelScrollPage)
1740 i = TermWin.nrow - 1; 2071 i = TermWin.nrow - 1;
1741 else 2072 else
1742 i = 5; 2073 i = 5;
1743 2074
1744# ifdef MOUSE_SLIP_WHEELING 2075# ifdef MOUSE_SLIP_WHEELING
… …
1795 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2126 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1796 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2127 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1797 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2128 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1798 int i; 2129 int i;
1799 2130
1800 Visual* visual = display->visual; 2131 Visual *visual = display->visual;
1801 2132
1802 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2133 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1803 2134
1804 /* for convenience */ 2135 /* for convenience */
1805 mask_r = visual->red_mask; 2136 mask_r = visual->red_mask;
… …
2026 Atom atype; 2357 Atom atype;
2027 unsigned char *prop = NULL; 2358 unsigned char *prop = NULL;
2028 Window root, oldp, *list; 2359 Window root, oldp, *list;
2029 Pixmap rootpixmap = None; 2360 Pixmap rootpixmap = None;
2030 XWindowAttributes wattr, wrootattr; 2361 XWindowAttributes wattr, wrootattr;
2362 dDisp;
2031 2363
2032 pchanged = 0; 2364 pchanged = 0;
2033 2365
2034 if (!(Options & Opt_transparent)) 2366 if (!(options & Opt_transparent))
2035 return pchanged; /* Don't try any more */ 2367 return pchanged; /* Don't try any more */
2036 2368
2037 XGetWindowAttributes (display->display, display->root, &wrootattr); 2369 XGetWindowAttributes (disp, display->root, &wrootattr);
2038 rootdepth = wrootattr.depth; 2370 rootdepth = wrootattr.depth;
2039 2371
2040 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2372 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2041 2373
2042 if (rootdepth != wattr.depth) 2374 if (rootdepth != wattr.depth)
2043 { 2375 {
2044 if (am_transparent) 2376 if (am_transparent)
2045 { 2377 {
2046 pchanged = 1; 2378 pchanged = 1;
2047 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2379 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2048 am_transparent = am_pixmap_trans = 0; 2380 am_transparent = am_pixmap_trans = 0;
2049 } 2381 }
2050 2382
2051 return pchanged; /* Don't try any more */ 2383 return pchanged; /* Don't try any more */
2052 } 2384 }
2053 2385
2054 /* Get all X ops out of the queue so that our information is up-to-date. */ 2386 /* Get all X ops out of the queue so that our information is up-to-date. */
2055 XSync (display->display, False); 2387 XSync (disp, False);
2056 2388
2057 /* 2389 /*
2058 * Make the frame window set by the window manager have 2390 * Make the frame window set by the window manager have
2059 * the root background. Some window managers put multiple nested frame 2391 * the root background. Some window managers put multiple nested frame
2060 * windows for each client, so we have to take care about that. 2392 * windows for each client, so we have to take care about that.
2061 */ 2393 */
2062 i = (xa[XA_XROOTPMAPID] 2394 i = (xa[XA_XROOTPMAP_ID]
2063 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2395 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2064 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2396 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2065 &nitems, &bytes_after, &prop) == Success); 2397 &nitems, &bytes_after, &prop) == Success);
2066 2398
2067 if (!i || prop == NULL) 2399 if (!i || prop == NULL)
2068 i = (xa[XA_XSETROOTID] 2400 i = (xa[XA_ESETROOT_PMAP_ID]
2069 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2401 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2070 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2071 &nitems, &bytes_after, &prop) == Success); 2403 &nitems, &bytes_after, &prop) == Success);
2072 2404
2073 if (!i || prop == NULL 2405 if (!i || prop == NULL
2074#if TINTING 2406#if TINTING
… …
2093 Window cr; 2425 Window cr;
2094 XImage *image; 2426 XImage *image;
2095 GC gc; 2427 GC gc;
2096 XGCValues gcvalue; 2428 XGCValues gcvalue;
2097 2429
2098 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2430 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2099 0, 0, &sx, &sy, &cr); 2431 0, 0, &sx, &sy, &cr);
2100 nw = (unsigned int)szHint.width; 2432 nw = (unsigned int)szHint.width;
2101 nh = (unsigned int)szHint.height; 2433 nh = (unsigned int)szHint.height;
2102 nx = ny = 0; 2434 nx = ny = 0;
2103 2435
… …
2115 sy = 0; 2447 sy = 0;
2116 } 2448 }
2117 2449
2118 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2450 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2119 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2451 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2452
2453 XSync (disp, False);
2120 allowedxerror = -1; 2454 allowedxerror = -1;
2121 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2455 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2122 2456
2123 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2457 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2124 /* XXX: may need a delay here? */ 2458 /* XXX: may need a delay here? */
2125 allowedxerror = 0; 2459 allowedxerror = 0;
2126 2460
… …
2129 if (am_transparent && am_pixmap_trans) 2463 if (am_transparent && am_pixmap_trans)
2130 { 2464 {
2131 pchanged = 1; 2465 pchanged = 1;
2132 if (TermWin.pixmap != None) 2466 if (TermWin.pixmap != None)
2133 { 2467 {
2134 XFreePixmap (display->display, TermWin.pixmap); 2468 XFreePixmap (disp, TermWin.pixmap);
2135 TermWin.pixmap = None; 2469 TermWin.pixmap = None;
2136 } 2470 }
2137 } 2471 }
2138 2472
2139 am_pixmap_trans = 0; 2473 am_pixmap_trans = 0;
2140 } 2474 }
2141 else 2475 else
2142 { 2476 {
2143 if (TermWin.pixmap != None) 2477 if (TermWin.pixmap != None)
2144 XFreePixmap (display->display, TermWin.pixmap); 2478 XFreePixmap (disp, TermWin.pixmap);
2145 2479
2146#if TINTING 2480#if TINTING
2147 if (ISSET_PIXCOLOR (Color_tint)) 2481 if (ISSET_PIXCOLOR (Color_tint))
2148 { 2482 {
2149 unsigned short rm, gm, bm; 2483 unsigned short rm, gm, bm;
2150 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2484 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2151 2485
2152 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2486 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2153 2487
2154 ShadeXImage (display, image, shade, rm, gm, bm); 2488 ShadeXImage (display, image, shade, rm, gm, bm);
2155 } 2489 }
2156#endif 2490#endif
2157 2491
2158 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2492 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2159 szHint.width, szHint.height, image->depth); 2493 szHint.width, szHint.height, image->depth);
2160 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2494 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2161 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2495 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2162 nx, ny, image->width, image->height); 2496 nx, ny, image->width, image->height);
2163 XFreeGC (display->display, gc); 2497 XFreeGC (disp, gc);
2164 XDestroyImage (image); 2498 XDestroyImage (image);
2165 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2499 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2166 XClearWindow (display->display, TermWin.parent[0]); 2500 XClearWindow (disp, TermWin.parent[0]);
2167 2501
2168 if (!am_transparent || !am_pixmap_trans) 2502 if (!am_transparent || !am_pixmap_trans)
2169 pchanged = 1; 2503 pchanged = 1;
2170 2504
2171 am_transparent = am_pixmap_trans = 1; 2505 am_transparent = am_pixmap_trans = 1;
2172 } 2506 }
2173 } 2507 }
2174 2508
2175 if (!am_pixmap_trans) 2509 if (am_pixmap_trans)
2510 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2511 else
2176 { 2512 {
2177 unsigned int n; 2513 unsigned int n;
2178 /* 2514 /*
2179 * InheritPixmap transparency 2515 * InheritPixmap transparency
2180 */ 2516 */
2181 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2182 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2517 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2183 { 2518 {
2184 oldp = TermWin.parent[i]; 2519 oldp = TermWin.parent[i];
2185 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2520 XQueryTree (disp, TermWin.parent[i - 1], &root,
2186 &TermWin.parent[i], &list, &n); 2521 &TermWin.parent[i], &list, &n);
2187 XFree (list); 2522 XFree (list);
2188 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2189 2523
2190 if (TermWin.parent[i] == display->root) 2524 if (TermWin.parent[i] == display->root)
2191 { 2525 {
2192 if (oldp != None) 2526 if (oldp != None)
2193 pchanged = 1; 2527 pchanged = 1;
… …
2203 2537
2204 if (pchanged) 2538 if (pchanged)
2205 { 2539 {
2206 for (; n < (unsigned int)i; n++) 2540 for (; n < (unsigned int)i; n++)
2207 { 2541 {
2208 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2542 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2209 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2210 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2543 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2211 { 2544 {
2212 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2545 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2213 break; 2546 break;
2214 } 2547 }
2215 } 2548 }
2216 } 2549 }
2217 2550
2218 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2551 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2219 { 2552 {
2220 D_X ((stderr, "InheritPixmap Turning off"));
2221 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2553 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2222 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2554 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2223 am_transparent = 0; 2555 am_transparent = 0;
2224 /* XXX: also turn off Opt_transparent? */ 2556 /* XXX: also turn off Opt_transparent? */
2225 } 2557 }
2226 else 2558 else
2227 { 2559 {
2228#if WAIT_FOR_WM 2560#if WAIT_FOR_WM
2229 /* wait (an arbitrary period) for the WM to do its thing 2561 /* wait (an arbitrary period) for the WM to do its thing
2230 * needed for fvwm2.2.2 (and before?) */ 2562 * needed for fvwm2.2.2 (and before?) */
2231 sleep (1); 2563 sleep (1);
2232#endif 2564#endif
2233 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2234 for (n = 0; n < (unsigned int)i; n++) 2565 for (n = 0; n < (unsigned int)i; n++)
2235 { 2566 {
2236 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2567 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2237 XClearWindow (display->display, TermWin.parent[n]); 2568 XClearWindow (disp, TermWin.parent[n]);
2238 } 2569 }
2239 2570
2240 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2571 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2241 am_transparent = 1; 2572 am_transparent = 1;
2242 } 2573 }
2243 2574
2244 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2575 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2245 TermWin.parent[i] = None; 2576 TermWin.parent[i] = None;
2246 } 2577 }
2247 2578
2248 // this is experimental
2249 if (scrollBar.win) 2579 if (scrollBar.win)
2250 { 2580 {
2251 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2581 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2252 XClearWindow (display->display, scrollBar.win);
2253 scrollBar.setIdle (); 2582 scrollBar.setIdle ();
2254 scrollbar_show (0); 2583 scrollbar_show (0);
2584 }
2585
2586 if (am_transparent)
2587 {
2588 want_refresh = want_full_refresh = 1;
2589 if (am_pixmap_trans)
2590 flush ();
2255 } 2591 }
2256 2592
2257 return pchanged; 2593 return pchanged;
2258} 2594}
2259#endif 2595#endif
… …
2278 if (ch == NOCHAR) // TODO: improve 2614 if (ch == NOCHAR) // TODO: improve
2279 break; 2615 break;
2280 2616
2281 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2617 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2282 { 2618 {
2619 if (!seen_input)
2620 {
2621 seen_input = 1;
2622 // many badly-written programs (e.g. jed) contain a race condition:
2623 // they first read the screensize and then install a SIGWINCH handler.
2624 // some window managers resize the window early, and these programs
2625 // then sometimes get the size wrong.
2626 // unfortunately other programs are even more buggy and dislike
2627 // being sent SIGWINCH, so only do it when we were in fact being
2628 // resized.
2629 if (seen_resize && cmd_pid)
2630 kill (-cmd_pid, SIGWINCH);
2631 }
2632
2283 /* Read a text string from the input buffer */ 2633 /* Read a text string from the input buffer */
2284 unicode_t buf[UBUFSIZ]; 2634 unicode_t buf[UBUFSIZ];
2285 bool refreshnow = false; 2635 bool refreshnow = false;
2286 int nlines = 0; 2636 int nlines = 0;
2287 unicode_t *str = buf; 2637 unicode_t *str = buf;
… …
2296 if (ch == C0_LF) 2646 if (ch == C0_LF)
2297 { 2647 {
2298 nlines++; 2648 nlines++;
2299 refresh_count++; 2649 refresh_count++;
2300 2650
2301 if (!(Options & Opt_jumpScroll) 2651 if (!(options & Opt_jumpScroll)
2302 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2303 { 2653 {
2304 refreshnow = true; 2654 refreshnow = true;
2305 ch = NOCHAR; 2655 ch = NOCHAR;
2306 break; 2656 break;
… …
2333 * the number of pages between refreshes is refresh_limit, which 2683 * the number of pages between refreshes is refresh_limit, which
2334 * is incremented here because we must be doing flat-out scrolling. 2684 * is incremented here because we must be doing flat-out scrolling.
2335 */ 2685 */
2336 if (refreshnow) 2686 if (refreshnow)
2337 { 2687 {
2338 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2688 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2339 refresh_limit++; 2689 refresh_limit++;
2340 else 2690 else
2341 { 2691 {
2342 flag = true; 2692 flag = true;
2343 scr_refresh (refresh_type); 2693 scr_refresh (refresh_type);
… …
2397 if (len == (size_t)-1) 2747 if (len == (size_t)-1)
2398 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2748 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2399 2749
2400 // assume wchar == unicode 2750 // assume wchar == unicode
2401 cmdbuf_ptr += len; 2751 cmdbuf_ptr += len;
2402 return wc; 2752 return wc & UNICODE_MASK;
2403 } 2753 }
2404 2754
2405 return NOCHAR; 2755 return NOCHAR;
2406} 2756}
2407 2757
… …
2533 process_escape_seq (); 2883 process_escape_seq ();
2534 break; 2884 break;
2535 case C0_ENQ: /* terminal Status */ 2885 case C0_ENQ: /* terminal Status */
2536 if (rs[Rs_answerbackstring]) 2886 if (rs[Rs_answerbackstring])
2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2887 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2538 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2888 (unsigned int)strlen (rs[Rs_answerbackstring]));
2539 else 2889 else
2540 tt_write ((unsigned char *)VT100_ANS, 2890 tt_write ((unsigned char *)VT100_ANS,
2541 (unsigned int)STRLEN (VT100_ANS)); 2891 (unsigned int)strlen (VT100_ANS));
2542 break; 2892 break;
2543 case C0_BEL: /* bell */ 2893 case C0_BEL: /* bell */
2544 scr_bell (); 2894 scr_bell ();
2545 break; 2895 break;
2546 case C0_BS: /* backspace */ 2896 case C0_BS: /* backspace */
… …
2645void 2995void
2646rxvt_term::process_escape_seq () 2996rxvt_term::process_escape_seq ()
2647{ 2997{
2648 unicode_t ch = cmd_getc (); 2998 unicode_t ch = cmd_getc ();
2649 2999
2650 if (PrivateModes & PrivMode_vt52) 3000 if (priv_modes & PrivMode_vt52)
2651 { 3001 {
2652 process_escape_vt52 (ch); 3002 process_escape_vt52 (ch);
2653 return; 3003 return;
2654 } 3004 }
2655 3005
… …
2670 scr_charset_set (2, (unsigned int)cmd_getc ()); 3020 scr_charset_set (2, (unsigned int)cmd_getc ());
2671 break; 3021 break;
2672 case '+': 3022 case '+':
2673 scr_charset_set (3, (unsigned int)cmd_getc ()); 3023 scr_charset_set (3, (unsigned int)cmd_getc ());
2674 break; 3024 break;
2675#ifndef NO_FRILLS 3025#if ENABLE_FRILLS
2676 case '6': 3026 case '6':
2677 scr_backindex (); 3027 scr_backindex ();
2678 break; 3028 break;
2679#endif 3029#endif
2680 case '7': 3030 case '7':
2681 scr_cursor (SAVE); 3031 scr_cursor (SAVE);
2682 break; 3032 break;
2683 case '8': 3033 case '8':
2684 scr_cursor (RESTORE); 3034 scr_cursor (RESTORE);
2685 break; 3035 break;
2686#ifndef NO_FRILLS 3036#if ENABLE_FRILLS
2687 case '9': 3037 case '9':
2688 scr_forwardindex (); 3038 scr_forwardindex ();
2689 break; 3039 break;
2690#endif 3040#endif
2691 case '=': 3041 case '=':
… …
2870 { 3220 {
2871 switch (priv) 3221 switch (priv)
2872 { 3222 {
2873 case '>': 3223 case '>':
2874 if (ch == CSI_DA) /* secondary device attributes */ 3224 if (ch == CSI_DA) /* secondary device attributes */
2875 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3225 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2876 break; 3226 break;
2877 case '?': 3227 case '?':
2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3228 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2879 process_terminal_mode (ch, priv, nargs, arg); 3229 process_terminal_mode (ch, priv, nargs, arg);
2880 break; 3230 break;
… …
2990 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3340 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2991 break; 3341 break;
2992 3342
2993 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3343 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2994 tt_write ((const unsigned char *)VT100_ANS, 3344 tt_write ((const unsigned char *)VT100_ANS,
2995 (unsigned int) (sizeof (VT100_ANS) - 1)); 3345 (unsigned int) (sizeof (VT100_ANS) - 1));
2996 break; 3346 break;
2997 3347
2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3348 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2999 process_sgr_mode (nargs, arg); 3349 process_sgr_mode (nargs, arg);
3000 break; 3350 break;
… …
3007 break; 3357 break;
3008 case 6: /* CPR requested */ 3358 case 6: /* CPR requested */
3009 scr_report_position (); 3359 scr_report_position ();
3010 break; 3360 break;
3011 case 7: /* unofficial extension */ 3361 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure) 3362 if (options & Opt_insecure)
3013 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3363 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3014 break; 3364 break;
3015 case 8: /* unofficial extension */ 3365 case 8: /* unofficial extension */
3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3366 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3017 break; 3367 break;
3018 } 3368 }
… …
3054 break; 3404 break;
3055 3405
3056 case CSI_RM: /* 8.3.107: RESET MODE */ 3406 case CSI_RM: /* 8.3.107: RESET MODE */
3057 if (arg[0] == 4) 3407 if (arg[0] == 4)
3058 scr_insert_mode (0); 3408 scr_insert_mode (0);
3409 else if (arg[0] == 20)
3410 priv_modes &= ~PrivMode_LFNL;
3059 break; 3411 break;
3060 3412
3061 case CSI_SM: /* 8.3.126: SET MODE */ 3413 case CSI_SM: /* 8.3.126: SET MODE */
3062 if (arg[0] == 4) 3414 if (arg[0] == 4)
3063 scr_insert_mode (1); 3415 scr_insert_mode (1);
3416 else if (arg[0] == 20)
3417 priv_modes |= PrivMode_LFNL;
3064 break; 3418 break;
3065 3419
3066 /* 3420 /*
3067 * PRIVATE USE beyond this point. All CSI_7? sequences here 3421 * PRIVATE USE beyond this point. All CSI_7? sequences here
3068 */ 3422 */
… …
3080 break; 3434 break;
3081 case CSI_75: 3435 case CSI_75:
3082 scr_cursor (RESTORE); 3436 scr_cursor (RESTORE);
3083 break; 3437 break;
3084 3438
3085#ifndef NO_FRILLS 3439#if ENABLE_FRILLS
3086 case CSI_74: 3440 case CSI_74:
3087 process_window_ops (arg, nargs); 3441 process_window_ops (arg, nargs);
3088 break; 3442 break;
3089#endif 3443#endif
3090 3444
… …
3097 break; 3451 break;
3098 } 3452 }
3099} 3453}
3100/*}}} */ 3454/*}}} */
3101 3455
3102#ifndef NO_FRILLS 3456#if ENABLE_FRILLS
3103/* ARGSUSED */ 3457/* ARGSUSED */
3104void 3458void
3105rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3459rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106{ 3460{
3107 int x, y; 3461 int x, y;
3108 XWindowAttributes wattr; 3462 XWindowAttributes wattr;
3109 Window wdummy; 3463 Window wdummy;
3464 dDisp;
3110 3465
3111 if (nargs == 0) 3466 if (nargs == 0)
3112 return; 3467 return;
3113 3468
3114 switch (args[0]) 3469 switch (args[0])
3115 { 3470 {
3116 /* 3471 /*
3117 * commands 3472 * commands
3118 */ 3473 */
3119 case 1: /* deiconify window */ 3474 case 1: /* deiconify window */
3120 XMapWindow (display->display, TermWin.parent[0]); 3475 XMapWindow (disp, TermWin.parent[0]);
3121 break; 3476 break;
3122 case 2: /* iconify window */ 3477 case 2: /* iconify window */
3123 XIconifyWindow (display->display, TermWin.parent[0], 3478 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3124 DefaultScreen (display->display));
3125 break; 3479 break;
3126 case 3: /* set position (pixels) */ 3480 case 3: /* set position (pixels) */
3127 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3128 break; 3482 break;
3129 case 4: /* set size (pixels) */ 3483 case 4: /* set size (pixels) */
3130 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3131 break; 3485 break;
3132 case 5: /* raise window */ 3486 case 5: /* raise window */
3133 XRaiseWindow (display->display, TermWin.parent[0]); 3487 XRaiseWindow (disp, TermWin.parent[0]);
3134 break; 3488 break;
3135 case 6: /* lower window */ 3489 case 6: /* lower window */
3136 XLowerWindow (display->display, TermWin.parent[0]); 3490 XLowerWindow (disp, TermWin.parent[0]);
3137 break; 3491 break;
3138 case 7: /* refresh window */ 3492 case 7: /* refresh window */
3139 scr_touch (true); 3493 scr_touch (true);
3140 break; 3494 break;
3141 case 8: /* set size (chars) */ 3495 case 8: /* set size (chars) */
… …
3153 3507
3154 /* 3508 /*
3155 * reports - some output format copied from XTerm 3509 * reports - some output format copied from XTerm
3156 */ 3510 */
3157 case 11: /* report window state */ 3511 case 11: /* report window state */
3158 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3160 break; 3514 break;
3161 case 13: /* report window position */ 3515 case 13: /* report window position */
3162 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3163 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3164 -wattr.border_width, -wattr.border_width, 3518 -wattr.border_width, -wattr.border_width,
3165 &x, &y, &wdummy); 3519 &x, &y, &wdummy);
3166 tt_printf ("\033[3;%d;%dt", x, y); 3520 tt_printf ("\033[3;%d;%dt", x, y);
3167 break; 3521 break;
3168 case 14: /* report window size (pixels) */ 3522 case 14: /* report window size (pixels) */
3169 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3171 break; 3525 break;
3172 case 18: /* report text area size (chars) */ 3526 case 18: /* report text area size (chars) */
3173 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3174 break; 3528 break;
3175 case 19: /* report window size (chars) */ 3529 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3177 break; 3531 break;
3178 case 20: /* report icon label */ 3532 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 { 3533 {
3181 char *s; 3534 char *s;
3182 XGetIconName (display->display, TermWin.parent[0], &s); 3535 XGetIconName (disp, TermWin.parent[0], &s);
3183 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3536 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3537 XFree (s);
3184 } 3538 }
3185 break; 3539 break;
3186 case 21: /* report window title */ 3540 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 { 3541 {
3189 char *s; 3542 char *s;
3190 XFetchName (display->display, TermWin.parent[0], &s); 3543 XFetchName (disp, TermWin.parent[0], &s);
3191 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3544 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3545 XFree (s);
3192 } 3546 }
3193 break; 3547 break;
3194 } 3548 }
3195} 3549}
3196#endif 3550#endif
3197 3551
… …
3201 * ends_how is terminator used. returned input must be free()'d 3555 * ends_how is terminator used. returned input must be free()'d
3202 */ 3556 */
3203unsigned char * 3557unsigned char *
3204rxvt_term::get_to_st (unicode_t &ends_how) 3558rxvt_term::get_to_st (unicode_t &ends_how)
3205{ 3559{
3206 unicode_t prev = 0, ch; 3560 unicode_t ch;
3561 bool seen_esc = false;
3207 unsigned int n = 0; 3562 unsigned int n = 0;
3208 unsigned char *s;
3209 unsigned char string[STRING_MAX]; 3563 wchar_t string[STRING_MAX];
3210 3564
3211 while ((ch = cmd_getc ()) != NOCHAR) 3565 while ((ch = cmd_getc ()) != NOCHAR)
3212 { 3566 {
3213 if (prev == C0_ESC) 3567 if (seen_esc)
3214 { 3568 {
3215 if (ch == 0x5c) /* 7bit ST */ 3569 if (ch == 0x5c) /* 7bit ST */
3216 break; 3570 break;
3217 else 3571 else
3218 return NULL; 3572 return NULL;
3219 } 3573 }
3574 else if (ch == C0_ESC)
3575 {
3576 seen_esc = true;
3577 continue;
3578 }
3220 else if (ch == C0_BEL || ch == CHAR_ST) 3579 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break; 3580 break;
3222 else if (ch < 0x20) 3581 else if (ch < 0x20)
3223 return NULL; /* other control character - exit */ 3582 return NULL; /* other control character - exit */
3583
3584 seen_esc = false;
3224 3585
3225 if (n >= sizeof (string) - 1) 3586 if (n >= sizeof (string) - 1)
3226 // stop at some sane length 3587 // stop at some sane length
3227 return NULL; 3588 return NULL;
3228 3589
3229 if (ch == C0_SYN) 3590 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 (); 3591 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else 3592 else
3235 string[n++] = prev = ch; 3593 string[n++] = ch;
3236 } 3594 }
3237 3595
3238 string[n++] = '\0'; 3596 string[n++] = '\0';
3239 3597
3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3241 return NULL;
3242
3243 ends_how = (ch == 0x5c ? C0_ESC : ch); 3598 ends_how = (ch == 0x5c ? C0_ESC : ch);
3244 STRNCPY (s, string, n); 3599
3245 return s; 3600 return (unsigned char *)rxvt_wcstombs (string);
3246} 3601}
3247 3602
3248/*----------------------------------------------------------------------*/ 3603/*----------------------------------------------------------------------*/
3249/* 3604/*
3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3605 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3294void 3649void
3295rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3650rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3296{ 3651{
3297 if (str[0] == '?' && !str[1]) 3652 if (str[0] == '?' && !str[1])
3298 { 3653 {
3299 if (Options & Opt_insecure)
3300 {
3301 unsigned short r, g, b; 3654 unsigned short r, g, b;
3302 PixColorsFocused[color].get (display, r, g, b); 3655 pix_colors_focused[color].get (display, r, g, b);
3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3656 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3304 }
3305 } 3657 }
3306 else 3658 else
3307 set_window_color (color, str); 3659 set_window_color (color, str);
3308} 3660}
3309 3661
… …
3337{ 3689{
3338 int changed = 0; 3690 int changed = 0;
3339 int color; 3691 int color;
3340 char *buf, *name; 3692 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1]; 3693 bool query = str[0] == '?' && !str[1];
3694 int saveop = op;
3695 dDisp;
3342 3696
3343 assert (str != NULL); 3697 assert (str != NULL);
3344 switch (op) 3698 switch (op)
3345 { 3699 {
3346 case XTerm_name: 3700 case XTerm_name:
… …
3353 set_title (str); 3707 set_title (str);
3354 break; 3708 break;
3355 case XTerm_property: 3709 case XTerm_property:
3356 if (str[0] == '?') 3710 if (str[0] == '?')
3357 { 3711 {
3358 Atom prop = XInternAtom (display->display, str + 1, True); 3712 Atom prop = display->atom (str + 1);
3359 Atom actual_type; 3713 Atom actual_type;
3360 int actual_format; 3714 int actual_format;
3361 unsigned long nitems; 3715 unsigned long nitems;
3362 unsigned long bytes_after; 3716 unsigned long bytes_after;
3363 unsigned char *value = 0; 3717 unsigned char *value = 0;
3364 const char *str = ""; 3718 const char *str = "";
3365 3719
3366 if (prop 3720 if (prop
3367 && XGetWindowProperty (display->display, TermWin.parent[0], 3721 && XGetWindowProperty (disp, TermWin.parent[0],
3368 prop, 0, 1<<16, 0, AnyPropertyType, 3722 prop, 0, 1<<16, 0, AnyPropertyType,
3369 &actual_type, &actual_format, 3723 &actual_type, &actual_format,
3370 &nitems, &bytes_after, &value) == Success 3724 &nitems, &bytes_after, &value) == Success
3371 && actual_type != None 3725 && actual_type != None
3372 && actual_format == 8) 3726 && actual_format == 8)
… …
3381 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3735 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3382 3736
3383 if (eq) 3737 if (eq)
3384 { 3738 {
3385 *eq = 0; 3739 *eq = 0;
3386 XChangeProperty (display->display, TermWin.parent[0], 3740 set_utf8_property (display->atom (str), eq + 1);
3387 display->atom (str), XA_STRING, 8,
3388 PropModeReplace, (unsigned char *)eq + 1,
3389 strlen (eq + 1));
3390 } 3741 }
3391 else 3742 else
3392 XDeleteProperty (display->display, TermWin.parent[0], 3743 XDeleteProperty (disp, TermWin.parent[0],
3393 display->atom (str)); 3744 display->atom (str));
3394 } 3745 }
3395 break; 3746 break;
3396 3747
3397 case XTerm_Color: 3748 case XTerm_Color:
3398 for (buf = (char *)str; buf && *buf;) 3749 for (buf = (char *)str; buf && *buf;)
3399 { 3750 {
3400 if ((name = STRCHR (buf, ';')) == NULL) 3751 if ((name = strchr (buf, ';')) == NULL)
3401 break; 3752 break;
3402 3753
3403 *name++ = '\0'; 3754 *name++ = '\0';
3404 color = atoi (buf); 3755 color = atoi (buf);
3405 3756
3406 if (color < 0 || color >= TOTAL_COLORS) 3757 if (color < 0 || color >= TOTAL_COLORS)
3407 break; 3758 break;
3408 3759
3409 if ((buf = STRCHR (name, ';')) != NULL) 3760 if ((buf = strchr (name, ';')) != NULL)
3410 *buf++ = '\0'; 3761 *buf++ = '\0';
3411 3762
3412 if (name[0] == '?' && !name[1]) 3763 if (name[0] == '?' && !name[1])
3413 { 3764 {
3414 if (Options & Opt_insecure)
3415 {
3416 unsigned short r, g, b; 3765 unsigned short r, g, b;
3417 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3766 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3418 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3767 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3419 }
3420 } 3768 }
3421 else 3769 else
3422 set_window_color (color + minCOLOR, name); 3770 set_window_color (color + minCOLOR, name);
3423 } 3771 }
3424 break; 3772 break;
… …
3441 break; 3789 break;
3442#ifndef NO_BOLD_UNDERLINE_REVERSE 3790#ifndef NO_BOLD_UNDERLINE_REVERSE
3443 case XTerm_Color_BD: 3791 case XTerm_Color_BD:
3444 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3792 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3445 break; 3793 break;
3794 case XTerm_Color_IT:
3795 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3796 break;
3446 case XTerm_Color_UL: 3797 case XTerm_Color_UL:
3447 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3798 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3448 break; 3799 break;
3449 case XTerm_Color_RV: 3800 case XTerm_Color_RV:
3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3801 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3802 break;
3803#endif
3804#if TRANSPARENT && TINTING
3805 case XTerm_Color_tint:
3806 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3807 check_our_parents ();
3808 if (am_transparent)
3809 want_full_refresh = want_refresh = 1;
3451 break; 3810 break;
3452#endif 3811#endif
3453 3812
3454 case XTerm_Pixmap: 3813 case XTerm_Pixmap:
3455 if (*str != ';') 3814 if (*str != ';')
… …
3458 scale_pixmap (""); /* reset to default scaling */ 3817 scale_pixmap (""); /* reset to default scaling */
3459 set_bgPixmap (str); /* change pixmap */ 3818 set_bgPixmap (str); /* change pixmap */
3460#endif 3819#endif
3461 scr_touch (true); 3820 scr_touch (true);
3462 } 3821 }
3463 while ((str = STRCHR (str, ';')) != NULL) 3822 while ((str = strchr (str, ';')) != NULL)
3464 { 3823 {
3465 str++; 3824 str++;
3466#if XPM_BACKGROUND 3825#if XPM_BACKGROUND
3467 changed += scale_pixmap (str); 3826 changed += scale_pixmap (str);
3468#endif 3827#endif
3469
3470 } 3828 }
3829
3471 if (changed) 3830 if (changed)
3472 { 3831 {
3473#ifdef XPM_BACKGROUND 3832#ifdef XPM_BACKGROUND
3474 resize_pixmap (); 3833 resize_pixmap ();
3475#endif 3834#endif
… …
3487 case XTerm_logfile: 3846 case XTerm_logfile:
3488 // TODO, when secure mode? 3847 // TODO, when secure mode?
3489 break; 3848 break;
3490 3849
3491 case XTerm_font: 3850 case XTerm_font:
3851 op = URxvt_font;
3852 case URxvt_font:
3853#if ENABLE_STYLES
3854 case URxvt_boldFont:
3855 case URxvt_italicFont:
3856 case URxvt_boldItalicFont:
3857#endif
3492 if (query) 3858 if (query)
3859 tt_printf ("\33]%d;%-.250s%c", saveop,
3860 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3861 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3862 resp);
3863 else
3493 { 3864 {
3494 if (Options & Opt_insecure) 3865 const char *&res = rs[Rs_font + (op - URxvt_font)];
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3866
3496 TermWin.fontset->fontdesc 3867 res = strdup (str);
3497 ? TermWin.fontset->fontdesc 3868 allocated.push_back ((void *)res);
3498 : "", 3869 set_fonts ();
3499 resp);
3500 } 3870 }
3501 else
3502 change_font (str);
3503 break; 3871 break;
3504 3872
3505#ifndef NO_FRILLS 3873#if ENABLE_FRILLS
3506 case XTerm_locale: 3874 case XTerm_locale:
3507 if (query) 3875 if (query)
3508 {
3509 if (Options & Opt_insecure)
3510 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3876 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3511 }
3512 else 3877 else
3513 { 3878 {
3514 set_locale (str); 3879 set_locale (str);
3515# ifdef USE_XIM 3880 pty.set_utf8_mode (enc_utf8);
3516 im_cb (); 3881 init_xlocale ();
3517# endif
3518 }
3519 break;
3520
3521 case XTerm_findfont:
3522 if (Options & Opt_insecure)
3523 {
3524 int fid = TermWin.fontset->find_font (atoi (str));
3525 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3526 fid, (*TermWin.fontset)[fid]->name, resp);
3527 } 3882 }
3528 break; 3883 break;
3529#endif 3884#endif
3530 3885
3531#ifdef MENUBAR 3886#ifdef MENUBAR
3532 case XTerm_Menu: 3887 case XTerm_Menu:
3533 if (Options & Opt_insecure) 3888 if (options & Opt_insecure)
3534 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3889 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3535 break; 3890 break;
3536#endif 3891#endif
3537#if 0 3892#if 0
3538 case XTerm_dumpscreen: /* no error notices */ 3893 case XTerm_dumpscreen: /* no error notices */
… …
3565{ 3920{
3566 int state; 3921 int state;
3567 3922
3568 if (mode == 's') 3923 if (mode == 's')
3569 { 3924 {
3570 SavedModes |= (PrivateModes & bit); 3925 SavedModes |= (priv_modes & bit);
3571 return -1; 3926 return -1;
3572 } 3927 }
3573 else 3928 else
3574 { 3929 {
3575 if (mode == 'r') 3930 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3931 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 3932 else
3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3933 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3579 PrivMode (state, bit); 3934 PrivMode (state, bit);
3580 } 3935 }
3581 3936
3582 return state; 3937 return state;
3583} 3938}
… …
3601 { 3, PrivMode_132 }, 3956 { 3, PrivMode_132 },
3602 { 4, PrivMode_smoothScroll }, 3957 { 4, PrivMode_smoothScroll },
3603 { 5, PrivMode_rVideo }, 3958 { 5, PrivMode_rVideo },
3604 { 6, PrivMode_relOrigin }, 3959 { 6, PrivMode_relOrigin },
3605 { 7, PrivMode_Autowrap }, 3960 { 7, PrivMode_Autowrap },
3961 // 8, bi-directional support mode
3606 { 9, PrivMode_MouseX10 }, 3962 { 9, PrivMode_MouseX10 },
3607#ifdef menuBar_esc 3963#ifdef menuBar_esc
3608 { menuBar_esc, PrivMode_menuBar }, 3964 { menuBar_esc, PrivMode_menuBar },
3609#endif 3965#endif
3966 // 18, 19 printing-related
3967 { 25, PrivMode_VisibleCursor },
3610#ifdef scrollBar_esc 3968#ifdef scrollBar_esc
3611 { scrollBar_esc, PrivMode_scrollBar }, 3969 { scrollBar_esc, PrivMode_scrollBar },
3612#endif 3970#endif
3613 // 18, 19 printing-related
3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3616 { 35, PrivMode_ShiftKeys }, // rxvt extension 3971 { 35, PrivMode_ShiftKeys }, // rxvt extension
3617 { 40, PrivMode_132OK }, 3972 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI 3973 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI 3974 // 45 margin bell NYI
3620 // 46 start logging 3975 // 46 start logging
… …
3661 4016
3662 /* extra handling for values with state unkept */ 4017 /* extra handling for values with state unkept */
3663 switch (arg[i]) 4018 switch (arg[i])
3664 { 4019 {
3665 case 1048: /* alternative cursor save */ 4020 case 1048: /* alternative cursor save */
4021 case 1049:
3666 if (Options & Opt_secondaryScreen) 4022 if (options & Opt_secondaryScreen)
3667 if (mode == 0) 4023 if (mode == 0)
3668 scr_cursor (RESTORE); 4024 scr_cursor (RESTORE);
3669 else if (mode == 1) 4025 else if (mode == 1)
3670 scr_cursor (SAVE); 4026 scr_cursor (SAVE);
3671 break; 4027 break;
… …
3682 * within VT52 mode 4038 * within VT52 mode
3683 */ 4039 */
3684 PrivMode (1, PrivMode_vt52); 4040 PrivMode (1, PrivMode_vt52);
3685 break; 4041 break;
3686 case 3: /* 80/132 */ 4042 case 3: /* 80/132 */
3687 if (PrivateModes & PrivMode_132OK) 4043 if (priv_modes & PrivMode_132OK)
3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4044 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3689 break; 4045 break;
3690 case 4: /* smooth scrolling */ 4046 case 4: /* smooth scrolling */
3691 if (state) 4047 if (state)
3692 Options &= ~Opt_jumpScroll; 4048 options &= ~Opt_jumpScroll;
3693 else 4049 else
3694 Options |= Opt_jumpScroll; 4050 options |= Opt_jumpScroll;
3695 break; 4051 break;
3696 case 5: /* reverse video */ 4052 case 5: /* reverse video */
3697 scr_rvideo_mode (state); 4053 scr_rvideo_mode (state);
3698 break; 4054 break;
3699 case 6: /* relative/absolute origins */ 4055 case 6: /* relative/absolute origins */
… …
3703 scr_autowrap (state); 4059 scr_autowrap (state);
3704 break; 4060 break;
3705 /* case 8: - auto repeat, can't do on a per window basis */ 4061 /* case 8: - auto repeat, can't do on a per window basis */
3706 case 9: /* X10 mouse reporting */ 4062 case 9: /* X10 mouse reporting */
3707 if (state) /* orthogonal */ 4063 if (state) /* orthogonal */
3708 PrivateModes &= ~PrivMode_MouseX11; 4064 priv_modes &= ~PrivMode_MouseX11;
3709 break; 4065 break;
3710#ifdef menuBar_esc 4066#ifdef menuBar_esc
3711 case menuBar_esc: 4067 case menuBar_esc:
3712#ifdef MENUBAR 4068#ifdef MENUBAR
3713 map_menuBar (state); 4069 map_menuBar (state);
… …
3733 break; 4089 break;
3734 /* case 66: - application key pad */ 4090 /* case 66: - application key pad */
3735 /* case 67: - backspace key */ 4091 /* case 67: - backspace key */
3736 case 1000: /* X11 mouse reporting */ 4092 case 1000: /* X11 mouse reporting */
3737 if (state) /* orthogonal */ 4093 if (state) /* orthogonal */
3738 PrivateModes &= ~PrivMode_MouseX10; 4094 priv_modes &= ~PrivMode_MouseX10;
3739 break; 4095 break;
3740#if 0 4096#if 0
3741 case 1001: 4097 case 1001:
3742 break; /* X11 mouse highlighting */ 4098 break; /* X11 mouse highlighting */
3743#endif 4099#endif
3744 case 1010: /* scroll to bottom on TTY output inhibit */ 4100 case 1010: /* scroll to bottom on TTY output inhibit */
3745 if (state) 4101 if (state)
3746 Options &= ~Opt_scrollTtyOutput; 4102 options &= ~Opt_scrollTtyOutput;
3747 else 4103 else
3748 Options |= Opt_scrollTtyOutput; 4104 options |= Opt_scrollTtyOutput;
3749 break; 4105 break;
3750 case 1011: /* scroll to bottom on key press */ 4106 case 1011: /* scroll to bottom on key press */
3751 if (state) 4107 if (state)
3752 Options |= Opt_scrollTtyKeypress; 4108 options |= Opt_scrollTtyKeypress;
3753 else 4109 else
3754 Options &= ~Opt_scrollTtyKeypress; 4110 options &= ~Opt_scrollTtyKeypress;
3755 break; 4111 break;
3756 case 1047: /* secondary screen w/ clearing last */ 4112 case 1047: /* secondary screen w/ clearing last */
3757 if (Options & Opt_secondaryScreen) 4113 if (options & Opt_secondaryScreen)
3758 if (current_screen != PRIMARY) 4114 if (current_screen != PRIMARY)
3759 scr_erase_screen (2); 4115 scr_erase_screen (2);
3760 scr_change_screen (state); 4116 scr_change_screen (state);
3761 break; 4117 break;
3762 case 1049: /* secondary screen w/ clearing first */ 4118 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state); 4119 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen) 4120 if (options & Opt_secondaryScreen)
3765 if (current_screen != PRIMARY) 4121 if (current_screen != PRIMARY)
3766 scr_erase_screen (2); 4122 scr_erase_screen (2);
3767 break; 4123 break;
3768 default: 4124 default:
3769 break; 4125 break;
… …
3795 rendset = 0, rendstyle = ~RS_None; 4151 rendset = 0, rendstyle = ~RS_None;
3796 break; 4152 break;
3797 case 1: 4153 case 1:
3798 rendset = 1, rendstyle = RS_Bold; 4154 rendset = 1, rendstyle = RS_Bold;
3799 break; 4155 break;
3800 //case 2: // faint or second colour 4156 //case 2: // low intensity
4157 case 3:
4158 rendset = 1, rendstyle = RS_Italic;
4159 break;
3801 case 4: 4160 case 4:
3802 rendset = 1, rendstyle = RS_Uline; 4161 rendset = 1, rendstyle = RS_Uline;
3803 break; 4162 break;
3804 case 5: // slowly blinking 4163 case 5: // slowly blinking
3805 case 6: // rapidly blinking 4164 case 6: // rapidly blinking
… …
3817 //case 11: // scoansi acs on, first alt font 4176 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font 4177 //case 12: // scoansi acs on, |0x80, second alt font
3819 //... 4178 //...
3820 //case 19: // ninth alt font 4179 //case 19: // ninth alt font
3821 //case 20: // gothic 4180 //case 20: // gothic
3822 case 21: // disable bold, faint 4181 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3823 rendset = 0, rendstyle = RS_Bold; 4182 rendset = 0, rendstyle = RS_Bold;
3824 break; 4183 break;
3825 case 22: 4184 case 22: // normal intensity
3826 rendset = 0, rendstyle = RS_Bold; 4185 rendset = 0, rendstyle = RS_Bold;
3827 break; 4186 break;
3828 //case 23: disable italic 4187 case 23: // disable italic
4188 rendset = 0, rendstyle = RS_Italic;
4189 break;
3829 case 24: 4190 case 24:
3830 rendset = 0, rendstyle = RS_Uline; 4191 rendset = 0, rendstyle = RS_Uline;
3831 break; 4192 break;
3832 case 25: 4193 case 25:
4194 rendset = 0, rendstyle = RS_Blink;
4195 break;
4196 case 26: // variable spacing (iso 8613)
3833 rendset = 0, rendstyle = RS_Blink; 4197 rendset = 0, rendstyle = RS_Blink;
3834 break; 4198 break;
3835 case 27: 4199 case 27:
3836 rendset = 0, rendstyle = RS_RVid; 4200 rendset = 0, rendstyle = RS_RVid;
3837 break; 4201 break;
… …
3855 case 35: 4219 case 35:
3856 case 36: 4220 case 36:
3857 case 37: 4221 case 37:
3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4222 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3859 break; 4223 break;
3860#ifdef TTY_256COLOR 4224 case 38: // set fg color, ISO 8613-6
3861 case 38:
3862 if (nargs > i + 2 && arg[i + 1] == 5) 4225 if (nargs > i + 2 && arg[i + 1] == 5)
3863 { 4226 {
3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4227 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3865 i += 2; 4228 i += 2;
3866 } 4229 }
3867 break; 4230 break;
3868#endif
3869 case 39: /* default fg */ 4231 case 39: /* default fg */
3870 scr_color (Color_fg, Color_fg); 4232 scr_color (Color_fg, Color_fg);
3871 break; 4233 break;
3872 4234
3873 case 40: 4235 case 40:
… …
3878 case 45: 4240 case 45:
3879 case 46: 4241 case 46:
3880 case 47: 4242 case 47:
3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4243 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3882 break; 4244 break;
3883#ifdef TTY_256COLOR 4245 case 48: // set bg color, ISO 8613-6
3884 case 48:
3885 if (nargs > i + 2 && arg[i + 1] == 5) 4246 if (nargs > i + 2 && arg[i + 1] == 5)
3886 { 4247 {
3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4248 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3888 i += 2; 4249 i += 2;
3889 } 4250 }
3890 break; 4251 break;
3891#endif
3892 case 49: /* default bg */ 4252 case 49: /* default bg */
3893 scr_color (Color_bg, Color_bg); 4253 scr_color (Color_bg, Color_bg);
3894 break; 4254 break;
4255
4256 //case 50: // not variable spacing
3895 4257
3896#ifndef NO_BRIGHTCOLOR 4258#ifndef NO_BRIGHTCOLOR
3897 case 90: 4259 case 90:
3898 case 91: /* set bright fg color */ 4260 case 91: /* set bright fg color */
3899 case 92: 4261 case 92:
3900 case 93: 4262 case 93:
3901 case 94: 4263 case 94:
3902 case 95: 4264 case 95:
3903 case 96: 4265 case 96:
3904 case 97: 4266 case 97:
3905 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4267 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3906 Color_fg);
3907 break; 4268 break;
3908 case 100: 4269 case 100:
3909 case 101: /* set bright bg color */ 4270 case 101: /* set bright bg color */
3910 case 102: 4271 case 102:
3911 case 103: 4272 case 103:
3912 case 104: 4273 case 104:
3913 case 105: 4274 case 105:
3914 case 106: 4275 case 106:
3915 case 107: 4276 case 107:
3916 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4277 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3917 Color_bg);
3918 break; 4278 break;
3919#endif 4279#endif
3920 4280
3921 } 4281 }
3922 } 4282 }
… …
3929{ 4289{
3930 unicode_t ch, cmd = cmd_getc (); 4290 unicode_t ch, cmd = cmd_getc ();
3931 4291
3932 if (cmd == 'Q') 4292 if (cmd == 'Q')
3933 { /* query graphics */ 4293 { /* query graphics */
3934 tt_printf ("\033G0\n"); /* no graphics */ 4294 tt_printf ("\033G0\012"); /* no graphics */
3935 return; 4295 return;
3936 } 4296 }
3937 /* swallow other graphics sequences until terminating ':' */ 4297 /* swallow other graphics sequences until terminating ':' */
3938 do 4298 do
3939 ch = cmd_getc (); 4299 ch = cmd_getc ();
… …
3954 unsigned char buf[256]; 4314 unsigned char buf[256];
3955 4315
3956 va_start (arg_ptr, fmt); 4316 va_start (arg_ptr, fmt);
3957 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4317 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3958 va_end (arg_ptr); 4318 va_end (arg_ptr);
3959 tt_write (buf, STRLEN (buf)); 4319 tt_write (buf, strlen (buf));
3960} 4320}
3961 4321
3962/* ---------------------------------------------------------------------- */ 4322/* ---------------------------------------------------------------------- */
3963/* Write data to the pty as typed by the user, pasted with the mouse, 4323/* Write data to the pty as typed by the user, pasted with the mouse,
3964 * or generated by us in response to a query ESC sequence. 4324 * or generated by us in response to a query ESC sequence.
3965 */ 4325 */
4326const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4327
3966void 4328void
3967rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4329rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3968{ 4330{
3969 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4331 if (v_buflen == 0)
4332 {
4333 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3970 4334
3971 if (len) 4335 if ((unsigned int)written == len)
4336 return;
4337
4338 data += written;
4339 len -= written;
3972 { 4340 }
4341
4342 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4343
4344 memcpy (v_buffer + v_buflen, data, len);
4345 v_buflen += len;
4346
4347 pty_ev.set (EVENT_READ | EVENT_WRITE);
4348}
4349
4350void rxvt_term::pty_write ()
4351{
4352 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4353
4354 if (written > 0)
4355 {
4356 v_buflen -= written;
4357
3973 if (v_buflen == 0) 4358 if (v_buflen == 0)
3974 { 4359 {
3975 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3976
3977 if ((unsigned int)written == len)
3978 return;
3979
3980 data += written;
3981 len -= written;
3982 }
3983
3984
3985 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3986
3987 memcpy (v_buffer + v_buflen, data, len);
3988 v_buflen += len;
3989 }
3990
3991 for (;;)
3992 {
3993 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3994
3995 if (written > 0)
3996 {
3997 v_buflen -= written;
3998
3999 if (v_buflen == 0)
4000 {
4001 free (v_buffer); 4360 free (v_buffer);
4002 v_buffer = 0; 4361 v_buffer = 0;
4003 v_buflen = 0; 4362 v_buflen = 0;
4004 4363
4005 pty_ev.set (EVENT_READ); 4364 pty_ev.set (EVENT_READ);
4006 return;
4007 }
4008
4009 memmove (v_buffer, v_buffer + written, v_buflen);
4010 }
4011 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4012 // original code just ignores this...
4013 destroy ();
4014 else
4015 {
4016 pty_ev.set (EVENT_READ | EVENT_WRITE);
4017 return; 4365 return;
4018 } 4366 }
4367
4368 memmove (v_buffer, v_buffer + written, v_buflen);
4019 } 4369 }
4370 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4371 // original code just ignores this...
4372 destroy ();
4020} 4373}
4021 4374
4022/*----------------------- end-of-file (C source) -----------------------*/ 4375/*----------------------- end-of-file (C source) -----------------------*/
4023 4376

Diff Legend

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