ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.191 by root, Wed Jan 26 07:08:15 2005 UTC

… …
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 {
… …
675 IMSendSpot (); 922 IMSendSpot ();
676#endif 923#endif
677 } 924 }
678 925
679 display->flush (); 926 display->flush ();
680
681 flush_ev.stop ();
682} 927}
683 928
684void 929void
685rxvt_term::check_cb (check_watcher &w) 930rxvt_term::check_cb (check_watcher &w)
686{ 931{
687 SET_R (this); 932 SET_R (this);
688 SET_LOCALE (locale); 933 SET_LOCALE (locale);
689 934
690 display->flush (); 935 display->flush ();
691 936
692 if (!flush_ev.active) 937 if (want_refresh && !flush_ev.active)
693 flush_ev.start (NOW + 0.01); 938 flush_ev.start (NOW + 0.01);
694} 939}
695 940
696void 941void
697rxvt_term::flush_cb (time_watcher &w) 942rxvt_term::flush_cb (time_watcher &w)
… …
762{ 1007{
763 if (mouse_slip_wheel_speed == 0 1008 if (mouse_slip_wheel_speed == 0
764 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1009 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
765 : scr_page (UP, mouse_slip_wheel_speed)) 1010 : scr_page (UP, mouse_slip_wheel_speed))
766 { 1011 {
1012 if (TermWin.view_start == TermWin.nscrolled ||
1013 TermWin.view_start == 0)
1014 mouse_slip_wheel_speed = 0;
1015
767 refresh_type |= SMOOTH_REFRESH; 1016 refresh_type |= SMOOTH_REFRESH;
768 want_refresh = 1; 1017 want_refresh = 1;
769 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
770 } 1019 }
771} 1020}
… …
784 1033
785 memmove (cmdbuf_base, cmdbuf_ptr, n); 1034 memmove (cmdbuf_base, cmdbuf_ptr, n);
786 cmdbuf_ptr = cmdbuf_base; 1035 cmdbuf_ptr = cmdbuf_base;
787 cmdbuf_endp = cmdbuf_ptr + n; 1036 cmdbuf_endp = cmdbuf_ptr + n;
788 1037
789 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1038 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
790 1039
791 if (n > 0) 1040 if (n > 0)
792 { 1041 {
793 cmdbuf_endp += n; 1042 cmdbuf_endp += n;
794 return true; 1043 return true;
… …
803rxvt_term::pty_cb (io_watcher &w, short revents) 1052rxvt_term::pty_cb (io_watcher &w, short revents)
804{ 1053{
805 SET_R (this); 1054 SET_R (this);
806 SET_LOCALE (locale); 1055 SET_LOCALE (locale);
807 1056
808 if (revents & EVENT_WRITE)
809 tt_write (0, 0);
810 else if (revents & EVENT_READ) 1057 if (revents & EVENT_READ)
811 // loop, but don't allow a single term to monopolize us 1058 // loop, but don't allow a single term to monopolize us
812 while (pty_fill ()) 1059 while (pty_fill ())
813 if (cmd_parse ()) 1060 if (cmd_parse ())
814 break; 1061 break;
1062
1063 if (revents & EVENT_WRITE)
1064 pty_write ();
815} 1065}
816 1066
817void 1067void
818rxvt_term::pointer_unblank () 1068rxvt_term::pointer_unblank ()
819{ 1069{
… …
821 recolour_cursor (); 1071 recolour_cursor ();
822 1072
823#ifdef POINTER_BLANK 1073#ifdef POINTER_BLANK
824 hidden_pointer = 0; 1074 hidden_pointer = 0;
825 1075
826 if (Options & Opt_pointerBlank) 1076 if (options & Opt_pointerBlank)
827 pointer_ev.start (NOW + pointerBlankDelay); 1077 pointer_ev.start (NOW + pointerBlankDelay);
828#endif 1078#endif
829} 1079}
830 1080
831#ifdef POINTER_BLANK 1081#ifdef POINTER_BLANK
832void 1082void
833rxvt_term::pointer_blank () 1083rxvt_term::pointer_blank ()
834{ 1084{
835 if (! (Options & Opt_pointerBlank)) 1085 if (! (options & Opt_pointerBlank))
836 return; 1086 return;
837 1087
838 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
839 XFlush (display->display); 1089 XFlush (display->display);
840 1090
841 hidden_pointer = 1; 1091 hidden_pointer = 1;
842} 1092}
843 1093
… …
860 x = ev.x; 1110 x = ev.x;
861 y = ev.y; 1111 y = ev.y;
862 pixel_position (&x, &y); 1112 pixel_position (&x, &y);
863 1113
864 if (MEvent.button == AnyButton) 1114 if (MEvent.button == AnyButton)
865 {
866 button_number = 3; 1115 button_number = 3;
867 }
868 else 1116 else
869 { 1117 {
870 button_number = MEvent.button - Button1; 1118 button_number = MEvent.button - Button1;
871 /* add 0x3D for wheel events, like xterm does */ 1119 /* add 0x3D for wheel events, like xterm does */
872 if (button_number >= 3) 1120 if (button_number >= 3)
873 button_number += (64 - 3); 1121 button_number += (64 - 3);
874 } 1122 }
875 1123
876 if (PrivateModes & PrivMode_MouseX10) 1124 if (priv_modes & PrivMode_MouseX10)
877 { 1125 {
878 /* 1126 /*
879 * do not report ButtonRelease 1127 * do not report ButtonRelease
880 * no state info allowed 1128 * no state info allowed
881 */ 1129 */
… …
896 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1144 + ((MEvent.state & ModMetaMask) ? 8 : 0)
897 + ((MEvent.state & ControlMask) ? 16 : 0); 1145 + ((MEvent.state & ControlMask) ? 16 : 0);
898#ifdef MOUSE_REPORT_DOUBLECLICK 1146#ifdef MOUSE_REPORT_DOUBLECLICK
899 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1147 key_state += ((MEvent.clicks > 1) ? 32 : 0);
900#endif 1148#endif
901
902 } 1149 }
903 1150
904#ifdef DEBUG_MOUSEREPORT 1151#if DEBUG_MOUSEREPORT
905 fprintf (stderr, "Mouse ["); 1152 fprintf (stderr, "Mouse [");
906 if (key_state & 16) 1153 if (key_state & 16)
907 fputc ('C', stderr); 1154 fputc ('C', stderr);
908 if (key_state & 4) 1155 if (key_state & 4)
909 fputc ('S', stderr); 1156 fputc ('S', stderr);
… …
913 fputc ('2', stderr); 1160 fputc ('2', stderr);
914 fprintf (stderr, "]: <%d>, %d/%d\n", 1161 fprintf (stderr, "]: <%d>, %d/%d\n",
915 button_number, 1162 button_number,
916 x + 1, 1163 x + 1,
917 y + 1); 1164 y + 1);
918#else 1165#endif
1166
919 tt_printf ("\033[M%c%c%c", 1167 tt_printf ("\033[M%c%c%c",
920 (32 + button_number + key_state), 1168 (32 + button_number + key_state),
921 (32 + x + 1), 1169 (32 + x + 1),
922 (32 + y + 1)); 1170 (32 + y + 1));
923#endif
924} 1171}
925 1172
926#ifdef USING_W11LIB 1173#ifdef USING_W11LIB
927void 1174void
928rxvt_W11_process_x_event (XEvent *ev) 1175rxvt_W11_process_x_event (XEvent *ev)
… …
939{ 1186{
940 SET_R (this); 1187 SET_R (this);
941 SET_LOCALE (locale); 1188 SET_LOCALE (locale);
942 1189
943#if defined(CURSOR_BLINK) 1190#if defined(CURSOR_BLINK)
944 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1191 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
945 { 1192 {
946 if (hidden_cursor) 1193 if (hidden_cursor)
947 { 1194 {
948 hidden_cursor = 0; 1195 hidden_cursor = 0;
949 want_refresh = 1; 1196 want_refresh = 1;
… …
952 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1199 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
953 } 1200 }
954#endif 1201#endif
955 1202
956#if defined(POINTER_BLANK) 1203#if defined(POINTER_BLANK)
957 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1204 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
958 { 1205 {
959 if (ev.type == MotionNotify 1206 if (ev.type == MotionNotify
960 || ev.type == ButtonPress 1207 || ev.type == ButtonPress
961 || ev.type == ButtonRelease) 1208 || ev.type == ButtonRelease)
962 if (hidden_pointer) 1209 if (hidden_pointer)
… …
965 if (ev.type == KeyPress && hidden_pointer == 0) 1212 if (ev.type == KeyPress && hidden_pointer == 0)
966 pointer_blank (); 1213 pointer_blank ();
967 } 1214 }
968#endif 1215#endif
969 1216
970#ifdef USE_XIM
971 if (XFilterEvent (&ev, None))
972 return;
973#endif
974
975 Window unused_root, unused_child; 1217 Window unused_root, unused_child;
976 int unused_root_x, unused_root_y; 1218 int unused_root_x, unused_root_y;
977 unsigned int unused_mask; 1219 unsigned int unused_mask;
978
979#ifdef DEBUG_X
980 const char *const eventnames[] =
981 { /* mason - this matches my system */
982 "",
983 "",
984 "KeyPress",
985 "KeyRelease",
986 "ButtonPress",
987 "ButtonRelease",
988 "MotionNotify",
989 "EnterNotify",
990 "LeaveNotify",
991 "FocusIn",
992 "FocusOut",
993 "KeymapNotify",
994 "Expose",
995 "GraphicsExpose",
996 "NoExpose",
997 "VisibilityNotify",
998 "CreateNotify",
999 "DestroyNotify",
1000 "UnmapNotify",
1001 "MapNotify",
1002 "MapRequest",
1003 "ReparentNotify",
1004 "ConfigureNotify",
1005 "ConfigureRequest",
1006 "GravityNotify",
1007 "ResizeRequest",
1008 "CirculateNotify",
1009 "CirculateRequest",
1010 "PropertyNotify",
1011 "SelectionClear",
1012 "SelectionRequest",
1013 "SelectionNotify",
1014 "ColormapNotify",
1015 "ClientMessage",
1016 "MappingNotify"
1017 };
1018#endif
1019
1020#ifdef DEBUG_X
1021 struct timeval tp;
1022 struct tm *ltt;
1023 (void)gettimeofday (&tp, NULL);
1024 ltt = localtime (& (tp.tv_sec));
1025 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1026#endif
1027 1220
1028 switch (ev.type) 1221 switch (ev.type)
1029 { 1222 {
1030 case KeyPress: 1223 case KeyPress:
1224#if ISO_14755
1225 if (!(iso14755buf & ISO_14755_52))
1226#endif
1031 lookup_key (ev.xkey); 1227 lookup_key (ev.xkey);
1228
1229 break;
1230
1231 case KeyRelease:
1232 {
1233#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1234 KeySym ks;
1235
1236 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1237#endif
1238
1239#if ENABLE_FRILLS || ISO_14755
1240 // ISO 14755 support
1241 if (iso14755buf)
1242 if (iso14755buf & ISO_14755_52)
1243 {
1244# if ENABLE_OVERLAY
1245 scr_overlay_off ();
1246# endif
1247# if ISO_14755
1248 // iso14755 part 5.2 handling: release time
1249 // first: controls
1250 if ((ev.xkey.state & ControlMask)
1251 && ((ks >= 0x40 && ks <= 0x5f)
1252 || (ks >= 0x61 && ks <= 0x7f)))
1253 {
1254 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1255 commit_iso14755 ();
1256 return; // case-break;
1257 }
1258
1259 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1260 if (i[0] == ks)
1261 {
1262 iso14755buf = ISO_14755_51 | i[1];
1263 commit_iso14755 ();
1264 return; // case-break;
1265 }
1266
1267 scr_bell ();
1268# endif
1269 iso14755buf = 0;
1032 break; 1270 break;
1271 }
1272 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1273 {
1274# if ENABLE_OVERLAY
1275 scr_overlay_off ();
1276# endif
1277 if (iso14755buf & ISO_14755_51)
1278 commit_iso14755 ();
1279#if ISO_14755
1280 else if (iso14755buf & ISO_14755_STARTED)
1281 {
1282 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1283
1284 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1285 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1286 }
1287# endif
1288 else
1289 iso14755buf = 0;
1290 }
1291#endif
1033 1292
1034#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1293#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1035 case KeyRelease:
1036 {
1037 if (!(ev.xkey.state & ControlMask)) 1294 if (!(ev.xkey.state & ControlMask))
1038 slip_wheel_ev.stop (); 1295 slip_wheel_ev.stop ();
1039 else
1040 {
1041 KeySym ks;
1042
1043 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1044 if (ks == XK_Control_L || ks == XK_Control_R) 1296 else if (ks == XK_Control_L || ks == XK_Control_R)
1045 mouse_slip_wheel_speed = 0; 1297 mouse_slip_wheel_speed = 0;
1046 } 1298#endif
1047 break; 1299 break;
1048 } 1300 }
1049#endif
1050 1301
1051 case ButtonPress: 1302 case ButtonPress:
1052 button_press (ev.xbutton); 1303 button_press (ev.xbutton);
1053 break; 1304 break;
1054 1305
… …
1078 0L, 1000000L, 1329 0L, 1000000L,
1079 False, AnyPropertyType, 1330 False, AnyPropertyType,
1080 &ActualType, &ActualFormat, 1331 &ActualType, &ActualFormat,
1081 &Size, &RemainingBytes, 1332 &Size, &RemainingBytes,
1082 &data); 1333 &data);
1083 XChangeProperty (display->display, display->root, 1334 set_string_property (XA_CUT_BUFFER0, data);
1084 XA_CUT_BUFFER0, XA_STRING,
1085 8, PropModeReplace,
1086 data, STRLEN (data));
1087 XFree (data); 1335 XFree (data);
1088 selection_paste (display->root, XA_CUT_BUFFER0, True); 1336 selection_paste (display->root, XA_CUT_BUFFER0, true);
1089 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1337 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1090 } 1338 }
1091#endif /* OFFIX_DND */ 1339#endif /* OFFIX_DND */
1092 break; 1340 break;
1093 1341
… …
1125 { 1373 {
1126 TermWin.focus = 1; 1374 TermWin.focus = 1;
1127 want_refresh = 1; 1375 want_refresh = 1;
1128#ifdef USE_XIM 1376#ifdef USE_XIM
1129 if (Input_Context != NULL) 1377 if (Input_Context != NULL)
1378 {
1379 IMSetStatusPosition ();
1130 XSetICFocus (Input_Context); 1380 XSetICFocus (Input_Context);
1381 }
1131#endif 1382#endif
1132#ifdef CURSOR_BLINK 1383#ifdef CURSOR_BLINK
1133 if (Options & Opt_cursorBlink) 1384 if (options & Opt_cursorBlink)
1134 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1385 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1135#endif 1386#endif
1136#ifdef OFF_FOCUS_FADING 1387#ifdef OFF_FOCUS_FADING
1137 if (rs[Rs_fade]) 1388 if (rs[Rs_fade])
1138 { 1389 {
1139 PixColors = PixColorsFocused; 1390 pix_colors = pix_colors_focused;
1140 set_colorfgbg ();
1141 scr_clear (); 1391 scr_recolour ();
1142 scr_touch (true);
1143 } 1392 }
1144#endif 1393#endif
1145 1394
1146 } 1395 }
1147 break; 1396 break;
… …
1149 case FocusOut: 1398 case FocusOut:
1150 if (TermWin.focus) 1399 if (TermWin.focus)
1151 { 1400 {
1152 TermWin.focus = 0; 1401 TermWin.focus = 0;
1153 want_refresh = 1; 1402 want_refresh = 1;
1403
1404#if ENABLE_FRILLS || ISO_14755
1405 iso14755buf = 0;
1406#endif
1407#if ENABLE_OVERLAY
1408 scr_overlay_off ();
1409#endif
1154#ifdef USE_XIM 1410#ifdef USE_XIM
1155 if (Input_Context != NULL) 1411 if (Input_Context != NULL)
1156 XUnsetICFocus (Input_Context); 1412 XUnsetICFocus (Input_Context);
1157#endif 1413#endif
1158#ifdef CURSOR_BLINK 1414#ifdef CURSOR_BLINK
1159 if (Options & Opt_cursorBlink) 1415 if (options & Opt_cursorBlink)
1160 cursor_blink_ev.stop (); 1416 cursor_blink_ev.stop ();
1161 hidden_cursor = 0; 1417 hidden_cursor = 0;
1162#endif 1418#endif
1163#ifdef OFF_FOCUS_FADING 1419#ifdef OFF_FOCUS_FADING
1164 if (rs[Rs_fade]) 1420 if (rs[Rs_fade])
1165 { 1421 {
1166 PixColors = PixColorsUnFocused; 1422 pix_colors = pix_colors_unfocused;
1167 set_colorfgbg ();
1168 scr_clear (); 1423 scr_recolour ();
1169 scr_touch (true);
1170 } 1424 }
1171#endif 1425#endif
1172
1173 } 1426 }
1174 break; 1427 break;
1175 1428
1176 case ConfigureNotify: 1429 case ConfigureNotify:
1177 if (ev.xconfigure.window == TermWin.parent[0]) 1430 if (ev.xconfigure.window == TermWin.parent[0])
… …
1185 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1186 } 1439 }
1187 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1188 1441
1189 if (szHint.width != width || szHint.height != height) 1442 if (szHint.width != width || szHint.height != height)
1443 {
1444 seen_resize = 1;
1190 resize_all_windows (width, height, 1); 1445 resize_all_windows (width, height, 1);
1446 }
1191 1447
1192#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1448#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1193 if (Options & Opt_transparent) 1449 if (options & Opt_transparent)
1194 {
1195 check_our_parents (); 1450 check_our_parents ();
1196 if (am_transparent)
1197 want_full_refresh = 1;
1198 }
1199#endif 1451#endif
1200 } 1452 }
1453 break;
1454
1455 case PropertyNotify:
1456 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1457 && ev.xproperty.state == PropertyNewValue)
1458 selection_property (ev.xproperty.window, ev.xproperty.atom);
1459
1201 break; 1460 break;
1202 1461
1203 case SelectionClear: 1462 case SelectionClear:
1204 selection_clear (); 1463 selection_clear ();
1205 break; 1464 break;
1206 1465
1207 case SelectionNotify: 1466 case SelectionNotify:
1208 if (selection_wait == Sel_normal) 1467 if (selection_wait == Sel_normal)
1209 selection_paste (ev.xselection.requestor, 1468 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1210 ev.xselection.property, True);
1211 break; 1469 break;
1212 1470
1213 case SelectionRequest: 1471 case SelectionRequest:
1214 selection_send (ev.xselectionrequest); 1472 selection_send (ev.xselectionrequest);
1215 break; 1473 break;
… …
1287 { 1545 {
1288 menubar_control (ev.xbutton); 1546 menubar_control (ev.xbutton);
1289 break; 1547 break;
1290 } 1548 }
1291#endif 1549#endif
1292 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1550 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1293 break; 1551 break;
1294 1552
1295 if (ev.xany.window == TermWin.vt) 1553 if (ev.xany.window == TermWin.vt)
1296 { 1554 {
1297 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1555 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1298 { 1556 {
1299 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1557 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1300 ; 1558 ;
1301 1559
1302 XQueryPointer (display->display, TermWin.vt, 1560 XQueryPointer (display->display, TermWin.vt,
1303 &unused_root, &unused_child, 1561 &unused_root, &unused_child,
1304 &unused_root_x, &unused_root_y, 1562 &unused_root_x, &unused_root_y,
1305 & (ev.xbutton.x), & (ev.xbutton.y), 1563 &ev.xbutton.x, &ev.xbutton.y,
1306 &unused_mask); 1564 &ev.xbutton.state);
1307#ifdef MOUSE_THRESHOLD 1565#ifdef MOUSE_THRESHOLD
1308 /* deal with a `jumpy' mouse */ 1566 /* deal with a `jumpy' mouse */
1309 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1567 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1310 { 1568 {
1311#endif 1569#endif
1570#if ISO_14755
1571 // 5.4
1572 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1573 {
1574 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1575 break;
1576 }
1577#endif
1312 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1578 selection_extend (ev.xbutton.x, ev.xbutton.y,
1313 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1579 ev.xbutton.state & Button3Mask ? 2 : 0);
1580
1314#ifdef SELECTION_SCROLLING 1581#ifdef SELECTION_SCROLLING
1315 if (ev.xbutton.y < TermWin.int_bwidth 1582 if (ev.xbutton.y < TermWin.int_bwidth
1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1583 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1317 { 1584 {
1318 int dist; 1585 int dist;
… …
1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1591 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1325 1592
1326 /* save the event params so we can highlight 1593 /* save the event params so we can highlight
1327 * the selection in the pending-scroll loop 1594 * the selection in the pending-scroll loop
1328 */ 1595 */
1329 selection_save_x=ev.xbutton.x; 1596 selection_save_x = ev.xbutton.x;
1330 selection_save_y=ev.xbutton.y; 1597 selection_save_y = ev.xbutton.y;
1331 selection_save_state=
1332 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1598 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1333 1599
1334 /* calc number of lines to scroll */ 1600 /* calc number of lines to scroll */
1335 if (ev.xbutton.y<TermWin.int_bwidth) 1601 if (ev.xbutton.y < TermWin.int_bwidth)
1336 { 1602 {
1337 scroll_selection_dir = UP; 1603 scroll_selection_dir = UP;
1338 dist = TermWin.int_bwidth - ev.xbutton.y; 1604 dist = TermWin.int_bwidth - ev.xbutton.y;
1339 } 1605 }
1340 else 1606 else
1341 { 1607 {
1342 scroll_selection_dir = DN; 1608 scroll_selection_dir = DN;
1343 dist = ev.xbutton.y -
1344 (TermWin.int_bwidth + TermWin.height); 1609 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1345 } 1610 }
1611
1346 scroll_selection_lines= (Pixel2Height (dist)/ 1612 scroll_selection_lines = Pixel2Height (dist)
1347 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1613 / SELECTION_SCROLL_LINE_SPEEDUP
1614 + 1;
1348 MIN_IT (scroll_selection_lines, 1615 MIN_IT (scroll_selection_lines,
1349 SELECTION_SCROLL_MAX_LINES); 1616 SELECTION_SCROLL_MAX_LINES);
1350 } 1617 }
1351 else 1618 else
1352 { 1619 {
1353 /* we are within the text window, so we 1620 /* we are within the text window, so we
1354 * shouldn't be scrolling 1621 * shouldn't be scrolling
… …
1356 if (sel_scroll_ev.active) 1623 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop(); 1624 sel_scroll_ev.stop();
1358 } 1625 }
1359#endif 1626#endif
1360#ifdef MOUSE_THRESHOLD 1627#ifdef MOUSE_THRESHOLD
1361
1362 } 1628 }
1363#endif 1629#endif
1364
1365 } 1630 }
1366 } 1631 }
1367 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1632 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1368 { 1633 {
1369 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1634 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1370 MotionNotify, &ev)) ; 1635 MotionNotify, &ev))
1636 ;
1637
1371 XQueryPointer (display->display, scrollBar.win, 1638 XQueryPointer (display->display, scrollBar.win,
1372 &unused_root, &unused_child, 1639 &unused_root, &unused_child,
1373 &unused_root_x, &unused_root_y, 1640 &unused_root_x, &unused_root_y,
1374 & (ev.xbutton.x), & (ev.xbutton.y), 1641 &ev.xbutton.x, &ev.xbutton.y,
1375 &unused_mask); 1642 &unused_mask);
1376 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1643 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1377 scrollbar_size ()); 1644 scrollbar_size ());
1378 scr_refresh (refresh_type); 1645 scr_refresh (refresh_type);
1379 refresh_limit = 0; 1646 refresh_limit = 0;
… …
1381 } 1648 }
1382 break; 1649 break;
1383 } 1650 }
1384} 1651}
1385 1652
1653#if TRANSPARENT
1386void 1654void
1387rxvt_term::rootwin_cb (XEvent &ev) 1655rxvt_term::rootwin_cb (XEvent &ev)
1388{ 1656{
1389 SET_R (this); 1657 SET_R (this);
1390 SET_LOCALE (locale); 1658 SET_LOCALE (locale);
1391 1659
1392 switch (ev.type) 1660 switch (ev.type)
1393 { 1661 {
1394 case PropertyNotify: 1662 case PropertyNotify:
1395 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1396 {
1397 if (ev.xproperty.state == PropertyNewValue)
1398 selection_property (ev.xproperty.window, ev.xproperty.atom);
1399 break;
1400 }
1401#ifdef TRANSPARENT
1402 else
1403 {
1404 /* 1663 /*
1405 * if user used some Esetroot compatible prog to set the root bg, 1664 * if user used some Esetroot compatible prog to set the root bg,
1406 * use the property to determine the pixmap. We use it later on. 1665 * use the property to determine the pixmap. We use it later on.
1407 */ 1666 */
1408 if (xa[XA_XROOTPMAPID] == 0)
1409 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1410
1411 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1667 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1668 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1412 return; 1669 return;
1413 }
1414 1670
1415 /* FALLTHROUGH */ 1671 /* FALLTHROUGH */
1416 case ReparentNotify: 1672 case ReparentNotify:
1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1673 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1418 want_full_refresh = 1; 1674 want_refresh = want_full_refresh = 1;
1419 break; 1675 break;
1420#endif
1421 } 1676 }
1422} 1677}
1678#endif
1423 1679
1424void 1680void
1425rxvt_term::button_press (XButtonEvent &ev) 1681rxvt_term::button_press (XButtonEvent &ev)
1426{ 1682{
1427 int reportmode = 0, clickintime; 1683 int reportmode = 0, clickintime;
1428 1684
1429 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1685 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1430 if (!bypass_keystate) 1686 if (!bypass_keystate)
1431 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1687 reportmode = !! (priv_modes & PrivMode_mouse_report);
1688
1432 /* 1689 /*
1433 * VT window processing of button press 1690 * VT window processing of button press
1434 */ 1691 */
1435 if (ev.window == TermWin.vt) 1692 if (ev.window == TermWin.vt)
1436 { 1693 {
1694#if ISO_14755
1695 // 5.4
1696 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1697 {
1698 iso14755_54 (ev.x, ev.y);
1699 return;
1700 }
1701#endif
1702
1437 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1703 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1704
1438 if (reportmode) 1705 if (reportmode)
1439 { 1706 {
1440 /* mouse report from vt window */ 1707 /* mouse report from vt window */
1441 /* save the xbutton state (for ButtonRelease) */ 1708 /* save the xbutton state (for ButtonRelease) */
1442 MEvent.state = ev.state; 1709 MEvent.state = ev.state;
… …
1471 } 1738 }
1472 else 1739 else
1473 { 1740 {
1474 if (ev.button != MEvent.button) 1741 if (ev.button != MEvent.button)
1475 MEvent.clicks = 0; 1742 MEvent.clicks = 0;
1743
1476 switch (ev.button) 1744 switch (ev.button)
1477 { 1745 {
1478 case Button1: 1746 case Button1:
1747 /* allow meta + click to select rectangular areas */
1748 /* should be done in screen.C */
1749#if ENABLE_FRILLS
1750 selection.rect = !!(ev.state & ModMetaMask);
1751#else
1752 selection.rect = false;
1753#endif
1754
1479 /* allow shift+left click to extend selection */ 1755 /* allow shift+left click to extend selection */
1480 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1756 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1481 { 1757 {
1482 if (MEvent.button == Button1 && clickintime) 1758 if (MEvent.button == Button1 && clickintime)
1483 selection_rotate (ev.x, ev.y); 1759 selection_rotate (ev.x, ev.y);
1484 else 1760 else
1485 selection_extend (ev.x, ev.y, 1); 1761 selection_extend (ev.x, ev.y, 1);
… …
1500 case Button3: 1776 case Button3:
1501 if (MEvent.button == Button3 && clickintime) 1777 if (MEvent.button == Button3 && clickintime)
1502 selection_rotate (ev.x, ev.y); 1778 selection_rotate (ev.x, ev.y);
1503 else 1779 else
1504 selection_extend (ev.x, ev.y, 1); 1780 selection_extend (ev.x, ev.y, 1);
1781
1505 MEvent.button = Button3; 1782 MEvent.button = Button3;
1506 break; 1783 break;
1507 } 1784 }
1508 } 1785 }
1786
1509 MEvent.time = ev.time; 1787 MEvent.time = ev.time;
1510 return; 1788 return;
1511 } 1789 }
1512 1790
1513 /* 1791 /*
… …
1605 break; 1883 break;
1606 case R_SB_ALIGN_BOTTOM: 1884 case R_SB_ALIGN_BOTTOM:
1607 csrO = scrollBar.bot - scrollBar.top; 1885 csrO = scrollBar.bot - scrollBar.top;
1608 break; 1886 break;
1609 } 1887 }
1888
1610 if (scrollBar.style == R_SB_XTERM 1889 if (scrollBar.style == R_SB_XTERM
1611 || scrollbar_above_slider (ev.y) 1890 || scrollbar_above_slider (ev.y)
1612 || scrollbar_below_slider (ev.y)) 1891 || scrollbar_below_slider (ev.y))
1613 scr_move_to ( scrollbar_position (ev.y) - csrO, 1892 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1614 scrollbar_size ()); 1893
1615 scrollBar.setMotion (); 1894 scrollBar.setMotion ();
1616 break; 1895 break;
1617 1896
1618 case Button1: 1897 case Button1:
1619 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1898 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1643 scr_page ((ev.button == Button1 ? DN : UP), 1922 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 1923 (TermWin.nrow
1645 * scrollbar_position (ev.y) 1924 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 1925 / scrollbar_size ()));
1647 } 1926 }
1927
1648 break; 1928 break;
1649 } 1929 }
1650 } 1930 }
1651 return; 1931 return;
1652 } 1932 }
… …
1664{ 1944{
1665 int reportmode = 0; 1945 int reportmode = 0;
1666 1946
1667 csrO = 0; /* reset csr Offset */ 1947 csrO = 0; /* reset csr Offset */
1668 if (!bypass_keystate) 1948 if (!bypass_keystate)
1669 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1949 reportmode = !! (priv_modes & PrivMode_mouse_report);
1670 1950
1671 if (scrollbar_isUpDn ()) 1951 if (scrollbar_isUpDn ())
1672 { 1952 {
1673 scrollBar.setIdle (); 1953 scrollBar.setIdle ();
1674 scrollbar_show (0); 1954 scrollbar_show (0);
1675#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1955#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1676 refresh_type &= ~SMOOTH_REFRESH; 1956 refresh_type &= ~SMOOTH_REFRESH;
1677#endif 1957#endif
1678
1679 } 1958 }
1959
1680#ifdef SELECTION_SCROLLING 1960#ifdef SELECTION_SCROLLING
1681 if (sel_scroll_ev.active) 1961 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop(); 1962 sel_scroll_ev.stop();
1683#endif 1963#endif
1964
1684 if (ev.window == TermWin.vt) 1965 if (ev.window == TermWin.vt)
1685 { 1966 {
1967#if ISO_14755
1968 // 5.4
1969 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1970 return;
1971#endif
1686 if (reportmode) 1972 if (reportmode)
1687 { 1973 {
1688 /* mouse report from vt window */ 1974 /* mouse report from vt window */
1689 /* don't report release of wheel "buttons" */ 1975 /* don't report release of wheel "buttons" */
1690 if (ev.button >= 4) 1976 if (ev.button >= 4)
… …
1704 MEvent.button = AnyButton; 1990 MEvent.button = AnyButton;
1705 mouse_report (ev); 1991 mouse_report (ev);
1706#endif /* MOUSE_REPORT_DOUBLECLICK */ 1992#endif /* MOUSE_REPORT_DOUBLECLICK */
1707 return; 1993 return;
1708 } 1994 }
1995
1709 /* 1996 /*
1710 * dumb hack to compensate for the failure of click-and-drag 1997 * dumb hack to compensate for the failure of click-and-drag
1711 * when overriding mouse reporting 1998 * when overriding mouse reporting
1712 */ 1999 */
1713 if (PrivateModes & PrivMode_mouse_report 2000 if (priv_modes & PrivMode_mouse_report
1714 && bypass_keystate 2001 && bypass_keystate
1715 && ev.button == Button1 && MEvent.clicks <= 1) 2002 && ev.button == Button1 && MEvent.clicks <= 1)
1716 selection_extend (ev.x, ev.y, 0); 2003 selection_extend (ev.x, ev.y, 0);
1717 2004
1718 switch (ev.button) 2005 switch (ev.button)
… …
1733 2020
1734 v = ev.button == Button4 ? UP : DN; 2021 v = ev.button == Button4 ? UP : DN;
1735 2022
1736 if (ev.state & ShiftMask) 2023 if (ev.state & ShiftMask)
1737 i = 1; 2024 i = 1;
1738 else if (Options & Opt_mouseWheelScrollPage) 2025 else if (options & Opt_mouseWheelScrollPage)
1739 i = TermWin.nrow - 1; 2026 i = TermWin.nrow - 1;
1740 else 2027 else
1741 i = 5; 2028 i = 5;
1742 2029
1743# ifdef MOUSE_SLIP_WHEELING 2030# ifdef MOUSE_SLIP_WHEELING
… …
2028 Pixmap rootpixmap = None; 2315 Pixmap rootpixmap = None;
2029 XWindowAttributes wattr, wrootattr; 2316 XWindowAttributes wattr, wrootattr;
2030 2317
2031 pchanged = 0; 2318 pchanged = 0;
2032 2319
2033 if (!(Options & Opt_transparent)) 2320 if (!(options & Opt_transparent))
2034 return pchanged; /* Don't try any more */ 2321 return pchanged; /* Don't try any more */
2035 2322
2036 XGetWindowAttributes (display->display, display->root, &wrootattr); 2323 XGetWindowAttributes (display->display, display->root, &wrootattr);
2037 rootdepth = wrootattr.depth; 2324 rootdepth = wrootattr.depth;
2038 2325
… …
2041 if (rootdepth != wattr.depth) 2328 if (rootdepth != wattr.depth)
2042 { 2329 {
2043 if (am_transparent) 2330 if (am_transparent)
2044 { 2331 {
2045 pchanged = 1; 2332 pchanged = 1;
2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2333 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2047 am_transparent = am_pixmap_trans = 0; 2334 am_transparent = am_pixmap_trans = 0;
2048 } 2335 }
2049 2336
2050 return pchanged; /* Don't try any more */ 2337 return pchanged; /* Don't try any more */
2051 } 2338 }
… …
2056 /* 2343 /*
2057 * Make the frame window set by the window manager have 2344 * Make the frame window set by the window manager have
2058 * the root background. Some window managers put multiple nested frame 2345 * the root background. Some window managers put multiple nested frame
2059 * windows for each client, so we have to take care about that. 2346 * windows for each client, so we have to take care about that.
2060 */ 2347 */
2061 i = (xa[XA_XROOTPMAPID] 2348 i = (xa[XA_XROOTPMAP_ID]
2062 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2349 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],
2063 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2350 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2064 &nitems, &bytes_after, &prop) == Success); 2351 &nitems, &bytes_after, &prop) == Success);
2065 2352
2066 if (!i || prop == NULL) 2353 if (!i || prop == NULL)
2067 i = (xa[XA_XSETROOTID] 2354 i = (xa[XA_ESETROOT_PMAP_ID]
2068 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2355 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],
2069 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2070 &nitems, &bytes_after, &prop) == Success); 2357 &nitems, &bytes_after, &prop) == Success);
2071 2358
2072 if (!i || prop == NULL 2359 if (!i || prop == NULL
2073#if TINTING 2360#if TINTING
… …
2114 sy = 0; 2401 sy = 0;
2115 } 2402 }
2116 2403
2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2404 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2405 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2406
2407 XSync (display->display, False);
2119 allowedxerror = -1; 2408 allowedxerror = -1;
2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2409 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2121 2410
2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2411 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2123 /* XXX: may need a delay here? */ 2412 /* XXX: may need a delay here? */
… …
2146 if (ISSET_PIXCOLOR (Color_tint)) 2435 if (ISSET_PIXCOLOR (Color_tint))
2147 { 2436 {
2148 unsigned short rm, gm, bm; 2437 unsigned short rm, gm, bm;
2149 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2438 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2150 2439
2151 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2440 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2152 2441
2153 ShadeXImage (display, image, shade, rm, gm, bm); 2442 ShadeXImage (display, image, shade, rm, gm, bm);
2154 } 2443 }
2155#endif 2444#endif
2156 2445
… …
2169 2458
2170 am_transparent = am_pixmap_trans = 1; 2459 am_transparent = am_pixmap_trans = 1;
2171 } 2460 }
2172 } 2461 }
2173 2462
2174 if (!am_pixmap_trans) 2463 if (am_pixmap_trans)
2464 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2465 else
2175 { 2466 {
2176 unsigned int n; 2467 unsigned int n;
2177 /* 2468 /*
2178 * InheritPixmap transparency 2469 * InheritPixmap transparency
2179 */ 2470 */
2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2471 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2182 { 2472 {
2183 oldp = TermWin.parent[i]; 2473 oldp = TermWin.parent[i];
2184 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2474 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2185 &TermWin.parent[i], &list, &n); 2475 &TermWin.parent[i], &list, &n);
2186 XFree (list); 2476 XFree (list);
2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188 2477
2189 if (TermWin.parent[i] == display->root) 2478 if (TermWin.parent[i] == display->root)
2190 { 2479 {
2191 if (oldp != None) 2480 if (oldp != None)
2192 pchanged = 1; 2481 pchanged = 1;
… …
2203 if (pchanged) 2492 if (pchanged)
2204 { 2493 {
2205 for (; n < (unsigned int)i; n++) 2494 for (; n < (unsigned int)i; n++)
2206 { 2495 {
2207 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2496 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2208 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2209 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2497 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2210 { 2498 {
2211 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2499 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2212 break; 2500 break;
2213 } 2501 }
2214 } 2502 }
2215 } 2503 }
2216 2504
2217 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2505 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2218 { 2506 {
2219 D_X ((stderr, "InheritPixmap Turning off"));
2220 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2507 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2508 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2222 am_transparent = 0; 2509 am_transparent = 0;
2223 /* XXX: also turn off Opt_transparent? */ 2510 /* XXX: also turn off Opt_transparent? */
2224 } 2511 }
2225 else 2512 else
2226 { 2513 {
2227#if WAIT_FOR_WM 2514#if WAIT_FOR_WM
2228 /* wait (an arbitrary period) for the WM to do its thing 2515 /* wait (an arbitrary period) for the WM to do its thing
2229 * needed for fvwm2.2.2 (and before?) */ 2516 * needed for fvwm2.2.2 (and before?) */
2230 sleep (1); 2517 sleep (1);
2231#endif 2518#endif
2232 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2233 for (n = 0; n < (unsigned int)i; n++) 2519 for (n = 0; n < (unsigned int)i; n++)
2234 { 2520 {
2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2521 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2236 XClearWindow (display->display, TermWin.parent[n]); 2522 XClearWindow (display->display, TermWin.parent[n]);
2237 } 2523 }
… …
2242 2528
2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2529 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2244 TermWin.parent[i] = None; 2530 TermWin.parent[i] = None;
2245 } 2531 }
2246 2532
2247 // this is experimental
2248 if (scrollBar.win) 2533 if (scrollBar.win)
2249 { 2534 {
2250 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2535 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2251 XClearWindow (display->display, scrollBar.win);
2252 scrollBar.setIdle (); 2536 scrollBar.setIdle ();
2253 scrollbar_show (0); 2537 scrollbar_show (0);
2538 }
2539
2540 if (am_transparent)
2541 {
2542 want_refresh = want_full_refresh = 1;
2543 if (am_pixmap_trans)
2544 flush ();
2254 } 2545 }
2255 2546
2256 return pchanged; 2547 return pchanged;
2257} 2548}
2258#endif 2549#endif
… …
2277 if (ch == NOCHAR) // TODO: improve 2568 if (ch == NOCHAR) // TODO: improve
2278 break; 2569 break;
2279 2570
2280 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2571 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2281 { 2572 {
2573 if (!seen_input)
2574 {
2575 seen_input = 1;
2576 // many badly-written programs (e.g. jed) contain a race condition:
2577 // they first read the screensize and then install a SIGWINCH handler.
2578 // some window managers resize the window early, and these programs
2579 // then sometimes get the size wrong.
2580 // unfortunately other programs are even more buggy and dislike
2581 // being sent SIGWINCH, so only do it when we were in fact being
2582 // resized.
2583 if (seen_resize)
2584 kill (-cmd_pid, SIGWINCH);
2585 }
2586
2282 /* Read a text string from the input buffer */ 2587 /* Read a text string from the input buffer */
2283 unicode_t buf[UBUFSIZ]; 2588 unicode_t buf[UBUFSIZ];
2284 bool refreshnow = false; 2589 bool refreshnow = false;
2285 int nlines = 0; 2590 int nlines = 0;
2286 unicode_t *str = buf; 2591 unicode_t *str = buf;
2287 2592
2288 *str++ = ch;
2289
2290 for (;;) 2593 for (;;)
2291 { 2594 {
2292 seq_begin = cmdbuf_ptr;
2293 ch = next_char ();
2294
2295 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2595 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2296 break; 2596 break;
2297 2597
2298 *str++ = ch; 2598 *str++ = ch;
2299 2599
2300 if (ch == C0_LF) 2600 if (ch == C0_LF)
2301 { 2601 {
2302 nlines++; 2602 nlines++;
2303 refresh_count++; 2603 refresh_count++;
2304 2604
2305 if (! (Options & Opt_jumpScroll) 2605 if (!(options & Opt_jumpScroll)
2306 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2606 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2307 { 2607 {
2308 refreshnow = true; 2608 refreshnow = true;
2309 ch = NOCHAR; 2609 ch = NOCHAR;
2310 break; 2610 break;
2311 } 2611 }
2312 2612
2313 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2613 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2314 if (nlines >= TermWin.nrow - 1) 2614 if (nlines >= TermWin.nrow - 1)
2315 { 2615 {
2316 scr_add_lines (buf, nlines, str - buf); 2616 scr_add_lines (buf, nlines, str - buf);
2317 nlines = 0; 2617 nlines = 0;
2318 str = buf; 2618 str = buf;
… …
2322 if (str >= buf + UBUFSIZ) 2622 if (str >= buf + UBUFSIZ)
2323 { 2623 {
2324 ch = NOCHAR; 2624 ch = NOCHAR;
2325 break; 2625 break;
2326 } 2626 }
2627
2628 seq_begin = cmdbuf_ptr;
2629 ch = next_char ();
2327 } 2630 }
2328 2631
2329 scr_add_lines (buf, nlines, str - buf); 2632 scr_add_lines (buf, nlines, str - buf);
2330 2633
2331 /* 2634 /*
… …
2334 * the number of pages between refreshes is refresh_limit, which 2637 * the number of pages between refreshes is refresh_limit, which
2335 * is incremented here because we must be doing flat-out scrolling. 2638 * is incremented here because we must be doing flat-out scrolling.
2336 */ 2639 */
2337 if (refreshnow) 2640 if (refreshnow)
2338 { 2641 {
2339 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2642 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2340 refresh_limit++; 2643 refresh_limit++;
2341 else 2644 else
2342 { 2645 {
2343 flag = true; 2646 flag = true;
2344 scr_refresh (refresh_type); 2647 scr_refresh (refresh_type);
… …
2398 if (len == (size_t)-1) 2701 if (len == (size_t)-1)
2399 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2702 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2400 2703
2401 // assume wchar == unicode 2704 // assume wchar == unicode
2402 cmdbuf_ptr += len; 2705 cmdbuf_ptr += len;
2403 return wc; 2706 return wc & UNICODE_MASK;
2404 } 2707 }
2405 2708
2406 return NOCHAR; 2709 return NOCHAR;
2407} 2710}
2408 2711
… …
2534 process_escape_seq (); 2837 process_escape_seq ();
2535 break; 2838 break;
2536 case C0_ENQ: /* terminal Status */ 2839 case C0_ENQ: /* terminal Status */
2537 if (rs[Rs_answerbackstring]) 2840 if (rs[Rs_answerbackstring])
2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2841 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2539 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2842 (unsigned int)strlen (rs[Rs_answerbackstring]));
2540 else 2843 else
2541 tt_write ((unsigned char *)VT100_ANS, 2844 tt_write ((unsigned char *)VT100_ANS,
2542 (unsigned int)STRLEN (VT100_ANS)); 2845 (unsigned int)strlen (VT100_ANS));
2543 break; 2846 break;
2544 case C0_BEL: /* bell */ 2847 case C0_BEL: /* bell */
2545 scr_bell (); 2848 scr_bell ();
2546 break; 2849 break;
2547 case C0_BS: /* backspace */ 2850 case C0_BS: /* backspace */
… …
2646void 2949void
2647rxvt_term::process_escape_seq () 2950rxvt_term::process_escape_seq ()
2648{ 2951{
2649 unicode_t ch = cmd_getc (); 2952 unicode_t ch = cmd_getc ();
2650 2953
2651 if (PrivateModes & PrivMode_vt52) 2954 if (priv_modes & PrivMode_vt52)
2652 { 2955 {
2653 process_escape_vt52 (ch); 2956 process_escape_vt52 (ch);
2654 return; 2957 return;
2655 } 2958 }
2656 2959
… …
2671 scr_charset_set (2, (unsigned int)cmd_getc ()); 2974 scr_charset_set (2, (unsigned int)cmd_getc ());
2672 break; 2975 break;
2673 case '+': 2976 case '+':
2674 scr_charset_set (3, (unsigned int)cmd_getc ()); 2977 scr_charset_set (3, (unsigned int)cmd_getc ());
2675 break; 2978 break;
2676#ifndef NO_FRILLS 2979#if ENABLE_FRILLS
2677 case '6': 2980 case '6':
2678 scr_backindex (); 2981 scr_backindex ();
2679 break; 2982 break;
2680#endif 2983#endif
2681 case '7': 2984 case '7':
2682 scr_cursor (SAVE); 2985 scr_cursor (SAVE);
2683 break; 2986 break;
2684 case '8': 2987 case '8':
2685 scr_cursor (RESTORE); 2988 scr_cursor (RESTORE);
2686 break; 2989 break;
2687#ifndef NO_FRILLS 2990#if ENABLE_FRILLS
2688 case '9': 2991 case '9':
2689 scr_forwardindex (); 2992 scr_forwardindex ();
2690 break; 2993 break;
2691#endif 2994#endif
2692 case '=': 2995 case '=':
… …
2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3294 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2992 break; 3295 break;
2993 3296
2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3297 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2995 tt_write ((const unsigned char *)VT100_ANS, 3298 tt_write ((const unsigned char *)VT100_ANS,
2996 (unsigned int) (sizeof (VT100_ANS) - 1)); 3299 (unsigned int) (sizeof (VT100_ANS) - 1));
2997 break; 3300 break;
2998 3301
2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3302 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3000 process_sgr_mode (nargs, arg); 3303 process_sgr_mode (nargs, arg);
3001 break; 3304 break;
… …
3008 break; 3311 break;
3009 case 6: /* CPR requested */ 3312 case 6: /* CPR requested */
3010 scr_report_position (); 3313 scr_report_position ();
3011 break; 3314 break;
3012 case 7: /* unofficial extension */ 3315 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure) 3316 if (options & Opt_insecure)
3014 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3317 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3015 break; 3318 break;
3016 case 8: /* unofficial extension */ 3319 case 8: /* unofficial extension */
3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3320 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3018 break; 3321 break;
3019 } 3322 }
… …
3055 break; 3358 break;
3056 3359
3057 case CSI_RM: /* 8.3.107: RESET MODE */ 3360 case CSI_RM: /* 8.3.107: RESET MODE */
3058 if (arg[0] == 4) 3361 if (arg[0] == 4)
3059 scr_insert_mode (0); 3362 scr_insert_mode (0);
3363 else if (arg[0] == 20)
3364 priv_modes &= ~PrivMode_LFNL;
3060 break; 3365 break;
3061 3366
3062 case CSI_SM: /* 8.3.126: SET MODE */ 3367 case CSI_SM: /* 8.3.126: SET MODE */
3063 if (arg[0] == 4) 3368 if (arg[0] == 4)
3064 scr_insert_mode (1); 3369 scr_insert_mode (1);
3370 else if (arg[0] == 20)
3371 priv_modes |= PrivMode_LFNL;
3065 break; 3372 break;
3066 3373
3067 /* 3374 /*
3068 * PRIVATE USE beyond this point. All CSI_7? sequences here 3375 * PRIVATE USE beyond this point. All CSI_7? sequences here
3069 */ 3376 */
… …
3081 break; 3388 break;
3082 case CSI_75: 3389 case CSI_75:
3083 scr_cursor (RESTORE); 3390 scr_cursor (RESTORE);
3084 break; 3391 break;
3085 3392
3086#ifndef NO_FRILLS 3393#if ENABLE_FRILLS
3087 case CSI_74: 3394 case CSI_74:
3088 process_window_ops (arg, nargs); 3395 process_window_ops (arg, nargs);
3089 break; 3396 break;
3090#endif 3397#endif
3091 3398
… …
3098 break; 3405 break;
3099 } 3406 }
3100} 3407}
3101/*}}} */ 3408/*}}} */
3102 3409
3103#ifndef NO_FRILLS 3410#if ENABLE_FRILLS
3104/* ARGSUSED */ 3411/* ARGSUSED */
3105void 3412void
3106rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3413rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3107{ 3414{
3108 int x, y; 3415 int x, y;
… …
3175 break; 3482 break;
3176 case 19: /* report window size (chars) */ 3483 case 19: /* report window size (chars) */
3177 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3484 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3178 break; 3485 break;
3179 case 20: /* report icon label */ 3486 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 { 3487 {
3182 char *s; 3488 char *s;
3183 XGetIconName (display->display, TermWin.parent[0], &s); 3489 XGetIconName (display->display, TermWin.parent[0], &s);
3184 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3490 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3491 XFree (s);
3185 } 3492 }
3186 break; 3493 break;
3187 case 21: /* report window title */ 3494 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 { 3495 {
3190 char *s; 3496 char *s;
3191 XFetchName (display->display, TermWin.parent[0], &s); 3497 XFetchName (display->display, TermWin.parent[0], &s);
3192 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3498 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s);
3193 } 3500 }
3194 break; 3501 break;
3195 } 3502 }
3196} 3503}
3197#endif 3504#endif
3198 3505
… …
3202 * ends_how is terminator used. returned input must be free()'d 3509 * ends_how is terminator used. returned input must be free()'d
3203 */ 3510 */
3204unsigned char * 3511unsigned char *
3205rxvt_term::get_to_st (unicode_t &ends_how) 3512rxvt_term::get_to_st (unicode_t &ends_how)
3206{ 3513{
3207 unicode_t prev = 0, ch; 3514 unicode_t ch;
3515 bool seen_esc = false;
3208 unsigned int n = 0; 3516 unsigned int n = 0;
3209 unsigned char *s;
3210 unsigned char string[STRING_MAX]; 3517 wchar_t string[STRING_MAX];
3211 3518
3212 while ((ch = cmd_getc ()) != NOCHAR) 3519 while ((ch = cmd_getc ()) != NOCHAR)
3213 { 3520 {
3214 if (prev == C0_ESC) 3521 if (seen_esc)
3215 { 3522 {
3216 if (ch == 0x5c) /* 7bit ST */ 3523 if (ch == 0x5c) /* 7bit ST */
3217 break; 3524 break;
3218 else 3525 else
3219 return NULL; 3526 return NULL;
3220 } 3527 }
3528 else if (ch == C0_ESC)
3529 {
3530 seen_esc = true;
3531 continue;
3532 }
3221 else if (ch == C0_BEL || ch == CHAR_ST) 3533 else if (ch == C0_BEL || ch == CHAR_ST)
3222 break; 3534 break;
3223 else if (ch < 0x20) 3535 else if (ch < 0x20)
3224 return NULL; /* other control character - exit */ 3536 return NULL; /* other control character - exit */
3537
3538 seen_esc = false;
3225 3539
3226 if (n >= sizeof (string) - 1) 3540 if (n >= sizeof (string) - 1)
3227 // stop at some sane length 3541 // stop at some sane length
3228 return NULL; 3542 return NULL;
3229 3543
3230 if (ch == C0_SYN) 3544 if (ch == C0_SYN)
3231 {
3232 string[n++] = cmd_get8 (); 3545 string[n++] = cmd_get8 ();
3233 prev = 0;
3234 }
3235 else 3546 else
3236 string[n++] = prev = ch; 3547 string[n++] = ch;
3237 } 3548 }
3238 3549
3239 string[n++] = '\0'; 3550 string[n++] = '\0';
3240 3551
3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3242 return NULL;
3243
3244 ends_how = (ch == 0x5c ? C0_ESC : ch); 3552 ends_how = (ch == 0x5c ? C0_ESC : ch);
3245 STRNCPY (s, string, n); 3553
3246 return s; 3554 return (unsigned char *)rxvt_wcstombs (string);
3247} 3555}
3248 3556
3249/*----------------------------------------------------------------------*/ 3557/*----------------------------------------------------------------------*/
3250/* 3558/*
3251 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3559 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3295void 3603void
3296rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3604rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3297{ 3605{
3298 if (str[0] == '?' && !str[1]) 3606 if (str[0] == '?' && !str[1])
3299 { 3607 {
3300 if (Options & Opt_insecure)
3301 {
3302 unsigned short r, g, b; 3608 unsigned short r, g, b;
3303 PixColorsFocused[color].get (display, r, g, b); 3609 pix_colors_focused[color].get (display, r, g, b);
3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3610 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3305 }
3306 } 3611 }
3307 else 3612 else
3308 set_window_color (color, str); 3613 set_window_color (color, str);
3309} 3614}
3310 3615
… …
3338{ 3643{
3339 int changed = 0; 3644 int changed = 0;
3340 int color; 3645 int color;
3341 char *buf, *name; 3646 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1]; 3647 bool query = str[0] == '?' && !str[1];
3648 int saveop = op;
3343 3649
3344 assert (str != NULL); 3650 assert (str != NULL);
3345 switch (op) 3651 switch (op)
3346 { 3652 {
3347 case XTerm_name: 3653 case XTerm_name:
… …
3354 set_title (str); 3660 set_title (str);
3355 break; 3661 break;
3356 case XTerm_property: 3662 case XTerm_property:
3357 if (str[0] == '?') 3663 if (str[0] == '?')
3358 { 3664 {
3359 Atom prop = XInternAtom (display->display, str + 1, True); 3665 Atom prop = display->atom (str + 1);
3360 Atom actual_type; 3666 Atom actual_type;
3361 int actual_format; 3667 int actual_format;
3362 unsigned long nitems; 3668 unsigned long nitems;
3363 unsigned long bytes_after; 3669 unsigned long bytes_after;
3364 unsigned char *value = 0; 3670 unsigned char *value = 0;
… …
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3688 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3383 3689
3384 if (eq) 3690 if (eq)
3385 { 3691 {
3386 *eq = 0; 3692 *eq = 0;
3387 XChangeProperty (display->display, TermWin.parent[0], 3693 set_utf8_property (display->atom (str), eq + 1);
3388 display->atom (str), XA_STRING, 8,
3389 PropModeReplace, (unsigned char *)eq + 1,
3390 strlen (eq + 1));
3391 } 3694 }
3392 else 3695 else
3393 XDeleteProperty (display->display, TermWin.parent[0], 3696 XDeleteProperty (display->display, TermWin.parent[0],
3394 display->atom (str)); 3697 display->atom (str));
3395 } 3698 }
3396 break; 3699 break;
3397 3700
3398 case XTerm_Color: 3701 case XTerm_Color:
3399 for (buf = (char *)str; buf && *buf;) 3702 for (buf = (char *)str; buf && *buf;)
3400 { 3703 {
3401 if ((name = STRCHR (buf, ';')) == NULL) 3704 if ((name = strchr (buf, ';')) == NULL)
3402 break; 3705 break;
3403 3706
3404 *name++ = '\0'; 3707 *name++ = '\0';
3405 color = atoi (buf); 3708 color = atoi (buf);
3406 3709
3407 if (color < 0 || color >= TOTAL_COLORS) 3710 if (color < 0 || color >= TOTAL_COLORS)
3408 break; 3711 break;
3409 3712
3410 if ((buf = STRCHR (name, ';')) != NULL) 3713 if ((buf = strchr (name, ';')) != NULL)
3411 *buf++ = '\0'; 3714 *buf++ = '\0';
3412 3715
3413 if (name[0] == '?' && !name[1]) 3716 if (name[0] == '?' && !name[1])
3414 { 3717 {
3415 if (Options & Opt_insecure)
3416 {
3417 unsigned short r, g, b; 3718 unsigned short r, g, b;
3418 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3719 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3419 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3720 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3420 }
3421 } 3721 }
3422 else 3722 else
3423 set_window_color (color + minCOLOR, name); 3723 set_window_color (color + minCOLOR, name);
3424 } 3724 }
3425 break; 3725 break;
… …
3442 break; 3742 break;
3443#ifndef NO_BOLD_UNDERLINE_REVERSE 3743#ifndef NO_BOLD_UNDERLINE_REVERSE
3444 case XTerm_Color_BD: 3744 case XTerm_Color_BD:
3445 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3745 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3446 break; 3746 break;
3747 case XTerm_Color_IT:
3748 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3749 break;
3447 case XTerm_Color_UL: 3750 case XTerm_Color_UL:
3448 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3751 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3449 break; 3752 break;
3450 case XTerm_Color_RV: 3753 case XTerm_Color_RV:
3451 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3754 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3755 break;
3756#endif
3757#if TRANSPARENT && TINTING
3758 case XTerm_Color_tint:
3759 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3760 check_our_parents ();
3761 if (am_transparent)
3762 want_full_refresh = want_refresh = 1;
3452 break; 3763 break;
3453#endif 3764#endif
3454 3765
3455 case XTerm_Pixmap: 3766 case XTerm_Pixmap:
3456 if (*str != ';') 3767 if (*str != ';')
… …
3459 scale_pixmap (""); /* reset to default scaling */ 3770 scale_pixmap (""); /* reset to default scaling */
3460 set_bgPixmap (str); /* change pixmap */ 3771 set_bgPixmap (str); /* change pixmap */
3461#endif 3772#endif
3462 scr_touch (true); 3773 scr_touch (true);
3463 } 3774 }
3464 while ((str = STRCHR (str, ';')) != NULL) 3775 while ((str = strchr (str, ';')) != NULL)
3465 { 3776 {
3466 str++; 3777 str++;
3467#if XPM_BACKGROUND 3778#if XPM_BACKGROUND
3468 changed += scale_pixmap (str); 3779 changed += scale_pixmap (str);
3469#endif 3780#endif
3470
3471 } 3781 }
3782
3472 if (changed) 3783 if (changed)
3473 { 3784 {
3474#ifdef XPM_BACKGROUND 3785#ifdef XPM_BACKGROUND
3475 resize_pixmap (); 3786 resize_pixmap ();
3476#endif 3787#endif
… …
3488 case XTerm_logfile: 3799 case XTerm_logfile:
3489 // TODO, when secure mode? 3800 // TODO, when secure mode?
3490 break; 3801 break;
3491 3802
3492 case XTerm_font: 3803 case XTerm_font:
3804 op = URxvt_font;
3805 case URxvt_font:
3806#if ENABLE_STYLES
3807 case URxvt_boldFont:
3808 case URxvt_italicFont:
3809 case URxvt_boldItalicFont:
3810#endif
3493 if (query) 3811 if (query)
3812 tt_printf ("\33]%d;%-.250s%c", saveop,
3813 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3814 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3815 resp);
3816 else
3494 { 3817 {
3495 if (Options & Opt_insecure) 3818 const char *&res = rs[Rs_font + (op - URxvt_font)];
3496 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3819
3497 TermWin.fontset->fontdesc 3820 res = strdup (str);
3498 ? TermWin.fontset->fontdesc 3821 allocated.push_back ((void *)res);
3499 : "", 3822 set_fonts ();
3500 resp);
3501 } 3823 }
3502 else
3503 change_font (str);
3504 break; 3824 break;
3505 3825
3506#ifndef NO_FRILLS 3826#if ENABLE_FRILLS
3507 case XTerm_locale: 3827 case XTerm_locale:
3508 if (query) 3828 if (query)
3509 {
3510 if (Options & Opt_insecure)
3511 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3829 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3512 }
3513 else 3830 else
3514 { 3831 {
3515 set_locale (str); 3832 set_locale (str);
3833 pty.set_utf8_mode (enc_utf8);
3516# ifdef USE_XIM 3834# ifdef USE_XIM
3517 im_cb (); 3835 im_cb ();
3518# endif 3836# endif
3519 } 3837 }
3520 break; 3838 break;
3521
3522 case XTerm_findfont:
3523 if (Options & Opt_insecure)
3524 {
3525 int fid = TermWin.fontset->find_font (atoi (str));
3526 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3527 fid, (*TermWin.fontset)[fid]->name, resp);
3528 }
3529 break;
3530#endif 3839#endif
3531 3840
3532#ifdef MENUBAR 3841#ifdef MENUBAR
3533 case XTerm_Menu: 3842 case XTerm_Menu:
3534 if (Options & Opt_insecure) 3843 if (options & Opt_insecure)
3535 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3536 break; 3845 break;
3537#endif 3846#endif
3538#if 0 3847#if 0
3539 case XTerm_dumpscreen: /* no error notices */ 3848 case XTerm_dumpscreen: /* no error notices */
… …
3566{ 3875{
3567 int state; 3876 int state;
3568 3877
3569 if (mode == 's') 3878 if (mode == 's')
3570 { 3879 {
3571 SavedModes |= (PrivateModes & bit); 3880 SavedModes |= (priv_modes & bit);
3572 return -1; 3881 return -1;
3573 } 3882 }
3574 else 3883 else
3575 { 3884 {
3576 if (mode == 'r') 3885 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3886 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3887 else
3579 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3888 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3889 PrivMode (state, bit);
3581 } 3890 }
3582 3891
3583 return state; 3892 return state;
3584} 3893}
… …
3602 { 3, PrivMode_132 }, 3911 { 3, PrivMode_132 },
3603 { 4, PrivMode_smoothScroll }, 3912 { 4, PrivMode_smoothScroll },
3604 { 5, PrivMode_rVideo }, 3913 { 5, PrivMode_rVideo },
3605 { 6, PrivMode_relOrigin }, 3914 { 6, PrivMode_relOrigin },
3606 { 7, PrivMode_Autowrap }, 3915 { 7, PrivMode_Autowrap },
3916 // 8, bi-directional support mode
3607 { 9, PrivMode_MouseX10 }, 3917 { 9, PrivMode_MouseX10 },
3608#ifdef menuBar_esc 3918#ifdef menuBar_esc
3609 { menuBar_esc, PrivMode_menuBar }, 3919 { menuBar_esc, PrivMode_menuBar },
3610#endif 3920#endif
3921 // 18, 19 printing-related
3922 { 25, PrivMode_VisibleCursor },
3611#ifdef scrollBar_esc 3923#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 3924 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 3925#endif
3614 // 18, 19 printing-related
3615 { 25, PrivMode_VisibleCursor },
3616 // 30 show scrollbar rxvt. extension
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 3926 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 { 40, PrivMode_132OK }, 3927 { 40, PrivMode_132OK },
3619 // 41 xterm more fixes NYI 3928 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI 3929 // 45 margin bell NYI
3621 // 46 start logging 3930 // 46 start logging
… …
3662 3971
3663 /* extra handling for values with state unkept */ 3972 /* extra handling for values with state unkept */
3664 switch (arg[i]) 3973 switch (arg[i])
3665 { 3974 {
3666 case 1048: /* alternative cursor save */ 3975 case 1048: /* alternative cursor save */
3976 case 1049:
3667 if (Options & Opt_secondaryScreen) 3977 if (options & Opt_secondaryScreen)
3668 if (mode == 0) 3978 if (mode == 0)
3669 scr_cursor (RESTORE); 3979 scr_cursor (RESTORE);
3670 else if (mode == 1) 3980 else if (mode == 1)
3671 scr_cursor (SAVE); 3981 scr_cursor (SAVE);
3672 break; 3982 break;
… …
3683 * within VT52 mode 3993 * within VT52 mode
3684 */ 3994 */
3685 PrivMode (1, PrivMode_vt52); 3995 PrivMode (1, PrivMode_vt52);
3686 break; 3996 break;
3687 case 3: /* 80/132 */ 3997 case 3: /* 80/132 */
3688 if (PrivateModes & PrivMode_132OK) 3998 if (priv_modes & PrivMode_132OK)
3689 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3690 break; 4000 break;
3691 case 4: /* smooth scrolling */ 4001 case 4: /* smooth scrolling */
3692 if (state) 4002 if (state)
3693 Options &= ~Opt_jumpScroll; 4003 options &= ~Opt_jumpScroll;
3694 else 4004 else
3695 Options |= Opt_jumpScroll; 4005 options |= Opt_jumpScroll;
3696 break; 4006 break;
3697 case 5: /* reverse video */ 4007 case 5: /* reverse video */
3698 scr_rvideo_mode (state); 4008 scr_rvideo_mode (state);
3699 break; 4009 break;
3700 case 6: /* relative/absolute origins */ 4010 case 6: /* relative/absolute origins */
… …
3704 scr_autowrap (state); 4014 scr_autowrap (state);
3705 break; 4015 break;
3706 /* case 8: - auto repeat, can't do on a per window basis */ 4016 /* case 8: - auto repeat, can't do on a per window basis */
3707 case 9: /* X10 mouse reporting */ 4017 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 4018 if (state) /* orthogonal */
3709 PrivateModes &= ~PrivMode_MouseX11; 4019 priv_modes &= ~PrivMode_MouseX11;
3710 break; 4020 break;
3711#ifdef menuBar_esc 4021#ifdef menuBar_esc
3712 case menuBar_esc: 4022 case menuBar_esc:
3713#ifdef MENUBAR 4023#ifdef MENUBAR
3714 map_menuBar (state); 4024 map_menuBar (state);
… …
3734 break; 4044 break;
3735 /* case 66: - application key pad */ 4045 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 4046 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 4047 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 4048 if (state) /* orthogonal */
3739 PrivateModes &= ~PrivMode_MouseX10; 4049 priv_modes &= ~PrivMode_MouseX10;
3740 break; 4050 break;
3741#if 0 4051#if 0
3742 case 1001: 4052 case 1001:
3743 break; /* X11 mouse highlighting */ 4053 break; /* X11 mouse highlighting */
3744#endif 4054#endif
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 4055 case 1010: /* scroll to bottom on TTY output inhibit */
3746 if (state) 4056 if (state)
3747 Options &= ~Opt_scrollTtyOutput; 4057 options &= ~Opt_scrollTtyOutput;
3748 else 4058 else
3749 Options |= Opt_scrollTtyOutput; 4059 options |= Opt_scrollTtyOutput;
3750 break; 4060 break;
3751 case 1011: /* scroll to bottom on key press */ 4061 case 1011: /* scroll to bottom on key press */
3752 if (state) 4062 if (state)
3753 Options |= Opt_scrollTtyKeypress; 4063 options |= Opt_scrollTtyKeypress;
3754 else 4064 else
3755 Options &= ~Opt_scrollTtyKeypress; 4065 options &= ~Opt_scrollTtyKeypress;
3756 break; 4066 break;
3757 case 1047: /* secondary screen w/ clearing last */ 4067 case 1047: /* secondary screen w/ clearing last */
3758 if (Options & Opt_secondaryScreen) 4068 if (options & Opt_secondaryScreen)
3759 if (current_screen != PRIMARY) 4069 if (current_screen != PRIMARY)
3760 scr_erase_screen (2); 4070 scr_erase_screen (2);
3761 scr_change_screen (state); 4071 scr_change_screen (state);
3762 break; 4072 break;
3763 case 1049: /* secondary screen w/ clearing first */ 4073 case 1049: /* secondary screen w/ clearing first */
3764 scr_change_screen (state); 4074 scr_change_screen (state);
3765 if (Options & Opt_secondaryScreen) 4075 if (options & Opt_secondaryScreen)
3766 if (current_screen != PRIMARY) 4076 if (current_screen != PRIMARY)
3767 scr_erase_screen (2); 4077 scr_erase_screen (2);
3768 break; 4078 break;
3769 default: 4079 default:
3770 break; 4080 break;
… …
3796 rendset = 0, rendstyle = ~RS_None; 4106 rendset = 0, rendstyle = ~RS_None;
3797 break; 4107 break;
3798 case 1: 4108 case 1:
3799 rendset = 1, rendstyle = RS_Bold; 4109 rendset = 1, rendstyle = RS_Bold;
3800 break; 4110 break;
3801 //case 2: // faint or second colour 4111 //case 2: // low intensity
4112 case 3:
4113 rendset = 1, rendstyle = RS_Italic;
4114 break;
3802 case 4: 4115 case 4:
3803 rendset = 1, rendstyle = RS_Uline; 4116 rendset = 1, rendstyle = RS_Uline;
3804 break; 4117 break;
3805 case 5: // slowly blinking 4118 case 5: // slowly blinking
3806 case 6: // rapidly blinking 4119 case 6: // rapidly blinking
… …
3818 //case 11: // scoansi acs on, first alt font 4131 //case 11: // scoansi acs on, first alt font
3819 //case 12: // scoansi acs on, |0x80, second alt font 4132 //case 12: // scoansi acs on, |0x80, second alt font
3820 //... 4133 //...
3821 //case 19: // ninth alt font 4134 //case 19: // ninth alt font
3822 //case 20: // gothic 4135 //case 20: // gothic
3823 case 21: // disable bold, faint 4136 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3824 rendset = 0, rendstyle = RS_Bold; 4137 rendset = 0, rendstyle = RS_Bold;
3825 break; 4138 break;
3826 case 22: 4139 case 22: // normal intensity
3827 rendset = 0, rendstyle = RS_Bold; 4140 rendset = 0, rendstyle = RS_Bold;
3828 break; 4141 break;
3829 //case 23: disable italic 4142 case 23: // disable italic
4143 rendset = 0, rendstyle = RS_Italic;
4144 break;
3830 case 24: 4145 case 24:
3831 rendset = 0, rendstyle = RS_Uline; 4146 rendset = 0, rendstyle = RS_Uline;
3832 break; 4147 break;
3833 case 25: 4148 case 25:
4149 rendset = 0, rendstyle = RS_Blink;
4150 break;
4151 case 26: // variable spacing (iso 8613)
3834 rendset = 0, rendstyle = RS_Blink; 4152 rendset = 0, rendstyle = RS_Blink;
3835 break; 4153 break;
3836 case 27: 4154 case 27:
3837 rendset = 0, rendstyle = RS_RVid; 4155 rendset = 0, rendstyle = RS_RVid;
3838 break; 4156 break;
… …
3856 case 35: 4174 case 35:
3857 case 36: 4175 case 36:
3858 case 37: 4176 case 37:
3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4177 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3860 break; 4178 break;
3861#ifdef TTY_256COLOR 4179 case 38: // set fg color, ISO 8613-6
3862 case 38:
3863 if (nargs > i + 2 && arg[i + 1] == 5) 4180 if (nargs > i + 2 && arg[i + 1] == 5)
3864 { 4181 {
3865 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4182 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3866 i += 2; 4183 i += 2;
3867 } 4184 }
3868 break; 4185 break;
3869#endif
3870 case 39: /* default fg */ 4186 case 39: /* default fg */
3871 scr_color (Color_fg, Color_fg); 4187 scr_color (Color_fg, Color_fg);
3872 break; 4188 break;
3873 4189
3874 case 40: 4190 case 40:
… …
3879 case 45: 4195 case 45:
3880 case 46: 4196 case 46:
3881 case 47: 4197 case 47:
3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4198 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3883 break; 4199 break;
3884#ifdef TTY_256COLOR 4200 case 48: // set bg color, ISO 8613-6
3885 case 48:
3886 if (nargs > i + 2 && arg[i + 1] == 5) 4201 if (nargs > i + 2 && arg[i + 1] == 5)
3887 { 4202 {
3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4203 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3889 i += 2; 4204 i += 2;
3890 } 4205 }
3891 break; 4206 break;
3892#endif
3893 case 49: /* default bg */ 4207 case 49: /* default bg */
3894 scr_color (Color_bg, Color_bg); 4208 scr_color (Color_bg, Color_bg);
3895 break; 4209 break;
4210
4211 //case 50: // not variable spacing
3896 4212
3897#ifndef NO_BRIGHTCOLOR 4213#ifndef NO_BRIGHTCOLOR
3898 case 90: 4214 case 90:
3899 case 91: /* set bright fg color */ 4215 case 91: /* set bright fg color */
3900 case 92: 4216 case 92:
3901 case 93: 4217 case 93:
3902 case 94: 4218 case 94:
3903 case 95: 4219 case 95:
3904 case 96: 4220 case 96:
3905 case 97: 4221 case 97:
3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4222 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3907 Color_fg);
3908 break; 4223 break;
3909 case 100: 4224 case 100:
3910 case 101: /* set bright bg color */ 4225 case 101: /* set bright bg color */
3911 case 102: 4226 case 102:
3912 case 103: 4227 case 103:
3913 case 104: 4228 case 104:
3914 case 105: 4229 case 105:
3915 case 106: 4230 case 106:
3916 case 107: 4231 case 107:
3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4232 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3918 Color_bg);
3919 break; 4233 break;
3920#endif 4234#endif
3921 4235
3922 } 4236 }
3923 } 4237 }
… …
3930{ 4244{
3931 unicode_t ch, cmd = cmd_getc (); 4245 unicode_t ch, cmd = cmd_getc ();
3932 4246
3933 if (cmd == 'Q') 4247 if (cmd == 'Q')
3934 { /* query graphics */ 4248 { /* query graphics */
3935 tt_printf ("\033G0\n"); /* no graphics */ 4249 tt_printf ("\033G0\012"); /* no graphics */
3936 return; 4250 return;
3937 } 4251 }
3938 /* swallow other graphics sequences until terminating ':' */ 4252 /* swallow other graphics sequences until terminating ':' */
3939 do 4253 do
3940 ch = cmd_getc (); 4254 ch = cmd_getc ();
… …
3955 unsigned char buf[256]; 4269 unsigned char buf[256];
3956 4270
3957 va_start (arg_ptr, fmt); 4271 va_start (arg_ptr, fmt);
3958 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4272 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3959 va_end (arg_ptr); 4273 va_end (arg_ptr);
3960 tt_write (buf, STRLEN (buf)); 4274 tt_write (buf, strlen (buf));
3961} 4275}
3962 4276
3963/* ---------------------------------------------------------------------- */ 4277/* ---------------------------------------------------------------------- */
3964/* Write data to the pty as typed by the user, pasted with the mouse, 4278/* Write data to the pty as typed by the user, pasted with the mouse,
3965 * or generated by us in response to a query ESC sequence. 4279 * or generated by us in response to a query ESC sequence.
3966 */ 4280 */
4281const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4282
3967void 4283void
3968rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4284rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3969{ 4285{
3970 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4286 if (v_buflen == 0)
4287 {
4288 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3971 4289
3972 if (len) 4290 if ((unsigned int)written == len)
4291 return;
4292
4293 data += written;
4294 len -= written;
3973 { 4295 }
4296
4297 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4298
4299 memcpy (v_buffer + v_buflen, data, len);
4300 v_buflen += len;
4301
4302 pty_ev.set (EVENT_READ | EVENT_WRITE);
4303}
4304
4305void rxvt_term::pty_write ()
4306{
4307 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4308
4309 if (written > 0)
4310 {
4311 v_buflen -= written;
4312
3974 if (v_buflen == 0) 4313 if (v_buflen == 0)
3975 { 4314 {
3976 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3977
3978 if ((unsigned int)written == len)
3979 return;
3980
3981 data += written;
3982 len -= written;
3983 }
3984
3985
3986 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3987
3988 memcpy (v_buffer + v_buflen, data, len);
3989 v_buflen += len;
3990 }
3991
3992 for (;;)
3993 {
3994 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3995
3996 if (written > 0)
3997 {
3998 v_buflen -= written;
3999
4000 if (v_buflen == 0)
4001 {
4002 free (v_buffer); 4315 free (v_buffer);
4003 v_buffer = 0; 4316 v_buffer = 0;
4004 v_buflen = 0; 4317 v_buflen = 0;
4005 4318
4006 pty_ev.set (EVENT_READ); 4319 pty_ev.set (EVENT_READ);
4007 return;
4008 }
4009
4010 memmove (v_buffer, v_buffer + written, v_buflen);
4011 }
4012 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4013 // original code just ignores this...
4014 destroy ();
4015 else
4016 {
4017 pty_ev.set (EVENT_READ | EVENT_WRITE);
4018 return; 4320 return;
4019 } 4321 }
4322
4323 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 4324 }
4325 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4326 // original code just ignores this...
4327 destroy ();
4021} 4328}
4022 4329
4023/*----------------------- end-of-file (C source) -----------------------*/ 4330/*----------------------- end-of-file (C source) -----------------------*/
4024 4331

Diff Legend

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