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.202 by root, Sat Mar 12 23:35:14 2005 UTC

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

Diff Legend

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