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.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.196 by root, Thu Feb 17 12:23:39 2005 UTC

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

Diff Legend

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