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.81 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.194 by root, Mon Feb 14 10:44:50 2005 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original 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 XK_KP_Space, 0x2422,
123 0,
124};
125
126void
127rxvt_term::iso14755_54 (int x, int y)
128{
129 x = Pixel2Col (x);
130 y = Pixel2Row (y);
131
132 if (x < 0 || x >= TermWin.ncol
133 || y < 0 || y >= TermWin.nrow)
134 return;
135
136 for (;;)
137 {
138 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
139
140 if (t != NOCHAR || !x)
141 {
142 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
143 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
144 iso14755buf = ISO_14755_54;
145 break;
146 }
147
148 x--;
149 }
150
151}
152#endif
153
154#if ENABLE_OVERLAY
155void
156rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
157{
158 rxvt_fontset *fs = FONTSET (r);
159 rxvt_font *f = (*fs)[fs->find_font (ch)];
160 wchar_t *chr, *alloc, ch2;
161 int len;
162
163#if ENABLE_COMBINING
164 if (IS_COMPOSE (ch))
165 {
166 len = rxvt_composite.expand (ch, 0);
167 alloc = chr = new wchar_t[len];
168 rxvt_composite.expand (ch, chr);
169 }
170 else
171#endif
172 {
173 ch2 = ch;
174
175 alloc = 0;
176 chr = &ch2;
177 len = 1;
178 }
179
180 int width = strlen (f->name);
181
182 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
183
184 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
185
186 for (int y = 0; y < len; y++)
187 {
188 char buf[9];
189
190 ch = *chr++;
191
192 sprintf (buf, "%8x", ch);
193 scr_overlay_set (0, y, buf);
194 scr_overlay_set (9, y, '=');
195#if !UNICODE3
196 if (ch >= 0x10000)
197 ch = 0xfffd;
198#endif
199 scr_overlay_set (11, y, ch, r);
200 scr_overlay_set (12, y, NOCHAR, r);
201 }
202
203 scr_overlay_set (0, len, f->name);
204
205#if ENABLE_COMBINING
206 if (alloc)
207 delete [] alloc;
208#endif
209}
210#endif
211
212void
213rxvt_term::commit_iso14755 ()
214{
215 wchar_t ch[2];
216
217 ch[0] = iso14755buf & ISO_14755_MASK;
218 ch[1] = 0;
219
220 if (iso14755buf & ISO_14755_51)
221 {
222 char mb[16];
223 int len;
224
225 // allow verbatim 0-bytes and control-bytes to be entered
226 if (ch[0] >= 0x20)
227 len = wcstombs (mb, ch, 16);
228 else
229 {
230 mb[0] = ch[0];
231 len = 1;
232 }
233
234 if (len > 0)
235 tt_write ((unsigned char *)mb, len);
236 else
237 scr_bell ();
238 }
239
240 iso14755buf = 0;
241}
242
243int
244rxvt_term::hex_keyval (XKeyEvent &ev)
245{
246 // check wether this event corresponds to a hex digit
247 // if the modifiers had not been pressed.
248 for (int index = 0; index < 8; index++)
249 {
250 KeySym k = XLookupKeysym (&ev, index);
251
252 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
253 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
254 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
255 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
256 }
257
258 return -1;
259}
260#endif
61 261
62/*{{{ Convert the keypress event into a string */ 262/*{{{ Convert the keypress event into a string */
63void 263void
64rxvt_term::lookup_key (XKeyEvent &ev) 264rxvt_term::lookup_key (XKeyEvent &ev)
65{ 265{
… …
147 valid_keysym = keysym != NoSymbol; 347 valid_keysym = keysym != NoSymbol;
148 } 348 }
149 349
150 if (valid_keysym) 350 if (valid_keysym)
151 { 351 {
352#ifdef KEYSYM_RESOURCE
353 if (keyboard->dispatch (this, keysym, ev.state))
354 return;
355#endif
356
152 if (TermWin.saveLines) 357 if (TermWin.saveLines)
153 { 358 {
154#ifdef UNSHIFTED_SCROLLKEYS 359#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 360 if (!ctrl && !meta)
156 {
157#else 361#else
158 if (IS_SCROLL_MOD) 362 if (IS_SCROLL_MOD)
363#endif
159 { 364 {
160#endif
161 int lnsppg; 365 int lnsppg;
162 366
163#ifdef PAGING_CONTEXT_LINES 367#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 368 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 369#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 418 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 419 {
216 keysym += (XK_F11 - XK_F1); 420 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 421 shft = 0; /* turn off Shift */
218 } 422 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 423 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 424 {
221 switch (keysym) 425 switch (keysym)
222 { 426 {
223 /* normal XTerm key bindings */ 427 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 428 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 429 selection_request (ev.time, 0, 0);
226 return; 430 return;
431#if TODO
227 /* rxvt extras */ 432 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 433 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 434 change_font (FONT_UP);
230 return; 435 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 436 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 437 change_font (FONT_DN);
233 return; 438 return;
439#endif
234 } 440 }
235 } 441 }
236 } 442 }
237#ifdef PRINTPIPE 443
238 if (keysym == XK_Print) 444#if ENABLE_FRILLS || ISO_14755
239 { 445 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 446 if (shft && ctrl)
241 return;
242 } 447 {
243#endif 448 int hv;
244 449
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 450 if (iso14755buf & ISO_14755_51
246 { 451 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 452 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 453 {
250 unsigned int l; 454 commit_iso14755 ();
251 const unsigned char *kbuf0; 455 iso14755buf = ISO_14755_51;
252 456# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 457 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 458# endif
261 ) 459 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 460 }
266 461 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 462 {
463 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
464 | hv | ISO_14755_51;
465# if ISO_14755
466 iso14755_51 (iso14755buf & ISO_14755_MASK);
467# endif
268 return; 468 return;
269 } 469 }
270 else 470 else
471 {
472# if ENABLE_OVERLAY
473 scr_overlay_off ();
271#endif 474# endif
475 iso14755buf = 0;
476 }
477 }
478 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
479 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
480 if (!(iso14755buf & ISO_14755_STARTED))
481 {
482 iso14755buf |= ISO_14755_STARTED;
483# if ENABLE_OVERLAY
484 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
485 scr_overlay_set (0, 0, "ISO 14755 mode");
486# endif
487 }
488#endif
489
490#ifdef PRINTPIPE
491 if (keysym == XK_Print)
492 {
493 scr_printscreen (ctrl | shft);
494 return;
495 }
496#endif
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
272 { 500 {
273 newlen = 1; 501 newlen = 1;
274 switch (keysym) 502 switch (keysym)
275 { 503 {
276#ifndef NO_BACKSPACE_KEY 504#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 505 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 506 if (priv_modes & PrivMode_HaveBackSpace)
279 { 507 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 508 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 509 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 510 kbuf[1] = '\0';
283 } 511 }
284 else 512 else
285 STRCPY (kbuf, key_backspace); 513 strcpy (kbuf, key_backspace);
286 break; 514 break;
287#endif 515#endif
288#ifndef NO_DELETE_KEY 516#ifndef NO_DELETE_KEY
289 case XK_Delete: 517 case XK_Delete:
290 STRCPY (kbuf, key_delete); 518 strcpy (kbuf, key_delete);
291 break; 519 break;
292#endif 520#endif
293 case XK_Tab: 521 case XK_Tab:
294 if (shft) 522 if (shft)
295 STRCPY (kbuf, "\033[Z"); 523 strcpy (kbuf, "\033[Z");
296 else 524 else
297 { 525 {
298#ifdef CTRL_TAB_MAKES_META 526#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 527 if (ctrl)
300 meta = 1; 528 meta = 1;
… …
306 newlen = 0; 534 newlen = 0;
307 } 535 }
308 break; 536 break;
309 537
310#ifdef XK_KP_Left 538#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 539 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 540 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 541 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 542 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 543 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 544 {
317 STRCPY (kbuf, "\033OZ"); 545 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 546 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 547 break;
320 } 548 }
321 else 549 else
322 /* translate to std. cursor key */ 550 /* translate to std. cursor key */
… …
325#endif 553#endif
326 case XK_Up: /* "\033[A" */ 554 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 555 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 556 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 557 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 558 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 559 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 560 /* do Shift first */
333 if (shft) 561 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 562 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 563 else if (ctrl)
336 { 564 {
337 kbuf[1] = 'O'; 565 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 566 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 567 }
340 else if (PrivateModes & PrivMode_aplCUR) 568 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 569 kbuf[1] = 'O';
342 break; 570 break;
343 571
344#ifndef UNSHIFTED_SCROLLKEYS 572#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 573# ifdef XK_KP_Prior
346 case XK_KP_Prior: 574 case XK_KP_Prior:
347 /* allow shift to override */ 575 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 576 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 577 {
350 STRCPY (kbuf, "\033Oy"); 578 strcpy (kbuf, "\033Oy");
351 break; 579 break;
352 } 580 }
353 /* FALLTHROUGH */ 581 /* FALLTHROUGH */
354# endif 582# endif
355 case XK_Prior: 583 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 584 strcpy (kbuf, "\033[5~");
357 break; 585 break;
358# ifdef XK_KP_Next 586# ifdef XK_KP_Next
359 case XK_KP_Next: 587 case XK_KP_Next:
360 /* allow shift to override */ 588 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 589 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 590 {
363 STRCPY (kbuf, "\033Os"); 591 strcpy (kbuf, "\033Os");
364 break; 592 break;
365 } 593 }
366 /* FALLTHROUGH */ 594 /* FALLTHROUGH */
367# endif 595# endif
368 case XK_Next: 596 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 597 strcpy (kbuf, "\033[6~");
370 break; 598 break;
371#endif 599#endif
372 case XK_KP_Enter: 600 case XK_KP_Enter:
373 /* allow shift to override */ 601 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 602 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 603 {
376 STRCPY (kbuf, "\033OM"); 604 strcpy (kbuf, "\033OM");
605 break;
606 }
607
608 /* FALLTHROUGH */
609
610 case XK_Return:
611 if (priv_modes & PrivMode_LFNL)
612 {
613 kbuf[0] = '\015';
614 kbuf[1] = '\012';
615 kbuf[2] = '\0';
377 } 616 }
378 else 617 else
379 { 618 {
380 kbuf[0] = '\r'; 619 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 620 kbuf[1] = '\0';
382 } 621 }
383 break; 622 break;
384 623
385#ifdef XK_KP_Begin 624#ifdef XK_KP_Begin
386 case XK_KP_Begin: 625 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 626 strcpy (kbuf, "\033Ou");
388 break; 627 break;
389 628
390 case XK_KP_Insert: 629 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op"); 630 strcpy (kbuf, "\033Op");
392 break; 631 break;
393 632
394 case XK_KP_Delete: 633 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On"); 634 strcpy (kbuf, "\033On");
396 break; 635 break;
397#endif 636#endif
398 case XK_KP_F1: /* "\033OP" */ 637 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 638 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 639 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 640 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 641 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 642 kbuf[2] += (keysym - XK_KP_F1);
404 break; 643 break;
405 644
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 645 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 646 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 657 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 658 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 659 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 660 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 661 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 662 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 663 {
425 STRCPY (kbuf, "\033Oj"); 664 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 665 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 666 }
428 else 667 else
429 { 668 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 669 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 670 kbuf[1] = '\0';
432 } 671 }
433 break; 672 break;
434 673
435 case XK_Find: 674 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 675 strcpy (kbuf, "\033[1~");
437 break; 676 break;
438 case XK_Insert: 677 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 678 strcpy (kbuf, "\033[2~");
440 break; 679 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 680#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 681 case DXK_Remove:
443 /* FALLTHROUGH */ 682 /* FALLTHROUGH */
444#endif 683#endif
445 case XK_Execute: 684 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 685 strcpy (kbuf, "\033[3~");
447 break; 686 break;
448 case XK_Select: 687 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 688 strcpy (kbuf, "\033[4~");
450 break; 689 break;
451#ifdef XK_KP_End 690#ifdef XK_KP_End
452 case XK_KP_End: 691 case XK_KP_End:
453 /* allow shift to override */ 692 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 693 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 694 {
456 STRCPY (kbuf, "\033Oq"); 695 strcpy (kbuf, "\033Oq");
457 break; 696 break;
458 } 697 }
459 /* FALLTHROUGH */ 698 /* FALLTHROUGH */
460#endif 699#endif
461 case XK_End: 700 case XK_End:
462 STRCPY (kbuf, KS_END); 701 strcpy (kbuf, KS_END);
463 break; 702 break;
464#ifdef XK_KP_Home 703#ifdef XK_KP_Home
465 case XK_KP_Home: 704 case XK_KP_Home:
466 /* allow shift to override */ 705 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 706 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 707 {
469 STRCPY (kbuf, "\033Ow"); 708 strcpy (kbuf, "\033Ow");
470 break; 709 break;
471 } 710 }
472 /* FALLTHROUGH */ 711 /* FALLTHROUGH */
473#endif 712#endif
474 case XK_Home: 713 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 714 strcpy (kbuf, KS_HOME);
476 break; 715 break;
477 716
478#define FKEY(n, fkey) \ 717#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 718 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 719
… …
532#undef FKEY 771#undef FKEY
533 default: 772 default:
534 newlen = 0; 773 newlen = 0;
535 break; 774 break;
536 } 775 }
776
537 if (newlen) 777 if (newlen)
538 len = STRLEN (kbuf); 778 len = strlen (kbuf);
539 } 779 }
540 780
541 /* 781 /*
542 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
543 */ 783 */
… …
550 else if (ctrl && keysym == XK_minus) 790 else if (ctrl && keysym == XK_minus)
551 { 791 {
552 len = 1; 792 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 793 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 794 }
795 else if (keysym == XK_ISO_Left_Tab)
796 {
797 strcpy (kbuf, "\033[Z");
798 len = 3;
799 }
555 else 800 else
556 { 801 {
557#ifdef META8_OPTION 802#ifdef META8_OPTION
558 /* set 8-bit on */ 803 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 804 if (meta && (meta_char == 0x80))
… …
571 } 816 }
572 817
573 if (len <= 0) 818 if (len <= 0)
574 return; /* not mapped */ 819 return; /* not mapped */
575 820
576 if (Options & Opt_scrollTtyKeypress) 821 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 822 if (TermWin.view_start)
578 { 823 {
579 TermWin.view_start = 0; 824 TermWin.view_start = 0;
580 want_refresh = 1; 825 want_refresh = 1;
581 } 826 }
… …
617#endif /* DEBUG_CMD */ 862#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 863 tt_write (kbuf, (unsigned int)len);
619} 864}
620/*}}} */ 865/*}}} */
621 866
622#if (MENUBAR_MAX) 867#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 868/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */ 869/* attempt to `write' count to the input buffer */
625unsigned int 870unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 871rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
627{ 872{
… …
630 n = cmdbuf_ptr - cmdbuf_base; 875 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 876 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 877
633 if (n > 0 && s < count) 878 if (n > 0 && s < count)
634 { 879 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 880 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 881 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 882 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 883 cmdbuf_endp -= n;
639 s += n; 884 s += n;
640 } 885 }
… …
650 895
651 cmd_parse (); 896 cmd_parse ();
652 897
653 return 0; 898 return 0;
654} 899}
655#endif /* MENUBAR_MAX */ 900#endif
656 901
657void 902void
658rxvt_term::flush () 903rxvt_term::flush ()
659{ 904{
905 flush_ev.stop ();
906
660#ifdef TRANSPARENT 907#ifdef TRANSPARENT
661 if (want_full_refresh) 908 if (want_full_refresh)
662 { 909 {
663 want_full_refresh = 0; 910 want_full_refresh = 0;
664 scr_clear (); 911 scr_clear ();
665 scr_touch (false); 912 scr_touch (false);
666 want_refresh = 1;
667 } 913 }
668#endif 914#endif
669 915
670 if (want_refresh) 916 if (want_refresh)
671 { 917 {
672 scr_refresh (refresh_type); 918 scr_refresh (refresh_type);
673 scrollbar_show (1); 919 scrollbar_show (1);
674#ifdef USE_XIM 920#ifdef USE_XIM
675 IMSendSpot (); 921 IMSendSpot ();
676#endif 922#endif
677
678 } 923 }
679 924
680 display->flush (); 925 display->flush ();
681} 926}
682 927
… …
684rxvt_term::check_cb (check_watcher &w) 929rxvt_term::check_cb (check_watcher &w)
685{ 930{
686 SET_R (this); 931 SET_R (this);
687 SET_LOCALE (locale); 932 SET_LOCALE (locale);
688 933
934 display->flush ();
935
936 if (want_refresh && !flush_ev.active)
937 flush_ev.start (NOW + 0.01);
938}
939
940void
941rxvt_term::flush_cb (time_watcher &w)
942{
943 SET_R (this);
944 SET_LOCALE (locale);
945
946 refresh_limit = 1;
947 refresh_count = 0;
689 flush (); 948 flush ();
690} 949}
691 950
692#ifdef CURSOR_BLINK 951#ifdef CURSOR_BLINK
693void 952void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 970 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 971 }
713} 972}
714#endif 973#endif
715 974
975#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
976void
977rxvt_term::cont_scroll_cb (time_watcher &w)
978{
979 if ((scrollbar_isUp() || scrollbar_isDn()) &&
980 scr_page (scrollbar_isUp() ? UP : DN, 1))
981 {
982 refresh_type |= SMOOTH_REFRESH;
983 want_refresh = 1;
984 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
985 }
986}
987#endif
988
989#ifdef SELECTION_SCROLLING
990void
991rxvt_term::sel_scroll_cb (time_watcher &w)
992{
993 if (scr_page (scroll_selection_dir, scroll_selection_lines))
994 {
995 selection_extend (selection_save_x, selection_save_y, selection_save_state);
996 refresh_type |= SMOOTH_REFRESH;
997 want_refresh = 1;
998 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
999 }
1000}
1001#endif
1002
1003#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1004void
1005rxvt_term::slip_wheel_cb (time_watcher &w)
1006{
1007 if (mouse_slip_wheel_speed == 0
1008 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1009 : scr_page (UP, mouse_slip_wheel_speed))
1010 {
1011 if (TermWin.view_start == TermWin.nscrolled ||
1012 TermWin.view_start == 0)
1013 mouse_slip_wheel_speed = 0;
1014
1015 refresh_type |= SMOOTH_REFRESH;
1016 want_refresh = 1;
1017 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1018 }
1019}
1020#endif
1021
716bool 1022bool
717rxvt_term::pty_fill () 1023rxvt_term::pty_fill ()
718{ 1024{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1025 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1026
1027 if (CBUFSIZ == n)
1028 {
1029 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1030 n = 0;
1031 }
720 1032
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1033 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1034 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1035 cmdbuf_endp = cmdbuf_ptr + n;
724 1036
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1037 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
726 1038
727 if (n > 0) 1039 if (n > 0)
728 { 1040 {
729 cmdbuf_endp += n; 1041 cmdbuf_endp += n;
730 return true; 1042 return true;
… …
739rxvt_term::pty_cb (io_watcher &w, short revents) 1051rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1052{
741 SET_R (this); 1053 SET_R (this);
742 SET_LOCALE (locale); 1054 SET_LOCALE (locale);
743 1055
1056 if (revents & EVENT_READ)
1057 // loop, but don't allow a single term to monopolize us
1058 while (pty_fill ())
1059 if (cmd_parse ())
1060 break;
1061
744 if (revents & EVENT_WRITE) 1062 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1063 pty_write ();
746 else if (revents & EVENT_READ) 1064}
747 {
748 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759 1065
760 if (cmd_parse ()) 1066void
761 break; 1067rxvt_term::pointer_unblank ()
762 } 1068{
763 } 1069 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1070 recolour_cursor ();
1071
1072#ifdef POINTER_BLANK
1073 hidden_pointer = 0;
1074
1075 if (options & Opt_pointerBlank)
1076 pointer_ev.start (NOW + pointerBlankDelay);
1077#endif
764} 1078}
765 1079
766#ifdef POINTER_BLANK 1080#ifdef POINTER_BLANK
767void 1081void
768rxvt_term::pointer_unblank ()
769{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor ();
772
773 hidden_pointer = 0;
774
775 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay);
777}
778
779void
780rxvt_term::pointer_blank () 1082rxvt_term::pointer_blank ()
781{ 1083{
782 if (! (Options & Opt_pointerBlank)) 1084 if (! (options & Opt_pointerBlank))
783 return; 1085 return;
784 1086
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1087 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
786 XFlush (display->display); 1088 XFlush (display->display);
787 1089
788 hidden_pointer = 1; 1090 hidden_pointer = 1;
789} 1091}
790 1092
… …
807 x = ev.x; 1109 x = ev.x;
808 y = ev.y; 1110 y = ev.y;
809 pixel_position (&x, &y); 1111 pixel_position (&x, &y);
810 1112
811 if (MEvent.button == AnyButton) 1113 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1114 button_number = 3;
814 }
815 else 1115 else
816 { 1116 {
817 button_number = MEvent.button - Button1; 1117 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1118 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1119 if (button_number >= 3)
820 button_number += (64 - 3); 1120 button_number += (64 - 3);
821 } 1121 }
822 1122
823 if (PrivateModes & PrivMode_MouseX10) 1123 if (priv_modes & PrivMode_MouseX10)
824 { 1124 {
825 /* 1125 /*
826 * do not report ButtonRelease 1126 * do not report ButtonRelease
827 * no state info allowed 1127 * no state info allowed
828 */ 1128 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1143 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1144 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1145#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1146 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1147#endif
848
849 } 1148 }
850 1149
851#ifdef DEBUG_MOUSEREPORT 1150#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1151 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1152 if (key_state & 16)
854 fputc ('C', stderr); 1153 fputc ('C', stderr);
855 if (key_state & 4) 1154 if (key_state & 4)
856 fputc ('S', stderr); 1155 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1159 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1160 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1161 button_number,
863 x + 1, 1162 x + 1,
864 y + 1); 1163 y + 1);
865#else 1164#endif
1165
866 tt_printf ("\033[M%c%c%c", 1166 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1167 (32 + button_number + key_state),
868 (32 + x + 1), 1168 (32 + x + 1),
869 (32 + y + 1)); 1169 (32 + y + 1));
870#endif
871} 1170}
872 1171
873#ifdef USING_W11LIB 1172#ifdef USING_W11LIB
874void 1173void
875rxvt_W11_process_x_event (XEvent *ev) 1174rxvt_W11_process_x_event (XEvent *ev)
… …
882 1181
883/*{{{ process an X event */ 1182/*{{{ process an X event */
884void 1183void
885rxvt_term::x_cb (XEvent &ev) 1184rxvt_term::x_cb (XEvent &ev)
886{ 1185{
1186 dDisp;
1187
887 SET_R (this); 1188 SET_R (this);
888 SET_LOCALE (locale); 1189 SET_LOCALE (locale);
889 1190
890#if defined(CURSOR_BLINK) 1191#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1192 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
892 { 1193 {
893 if (hidden_cursor) 1194 if (hidden_cursor)
894 { 1195 {
895 hidden_cursor = 0; 1196 hidden_cursor = 0;
896 want_refresh = 1; 1197 want_refresh = 1;
… …
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1200 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 } 1201 }
901#endif 1202#endif
902 1203
903#if defined(POINTER_BLANK) 1204#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1205 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 { 1206 {
906 if (ev.type == MotionNotify 1207 if (ev.type == MotionNotify
907 || ev.type == ButtonPress 1208 || ev.type == ButtonPress
908 || ev.type == ButtonRelease) 1209 || ev.type == ButtonRelease)
909 if (hidden_pointer) 1210 if (hidden_pointer)
… …
912 if (ev.type == KeyPress && hidden_pointer == 0) 1213 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank (); 1214 pointer_blank ();
914 } 1215 }
915#endif 1216#endif
916 1217
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return;
920#endif
921
922 Window unused_root, unused_child; 1218 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1219 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1220 unsigned int unused_mask;
925
926#ifdef DEBUG_X
927 const char *const eventnames[] =
928 { /* mason - this matches my system */
929 "",
930 "",
931 "KeyPress",
932 "KeyRelease",
933 "ButtonPress",
934 "ButtonRelease",
935 "MotionNotify",
936 "EnterNotify",
937 "LeaveNotify",
938 "FocusIn",
939 "FocusOut",
940 "KeymapNotify",
941 "Expose",
942 "GraphicsExpose",
943 "NoExpose",
944 "VisibilityNotify",
945 "CreateNotify",
946 "DestroyNotify",
947 "UnmapNotify",
948 "MapNotify",
949 "MapRequest",
950 "ReparentNotify",
951 "ConfigureNotify",
952 "ConfigureRequest",
953 "GravityNotify",
954 "ResizeRequest",
955 "CirculateNotify",
956 "CirculateRequest",
957 "PropertyNotify",
958 "SelectionClear",
959 "SelectionRequest",
960 "SelectionNotify",
961 "ColormapNotify",
962 "ClientMessage",
963 "MappingNotify"
964 };
965#endif
966
967#ifdef DEBUG_X
968 struct timeval tp;
969 struct tm *ltt;
970 (void)gettimeofday (&tp, NULL);
971 ltt = localtime (& (tp.tv_sec));
972 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));
973#endif
974 1221
975 switch (ev.type) 1222 switch (ev.type)
976 { 1223 {
977 case KeyPress: 1224 case KeyPress:
1225#if ISO_14755
1226 if (!(iso14755buf & ISO_14755_52))
1227#endif
978 lookup_key (ev.xkey); 1228 lookup_key (ev.xkey);
1229
1230 break;
1231
1232 case KeyRelease:
1233 {
1234#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1235 KeySym ks;
1236
1237 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1238#endif
1239
1240#if ENABLE_FRILLS || ISO_14755
1241 // ISO 14755 support
1242 if (iso14755buf)
1243 if (iso14755buf & ISO_14755_52)
1244 {
1245# if ENABLE_OVERLAY
1246 scr_overlay_off ();
1247# endif
1248# if ISO_14755
1249 // iso14755 part 5.2 handling: release time
1250 // first: controls
1251 if ((ev.xkey.state & ControlMask)
1252 && ((ks >= 0x40 && ks <= 0x5f)
1253 || (ks >= 0x61 && ks <= 0x7f)))
1254 {
1255 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1256 commit_iso14755 ();
1257 return; // case-break;
1258 }
1259
1260 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1261 if (i[0] == ks)
1262 {
1263 iso14755buf = ISO_14755_51 | i[1];
1264 commit_iso14755 ();
1265 return; // case-break;
1266 }
1267
1268 scr_bell ();
1269# endif
1270 iso14755buf = 0;
979 break; 1271 break;
1272 }
1273 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1274 {
1275# if ENABLE_OVERLAY
1276 scr_overlay_off ();
1277# endif
1278 if (iso14755buf & ISO_14755_51)
1279 commit_iso14755 ();
1280#if ISO_14755
1281 else if (iso14755buf & ISO_14755_STARTED)
1282 {
1283 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1284
1285 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1286 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1287 }
1288# endif
1289 else
1290 iso14755buf = 0;
1291 }
1292#endif
980 1293
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1294#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1295 if (!(ev.xkey.state & ControlMask))
1296 slip_wheel_ev.stop ();
1297 else if (ks == XK_Control_L || ks == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1298 mouse_slip_wheel_speed = 0;
986 else 1299#endif
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1300 break;
995 } 1301 }
996#endif
997 1302
998 case ButtonPress: 1303 case ButtonPress:
999 button_press (ev.xbutton); 1304 button_press (ev.xbutton);
1000 break; 1305 break;
1001 1306
… …
1013 && (ev.xclient.data.l[0] == DndFile 1318 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1319 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1320 || ev.xclient.data.l[0] == DndLink))
1016 { 1321 {
1017 /* Get Dnd data */ 1322 /* Get Dnd data */
1018 Atom ActualType; 1323 Atom ActualType;
1019 int ActualFormat; 1324 int ActualFormat;
1020 unsigned char *data; 1325 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1326 unsigned long Size, RemainingBytes;
1022 1327
1023 XGetWindowProperty (display->display, display->root, 1328 XGetWindowProperty (disp, display->root,
1024 xa[XA_DNDSELECTION], 1329 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1330 0L, 1000000L,
1026 False, AnyPropertyType, 1331 False, AnyPropertyType,
1027 &ActualType, &ActualFormat, 1332 &ActualType, &ActualFormat,
1028 &Size, &RemainingBytes, 1333 &Size, &RemainingBytes,
1029 &data); 1334 &data);
1030 XChangeProperty (display->display, display->root, 1335 set_string_property (XA_CUT_BUFFER0, data);
1031 XA_CUT_BUFFER0, XA_STRING, 1336 XFree (data);
1032 8, PropModeReplace,
1033 data, STRLEN (data));
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1337 selection_paste (display->root, XA_CUT_BUFFER0, true);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1338 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1036 } 1339 }
1037#endif /* OFFIX_DND */ 1340#endif /* OFFIX_DND */
1038 break; 1341 break;
1039 1342
1040 case MappingNotify: 1343 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1344 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1345 break;
1043 1346
1044 /* 1347 /*
1045 * XXX: this is not the _current_ arrangement 1348 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1349 * Here's my conclusion:
… …
1071 { 1374 {
1072 TermWin.focus = 1; 1375 TermWin.focus = 1;
1073 want_refresh = 1; 1376 want_refresh = 1;
1074#ifdef USE_XIM 1377#ifdef USE_XIM
1075 if (Input_Context != NULL) 1378 if (Input_Context != NULL)
1379 {
1380 IMSetStatusPosition ();
1076 XSetICFocus (Input_Context); 1381 XSetICFocus (Input_Context);
1382 }
1077#endif 1383#endif
1078#ifdef CURSOR_BLINK 1384#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink) 1385 if (options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1386 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1387#endif
1388#ifdef OFF_FOCUS_FADING
1389 if (rs[Rs_fade])
1390 {
1391 pix_colors = pix_colors_focused;
1392 scr_recolour ();
1393 }
1081#endif 1394#endif
1082 1395
1083 } 1396 }
1084 break; 1397 break;
1085 1398
1086 case FocusOut: 1399 case FocusOut:
1087 if (TermWin.focus) 1400 if (TermWin.focus)
1088 { 1401 {
1089 TermWin.focus = 0; 1402 TermWin.focus = 0;
1090 want_refresh = 1; 1403 want_refresh = 1;
1404
1405#if ENABLE_FRILLS || ISO_14755
1406 iso14755buf = 0;
1407#endif
1408#if ENABLE_OVERLAY
1409 scr_overlay_off ();
1410#endif
1091#ifdef USE_XIM 1411#ifdef USE_XIM
1092 if (Input_Context != NULL) 1412 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context); 1413 XUnsetICFocus (Input_Context);
1094#endif 1414#endif
1095#ifdef CURSOR_BLINK 1415#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink) 1416 if (options & Opt_cursorBlink)
1097 cursor_blink_ev.stop (); 1417 cursor_blink_ev.stop ();
1098 hidden_cursor = 0; 1418 hidden_cursor = 0;
1099#endif 1419#endif
1100 1420#ifdef OFF_FOCUS_FADING
1421 if (rs[Rs_fade])
1422 {
1423 pix_colors = pix_colors_unfocused;
1424 scr_recolour ();
1425 }
1426#endif
1101 } 1427 }
1102 break; 1428 break;
1103 1429
1104 case ConfigureNotify: 1430 case ConfigureNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1431 if (ev.xconfigure.window == TermWin.parent[0])
… …
1110 { /* Wrap lots of configures into one */ 1436 { /* Wrap lots of configures into one */
1111 width = ev.xconfigure.width; 1437 width = ev.xconfigure.width;
1112 height = ev.xconfigure.height; 1438 height = ev.xconfigure.height;
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1439 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 } 1440 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1441 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1116 1442
1117 if (szHint.width != width || szHint.height != height) 1443 if (szHint.width != width || szHint.height != height)
1118 { 1444 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1445 seen_resize = 1;
1120 resize_all_windows (width, height, 1); 1446 resize_all_windows (width, height, 1);
1121 } 1447 }
1122#ifdef DEBUG_SIZE 1448
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1449#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent) 1450 if (options & Opt_transparent)
1130 {
1131 check_our_parents (); 1451 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif 1452#endif
1136
1137 } 1453 }
1454 break;
1455
1456 case PropertyNotify:
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1138 break; 1461 break;
1139 1462
1140 case SelectionClear: 1463 case SelectionClear:
1141 selection_clear (); 1464 selection_clear ();
1142 break; 1465 break;
1143 1466
1144 case SelectionNotify: 1467 case SelectionNotify:
1145 if (selection_wait == Sel_normal) 1468 if (selection_wait == Sel_normal)
1146 selection_paste (ev.xselection.requestor, 1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1147 ev.xselection.property, True);
1148 break; 1470 break;
1149 1471
1150 case SelectionRequest: 1472 case SelectionRequest:
1151 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1152 break; 1474 break;
… …
1173 1495
1174 case GraphicsExpose: 1496 case GraphicsExpose:
1175 case Expose: 1497 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1498 if (ev.xany.window == TermWin.vt)
1177 { 1499 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1500 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1501 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1502 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1504
1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1506
1507 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1508 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1509 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1510
1186 // ev.xexpose.width, TermWin.height, False); 1511 scr_refresh (refresh_type);
1187#endif
1188 want_refresh = 1;
1189 } 1512 }
1190 else 1513 else
1191 { 1514 {
1192 XEvent unused_event; 1515 XEvent unused_event;
1193 1516
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1517 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1195 Expose, 1518 ;
1196 &unused_event)) ; 1519 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1520 ;
1198 GraphicsExpose, 1521
1199 &unused_event)) ;
1200 if (isScrollbarWindow (ev.xany.window)) 1522 if (isScrollbarWindow (ev.xany.window))
1201 { 1523 {
1202 scrollBar.setIdle (); 1524 scrollBar.setIdle ();
1203 scrollbar_show (0); 1525 scrollbar_show (0);
1204 } 1526 }
1205#ifdef MENUBAR 1527#ifdef MENUBAR
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1528 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1207 menubar_expose (); 1529 menubar_expose ();
1208#endif 1530#endif
1531
1532#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == TermWin.parent[0])
1534 XClearWindow (disp, ev.xany.window);
1535#endif
1209 } 1536 }
1210 break; 1537 break;
1211 1538
1212 case MotionNotify: 1539 case MotionNotify:
1213#ifdef POINTER_BLANK 1540#ifdef POINTER_BLANK
… …
1219 { 1546 {
1220 menubar_control (ev.xbutton); 1547 menubar_control (ev.xbutton);
1221 break; 1548 break;
1222 } 1549 }
1223#endif 1550#endif
1224 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1551 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1225 break; 1552 break;
1226 1553
1227 if (ev.xany.window == TermWin.vt) 1554 if (ev.xany.window == TermWin.vt)
1228 { 1555 {
1229 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1556 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1557 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1558 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1232 ; 1559 ;
1233 1560
1234 XQueryPointer (display->display, TermWin.vt, 1561 XQueryPointer (disp, TermWin.vt,
1235 &unused_root, &unused_child, 1562 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1563 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1564 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1565 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1566#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1567 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1568 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1569 {
1243#endif 1570#endif
1571#if ISO_14755
1572 // 5.4
1573 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1574 {
1575 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1576 break;
1577 }
1578#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1579 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1580 ev.xbutton.state & Button3Mask ? 2 : 0);
1581
1246#ifdef SELECTION_SCROLLING 1582#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1583 if (ev.xbutton.y < TermWin.int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1249 { 1585 {
1250 int dist; 1586 int dist;
1251 1587
1252 pending_scroll_selection=1;
1253
1254 /* don't clobber the current delay if we are 1588 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1589 * already in the middle of scrolling.
1256 */ 1590 */
1257 if (scroll_selection_delay<=0) 1591 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1592 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1593
1260 /* save the event params so we can highlight 1594 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1595 * the selection in the pending-scroll loop
1262 */ 1596 */
1263 selection_save_x=ev.xbutton.x; 1597 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1598 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1600
1268 /* calc number of lines to scroll */ 1601 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1602 if (ev.xbutton.y < TermWin.int_bwidth)
1270 { 1603 {
1271 scroll_selection_dir = UP; 1604 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1605 dist = TermWin.int_bwidth - ev.xbutton.y;
1273 } 1606 }
1274 else 1607 else
1275 { 1608 {
1276 scroll_selection_dir = DN; 1609 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y -
1278 (TermWin.int_bwidth + TermWin.height); 1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1279 } 1611 }
1612
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1613 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1614 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1;
1282 MIN_IT (scroll_selection_lines, 1616 MIN_IT (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1617 SELECTION_SCROLL_MAX_LINES);
1284 } 1618 }
1285 else 1619 else
1286 { 1620 {
1287 /* we are within the text window, so we 1621 /* we are within the text window, so we
1288 * shouldn't be scrolling 1622 * shouldn't be scrolling
1289 */ 1623 */
1290 pending_scroll_selection = 0; 1624 if (sel_scroll_ev.active)
1625 sel_scroll_ev.stop();
1291 } 1626 }
1292#endif 1627#endif
1293#ifdef MOUSE_THRESHOLD 1628#ifdef MOUSE_THRESHOLD
1294
1295 } 1629 }
1296#endif 1630#endif
1297
1298 } 1631 }
1299 } 1632 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 { 1634 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1635 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1303 MotionNotify, &ev)) ; 1636 MotionNotify, &ev))
1637 ;
1638
1304 XQueryPointer (display->display, scrollBar.win, 1639 XQueryPointer (disp, scrollBar.win,
1305 &unused_root, &unused_child, 1640 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1641 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1642 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1643 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1644 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1645 scrollbar_size ());
1311 scr_refresh (refresh_type); 1646 scr_refresh (refresh_type);
1312 refresh_limit = 0; 1647 refresh_limit = 0;
… …
1314 } 1649 }
1315 break; 1650 break;
1316 } 1651 }
1317} 1652}
1318 1653
1654#if TRANSPARENT
1319void 1655void
1320rxvt_term::rootwin_cb (XEvent &ev) 1656rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1657{
1322 SET_R (this); 1658 SET_R (this);
1323 SET_LOCALE (locale); 1659 SET_LOCALE (locale);
1324 1660
1325 switch (ev.type) 1661 switch (ev.type)
1326 { 1662 {
1327 case PropertyNotify: 1663 case PropertyNotify:
1328 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1329 {
1330 if (ev.xproperty.state == PropertyNewValue)
1331 selection_property (ev.xproperty.window, ev.xproperty.atom);
1332 break;
1333 }
1334#ifdef TRANSPARENT
1335 else
1336 {
1337 /* 1664 /*
1338 * if user used some Esetroot compatible prog to set the root bg, 1665 * if user used some Esetroot compatible prog to set the root bg,
1339 * use the property to determine the pixmap. We use it later on. 1666 * use the property to determine the pixmap. We use it later on.
1340 */ 1667 */
1341 if (xa[XA_XROOTPMAPID] == 0)
1342 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1343
1344 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1668 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1669 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1345 return; 1670 return;
1346 }
1347 1671
1348 /* FALLTHROUGH */ 1672 /* FALLTHROUGH */
1349 case ReparentNotify: 1673 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ()) 1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1351 if (am_transparent)
1352 want_full_refresh = 1; 1675 want_refresh = want_full_refresh = 1;
1353 break; 1676 break;
1354#endif
1355 } 1677 }
1356} 1678}
1679#endif
1357 1680
1358void 1681void
1359rxvt_term::button_press (XButtonEvent &ev) 1682rxvt_term::button_press (XButtonEvent &ev)
1360{ 1683{
1361 int reportmode = 0, clickintime; 1684 int reportmode = 0, clickintime;
1362 1685
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1364 if (!bypass_keystate) 1687 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1688 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689
1366 /* 1690 /*
1367 * VT window processing of button press 1691 * VT window processing of button press
1368 */ 1692 */
1369 if (ev.window == TermWin.vt) 1693 if (ev.window == TermWin.vt)
1370 { 1694 {
1695#if ISO_14755
1696 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 {
1699 iso14755_54 (ev.x, ev.y);
1700 return;
1701 }
1702#endif
1703
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1705
1372 if (reportmode) 1706 if (reportmode)
1373 { 1707 {
1374 /* mouse report from vt window */ 1708 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1709 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1710 MEvent.state = ev.state;
… …
1405 } 1739 }
1406 else 1740 else
1407 { 1741 {
1408 if (ev.button != MEvent.button) 1742 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1743 MEvent.clicks = 0;
1744
1410 switch (ev.button) 1745 switch (ev.button)
1411 { 1746 {
1412 case Button1: 1747 case Button1:
1748 /* allow meta + click to select rectangular areas */
1749 /* should be done in screen.C */
1750#if ENABLE_FRILLS
1751 selection.rect = !!(ev.state & ModMetaMask);
1752#else
1753 selection.rect = false;
1754#endif
1755
1413 /* allow shift+left click to extend selection */ 1756 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1757 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1415 { 1758 {
1416 if (MEvent.button == Button1 && clickintime) 1759 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1760 selection_rotate (ev.x, ev.y);
1418 else 1761 else
1419 selection_extend (ev.x, ev.y, 1); 1762 selection_extend (ev.x, ev.y, 1);
… …
1434 case Button3: 1777 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1778 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1779 selection_rotate (ev.x, ev.y);
1437 else 1780 else
1438 selection_extend (ev.x, ev.y, 1); 1781 selection_extend (ev.x, ev.y, 1);
1782
1439 MEvent.button = Button3; 1783 MEvent.button = Button3;
1440 break; 1784 break;
1441 } 1785 }
1442 } 1786 }
1787
1443 MEvent.time = ev.time; 1788 MEvent.time = ev.time;
1444 return; 1789 return;
1445 } 1790 }
1446 1791
1447 /* 1792 /*
… …
1513 upordown = 1; /* down */ 1858 upordown = 1; /* down */
1514 } 1859 }
1515 if (upordown) 1860 if (upordown)
1516 { 1861 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1862#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1863 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 1864#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 1865 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 1866 {
1522 if (upordown < 0) 1867 if (upordown < 0)
1523 scrollBar.setUp (); 1868 scrollBar.setUp ();
… …
1539 break; 1884 break;
1540 case R_SB_ALIGN_BOTTOM: 1885 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 1886 csrO = scrollBar.bot - scrollBar.top;
1542 break; 1887 break;
1543 } 1888 }
1889
1544 if (scrollBar.style == R_SB_XTERM 1890 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 1891 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 1892 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 1893 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1548 scrollbar_size ()); 1894
1549 scrollBar.setMotion (); 1895 scrollBar.setMotion ();
1550 break; 1896 break;
1551 1897
1552 case Button1: 1898 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1899 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1577 scr_page ((ev.button == Button1 ? DN : UP), 1923 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 1924 (TermWin.nrow
1579 * scrollbar_position (ev.y) 1925 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 1926 / scrollbar_size ()));
1581 } 1927 }
1928
1582 break; 1929 break;
1583 } 1930 }
1584 } 1931 }
1585 return; 1932 return;
1586 } 1933 }
… …
1598{ 1945{
1599 int reportmode = 0; 1946 int reportmode = 0;
1600 1947
1601 csrO = 0; /* reset csr Offset */ 1948 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 1949 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1950 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 1951
1605 if (scrollbar_isUpDn ()) 1952 if (scrollbar_isUpDn ())
1606 { 1953 {
1607 scrollBar.setIdle (); 1954 scrollBar.setIdle ();
1608 scrollbar_show (0); 1955 scrollbar_show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1956#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH; 1957 refresh_type &= ~SMOOTH_REFRESH;
1611#endif 1958#endif
1612
1613 } 1959 }
1960
1614#ifdef SELECTION_SCROLLING 1961#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 1962 if (sel_scroll_ev.active)
1963 sel_scroll_ev.stop();
1616#endif 1964#endif
1965
1617 if (ev.window == TermWin.vt) 1966 if (ev.window == TermWin.vt)
1618 { 1967 {
1968#if ISO_14755
1969 // 5.4
1970 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1971 return;
1972#endif
1619 if (reportmode) 1973 if (reportmode)
1620 { 1974 {
1621 /* mouse report from vt window */ 1975 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 1976 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 1977 if (ev.button >= 4)
… …
1637 MEvent.button = AnyButton; 1991 MEvent.button = AnyButton;
1638 mouse_report (ev); 1992 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 1993#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 1994 return;
1641 } 1995 }
1996
1642 /* 1997 /*
1643 * dumb hack to compensate for the failure of click-and-drag 1998 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 1999 * when overriding mouse reporting
1645 */ 2000 */
1646 if (PrivateModes & PrivMode_mouse_report 2001 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2002 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2003 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2004 selection_extend (ev.x, ev.y, 0);
1650 2005
1651 switch (ev.button) 2006 switch (ev.button)
… …
1662 case Button5: 2017 case Button5:
1663 { 2018 {
1664 int i; 2019 int i;
1665 page_dirn v; 2020 page_dirn v;
1666 2021
1667 v = (ev.button == Button4) ? UP : DN; 2022 v = ev.button == Button4 ? UP : DN;
2023
1668 if (ev.state & ShiftMask) 2024 if (ev.state & ShiftMask)
1669 i = 1; 2025 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2026 else if (options & Opt_mouseWheelScrollPage)
1671 i = TermWin.nrow - 1; 2027 i = TermWin.nrow - 1;
1672 else 2028 else
1673 i = 5; 2029 i = 5;
2030
1674# ifdef MOUSE_SLIP_WHEELING 2031# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2032 if (ev.state & ControlMask)
1676 { 2033 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2034 mouse_slip_wheel_speed += v ? -1 : 1;
2035 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2036 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2037
2038 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2039 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2040
2041 slip_wheel_ev.start ();
1679 } 2042 }
2043 else
2044 {
1680# endif 2045# endif
1681# ifdef JUMP_MOUSE_WHEEL 2046# ifdef JUMP_MOUSE_WHEEL
1682 scr_page (v, i);
1683 scr_refresh (SMOOTH_REFRESH);
1684 scrollbar_show (1);
1685# else
1686 while (i--)
1687 {
1688 scr_page (v, 1); 2047 scr_page (v, i);
1689 scr_refresh (SMOOTH_REFRESH); 2048 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1); 2049 scrollbar_show (1);
2050# else
2051 while (i--)
2052 {
2053 scr_page (v, 1);
2054 scr_refresh (SMOOTH_REFRESH);
2055 scrollbar_show (1);
2056 }
2057# endif
2058# ifdef MOUSE_SLIP_WHEELING
1691 } 2059 }
1692# endif 2060#endif
1693
1694 } 2061 }
1695 break; 2062 break;
1696#endif 2063#endif
1697
1698 } 2064 }
1699 } 2065 }
1700#ifdef MENUBAR 2066#ifdef MENUBAR
1701 else if (isMenuBarWindow (ev.window)) 2067 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev); 2068 menubar_control (ev);
1703#endif 2069#endif
1704} 2070}
1705 2071
1706
1707#ifdef TRANSPARENT 2072#ifdef TRANSPARENT
2073#if TINTING
2074/* taken from aterm-0.4.2 */
2075
2076typedef uint32_t RUINT32T;
2077
2078void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2079{
2080 int sh_r, sh_g, sh_b;
2081 RUINT32T mask_r, mask_g, mask_b;
2082 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2083 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2084 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2085 int i;
2086
2087 Visual *visual = display->visual;
2088
2089 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2090
2091 /* for convenience */
2092 mask_r = visual->red_mask;
2093 mask_g = visual->green_mask;
2094 mask_b = visual->blue_mask;
2095
2096 /* boring lookup table pre-initialization */
2097 switch (srcImage->bits_per_pixel) {
2098 case 15:
2099 if ((mask_r != 0x7c00) ||
2100 (mask_g != 0x03e0) ||
2101 (mask_b != 0x001f))
2102 return;
2103 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2104 lookup_r = lookup;
2105 lookup_g = lookup+32;
2106 lookup_b = lookup+32+32;
2107 sh_r = 10;
2108 sh_g = 5;
2109 sh_b = 0;
2110 break;
2111 case 16:
2112 if ((mask_r != 0xf800) ||
2113 (mask_g != 0x07e0) ||
2114 (mask_b != 0x001f))
2115 return;
2116 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2117 lookup_r = lookup;
2118 lookup_g = lookup+32;
2119 lookup_b = lookup+32+64;
2120 sh_r = 11;
2121 sh_g = 5;
2122 sh_b = 0;
2123 break;
2124 case 24:
2125 if ((mask_r != 0xff0000) ||
2126 (mask_g != 0x00ff00) ||
2127 (mask_b != 0x0000ff))
2128 return;
2129 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2130 lookup_r = lookup;
2131 lookup_g = lookup+256;
2132 lookup_b = lookup+256+256;
2133 sh_r = 16;
2134 sh_g = 8;
2135 sh_b = 0;
2136 break;
2137 case 32:
2138 if ((mask_r != 0xff0000) ||
2139 (mask_g != 0x00ff00) ||
2140 (mask_b != 0x0000ff))
2141 return;
2142 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2143 lookup_r = lookup;
2144 lookup_g = lookup+256;
2145 lookup_b = lookup+256+256;
2146 sh_r = 16;
2147 sh_g = 8;
2148 sh_b = 0;
2149 break;
2150 default:
2151 return; /* we do not support this color depth */
2152 }
2153
2154 /* prepare limits for color transformation (each channel is handled separately) */
2155 if (shade < 0) {
2156 shade = -shade;
2157 if (shade < 0) shade = 0;
2158 if (shade > 100) shade = 100;
2159
2160 lower_lim_r = 65535-rm;
2161 lower_lim_g = 65535-gm;
2162 lower_lim_b = 65535-bm;
2163
2164 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2165 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2166 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2167
2168 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2169 } else {
2170 if (shade < 0) shade = 0;
2171 if (shade > 100) shade = 100;
2172
2173 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2174
2175 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2176 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2177 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2178 }
2179
2180 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2181 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2182 {
2183 unsigned int tmp;
2184
2185 tmp = lower_lim_r;
2186 lower_lim_r = lower_lim_b;
2187 lower_lim_b = tmp;
2188
2189 tmp = upper_lim_r;
2190 upper_lim_r = upper_lim_b;
2191 upper_lim_b = tmp;
2192 }
2193
2194 /* fill our lookup tables */
2195 for (i = 0; i <= mask_r>>sh_r; i++)
2196 {
2197 RUINT32T tmp;
2198 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2199 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2200 lookup_r[i] = (tmp/65535)<<sh_r;
2201 }
2202 for (i = 0; i <= mask_g>>sh_g; i++)
2203 {
2204 RUINT32T tmp;
2205 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2206 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2207 lookup_g[i] = (tmp/65535)<<sh_g;
2208 }
2209 for (i = 0; i <= mask_b>>sh_b; i++)
2210 {
2211 RUINT32T tmp;
2212 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2213 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2214 lookup_b[i] = (tmp/65535)<<sh_b;
2215 }
2216
2217 /* apply table to input image (replacing colors by newly calculated ones) */
2218 switch (srcImage->bits_per_pixel)
2219 {
2220 case 15:
2221 {
2222 unsigned short *p1, *pf, *p, *pl;
2223 p1 = (unsigned short *) srcImage->data;
2224 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2225 while (p1 < pf)
2226 {
2227 p = p1;
2228 pl = p1 + srcImage->width;
2229 for (; p < pl; p++)
2230 {
2231 *p = lookup_r[(*p & 0x7c00)>>10] |
2232 lookup_g[(*p & 0x03e0)>> 5] |
2233 lookup_b[(*p & 0x001f)];
2234 }
2235 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2236 }
2237 break;
2238 }
2239 case 16:
2240 {
2241 unsigned short *p1, *pf, *p, *pl;
2242 p1 = (unsigned short *) srcImage->data;
2243 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2244 while (p1 < pf)
2245 {
2246 p = p1;
2247 pl = p1 + srcImage->width;
2248 for (; p < pl; p++)
2249 {
2250 *p = lookup_r[(*p & 0xf800)>>11] |
2251 lookup_g[(*p & 0x07e0)>> 5] |
2252 lookup_b[(*p & 0x001f)];
2253 }
2254 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2255 }
2256 break;
2257 }
2258 case 24:
2259 {
2260 unsigned char *p1, *pf, *p, *pl;
2261 p1 = (unsigned char *) srcImage->data;
2262 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2263 while (p1 < pf)
2264 {
2265 p = p1;
2266 pl = p1 + srcImage->width * 3;
2267 for (; p < pl; p += 3)
2268 {
2269 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2270 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2271 p[2] = lookup_r[(p[2] & 0x0000ff)];
2272 }
2273 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2274 }
2275 break;
2276 }
2277 case 32:
2278 {
2279 RUINT32T *p1, *pf, *p, *pl;
2280 p1 = (RUINT32T *) srcImage->data;
2281 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2282
2283 while (p1 < pf)
2284 {
2285 p = p1;
2286 pl = p1 + srcImage->width;
2287 for (; p < pl; p++)
2288 {
2289 *p = lookup_r[(*p & 0xff0000)>>16] |
2290 lookup_g[(*p & 0x00ff00)>> 8] |
2291 lookup_b[(*p & 0x0000ff)] |
2292 (*p & ~0xffffff);
2293 }
2294 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2295 }
2296 break;
2297 }
2298 }
2299
2300 free (lookup);
2301}
2302#endif
2303
1708/* 2304/*
1709 * Check our parents are still who we think they are. 2305 * Check our parents are still who we think they are.
1710 * Do transparency updates if required 2306 * Do transparency updates if required
1711 */ 2307 */
1712int 2308int
1713rxvt_term::check_our_parents () 2309rxvt_term::check_our_parents ()
1714{ 2310{
1715 int i, pchanged, aformat, have_pixmap, rootdepth; 2311 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after; 2312 unsigned long nitems, bytes_after;
1717 Atom atype; 2313 Atom atype;
1718 unsigned char *prop = NULL; 2314 unsigned char *prop = NULL;
1719 Window root, oldp, *list; 2315 Window root, oldp, *list;
1720 Pixmap rootpixmap = None; 2316 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr; 2317 XWindowAttributes wattr, wrootattr;
2318 dDisp;
1722 2319
1723 pchanged = 0; 2320 pchanged = 0;
1724 2321
1725 if (! (Options & Opt_transparent)) 2322 if (!(options & Opt_transparent))
1726 return pchanged; /* Don't try any more */ 2323 return pchanged; /* Don't try any more */
1727 2324
1728 XGetWindowAttributes (display->display, display->root, &wrootattr); 2325 XGetWindowAttributes (disp, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth; 2326 rootdepth = wrootattr.depth;
1730 2327
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2328 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2329
1732 if (rootdepth != wattr.depth) 2330 if (rootdepth != wattr.depth)
1733 { 2331 {
1734 if (am_transparent) 2332 if (am_transparent)
1735 { 2333 {
1736 pchanged = 1; 2334 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt, 2335 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0; 2336 am_transparent = am_pixmap_trans = 0;
1740 } 2337 }
2338
1741 return pchanged; /* Don't try any more */ 2339 return pchanged; /* Don't try any more */
1742 } 2340 }
1743 2341
1744 /* Get all X ops out of the queue so that our information is up-to-date. */ 2342 /* Get all X ops out of the queue so that our information is up-to-date. */
1745 XSync (display->display, False); 2343 XSync (disp, False);
1746 2344
1747 /* 2345 /*
1748 * Make the frame window set by the window manager have 2346 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame 2347 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that. 2348 * windows for each client, so we have to take care about that.
1751 */ 2349 */
1752 i = (xa[XA_XROOTPMAPID] != 0 2350 i = (xa[XA_XROOTPMAP_ID]
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2351 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2352 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success)); 2353 &nitems, &bytes_after, &prop) == Success);
2354
1756 if (!i || prop == NULL) 2355 if (!i || prop == NULL)
2356 i = (xa[XA_ESETROOT_PMAP_ID]
2357 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2358 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2359 &nitems, &bytes_after, &prop) == Success);
2360
2361 if (!i || prop == NULL
2362#if TINTING
2363 || !rs[Rs_color + Color_tint]
2364#endif
2365 )
1757 have_pixmap = 0; 2366 have_pixmap = 0;
1758 else 2367 else
1759 { 2368 {
1760 have_pixmap = 1; 2369 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop); 2370 rootpixmap = *(Pixmap *)prop;
1762 XFree (prop); 2371 XFree (prop);
1763 } 2372 }
2373
1764 if (have_pixmap) 2374 if (have_pixmap)
1765 { 2375 {
1766 /* 2376 /*
1767 * Copy display->root pixmap transparency 2377 * Copy display->root pixmap transparency
1768 */ 2378 */
… …
1771 Window cr; 2381 Window cr;
1772 XImage *image; 2382 XImage *image;
1773 GC gc; 2383 GC gc;
1774 XGCValues gcvalue; 2384 XGCValues gcvalue;
1775 2385
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2386 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1777 0, 0, &sx, &sy, &cr); 2387 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width; 2388 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height; 2389 nh = (unsigned int)szHint.height;
1780 nx = ny = 0; 2390 nx = ny = 0;
1781 2391
1782 if (sx < 0) 2392 if (sx < 0)
… …
1793 sy = 0; 2403 sy = 0;
1794 } 2404 }
1795 2405
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2406 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2407 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2408
2409 XSync (disp, False);
1798 allowedxerror = -1; 2410 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2411 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1800 ZPixmap); 2412
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2413 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */ 2414 /* XXX: may need a delay here? */
1803 allowedxerror = 0; 2415 allowedxerror = 0;
2416
1804 if (image == NULL) 2417 if (image == NULL)
1805 { 2418 {
1806 if (am_transparent && am_pixmap_trans) 2419 if (am_transparent && am_pixmap_trans)
1807 { 2420 {
1808 pchanged = 1; 2421 pchanged = 1;
1809 if (TermWin.pixmap != None) 2422 if (TermWin.pixmap != None)
1810 { 2423 {
1811 XFreePixmap (display->display, TermWin.pixmap); 2424 XFreePixmap (disp, TermWin.pixmap);
1812 TermWin.pixmap = None; 2425 TermWin.pixmap = None;
1813 } 2426 }
1814 } 2427 }
2428
1815 am_pixmap_trans = 0; 2429 am_pixmap_trans = 0;
1816 } 2430 }
1817 else 2431 else
1818 { 2432 {
1819 if (TermWin.pixmap != None) 2433 if (TermWin.pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap); 2434 XFreePixmap (disp, TermWin.pixmap);
2435
2436#if TINTING
2437 if (ISSET_PIXCOLOR (Color_tint))
2438 {
2439 unsigned short rm, gm, bm;
2440 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2441
2442 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2443
2444 ShadeXImage (display, image, shade, rm, gm, bm);
2445 }
2446#endif
2447
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2448 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height, 2449 szHint.width, szHint.height, image->depth);
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2450 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2451 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height); 2452 nx, ny, image->width, image->height);
1829 XFreeGC (display->display, gc); 2453 XFreeGC (disp, gc);
1830 XDestroyImage (image); 2454 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2455 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
1832 TermWin.pixmap); 2456 XClearWindow (disp, TermWin.parent[0]);
2457
1833 if (!am_transparent || !am_pixmap_trans) 2458 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1; 2459 pchanged = 1;
2460
1835 am_transparent = am_pixmap_trans = 1; 2461 am_transparent = am_pixmap_trans = 1;
1836 } 2462 }
1837 } 2463 }
1838 2464
1839 if (!am_pixmap_trans) 2465 if (am_pixmap_trans)
2466 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2467 else
1840 { 2468 {
1841 unsigned int n; 2469 unsigned int n;
1842 /* 2470 /*
1843 * InheritPixmap transparency 2471 * InheritPixmap transparency
1844 */ 2472 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1847 i++)
1848 { 2474 {
1849 oldp = TermWin.parent[i]; 2475 oldp = TermWin.parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2476 XQueryTree (disp, TermWin.parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n); 2477 &TermWin.parent[i], &list, &n);
1852 XFree (list); 2478 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2479
1854 if (TermWin.parent[i] == display->root) 2480 if (TermWin.parent[i] == display->root)
1855 { 2481 {
1856 if (oldp != None) 2482 if (oldp != None)
1857 pchanged = 1; 2483 pchanged = 1;
2484
1858 break; 2485 break;
1859 } 2486 }
2487
1860 if (oldp != TermWin.parent[i]) 2488 if (oldp != TermWin.parent[i])
1861 pchanged = 1; 2489 pchanged = 1;
1862 } 2490 }
1863 2491
1864 n = 0; 2492 n = 0;
1865 2493
1866 if (pchanged) 2494 if (pchanged)
1867 { 2495 {
1868 for (; n < (unsigned int)i; n++) 2496 for (; n < (unsigned int)i; n++)
1869 { 2497 {
1870 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2498 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
1871 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
1872 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
1873 { 2500 {
1874 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
1875 break; 2502 break;
1876 } 2503 }
1877 } 2504 }
1878 } 2505 }
1879 2506
1880 if (n > (int) (sizeof (TermWin.parent) 2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
1881 / sizeof (TermWin.parent[0])))
1882 { 2508 {
1883 D_X ((stderr, "InheritPixmap Turning off")); 2509 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
1884 XSetWindowBackground (display->display, TermWin.parent[0], 2510 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1885 PixColors[Color_fg]);
1886 XSetWindowBackground (display->display, TermWin.vt,
1887 PixColors[Color_bg]);
1888 am_transparent = 0; 2511 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */ 2512 /* XXX: also turn off Opt_transparent? */
1890 } 2513 }
1891 else 2514 else
1892 { 2515 {
2516#if WAIT_FOR_WM
1893 /* wait (an arbitrary period) for the WM to do its thing 2517 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */ 2518 * needed for fvwm2.2.2 (and before?) */
1895# ifdef HAVE_NANOSLEEP
1896 struct timespec rqt;
1897
1898 rqt.tv_sec = 1;
1899 rqt.tv_nsec = 0;
1900 nanosleep (&rqt, NULL);
1901# else
1902 sleep (1); 2519 sleep (1);
1903# endif 2520#endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++) 2521 for (n = 0; n < (unsigned int)i; n++)
2522 {
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2523 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
1907 ParentRelative); 2524 XClearWindow (disp, TermWin.parent[n]);
2525 }
2526
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2527 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
1909 ParentRelative);
1910 am_transparent = 1; 2528 am_transparent = 1;
1911 } 2529 }
1912 2530
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None; 2532 TermWin.parent[i] = None;
1915 } 2533 }
2534
2535 if (scrollBar.win)
2536 {
2537 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2538 scrollBar.setIdle ();
2539 scrollbar_show (0);
2540 }
2541
2542 if (am_transparent)
2543 {
2544 want_refresh = want_full_refresh = 1;
2545 if (am_pixmap_trans)
2546 flush ();
2547 }
2548
1916 return pchanged; 2549 return pchanged;
1917} 2550}
1918#endif 2551#endif
1919 2552
1920/*}}} */ 2553/*}}} */
… …
1935 } 2568 }
1936 2569
1937 if (ch == NOCHAR) // TODO: improve 2570 if (ch == NOCHAR) // TODO: improve
1938 break; 2571 break;
1939 2572
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2573 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2574 {
2575 if (!seen_input)
1941 { 2576 {
2577 seen_input = 1;
2578 // many badly-written programs (e.g. jed) contain a race condition:
2579 // they first read the screensize and then install a SIGWINCH handler.
2580 // some window managers resize the window early, and these programs
2581 // then sometimes get the size wrong.
2582 // unfortunately other programs are even more buggy and dislike
2583 // being sent SIGWINCH, so only do it when we were in fact being
2584 // resized.
2585 if (seen_resize)
2586 kill (-cmd_pid, SIGWINCH);
2587 }
2588
1942 /* Read a text string from the input buffer */ 2589 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2590 unicode_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2591 bool refreshnow = false;
1945 int nlines = 0; 2592 int nlines = 0;
1946 unicode_t *str = buf; 2593 unicode_t *str = buf;
1947 2594
1948 *str++ = ch;
1949
1950 for (;;) 2595 for (;;)
1951 { 2596 {
1952 seq_begin = cmdbuf_ptr;
1953 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2597 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2598 break;
1957 2599
1958 *str++ = ch; 2600 *str++ = ch;
1959 2601
1960 if (ch == '\n') 2602 if (ch == C0_LF)
1961 { 2603 {
1962 nlines++; 2604 nlines++;
1963 refresh_count++; 2605 refresh_count++;
1964 2606
1965 if (! (Options & Opt_jumpScroll) 2607 if (!(options & Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2608 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
1967 { 2609 {
1968 refreshnow = true; 2610 refreshnow = true;
1969 flag = true;
1970 ch = NOCHAR; 2611 ch = NOCHAR;
1971 break; 2612 break;
1972 } 2613 }
1973 2614
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2615 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
1975 if (nlines >= TermWin.nrow - 1) 2616 if (nlines >= TermWin.nrow - 1)
1976 { 2617 {
1977 scr_add_lines (buf, nlines, str - buf); 2618 scr_add_lines (buf, nlines, str - buf);
1978 nlines = 0; 2619 nlines = 0;
1979 str = buf; 2620 str = buf;
… …
1983 if (str >= buf + UBUFSIZ) 2624 if (str >= buf + UBUFSIZ)
1984 { 2625 {
1985 ch = NOCHAR; 2626 ch = NOCHAR;
1986 break; 2627 break;
1987 } 2628 }
2629
2630 seq_begin = cmdbuf_ptr;
2631 ch = next_char ();
1988 } 2632 }
1989 2633
1990 scr_add_lines (buf, nlines, str - buf); 2634 scr_add_lines (buf, nlines, str - buf);
1991 2635
1992 /* 2636 /*
1993 * If there have been a lot of new lines, then update the screen 2637 * If there have been a lot of new lines, then update the screen
1994 * What the heck I'll cheat and only refresh less than every page-full. 2638 * What the heck I'll cheat and only refresh less than every page-full.
1995 * the number of pages between refreshes is refresh_limit, which 2639 * the number of pages between refreshes is refresh_limit, which
1996 * is incremented here because we must be doing flat-out scrolling. 2640 * is incremented here because we must be doing flat-out scrolling.
1997 *
1998 * refreshing should be correct for small scrolls, because of the
1999 * time-out
2000 */ 2641 */
2001 if (refreshnow) 2642 if (refreshnow)
2002 { 2643 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2644 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2645 refresh_limit++;
2005 2646 else
2647 {
2648 flag = true;
2006 scr_refresh (refresh_type); 2649 scr_refresh (refresh_type);
2650 }
2007 } 2651 }
2008 2652
2009 } 2653 }
2010 else 2654 else
2011 { 2655 {
… …
2025 } 2669 }
2026 2670
2027 return flag; 2671 return flag;
2028} 2672}
2029 2673
2674// read the next octet
2675unicode_t
2676rxvt_term::next_octet ()
2677{
2678 return cmdbuf_ptr < cmdbuf_endp
2679 ? *cmdbuf_ptr++
2680 : NOCHAR;
2681}
2682
2030// read the next character 2683// read the next character
2031unicode_t 2684unicode_t
2032rxvt_term::next_char () 2685rxvt_term::next_char ()
2033{ 2686{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2687 while (cmdbuf_ptr < cmdbuf_endp)
… …
2050 if (len == (size_t)-1) 2703 if (len == (size_t)-1)
2051 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2704 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2052 2705
2053 // assume wchar == unicode 2706 // assume wchar == unicode
2054 cmdbuf_ptr += len; 2707 cmdbuf_ptr += len;
2055 return wc; 2708 return wc & UNICODE_MASK;
2056 } 2709 }
2057 2710
2058 return NOCHAR; 2711 return NOCHAR;
2059} 2712}
2060 2713
… …
2065 */ 2718 */
2066unicode_t 2719unicode_t
2067rxvt_term::cmd_getc () 2720rxvt_term::cmd_getc ()
2068{ 2721{
2069 unicode_t c = next_char (); 2722 unicode_t c = next_char ();
2723
2724 if (c == NOCHAR)
2725 throw out_of_input;
2726
2727 return c;
2728}
2729
2730unicode_t
2731rxvt_term::cmd_get8 ()
2732{
2733 unicode_t c = next_octet ();
2070 2734
2071 if (c == NOCHAR) 2735 if (c == NOCHAR)
2072 throw out_of_input; 2736 throw out_of_input;
2073 2737
2074 return c; 2738 return c;
… …
2156/*}}} */ 2820/*}}} */
2157 2821
2158/* *INDENT-OFF* */ 2822/* *INDENT-OFF* */
2159enum { 2823enum {
2160 C1_40 = 0x40, 2824 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2825 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2162 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2826 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2163 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2827 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2164 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2828 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2829};
2166/* *INDENT-ON* */ 2830/* *INDENT-ON* */
2167 2831
2168/*{{{ process non-printing single characters */ 2832/*{{{ process non-printing single characters */
2169void 2833void
… …
2174 case C0_ESC: 2838 case C0_ESC:
2175 process_escape_seq (); 2839 process_escape_seq ();
2176 break; 2840 break;
2177 case C0_ENQ: /* terminal Status */ 2841 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2842 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2843 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2844 (unsigned int)strlen (rs[Rs_answerbackstring]));
2182 else 2845 else
2183 tt_write ((unsigned char *)VT100_ANS, 2846 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2847 (unsigned int)strlen (VT100_ANS));
2185 break; 2848 break;
2186 case C0_BEL: /* bell */ 2849 case C0_BEL: /* bell */
2187 scr_bell (); 2850 scr_bell ();
2188 break; 2851 break;
2189 case C0_BS: /* backspace */ 2852 case C0_BS: /* backspace */
… …
2205 break; 2868 break;
2206 case C0_SI: /* shift in - acs */ 2869 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2870 scr_charset_choose (0);
2208 break; 2871 break;
2209 2872
2873#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 2874 // 8-bit controls
2211 case 0x90: /* DCS */ 2875 case 0x90: /* DCS */
2212 process_dcs_seq (); 2876 process_dcs_seq ();
2213 break; 2877 break;
2214 case 0x9b: /* CSI */ 2878 case 0x9b: /* CSI */
2215 process_csi_seq (); 2879 process_csi_seq ();
2216 break; 2880 break;
2217 case 0x9d: /* CSI */ 2881 case 0x9d: /* CSI */
2218 process_osc_seq (); 2882 process_osc_seq ();
2219 break; 2883 break;
2884#endif
2220 } 2885 }
2221} 2886}
2222/*}}} */ 2887/*}}} */
2223 2888
2224 2889
… …
2286void 2951void
2287rxvt_term::process_escape_seq () 2952rxvt_term::process_escape_seq ()
2288{ 2953{
2289 unicode_t ch = cmd_getc (); 2954 unicode_t ch = cmd_getc ();
2290 2955
2291 if (PrivateModes & PrivMode_vt52) 2956 if (priv_modes & PrivMode_vt52)
2292 { 2957 {
2293 process_escape_vt52 (ch); 2958 process_escape_vt52 (ch);
2294 return; 2959 return;
2295 } 2960 }
2296 2961
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 2976 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 2977 break;
2313 case '+': 2978 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 2979 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 2980 break;
2316#ifndef NO_FRILLS 2981#if ENABLE_FRILLS
2317 case '6': 2982 case '6':
2318 scr_backindex (); 2983 scr_backindex ();
2319 break; 2984 break;
2320#endif 2985#endif
2321 case '7': 2986 case '7':
2322 scr_cursor (SAVE); 2987 scr_cursor (SAVE);
2323 break; 2988 break;
2324 case '8': 2989 case '8':
2325 scr_cursor (RESTORE); 2990 scr_cursor (RESTORE);
2326 break; 2991 break;
2327#ifndef NO_FRILLS 2992#if ENABLE_FRILLS
2328 case '9': 2993 case '9':
2329 scr_forwardindex (); 2994 scr_forwardindex ();
2330 break; 2995 break;
2331#endif 2996#endif
2332 case '=': 2997 case '=':
… …
2342 break; 3007 break;
2343 3008
2344 /* 8.3.87: NEXT LINE */ 3009 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 3010 case C1_NEL: /* ESC E */
2346 { 3011 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 3012 unicode_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 3013 scr_add_lines (nlcr, 1, 2);
2349 } 3014 }
2350 break; 3015 break;
2351 3016
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 3017 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2363 case C1_RI: /* ESC M */ 3028 case C1_RI: /* ESC M */
2364 scr_index (DN); 3029 scr_index (DN);
2365 break; 3030 break;
2366 3031
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 3032 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 3033 /*case C1_SS2: scr_single_shift (2); break; */
2369 3034
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 3035 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 3036 /*case C1_SS3: scr_single_shift (3); break; */
2372 3037
2373 /* 8.3.27: DEVICE CONTROL STRING */ 3038 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 3039 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 3040 process_dcs_seq ();
2376 break; 3041 break;
… …
2391 process_osc_seq (); 3056 process_osc_seq ();
2392 break; 3057 break;
2393 3058
2394 /* 8.3.106: RESET TO INITIAL STATE */ 3059 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 3060 case 'c':
3061 mbstate.reset ();
2396 scr_poweron (); 3062 scr_poweron ();
2397 scrollbar_show (1); 3063 scrollbar_show (1);
2398 break; 3064 break;
2399 3065
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3066 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 3078
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3079/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 3080/* *INDENT-OFF* */
2415enum { 3081enum {
2416 CSI_ICH = 0x40, 3082 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3083 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2418 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3084 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2419 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3085 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2420 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3086 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2421 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3087 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2422 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3088 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2437 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3103 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2438 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3104 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2439 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3105 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2440 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3106 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2441 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3107 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2442 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3108 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 3109 };
2444/* *INDENT-ON* */ 3110/* *INDENT-ON* */
2445 3111
2446void 3112void
2447rxvt_term::process_csi_seq () 3113rxvt_term::process_csi_seq ()
… …
2510 { 3176 {
2511 switch (priv) 3177 switch (priv)
2512 { 3178 {
2513 case '>': 3179 case '>':
2514 if (ch == CSI_DA) /* secondary device attributes */ 3180 if (ch == CSI_DA) /* secondary device attributes */
2515 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3181 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2516 break; 3182 break;
2517 case '?': 3183 case '?':
2518 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3184 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2519 process_terminal_mode (ch, priv, nargs, arg); 3185 process_terminal_mode (ch, priv, nargs, arg);
2520 break; 3186 break;
… …
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3296 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2631 break; 3297 break;
2632 3298
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3299 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 3300 tt_write ((const unsigned char *)VT100_ANS,
2635 (unsigned int) (sizeof (VT100_ANS) - 1)); 3301 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 3302 break;
2637 3303
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3304 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 3305 process_sgr_mode (nargs, arg);
2640 break; 3306 break;
… …
2646 tt_printf ("\033[0n"); 3312 tt_printf ("\033[0n");
2647 break; 3313 break;
2648 case 6: /* CPR requested */ 3314 case 6: /* CPR requested */
2649 scr_report_position (); 3315 scr_report_position ();
2650 break; 3316 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3317 case 7: /* unofficial extension */
3318 if (options & Opt_insecure)
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3319 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3320 break;
2655#endif
2656 case 8: /* unofficial extension */ 3321 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3322 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3323 break;
2659 } 3324 }
2660 break; 3325 break;
2661 3326
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3327 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3360 break;
2696 3361
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3362 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3363 if (arg[0] == 4)
2699 scr_insert_mode (0); 3364 scr_insert_mode (0);
3365 else if (arg[0] == 20)
3366 priv_modes &= ~PrivMode_LFNL;
2700 break; 3367 break;
2701 3368
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3369 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3370 if (arg[0] == 4)
2704 scr_insert_mode (1); 3371 scr_insert_mode (1);
3372 else if (arg[0] == 20)
3373 priv_modes |= PrivMode_LFNL;
2705 break; 3374 break;
2706 3375
2707 /* 3376 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3377 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3378 */
… …
2721 break; 3390 break;
2722 case CSI_75: 3391 case CSI_75:
2723 scr_cursor (RESTORE); 3392 scr_cursor (RESTORE);
2724 break; 3393 break;
2725 3394
2726#ifndef NO_FRILLS 3395#if ENABLE_FRILLS
2727 case CSI_74: 3396 case CSI_74:
2728 process_window_ops (arg, nargs); 3397 process_window_ops (arg, nargs);
2729 break; 3398 break;
2730#endif 3399#endif
2731 3400
… …
2738 break; 3407 break;
2739 } 3408 }
2740} 3409}
2741/*}}} */ 3410/*}}} */
2742 3411
2743#ifndef NO_FRILLS 3412#if ENABLE_FRILLS
2744/* ARGSUSED */ 3413/* ARGSUSED */
2745void 3414void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3415rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3416{
2748 int x, y; 3417 int x, y;
2749 XWindowAttributes wattr; 3418 XWindowAttributes wattr;
2750 Window wdummy; 3419 Window wdummy;
3420 dDisp;
2751 3421
2752 if (nargs == 0) 3422 if (nargs == 0)
2753 return; 3423 return;
2754 3424
2755 switch (args[0]) 3425 switch (args[0])
2756 { 3426 {
2757 /* 3427 /*
2758 * commands 3428 * commands
2759 */ 3429 */
2760 case 1: /* deiconify window */ 3430 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3431 XMapWindow (disp, TermWin.parent[0]);
2762 break; 3432 break;
2763 case 2: /* iconify window */ 3433 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3434 XIconifyWindow (disp, TermWin.parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3435 break;
2767 case 3: /* set position (pixels) */ 3436 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3437 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
2769 break; 3438 break;
2770 case 4: /* set size (pixels) */ 3439 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3440 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3441 break;
2773 case 5: /* raise window */ 3442 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3443 XRaiseWindow (disp, TermWin.parent[0]);
2775 break; 3444 break;
2776 case 6: /* lower window */ 3445 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3446 XLowerWindow (disp, TermWin.parent[0]);
2778 break; 3447 break;
2779 case 7: /* refresh window */ 3448 case 7: /* refresh window */
2780 scr_touch (true); 3449 scr_touch (true);
2781 break; 3450 break;
2782 case 8: /* set size (chars) */ 3451 case 8: /* set size (chars) */
… …
2794 3463
2795 /* 3464 /*
2796 * reports - some output format copied from XTerm 3465 * reports - some output format copied from XTerm
2797 */ 3466 */
2798 case 11: /* report window state */ 3467 case 11: /* report window state */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3468 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3469 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3470 break;
2802 case 13: /* report window position */ 3471 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3472 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3473 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3474 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3475 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3476 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3477 break;
2809 case 14: /* report window size (pixels) */ 3478 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3479 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3480 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2812 break; 3481 break;
2813 case 18: /* report text area size (chars) */ 3482 case 18: /* report text area size (chars) */
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3483 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2815 break; 3484 break;
2816 case 19: /* report window size (chars) */ 3485 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3486 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
2818 break; 3487 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3488 case 20: /* report icon label */
3489 {
3490 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3491 XGetIconName (disp, TermWin.parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3492 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3493 XFree (s);
3494 }
2823 break; 3495 break;
2824 case 21: /* report window title */ 3496 case 21: /* report window title */
3497 {
3498 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3499 XFetchName (disp, TermWin.parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3500 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3501 XFree (s);
3502 }
2827 break; 3503 break;
2828#endif
2829 } 3504 }
2830} 3505}
2831#endif 3506#endif
2832 3507
2833/*----------------------------------------------------------------------*/ 3508/*----------------------------------------------------------------------*/
2834/* 3509/*
2835 * get input up until STRING TERMINATOR (or BEL) 3510 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3511 * ends_how is terminator used. returned input must be free()'d
2837 */ 3512 */
2838unsigned char * 3513unsigned char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3514rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3515{
2841 int seen_esc = 0; /* seen escape? */ 3516 unicode_t ch;
3517 bool seen_esc = false;
2842 unsigned int n = 0; 3518 unsigned int n = 0;
2843 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3519 wchar_t string[STRING_MAX];
2846 3520
2847 while ((ch = cmd_getc ())) 3521 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3522 {
2849 if (ch == C0_BEL 3523 if (seen_esc)
2850 || ch == CHAR_ST 3524 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3525 if (ch == 0x5c) /* 7bit ST */
2852 break; 3526 break;
2853 3527 else
3528 return NULL;
3529 }
2854 if (ch == C0_ESC) 3530 else if (ch == C0_ESC)
2855 { 3531 {
2856 seen_esc = 1; 3532 seen_esc = true;
2857 continue; 3533 continue;
2858 } 3534 }
2859 else if (ch == '\t') 3535 else if (ch == C0_BEL || ch == CHAR_ST)
2860 ch = ' '; /* translate '\t' to space */ 3536 break;
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3537 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3538 return NULL; /* other control character - exit */
2863 3539
3540 seen_esc = false;
3541
2864 if (n < sizeof (string) - 1) 3542 if (n >= sizeof (string) - 1)
3543 // stop at some sane length
3544 return NULL;
3545
3546 if (ch == C0_SYN)
3547 string[n++] = cmd_get8 ();
3548 else
2865 string[n++] = ch; 3549 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3550 }
2869 3551
2870 string[n++] = '\0'; 3552 string[n++] = '\0';
2871 3553
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL;
2874
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3554 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3555
2877 return s; 3556 return (unsigned char *)rxvt_wcstombs (string);
2878} 3557}
2879 3558
2880/*----------------------------------------------------------------------*/ 3559/*----------------------------------------------------------------------*/
2881/* 3560/*
2882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3561 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
2915 { 3594 {
2916 unsigned char *s = get_to_st (eh); 3595 unsigned char *s = get_to_st (eh);
2917 3596
2918 if (s) 3597 if (s)
2919 { 3598 {
2920 /*
2921 * rxvt_menubar_dispatch () violates the constness of the string,
2922 * so do it here
2923 */
2924 if (arg == XTerm_Menu)
2925#if 0 /* XXX: currently disabled due to security concerns */
2926 menubar_dispatch ((char *)s);
2927#else
2928 (void)0;
2929#endif
2930 else
2931 xterm_seq (arg, (char *)s, eh); 3599 process_xterm_seq (arg, (char *)s, eh);
2932
2933 free (s); 3600 free (s);
2934 } 3601 }
2935 } 3602 }
2936} 3603}
3604
3605void
3606rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3607{
3608 if (str[0] == '?' && !str[1])
3609 {
3610 unsigned short r, g, b;
3611 pix_colors_focused[color].get (display, r, g, b);
3612 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3613 }
3614 else
3615 set_window_color (color, str);
3616}
3617
2937/* 3618/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3619 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2939 * 0 = change iconName/title 3620 * 0 = change iconName/title
2940 * 1 = change iconName 3621 * 1 = change iconName
2941 * 2 = change title 3622 * 2 = change title
2942 * 4 = change color 3623 * 4 = change color
3624 * 10 = change fg color
3625 * 11 = change bg color
2943 * 12 = change text color 3626 * 12 = change text color
2944 * 13 = change mouse foreground color 3627 * 13 = change mouse foreground color
2945 * 17 = change highlight character colour 3628 * 17 = change highlight character colour
2946 * 18 = change bold character color 3629 * 18 = change bold character color
2947 * 19 = change underlined character color 3630 * 19 = change underlined character color
2948 * 46 = change logfile (not implemented) 3631 * 46 = change logfile (not implemented)
2949 * 50 = change font 3632 * 50 = change font
2950 * 3633 *
2951 * rxvt extensions: 3634 * rxvt extensions:
2952 * 10 = menu (may change in future)
2953 * 20 = bg pixmap 3635 * 20 = bg pixmap
2954 * 39 = change default fg color 3636 * 39 = change default fg color
2955 * 49 = change default bg color 3637 * 49 = change default bg color
2956 * 55 = dump scrollback buffer and all of screen 3638 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale 3639 * 701 = change locale
2958 * 702 = find font 3640 * 702 = find font
3641 * 703 = menu
2959 */ 3642 */
2960void 3643void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3644rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2962{ 3645{
2963 int changed = 0; 3646 int changed = 0;
2964 int color; 3647 int color;
2965 char *buf, *name; 3648 char *buf, *name;
3649 bool query = str[0] == '?' && !str[1];
3650 int saveop = op;
3651 dDisp;
2966 3652
2967 assert (str != NULL); 3653 assert (str != NULL);
2968 switch (op) 3654 switch (op)
2969 { 3655 {
2970 case XTerm_name: 3656 case XTerm_name:
… …
2974 set_icon_name (str); 3660 set_icon_name (str);
2975 break; 3661 break;
2976 case XTerm_title: 3662 case XTerm_title:
2977 set_title (str); 3663 set_title (str);
2978 break; 3664 break;
3665 case XTerm_property:
3666 if (str[0] == '?')
3667 {
3668 Atom prop = display->atom (str + 1);
3669 Atom actual_type;
3670 int actual_format;
3671 unsigned long nitems;
3672 unsigned long bytes_after;
3673 unsigned char *value = 0;
3674 const char *str = "";
3675
3676 if (prop
3677 && XGetWindowProperty (disp, TermWin.parent[0],
3678 prop, 0, 1<<16, 0, AnyPropertyType,
3679 &actual_type, &actual_format,
3680 &nitems, &bytes_after, &value) == Success
3681 && actual_type != None
3682 && actual_format == 8)
3683 str = (const char *)(value);
3684
3685 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3686
3687 XFree (value);
3688 }
3689 else
3690 {
3691 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3692
3693 if (eq)
3694 {
3695 *eq = 0;
3696 set_utf8_property (display->atom (str), eq + 1);
3697 }
3698 else
3699 XDeleteProperty (disp, TermWin.parent[0],
3700 display->atom (str));
3701 }
3702 break;
3703
2979 case XTerm_Color: 3704 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3705 for (buf = (char *)str; buf && *buf;)
2981 { 3706 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3707 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3708 break;
2984 3709
2985 *name++ = '\0'; 3710 *name++ = '\0';
2986 color = atoi (buf); 3711 color = atoi (buf);
2987 3712
2988 if (color < 0 || color >= TOTAL_COLORS) 3713 if (color < 0 || color >= TOTAL_COLORS)
2989 break; 3714 break;
2990 3715
2991 if ((buf = STRCHR (name, ';')) != NULL) 3716 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3717 *buf++ = '\0';
2993 3718
3719 if (name[0] == '?' && !name[1])
3720 {
3721 unsigned short r, g, b;
3722 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3723 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3724 }
3725 else
2994 set_window_color (color + minCOLOR, name); 3726 set_window_color (color + minCOLOR, name);
2995 } 3727 }
3728 break;
3729 case XTerm_Color00:
3730 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3731 break;
3732 case XTerm_Color01:
3733 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2996 break; 3734 break;
2997#ifndef NO_CURSORCOLOR 3735#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3736 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3737 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3000 break; 3738 break;
3001#endif 3739#endif
3002 case XTerm_Color_pointer: 3740 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3741 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3742 break;
3743 case XTerm_Color_pointer_bg:
3744 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3004 break; 3745 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3746#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD: 3747 case XTerm_Color_BD:
3007 set_window_color (Color_BD, str); 3748 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3749 break;
3750 case XTerm_Color_IT:
3751 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3008 break; 3752 break;
3009 case XTerm_Color_UL: 3753 case XTerm_Color_UL:
3010 set_window_color (Color_UL, str); 3754 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3011 break; 3755 break;
3012 case XTerm_Color_RV: 3756 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3757 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3014 break; 3758 break;
3015#endif 3759#endif
3016 3760#if TRANSPARENT && TINTING
3017 case XTerm_Menu: 3761 case XTerm_Color_tint:
3018 /* 3762 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3019 * rxvt_menubar_dispatch () violates the constness of the string, 3763 check_our_parents ();
3020 * so DON'T do it here 3764 if (am_transparent)
3021 */ 3765 want_full_refresh = want_refresh = 1;
3022 break; 3766 break;
3767#endif
3768
3023 case XTerm_Pixmap: 3769 case XTerm_Pixmap:
3024 if (*str != ';') 3770 if (*str != ';')
3025 { 3771 {
3026#if XPM_BACKGROUND 3772#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3773 scale_pixmap (""); /* reset to default scaling */
3028 set_bgPixmap (str); /* change pixmap */ 3774 set_bgPixmap (str); /* change pixmap */
3029#endif 3775#endif
3030 scr_touch (true); 3776 scr_touch (true);
3031 } 3777 }
3032 while ((str = STRCHR (str, ';')) != NULL) 3778 while ((str = strchr (str, ';')) != NULL)
3033 { 3779 {
3034 str++; 3780 str++;
3035#if XPM_BACKGROUND 3781#if XPM_BACKGROUND
3036 changed += scale_pixmap (str); 3782 changed += scale_pixmap (str);
3037#endif 3783#endif
3038
3039 } 3784 }
3785
3040 if (changed) 3786 if (changed)
3041 { 3787 {
3042#ifdef XPM_BACKGROUND 3788#ifdef XPM_BACKGROUND
3043 resize_pixmap (); 3789 resize_pixmap ();
3044#endif 3790#endif
… …
3050 set_window_color (Color_fg, str); 3796 set_window_color (Color_fg, str);
3051 break; 3797 break;
3052 case XTerm_restoreBG: 3798 case XTerm_restoreBG:
3053 set_window_color (Color_bg, str); 3799 set_window_color (Color_bg, str);
3054 break; 3800 break;
3801
3055 case XTerm_logfile: 3802 case XTerm_logfile:
3056 // TODO, when secure mode? 3803 // TODO, when secure mode?
3057 break; 3804 break;
3805
3058 case XTerm_font: 3806 case XTerm_font:
3059 change_font (str); 3807 op = URxvt_font;
3808 case URxvt_font:
3809#if ENABLE_STYLES
3810 case URxvt_boldFont:
3811 case URxvt_italicFont:
3812 case URxvt_boldItalicFont:
3813#endif
3814 if (query)
3815 tt_printf ("\33]%d;%-.250s%c", saveop,
3816 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3817 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3818 resp);
3819 else
3820 {
3821 const char *&res = rs[Rs_font + (op - URxvt_font)];
3822
3823 res = strdup (str);
3824 allocated.push_back ((void *)res);
3825 set_fonts ();
3826 }
3060 break; 3827 break;
3061#ifndef NO_FRILLS 3828
3829#if ENABLE_FRILLS
3062 case XTerm_locale: 3830 case XTerm_locale:
3063 if (str[0] == '?' && !str[1]) 3831 if (query)
3064 tt_printf ("%-.250s\n", locale); 3832 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3065 else 3833 else
3066 { 3834 {
3067 set_locale (str); 3835 set_locale (str);
3836 pty.set_utf8_mode (enc_utf8);
3068# ifdef USE_XIM 3837# ifdef USE_XIM
3069 im_cb (); 3838 im_cb ();
3070# endif 3839# endif
3071 } 3840 }
3072 break; 3841 break;
3842#endif
3843
3844#ifdef MENUBAR
3073 case XTerm_findfont: 3845 case XTerm_Menu:
3074 { 3846 if (options & Opt_insecure)
3075 int fid = TermWin.fontset->find_font (atoi (str)); 3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3076 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3077 }
3078 break; 3848 break;
3079#endif 3849#endif
3080#if 0 3850#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3851 case XTerm_dumpscreen: /* no error notices */
3082 { 3852 {
3083 int fd; 3853 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3855 {
3086 scr_dump (fd); 3856 scr_dump (fd);
3087 close (fd); 3857 close (fd);
3088 } 3858 }
… …
3108{ 3878{
3109 int state; 3879 int state;
3110 3880
3111 if (mode == 's') 3881 if (mode == 's')
3112 { 3882 {
3113 SavedModes |= (PrivateModes & bit); 3883 SavedModes |= (priv_modes & bit);
3114 return -1; 3884 return -1;
3115 } 3885 }
3116 else 3886 else
3117 { 3887 {
3118 if (mode == 'r') 3888 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3889 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 3890 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3891 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 3892 PrivMode (state, bit);
3123 } 3893 }
3124 3894
3125 return state; 3895 return state;
3126} 3896}
… …
3144 { 3, PrivMode_132 }, 3914 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 3915 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 3916 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 3917 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 3918 { 7, PrivMode_Autowrap },
3919 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 3920 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 3921#ifdef menuBar_esc
3151 { menuBar_esc, PrivMode_menuBar }, 3922 { menuBar_esc, PrivMode_menuBar },
3152#endif 3923#endif
3924 // 18, 19 printing-related
3925 { 25, PrivMode_VisibleCursor },
3153#ifdef scrollBar_esc 3926#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 3927 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 3928#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 3929 { 35, PrivMode_ShiftKeys }, // rxvt extension
3160 { 40, PrivMode_132OK }, 3930 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 3931 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 3932 // 45 margin bell NYI
3163 // 46 start logging 3933 // 46 start logging
… …
3175 // 1035 enable modifiers for alt, numlock NYI 3945 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 3946 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 3947 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 3948 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 3949 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3950 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3951 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 3952 };
3183 3953
3184 if (nargs == 0) 3954 if (nargs == 0)
3185 return; 3955 return;
… …
3205 /* extra handling for values with state unkept */ 3975 /* extra handling for values with state unkept */
3206 switch (arg[i]) 3976 switch (arg[i])
3207 { 3977 {
3208 case 1048: /* alternative cursor save */ 3978 case 1048: /* alternative cursor save */
3209 case 1049: 3979 case 1049:
3980 if (options & Opt_secondaryScreen)
3210 if (mode == 0) 3981 if (mode == 0)
3211 scr_cursor (RESTORE); 3982 scr_cursor (RESTORE);
3212 else if (mode == 1) 3983 else if (mode == 1)
3213 scr_cursor (SAVE); 3984 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 3985 break;
3215 } 3986 }
3216 3987
3217 if (state >= 0) 3988 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 3989 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 3990 switch (arg[i])
… …
3225 * within VT52 mode 3996 * within VT52 mode
3226 */ 3997 */
3227 PrivMode (1, PrivMode_vt52); 3998 PrivMode (1, PrivMode_vt52);
3228 break; 3999 break;
3229 case 3: /* 80/132 */ 4000 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 4001 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4002 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3232 break; 4003 break;
3233 case 4: /* smooth scrolling */ 4004 case 4: /* smooth scrolling */
3234 if (state) 4005 if (state)
3235 Options &= ~Opt_jumpScroll; 4006 options &= ~Opt_jumpScroll;
3236 else 4007 else
3237 Options |= Opt_jumpScroll; 4008 options |= Opt_jumpScroll;
3238 break; 4009 break;
3239 case 5: /* reverse video */ 4010 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 4011 scr_rvideo_mode (state);
3241 break; 4012 break;
3242 case 6: /* relative/absolute origins */ 4013 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 4014 scr_relative_origin (state);
3244 break; 4015 break;
3245 case 7: /* autowrap */ 4016 case 7: /* autowrap */
3246 scr_autowrap (state); 4017 scr_autowrap (state);
3247 break; 4018 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 4019 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 4020 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 4021 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 4022 priv_modes &= ~PrivMode_MouseX11;
3252 break; 4023 break;
3253#ifdef menuBar_esc 4024#ifdef menuBar_esc
3254 case menuBar_esc: 4025 case menuBar_esc:
3255#ifdef MENUBAR 4026#ifdef MENUBAR
3256 map_menuBar (state); 4027 map_menuBar (state);
… …
3267 break; 4038 break;
3268#endif 4039#endif
3269 case 25: /* visible/invisible cursor */ 4040 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 4041 scr_cursor_visible (state);
3271 break; 4042 break;
3272 /* case 35: - shift keys */ 4043 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 4044 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 4045 case 47: /* secondary screen */
3275 scr_change_screen (state); 4046 scr_change_screen (state);
3276 break; 4047 break;
3277 /* case 66: - application key pad */ 4048 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 4049 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 4050 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 4051 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 4052 priv_modes &= ~PrivMode_MouseX10;
3282 break; 4053 break;
3283#if 0 4054#if 0
3284 case 1001: 4055 case 1001:
3285 break; /* X11 mouse highlighting */ 4056 break; /* X11 mouse highlighting */
3286#endif 4057#endif
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 4058 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state) 4059 if (state)
3289 Options &= ~Opt_scrollTtyOutput; 4060 options &= ~Opt_scrollTtyOutput;
3290 else 4061 else
3291 Options |= Opt_scrollTtyOutput; 4062 options |= Opt_scrollTtyOutput;
3292 break; 4063 break;
3293 case 1011: /* scroll to bottom on key press */ 4064 case 1011: /* scroll to bottom on key press */
3294 if (state) 4065 if (state)
3295 Options |= Opt_scrollTtyKeypress; 4066 options |= Opt_scrollTtyKeypress;
3296 else 4067 else
3297 Options &= ~Opt_scrollTtyKeypress; 4068 options &= ~Opt_scrollTtyKeypress;
3298 break; 4069 break;
3299 case 1047: /* secondary screen w/ clearing */ 4070 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4071 if (options & Opt_secondaryScreen)
3301 if (current_screen != PRIMARY) 4072 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 4073 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 4074 scr_change_screen (state);
3305 /* FALLTHROUGH */ 4075 break;
4076 case 1049: /* secondary screen w/ clearing first */
4077 scr_change_screen (state);
4078 if (options & Opt_secondaryScreen)
4079 if (current_screen != PRIMARY)
4080 scr_erase_screen (2);
4081 break;
3306 default: 4082 default:
3307 break; 4083 break;
3308 } 4084 }
3309 } 4085 }
3310} 4086}
… …
3333 rendset = 0, rendstyle = ~RS_None; 4109 rendset = 0, rendstyle = ~RS_None;
3334 break; 4110 break;
3335 case 1: 4111 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 4112 rendset = 1, rendstyle = RS_Bold;
3337 break; 4113 break;
4114 //case 2: // low intensity
4115 case 3:
4116 rendset = 1, rendstyle = RS_Italic;
4117 break;
3338 case 4: 4118 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 4119 rendset = 1, rendstyle = RS_Uline;
3340 break; 4120 break;
3341 case 5: 4121 case 5: // slowly blinking
4122 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 4123 rendset = 1, rendstyle = RS_Blink;
3343 break; 4124 break;
4125 //case 6: // scoansi light background
3344 case 7: 4126 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 4127 rendset = 1, rendstyle = RS_RVid;
3346 break; 4128 break;
3347 case 8: 4129 case 8:
3348 // invisible. NYI 4130 // invisible. NYI
3349 break; 4131 break;
3350 case 22: 4132 //case 9: // crossed out
4133 //case 10: // scoansi acs off, primary font
4134 //case 11: // scoansi acs on, first alt font
4135 //case 12: // scoansi acs on, |0x80, second alt font
4136 //...
4137 //case 19: // ninth alt font
4138 //case 20: // gothic
4139 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 4140 rendset = 0, rendstyle = RS_Bold;
4141 break;
4142 case 22: // normal intensity
4143 rendset = 0, rendstyle = RS_Bold;
4144 break;
4145 case 23: // disable italic
4146 rendset = 0, rendstyle = RS_Italic;
3352 break; 4147 break;
3353 case 24: 4148 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 4149 rendset = 0, rendstyle = RS_Uline;
3355 break; 4150 break;
3356 case 25: 4151 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 4152 rendset = 0, rendstyle = RS_Blink;
3358 break; 4153 break;
4154 case 26: // variable spacing (iso 8613)
4155 rendset = 0, rendstyle = RS_Blink;
4156 break;
3359 case 27: 4157 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 4158 rendset = 0, rendstyle = RS_RVid;
3361 break; 4159 break;
3362 case 28:
3363 // visible. NYI 4160 //case 28: // visible. NYI
3364 break; 4161 //case 29: // not crossed-out
3365 } 4162 }
3366 4163
3367 if (rendset != -1) 4164 if (rendset != -1)
3368 { 4165 {
3369 scr_rendition (rendset, rendstyle); 4166 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 4177 case 35:
3381 case 36: 4178 case 36:
3382 case 37: 4179 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4180 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 4181 break;
3385#ifdef TTY_256COLOR 4182 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 4183 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 4184 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4185 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 4186 i += 2;
3391 } 4187 }
3392 break; 4188 break;
3393#endif
3394 case 39: /* default fg */ 4189 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 4190 scr_color (Color_fg, Color_fg);
3396 break; 4191 break;
3397 4192
3398 case 40: 4193 case 40:
… …
3403 case 45: 4198 case 45:
3404 case 46: 4199 case 46:
3405 case 47: 4200 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4201 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 4202 break;
3408#ifdef TTY_256COLOR 4203 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 4204 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 4205 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4206 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 4207 i += 2;
3414 } 4208 }
3415 break; 4209 break;
3416#endif
3417 case 49: /* default bg */ 4210 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 4211 scr_color (Color_bg, Color_bg);
3419 break; 4212 break;
4213
4214 //case 50: // not variable spacing
3420 4215
3421#ifndef NO_BRIGHTCOLOR 4216#ifndef NO_BRIGHTCOLOR
3422 case 90: 4217 case 90:
3423 case 91: /* set bright fg color */ 4218 case 91: /* set bright fg color */
3424 case 92: 4219 case 92:
3425 case 93: 4220 case 93:
3426 case 94: 4221 case 94:
3427 case 95: 4222 case 95:
3428 case 96: 4223 case 96:
3429 case 97: 4224 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4225 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 4226 break;
3433 case 100: 4227 case 100:
3434 case 101: /* set bright bg color */ 4228 case 101: /* set bright bg color */
3435 case 102: 4229 case 102:
3436 case 103: 4230 case 103:
3437 case 104: 4231 case 104:
3438 case 105: 4232 case 105:
3439 case 106: 4233 case 106:
3440 case 107: 4234 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4235 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 4236 break;
3444#endif 4237#endif
3445 4238
3446 } 4239 }
3447 } 4240 }
3448} 4241}
3449/*}}} */ 4242/*}}} */
3450 4243
3451/*{{{ process Rob Nation's own graphics mode sequences */ 4244/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 4245void
3453rxvt_term::process_graphics () 4246rxvt_term::process_graphics ()
3454{ 4247{
3455 unicode_t ch, cmd = cmd_getc (); 4248 unicode_t ch, cmd = cmd_getc ();
3456 4249
3457 if (cmd == 'Q') 4250 if (cmd == 'Q')
3458 { /* query graphics */ 4251 { /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 4252 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 4253 return;
3461 } 4254 }
3462 /* swallow other graphics sequences until terminating ':' */ 4255 /* swallow other graphics sequences until terminating ':' */
3463 do 4256 do
3464 ch = cmd_getc (); 4257 ch = cmd_getc ();
… …
3479 unsigned char buf[256]; 4272 unsigned char buf[256];
3480 4273
3481 va_start (arg_ptr, fmt); 4274 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4275 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 4276 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 4277 tt_write (buf, strlen (buf));
3485} 4278}
3486 4279
3487/* ---------------------------------------------------------------------- */ 4280/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 4281/* Write data to the pty as typed by the user, pasted with the mouse,
3489 * or generated by us in response to a query ESC sequence. 4282 * or generated by us in response to a query ESC sequence.
3490 */ 4283 */
4284const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4285
3491void 4286void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4287rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3493{ 4288{
3494 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4289 if (v_buflen == 0)
4290 {
4291 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3495 4292
3496 if (len) 4293 if ((unsigned int)written == len)
4294 return;
4295
4296 data += written;
4297 len -= written;
3497 { 4298 }
4299
4300 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4301
4302 memcpy (v_buffer + v_buflen, data, len);
4303 v_buflen += len;
4304
4305 pty_ev.set (EVENT_READ | EVENT_WRITE);
4306}
4307
4308void rxvt_term::pty_write ()
4309{
4310 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4311
4312 if (written > 0)
4313 {
4314 v_buflen -= written;
4315
3498 if (v_buflen == 0) 4316 if (v_buflen == 0)
3499 { 4317 {
3500 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3501
3502 if ((unsigned int)written == len)
3503 return;
3504
3505 data += written;
3506 len -= written;
3507 }
3508
3509
3510 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3511
3512 memcpy (v_buffer + v_buflen, data, len);
3513 v_buflen += len;
3514 }
3515
3516 for (;;)
3517 {
3518 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3519
3520 if (written > 0)
3521 {
3522 v_buflen -= written;
3523
3524 if (v_buflen == 0)
3525 {
3526 free (v_buffer); 4318 free (v_buffer);
3527 v_buffer = 0; 4319 v_buffer = 0;
3528 v_buflen = 0; 4320 v_buflen = 0;
3529 4321
3530 pty_ev.set (EVENT_READ); 4322 pty_ev.set (EVENT_READ);
3531 return;
3532 }
3533
3534 memmove (v_buffer, v_buffer + written, v_buflen);
3535 }
3536 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3537 // original code just ignores this...
3538 destroy ();
3539 else
3540 {
3541 pty_ev.set (EVENT_READ | EVENT_WRITE);
3542 return; 4323 return;
3543 } 4324 }
4325
4326 memmove (v_buffer, v_buffer + written, v_buflen);
3544 } 4327 }
4328 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4329 // original code just ignores this...
4330 destroy ();
3545} 4331}
3546 4332
3547/*----------------------- end-of-file (C source) -----------------------*/ 4333/*----------------------- end-of-file (C source) -----------------------*/
3548 4334

Diff Legend

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