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.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.177 by root, Mon Dec 13 07:18:52 2004 UTC

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

Diff Legend

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