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.36 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.51 by pcg, Sun Feb 22 08:28:36 2004 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
30 * 31 *
31 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
32 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
33 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
34 * (at your option) any later version. 35 * (at your option) any later version.
… …
53 54
54/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
55 56
56/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
57void 58void
58rxvt_term::lookup_key (XKeyEvent *ev) 59rxvt_term::lookup_key (XKeyEvent &ev)
59{ 60{
60 int ctrl, meta, shft, len; 61 int ctrl, meta, shft, len;
61 unsigned int newlen; 62 unsigned int newlen;
62 KeySym keysym; 63 KeySym keysym;
63#ifdef DEBUG_CMD 64#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 65 static int debug_key = 1; /* accessible by a debugger only */
65#endif 66#endif
66 int valid_keysym; 67 int valid_keysym;
67 unsigned char kbuf[KBUFSZ]; 68 unsigned char kbuf[KBUFSZ];
68 69
69 /* 70 /*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 72 * escape sequence to toggle the Keypad.
72 * 73 *
73 * Always permit `shift' to override the current setting 74 * Always permit `shift' to override the current setting
74 */ 75 */
75 shft = (ev->state & ShiftMask); 76 shft = (ev.state & ShiftMask);
76 ctrl = (ev->state & ControlMask); 77 ctrl = (ev.state & ControlMask);
77 meta = (ev->state & ModMetaMask); 78 meta = (ev.state & ModMetaMask);
78 79
79 if (numlock_state || (ev->state & ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
80 { 81 {
81 numlock_state = (ev->state & ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!numlock_state), PrivMode_aplKP); 83 PrivMode ((!numlock_state), PrivMode_aplKP);
83 } 84 }
84 85
85 kbuf[0] = 0; 86 kbuf[0] = 0;
86 87
87#ifdef USE_XIM 88#ifdef USE_XIM
88 if (Input_Context) 89 if (Input_Context)
89 { 90 {
90 Status status_return; 91 Status status_return;
91 92
92#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) 94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
94 len = Xutf8LookupString (Input_Context, ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
95 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
96 else 97 else
97#endif 98#endif
98
99 { 99 {
100 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
101 101
102 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 104 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 105 SET_LOCALE (rs[Rs_imLocale]);
106 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 110 SET_LOCALE (locale);
111 111
112 if (status_return == XLookupChars 112 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
114 { 114 {
115 wkbuf[len] = 0; 115 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 117 if (len < 0)
118 len = 0; 118 len = 0;
… …
120 else 120 else
121 len = 0; 121 len = 0;
122 } 122 }
123 123
124 valid_keysym = status_return == XLookupKeySym 124 valid_keysym = status_return == XLookupKeySym
125 || status_return == XLookupBoth; 125 || status_return == XLookupBoth;
126 } 126 }
127 else 127 else
128#endif 128#endif
129
130 { 129 {
131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 130 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 131 valid_keysym = keysym != NoSymbol;
133 } 132 }
134 133
135 if (valid_keysym) 134 if (valid_keysym)
136 { 135 {
137 /* for some backwards compatibility */ 136 /* for some backwards compatibility */
… …
142 if (meta) 141 if (meta)
143# endif 142# endif
144 { 143 {
145 if (keysym == ks_bigfont) 144 if (keysym == ks_bigfont)
146 { 145 {
147 change_font (0, FONT_UP); 146 change_font (FONT_UP);
148 return; 147 return;
149 } 148 }
150 else if (keysym == ks_smallfont) 149 else if (keysym == ks_smallfont)
151 { 150 {
152 change_font (0, FONT_DN); 151 change_font (FONT_DN);
153 return; 152 return;
154 } 153 }
155 } 154 }
156#endif 155#endif
157 156
… …
162 { 161 {
163#else 162#else
164 if (IS_SCROLL_MOD) 163 if (IS_SCROLL_MOD)
165 { 164 {
166#endif 165#endif
167 int lnsppg; 166 int lnsppg;
168 167
169#ifdef PAGING_CONTEXT_LINES 168#ifdef PAGING_CONTEXT_LINES
170 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 169 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
171#else 170#else
172 lnsppg = TermWin.nrow * 4 / 5; 171 lnsppg = TermWin.nrow * 4 / 5;
… …
210 scr_move_to (1, 0); 209 scr_move_to (1, 0);
211 return; 210 return;
212 } 211 }
213 } 212 }
214#endif 213#endif
215
216 } 214 }
217 215
218 if (shft) 216 if (shft)
219 { 217 {
220 /* Shift + F1 - F10 generates F11 - F20 */ 218 /* Shift + F1 - F10 generates F11 - F20 */
… …
227 { 225 {
228 switch (keysym) 226 switch (keysym)
229 { 227 {
230 /* normal XTerm key bindings */ 228 /* normal XTerm key bindings */
231 case XK_Insert: /* Shift+Insert = paste mouse selection */ 229 case XK_Insert: /* Shift+Insert = paste mouse selection */
232 selection_request (ev->time, 0, 0); 230 selection_request (ev.time, 0, 0);
233 return; 231 return;
234 /* rxvt extras */ 232 /* rxvt extras */
235 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 233 case XK_KP_Add: /* Shift+KP_Add = bigger font */
236 change_font (0, FONT_UP); 234 change_font (FONT_UP);
237 return; 235 return;
238 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 236 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
239 change_font (0, FONT_DN); 237 change_font (FONT_DN);
240 return; 238 return;
241 } 239 }
242 } 240 }
243 } 241 }
244#ifdef PRINTPIPE 242#ifdef PRINTPIPE
… …
246 { 244 {
247 scr_printscreen (ctrl | shft); 245 scr_printscreen (ctrl | shft);
248 return; 246 return;
249 } 247 }
250#endif 248#endif
251#ifdef GREEK_SUPPORT
252 if (keysym == ks_greekmodeswith)
253 {
254 greek_mode = !greek_mode;
255 if (greek_mode)
256 {
257 xterm_seq (XTerm_title,
258 (greek_getmode() == GREEK_ELOT928
259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
260 greek_reset();
261 }
262 else
263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
264 return;
265 }
266#endif
267 249
268 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 250 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
269 { 251 {
270#ifdef KEYSYM_RESOURCE 252#ifdef KEYSYM_RESOURCE
271 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 253 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
272 { 254 {
273 unsigned int l; 255 unsigned int l;
274 const unsigned char *kbuf0; 256 const unsigned char *kbuf0;
275 const unsigned char ch = C0_ESC; 257 const unsigned char ch = C0_ESC;
276 258
… …
286 tt_write (kbuf0, l); 268 tt_write (kbuf0, l);
287 return; 269 return;
288 } 270 }
289 else 271 else
290#endif 272#endif
291
292 { 273 {
293 newlen = 1; 274 newlen = 1;
294 switch (keysym) 275 switch (keysym)
295 { 276 {
296#ifndef NO_BACKSPACE_KEY 277#ifndef NO_BACKSPACE_KEY
297 case XK_BackSpace: 278 case XK_BackSpace:
298 if (PrivateModes & PrivMode_HaveBackSpace) 279 if (PrivateModes & PrivMode_HaveBackSpace)
299 { 280 {
300 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 281 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
301 ^ !!ctrl) ? '\b' : '\177'; 282 ^ !!ctrl) ? '\b' : '\177';
302 kbuf[1] = '\0'; 283 kbuf[1] = '\0';
303 } 284 }
304 else 285 else
305 STRCPY(kbuf, key_backspace); 286 STRCPY (kbuf, key_backspace);
306# ifdef MULTICHAR_SET 287# ifdef MULTICHAR_SET
307 if ((Options & Opt_mc_hack) && screen.cur.col > 0) 288 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
308 { 289 {
309 int col, row; 290 int col, row;
310 291
311 newlen = STRLEN(kbuf); 292 newlen = STRLEN (kbuf);
312 col = screen.cur.col - 1; 293 col = screen.cur.col - 1;
313 row = screen.cur.row + TermWin.saveLines; 294 row = screen.cur.row + TermWin.saveLines;
314 if (IS_MULTI2(screen.rend[row][col])) 295 if (IS_MULTI2 (screen.rend[row][col]))
315 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 296 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
316 } 297 }
317# endif 298# endif
318 break; 299 break;
319#endif 300#endif
320#ifndef NO_DELETE_KEY 301#ifndef NO_DELETE_KEY
321 case XK_Delete: 302 case XK_Delete:
322 STRCPY(kbuf, key_delete); 303 STRCPY (kbuf, key_delete);
323# ifdef MULTICHAR_SET 304# ifdef MULTICHAR_SET
324 if (Options & Opt_mc_hack) 305 if (Options & Opt_mc_hack)
325 { 306 {
326 int col, row; 307 int col, row;
327 308
328 newlen = STRLEN(kbuf); 309 newlen = STRLEN (kbuf);
329 col = screen.cur.col; 310 col = screen.cur.col;
330 row = screen.cur.row + TermWin.saveLines; 311 row = screen.cur.row + TermWin.saveLines;
331 if (IS_MULTI1(screen.rend[row][col])) 312 if (IS_MULTI1 (screen.rend[row][col]))
332 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 313 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
333 } 314 }
334# endif 315# endif
335 break; 316 break;
336#endif 317#endif
337 case XK_Tab: 318 case XK_Tab:
338 if (shft) 319 if (shft)
339 STRCPY(kbuf, "\033[Z"); 320 STRCPY (kbuf, "\033[Z");
340 else 321 else
341 { 322 {
342#ifdef CTRL_TAB_MAKES_META 323#ifdef CTRL_TAB_MAKES_META
343 if (ctrl) 324 if (ctrl)
344 meta = 1; 325 meta = 1;
345#endif 326#endif
346#ifdef MOD4_TAB_MAKES_META 327#ifdef MOD4_TAB_MAKES_META
347 if (ev->state & Mod4Mask) 328 if (ev.state & Mod4Mask)
348 meta = 1; 329 meta = 1;
349#endif 330#endif
350 newlen = 0; 331 newlen = 0;
351 } 332 }
352 break; 333 break;
353
354 334
355#ifdef XK_KP_Left 335#ifdef XK_KP_Left
356 case XK_KP_Up: /* \033Ox or standard */ 336 case XK_KP_Up: /* \033Ox or standard */
357 case XK_KP_Down: /* \033Or or standard */ 337 case XK_KP_Down: /* \033Or or standard */
358 case XK_KP_Right: /* \033Ov or standard */ 338 case XK_KP_Right: /* \033Ov or standard */
359 case XK_KP_Left: /* \033Ot or standard */ 339 case XK_KP_Left: /* \033Ot or standard */
360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 340 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
361 { 341 {
362 STRCPY(kbuf, "\033OZ"); 342 STRCPY (kbuf, "\033OZ");
363 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 343 kbuf[2] = "txvr"[keysym - XK_KP_Left];
364 break; 344 break;
365 } 345 }
366 else 346 else
367 /* translate to std. cursor key */ 347 /* translate to std. cursor key */
368 keysym = XK_Left + (keysym - XK_KP_Left); 348 keysym = XK_Left + (keysym - XK_KP_Left);
… …
370#endif 350#endif
371 case XK_Up: /* "\033[A" */ 351 case XK_Up: /* "\033[A" */
372 case XK_Down: /* "\033[B" */ 352 case XK_Down: /* "\033[B" */
373 case XK_Right: /* "\033[C" */ 353 case XK_Right: /* "\033[C" */
374 case XK_Left: /* "\033[D" */ 354 case XK_Left: /* "\033[D" */
375 STRCPY(kbuf, "\033[Z"); 355 STRCPY (kbuf, "\033[Z");
376 kbuf[2] = ("DACB"[keysym - XK_Left]); 356 kbuf[2] = "DACB"[keysym - XK_Left];
377 /* do Shift first */ 357 /* do Shift first */
378 if (shft) 358 if (shft)
379 kbuf[2] = ("dacb"[keysym - XK_Left]); 359 kbuf[2] = "dacb"[keysym - XK_Left];
380 else if (ctrl) 360 else if (ctrl)
381 { 361 {
382 kbuf[1] = 'O'; 362 kbuf[1] = 'O';
383 kbuf[2] = ("dacb"[keysym - XK_Left]); 363 kbuf[2] = "dacb"[keysym - XK_Left];
384 } 364 }
385 else if (PrivateModes & PrivMode_aplCUR) 365 else if (PrivateModes & PrivMode_aplCUR)
386 kbuf[1] = 'O'; 366 kbuf[1] = 'O';
387#ifdef MULTICHAR_SET 367#ifdef MULTICHAR_SET
388 //TODO: ?? 368 //TODO: ??
… …
392 372
393 col = screen.cur.col; 373 col = screen.cur.col;
394 row = screen.cur.row + TermWin.saveLines; 374 row = screen.cur.row + TermWin.saveLines;
395 m = 0; 375 m = 0;
396 if (keysym == XK_Right 376 if (keysym == XK_Right
397 && IS_MULTI1(screen.rend[row][col])) 377 && IS_MULTI1 (screen.rend[row][col]))
398 m = 1; 378 m = 1;
399 else if (keysym == XK_Left) 379 else if (keysym == XK_Left)
400 { 380 {
401 if (col > 0) 381 if (col > 0)
402 { 382 {
403 if (IS_MULTI2(screen.rend[row][col - 1])) 383 if (IS_MULTI2 (screen.rend[row][col - 1]))
404 m = 1; 384 m = 1;
405 } 385 }
406 else if (screen.cur.row > 0) 386 else if (screen.cur.row > 0)
407 { 387 {
408 col = screen.tlen[--row]; 388 col = screen.tlen[--row];
409 if (col == -1) 389 if (col == -1)
410 col = TermWin.ncol - 1; 390 col = TermWin.ncol - 1;
411 else 391 else
412 col--; 392 col--;
413 if (col > 0 393 if (col > 0
414 && IS_MULTI2(screen.rend[row][col])) 394 && IS_MULTI2 (screen.rend[row][col]))
415 m = 1; 395 m = 1;
416 } 396 }
417 } 397 }
418 if (m) 398 if (m)
419 MEMMOVE(kbuf + 3, kbuf, 3 + 1); 399 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
420 } 400 }
421#endif 401#endif
422 break; 402 break;
423 403
424#ifndef UNSHIFTED_SCROLLKEYS 404#ifndef UNSHIFTED_SCROLLKEYS
425# ifdef XK_KP_Prior 405# ifdef XK_KP_Prior
426 case XK_KP_Prior: 406 case XK_KP_Prior:
427 /* allow shift to override */ 407 /* allow shift to override */
428 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 408 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
429 { 409 {
430 STRCPY(kbuf, "\033Oy"); 410 STRCPY (kbuf, "\033Oy");
431 break; 411 break;
432 } 412 }
433 /* FALLTHROUGH */ 413 /* FALLTHROUGH */
434# endif 414# endif
435 case XK_Prior: 415 case XK_Prior:
436 STRCPY(kbuf, "\033[5~"); 416 STRCPY (kbuf, "\033[5~");
437 break; 417 break;
438# ifdef XK_KP_Next 418# ifdef XK_KP_Next
439 case XK_KP_Next: 419 case XK_KP_Next:
440 /* allow shift to override */ 420 /* allow shift to override */
441 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 421 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
442 { 422 {
443 STRCPY(kbuf, "\033Os"); 423 STRCPY (kbuf, "\033Os");
444 break; 424 break;
445 } 425 }
446 /* FALLTHROUGH */ 426 /* FALLTHROUGH */
447# endif 427# endif
448 case XK_Next: 428 case XK_Next:
449 STRCPY(kbuf, "\033[6~"); 429 STRCPY (kbuf, "\033[6~");
450 break; 430 break;
451#endif 431#endif
452 case XK_KP_Enter: 432 case XK_KP_Enter:
453 /* allow shift to override */ 433 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 434 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
455 { 435 {
456 STRCPY(kbuf, "\033OM"); 436 STRCPY (kbuf, "\033OM");
457 } 437 }
458 else 438 else
459 { 439 {
460 kbuf[0] = '\r'; 440 kbuf[0] = '\r';
461 kbuf[1] = '\0'; 441 kbuf[1] = '\0';
462 } 442 }
463 break; 443 break;
464 444
465#ifdef XK_KP_Begin 445#ifdef XK_KP_Begin
466 case XK_KP_Begin: 446 case XK_KP_Begin:
467 STRCPY(kbuf, "\033Ou"); 447 STRCPY (kbuf, "\033Ou");
468 break; 448 break;
469 449
470 case XK_KP_Insert: 450 case XK_KP_Insert:
471 STRCPY(kbuf, "\033Op"); 451 STRCPY (kbuf, "\033Op");
472 break; 452 break;
473 453
474 case XK_KP_Delete: 454 case XK_KP_Delete:
475 STRCPY(kbuf, "\033On"); 455 STRCPY (kbuf, "\033On");
476 break; 456 break;
477#endif 457#endif
478 case XK_KP_F1: /* "\033OP" */ 458 case XK_KP_F1: /* "\033OP" */
479 case XK_KP_F2: /* "\033OQ" */ 459 case XK_KP_F2: /* "\033OQ" */
480 case XK_KP_F3: /* "\033OR" */ 460 case XK_KP_F3: /* "\033OR" */
481 case XK_KP_F4: /* "\033OS" */ 461 case XK_KP_F4: /* "\033OS" */
482 STRCPY(kbuf, "\033OP"); 462 STRCPY (kbuf, "\033OP");
483 kbuf[2] += (keysym - XK_KP_F1); 463 kbuf[2] += (keysym - XK_KP_F1);
484 break; 464 break;
485 465
486 case XK_KP_Multiply: /* "\033Oj" : "*" */ 466 case XK_KP_Multiply: /* "\033Oj" : "*" */
487 case XK_KP_Add: /* "\033Ok" : "+" */ 467 case XK_KP_Add: /* "\033Ok" : "+" */
488 case XK_KP_Separator: /* "\033Ol" : "," */ 468 case XK_KP_Separator: /* "\033Ol" : "," */
489 case XK_KP_Subtract: /* "\033Om" : "-" */ 469 case XK_KP_Subtract: /* "\033Om" : "-" */
490 case XK_KP_Decimal: /* "\033On" : "." */ 470 case XK_KP_Decimal: /* "\033On" : "." */
491 case XK_KP_Divide: /* "\033Oo" : "/" */ 471 case XK_KP_Divide: /* "\033Oo" : "/" */
492 case XK_KP_0: /* "\033Op" : "0" */ 472 case XK_KP_0: /* "\033Op" : "0" */
… …
500 case XK_KP_8: /* "\033Ox" : "8" */ 480 case XK_KP_8: /* "\033Ox" : "8" */
501 case XK_KP_9: /* "\033Oy" : "9" */ 481 case XK_KP_9: /* "\033Oy" : "9" */
502 /* allow shift to override */ 482 /* allow shift to override */
503 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 483 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
504 { 484 {
505 STRCPY(kbuf, "\033Oj"); 485 STRCPY (kbuf, "\033Oj");
506 kbuf[2] += (keysym - XK_KP_Multiply); 486 kbuf[2] += (keysym - XK_KP_Multiply);
507 } 487 }
508 else 488 else
509 { 489 {
510 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 490 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
511 kbuf[1] = '\0'; 491 kbuf[1] = '\0';
512 } 492 }
513 break; 493 break;
514 494
515 case XK_Find: 495 case XK_Find:
516 STRCPY(kbuf, "\033[1~"); 496 STRCPY (kbuf, "\033[1~");
517 break; 497 break;
518 case XK_Insert: 498 case XK_Insert:
519 STRCPY(kbuf, "\033[2~"); 499 STRCPY (kbuf, "\033[2~");
520 break; 500 break;
521#ifdef DXK_Remove /* support for DEC remove like key */ 501#ifdef DXK_Remove /* support for DEC remove like key */
522 case DXK_Remove: 502 case DXK_Remove:
523 /* FALLTHROUGH */ 503 /* FALLTHROUGH */
524#endif 504#endif
525 case XK_Execute: 505 case XK_Execute:
526 STRCPY(kbuf, "\033[3~"); 506 STRCPY (kbuf, "\033[3~");
527 break; 507 break;
528 case XK_Select: 508 case XK_Select:
529 STRCPY(kbuf, "\033[4~"); 509 STRCPY (kbuf, "\033[4~");
530 break; 510 break;
531#ifdef XK_KP_End 511#ifdef XK_KP_End
532 case XK_KP_End: 512 case XK_KP_End:
533 /* allow shift to override */ 513 /* allow shift to override */
534 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 514 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
535 { 515 {
536 STRCPY(kbuf, "\033Oq"); 516 STRCPY (kbuf, "\033Oq");
537 break; 517 break;
538 } 518 }
539 /* FALLTHROUGH */ 519 /* FALLTHROUGH */
540#endif 520#endif
541 case XK_End: 521 case XK_End:
542 STRCPY(kbuf, KS_END); 522 STRCPY (kbuf, KS_END);
543 break; 523 break;
544#ifdef XK_KP_Home 524#ifdef XK_KP_Home
545 case XK_KP_Home: 525 case XK_KP_Home:
546 /* allow shift to override */ 526 /* allow shift to override */
547 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 527 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
548 { 528 {
549 STRCPY(kbuf, "\033Ow"); 529 STRCPY (kbuf, "\033Ow");
550 break; 530 break;
551 } 531 }
552 /* FALLTHROUGH */ 532 /* FALLTHROUGH */
553#endif 533#endif
554 case XK_Home: 534 case XK_Home:
555 STRCPY(kbuf, KS_HOME); 535 STRCPY (kbuf, KS_HOME);
556 break; 536 break;
557 537
558#define FKEY(n, fkey) \ 538#define FKEY(n, fkey) \
559 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 539 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
560 540
561 case XK_F1: /* "\033[11~" */ 541 case XK_F1: /* "\033[11~" */
562 case XK_F2: /* "\033[12~" */ 542 case XK_F2: /* "\033[12~" */
563 case XK_F3: /* "\033[13~" */ 543 case XK_F3: /* "\033[13~" */
564 case XK_F4: /* "\033[14~" */ 544 case XK_F4: /* "\033[14~" */
565 case XK_F5: /* "\033[15~" */ 545 case XK_F5: /* "\033[15~" */
566 FKEY(11, XK_F1); 546 FKEY (11, XK_F1);
567 break; 547 break;
568 case XK_F6: /* "\033[17~" */ 548 case XK_F6: /* "\033[17~" */
569 case XK_F7: /* "\033[18~" */ 549 case XK_F7: /* "\033[18~" */
570 case XK_F8: /* "\033[19~" */ 550 case XK_F8: /* "\033[19~" */
571 case XK_F9: /* "\033[20~" */ 551 case XK_F9: /* "\033[20~" */
572 case XK_F10: /* "\033[21~" */ 552 case XK_F10: /* "\033[21~" */
573 FKEY(17, XK_F6); 553 FKEY (17, XK_F6);
574 break; 554 break;
575 case XK_F11: /* "\033[23~" */ 555 case XK_F11: /* "\033[23~" */
576 case XK_F12: /* "\033[24~" */ 556 case XK_F12: /* "\033[24~" */
577 case XK_F13: /* "\033[25~" */ 557 case XK_F13: /* "\033[25~" */
578 case XK_F14: /* "\033[26~" */ 558 case XK_F14: /* "\033[26~" */
579 FKEY(23, XK_F11); 559 FKEY (23, XK_F11);
580 break; 560 break;
581 case XK_F15: /* "\033[28~" */ 561 case XK_F15: /* "\033[28~" */
582 case XK_F16: /* "\033[29~" */ 562 case XK_F16: /* "\033[29~" */
583 FKEY(28, XK_F15); 563 FKEY (28, XK_F15);
584 break; 564 break;
585 case XK_Help: /* "\033[28~" */ 565 case XK_Help: /* "\033[28~" */
586 FKEY(28, XK_Help); 566 FKEY (28, XK_Help);
587 break; 567 break;
588 case XK_Menu: /* "\033[29~" */ 568 case XK_Menu: /* "\033[29~" */
589 FKEY(29, XK_Menu); 569 FKEY (29, XK_Menu);
590 break; 570 break;
591 case XK_F17: /* "\033[31~" */ 571 case XK_F17: /* "\033[31~" */
592 case XK_F18: /* "\033[32~" */ 572 case XK_F18: /* "\033[32~" */
593 case XK_F19: /* "\033[33~" */ 573 case XK_F19: /* "\033[33~" */
594 case XK_F20: /* "\033[34~" */ 574 case XK_F20: /* "\033[34~" */
… …
605 case XK_F31: /* "\033[45~" */ 585 case XK_F31: /* "\033[45~" */
606 case XK_F32: /* "\033[46~" */ 586 case XK_F32: /* "\033[46~" */
607 case XK_F33: /* "\033[47~" */ 587 case XK_F33: /* "\033[47~" */
608 case XK_F34: /* "\033[48~" */ 588 case XK_F34: /* "\033[48~" */
609 case XK_F35: /* "\033[49~" */ 589 case XK_F35: /* "\033[49~" */
610 FKEY(31, XK_F17); 590 FKEY (31, XK_F17);
611 break; 591 break;
612#undef FKEY 592#undef FKEY
613 default: 593 default:
614 newlen = 0; 594 newlen = 0;
615 break; 595 break;
616 } 596 }
617 if (newlen) 597 if (newlen)
618 len = STRLEN(kbuf); 598 len = STRLEN (kbuf);
619 } 599 }
620 /* 600 /*
621 * Pass meta for all function keys, if 'meta' option set 601 * Pass meta for all function keys, if 'meta' option set
622 */ 602 */
623#ifdef META8_OPTION 603#ifdef META8_OPTION
… …
641 621
642 for (ch = kbuf; ch < kbuf + len; ch++) 622 for (ch = kbuf; ch < kbuf + len; ch++)
643 *ch |= 0x80; 623 *ch |= 0x80;
644 meta = 0; 624 meta = 0;
645 } 625 }
646#endif
647#ifdef GREEK_SUPPORT
648 if (greek_mode)
649 len = greek_xlat(kbuf, len);
650#endif 626#endif
651 /* nil */ ; 627 /* nil */ ;
652 } 628 }
653 } 629 }
654 630
… …
683#endif 659#endif
684 ) 660 )
685 { 661 {
686 const unsigned char ch = C0_ESC; 662 const unsigned char ch = C0_ESC;
687 663
688 tt_write(&ch, 1); 664 tt_write (&ch, 1);
689 } 665 }
690#ifdef DEBUG_CMD 666#ifdef DEBUG_CMD
691 if (debug_key) 667 if (debug_key)
692 { /* Display keyboard buffer contents */ 668 { /* Display keyboard buffer contents */
693 char *p; 669 char *p;
694 int i; 670 int i;
695 671
696 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 672 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
697 for (i = 0, p = kbuf; i < len; i++, p++) 673 for (i = 0, p = kbuf; i < len; i++, p++)
698 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 674 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
699 fprintf(stderr, "'\n"); 675 fprintf (stderr, "'\n");
700 } 676 }
701#endif /* DEBUG_CMD */ 677#endif /* DEBUG_CMD */
702 tt_write (kbuf, (unsigned int)len); 678 tt_write (kbuf, (unsigned int)len);
703} 679}
704/*}}} */ 680/*}}} */
705 681
706#if (MENUBAR_MAX) 682#if (MENUBAR_MAX)
707/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 683/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
708/* attempt to `write' count to the input buffer */ 684/* attempt to `write' count to the input buffer */
709unsigned int 685unsigned int
710rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 686rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
711{ 687{
712 unsigned int n, s; 688 unsigned int n, s;
713 689
714 n = cmdbuf_ptr - cmdbuf_base; 690 n = cmdbuf_ptr - cmdbuf_base;
715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 691 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
716 if (n > 0 && s < count) 692 if (n > 0 && s < count)
717 { 693 {
718 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 694 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
719 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 695 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
720 cmdbuf_ptr = cmdbuf_base; 696 cmdbuf_ptr = cmdbuf_base;
721 cmdbuf_endp -= n; 697 cmdbuf_endp -= n;
722 s += n; 698 s += n;
723 } 699 }
724 if (count > s) 700 if (count > s)
725 { 701 {
726 rxvt_print_error("data loss: cmd_write too large"); 702 rxvt_print_error ("data loss: cmd_write too large");
727 count = s; 703 count = s;
728 } 704 }
729 for (; count--;) 705 for (; count--;)
730 *cmdbuf_endp++ = *str++; 706 *cmdbuf_endp++ = *str++;
731 return 0; 707 return 0;
… …
753 IMSendSpot (); 729 IMSendSpot ();
754#endif 730#endif
755 731
756 } 732 }
757 733
758 XFlush (Xdisplay); 734 display->flush ();
759} 735}
760 736
761void 737void
762rxvt_term::check_cb (check_watcher &w) 738rxvt_term::check_cb (check_watcher &w)
763{ 739{
764 SET_R (this); 740 SET_R (this);
765 SET_LOCALE (locale); 741 SET_LOCALE (locale);
766 742
767 flush (); 743 flush ();
768}
769
770void
771rxvt_term::process_x_events ()
772{
773 do
774 {
775 XEvent xev;
776
777 XNextEvent (Xdisplay, &xev);
778
779#if defined(CURSOR_BLINK)
780 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
781 {
782 if (hidden_cursor)
783 {
784 hidden_cursor = 0;
785 want_refresh = 1;
786 }
787
788 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
789 }
790#endif
791
792#if defined(POINTER_BLANK)
793 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
794 {
795 if (xev.type == MotionNotify
796 || xev.type == ButtonPress
797 || xev.type == ButtonRelease)
798 if (hidden_pointer)
799 pointer_unblank ();
800
801 if (xev.type == KeyPress && hidden_pointer == 0)
802 pointer_blank ();
803 }
804#endif
805
806#ifdef USE_XIM
807 if (!XFilterEvent (&xev, xev.xany.window))
808#endif
809 process_x_event (&xev);
810 }
811 while (XPending (Xdisplay));
812} 744}
813 745
814#ifdef CURSOR_BLINK 746#ifdef CURSOR_BLINK
815void 747void
816rxvt_term::cursor_blink_cb (time_watcher &w) 748rxvt_term::cursor_blink_cb (time_watcher &w)
… …
832 want_refresh = 1; 764 want_refresh = 1;
833 w.start (w.at + TEXT_BLINK_INTERVAL); 765 w.start (w.at + TEXT_BLINK_INTERVAL);
834 } 766 }
835} 767}
836#endif 768#endif
837
838void
839rxvt_term::x_cb (io_watcher &w, short revents)
840{
841 SET_R (this);
842 SET_LOCALE (locale);
843
844 process_x_events ();
845}
846 769
847bool 770bool
848rxvt_term::pty_fill () 771rxvt_term::pty_fill ()
849{ 772{
850 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 773 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
… …
922 if (ch == '\n') 845 if (ch == '\n')
923 { 846 {
924 nlines++; 847 nlines++;
925 refresh_count++; 848 refresh_count++;
926 849
927 if (!(Options & Opt_jumpScroll) 850 if (! (Options & Opt_jumpScroll)
928 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 851 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
929 { 852 {
930 refreshnow = true; 853 refreshnow = true;
931 flag = false; 854 flag = false;
932 ch = NOCHAR; 855 ch = NOCHAR;
933 break; 856 break;
857 }
858
859 // scr_add_lines only works for nlines < TermWin.nrow - 1.
860 if (nlines >= TermWin.nrow - 1)
861 {
862 scr_add_lines (buf, nlines, str - buf);
863 nlines = 0;
864 str = buf;
934 } 865 }
935 } 866 }
936 867
937 if (str >= buf + BUFSIZ) 868 if (str >= buf + BUFSIZ)
938 { 869 {
… …
992 { 923 {
993 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 924 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
994 return *cmdbuf_ptr++; 925 return *cmdbuf_ptr++;
995 926
996 wchar_t wc; 927 wchar_t wc;
997 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 928 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
998 929
999 if (len == (size_t)-2) 930 if (len == (size_t)-2)
1000 return NOCHAR; 931 return NOCHAR;
1001 932
1002 if (len == (size_t)-1) 933 if (len == (size_t)-1)
… …
1008 } 939 }
1009 940
1010 return NOCHAR; 941 return NOCHAR;
1011} 942}
1012 943
1013/* rxvt_cmd_getc() - Return next input character */ 944/* rxvt_cmd_getc () - Return next input character */
1014/* 945/*
1015 * Return the next input character after first passing any keyboard input 946 * Return the next input character after first passing any keyboard input
1016 * to the command. 947 * to the command.
1017 */ 948 */
1018uint32_t 949uint32_t
… …
1034 965
1035#ifdef POINTER_BLANK 966#ifdef POINTER_BLANK
1036void 967void
1037rxvt_term::pointer_unblank () 968rxvt_term::pointer_unblank ()
1038{ 969{
1039 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 970 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1040 recolour_cursor (); 971 recolour_cursor ();
1041 972
1042 hidden_pointer = 0; 973 hidden_pointer = 0;
1043 974
1044 if (Options & Opt_pointerBlank) 975 if (Options & Opt_pointerBlank)
… …
1046} 977}
1047 978
1048void 979void
1049rxvt_term::pointer_blank () 980rxvt_term::pointer_blank ()
1050{ 981{
1051 if (!(Options & Opt_pointerBlank)) 982 if (! (Options & Opt_pointerBlank))
1052 return; 983 return;
1053 984
1054 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 985 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1055 XFlush (Xdisplay); 986 XFlush (display->display);
1056 987
1057 hidden_pointer = 1; 988 hidden_pointer = 1;
1058} 989}
1059 990
1060void 991void
… …
1066 pointer_blank (); 997 pointer_blank ();
1067} 998}
1068#endif 999#endif
1069 1000
1070void 1001void
1071rxvt_term::mouse_report (const XButtonEvent *ev) 1002rxvt_term::mouse_report (const XButtonEvent &ev)
1072{ 1003{
1073 int button_number, key_state = 0; 1004 int button_number, key_state = 0;
1074 int x, y; 1005 int x, y;
1075 1006
1076 x = ev->x; 1007 x = ev.x;
1077 y = ev->y; 1008 y = ev.y;
1078 pixel_position (&x, &y); 1009 pixel_position (&x, &y);
1079 1010
1080 if (MEvent.button == AnyButton) 1011 if (MEvent.button == AnyButton)
1081 { 1012 {
1082 button_number = 3; 1013 button_number = 3;
… …
1116#endif 1047#endif
1117 1048
1118 } 1049 }
1119 1050
1120#ifdef DEBUG_MOUSEREPORT 1051#ifdef DEBUG_MOUSEREPORT
1121 fprintf(stderr, "Mouse ["); 1052 fprintf (stderr, "Mouse [");
1122 if (key_state & 16) 1053 if (key_state & 16)
1123 fputc('C', stderr); 1054 fputc ('C', stderr);
1124 if (key_state & 4) 1055 if (key_state & 4)
1125 fputc('S', stderr); 1056 fputc ('S', stderr);
1126 if (key_state & 8) 1057 if (key_state & 8)
1127 fputc('A', stderr); 1058 fputc ('A', stderr);
1128 if (key_state & 32) 1059 if (key_state & 32)
1129 fputc('2', stderr); 1060 fputc ('2', stderr);
1130 fprintf(stderr, "]: <%d>, %d/%d\n", 1061 fprintf (stderr, "]: <%d>, %d/%d\n",
1131 button_number, 1062 button_number,
1132 x + 1, 1063 x + 1,
1133 y + 1); 1064 y + 1);
1134#else 1065#else
1135 tt_printf("\033[M%c%c%c", 1066 tt_printf ("\033[M%c%c%c",
1136 (32 + button_number + key_state), 1067 (32 + button_number + key_state),
1137 (32 + x + 1), 1068 (32 + x + 1),
1138 (32 + y + 1)); 1069 (32 + y + 1));
1139#endif 1070#endif
1140} 1071}
1141 1072
1142#ifdef USING_W11LIB 1073#ifdef USING_W11LIB
1143void 1074void
1144rxvt_W11_process_x_event(XEvent *ev) 1075rxvt_W11_process_x_event (XEvent *ev)
1145{ 1076{
1146 rxvt_t *r = rxvt_get_r(); 1077 rxvt_t *r = rxvt_get_r ();
1147 1078
1148 process_x_event (ev); 1079 x_cb (*ev);
1149} 1080}
1150#endif 1081#endif
1151 1082
1152/*{{{ process an X event */ 1083/*{{{ process an X event */
1153void 1084void
1154rxvt_term::process_x_event (XEvent *ev) 1085rxvt_term::x_cb (XEvent &ev)
1155{ 1086{
1087 SET_R (this);
1088 SET_LOCALE (locale);
1089
1090#if defined(CURSOR_BLINK)
1091 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1092 {
1093 if (hidden_cursor)
1094 {
1095 hidden_cursor = 0;
1096 want_refresh = 1;
1097 }
1098
1099 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1100 }
1101#endif
1102
1103#if defined(POINTER_BLANK)
1104 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1105 {
1106 if (ev.type == MotionNotify
1107 || ev.type == ButtonPress
1108 || ev.type == ButtonRelease)
1109 if (hidden_pointer)
1110 pointer_unblank ();
1111
1112 if (ev.type == KeyPress && hidden_pointer == 0)
1113 pointer_blank ();
1114 }
1115#endif
1116
1117#ifdef USE_XIM
1118 if (XFilterEvent (&ev, None))
1119 return;
1120#endif
1121
1156 Window unused_root, unused_child; 1122 Window unused_root, unused_child;
1157 int unused_root_x, unused_root_y; 1123 int unused_root_x, unused_root_y;
1158 unsigned int unused_mask; 1124 unsigned int unused_mask;
1159 1125
1160#ifdef DEBUG_X 1126#ifdef DEBUG_X
… …
1199#endif 1165#endif
1200 1166
1201#ifdef DEBUG_X 1167#ifdef DEBUG_X
1202 struct timeval tp; 1168 struct timeval tp;
1203 struct tm *ltt; 1169 struct tm *ltt;
1204 (void)gettimeofday(&tp, NULL); 1170 (void)gettimeofday (&tp, NULL);
1205 ltt = localtime(&(tp.tv_sec)); 1171 ltt = localtime (& (tp.tv_sec));
1206 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)); 1172 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));
1207#endif 1173#endif
1208 1174
1209 switch (ev->type) 1175 switch (ev.type)
1210 { 1176 {
1211 case KeyPress: 1177 case KeyPress:
1212 lookup_key ((XKeyEvent *)ev); 1178 lookup_key (ev.xkey);
1213 break; 1179 break;
1214 1180
1215#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1181#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1216 case KeyRelease: 1182 case KeyRelease:
1217 { 1183 {
1218 if (!(ev->xkey.state & ControlMask)) 1184 if (! (ev.xkey.state & ControlMask))
1219 mouse_slip_wheel_speed = 0; 1185 mouse_slip_wheel_speed = 0;
1220 else 1186 else
1221 { 1187 {
1222 KeySym ks; 1188 KeySym ks;
1223 1189
1224 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0); 1190 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1225 if (ks == XK_Control_L || ks == XK_Control_R) 1191 if (ks == XK_Control_L || ks == XK_Control_R)
1226 mouse_slip_wheel_speed = 0; 1192 mouse_slip_wheel_speed = 0;
1227 } 1193 }
1228 break; 1194 break;
1229 } 1195 }
1230#endif 1196#endif
1231 1197
1232 case ButtonPress: 1198 case ButtonPress:
1233 button_press ((XButtonEvent *)ev); 1199 button_press (ev.xbutton);
1234 break; 1200 break;
1235 1201
1236 case ButtonRelease: 1202 case ButtonRelease:
1237 button_release ((XButtonEvent *)ev); 1203 button_release (ev.xbutton);
1238 break; 1204 break;
1239 1205
1240 case ClientMessage: 1206 case ClientMessage:
1241 if (ev->xclient.format == 32 1207 if (ev.xclient.format == 32
1242 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1208 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1243 destroy (); 1209 destroy ();
1244#ifdef OFFIX_DND 1210#ifdef OFFIX_DND
1245 /* OffiX Dnd (drag 'n' drop) protocol */ 1211 /* OffiX Dnd (drag 'n' drop) protocol */
1246 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] 1212 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1247 && (ev->xclient.data.l[0] == DndFile 1213 && (ev.xclient.data.l[0] == DndFile
1248 || ev->xclient.data.l[0] == DndDir 1214 || ev.xclient.data.l[0] == DndDir
1249 || ev->xclient.data.l[0] == DndLink)) 1215 || ev.xclient.data.l[0] == DndLink))
1250 { 1216 {
1251 /* Get Dnd data */ 1217 /* Get Dnd data */
1252 Atom ActualType; 1218 Atom ActualType;
1253 int ActualFormat; 1219 int ActualFormat;
1254 unsigned char *data; 1220 unsigned char *data;
1255 unsigned long Size, RemainingBytes; 1221 unsigned long Size, RemainingBytes;
1256 1222
1257 XGetWindowProperty(Xdisplay, Xroot, 1223 XGetWindowProperty (display->display, display->root,
1258 xa[XA_DNDSELECTION], 1224 xa[XA_DNDSELECTION],
1259 0L, 1000000L, 1225 0L, 1000000L,
1260 False, AnyPropertyType, 1226 False, AnyPropertyType,
1261 &ActualType, &ActualFormat, 1227 &ActualType, &ActualFormat,
1262 &Size, &RemainingBytes, 1228 &Size, &RemainingBytes,
1263 &data); 1229 &data);
1264 XChangeProperty(Xdisplay, Xroot, 1230 XChangeProperty (display->display, display->root,
1265 XA_CUT_BUFFER0, XA_STRING, 1231 XA_CUT_BUFFER0, XA_STRING,
1266 8, PropModeReplace, 1232 8, PropModeReplace,
1267 data, STRLEN(data)); 1233 data, STRLEN (data));
1268 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1234 selection_paste (display->root, XA_CUT_BUFFER0, True);
1269 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1235 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1270 } 1236 }
1271#endif /* OFFIX_DND */ 1237#endif /* OFFIX_DND */
1272 break; 1238 break;
1273 1239
1274 case MappingNotify: 1240 case MappingNotify:
1275 XRefreshKeyboardMapping(&(ev->xmapping)); 1241 XRefreshKeyboardMapping (& (ev.xmapping));
1276 break; 1242 break;
1277 1243
1278 /* 1244 /*
1279 * XXX: this is not the _current_ arrangement 1245 * XXX: this is not the _current_ arrangement
1280 * Here's my conclusion: 1246 * Here's my conclusion:
… …
1284 * in the GraphicsExpose parts, which means that after each refresh, 1250 * in the GraphicsExpose parts, which means that after each refresh,
1285 * we need to wait for the graphics expose or Noexpose events, 1251 * we need to wait for the graphics expose or Noexpose events,
1286 * which ought to make things real slow! 1252 * which ought to make things real slow!
1287 */ 1253 */
1288 case VisibilityNotify: 1254 case VisibilityNotify:
1289 switch (ev->xvisibility.state) 1255 switch (ev.xvisibility.state)
1290 { 1256 {
1291 case VisibilityUnobscured: 1257 case VisibilityUnobscured:
1292 refresh_type = FAST_REFRESH; 1258 refresh_type = FAST_REFRESH;
1293 break; 1259 break;
1294 case VisibilityPartiallyObscured: 1260 case VisibilityPartiallyObscured:
… …
1305 { 1271 {
1306 TermWin.focus = 1; 1272 TermWin.focus = 1;
1307 want_refresh = 1; 1273 want_refresh = 1;
1308#ifdef USE_XIM 1274#ifdef USE_XIM
1309 if (Input_Context != NULL) 1275 if (Input_Context != NULL)
1310 XSetICFocus(Input_Context); 1276 XSetICFocus (Input_Context);
1311#endif 1277#endif
1312#ifdef CURSOR_BLINK 1278#ifdef CURSOR_BLINK
1313 if (Options & Opt_cursorBlink) 1279 if (Options & Opt_cursorBlink)
1314 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1280 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1315#endif 1281#endif
… …
1322 { 1288 {
1323 TermWin.focus = 0; 1289 TermWin.focus = 0;
1324 want_refresh = 1; 1290 want_refresh = 1;
1325#ifdef USE_XIM 1291#ifdef USE_XIM
1326 if (Input_Context != NULL) 1292 if (Input_Context != NULL)
1327 XUnsetICFocus(Input_Context); 1293 XUnsetICFocus (Input_Context);
1328#endif 1294#endif
1329#ifdef CURSOR_BLINK 1295#ifdef CURSOR_BLINK
1330 if (Options & Opt_cursorBlink) 1296 if (Options & Opt_cursorBlink)
1331 cursor_blink_ev.stop (); 1297 cursor_blink_ev.stop ();
1332 hidden_cursor = 0; 1298 hidden_cursor = 0;
… …
1334 1300
1335 } 1301 }
1336 break; 1302 break;
1337 1303
1338 case ConfigureNotify: 1304 case ConfigureNotify:
1339 if (ev->xconfigure.window == TermWin.parent[0]) 1305 if (ev.xconfigure.window == TermWin.parent[0])
1340 { 1306 {
1341 int height, width; 1307 int height, width;
1342 1308
1343 do 1309 do
1344 { /* Wrap lots of configures into one */ 1310 { /* Wrap lots of configures into one */
1345 width = ev->xconfigure.width; 1311 width = ev.xconfigure.width;
1346 height = ev->xconfigure.height; 1312 height = ev.xconfigure.height;
1347 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1313 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1348 } 1314 }
1349 while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window, 1315 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1350 ConfigureNotify, ev)); 1316
1351 if (szHint.width != width || szHint.height != height) 1317 if (szHint.width != width || szHint.height != height)
1352 { 1318 {
1353 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1319 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1354 resize_all_windows (width, height, 1); 1320 resize_all_windows (width, height, 1);
1355 } 1321 }
1356#ifdef DEBUG_SIZE 1322#ifdef DEBUG_SIZE
1357 else 1323 else
1358 { 1324 {
1359 D_SIZE((stderr, "Size: Not resizing")); 1325 D_SIZE ((stderr, "Size: Not resizing"));
1360 } 1326 }
1361#endif 1327#endif
1362#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1328#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1363 if (Options & Opt_transparent) 1329 if (Options & Opt_transparent)
1364 { 1330 {
… …
1370 1336
1371 } 1337 }
1372 break; 1338 break;
1373 1339
1374 case SelectionClear: 1340 case SelectionClear:
1375 selection_clear (); 1341 display->set_selection_owner (0);
1376 break; 1342 break;
1377 1343
1378 case SelectionNotify: 1344 case SelectionNotify:
1379 if (selection_wait == Sel_normal) 1345 if (selection_wait == Sel_normal)
1380 selection_paste (ev->xselection.requestor, 1346 selection_paste (ev.xselection.requestor,
1381 ev->xselection.property, True); 1347 ev.xselection.property, True);
1382 break; 1348 break;
1383 1349
1384 case SelectionRequest: 1350 case SelectionRequest:
1385 selection_send (&(ev->xselectionrequest)); 1351 selection_send (ev.xselectionrequest);
1386 break; 1352 break;
1387 1353
1388 case UnmapNotify: 1354 case UnmapNotify:
1389 TermWin.mapped = 0; 1355 TermWin.mapped = 0;
1390#ifdef TEXT_BLINK 1356#ifdef TEXT_BLINK
… …
1397#ifdef TEXT_BLINK 1363#ifdef TEXT_BLINK
1398 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1364 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1399#endif 1365#endif
1400 break; 1366 break;
1401 1367
1402 case PropertyNotify:
1403 if (ev->xproperty.atom == xa[XA_VT_SELECTION])
1404 {
1405 if (ev->xproperty.state == PropertyNewValue)
1406 selection_property (ev->xproperty.window,
1407 ev->xproperty.atom);
1408 break;
1409 }
1410#ifdef TRANSPARENT 1368#ifdef TRANSPARENT
1411 /*
1412 * if user used some Esetroot compatible prog to set the root bg,
1413 * use the property to determine the pixmap. We use it later on.
1414 */
1415 if (xa[XA_XROOTPMAPID] == 0)
1416 xa[XA_XROOTPMAPID] = XInternAtom(Xdisplay,
1417 "_XROOTPMAP_ID", False);
1418 if (ev->xproperty.atom != xa[XA_XROOTPMAPID])
1419 break;
1420 /* FALLTHROUGH */
1421 case ReparentNotify: 1369 case ReparentNotify:
1422 if ((Options & Opt_transparent) && check_our_parents ()) 1370 rootwin_cb (ev);
1423 { 1371 break;
1424 if (am_transparent)
1425 want_full_refresh = 1;
1426 }
1427#endif /* TRANSPARENT */ 1372#endif /* TRANSPARENT */
1428 break;
1429 1373
1430 case GraphicsExpose: 1374 case GraphicsExpose:
1431 case Expose: 1375 case Expose:
1432 if (ev->xany.window == TermWin.vt) 1376 if (ev.xany.window == TermWin.vt)
1433 { 1377 {
1434#ifdef NO_SLOW_LINK_SUPPORT 1378#ifdef NO_SLOW_LINK_SUPPORT
1435 scr_expose (ev->xexpose.x, ev->xexpose.y, 1379 scr_expose (ev.xexpose.x, ev.xexpose.y,
1436 ev->xexpose.width, ev->xexpose.height, False); 1380 ev.xexpose.width, ev.xexpose.height, False);
1437#else 1381#else
1438 // don't understand this, so commented it out 1382 // don't understand this, so commented it out
1439 scr_expose (ev->xexpose.x, ev->xexpose.y, 1383 scr_expose (ev.xexpose.x, ev.xexpose.y,
1440 ev->xexpose.width, ev->xexpose.height, False); 1384 ev.xexpose.width, ev.xexpose.height, False);
1441 //scr_expose (ev->xexpose.x, 0, 1385 //scr_expose (ev.xexpose.x, 0,
1442 // ev->xexpose.width, TermWin.height, False); 1386 // ev.xexpose.width, TermWin.height, False);
1443#endif 1387#endif
1444 want_refresh = 1; 1388 want_refresh = 1;
1445 } 1389 }
1446 else 1390 else
1447 { 1391 {
1448 XEvent unused_xevent; 1392 XEvent unused_event;
1449 1393
1450 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1394 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1451 Expose, 1395 Expose,
1452 &unused_xevent)) ; 1396 &unused_event)) ;
1453 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1397 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1454 GraphicsExpose, 1398 GraphicsExpose,
1455 &unused_xevent)) ; 1399 &unused_event)) ;
1456 if (isScrollbarWindow(ev->xany.window)) 1400 if (isScrollbarWindow (ev.xany.window))
1457 { 1401 {
1458 scrollBar.setIdle(); 1402 scrollBar.setIdle ();
1459 scrollbar_show (0); 1403 scrollbar_show (0);
1460 } 1404 }
1461#ifdef MENUBAR 1405#ifdef MENUBAR
1462 if (menubar_visible () && isMenuBarWindow(ev->xany.window)) 1406 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1463 menubar_expose (); 1407 menubar_expose ();
1464#endif 1408#endif
1465#ifdef RXVT_GRAPHICS
1466 Gr_expose (ev->xany.window);
1467#endif
1468
1469 } 1409 }
1470 break; 1410 break;
1471 1411
1472 case MotionNotify: 1412 case MotionNotify:
1473#ifdef POINTER_BLANK 1413#ifdef POINTER_BLANK
1474 if (hidden_pointer) 1414 if (hidden_pointer)
1475 pointer_unblank (); 1415 pointer_unblank ();
1476#endif 1416#endif
1477#if MENUBAR 1417#if MENUBAR
1478 if (isMenuBarWindow(ev->xany.window)) 1418 if (isMenuBarWindow (ev.xany.window))
1479 { 1419 {
1480 menubar_control (&(ev->xbutton)); 1420 menubar_control (& (ev.xbutton));
1481 break; 1421 break;
1482 } 1422 }
1483#endif 1423#endif
1484 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1424 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1485 break; 1425 break;
1486 1426
1487 if (ev->xany.window == TermWin.vt) 1427 if (ev.xany.window == TermWin.vt)
1488 { 1428 {
1489 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) 1429 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1490 { 1430 {
1491 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1431 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1492 MotionNotify, ev)) ; 1432 ;
1433
1493 XQueryPointer(Xdisplay, TermWin.vt, 1434 XQueryPointer (display->display, TermWin.vt,
1494 &unused_root, &unused_child, 1435 &unused_root, &unused_child,
1495 &unused_root_x, &unused_root_y, 1436 &unused_root_x, &unused_root_y,
1496 &(ev->xbutton.x), &(ev->xbutton.y), 1437 & (ev.xbutton.x), & (ev.xbutton.y),
1497 &unused_mask); 1438 &unused_mask);
1498#ifdef MOUSE_THRESHOLD 1439#ifdef MOUSE_THRESHOLD
1499 /* deal with a `jumpy' mouse */ 1440 /* deal with a `jumpy' mouse */
1500 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1441 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1501 { 1442 {
1502#endif 1443#endif
1503 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1444 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1504 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1445 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1505#ifdef SELECTION_SCROLLING 1446#ifdef SELECTION_SCROLLING
1506 if (ev->xbutton.y < TermWin.int_bwidth 1447 if (ev.xbutton.y < TermWin.int_bwidth
1507 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) 1448 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1508 { 1449 {
1509 int dist; 1450 int dist;
1510 1451
1511 pending_scroll_selection=1; 1452 pending_scroll_selection=1;
1512 1453
… …
1517 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1458 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1518 1459
1519 /* save the event params so we can highlight 1460 /* save the event params so we can highlight
1520 * the selection in the pending-scroll loop 1461 * the selection in the pending-scroll loop
1521 */ 1462 */
1522 selection_save_x=ev->xbutton.x; 1463 selection_save_x=ev.xbutton.x;
1523 selection_save_y=ev->xbutton.y; 1464 selection_save_y=ev.xbutton.y;
1524 selection_save_state= 1465 selection_save_state=
1525 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1466 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1526 1467
1527 /* calc number of lines to scroll */ 1468 /* calc number of lines to scroll */
1528 if (ev->xbutton.y<TermWin.int_bwidth) 1469 if (ev.xbutton.y<TermWin.int_bwidth)
1529 { 1470 {
1530 scroll_selection_dir = UP; 1471 scroll_selection_dir = UP;
1531 dist = TermWin.int_bwidth - ev->xbutton.y; 1472 dist = TermWin.int_bwidth - ev.xbutton.y;
1532 } 1473 }
1533 else 1474 else
1534 { 1475 {
1535 scroll_selection_dir = DN; 1476 scroll_selection_dir = DN;
1536 dist = ev->xbutton.y - 1477 dist = ev.xbutton.y -
1537 (TermWin.int_bwidth + TermWin.height); 1478 (TermWin.int_bwidth + TermWin.height);
1538 } 1479 }
1539 scroll_selection_lines=(Pixel2Height(dist)/ 1480 scroll_selection_lines= (Pixel2Height (dist)/
1540 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1481 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1541 MIN_IT(scroll_selection_lines, 1482 MIN_IT (scroll_selection_lines,
1542 SELECTION_SCROLL_MAX_LINES); 1483 SELECTION_SCROLL_MAX_LINES);
1543 } 1484 }
1544 else 1485 else
1545 { 1486 {
1546 /* we are within the text window, so we 1487 /* we are within the text window, so we
… …
1554 } 1495 }
1555#endif 1496#endif
1556 1497
1557 } 1498 }
1558 } 1499 }
1559 else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) 1500 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1560 { 1501 {
1561 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win, 1502 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1562 MotionNotify, ev)) ; 1503 MotionNotify, &ev)) ;
1563 XQueryPointer(Xdisplay, scrollBar.win, 1504 XQueryPointer (display->display, scrollBar.win,
1564 &unused_root, &unused_child, 1505 &unused_root, &unused_child,
1565 &unused_root_x, &unused_root_y, 1506 &unused_root_x, &unused_root_y,
1566 &(ev->xbutton.x), &(ev->xbutton.y), 1507 & (ev.xbutton.x), & (ev.xbutton.y),
1567 &unused_mask); 1508 &unused_mask);
1568 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO, 1509 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1569 scrollbar_size()); 1510 scrollbar_size ());
1570 scr_refresh (refresh_type); 1511 scr_refresh (refresh_type);
1571 refresh_limit = 0; 1512 refresh_limit = 0;
1572 scrollbar_show (1); 1513 scrollbar_show (1);
1573 } 1514 }
1574 break; 1515 break;
1575 } 1516 }
1576} 1517}
1577 1518
1578void 1519void
1520rxvt_term::rootwin_cb (XEvent &ev)
1521{
1522 SET_R (this);
1523 SET_LOCALE (locale);
1524
1525 switch (ev.type)
1526 {
1527 case PropertyNotify:
1528 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1529 {
1530 if (ev.xproperty.state == PropertyNewValue)
1531 selection_property (ev.xproperty.window, ev.xproperty.atom);
1532 break;
1533 }
1534#ifdef TRANSPARENT
1535 else
1536 {
1537 /*
1538 * if user used some Esetroot compatible prog to set the root bg,
1539 * use the property to determine the pixmap. We use it later on.
1540 */
1541 if (xa[XA_XROOTPMAPID] == 0)
1542 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1543
1544 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1545 return;
1546 }
1547
1548 /* FALLTHROUGH */
1549 case ReparentNotify:
1550 if ((Options & Opt_transparent) && check_our_parents ())
1551 if (am_transparent)
1552 want_full_refresh = 1;
1553 break;
1554#endif
1555 }
1556}
1557
1558void
1579rxvt_term::button_press (XButtonEvent *ev) 1559rxvt_term::button_press (const XButtonEvent &ev)
1580{ 1560{
1581 int reportmode = 0, clickintime; 1561 int reportmode = 0, clickintime;
1582 1562
1583 bypass_keystate = ev->state & (ModMetaMask | ShiftMask); 1563 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1584 if (!bypass_keystate) 1564 if (!bypass_keystate)
1585 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1565 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1586 /* 1566 /*
1587 * VT window processing of button press 1567 * VT window processing of button press
1588 */ 1568 */
1589 if (ev->window == TermWin.vt) 1569 if (ev.window == TermWin.vt)
1590 { 1570 {
1591#if RXVT_GRAPHICS
1592 if (ev->subwindow != None)
1593 rxvt_Gr_ButtonPress (ev->x, ev->y);
1594 else
1595#endif
1596
1597 {
1598 clickintime = ev->time - MEvent.time < MULTICLICK_TIME; 1571 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1599 if (reportmode) 1572 if (reportmode)
1573 {
1574 /* mouse report from vt window */
1575 /* save the xbutton state (for ButtonRelease) */
1576 MEvent.state = ev.state;
1577#ifdef MOUSE_REPORT_DOUBLECLICK
1578 if (ev.button == MEvent.button && clickintime)
1600 { 1579 {
1601 /* mouse report from vt window */ 1580 /* same button, within alloted time */
1602 /* save the xbutton state (for ButtonRelease) */ 1581 MEvent.clicks++;
1603 MEvent.state = ev->state; 1582 if (MEvent.clicks > 1)
1604#ifdef MOUSE_REPORT_DOUBLECLICK
1605 if (ev->button == MEvent.button && clickintime)
1606 { 1583 {
1607 /* same button, within alloted time */
1608 MEvent.clicks++;
1609 if (MEvent.clicks > 1)
1610 {
1611 /* only report double clicks */ 1584 /* only report double clicks */
1612 MEvent.clicks = 2; 1585 MEvent.clicks = 2;
1613 mouse_report (ev); 1586 mouse_report (ev);
1614 1587
1615 /* don't report the release */ 1588 /* don't report the release */
1616 MEvent.clicks = 0; 1589 MEvent.clicks = 0;
1617 MEvent.button = AnyButton; 1590 MEvent.button = AnyButton;
1618 }
1619 } 1591 }
1620 else
1621 {
1622 /* different button, or time expired */
1623 MEvent.clicks = 1;
1624 MEvent.button = ev->button;
1625 mouse_report (ev);
1626 }
1627#else
1628 MEvent.button = ev->button;
1629 mouse_report (ev);
1630#endif /* MOUSE_REPORT_DOUBLECLICK */
1631
1632 } 1592 }
1633 else 1593 else
1634 { 1594 {
1635 if (ev->button != MEvent.button) 1595 /* different button, or time expired */
1636 MEvent.clicks = 0; 1596 MEvent.clicks = 1;
1597 MEvent.button = ev.button;
1598 mouse_report (ev);
1599 }
1600#else
1601 MEvent.button = ev.button;
1602 mouse_report (ev);
1603#endif /* MOUSE_REPORT_DOUBLECLICK */
1604
1605 }
1606 else
1607 {
1608 if (ev.button != MEvent.button)
1609 MEvent.clicks = 0;
1637 switch (ev->button) 1610 switch (ev.button)
1638 { 1611 {
1639 case Button1: 1612 case Button1:
1640 /* allow shift+left click to extend selection */ 1613 /* allow shift+left click to extend selection */
1641 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1614 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1642 { 1615 {
1643 if (MEvent.button == Button1 && clickintime) 1616 if (MEvent.button == Button1 && clickintime)
1644 selection_rotate (ev->x, ev->y); 1617 selection_rotate (ev.x, ev.y);
1645 else
1646 selection_extend (ev->x, ev->y, 1);
1647 }
1648 else 1618 else
1649 { 1619 selection_extend (ev.x, ev.y, 1);
1650 if (MEvent.button == Button1 && clickintime)
1651 MEvent.clicks++;
1652 else
1653 MEvent.clicks = 1;
1654
1655 selection_click (MEvent.clicks, ev->x, ev->y);
1656 } 1620 }
1657 1621 else
1658 MEvent.button = Button1;
1659 break; 1622 {
1660
1661 case Button3:
1662 if (MEvent.button == Button3 && clickintime) 1623 if (MEvent.button == Button1 && clickintime)
1663 selection_rotate (ev->x, ev->y); 1624 MEvent.clicks++;
1664 else 1625 else
1626 MEvent.clicks = 1;
1627
1628 selection_click (MEvent.clicks, ev.x, ev.y);
1629 }
1630
1631 MEvent.button = Button1;
1632 break;
1633
1634 case Button3:
1635 if (MEvent.button == Button3 && clickintime)
1636 selection_rotate (ev.x, ev.y);
1637 else
1665 selection_extend (ev->x, ev->y, 1); 1638 selection_extend (ev.x, ev.y, 1);
1666 MEvent.button = Button3; 1639 MEvent.button = Button3;
1667 break; 1640 break;
1668 }
1669 } 1641 }
1642 }
1670 MEvent.time = ev->time; 1643 MEvent.time = ev.time;
1671 return; 1644 return;
1672 }
1673 } 1645 }
1674 1646
1675 /* 1647 /*
1676 * Scrollbar window processing of button press 1648 * Scrollbar window processing of button press
1677 */ 1649 */
1678 if (isScrollbarWindow(ev->window)) 1650 if (isScrollbarWindow (ev.window))
1679 { 1651 {
1680 scrollBar.setIdle (); 1652 scrollBar.setIdle ();
1681 /* 1653 /*
1682 * Rxvt-style scrollbar: 1654 * Rxvt-style scrollbar:
1683 * move up if mouse is above slider 1655 * move up if mouse is above slider
… …
1695 * Mouse report disabled scrollbar: 1667 * Mouse report disabled scrollbar:
1696 * arrow buttons - send up/down 1668 * arrow buttons - send up/down
1697 * click on scrollbar - send pageup/down 1669 * click on scrollbar - send pageup/down
1698 */ 1670 */
1699 if ((scrollBar.style == R_SB_NEXT 1671 if ((scrollBar.style == R_SB_NEXT
1700 && scrollbarnext_upButton(ev->y)) 1672 && scrollbarnext_upButton (ev.y))
1701 || (scrollBar.style == R_SB_RXVT 1673 || (scrollBar.style == R_SB_RXVT
1702 && scrollbarrxvt_upButton(ev->y))) 1674 && scrollbarrxvt_upButton (ev.y)))
1703 tt_printf("\033[A"); 1675 tt_printf ("\033[A");
1704 else if ((scrollBar.style == R_SB_NEXT 1676 else if ((scrollBar.style == R_SB_NEXT
1705 && scrollbarnext_dnButton(ev->y)) 1677 && scrollbarnext_dnButton (ev.y))
1706 || (scrollBar.style == R_SB_RXVT 1678 || (scrollBar.style == R_SB_RXVT
1707 && scrollbarrxvt_dnButton(ev->y))) 1679 && scrollbarrxvt_dnButton (ev.y)))
1708 tt_printf("\033[B"); 1680 tt_printf ("\033[B");
1709 else 1681 else
1710 switch (ev->button) 1682 switch (ev.button)
1711 { 1683 {
1712 case Button2: 1684 case Button2:
1713 tt_printf("\014"); 1685 tt_printf ("\014");
1714 break; 1686 break;
1715 case Button1: 1687 case Button1:
1716 tt_printf("\033[6~"); 1688 tt_printf ("\033[6~");
1717 break; 1689 break;
1718 case Button3: 1690 case Button3:
1719 tt_printf("\033[5~"); 1691 tt_printf ("\033[5~");
1720 break; 1692 break;
1721 } 1693 }
1722 } 1694 }
1723 else 1695 else
1724#endif /* NO_SCROLLBAR_REPORT */ 1696#endif /* NO_SCROLLBAR_REPORT */
… …
1726 { 1698 {
1727 char upordown = 0; 1699 char upordown = 0;
1728 1700
1729 if (scrollBar.style == R_SB_NEXT) 1701 if (scrollBar.style == R_SB_NEXT)
1730 { 1702 {
1731 if (scrollbarnext_upButton(ev->y)) 1703 if (scrollbarnext_upButton (ev.y))
1732 upordown = -1; /* up */ 1704 upordown = -1; /* up */
1733 else if (scrollbarnext_dnButton(ev->y)) 1705 else if (scrollbarnext_dnButton (ev.y))
1734 upordown = 1; /* down */ 1706 upordown = 1; /* down */
1735 } 1707 }
1736 else if (scrollBar.style == R_SB_RXVT) 1708 else if (scrollBar.style == R_SB_RXVT)
1737 { 1709 {
1738 if (scrollbarrxvt_upButton(ev->y)) 1710 if (scrollbarrxvt_upButton (ev.y))
1739 upordown = -1; /* up */ 1711 upordown = -1; /* up */
1740 else if (scrollbarrxvt_dnButton(ev->y)) 1712 else if (scrollbarrxvt_dnButton (ev.y))
1741 upordown = 1; /* down */ 1713 upordown = 1; /* down */
1742 } 1714 }
1743 if (upordown) 1715 if (upordown)
1744 { 1716 {
1745#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1717#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
… …
1752 else 1724 else
1753 scrollBar.setDn (); 1725 scrollBar.setDn ();
1754 } 1726 }
1755 } 1727 }
1756 else 1728 else
1757 switch (ev->button) 1729 switch (ev.button)
1758 { 1730 {
1759 case Button2: 1731 case Button2:
1760 switch (scrollbar_align) 1732 switch (scrollbar_align)
1761 { 1733 {
1762 case R_SB_ALIGN_TOP: 1734 case R_SB_ALIGN_TOP:
… …
1768 case R_SB_ALIGN_BOTTOM: 1740 case R_SB_ALIGN_BOTTOM:
1769 csrO = scrollBar.bot - scrollBar.top; 1741 csrO = scrollBar.bot - scrollBar.top;
1770 break; 1742 break;
1771 } 1743 }
1772 if (scrollBar.style == R_SB_XTERM 1744 if (scrollBar.style == R_SB_XTERM
1773 || scrollbar_above_slider(ev->y) 1745 || scrollbar_above_slider (ev.y)
1774 || scrollbar_below_slider(ev->y)) 1746 || scrollbar_below_slider (ev.y))
1775 scr_move_to ( scrollbar_position(ev->y) - csrO, 1747 scr_move_to ( scrollbar_position (ev.y) - csrO,
1776 scrollbar_size()); 1748 scrollbar_size ());
1777 scrollBar.setMotion (); 1749 scrollBar.setMotion ();
1778 break; 1750 break;
1779 1751
1780 case Button1: 1752 case Button1:
1781 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1753 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1782 csrO = ev->y - scrollBar.top; 1754 csrO = ev.y - scrollBar.top;
1783 /* FALLTHROUGH */ 1755 /* FALLTHROUGH */
1784 1756
1785 case Button3: 1757 case Button3:
1786 if (scrollBar.style != R_SB_XTERM) 1758 if (scrollBar.style != R_SB_XTERM)
1787 { 1759 {
1788 if (scrollbar_above_slider(ev->y)) 1760 if (scrollbar_above_slider (ev.y))
1789# ifdef RXVT_SCROLL_FULL 1761# ifdef RXVT_SCROLL_FULL
1790 scr_page (UP, TermWin.nrow - 1); 1762 scr_page (UP, TermWin.nrow - 1);
1791# else 1763# else
1792 scr_page (UP, TermWin.nrow / 4); 1764 scr_page (UP, TermWin.nrow / 4);
1793# endif 1765# endif
1794 else if (scrollbar_below_slider(ev->y)) 1766 else if (scrollbar_below_slider (ev.y))
1795# ifdef RXVT_SCROLL_FULL 1767# ifdef RXVT_SCROLL_FULL
1796 scr_page (DN, TermWin.nrow - 1); 1768 scr_page (DN, TermWin.nrow - 1);
1797# else 1769# else
1798 scr_page (DN, TermWin.nrow / 4); 1770 scr_page (DN, TermWin.nrow / 4);
1799# endif 1771# endif
1800 else 1772 else
1801 scrollBar.setMotion (); 1773 scrollBar.setMotion ();
1802 } 1774 }
1803 else 1775 else
1804 { 1776 {
1805 scr_page ((ev->button == Button1 ? DN : UP), 1777 scr_page ((ev.button == Button1 ? DN : UP),
1806 (TermWin.nrow 1778 (TermWin.nrow
1807 * scrollbar_position(ev->y) 1779 * scrollbar_position (ev.y)
1808 / scrollbar_size())); 1780 / scrollbar_size ()));
1809 } 1781 }
1810 break; 1782 break;
1811 } 1783 }
1812 } 1784 }
1813 return; 1785 return;
1814 } 1786 }
1815#if MENUBAR 1787#if MENUBAR
1816 /* 1788 /*
1817 * Menubar window processing of button press 1789 * Menubar window processing of button press
1818 */ 1790 */
1819 if (isMenuBarWindow(ev->window)) 1791 if (isMenuBarWindow (ev.window))
1820 menubar_control (ev); 1792 menubar_control (ev);
1821#endif 1793#endif
1822} 1794}
1823 1795
1824void 1796void
1825rxvt_term::button_release (XButtonEvent *ev) 1797rxvt_term::button_release (const XButtonEvent &ev)
1826{ 1798{
1827 int reportmode = 0; 1799 int reportmode = 0;
1828 1800
1829 csrO = 0; /* reset csr Offset */ 1801 csrO = 0; /* reset csr Offset */
1830 if (!bypass_keystate) 1802 if (!bypass_keystate)
1831 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1803 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1832 1804
1833 if (scrollbar_isUpDn()) 1805 if (scrollbar_isUpDn ())
1834 { 1806 {
1835 scrollBar.setIdle (); 1807 scrollBar.setIdle ();
1836 scrollbar_show (0); 1808 scrollbar_show (0);
1837#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1809#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1838 refresh_type &= ~SMOOTH_REFRESH; 1810 refresh_type &= ~SMOOTH_REFRESH;
… …
1840 1812
1841 } 1813 }
1842#ifdef SELECTION_SCROLLING 1814#ifdef SELECTION_SCROLLING
1843 pending_scroll_selection=0; 1815 pending_scroll_selection=0;
1844#endif 1816#endif
1845 if (ev->window == TermWin.vt) 1817 if (ev.window == TermWin.vt)
1846 { 1818 {
1847#ifdef RXVT_GRAPHICS
1848 if (ev->subwindow != None)
1849 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1850 else
1851#endif
1852
1853 {
1854 if (reportmode) 1819 if (reportmode)
1820 {
1821 /* mouse report from vt window */
1822 /* don't report release of wheel "buttons" */
1823 if (ev.button >= 4)
1824 return;
1825#ifdef MOUSE_REPORT_DOUBLECLICK
1826 /* only report the release of 'slow' single clicks */
1827 if (MEvent.button != AnyButton
1828 && (ev.button != MEvent.button
1829 || (ev.time - MEvent.time
1830 > MULTICLICK_TIME / 2)))
1855 { 1831 {
1856 /* mouse report from vt window */
1857 /* don't report release of wheel "buttons" */
1858 if (ev->button >= 4)
1859 return;
1860#ifdef MOUSE_REPORT_DOUBLECLICK
1861 /* only report the release of 'slow' single clicks */
1862 if (MEvent.button != AnyButton
1863 && (ev->button != MEvent.button
1864 || (ev->time - MEvent.time
1865 > MULTICLICK_TIME / 2)))
1866 {
1867 MEvent.clicks = 0; 1832 MEvent.clicks = 0;
1868 MEvent.button = AnyButton;
1869 mouse_report (ev);
1870 }
1871#else /* MOUSE_REPORT_DOUBLECLICK */
1872 MEvent.button = AnyButton; 1833 MEvent.button = AnyButton;
1873 mouse_report (ev); 1834 mouse_report (ev);
1835 }
1836#else /* MOUSE_REPORT_DOUBLECLICK */
1837 MEvent.button = AnyButton;
1838 mouse_report (ev);
1874#endif /* MOUSE_REPORT_DOUBLECLICK */ 1839#endif /* MOUSE_REPORT_DOUBLECLICK */
1875 return; 1840 return;
1876 } 1841 }
1877 /* 1842 /*
1878 * dumb hack to compensate for the failure of click-and-drag 1843 * dumb hack to compensate for the failure of click-and-drag
1879 * when overriding mouse reporting 1844 * when overriding mouse reporting
1880 */ 1845 */
1881 if (PrivateModes & PrivMode_mouse_report 1846 if (PrivateModes & PrivMode_mouse_report
1882 && bypass_keystate 1847 && bypass_keystate
1883 && ev->button == Button1 && MEvent.clicks <= 1) 1848 && ev.button == Button1 && MEvent.clicks <= 1)
1884 selection_extend (ev->x, ev->y, 0); 1849 selection_extend (ev.x, ev.y, 0);
1885 1850
1886 switch (ev->button) 1851 switch (ev.button)
1852 {
1853 case Button1:
1854 case Button3:
1855 selection_make (ev.time);
1856 break;
1857 case Button2:
1858 selection_request (ev.time, ev.x, ev.y);
1859 break;
1860#ifdef MOUSE_WHEEL
1861 case Button4:
1862 case Button5:
1887 { 1863 {
1888 case Button1: 1864 int i;
1889 case Button3: 1865 page_dirn v;
1890 selection_make (ev->time); 1866
1867 v = (ev.button == Button4) ? UP : DN;
1868 if (ev.state & ShiftMask)
1891 break; 1869 i = 1;
1892 case Button2: 1870 else if ((Options & Opt_mouseWheelScrollPage))
1893 selection_request (ev->time, ev->x, ev->y); 1871 i = TermWin.nrow - 1;
1872 else
1894 break; 1873 i = 5;
1895#ifdef MOUSE_WHEEL 1874# ifdef MOUSE_SLIP_WHEELING
1896 case Button4: 1875 if (ev.state & ControlMask)
1897 case Button5:
1898 { 1876 {
1899 int i;
1900 page_dirn v;
1901
1902 v = (ev->button == Button4) ? UP : DN;
1903 if (ev->state & ShiftMask)
1904 i = 1;
1905 else if ((Options & Opt_mouseWheelScrollPage))
1906 i = TermWin.nrow - 1;
1907 else
1908 i = 5;
1909# ifdef MOUSE_SLIP_WHEELING
1910 if (ev->state & ControlMask)
1911 {
1912 mouse_slip_wheel_speed += (v ? -1 : 1); 1877 mouse_slip_wheel_speed += (v ? -1 : 1);
1913 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1878 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1914 } 1879 }
1915# endif 1880# endif
1916# ifdef JUMP_MOUSE_WHEEL 1881# ifdef JUMP_MOUSE_WHEEL
1882 scr_page (v, i);
1883 scr_refresh (SMOOTH_REFRESH);
1884 scrollbar_show (1);
1885# else
1886 while (i--)
1887 {
1917 scr_page (v, i); 1888 scr_page (v, 1);
1918 scr_refresh (SMOOTH_REFRESH); 1889 scr_refresh (SMOOTH_REFRESH);
1919 scrollbar_show (1); 1890 scrollbar_show (1);
1920# else
1921 while (i--)
1922 {
1923 scr_page (v, 1);
1924 scr_refresh (SMOOTH_REFRESH);
1925 scrollbar_show (1);
1926 } 1891 }
1927# endif 1892# endif
1928 1893
1929 }
1930 break;
1931#endif
1932
1933 } 1894 }
1895 break;
1896#endif
1897
1934 } 1898 }
1935 } 1899 }
1936#ifdef MENUBAR 1900#ifdef MENUBAR
1937 else if (isMenuBarWindow(ev->window)) 1901 else if (isMenuBarWindow (ev.window))
1938 menubar_control (ev); 1902 menubar_control (ev);
1939#endif 1903#endif
1940} 1904}
1941 1905
1942 1906
… …
1956 Pixmap rootpixmap = None; 1920 Pixmap rootpixmap = None;
1957 XWindowAttributes wattr, wrootattr; 1921 XWindowAttributes wattr, wrootattr;
1958 1922
1959 pchanged = 0; 1923 pchanged = 0;
1960 1924
1961 if (!(Options & Opt_transparent)) 1925 if (! (Options & Opt_transparent))
1962 return pchanged; /* Don't try any more */ 1926 return pchanged; /* Don't try any more */
1963 1927
1964 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); 1928 XGetWindowAttributes (display->display, display->root, &wrootattr);
1965 rootdepth = wrootattr.depth; 1929 rootdepth = wrootattr.depth;
1966 1930
1967 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 1931 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1968 if (rootdepth != wattr.depth) 1932 if (rootdepth != wattr.depth)
1969 { 1933 {
1970 if (am_transparent) 1934 if (am_transparent)
1971 { 1935 {
1972 pchanged = 1; 1936 pchanged = 1;
1973 XSetWindowBackground(Xdisplay, TermWin.vt, 1937 XSetWindowBackground (display->display, TermWin.vt,
1974 PixColors[Color_bg]); 1938 PixColors[Color_bg]);
1975 am_transparent = am_pixmap_trans = 0; 1939 am_transparent = am_pixmap_trans = 0;
1976 } 1940 }
1977 return pchanged; /* Don't try any more */ 1941 return pchanged; /* Don't try any more */
1978 } 1942 }
1979 1943
1980 /* Get all X ops out of the queue so that our information is up-to-date. */ 1944 /* Get all X ops out of the queue so that our information is up-to-date. */
1981 XSync(Xdisplay, False); 1945 XSync (display->display, False);
1982 1946
1983 /* 1947 /*
1984 * Make the frame window set by the window manager have 1948 * Make the frame window set by the window manager have
1985 * the root background. Some window managers put multiple nested frame 1949 * the root background. Some window managers put multiple nested frame
1986 * windows for each client, so we have to take care about that. 1950 * windows for each client, so we have to take care about that.
1987 */ 1951 */
1988 i = (xa[XA_XROOTPMAPID] != 0 1952 i = (xa[XA_XROOTPMAPID] != 0
1989 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], 1953 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1990 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1954 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1991 &nitems, &bytes_after, &prop) == Success)); 1955 &nitems, &bytes_after, &prop) == Success));
1992 if (!i || prop == NULL) 1956 if (!i || prop == NULL)
1993 have_pixmap = 0; 1957 have_pixmap = 0;
1994 else 1958 else
1995 { 1959 {
1996 have_pixmap = 1; 1960 have_pixmap = 1;
1997 rootpixmap = *((Pixmap *)prop); 1961 rootpixmap = * ((Pixmap *)prop);
1998 XFree(prop); 1962 XFree (prop);
1999 } 1963 }
2000 if (have_pixmap) 1964 if (have_pixmap)
2001 { 1965 {
2002 /* 1966 /*
2003 * Copy Xroot pixmap transparency 1967 * Copy display->root pixmap transparency
2004 */ 1968 */
2005 int sx, sy, nx, ny; 1969 int sx, sy, nx, ny;
2006 unsigned int nw, nh; 1970 unsigned int nw, nh;
2007 Window cr; 1971 Window cr;
2008 XImage *image; 1972 XImage *image;
2009 GC gc; 1973 GC gc;
2010 XGCValues gcvalue; 1974 XGCValues gcvalue;
2011 1975
2012 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, 1976 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2013 0, 0, &sx, &sy, &cr); 1977 0, 0, &sx, &sy, &cr);
2014 nw = (unsigned int)szHint.width; 1978 nw = (unsigned int)szHint.width;
2015 nh = (unsigned int)szHint.height; 1979 nh = (unsigned int)szHint.height;
2016 nx = ny = 0; 1980 nx = ny = 0;
2017 if (sx < 0) 1981 if (sx < 0)
… …
2024 { 1988 {
2025 nh += sy; 1989 nh += sy;
2026 ny = -sy; 1990 ny = -sy;
2027 sy = 0; 1991 sy = 0;
2028 } 1992 }
2029 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 1993 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2030 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 1994 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2031 allowedxerror = -1; 1995 allowedxerror = -1;
2032 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 1996 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
2033 ZPixmap); 1997 ZPixmap);
2034 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 1998 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2035 /* XXX: may need a delay here? */ 1999 /* XXX: may need a delay here? */
2036 allowedxerror = 0; 2000 allowedxerror = 0;
2037 if (image == NULL) 2001 if (image == NULL)
… …
2039 if (am_transparent && am_pixmap_trans) 2003 if (am_transparent && am_pixmap_trans)
2040 { 2004 {
2041 pchanged = 1; 2005 pchanged = 1;
2042 if (TermWin.pixmap != None) 2006 if (TermWin.pixmap != None)
2043 { 2007 {
2044 XFreePixmap(Xdisplay, TermWin.pixmap); 2008 XFreePixmap (display->display, TermWin.pixmap);
2045 TermWin.pixmap = None; 2009 TermWin.pixmap = None;
2046 } 2010 }
2047 } 2011 }
2048 am_pixmap_trans = 0; 2012 am_pixmap_trans = 0;
2049 } 2013 }
2050 else 2014 else
2051 { 2015 {
2052 if (TermWin.pixmap != None) 2016 if (TermWin.pixmap != None)
2053 XFreePixmap(Xdisplay, TermWin.pixmap); 2017 XFreePixmap (display->display, TermWin.pixmap);
2054 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 2018 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2055 (unsigned int)szHint.width, 2019 (unsigned int)szHint.width,
2056 (unsigned int)szHint.height, 2020 (unsigned int)szHint.height,
2057 (unsigned int)image->depth); 2021 (unsigned int)image->depth);
2058 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue); 2022 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2059 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0, 2023 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2060 nx, ny, (unsigned int)image->width, 2024 nx, ny, (unsigned int)image->width,
2061 (unsigned int)image->height); 2025 (unsigned int)image->height);
2062 XFreeGC(Xdisplay, gc); 2026 XFreeGC (display->display, gc);
2063 XDestroyImage(image); 2027 XDestroyImage (image);
2064 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2028 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2065 TermWin.pixmap); 2029 TermWin.pixmap);
2066 if (!am_transparent || !am_pixmap_trans) 2030 if (!am_transparent || !am_pixmap_trans)
2067 pchanged = 1; 2031 pchanged = 1;
2068 am_transparent = am_pixmap_trans = 1; 2032 am_transparent = am_pixmap_trans = 1;
2069 } 2033 }
… …
2072 { 2036 {
2073 unsigned int n; 2037 unsigned int n;
2074 /* 2038 /*
2075 * InheritPixmap transparency 2039 * InheritPixmap transparency
2076 */ 2040 */
2077 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2041 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2078 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2042 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2079 i++) 2043 i++)
2080 { 2044 {
2081 oldp = TermWin.parent[i]; 2045 oldp = TermWin.parent[i];
2082 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root, 2046 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2083 &TermWin.parent[i], &list, &n); 2047 &TermWin.parent[i], &list, &n);
2084 XFree(list); 2048 XFree (list);
2085 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2049 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2086 if (TermWin.parent[i] == Xroot) 2050 if (TermWin.parent[i] == display->root)
2087 { 2051 {
2088 if (oldp != None) 2052 if (oldp != None)
2089 pchanged = 1; 2053 pchanged = 1;
2090 break; 2054 break;
2091 } 2055 }
… …
2095 n = 0; 2059 n = 0;
2096 if (pchanged) 2060 if (pchanged)
2097 { 2061 {
2098 for (; n < (unsigned int)i; n++) 2062 for (; n < (unsigned int)i; n++)
2099 { 2063 {
2100 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr); 2064 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2101 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2065 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2102 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2066 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2103 { 2067 {
2104 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2068 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2105 break; 2069 break;
2106 } 2070 }
2107 } 2071 }
2108 } 2072 }
2109 if (n > (int)(sizeof(TermWin.parent) 2073 if (n > (int) (sizeof (TermWin.parent)
2110 / sizeof(TermWin.parent[0]))) 2074 / sizeof (TermWin.parent[0])))
2111 { 2075 {
2112 D_X((stderr, "InheritPixmap Turning off")); 2076 D_X ((stderr, "InheritPixmap Turning off"));
2113 XSetWindowBackground(Xdisplay, TermWin.parent[0], 2077 XSetWindowBackground (display->display, TermWin.parent[0],
2114 PixColors[Color_fg]); 2078 PixColors[Color_fg]);
2115 XSetWindowBackground(Xdisplay, TermWin.vt, 2079 XSetWindowBackground (display->display, TermWin.vt,
2116 PixColors[Color_bg]); 2080 PixColors[Color_bg]);
2117 am_transparent = 0; 2081 am_transparent = 0;
2118 /* XXX: also turn off Opt_transparent? */ 2082 /* XXX: also turn off Opt_transparent? */
2119 } 2083 }
2120 else 2084 else
… …
2124# ifdef HAVE_NANOSLEEP 2088# ifdef HAVE_NANOSLEEP
2125 struct timespec rqt; 2089 struct timespec rqt;
2126 2090
2127 rqt.tv_sec = 1; 2091 rqt.tv_sec = 1;
2128 rqt.tv_nsec = 0; 2092 rqt.tv_nsec = 0;
2129 nanosleep(&rqt, NULL); 2093 nanosleep (&rqt, NULL);
2130# else 2094# else
2131 sleep(1); 2095 sleep (1);
2132# endif 2096# endif
2133 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2097 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2134 for (n = 0; n < (unsigned int)i; n++) 2098 for (n = 0; n < (unsigned int)i; n++)
2135 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n], 2099 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2136 ParentRelative); 2100 ParentRelative);
2137 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2101 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2138 ParentRelative); 2102 ParentRelative);
2139 am_transparent = 1; 2103 am_transparent = 1;
2140 } 2104 }
2141 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2105 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2142 TermWin.parent[i] = None; 2106 TermWin.parent[i] = None;
2143 } 2107 }
2144 return pchanged; 2108 return pchanged;
2145} 2109}
2146#endif 2110#endif
… …
2151/*----------------------------------------------------------------------*/ 2115/*----------------------------------------------------------------------*/
2152#ifdef PRINTPIPE 2116#ifdef PRINTPIPE
2153FILE * 2117FILE *
2154rxvt_term::popen_printer () 2118rxvt_term::popen_printer ()
2155{ 2119{
2156 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2120 FILE *stream = popen (rs[Rs_print_pipe], "w");
2157 2121
2158 if (stream == NULL) 2122 if (stream == NULL)
2159 rxvt_print_error("can't open printer pipe"); 2123 rxvt_print_error ("can't open printer pipe");
2160 return stream; 2124 return stream;
2161} 2125}
2162 2126
2163int 2127int
2164rxvt_term::pclose_printer (FILE *stream) 2128rxvt_term::pclose_printer (FILE *stream)
2165{ 2129{
2166 fflush (stream); 2130 fflush (stream);
2167 /* pclose() reported not to work on SunOS 4.1.3 */ 2131 /* pclose () reported not to work on SunOS 4.1.3 */
2168# if defined (__sun__) /* TODO: RESOLVE THIS */ 2132# if defined (__sun__) /* TODO: RESOLVE THIS */
2169 /* pclose works provided SIGCHLD handler uses waitpid */ 2133 /* pclose works provided SIGCHLD handler uses waitpid */
2170 return pclose (stream); /* return fclose (stream); */ 2134 return pclose (stream); /* return fclose (stream); */
2171# else 2135# else
2172 return pclose (stream); 2136 return pclose (stream);
… …
2195 unsigned char ch; 2159 unsigned char ch;
2196 unsigned int i, len; 2160 unsigned int i, len;
2197 2161
2198 if ((ch = cmd_getc ()) != C0_ESC) 2162 if ((ch = cmd_getc ()) != C0_ESC)
2199 { 2163 {
2200 if (putc(ch, fd) == EOF) 2164 if (putc (ch, fd) == EOF)
2201 break; /* done = 1 */ 2165 break; /* done = 1 */
2202 } 2166 }
2203 else 2167 else
2204 { 2168 {
2205 len = 0; 2169 len = 0;
… …
2217 if ((buf[len++] = cmd_getc ()) == 'i') 2181 if ((buf[len++] = cmd_getc ()) == 'i')
2218 break; /* done = 1 */ 2182 break; /* done = 1 */
2219 } 2183 }
2220 } 2184 }
2221 for (i = 0; i < len; i++) 2185 for (i = 0; i < len; i++)
2222 if (putc(buf[i], fd) == EOF) 2186 if (putc (buf[i], fd) == EOF)
2223 { 2187 {
2224 done = 1; 2188 done = 1;
2225 break; 2189 break;
2226 } 2190 }
2227 } 2191 }
… …
2247{ 2211{
2248 switch (ch) 2212 switch (ch)
2249 { 2213 {
2250 case C0_ENQ: /* terminal Status */ 2214 case C0_ENQ: /* terminal Status */
2251 if (rs[Rs_answerbackstring]) 2215 if (rs[Rs_answerbackstring])
2252 tt_write( 2216 tt_write (
2253 (const unsigned char *)rs[Rs_answerbackstring], 2217 (const unsigned char *)rs[Rs_answerbackstring],
2254 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2218 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2255 else 2219 else
2256 tt_write((unsigned char *)VT100_ANS, 2220 tt_write ((unsigned char *)VT100_ANS,
2257 (unsigned int)STRLEN(VT100_ANS)); 2221 (unsigned int)STRLEN (VT100_ANS));
2258 break; 2222 break;
2259 case C0_BEL: /* bell */ 2223 case C0_BEL: /* bell */
2260 scr_bell (); 2224 scr_bell ();
2261 break; 2225 break;
2262 case C0_BS: /* backspace */ 2226 case C0_BS: /* backspace */
… …
2324 row = cmd_getc () - ' '; 2288 row = cmd_getc () - ' ';
2325 col = cmd_getc () - ' '; 2289 col = cmd_getc () - ' ';
2326 scr_gotorc (row, col, 0); 2290 scr_gotorc (row, col, 0);
2327 break; 2291 break;
2328 case 'Z': /* identify the terminal type */ 2292 case 'Z': /* identify the terminal type */
2329 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2293 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2330 break; 2294 break;
2331 case '<': /* turn off VT52 mode */ 2295 case '<': /* turn off VT52 mode */
2332 PrivMode(0, PrivMode_vt52); 2296 PrivMode (0, PrivMode_vt52);
2333 break; 2297 break;
2334 case 'F': /* use special graphics character set */ 2298 case 'F': /* use special graphics character set */
2335 case 'G': /* use regular character set */ 2299 case 'G': /* use regular character set */
2336 /* unimplemented */ 2300 /* unimplemented */
2337 break; 2301 break;
… …
2396 scr_forwardindex (); 2360 scr_forwardindex ();
2397 break; 2361 break;
2398#endif 2362#endif
2399 case '=': 2363 case '=':
2400 case '>': 2364 case '>':
2401 PrivMode((ch == '='), PrivMode_aplKP); 2365 PrivMode ((ch == '='), PrivMode_aplKP);
2402 break; 2366 break;
2403 2367
2404 case C1_40: 2368 case C1_40:
2405 cmd_getc (); 2369 cmd_getc ();
2406 break; 2370 break;
… …
2442 process_dcs_seq (); 2406 process_dcs_seq ();
2443 break; 2407 break;
2444 2408
2445 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2409 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2446 case C1_SCI: /* ESC Z */ 2410 case C1_SCI: /* ESC Z */
2447 tt_write((const unsigned char *)ESCZ_ANSWER, 2411 tt_write ((const unsigned char *)ESCZ_ANSWER,
2448 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2412 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2449 break; /* steal obsolete ESC [ c */ 2413 break; /* steal obsolete ESC [ c */
2450 2414
2451 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2415 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2452 case C1_CSI: /* ESC [ */ 2416 case C1_CSI: /* ESC [ */
2453 process_csi_seq (); 2417 process_csi_seq ();
… …
2493 2457
2494#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2458#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2495 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2459 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2496 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2460 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2497#define get_byte_array_bit(array, bit) \ 2461#define get_byte_array_bit(array, bit) \
2498 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2462 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2499 2463
2500const unsigned char csi_defaults[] = 2464const unsigned char csi_defaults[] =
2501 { 2465 {
2502 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2466 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2503 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2467 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2504 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2468 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2505 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2469 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2506 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2470 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2507 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2471 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2508 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2472 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2509 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2473 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2510 }; 2474 };
2511/* *INDENT-ON* */ 2475/* *INDENT-ON* */
2512 2476
2513void 2477void
2514rxvt_term::process_csi_seq () 2478rxvt_term::process_csi_seq ()
… …
2529 ch = cmd_getc (); 2493 ch = cmd_getc ();
2530 } 2494 }
2531 /* read any numerical arguments */ 2495 /* read any numerical arguments */
2532 for (n = -1; ch < CSI_ICH; ) 2496 for (n = -1; ch < CSI_ICH; )
2533 { 2497 {
2534 if (isdigit(ch)) 2498 if (isdigit (ch))
2535 { 2499 {
2536 if (n < 0) 2500 if (n < 0)
2537 n = ch - '0'; 2501 n = ch - '0';
2538 else 2502 else
2539 n = n * 10 + ch - '0'; 2503 n = n * 10 + ch - '0';
… …
2565 2529
2566 if (nargs < ESC_ARGS) 2530 if (nargs < ESC_ARGS)
2567 arg[nargs++] = n; 2531 arg[nargs++] = n;
2568 2532
2569 i = ch - CSI_ICH; 2533 i = ch - CSI_ICH;
2570 ndef = get_byte_array_bit(csi_defaults, i); 2534 ndef = get_byte_array_bit (csi_defaults, i);
2571 for (p = 0; p < nargs; p++) 2535 for (p = 0; p < nargs; p++)
2572 if (arg[p] == -1) 2536 if (arg[p] == -1)
2573 arg[p] = ndef; 2537 arg[p] = ndef;
2574 2538
2575#ifdef DEBUG_CMD 2539#ifdef DEBUG_CMD
2576 fprintf(stderr, "CSI "); 2540 fprintf (stderr, "CSI ");
2577 for (p = 0; p < nargs; p++) 2541 for (p = 0; p < nargs; p++)
2578 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2542 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2579 fprintf(stderr, "%c\n", ch); 2543 fprintf (stderr, "%c\n", ch);
2580#endif 2544#endif
2581 2545
2582 /* 2546 /*
2583 * private mode handling 2547 * private mode handling
2584 */ 2548 */
… …
2586 { 2550 {
2587 switch (priv) 2551 switch (priv)
2588 { 2552 {
2589 case '>': 2553 case '>':
2590 if (ch == CSI_DA) /* secondary device attributes */ 2554 if (ch == CSI_DA) /* secondary device attributes */
2591 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2555 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2592 break; 2556 break;
2593 case '?': 2557 case '?':
2594 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2558 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2595 process_terminal_mode (ch, priv, nargs, arg); 2559 process_terminal_mode (ch, priv, nargs, arg);
2596 break; 2560 break;
… …
2599 } 2563 }
2600 2564
2601 switch (ch) 2565 switch (ch)
2602 { 2566 {
2603 /* 2567 /*
2604 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2568 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2605 */ 2569 */
2606#ifdef PRINTPIPE 2570#ifdef PRINTPIPE
2607 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2571 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2608 switch (arg[0]) 2572 switch (arg[0])
2609 { 2573 {
… …
2705 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2669 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2706 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2670 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2707 break; 2671 break;
2708 2672
2709 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2673 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2710 tt_write((const unsigned char *)VT100_ANS, 2674 tt_write ((const unsigned char *)VT100_ANS,
2711 (unsigned int)(sizeof(VT100_ANS) - 1)); 2675 (unsigned int) (sizeof (VT100_ANS) - 1));
2712 break; 2676 break;
2713 2677
2714 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2678 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2715 process_sgr_mode (nargs, arg); 2679 process_sgr_mode (nargs, arg);
2716 break; 2680 break;
2717 2681
2718 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2682 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2719 switch (arg[0]) 2683 switch (arg[0])
2720 { 2684 {
2721 case 5: /* DSR requested */ 2685 case 5: /* DSR requested */
2722 tt_printf("\033[0n"); 2686 tt_printf ("\033[0n");
2723 break; 2687 break;
2724 case 6: /* CPR requested */ 2688 case 6: /* CPR requested */
2725 scr_report_position (); 2689 scr_report_position ();
2726 break; 2690 break;
2727#if defined (ENABLE_DISPLAY_ANSWER) 2691#if defined (ENABLE_DISPLAY_ANSWER)
2728 case 7: /* unofficial extension */ 2692 case 7: /* unofficial extension */
2729 tt_printf("%-.250s\n", rs[Rs_display_name]); 2693 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2730 break; 2694 break;
2731#endif 2695#endif
2732 case 8: /* unofficial extension */ 2696 case 8: /* unofficial extension */
2733 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2697 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2734 break; 2698 break;
… …
2805 break; 2769 break;
2806#endif 2770#endif
2807 2771
2808 case CSI_78: /* DECREQTPARM */ 2772 case CSI_78: /* DECREQTPARM */
2809 if (arg[0] == 0 || arg[0] == 1) 2773 if (arg[0] == 0 || arg[0] == 1)
2810 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2774 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2811 /* FALLTHROUGH */ 2775 /* FALLTHROUGH */
2812 2776
2813 default: 2777 default:
2814 break; 2778 break;
2815 } 2779 }
… …
2834 { 2798 {
2835 /* 2799 /*
2836 * commands 2800 * commands
2837 */ 2801 */
2838 case 1: /* deiconify window */ 2802 case 1: /* deiconify window */
2839 XMapWindow(Xdisplay, TermWin.parent[0]); 2803 XMapWindow (display->display, TermWin.parent[0]);
2840 break; 2804 break;
2841 case 2: /* iconify window */ 2805 case 2: /* iconify window */
2842 XIconifyWindow(Xdisplay, TermWin.parent[0], 2806 XIconifyWindow (display->display, TermWin.parent[0],
2843 DefaultScreen(Xdisplay)); 2807 DefaultScreen (display->display));
2844 break; 2808 break;
2845 case 3: /* set position (pixels) */ 2809 case 3: /* set position (pixels) */
2846 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 2810 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2847 break; 2811 break;
2848 case 4: /* set size (pixels) */ 2812 case 4: /* set size (pixels) */
2849 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 2813 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2850 break; 2814 break;
2851 case 5: /* raise window */ 2815 case 5: /* raise window */
2852 XRaiseWindow(Xdisplay, TermWin.parent[0]); 2816 XRaiseWindow (display->display, TermWin.parent[0]);
2853 break; 2817 break;
2854 case 6: /* lower window */ 2818 case 6: /* lower window */
2855 XLowerWindow(Xdisplay, TermWin.parent[0]); 2819 XLowerWindow (display->display, TermWin.parent[0]);
2856 break; 2820 break;
2857 case 7: /* refresh window */ 2821 case 7: /* refresh window */
2858 scr_touch (true); 2822 scr_touch (true);
2859 break; 2823 break;
2860 case 8: /* set size (chars) */ 2824 case 8: /* set size (chars) */
2861 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 2825 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2862 (unsigned int)(args[1] * TermWin.fheight)); 2826 (unsigned int) (args[1] * TermWin.fheight));
2863 break; 2827 break;
2864 default: 2828 default:
2865 if (args[0] >= 24) /* set height (chars) */ 2829 if (args[0] >= 24) /* set height (chars) */
2866 set_widthheight ((unsigned int)TermWin.width, 2830 set_widthheight ((unsigned int)TermWin.width,
2867 (unsigned int)(args[1] * TermWin.fheight)); 2831 (unsigned int) (args[1] * TermWin.fheight));
2868 break; 2832 break;
2869 /* 2833 /*
2870 * reports - some output format copied from XTerm 2834 * reports - some output format copied from XTerm
2871 */ 2835 */
2872 case 11: /* report window state */ 2836 case 11: /* report window state */
2873 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2837 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2874 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2838 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2875 break; 2839 break;
2876 case 13: /* report window position */ 2840 case 13: /* report window position */
2877 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2841 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2878 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 2842 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2879 -wattr.border_width, -wattr.border_width, 2843 -wattr.border_width, -wattr.border_width,
2880 &x, &y, &wdummy); 2844 &x, &y, &wdummy);
2881 tt_printf("\033[3;%d;%dt", x, y); 2845 tt_printf ("\033[3;%d;%dt", x, y);
2882 break; 2846 break;
2883 case 14: /* report window size (pixels) */ 2847 case 14: /* report window size (pixels) */
2884 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2885 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2849 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2886 break; 2850 break;
2887 case 18: /* report window size (chars) */ 2851 case 18: /* report window size (chars) */
2888 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 2852 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2889 break; 2853 break;
2890#if 0 /* XXX: currently disabled due to security concerns */ 2854#if 0 /* XXX: currently disabled due to security concerns */
2891 case 20: /* report icon label */ 2855 case 20: /* report icon label */
2892 XGetIconName(Xdisplay, TermWin.parent[0], &s); 2856 XGetIconName (display->display, TermWin.parent[0], &s);
2893 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2857 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2894 break; 2858 break;
2895 case 21: /* report window title */ 2859 case 21: /* report window title */
2896 XFetchName(Xdisplay, TermWin.parent[0], &s); 2860 XFetchName (display->display, TermWin.parent[0], &s);
2897 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2861 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2898 break; 2862 break;
2899#endif 2863#endif
2900 2864
2901 } 2865 }
2902} 2866}
2903#endif 2867#endif
2904 2868
2905/*----------------------------------------------------------------------*/ 2869/*----------------------------------------------------------------------*/
2906/* 2870/*
2907 * get input up until STRING TERMINATOR (or BEL) 2871 * get input up until STRING TERMINATOR (or BEL)
2908 * ends_how is terminator used. returned input must be free()d 2872 * ends_how is terminator used. returned input must be free ()d
2909 */ 2873 */
2910unsigned char * 2874unsigned char *
2911rxvt_term::get_to_st (unsigned char *ends_how) 2875rxvt_term::get_to_st (unsigned char *ends_how)
2912{ 2876{
2913 int seen_esc = 0; /* seen escape? */ 2877 int seen_esc = 0; /* seen escape? */
… …
2928 } 2892 }
2929 else if (ch == '\t') 2893 else if (ch == '\t')
2930 ch = ' '; /* translate '\t' to space */ 2894 ch = ' '; /* translate '\t' to space */
2931 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2895 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2932 return NULL; /* other control character - exit */ 2896 return NULL; /* other control character - exit */
2933 if (n < sizeof(string) - 1) 2897 if (n < sizeof (string) - 1)
2934 string[n++] = ch; 2898 string[n++] = ch;
2935 seen_esc = 0; 2899 seen_esc = 0;
2936 } 2900 }
2937 string[n++] = '\0'; 2901 string[n++] = '\0';
2938 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2902 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2939 return NULL; 2903 return NULL;
2940 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2904 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2941 STRNCPY(s, string, n); 2905 STRNCPY (s, string, n);
2942 return s; 2906 return s;
2943} 2907}
2944 2908
2945/*----------------------------------------------------------------------*/ 2909/*----------------------------------------------------------------------*/
2946/* 2910/*
… …
2953 /* 2917 /*
2954 * Not handled yet 2918 * Not handled yet
2955 */ 2919 */
2956 s = get_to_st (&eh); 2920 s = get_to_st (&eh);
2957 if (s) 2921 if (s)
2958 free(s); 2922 free (s);
2959 return; 2923 return;
2960} 2924}
2961 2925
2962/*----------------------------------------------------------------------*/ 2926/*----------------------------------------------------------------------*/
2963/* 2927/*
… …
2968{ 2932{
2969 unsigned char ch, eh, *s; 2933 unsigned char ch, eh, *s;
2970 int arg; 2934 int arg;
2971 2935
2972 ch = cmd_getc (); 2936 ch = cmd_getc ();
2973 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 2937 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2974 arg = arg * 10 + (ch - '0'); 2938 arg = arg * 10 + (ch - '0');
2975 2939
2976 if (ch == ';') 2940 if (ch == ';')
2977 { 2941 {
2978 s = get_to_st (&eh); 2942 s = get_to_st (&eh);
2979 if (s) 2943 if (s)
2980 { 2944 {
2981 /* 2945 /*
2982 * rxvt_menubar_dispatch() violates the constness of the string, 2946 * rxvt_menubar_dispatch () violates the constness of the string,
2983 * so do it here 2947 * so do it here
2984 */ 2948 */
2985 if (arg == XTerm_Menu) 2949 if (arg == XTerm_Menu)
2986#if 0 /* XXX: currently disabled due to security concerns */ 2950#if 0 /* XXX: currently disabled due to security concerns */
2987 menubar_dispatch ((char *)s); 2951 menubar_dispatch ((char *)s);
2988#else 2952#else
2989 (void)0; 2953 (void)0;
2990#endif 2954#endif
2991 else 2955 else
2992 xterm_seq (arg, (char *)s, eh); 2956 xterm_seq (arg, (char *)s, eh);
2993 free(s); 2957 free (s);
2994 } 2958 }
2995 } 2959 }
2996} 2960}
2997/* 2961/*
2998 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2962 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
… …
3007 * 19 = change underlined character color 2971 * 19 = change underlined character color
3008 * 46 = change logfile (not implemented) 2972 * 46 = change logfile (not implemented)
3009 * 50 = change font 2973 * 50 = change font
3010 * 2974 *
3011 * rxvt extensions: 2975 * rxvt extensions:
2976 * 9 = change locale (NYI)
3012 * 10 = menu (may change in future) 2977 * 10 = menu (may change in future)
3013 * 20 = bg pixmap 2978 * 20 = bg pixmap
3014 * 39 = change default fg color 2979 * 39 = change default fg color
3015 * 49 = change default bg color 2980 * 49 = change default bg color
3016 * 55 = dump scrollback buffer and all of screen 2981 * 55 = dump scrollback buffer and all of screen
3017 */ 2982 */
3018void 2983void
3019rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 2984rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
3020{ 2985{
3021 int changed = 0; 2986 int changed = 0;
3022 int color; 2987 int color;
3023 char *buf, *name; 2988 char *buf, *name;
3024 2989
3025 assert(str != NULL); 2990 assert (str != NULL);
3026 switch (op) 2991 switch (op)
3027 { 2992 {
3028 case XTerm_name: 2993 case XTerm_name:
3029 set_title (str); 2994 set_title (str);
3030 /* FALLTHROUGH */ 2995 /* FALLTHROUGH */
… …
3035 set_title (str); 3000 set_title (str);
3036 break; 3001 break;
3037 case XTerm_Color: 3002 case XTerm_Color:
3038 for (buf = (char *)str; buf && *buf;) 3003 for (buf = (char *)str; buf && *buf;)
3039 { 3004 {
3040 if ((name = STRCHR(buf, ';')) == NULL) 3005 if ((name = STRCHR (buf, ';')) == NULL)
3041 break; 3006 break;
3042 *name++ = '\0'; 3007 *name++ = '\0';
3043 color = atoi(buf); 3008 color = atoi (buf);
3044 if (color < 0 || color >= TOTAL_COLORS) 3009 if (color < 0 || color >= TOTAL_COLORS)
3045 break; 3010 break;
3046 if ((buf = STRCHR(name, ';')) != NULL) 3011 if ((buf = STRCHR (name, ';')) != NULL)
3047 *buf++ = '\0'; 3012 *buf++ = '\0';
3048 set_window_color (color + minCOLOR, name); 3013 set_window_color (color + minCOLOR, name);
3049 } 3014 }
3050 break; 3015 break;
3051#ifndef NO_CURSORCOLOR 3016#ifndef NO_CURSORCOLOR
… …
3068 break; 3033 break;
3069#endif 3034#endif
3070 3035
3071 case XTerm_Menu: 3036 case XTerm_Menu:
3072 /* 3037 /*
3073 * rxvt_menubar_dispatch() violates the constness of the string, 3038 * rxvt_menubar_dispatch () violates the constness of the string,
3074 * so DON'T do it here 3039 * so DON'T do it here
3075 */ 3040 */
3076 break; 3041 break;
3077 case XTerm_Pixmap: 3042 case XTerm_Pixmap:
3078 if (*str != ';') 3043 if (*str != ';')
… …
3081 scale_pixmap (""); /* reset to default scaling */ 3046 scale_pixmap (""); /* reset to default scaling */
3082 set_bgPixmap (str); /* change pixmap */ 3047 set_bgPixmap (str); /* change pixmap */
3083#endif 3048#endif
3084 scr_touch (true); 3049 scr_touch (true);
3085 } 3050 }
3086 while ((str = STRCHR(str, ';')) != NULL) 3051 while ((str = STRCHR (str, ';')) != NULL)
3087 { 3052 {
3088 str++; 3053 str++;
3089#if XPM_BACKGROUND 3054#if XPM_BACKGROUND
3090 changed += scale_pixmap (str); 3055 changed += scale_pixmap (str);
3091#endif 3056#endif
… …
3107 set_window_color (Color_bg, str); 3072 set_window_color (Color_bg, str);
3108 break; 3073 break;
3109 case XTerm_logfile: 3074 case XTerm_logfile:
3110 break; 3075 break;
3111 case XTerm_font: 3076 case XTerm_font:
3112 change_font (0, str); 3077 change_font (str);
3078 break;
3079 case XTerm_locale:
3080 /* TODO */
3113 break; 3081 break;
3114#if 0 3082#if 0
3115 case XTerm_dumpscreen: /* no error notices */ 3083 case XTerm_dumpscreen: /* no error notices */
3116 { 3084 {
3117 int fd; 3085 int fd;
3118 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3086 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3119 { 3087 {
3120 scr_dump (fd); 3088 scr_dump (fd);
3121 close(fd); 3089 close (fd);
3122 } 3090 }
3123 } 3091 }
3124 break; 3092 break;
3125#endif 3093#endif
3126 3094
… …
3151 else 3119 else
3152 { 3120 {
3153 if (mode == 'r') 3121 if (mode == 'r')
3154 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3122 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3155 else 3123 else
3156 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3124 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3157 PrivMode(state, bit); 3125 PrivMode (state, bit);
3158 } 3126 }
3159 return state; 3127 return state;
3160} 3128}
3161 3129
3162/* we're not using priv _yet_ */ 3130/* we're not using priv _yet_ */
3163void 3131void
3164rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3132rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3165{ 3133{
3166 unsigned int i, j; 3134 unsigned int i, j;
3167 int state; 3135 int state;
3168 static const struct 3136 static const struct
3169 { 3137 {
… …
3212 for (i = 0; i < nargs; i++) 3180 for (i = 0; i < nargs; i++)
3213 { 3181 {
3214 state = -1; 3182 state = -1;
3215 3183
3216 /* basic handling */ 3184 /* basic handling */
3217 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3185 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3218 if (argtopriv[j].argval == arg[i]) 3186 if (argtopriv[j].argval == arg[i])
3219 { 3187 {
3220 state = privcases (mode, argtopriv[j].bit); 3188 state = privcases (mode, argtopriv[j].bit);
3221 break; 3189 break;
3222 } 3190 }
… …
3230 scr_cursor (RESTORE); 3198 scr_cursor (RESTORE);
3231 else if (mode == 1) 3199 else if (mode == 1)
3232 scr_cursor (SAVE); 3200 scr_cursor (SAVE);
3233 /* FALLTHROUGH */ 3201 /* FALLTHROUGH */
3234 default: 3202 default:
3235 continue; /* for(;i;) */ 3203 continue; /* for (;i;) */
3236 } 3204 }
3237 3205
3238 /* extra handling for values with valid 0 or 1 state */ 3206 /* extra handling for values with valid 0 or 1 state */
3239 switch (arg[i]) 3207 switch (arg[i])
3240 { 3208 {
… …
3242 case 2: /* VT52 mode */ 3210 case 2: /* VT52 mode */
3243 /* oddball mode. should be set regardless of set/reset 3211 /* oddball mode. should be set regardless of set/reset
3244 * parameter. Return from VT52 mode with an ESC < from 3212 * parameter. Return from VT52 mode with an ESC < from
3245 * within VT52 mode 3213 * within VT52 mode
3246 */ 3214 */
3247 PrivMode(1, PrivMode_vt52); 3215 PrivMode (1, PrivMode_vt52);
3248 break; 3216 break;
3249 case 3: /* 80/132 */ 3217 case 3: /* 80/132 */
3250 if (PrivateModes & PrivMode_132OK) 3218 if (PrivateModes & PrivMode_132OK)
3251 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3219 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3252 (unsigned int)TermWin.height); 3220 (unsigned int)TermWin.height);
3253 break; 3221 break;
3254 case 4: /* smooth scrolling */ 3222 case 4: /* smooth scrolling */
3255 if (state) 3223 if (state)
3256 Options &= ~Opt_jumpScroll; 3224 Options &= ~Opt_jumpScroll;
… …
3267 scr_autowrap (state); 3235 scr_autowrap (state);
3268 break; 3236 break;
3269 /* case 8: - auto repeat, can't do on a per window basis */ 3237 /* case 8: - auto repeat, can't do on a per window basis */
3270 case 9: /* X10 mouse reporting */ 3238 case 9: /* X10 mouse reporting */
3271 if (state) /* orthogonal */ 3239 if (state) /* orthogonal */
3272 PrivateModes &= ~(PrivMode_MouseX11); 3240 PrivateModes &= ~ (PrivMode_MouseX11);
3273 break; 3241 break;
3274#ifdef menuBar_esc 3242#ifdef menuBar_esc
3275 case menuBar_esc: 3243 case menuBar_esc:
3276#ifdef MENUBAR 3244#ifdef MENUBAR
3277 map_menuBar (state); 3245 map_menuBar (state);
… …
3297 break; 3265 break;
3298 /* case 66: - application key pad */ 3266 /* case 66: - application key pad */
3299 /* case 67: - backspace key */ 3267 /* case 67: - backspace key */
3300 case 1000: /* X11 mouse reporting */ 3268 case 1000: /* X11 mouse reporting */
3301 if (state) /* orthogonal */ 3269 if (state) /* orthogonal */
3302 PrivateModes &= ~(PrivMode_MouseX10); 3270 PrivateModes &= ~ (PrivMode_MouseX10);
3303 break; 3271 break;
3304#if 0 3272#if 0
3305 case 1001: 3273 case 1001:
3306 break; /* X11 mouse highlighting */ 3274 break; /* X11 mouse highlighting */
3307#endif 3275#endif
… …
3377 break; 3345 break;
3378 } 3346 }
3379 if (rendset != -1) 3347 if (rendset != -1)
3380 { 3348 {
3381 scr_rendition (rendset, rendstyle); 3349 scr_rendition (rendset, rendstyle);
3382 continue; /* for(;i;) */ 3350 continue; /* for (;i;) */
3383 } 3351 }
3384 3352
3385 switch (arg[i]) 3353 switch (arg[i])
3386 { 3354 {
3387 case 30: 3355 case 30:
… …
3390 case 33: 3358 case 33:
3391 case 34: 3359 case 34:
3392 case 35: 3360 case 35:
3393 case 36: 3361 case 36:
3394 case 37: 3362 case 37:
3395 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3363 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3396 Color_fg); 3364 Color_fg);
3397 break; 3365 break;
3398#ifdef TTY_256COLOR 3366#ifdef TTY_256COLOR
3399 case 38: 3367 case 38:
3400 if (nargs > i + 2 && arg[i + 1] == 5) 3368 if (nargs > i + 2 && arg[i + 1] == 5)
3401 { 3369 {
3402 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3370 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3403 Color_fg); 3371 Color_fg);
3404 i += 2; 3372 i += 2;
3405 } 3373 }
3406 break; 3374 break;
3407#endif 3375#endif
… …
3415 case 43: 3383 case 43:
3416 case 44: 3384 case 44:
3417 case 45: 3385 case 45:
3418 case 46: 3386 case 46:
3419 case 47: 3387 case 47:
3420 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3388 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3421 Color_bg); 3389 Color_bg);
3422 break; 3390 break;
3423#ifdef TTY_256COLOR 3391#ifdef TTY_256COLOR
3424 case 48: 3392 case 48:
3425 if (nargs > i + 2 && arg[i + 1] == 5) 3393 if (nargs > i + 2 && arg[i + 1] == 5)
3426 { 3394 {
3427 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3395 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3428 Color_bg); 3396 Color_bg);
3429 i += 2; 3397 i += 2;
3430 } 3398 }
3431 break; 3399 break;
3432#endif 3400#endif
… …
3441 case 93: 3409 case 93:
3442 case 94: 3410 case 94:
3443 case 95: 3411 case 95:
3444 case 96: 3412 case 96:
3445 case 97: 3413 case 97:
3446 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3414 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3447 Color_fg); 3415 Color_fg);
3448 break; 3416 break;
3449 case 100: 3417 case 100:
3450 case 101: /* set bright bg color */ 3418 case 101: /* set bright bg color */
3451 case 102: 3419 case 102:
3452 case 103: 3420 case 103:
3453 case 104: 3421 case 104:
3454 case 105: 3422 case 105:
3455 case 106: 3423 case 106:
3456 case 107: 3424 case 107:
3457 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3425 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3458 Color_bg); 3426 Color_bg);
3459 break; 3427 break;
3460#endif 3428#endif
3461 3429
3462 } 3430 }
… …
3468void 3436void
3469rxvt_term::process_graphics () 3437rxvt_term::process_graphics ()
3470{ 3438{
3471 unsigned char ch, cmd = cmd_getc (); 3439 unsigned char ch, cmd = cmd_getc ();
3472 3440
3473#ifndef RXVT_GRAPHICS
3474 if (cmd == 'Q') 3441 if (cmd == 'Q')
3475 { /* query graphics */ 3442 { /* query graphics */
3476 tt_printf("\033G0\n"); /* no graphics */ 3443 tt_printf ("\033G0\n"); /* no graphics */
3477 return; 3444 return;
3478 } 3445 }
3479 /* swallow other graphics sequences until terminating ':' */ 3446 /* swallow other graphics sequences until terminating ':' */
3480 do 3447 do
3481 ch = cmd_getc (); 3448 ch = cmd_getc ();
3482 while (ch != ':'); 3449 while (ch != ':');
3483#else
3484 unsigned int nargs;
3485 int args[NGRX_PTS];
3486 unsigned char *text = NULL;
3487
3488 if (cmd == 'Q')
3489 { /* query graphics */
3490 tt_printf("\033G1\n"); /* yes, graphics (color) */
3491 return;
3492 }
3493 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;)
3494 {
3495 int neg;
3496
3497 ch = cmd_getc ();
3498 neg = (ch == '-');
3499 if (neg || ch == '+')
3500 ch = cmd_getc ();
3501
3502 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3503 args[nargs] = args[nargs] * 10 + (ch - '0');
3504 if (neg)
3505 args[nargs] = -args[nargs];
3506
3507 nargs++;
3508 args[nargs] = 0;
3509 if (ch != ';')
3510 break;
3511 }
3512
3513 if ((cmd == 'T') && (nargs >= 5))
3514 {
3515 int i, len = args[4];
3516
3517 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3518
3519 if (text != NULL)
3520 {
3521 for (i = 0; i < len; i++)
3522 text[i] = cmd_getc ();
3523 text[len] = '\0';
3524 }
3525 }
3526 Gr_do_graphics (cmd, nargs, args, text);
3527#endif
3528} 3450}
3529/*}}} */ 3451/*}}} */
3530 3452
3531/* ------------------------------------------------------------------------- */ 3453/* ------------------------------------------------------------------------- */
3532 3454
3533/* 3455/*
3534 * Send printf() formatted output to the command. 3456 * Send printf () formatted output to the command.
3535 * Only use for small amounts of data. 3457 * Only use for small amounts of data.
3536 */ 3458 */
3537void 3459void
3538rxvt_term::tt_printf (const char *fmt,...) 3460rxvt_term::tt_printf (const char *fmt,...)
3539{ 3461{

Diff Legend

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