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

Diff Legend

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