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.32 by pcg, Thu Jan 29 23:31:45 2004 UTC vs.
Revision 1.38 by pcg, Mon Feb 9 07:11:49 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.32 2004/01/29 23:31:45 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
53#include <wchar.h> 52#include <wchar.h>
54 53
55/*----------------------------------------------------------------------*/ 54/*----------------------------------------------------------------------*/
56 55
57/*{{{ Convert the keypress event into a string */ 56/*{{{ Convert the keypress event into a string */
58/* INTPROTO */
59void 57void
60rxvt_lookup_key(pR_ XKeyEvent *ev) 58rxvt_term::lookup_key (XKeyEvent &ev)
61{ 59{
62 int ctrl, meta, shft, len; 60 int ctrl, meta, shft, len;
63 unsigned int newlen; 61 unsigned int newlen;
64 KeySym keysym; 62 KeySym keysym;
65#ifdef DEBUG_CMD 63#ifdef DEBUG_CMD
66 static int debug_key = 1; /* accessible by a debugger only */ 64 static int debug_key = 1; /* accessible by a debugger only */
67#endif 65#endif
68 int valid_keysym; 66 int valid_keysym;
69 unsigned char kbuf[KBUFSZ]; 67 unsigned char kbuf[KBUFSZ];
70 68
71/* 69 /*
72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
73 * escape sequence to toggle the Keypad. 71 * escape sequence to toggle the Keypad.
74 * 72 *
75 * Always permit `shift' to override the current setting 73 * Always permit `shift' to override the current setting
76 */ 74 */
77 shft = (ev->state & ShiftMask); 75 shft = (ev.state & ShiftMask);
78 ctrl = (ev->state & ControlMask); 76 ctrl = (ev.state & ControlMask);
79 meta = (ev->state & R->ModMetaMask); 77 meta = (ev.state & ModMetaMask);
80 78
81 if (R->numlock_state || (ev->state & R->ModNumLockMask)) 79 if (numlock_state || (ev.state & ModNumLockMask))
82 { 80 {
83 R->numlock_state = (ev->state & R->ModNumLockMask); 81 numlock_state = (ev.state & ModNumLockMask);
84 PrivMode((!R->numlock_state), PrivMode_aplKP); 82 PrivMode((!numlock_state), PrivMode_aplKP);
85 } 83 }
86 84
87 kbuf[0] = 0; 85 kbuf[0] = 0;
88 86
89#ifdef USE_XIM 87#ifdef USE_XIM
90 if (R->Input_Context) 88 if (Input_Context)
91 { 89 {
92 Status status_return; 90 Status status_return;
93 91
94#ifdef X_HAVE_UTF8_STRING 92#ifdef X_HAVE_UTF8_STRING
95 if (R->enc_utf8 && 0) 93 if (enc_utf8 && 0)
96 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf, 94 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
97 KBUFSZ, &keysym, &status_return); 95 KBUFSZ, &keysym, &status_return);
98 else 96 else
99#endif 97#endif
98
100 { 99 {
101 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
102 101
103 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
104 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
105 if (R->rs[Rs_imLocale]) 104 if (rs[Rs_imLocale])
106 SET_LOCALE (R->rs[Rs_imLocale]); 105 SET_LOCALE (rs[Rs_imLocale]);
107 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
108 len = XwcLookupString (R->Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
109 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
110 if (R->rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
111 SET_LOCALE (R->locale); 110 SET_LOCALE (locale);
112 111
113 if (status_return == XLookupChars 112 if (status_return == XLookupChars
114 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
115 { 114 {
116 wkbuf[len] = 0; 115 wkbuf[len] = 0;
117 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
118 if (len < 0) 117 if (len < 0)
119 len = 0; 118 len = 0;
120 } 119 }
121 else 120 else
122 len = 0; 121 len = 0;
123 } 122 }
124 123
125 valid_keysym = status_return == XLookupKeySym 124 valid_keysym = status_return == XLookupKeySym
126 || status_return == XLookupBoth; 125 || status_return == XLookupBoth;
127 } 126 }
128 else 127 else
129#endif 128#endif
129
130 { 130 {
131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose); 131 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 132 valid_keysym = !len;
133 } 133 }
134 134
135 if (valid_keysym) 135 if (valid_keysym)
136 { 136 {
137/* for some backwards compatibility */ 137 /* for some backwards compatibility */
138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
139# ifdef HOTKEY_CTRL 139# ifdef HOTKEY_CTRL
140 if (ctrl) 140 if (ctrl)
141# else 141# else
142 if (meta) 142 if (meta)
143# endif 143# endif
144 { 144 {
145 if (keysym == R->ks_bigfont) 145 if (keysym == ks_bigfont)
146 { 146 {
147 rxvt_change_font(aR_ 0, FONT_UP); 147 change_font (0, FONT_UP);
148 return; 148 return;
149 } 149 }
150 else if (keysym == R->ks_smallfont) 150 else if (keysym == ks_smallfont)
151 { 151 {
152 rxvt_change_font(aR_ 0, FONT_DN); 152 change_font (0, FONT_DN);
153 return; 153 return;
154 }
154 } 155 }
155 }
156#endif 156#endif
157 157
158 if (R->TermWin.saveLines) { 158 if (TermWin.saveLines)
159 {
159#ifdef UNSHIFTED_SCROLLKEYS 160#ifdef UNSHIFTED_SCROLLKEYS
160 if (!ctrl && !meta) { 161 if (!ctrl && !meta)
162 {
161#else 163#else
162 if (IS_SCROLL_MOD) { 164 if (IS_SCROLL_MOD)
165 {
163#endif 166#endif
164 int lnsppg; 167 int lnsppg;
165 168
166#ifdef PAGING_CONTEXT_LINES 169#ifdef PAGING_CONTEXT_LINES
167 lnsppg = R->TermWin.nrow - PAGING_CONTEXT_LINES; 170 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
168#else 171#else
169 lnsppg = R->TermWin.nrow * 4 / 5; 172 lnsppg = TermWin.nrow * 4 / 5;
170#endif 173#endif
171 if (keysym == XK_Prior) { 174 if (keysym == XK_Prior)
172 rxvt_scr_page(aR_ UP, lnsppg); 175 {
173 return; 176 scr_page (UP, lnsppg);
177 return;
178 }
174 } else if (keysym == XK_Next) { 179 else if (keysym == XK_Next)
175 rxvt_scr_page(aR_ DN, lnsppg); 180 {
176 return; 181 scr_page (DN, lnsppg);
177 } 182 return;
178 } 183 }
184 }
179#ifdef SCROLL_ON_UPDOWN_KEYS 185#ifdef SCROLL_ON_UPDOWN_KEYS
180 if (IS_SCROLL_MOD) { 186 if (IS_SCROLL_MOD)
181 if (keysym == XK_Up) { 187 {
182 rxvt_scr_page(aR_ UP, 1); 188 if (keysym == XK_Up)
183 return; 189 {
190 scr_page (UP, 1);
191 return;
192 }
184 } else if (keysym == XK_Down) { 193 else if (keysym == XK_Down)
185 rxvt_scr_page(aR_ DN, 1); 194 {
186 return; 195 scr_page (DN, 1);
187 } 196 return;
188 } 197 }
198 }
189#endif 199#endif
190#ifdef SCROLL_ON_HOMEEND_KEYS 200#ifdef SCROLL_ON_HOMEEND_KEYS
191 if (IS_SCROLL_MOD) { 201 if (IS_SCROLL_MOD)
192 if (keysym == XK_Home) { 202 {
193 rxvt_scr_move_to(aR_ 0, 1); 203 if (keysym == XK_Home)
194 return; 204 {
205 scr_move_to (0, 1);
206 return;
207 }
195 } else if (keysym == XK_End) { 208 else if (keysym == XK_End)
196 rxvt_scr_move_to(aR_ 1, 0); 209 {
197 return; 210 scr_move_to (1, 0);
198 } 211 return;
199 } 212 }
213 }
200#endif 214#endif
201 }
202 215
203 if (shft) { 216 }
217
218 if (shft)
219 {
204 /* Shift + F1 - F10 generates F11 - F20 */ 220 /* Shift + F1 - F10 generates F11 - F20 */
205 if (keysym >= XK_F1 && keysym <= XK_F10) { 221 if (keysym >= XK_F1 && keysym <= XK_F10)
222 {
206 keysym += (XK_F11 - XK_F1); 223 keysym += (XK_F11 - XK_F1);
207 shft = 0; /* turn off Shift */ 224 shft = 0; /* turn off Shift */
225 }
208 } else if (!ctrl && !meta && (R->PrivateModes & PrivMode_ShiftKeys)) { 226 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys))
209 switch (keysym) { 227 {
210 /* normal XTerm key bindings */ 228 switch (keysym)
229 {
230 /* normal XTerm key bindings */
211 case XK_Insert: /* Shift+Insert = paste mouse selection */ 231 case XK_Insert: /* Shift+Insert = paste mouse selection */
212 rxvt_selection_request(aR_ ev->time, 0, 0); 232 selection_request (ev.time, 0, 0);
213 return; 233 return;
214 /* rxvt extras */ 234 /* rxvt extras */
215 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 235 case XK_KP_Add: /* Shift+KP_Add = bigger font */
216 rxvt_change_font(aR_ 0, FONT_UP); 236 change_font (0, FONT_UP);
217 return; 237 return;
218 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 238 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
219 rxvt_change_font(aR_ 0, FONT_DN); 239 change_font (0, FONT_DN);
220 return; 240 return;
221 } 241 }
222 } 242 }
223 } 243 }
224#ifdef PRINTPIPE 244#ifdef PRINTPIPE
225 if (keysym == XK_Print) { 245 if (keysym == XK_Print)
226 rxvt_scr_printscreen(aR_ ctrl | shft); 246 {
247 scr_printscreen (ctrl | shft);
227 return; 248 return;
228 } 249 }
229#endif 250#endif
230#ifdef GREEK_SUPPORT 251#ifdef GREEK_SUPPORT
231 if (keysym == R->ks_greekmodeswith) { 252 if (keysym == ks_greekmodeswith)
232 R->greek_mode = !R->greek_mode; 253 {
254 greek_mode = !greek_mode;
233 if (R->greek_mode) { 255 if (greek_mode)
234 rxvt_xterm_seq(aR_ XTerm_title, 256 {
257 xterm_seq (XTerm_title,
235 (greek_getmode() == GREEK_ELOT928 258 (greek_getmode() == GREEK_ELOT928
236 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); 259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
237 greek_reset(); 260 greek_reset();
238 } else 261 }
262 else
239 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
240 return; 264 return;
241 } 265 }
242#endif 266#endif
243 267
244 if (keysym >= 0xFF00 && keysym <= 0xFFFF) { 268 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
269 {
245#ifdef KEYSYM_RESOURCE 270#ifdef KEYSYM_RESOURCE
246 if (!(shft | ctrl) && R->Keysym_map[keysym & 0xFF] != NULL) { 271 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
247 unsigned int l; 272 {
273 unsigned int l;
248 const unsigned char *kbuf0; 274 const unsigned char *kbuf0;
249 const unsigned char ch = C0_ESC; 275 const unsigned char ch = C0_ESC;
250 276
251 kbuf0 = (R->Keysym_map[keysym & 0xFF]); 277 kbuf0 = (Keysym_map[keysym & 0xFF]);
252 l = (unsigned int)*kbuf0++; 278 l = (unsigned int)*kbuf0++;
253 279
254 /* escape prefix */ 280 /* escape prefix */
255 if (meta) 281 if (meta)
256# ifdef META8_OPTION 282# ifdef META8_OPTION
257 if (R->meta_char == C0_ESC) 283 if (meta_char == C0_ESC)
258# endif 284# endif
259 R->tt_write (&ch, 1); 285 tt_write (&ch, 1);
260 R->tt_write (kbuf0, l); 286 tt_write (kbuf0, l);
261 return; 287 return;
262 } else 288 }
289 else
263#endif 290#endif
264 { 291
265 newlen = 1; 292 {
266 switch (keysym) { 293 newlen = 1;
294 switch (keysym)
295 {
267#ifndef NO_BACKSPACE_KEY 296#ifndef NO_BACKSPACE_KEY
268 case XK_BackSpace: 297 case XK_BackSpace:
269 if (R->PrivateModes & PrivMode_HaveBackSpace) { 298 if (PrivateModes & PrivMode_HaveBackSpace)
299 {
270 kbuf[0] = (!!(R->PrivateModes & PrivMode_BackSpace) 300 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace)
271 ^ !!ctrl) ? '\b' : '\177'; 301 ^ !!ctrl) ? '\b' : '\177';
272 kbuf[1] = '\0'; 302 kbuf[1] = '\0';
273 } else 303 }
274 STRCPY(kbuf, R->key_backspace); 304 else
305 STRCPY(kbuf, key_backspace);
275# ifdef MULTICHAR_SET 306# ifdef MULTICHAR_SET
276 if ((R->Options & Opt_mc_hack) && R->screen.cur.col > 0) { 307 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
277 int col, row; 308 {
309 int col, row;
278 310
279 newlen = STRLEN(kbuf); 311 newlen = STRLEN(kbuf);
280 col = R->screen.cur.col - 1; 312 col = screen.cur.col - 1;
281 row = R->screen.cur.row + R->TermWin.saveLines; 313 row = screen.cur.row + TermWin.saveLines;
282 if (IS_MULTI2(R->screen.rend[row][col])) 314 if (IS_MULTI2(screen.rend[row][col]))
283 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 315 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
284 } 316 }
285# endif 317# endif
286 break; 318 break;
287#endif 319#endif
288#ifndef NO_DELETE_KEY 320#ifndef NO_DELETE_KEY
289 case XK_Delete: 321 case XK_Delete:
290 STRCPY(kbuf, R->key_delete); 322 STRCPY(kbuf, key_delete);
291# ifdef MULTICHAR_SET 323# ifdef MULTICHAR_SET
292 if (R->Options & Opt_mc_hack) { 324 if (Options & Opt_mc_hack)
293 int col, row; 325 {
294 326 int col, row;
295 newlen = STRLEN(kbuf); 327
296 col = R->screen.cur.col; 328 newlen = STRLEN(kbuf);
297 row = R->screen.cur.row + R->TermWin.saveLines; 329 col = screen.cur.col;
298 if (IS_MULTI1(R->screen.rend[row][col])) 330 row = screen.cur.row + TermWin.saveLines;
331 if (IS_MULTI1(screen.rend[row][col]))
299 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 332 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
300 } 333 }
301# endif 334# endif
302 break; 335 break;
303#endif 336#endif
304 case XK_Tab: 337 case XK_Tab:
305 if (shft) 338 if (shft)
306 STRCPY(kbuf, "\033[Z"); 339 STRCPY(kbuf, "\033[Z");
307 else { 340 else
341 {
308#ifdef CTRL_TAB_MAKES_META 342#ifdef CTRL_TAB_MAKES_META
309 if (ctrl) 343 if (ctrl)
310 meta = 1; 344 meta = 1;
311#endif 345#endif
312#ifdef MOD4_TAB_MAKES_META 346#ifdef MOD4_TAB_MAKES_META
313 if (ev->state & Mod4Mask) 347 if (ev.state & Mod4Mask)
314 meta = 1; 348 meta = 1;
315#endif 349#endif
316 newlen = 0; 350 newlen = 0;
317 } 351 }
318 break; 352 break;
319 353
320 354
321#ifdef XK_KP_Left 355#ifdef XK_KP_Left
322 case XK_KP_Up: /* \033Ox or standard */ 356 case XK_KP_Up: /* \033Ox or standard */
323 case XK_KP_Down: /* \033Or or standard */ 357 case XK_KP_Down: /* \033Or or standard */
324 case XK_KP_Right: /* \033Ov or standard */ 358 case XK_KP_Right: /* \033Ov or standard */
325 case XK_KP_Left: /* \033Ot or standard */ 359 case XK_KP_Left: /* \033Ot or standard */
326 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
327 STRCPY(kbuf, "\033OZ"); 361 {
328 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 362 STRCPY(kbuf, "\033OZ");
329 break; 363 kbuf[2] = ("txvr"[keysym - XK_KP_Left]);
330 } else 364 break;
365 }
366 else
331 /* translate to std. cursor key */ 367 /* translate to std. cursor key */
332 keysym = XK_Left + (keysym - XK_KP_Left); 368 keysym = XK_Left + (keysym - XK_KP_Left);
333 /* FALLTHROUGH */ 369 /* FALLTHROUGH */
334#endif 370#endif
335 case XK_Up: /* "\033[A" */ 371 case XK_Up: /* "\033[A" */
336 case XK_Down: /* "\033[B" */ 372 case XK_Down: /* "\033[B" */
337 case XK_Right: /* "\033[C" */ 373 case XK_Right: /* "\033[C" */
338 case XK_Left: /* "\033[D" */ 374 case XK_Left: /* "\033[D" */
339 STRCPY(kbuf, "\033[Z"); 375 STRCPY(kbuf, "\033[Z");
340 kbuf[2] = ("DACB"[keysym - XK_Left]); 376 kbuf[2] = ("DACB"[keysym - XK_Left]);
341 /* do Shift first */ 377 /* do Shift first */
342 if (shft) 378 if (shft)
343 kbuf[2] = ("dacb"[keysym - XK_Left]); 379 kbuf[2] = ("dacb"[keysym - XK_Left]);
344 else if (ctrl) { 380 else if (ctrl)
345 kbuf[1] = 'O'; 381 {
346 kbuf[2] = ("dacb"[keysym - XK_Left]); 382 kbuf[1] = 'O';
347 } else if (R->PrivateModes & PrivMode_aplCUR) 383 kbuf[2] = ("dacb"[keysym - XK_Left]);
348 kbuf[1] = 'O'; 384 }
385 else if (PrivateModes & PrivMode_aplCUR)
386 kbuf[1] = 'O';
349#ifdef MULTICHAR_SET 387#ifdef MULTICHAR_SET
350 //TODO: ?? 388 //TODO: ??
351 if (R->Options & Opt_mc_hack) { 389 if (Options & Opt_mc_hack)
352 int col, row, m; 390 {
391 int col, row, m;
353 392
354 col = R->screen.cur.col; 393 col = screen.cur.col;
355 row = R->screen.cur.row + R->TermWin.saveLines; 394 row = screen.cur.row + TermWin.saveLines;
356 m = 0; 395 m = 0;
357 if (keysym == XK_Right 396 if (keysym == XK_Right
358 && IS_MULTI1(R->screen.rend[row][col])) 397 && IS_MULTI1(screen.rend[row][col]))
359 m = 1; 398 m = 1;
360 else if (keysym == XK_Left) { 399 else if (keysym == XK_Left)
361 if (col > 0) { 400 {
362 if (IS_MULTI2(R->screen.rend[row][col - 1])) 401 if (col > 0)
363 m = 1; 402 {
364 } else if (R->screen.cur.row > 0) { 403 if (IS_MULTI2(screen.rend[row][col - 1]))
365 col = R->screen.tlen[--row]; 404 m = 1;
366 if (col == -1) 405 }
367 col = R->TermWin.ncol - 1; 406 else if (screen.cur.row > 0)
368 else 407 {
369 col--; 408 col = screen.tlen[--row];
370 if (col > 0 409 if (col == -1)
371 && IS_MULTI2(R->screen.rend[row][col])) 410 col = TermWin.ncol - 1;
372 m = 1; 411 else
373 } 412 col--;
374 } 413 if (col > 0
375 if (m) 414 && IS_MULTI2(screen.rend[row][col]))
376 MEMMOVE(kbuf + 3, kbuf, 3 + 1); 415 m = 1;
377 } 416 }
417 }
418 if (m)
419 MEMMOVE(kbuf + 3, kbuf, 3 + 1);
420 }
378#endif 421#endif
379 break; 422 break;
380 423
381#ifndef UNSHIFTED_SCROLLKEYS 424#ifndef UNSHIFTED_SCROLLKEYS
382# ifdef XK_KP_Prior 425# ifdef XK_KP_Prior
383 case XK_KP_Prior: 426 case XK_KP_Prior:
384 /* allow shift to override */ 427 /* allow shift to override */
385 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 428 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
386 STRCPY(kbuf, "\033Oy"); 429 {
387 break; 430 STRCPY(kbuf, "\033Oy");
388 } 431 break;
389 /* FALLTHROUGH */ 432 }
433 /* FALLTHROUGH */
390# endif 434# endif
391 case XK_Prior: 435 case XK_Prior:
392 STRCPY(kbuf, "\033[5~"); 436 STRCPY(kbuf, "\033[5~");
393 break; 437 break;
394# ifdef XK_KP_Next 438# ifdef XK_KP_Next
395 case XK_KP_Next: 439 case XK_KP_Next:
396 /* allow shift to override */ 440 /* allow shift to override */
397 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 441 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
398 STRCPY(kbuf, "\033Os"); 442 {
399 break; 443 STRCPY(kbuf, "\033Os");
400 } 444 break;
401 /* FALLTHROUGH */ 445 }
446 /* FALLTHROUGH */
402# endif 447# endif
403 case XK_Next: 448 case XK_Next:
404 STRCPY(kbuf, "\033[6~"); 449 STRCPY(kbuf, "\033[6~");
405 break; 450 break;
406#endif 451#endif
407 case XK_KP_Enter: 452 case XK_KP_Enter:
408 /* allow shift to override */ 453 /* allow shift to override */
409 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
410 STRCPY(kbuf, "\033OM"); 455 {
411 } else { 456 STRCPY(kbuf, "\033OM");
412 kbuf[0] = '\r'; 457 }
413 kbuf[1] = '\0'; 458 else
414 } 459 {
415 break; 460 kbuf[0] = '\r';
461 kbuf[1] = '\0';
462 }
463 break;
416 464
417#ifdef XK_KP_Begin 465#ifdef XK_KP_Begin
418 case XK_KP_Begin: 466 case XK_KP_Begin:
419 STRCPY(kbuf, "\033Ou"); 467 STRCPY(kbuf, "\033Ou");
420 break; 468 break;
421 469
422 case XK_KP_Insert: 470 case XK_KP_Insert:
423 STRCPY(kbuf, "\033Op"); 471 STRCPY(kbuf, "\033Op");
424 break; 472 break;
425 473
426 case XK_KP_Delete: 474 case XK_KP_Delete:
427 STRCPY(kbuf, "\033On"); 475 STRCPY(kbuf, "\033On");
428 break; 476 break;
429#endif 477#endif
430 case XK_KP_F1: /* "\033OP" */ 478 case XK_KP_F1: /* "\033OP" */
431 case XK_KP_F2: /* "\033OQ" */ 479 case XK_KP_F2: /* "\033OQ" */
432 case XK_KP_F3: /* "\033OR" */ 480 case XK_KP_F3: /* "\033OR" */
433 case XK_KP_F4: /* "\033OS" */ 481 case XK_KP_F4: /* "\033OS" */
434 STRCPY(kbuf, "\033OP"); 482 STRCPY(kbuf, "\033OP");
435 kbuf[2] += (keysym - XK_KP_F1); 483 kbuf[2] += (keysym - XK_KP_F1);
436 break; 484 break;
437 485
438 case XK_KP_Multiply: /* "\033Oj" : "*" */ 486 case XK_KP_Multiply: /* "\033Oj" : "*" */
439 case XK_KP_Add: /* "\033Ok" : "+" */ 487 case XK_KP_Add: /* "\033Ok" : "+" */
440 case XK_KP_Separator: /* "\033Ol" : "," */ 488 case XK_KP_Separator: /* "\033Ol" : "," */
441 case XK_KP_Subtract: /* "\033Om" : "-" */ 489 case XK_KP_Subtract: /* "\033Om" : "-" */
442 case XK_KP_Decimal: /* "\033On" : "." */ 490 case XK_KP_Decimal: /* "\033On" : "." */
443 case XK_KP_Divide: /* "\033Oo" : "/" */ 491 case XK_KP_Divide: /* "\033Oo" : "/" */
444 case XK_KP_0: /* "\033Op" : "0" */ 492 case XK_KP_0: /* "\033Op" : "0" */
445 case XK_KP_1: /* "\033Oq" : "1" */ 493 case XK_KP_1: /* "\033Oq" : "1" */
446 case XK_KP_2: /* "\033Or" : "2" */ 494 case XK_KP_2: /* "\033Or" : "2" */
447 case XK_KP_3: /* "\033Os" : "3" */ 495 case XK_KP_3: /* "\033Os" : "3" */
448 case XK_KP_4: /* "\033Ot" : "4" */ 496 case XK_KP_4: /* "\033Ot" : "4" */
449 case XK_KP_5: /* "\033Ou" : "5" */ 497 case XK_KP_5: /* "\033Ou" : "5" */
450 case XK_KP_6: /* "\033Ov" : "6" */ 498 case XK_KP_6: /* "\033Ov" : "6" */
451 case XK_KP_7: /* "\033Ow" : "7" */ 499 case XK_KP_7: /* "\033Ow" : "7" */
452 case XK_KP_8: /* "\033Ox" : "8" */ 500 case XK_KP_8: /* "\033Ox" : "8" */
453 case XK_KP_9: /* "\033Oy" : "9" */ 501 case XK_KP_9: /* "\033Oy" : "9" */
454 /* allow shift to override */ 502 /* allow shift to override */
455 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 503 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
456 STRCPY(kbuf, "\033Oj"); 504 {
457 kbuf[2] += (keysym - XK_KP_Multiply); 505 STRCPY(kbuf, "\033Oj");
458 } else { 506 kbuf[2] += (keysym - XK_KP_Multiply);
507 }
508 else
509 {
459 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 510 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
460 kbuf[1] = '\0'; 511 kbuf[1] = '\0';
461 } 512 }
462 break; 513 break;
463 514
464 case XK_Find: 515 case XK_Find:
465 STRCPY(kbuf, "\033[1~"); 516 STRCPY(kbuf, "\033[1~");
466 break; 517 break;
467 case XK_Insert: 518 case XK_Insert:
468 STRCPY(kbuf, "\033[2~"); 519 STRCPY(kbuf, "\033[2~");
469 break; 520 break;
470#ifdef DXK_Remove /* support for DEC remove like key */ 521#ifdef DXK_Remove /* support for DEC remove like key */
471 case DXK_Remove: 522 case DXK_Remove:
472 /* FALLTHROUGH */ 523 /* FALLTHROUGH */
473#endif 524#endif
474 case XK_Execute: 525 case XK_Execute:
475 STRCPY(kbuf, "\033[3~"); 526 STRCPY(kbuf, "\033[3~");
476 break; 527 break;
477 case XK_Select: 528 case XK_Select:
478 STRCPY(kbuf, "\033[4~"); 529 STRCPY(kbuf, "\033[4~");
479 break; 530 break;
480#ifdef XK_KP_End 531#ifdef XK_KP_End
481 case XK_KP_End: 532 case XK_KP_End:
482 /* allow shift to override */ 533 /* allow shift to override */
483 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 534 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
484 STRCPY(kbuf, "\033Oq"); 535 {
485 break; 536 STRCPY(kbuf, "\033Oq");
486 } 537 break;
487 /* FALLTHROUGH */ 538 }
539 /* FALLTHROUGH */
488#endif 540#endif
489 case XK_End: 541 case XK_End:
490 STRCPY(kbuf, KS_END); 542 STRCPY(kbuf, KS_END);
491 break; 543 break;
492#ifdef XK_KP_Home 544#ifdef XK_KP_Home
493 case XK_KP_Home: 545 case XK_KP_Home:
494 /* allow shift to override */ 546 /* allow shift to override */
495 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 547 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
496 STRCPY(kbuf, "\033Ow"); 548 {
497 break; 549 STRCPY(kbuf, "\033Ow");
498 } 550 break;
499 /* FALLTHROUGH */ 551 }
552 /* FALLTHROUGH */
500#endif 553#endif
501 case XK_Home: 554 case XK_Home:
502 STRCPY(kbuf, KS_HOME); 555 STRCPY(kbuf, KS_HOME);
503 break; 556 break;
504 557
505#define FKEY(n, fkey) \ 558#define FKEY(n, fkey) \
506 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 559 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey)))
507 560
508 case XK_F1: /* "\033[11~" */ 561 case XK_F1: /* "\033[11~" */
509 case XK_F2: /* "\033[12~" */ 562 case XK_F2: /* "\033[12~" */
510 case XK_F3: /* "\033[13~" */ 563 case XK_F3: /* "\033[13~" */
511 case XK_F4: /* "\033[14~" */ 564 case XK_F4: /* "\033[14~" */
512 case XK_F5: /* "\033[15~" */ 565 case XK_F5: /* "\033[15~" */
513 FKEY(11, XK_F1); 566 FKEY(11, XK_F1);
514 break; 567 break;
515 case XK_F6: /* "\033[17~" */ 568 case XK_F6: /* "\033[17~" */
516 case XK_F7: /* "\033[18~" */ 569 case XK_F7: /* "\033[18~" */
517 case XK_F8: /* "\033[19~" */ 570 case XK_F8: /* "\033[19~" */
518 case XK_F9: /* "\033[20~" */ 571 case XK_F9: /* "\033[20~" */
519 case XK_F10: /* "\033[21~" */ 572 case XK_F10: /* "\033[21~" */
520 FKEY(17, XK_F6); 573 FKEY(17, XK_F6);
521 break; 574 break;
522 case XK_F11: /* "\033[23~" */ 575 case XK_F11: /* "\033[23~" */
523 case XK_F12: /* "\033[24~" */ 576 case XK_F12: /* "\033[24~" */
524 case XK_F13: /* "\033[25~" */ 577 case XK_F13: /* "\033[25~" */
525 case XK_F14: /* "\033[26~" */ 578 case XK_F14: /* "\033[26~" */
526 FKEY(23, XK_F11); 579 FKEY(23, XK_F11);
527 break; 580 break;
528 case XK_F15: /* "\033[28~" */ 581 case XK_F15: /* "\033[28~" */
529 case XK_F16: /* "\033[29~" */ 582 case XK_F16: /* "\033[29~" */
530 FKEY(28, XK_F15); 583 FKEY(28, XK_F15);
531 break; 584 break;
532 case XK_Help: /* "\033[28~" */ 585 case XK_Help: /* "\033[28~" */
533 FKEY(28, XK_Help); 586 FKEY(28, XK_Help);
534 break; 587 break;
535 case XK_Menu: /* "\033[29~" */ 588 case XK_Menu: /* "\033[29~" */
536 FKEY(29, XK_Menu); 589 FKEY(29, XK_Menu);
537 break; 590 break;
538 case XK_F17: /* "\033[31~" */ 591 case XK_F17: /* "\033[31~" */
539 case XK_F18: /* "\033[32~" */ 592 case XK_F18: /* "\033[32~" */
540 case XK_F19: /* "\033[33~" */ 593 case XK_F19: /* "\033[33~" */
541 case XK_F20: /* "\033[34~" */ 594 case XK_F20: /* "\033[34~" */
542 case XK_F21: /* "\033[35~" */ 595 case XK_F21: /* "\033[35~" */
543 case XK_F22: /* "\033[36~" */ 596 case XK_F22: /* "\033[36~" */
544 case XK_F23: /* "\033[37~" */ 597 case XK_F23: /* "\033[37~" */
545 case XK_F24: /* "\033[38~" */ 598 case XK_F24: /* "\033[38~" */
546 case XK_F25: /* "\033[39~" */ 599 case XK_F25: /* "\033[39~" */
547 case XK_F26: /* "\033[40~" */ 600 case XK_F26: /* "\033[40~" */
548 case XK_F27: /* "\033[41~" */ 601 case XK_F27: /* "\033[41~" */
549 case XK_F28: /* "\033[42~" */ 602 case XK_F28: /* "\033[42~" */
550 case XK_F29: /* "\033[43~" */ 603 case XK_F29: /* "\033[43~" */
551 case XK_F30: /* "\033[44~" */ 604 case XK_F30: /* "\033[44~" */
552 case XK_F31: /* "\033[45~" */ 605 case XK_F31: /* "\033[45~" */
553 case XK_F32: /* "\033[46~" */ 606 case XK_F32: /* "\033[46~" */
554 case XK_F33: /* "\033[47~" */ 607 case XK_F33: /* "\033[47~" */
555 case XK_F34: /* "\033[48~" */ 608 case XK_F34: /* "\033[48~" */
556 case XK_F35: /* "\033[49~" */ 609 case XK_F35: /* "\033[49~" */
557 FKEY(31, XK_F17); 610 FKEY(31, XK_F17);
558 break; 611 break;
559#undef FKEY 612#undef FKEY
560 default: 613 default:
561 newlen = 0; 614 newlen = 0;
562 break; 615 break;
563 } 616 }
564 if (newlen) 617 if (newlen)
565 len = STRLEN(kbuf); 618 len = STRLEN(kbuf);
566 } 619 }
567 /* 620 /*
568 * Pass meta for all function keys, if 'meta' option set 621 * Pass meta for all function keys, if 'meta' option set
569 */ 622 */
570#ifdef META8_OPTION 623#ifdef META8_OPTION
571 if (meta && (R->meta_char == 0x80) && len > 0) 624 if (meta && (meta_char == 0x80) && len > 0)
572 kbuf[len - 1] |= 0x80; 625 kbuf[len - 1] |= 0x80;
573#endif 626#endif
627
628 }
574 } else if (ctrl && keysym == XK_minus) { 629 else if (ctrl && keysym == XK_minus)
630 {
575 len = 1; 631 len = 1;
576 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 632 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
577 } else { 633 }
634 else
635 {
578#ifdef META8_OPTION 636#ifdef META8_OPTION
579 /* set 8-bit on */ 637 /* set 8-bit on */
580 if (meta && (R->meta_char == 0x80)) { 638 if (meta && (meta_char == 0x80))
581 unsigned char *ch; 639 {
640 unsigned char *ch;
582 641
583 for (ch = kbuf; ch < kbuf + len; ch++) 642 for (ch = kbuf; ch < kbuf + len; ch++)
584 *ch |= 0x80; 643 *ch |= 0x80;
585 meta = 0; 644 meta = 0;
586 } 645 }
587#endif 646#endif
588#ifdef GREEK_SUPPORT 647#ifdef GREEK_SUPPORT
589 if (R->greek_mode) 648 if (greek_mode)
590 len = greek_xlat(kbuf, len); 649 len = greek_xlat(kbuf, len);
591#endif 650#endif
592 /* nil */ ; 651 /* nil */ ;
593 } 652 }
653 }
654
655 if (len <= 0)
656 return; /* not mapped */
657
658 if (Options & Opt_scrollTtyKeypress)
659 if (TermWin.view_start)
660 {
661 TermWin.view_start = 0;
662 want_refresh = 1;
594 } 663 }
595 664
596 if (len <= 0) 665 /*
597 return; /* not mapped */
598
599 if (R->Options & Opt_scrollTtyKeypress)
600 if (R->TermWin.view_start) {
601 R->TermWin.view_start = 0;
602 R->want_refresh = 1;
603 }
604
605/*
606 * these modifications only affect the static keybuffer 666 * these modifications only affect the static keybuffer
607 * pass Shift/Control indicators for function keys ending with `~' 667 * pass Shift/Control indicators for function keys ending with `~'
608 * 668 *
609 * eg, 669 * eg,
610 * Prior = "ESC[5~" 670 * Prior = "ESC[5~"
611 * Shift+Prior = "ESC[5$" 671 * Shift+Prior = "ESC[5$"
612 * Ctrl+Prior = "ESC[5^" 672 * Ctrl+Prior = "ESC[5^"
613 * Ctrl+Shift+Prior = "ESC[5@" 673 * Ctrl+Shift+Prior = "ESC[5@"
614 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 674 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
615 */ 675 */
616 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~') 676 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
617 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 677 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
618 678
619/* escape prefix */ 679 /* escape prefix */
620 if (meta 680 if (meta
621#ifdef META8_OPTION 681#ifdef META8_OPTION
622 && (R->meta_char == C0_ESC) 682 && (meta_char == C0_ESC)
623#endif 683#endif
624 ) { 684 )
685 {
625 const unsigned char ch = C0_ESC; 686 const unsigned char ch = C0_ESC;
626 687
627 R->tt_write(&ch, 1); 688 tt_write(&ch, 1);
628 } 689 }
629#ifdef DEBUG_CMD 690#ifdef DEBUG_CMD
691 if (debug_key)
630 if (debug_key) { /* Display keyboard buffer contents */ 692 { /* Display keyboard buffer contents */
631 char *p; 693 char *p;
632 int i; 694 int i;
633 695
634 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 696 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
635 for (i = 0, p = kbuf; i < len; i++, p++) 697 for (i = 0, p = kbuf; i < len; i++, p++)
636 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 698 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
637 fprintf(stderr, "'\n"); 699 fprintf(stderr, "'\n");
638 } 700 }
639#endif /* DEBUG_CMD */ 701#endif /* DEBUG_CMD */
640 R->tt_write (kbuf, (unsigned int)len); 702 tt_write (kbuf, (unsigned int)len);
641} 703}
642/*}}} */ 704/*}}} */
643 705
644#if (MENUBAR_MAX) 706#if (MENUBAR_MAX)
645/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 707/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
646/* attempt to `write' count to the input buffer */ 708/* attempt to `write' count to the input buffer */
647/* EXTPROTO */
648unsigned int 709unsigned int
649rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count) 710rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
650{ 711{
651 unsigned int n, s; 712 unsigned int n, s;
652 unsigned char *cmdbuf_base = R->cmdbuf_base,
653 *cmdbuf_endp = R->cmdbuf_endp,
654 *cmdbuf_ptr = R->cmdbuf_ptr;
655 713
656 n = cmdbuf_ptr - cmdbuf_base; 714 n = cmdbuf_ptr - cmdbuf_base;
657 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
658 if (n > 0 && s < count) { 716 if (n > 0 && s < count)
717 {
659 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 718 MEMMOVE(cmdbuf_base, cmdbuf_ptr,
660 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 719 (unsigned int)(cmdbuf_endp - cmdbuf_ptr));
661 cmdbuf_ptr = cmdbuf_base; 720 cmdbuf_ptr = cmdbuf_base;
662 cmdbuf_endp -= n; 721 cmdbuf_endp -= n;
663 s += n; 722 s += n;
664 } 723 }
665 if (count > s) { 724 if (count > s)
725 {
666 rxvt_print_error("data loss: cmd_write too large"); 726 rxvt_print_error("data loss: cmd_write too large");
667 count = s; 727 count = s;
668 } 728 }
669 for (; count--;) 729 for (; count--;)
670 *cmdbuf_endp++ = *str++; 730 *cmdbuf_endp++ = *str++;
671 R->cmdbuf_ptr = cmdbuf_ptr;
672 R->cmdbuf_endp = cmdbuf_endp;
673 return 0; 731 return 0;
674} 732}
675#endif /* MENUBAR_MAX */ 733#endif /* MENUBAR_MAX */
676 734
677void 735void
678rxvt_term::flush () 736rxvt_term::flush ()
… …
688#endif 746#endif
689 747
690 if (want_refresh) 748 if (want_refresh)
691 { 749 {
692 scr_refresh (refresh_type); 750 scr_refresh (refresh_type);
693 rxvt_scrollbar_show (this, 1); 751 scrollbar_show (1);
694#ifdef USE_XIM 752#ifdef USE_XIM
695 rxvt_IMSendSpot (this); 753 IMSendSpot ();
696#endif 754#endif
697 }
698 755
756 }
757
699 XFlush (Xdisplay); 758 XFlush (display->display);
700} 759}
701 760
702void 761void
703rxvt_term::check_cb (check_watcher &w) 762rxvt_term::check_cb (check_watcher &w)
704{ 763{
705 SET_R (this); 764 SET_R (this);
706 SET_LOCALE (locale); 765 SET_LOCALE (locale);
707 766
708 flush (); 767 flush ();
709}
710
711void
712rxvt_term::process_x_events ()
713{
714 do
715 {
716 XEvent xev;
717
718 XNextEvent (Xdisplay, &xev);
719
720#if defined(CURSOR_BLINK)
721 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
722 {
723 if (hidden_cursor)
724 {
725 hidden_cursor = 0;
726 want_refresh = 1;
727 }
728
729 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
730 }
731#endif
732
733#if defined(POINTER_BLANK)
734 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
735 {
736 if (xev.type == MotionNotify
737 || xev.type == ButtonPress
738 || xev.type == ButtonRelease)
739 if (hidden_pointer)
740 pointer_unblank ();
741
742 if (xev.type == KeyPress && hidden_pointer == 0)
743 pointer_blank ();
744 }
745#endif
746
747#ifdef USE_XIM
748 if (!XFilterEvent (&xev, xev.xany.window))
749#endif
750 rxvt_process_x_event (this, &xev);
751 }
752 while (XPending (Xdisplay));
753} 768}
754 769
755#ifdef CURSOR_BLINK 770#ifdef CURSOR_BLINK
756void 771void
757rxvt_term::cursor_blink_cb (time_watcher &w) 772rxvt_term::cursor_blink_cb (time_watcher &w)
… …
774 w.start (w.at + TEXT_BLINK_INTERVAL); 789 w.start (w.at + TEXT_BLINK_INTERVAL);
775 } 790 }
776} 791}
777#endif 792#endif
778 793
779void
780rxvt_term::x_cb (io_watcher &w, short revents)
781{
782 SET_R (this);
783 SET_LOCALE (locale);
784
785 process_x_events ();
786}
787
788bool 794bool
789rxvt_term::pty_fill () 795rxvt_term::pty_fill ()
790{ 796{
791 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 797 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
792 798
793 memmove (cmdbuf_base, cmdbuf_ptr, n); 799 memmove (cmdbuf_base, cmdbuf_ptr, n);
794 cmdbuf_ptr = cmdbuf_base; 800 cmdbuf_ptr = cmdbuf_base;
795 cmdbuf_endp = cmdbuf_ptr + n; 801 cmdbuf_endp = cmdbuf_ptr + n;
796 802
797 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 803 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
798 804
799 if (n > 0) 805 if (n > 0)
800 { 806 {
801 cmdbuf_endp += n; 807 cmdbuf_endp += n;
… …
871 refreshnow = true; 877 refreshnow = true;
872 flag = false; 878 flag = false;
873 ch = NOCHAR; 879 ch = NOCHAR;
874 break; 880 break;
875 } 881 }
882
883 // scr_add_lines only works for nlines < TermWin.nrow - 1.
884 if (nlines >= TermWin.nrow - 1)
885 {
886 scr_add_lines (buf, nlines, str - buf);
887 nlines = 0;
888 str = buf;
889 }
876 } 890 }
877 891
878 if (str >= buf + BUFSIZ) 892 if (str >= buf + BUFSIZ)
879 { 893 {
880 ch = NOCHAR; 894 ch = NOCHAR;
881 break; 895 break;
882 } 896 }
883 } 897 }
884 } 898 }
885 899
886 rxvt_scr_add_lines (this, buf, nlines, str - buf); 900 scr_add_lines (buf, nlines, str - buf);
887 901
888 /* 902 /*
889 * If there have been a lot of new lines, then update the screen 903 * If there have been a lot of new lines, then update the screen
890 * What the heck I'll cheat and only refresh less than every page-full. 904 * What the heck I'll cheat and only refresh less than every page-full.
891 * the number of pages between refreshes is refresh_limit, which 905 * the number of pages between refreshes is refresh_limit, which
… …
906 else 920 else
907 { 921 {
908 switch (ch) 922 switch (ch)
909 { 923 {
910 default: 924 default:
911 rxvt_process_nonprinting (this, ch); 925 process_nonprinting (ch);
912 break; 926 break;
913 case C0_ESC: /* escape char */ 927 case C0_ESC: /* escape char */
914 rxvt_process_escape_seq (this); 928 process_escape_seq ();
915 break; 929 break;
916 /*case 0x9b: */ /* CSI */ 930 /*case 0x9b: */ /* CSI */
917 /* rxvt_process_csi_seq (this); */ 931 /* process_csi_seq (); */
918 } 932 }
919 933
920 ch = NOCHAR; 934 ch = NOCHAR;
921 } 935 }
922 } 936 }
… …
933 { 947 {
934 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 948 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
935 return *cmdbuf_ptr++; 949 return *cmdbuf_ptr++;
936 950
937 wchar_t wc; 951 wchar_t wc;
938 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 952 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
939 953
940 if (len == (size_t)-2) 954 if (len == (size_t)-2)
941 return NOCHAR; 955 return NOCHAR;
942 956
943 if (len == (size_t)-1) 957 if (len == (size_t)-1)
… …
954/* rxvt_cmd_getc() - Return next input character */ 968/* rxvt_cmd_getc() - Return next input character */
955/* 969/*
956 * Return the next input character after first passing any keyboard input 970 * Return the next input character after first passing any keyboard input
957 * to the command. 971 * to the command.
958 */ 972 */
959/* INTPROTO */
960uint32_t 973uint32_t
961rxvt_cmd_getc(pR) 974rxvt_term::cmd_getc ()
962{ 975{
963 for (;;) 976 for (;;)
964 { 977 {
965 uint32_t c = R->next_char (); 978 uint32_t c = next_char ();
966 if (c != NOCHAR) 979 if (c != NOCHAR)
967 return c; 980 return c;
968 981
969 // incomplete sequences should occur rarely, still, a better solution 982 // incomplete sequences should occur rarely, still, a better solution
970 // would be preferred. either setjmp/longjmp or better design. 983 // would be preferred. either setjmp/longjmp or better design.
971 fcntl (R->cmd_fd, F_SETFL, 0); 984 fcntl (cmd_fd, F_SETFL, 0);
972 R->pty_fill (); 985 pty_fill ();
973 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 986 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
974 }
975
976#if 0
977#define TIMEOUT_USEC 5000
978 fd_set readfds;
979 int quick_timeout, select_res;
980 int want_motion_time, want_keypress_time;
981 struct timeval value;
982#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
983 struct timeval tp;
984#endif
985
986 for (;;) {
987 /* loop until we can return something */
988
989 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
990 R->tt_write(NULL, 0);
991
992#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
993 if (R->mouse_slip_wheel_speed) {
994 quick_timeout = 1;
995 if (!R->mouse_slip_wheel_delay--
996 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN,
997 abs(R->mouse_slip_wheel_speed))) {
998 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
999 R->refresh_type |= SMOOTH_REFRESH;
1000 R->want_refresh = 1;
1001 } 987 }
1002 }
1003#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
1004#ifdef SELECTION_SCROLLING
1005 if (R->pending_scroll_selection) {
1006 quick_timeout = 1;
1007 if (!R->scroll_selection_delay--
1008 && rxvt_scr_page(aR_ R->scroll_selection_dir,
1009 R->scroll_selection_lines)) {
1010 R->selection_extend (R->selection_save_x,
1011 R->selection_save_y, R->selection_save_state);
1012 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1013 R->refresh_type |= SMOOTH_REFRESH;
1014 R->want_refresh = 1;
1015 }
1016 }
1017#endif
1018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1019 if (scrollbar_isUp() || scrollbar_isDn()) {
1020 quick_timeout = 1;
1021 if (!R->scroll_arrow_delay--
1022 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) {
1023 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1024 R->refresh_type |= SMOOTH_REFRESH;
1025 R->want_refresh = 1;
1026 }
1027 }
1028#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1029
1030#ifdef TRANSPARENT
1031 quick_timeout |= R->want_full_refresh;
1032#endif
1033#endif
1034} 988}
1035 989
1036#ifdef POINTER_BLANK 990#ifdef POINTER_BLANK
1037void 991void
1038rxvt_term::pointer_unblank () 992rxvt_term::pointer_unblank ()
1039{ 993{
1040 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 994 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1041 recolour_cursor (); 995 recolour_cursor ();
1042 996
1043 hidden_pointer = 0; 997 hidden_pointer = 0;
1044 998
1045 if (Options & Opt_pointerBlank) 999 if (Options & Opt_pointerBlank)
… …
1050rxvt_term::pointer_blank () 1004rxvt_term::pointer_blank ()
1051{ 1005{
1052 if (!(Options & Opt_pointerBlank)) 1006 if (!(Options & Opt_pointerBlank))
1053 return; 1007 return;
1054 1008
1055 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1009 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1056 XFlush (Xdisplay); 1010 XFlush (display->display);
1057 1011
1058 hidden_pointer = 1; 1012 hidden_pointer = 1;
1059} 1013}
1060 1014
1061void 1015void
… …
1066 1020
1067 pointer_blank (); 1021 pointer_blank ();
1068} 1022}
1069#endif 1023#endif
1070 1024
1071/* INTPROTO */
1072void 1025void
1073rxvt_mouse_report(pR_ const XButtonEvent *ev) 1026rxvt_term::mouse_report (const XButtonEvent &ev)
1074{ 1027{
1075 int button_number, key_state = 0; 1028 int button_number, key_state = 0;
1076 int x, y; 1029 int x, y;
1077 1030
1078 x = ev->x; 1031 x = ev.x;
1079 y = ev->y; 1032 y = ev.y;
1080 R->pixel_position (&x, &y); 1033 pixel_position (&x, &y);
1081 1034
1082 if (R->MEvent.button == AnyButton) { 1035 if (MEvent.button == AnyButton)
1036 {
1083 button_number = 3; 1037 button_number = 3;
1084 } else { 1038 }
1039 else
1040 {
1085 button_number = R->MEvent.button - Button1; 1041 button_number = MEvent.button - Button1;
1086 /* add 0x3D for wheel events, like xterm does */ 1042 /* add 0x3D for wheel events, like xterm does */
1087 if (button_number >= 3) 1043 if (button_number >= 3)
1088 button_number += (64 - 3); 1044 button_number += (64 - 3);
1089 } 1045 }
1090 1046
1091 if (R->PrivateModes & PrivMode_MouseX10) { 1047 if (PrivateModes & PrivMode_MouseX10)
1048 {
1092 /* 1049 /*
1093 * do not report ButtonRelease 1050 * do not report ButtonRelease
1094 * no state info allowed 1051 * no state info allowed
1095 */ 1052 */
1096 key_state = 0; 1053 key_state = 0;
1097 if (button_number == 3) 1054 if (button_number == 3)
1098 return; 1055 return;
1099 } else { 1056 }
1057 else
1058 {
1100 /* XTerm mouse reporting needs these values: 1059 /* XTerm mouse reporting needs these values:
1101 * 4 = Shift 1060 * 4 = Shift
1102 * 8 = Meta 1061 * 8 = Meta
1103 * 16 = Control 1062 * 16 = Control
1104 * plus will add in our own Double-Click reporting 1063 * plus will add in our own Double-Click reporting
1105 * 32 = Double Click 1064 * 32 = Double Click
1106 */ 1065 */
1107 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0) 1066 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1108 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0) 1067 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1109 + ((R->MEvent.state & ControlMask) ? 16 : 0); 1068 + ((MEvent.state & ControlMask) ? 16 : 0);
1110#ifdef MOUSE_REPORT_DOUBLECLICK 1069#ifdef MOUSE_REPORT_DOUBLECLICK
1111 key_state += ((R->MEvent.clicks > 1) ? 32 : 0); 1070 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1112#endif 1071#endif
1072
1113 } 1073 }
1114 1074
1115#ifdef DEBUG_MOUSEREPORT 1075#ifdef DEBUG_MOUSEREPORT
1116 fprintf(stderr, "Mouse ["); 1076 fprintf(stderr, "Mouse [");
1117 if (key_state & 16) 1077 if (key_state & 16)
1118 fputc('C', stderr); 1078 fputc('C', stderr);
1119 if (key_state & 4) 1079 if (key_state & 4)
1120 fputc('S', stderr); 1080 fputc('S', stderr);
1121 if (key_state & 8) 1081 if (key_state & 8)
1122 fputc('A', stderr); 1082 fputc('A', stderr);
1123 if (key_state & 32) 1083 if (key_state & 32)
1124 fputc('2', stderr); 1084 fputc('2', stderr);
1125 fprintf(stderr, "]: <%d>, %d/%d\n", 1085 fprintf(stderr, "]: <%d>, %d/%d\n",
1126 button_number, 1086 button_number,
1127 x + 1, 1087 x + 1,
1128 y + 1); 1088 y + 1);
1129#else 1089#else
1130 R->tt_printf("\033[M%c%c%c", 1090 tt_printf("\033[M%c%c%c",
1131 (32 + button_number + key_state), 1091 (32 + button_number + key_state),
1132 (32 + x + 1), 1092 (32 + x + 1),
1133 (32 + y + 1)); 1093 (32 + y + 1));
1134#endif 1094#endif
1135} 1095}
1136 1096
1137#ifdef USING_W11LIB 1097#ifdef USING_W11LIB
1138/* EXTPROTO */
1139void 1098void
1140rxvt_W11_process_x_event(XEvent *ev) 1099rxvt_W11_process_x_event(XEvent *ev)
1141{ 1100{
1142 rxvt_t *r = rxvt_get_r(); 1101 rxvt_t *r = rxvt_get_r();
1143 1102
1144 rxvt_process_x_event(aR_ ev); 1103 x_cb (*ev);
1145} 1104}
1146#endif 1105#endif
1147 1106
1148/*{{{ process an X event */ 1107/*{{{ process an X event */
1149/* INTPROTO */
1150void 1108void
1151rxvt_process_x_event(pR_ XEvent *ev) 1109rxvt_term::x_cb (XEvent &ev)
1152{ 1110{
1153 int i, want_timeout; 1111 SET_R (this);
1112 SET_LOCALE (locale);
1113
1114#if defined(CURSOR_BLINK)
1115 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1116 {
1117 if (hidden_cursor)
1118 {
1119 hidden_cursor = 0;
1120 want_refresh = 1;
1121 }
1122
1123 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1124 }
1125#endif
1126
1127#if defined(POINTER_BLANK)
1128 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1129 {
1130 if (ev.type == MotionNotify
1131 || ev.type == ButtonPress
1132 || ev.type == ButtonRelease)
1133 if (hidden_pointer)
1134 pointer_unblank ();
1135
1136 if (ev.type == KeyPress && hidden_pointer == 0)
1137 pointer_blank ();
1138 }
1139#endif
1140
1141#ifdef USE_XIM
1142 if (XFilterEvent (&ev, None))
1143 return;
1144#endif
1145
1154 Window unused_root, unused_child; 1146 Window unused_root, unused_child;
1155 int unused_root_x, unused_root_y; 1147 int unused_root_x, unused_root_y;
1156 unsigned int unused_mask; 1148 unsigned int unused_mask;
1157 1149
1158#ifdef DEBUG_X 1150#ifdef DEBUG_X
1159 const char *const eventnames[] = 1151 const char *const eventnames[] =
1160 { /* mason - this matches my system */ 1152 { /* mason - this matches my system */
1161 "", 1153 "",
1162 "", 1154 "",
1163 "KeyPress", 1155 "KeyPress",
1164 "KeyRelease", 1156 "KeyRelease",
1165 "ButtonPress", 1157 "ButtonPress",
1166 "ButtonRelease", 1158 "ButtonRelease",
1167 "MotionNotify", 1159 "MotionNotify",
1168 "EnterNotify", 1160 "EnterNotify",
1169 "LeaveNotify", 1161 "LeaveNotify",
1170 "FocusIn", 1162 "FocusIn",
1171 "FocusOut", 1163 "FocusOut",
1172 "KeymapNotify", 1164 "KeymapNotify",
1173 "Expose", 1165 "Expose",
1174 "GraphicsExpose", 1166 "GraphicsExpose",
1175 "NoExpose", 1167 "NoExpose",
1176 "VisibilityNotify", 1168 "VisibilityNotify",
1177 "CreateNotify", 1169 "CreateNotify",
1178 "DestroyNotify", 1170 "DestroyNotify",
1179 "UnmapNotify", 1171 "UnmapNotify",
1180 "MapNotify", 1172 "MapNotify",
1181 "MapRequest", 1173 "MapRequest",
1182 "ReparentNotify", 1174 "ReparentNotify",
1183 "ConfigureNotify", 1175 "ConfigureNotify",
1184 "ConfigureRequest", 1176 "ConfigureRequest",
1185 "GravityNotify", 1177 "GravityNotify",
1186 "ResizeRequest", 1178 "ResizeRequest",
1187 "CirculateNotify", 1179 "CirculateNotify",
1188 "CirculateRequest", 1180 "CirculateRequest",
1189 "PropertyNotify", 1181 "PropertyNotify",
1190 "SelectionClear", 1182 "SelectionClear",
1191 "SelectionRequest", 1183 "SelectionRequest",
1192 "SelectionNotify", 1184 "SelectionNotify",
1193 "ColormapNotify", 1185 "ColormapNotify",
1194 "ClientMessage", 1186 "ClientMessage",
1195 "MappingNotify" 1187 "MappingNotify"
1196 }; 1188 };
1197#endif 1189#endif
1198 1190
1199#ifdef DEBUG_X 1191#ifdef DEBUG_X
1200 struct timeval tp; 1192 struct timeval tp;
1201 struct tm *ltt; 1193 struct tm *ltt;
1202 (void)gettimeofday(&tp, NULL); 1194 (void)gettimeofday(&tp, NULL);
1203 ltt = localtime(&(tp.tv_sec)); 1195 ltt = localtime(&(tp.tv_sec));
1204 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->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)); 1196 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));
1205#endif 1197#endif
1206 1198
1207 switch (ev->type) { 1199 switch (ev.type)
1200 {
1208 case KeyPress: 1201 case KeyPress:
1209 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1202 lookup_key (ev.xkey);
1210 break; 1203 break;
1211 1204
1212#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1205#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1213 case KeyRelease: 1206 case KeyRelease:
1214 { 1207 {
1215 if (!(ev->xkey.state & ControlMask)) 1208 if (!(ev.xkey.state & ControlMask))
1216 R->mouse_slip_wheel_speed = 0; 1209 mouse_slip_wheel_speed = 0;
1217 else { 1210 else
1218 KeySym ks; 1211 {
1219 1212 KeySym ks;
1213
1220 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1214 ks = XKeycodeToKeysym(display->display, ev.xkey.keycode, 0);
1221 if (ks == XK_Control_L || ks == XK_Control_R) 1215 if (ks == XK_Control_L || ks == XK_Control_R)
1222 R->mouse_slip_wheel_speed = 0; 1216 mouse_slip_wheel_speed = 0;
1223 } 1217 }
1224 break; 1218 break;
1225 } 1219 }
1226#endif 1220#endif
1227 1221
1228 case ButtonPress: 1222 case ButtonPress:
1229 rxvt_button_press(aR_ (XButtonEvent *)ev); 1223 button_press (ev.xbutton);
1230 break; 1224 break;
1231 1225
1232 case ButtonRelease: 1226 case ButtonRelease:
1233 rxvt_button_release(aR_ (XButtonEvent *)ev); 1227 button_release (ev.xbutton);
1234 break; 1228 break;
1235 1229
1236 case ClientMessage: 1230 case ClientMessage:
1237 if (ev->xclient.format == 32 1231 if (ev.xclient.format == 32
1238 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1232 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1239 R->destroy (); 1233 destroy ();
1240#ifdef OFFIX_DND 1234#ifdef OFFIX_DND
1241 /* OffiX Dnd (drag 'n' drop) protocol */ 1235 /* OffiX Dnd (drag 'n' drop) protocol */
1242 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1236 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1243 && (ev->xclient.data.l[0] == DndFile 1237 && (ev.xclient.data.l[0] == DndFile
1244 || ev->xclient.data.l[0] == DndDir 1238 || ev.xclient.data.l[0] == DndDir
1245 || ev->xclient.data.l[0] == DndLink)) { 1239 || ev.xclient.data.l[0] == DndLink))
1246 /* Get Dnd data */ 1240 {
1241 /* Get Dnd data */
1247 Atom ActualType; 1242 Atom ActualType;
1248 int ActualFormat; 1243 int ActualFormat;
1249 unsigned char *data; 1244 unsigned char *data;
1250 unsigned long Size, RemainingBytes; 1245 unsigned long Size, RemainingBytes;
1251 1246
1252 XGetWindowProperty(R->Xdisplay, Xroot, 1247 XGetWindowProperty(display->display, display->root,
1253 R->xa[XA_DNDSELECTION], 1248 xa[XA_DNDSELECTION],
1254 0L, 1000000L, 1249 0L, 1000000L,
1255 False, AnyPropertyType, 1250 False, AnyPropertyType,
1256 &ActualType, &ActualFormat, 1251 &ActualType, &ActualFormat,
1257 &Size, &RemainingBytes, 1252 &Size, &RemainingBytes,
1258 &data); 1253 &data);
1259 XChangeProperty(R->Xdisplay, Xroot, 1254 XChangeProperty(display->display, display->root,
1260 XA_CUT_BUFFER0, XA_STRING, 1255 XA_CUT_BUFFER0, XA_STRING,
1261 8, PropModeReplace, 1256 8, PropModeReplace,
1262 data, STRLEN(data)); 1257 data, STRLEN(data));
1263 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, True); 1258 selection_paste (display->root, XA_CUT_BUFFER0, True);
1264 XSetInputFocus(R->Xdisplay, Xroot, RevertToNone, CurrentTime); 1259 XSetInputFocus(display->display, display->root, RevertToNone, CurrentTime);
1265 } 1260 }
1266#endif /* OFFIX_DND */ 1261#endif /* OFFIX_DND */
1267 break; 1262 break;
1268 1263
1269 case MappingNotify: 1264 case MappingNotify:
1270 XRefreshKeyboardMapping(&(ev->xmapping)); 1265 XRefreshKeyboardMapping(&(ev.xmapping));
1271 break; 1266 break;
1272 1267
1273 /* 1268 /*
1274 * XXX: this is not the _current_ arrangement 1269 * XXX: this is not the _current_ arrangement
1275 * Here's my conclusion: 1270 * Here's my conclusion:
1276 * If the window is completely unobscured, use bitblt's 1271 * If the window is completely unobscured, use bitblt's
1277 * to scroll. Even then, they're only used when doing partial 1272 * to scroll. Even then, they're only used when doing partial
1278 * screen scrolling. When partially obscured, we have to fill 1273 * screen scrolling. When partially obscured, we have to fill
1279 * in the GraphicsExpose parts, which means that after each refresh, 1274 * in the GraphicsExpose parts, which means that after each refresh,
1280 * we need to wait for the graphics expose or Noexpose events, 1275 * we need to wait for the graphics expose or Noexpose events,
1281 * which ought to make things real slow! 1276 * which ought to make things real slow!
1282 */ 1277 */
1283 case VisibilityNotify: 1278 case VisibilityNotify:
1284 switch (ev->xvisibility.state) 1279 switch (ev.xvisibility.state)
1285 { 1280 {
1286 case VisibilityUnobscured: 1281 case VisibilityUnobscured:
1287 R->refresh_type = FAST_REFRESH; 1282 refresh_type = FAST_REFRESH;
1288 break; 1283 break;
1289 case VisibilityPartiallyObscured: 1284 case VisibilityPartiallyObscured:
1290 R->refresh_type = SLOW_REFRESH; 1285 refresh_type = SLOW_REFRESH;
1291 break; 1286 break;
1292 default: 1287 default:
1293 R->refresh_type = NO_REFRESH; 1288 refresh_type = NO_REFRESH;
1294 break; 1289 break;
1295 } 1290 }
1296 break; 1291 break;
1297 1292
1298 case FocusIn: 1293 case FocusIn:
1299 if (!R->TermWin.focus) { 1294 if (!TermWin.focus)
1300 R->TermWin.focus = 1; 1295 {
1301 R->want_refresh = 1; 1296 TermWin.focus = 1;
1297 want_refresh = 1;
1302#ifdef USE_XIM 1298#ifdef USE_XIM
1303 if (R->Input_Context != NULL) 1299 if (Input_Context != NULL)
1304 XSetICFocus(R->Input_Context); 1300 XSetICFocus(Input_Context);
1305#endif 1301#endif
1306#ifdef CURSOR_BLINK 1302#ifdef CURSOR_BLINK
1307 if (R->Options & Opt_cursorBlink) 1303 if (Options & Opt_cursorBlink)
1308 R->cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1304 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1309#endif 1305#endif
1310 }
1311 break;
1312 1306
1307 }
1308 break;
1309
1313 case FocusOut: 1310 case FocusOut:
1314 if (R->TermWin.focus) { 1311 if (TermWin.focus)
1315 R->TermWin.focus = 0; 1312 {
1316 R->want_refresh = 1; 1313 TermWin.focus = 0;
1314 want_refresh = 1;
1317#ifdef USE_XIM 1315#ifdef USE_XIM
1318 if (R->Input_Context != NULL) 1316 if (Input_Context != NULL)
1319 XUnsetICFocus(R->Input_Context); 1317 XUnsetICFocus(Input_Context);
1320#endif 1318#endif
1321#ifdef CURSOR_BLINK 1319#ifdef CURSOR_BLINK
1322 if (R->Options & Opt_cursorBlink) 1320 if (Options & Opt_cursorBlink)
1323 R->cursor_blink_ev.stop (); 1321 cursor_blink_ev.stop ();
1324 R->hidden_cursor = 0; 1322 hidden_cursor = 0;
1325#endif 1323#endif
1326 }
1327 break;
1328 1324
1325 }
1326 break;
1327
1329 case ConfigureNotify: 1328 case ConfigureNotify:
1330 if (ev->xconfigure.window == R->TermWin.parent[0]) { 1329 if (ev.xconfigure.window == TermWin.parent[0])
1331 int height, width; 1330 {
1331 int height, width;
1332 1332
1333 do
1333 do { /* Wrap lots of configures into one */ 1334 { /* Wrap lots of configures into one */
1334 width = ev->xconfigure.width; 1335 width = ev.xconfigure.width;
1335 height = ev->xconfigure.height; 1336 height = ev.xconfigure.height;
1336 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1337 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1337 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1338 }
1338 ConfigureNotify, ev)); 1339 while (XCheckTypedWindowEvent(display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1340
1339 if (R->szHint.width != width || R->szHint.height != height) { 1341 if (szHint.width != width || szHint.height != height)
1342 {
1340 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1343 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1341 R->resize_all_windows (width, height, 1); 1344 resize_all_windows (width, height, 1);
1342 } 1345 }
1343#ifdef DEBUG_SIZE 1346#ifdef DEBUG_SIZE
1344 else { 1347 else
1348 {
1345 D_SIZE((stderr, "Size: Not resizing")); 1349 D_SIZE((stderr, "Size: Not resizing"));
1346 } 1350 }
1347#endif 1351#endif
1348#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1352#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1349 if (R->Options & Opt_transparent) { 1353 if (Options & Opt_transparent)
1350 rxvt_check_our_parents(aR); 1354 {
1351 if (R->am_transparent) 1355 check_our_parents ();
1352 R->want_full_refresh = 1; 1356 if (am_transparent)
1353 } 1357 want_full_refresh = 1;
1358 }
1354#endif 1359#endif
1355 }
1356 break;
1357 1360
1361 }
1362 break;
1363
1358 case SelectionClear: 1364 case SelectionClear:
1359 rxvt_selection_clear(aR); 1365 selection_clear ();
1360 break; 1366 break;
1361 1367
1362 case SelectionNotify: 1368 case SelectionNotify:
1363 if (R->selection_wait == Sel_normal) 1369 if (selection_wait == Sel_normal)
1364 rxvt_selection_paste(aR_ ev->xselection.requestor, 1370 selection_paste (ev.xselection.requestor,
1365 ev->xselection.property, True); 1371 ev.xselection.property, True);
1366 break; 1372 break;
1367 1373
1368 case SelectionRequest: 1374 case SelectionRequest:
1369 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1375 selection_send (ev.xselectionrequest);
1370 break; 1376 break;
1371 1377
1372 case UnmapNotify: 1378 case UnmapNotify:
1373 R->TermWin.mapped = 0; 1379 TermWin.mapped = 0;
1374#ifdef TEXT_BLINK 1380#ifdef TEXT_BLINK
1375 R->text_blink_ev.stop (); 1381 text_blink_ev.stop ();
1376#endif 1382#endif
1377 break; 1383 break;
1378 1384
1379 case MapNotify: 1385 case MapNotify:
1380 R->TermWin.mapped = 1; 1386 TermWin.mapped = 1;
1381#ifdef TEXT_BLINK 1387#ifdef TEXT_BLINK
1382 R->text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1388 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1383#endif 1389#endif
1384 break; 1390 break;
1385 1391
1386 case PropertyNotify: 1392 case PropertyNotify:
1387 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) { 1393 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1388 if (ev->xproperty.state == PropertyNewValue) 1394 if (ev.xproperty.state == PropertyNewValue)
1389 rxvt_selection_property(aR_ ev->xproperty.window, 1395 selection_property (ev.xproperty.window, ev.xproperty.atom);
1390 ev->xproperty.atom);
1391 break; 1396 break;
1392 } 1397
1393#ifdef TRANSPARENT 1398#ifdef TRANSPARENT
1394 /*
1395 * if user used some Esetroot compatible prog to set the root bg,
1396 * use the property to determine the pixmap. We use it later on.
1397 */
1398 if (R->xa[XA_XROOTPMAPID] == 0)
1399 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay,
1400 "_XROOTPMAP_ID", False);
1401 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID])
1402 break;
1403 /* FALLTHROUGH */
1404 case ReparentNotify: 1399 case ReparentNotify:
1405 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1400 rootwin_cb (ev);
1406 if (R->am_transparent) 1401 break;
1407 R->want_full_refresh = 1;
1408 }
1409#endif /* TRANSPARENT */ 1402#endif /* TRANSPARENT */
1410 break;
1411 1403
1412 case GraphicsExpose: 1404 case GraphicsExpose:
1413 case Expose: 1405 case Expose:
1414 if (ev->xany.window == R->TermWin.vt) { 1406 if (ev.xany.window == TermWin.vt)
1407 {
1415#ifdef NO_SLOW_LINK_SUPPORT 1408#ifdef NO_SLOW_LINK_SUPPORT
1416 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1409 scr_expose (ev.xexpose.x, ev.xexpose.y,
1417 ev->xexpose.width, ev->xexpose.height, False); 1410 ev.xexpose.width, ev.xexpose.height, False);
1418#else 1411#else
1419 // don't understand this, so commented it out 1412 // don't understand this, so commented it out
1420 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1413 scr_expose (ev.xexpose.x, ev.xexpose.y,
1421 ev->xexpose.width, ev->xexpose.height, False); 1414 ev.xexpose.width, ev.xexpose.height, False);
1422 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1415 //scr_expose (ev.xexpose.x, 0,
1423 // ev->xexpose.width, R->TermWin.height, False); 1416 // ev.xexpose.width, TermWin.height, False);
1424#endif 1417#endif
1425 R->want_refresh = 1; 1418 want_refresh = 1;
1426 } else { 1419 }
1427 XEvent unused_xevent; 1420 else
1421 {
1422 XEvent unused_event;
1428 1423
1429 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1424 while (XCheckTypedWindowEvent(display->display, ev.xany.window,
1430 Expose, 1425 Expose,
1431 &unused_xevent)) ; 1426 &unused_event)) ;
1432 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1427 while (XCheckTypedWindowEvent(display->display, ev.xany.window,
1433 GraphicsExpose, 1428 GraphicsExpose,
1434 &unused_xevent)) ; 1429 &unused_event)) ;
1435 if (isScrollbarWindow(ev->xany.window)) { 1430 if (isScrollbarWindow(ev.xany.window))
1436 R->scrollBar.setIdle(); 1431 {
1437 rxvt_scrollbar_show(aR_ 0); 1432 scrollBar.setIdle();
1438 } 1433 scrollbar_show (0);
1434 }
1439#ifdef MENUBAR 1435#ifdef MENUBAR
1440 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1436 if (menubar_visible () && isMenuBarWindow(ev.xany.window))
1441 rxvt_menubar_expose(aR); 1437 menubar_expose ();
1442#endif 1438#endif
1443#ifdef RXVT_GRAPHICS 1439#ifdef RXVT_GRAPHICS
1444 rxvt_Gr_expose(aR_ ev->xany.window); 1440 Gr_expose (ev.xany.window);
1445#endif 1441#endif
1446 }
1447 break;
1448 1442
1443 }
1444 break;
1445
1449 case MotionNotify: 1446 case MotionNotify:
1450#ifdef POINTER_BLANK 1447#ifdef POINTER_BLANK
1451 if (R->hidden_pointer) 1448 if (hidden_pointer)
1452 R->pointer_unblank (); 1449 pointer_unblank ();
1453#endif 1450#endif
1454#if MENUBAR 1451#if MENUBAR
1455 if (isMenuBarWindow(ev->xany.window)) { 1452 if (isMenuBarWindow(ev.xany.window))
1456 rxvt_menubar_control(aR_ &(ev->xbutton)); 1453 {
1457 break; 1454 menubar_control (&(ev.xbutton));
1458 } 1455 break;
1456 }
1459#endif 1457#endif
1460 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate)) 1458 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate))
1461 break; 1459 break;
1462 1460
1463 if (ev->xany.window == R->TermWin.vt) { 1461 if (ev.xany.window == TermWin.vt)
1462 {
1464 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1463 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1465 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1464 {
1466 MotionNotify, ev)) ; 1465 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1467 XQueryPointer(R->Xdisplay, R->TermWin.vt, 1466 ;
1468 &unused_root, &unused_child, 1467
1469 &unused_root_x, &unused_root_y, 1468 XQueryPointer(display->display, TermWin.vt,
1470 &(ev->xbutton.x), &(ev->xbutton.y), 1469 &unused_root, &unused_child,
1471 &unused_mask); 1470 &unused_root_x, &unused_root_y,
1471 &(ev.xbutton.x), &(ev.xbutton.y),
1472 &unused_mask);
1472#ifdef MOUSE_THRESHOLD 1473#ifdef MOUSE_THRESHOLD
1473 /* deal with a `jumpy' mouse */ 1474 /* deal with a `jumpy' mouse */
1474 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1475 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1476 {
1475#endif 1477#endif
1476 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1478 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1477 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1479 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1478#ifdef SELECTION_SCROLLING 1480#ifdef SELECTION_SCROLLING
1479 if (ev->xbutton.y<R->TermWin.int_bwidth || 1481 if (ev.xbutton.y < TermWin.int_bwidth
1480 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1482 || Pixel2Row(ev.xbutton.y) > (TermWin.nrow-1))
1481 int dist;
1482
1483 R->pending_scroll_selection=1;
1484
1485 /* don't clobber the current delay if we are
1486 * already in the middle of scrolling.
1487 */
1488 if (R->scroll_selection_delay<=0)
1489 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1490
1491 /* save the event params so we can highlight
1492 * the selection in the pending-scroll loop
1493 */
1494 R->selection_save_x=ev->xbutton.x;
1495 R->selection_save_y=ev->xbutton.y;
1496 R->selection_save_state=
1497 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1498
1499 /* calc number of lines to scroll */
1500 if (ev->xbutton.y<R->TermWin.int_bwidth) {
1501 R->scroll_selection_dir = UP;
1502 dist = R->TermWin.int_bwidth - ev->xbutton.y;
1503 }
1504 else {
1505 R->scroll_selection_dir = DN;
1506 dist = ev->xbutton.y -
1507 (R->TermWin.int_bwidth + R->TermWin.height);
1508 }
1509 R->scroll_selection_lines=(Pixel2Height(dist)/
1510 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1511 MIN_IT(R->scroll_selection_lines,
1512 SELECTION_SCROLL_MAX_LINES);
1513 }
1514 else {
1515 /* we are within the text window, so we
1516 * shouldn't be scrolling
1517 */
1518 R->pending_scroll_selection = 0;
1519 }
1520#endif
1521#ifdef MOUSE_THRESHOLD
1522 }
1523#endif
1524 }
1525 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1526 while (XCheckTypedWindowEvent(R->Xdisplay, R->scrollBar.win,
1527 MotionNotify, ev)) ;
1528 XQueryPointer(R->Xdisplay, R->scrollBar.win,
1529 &unused_root, &unused_child,
1530 &unused_root_x, &unused_root_y,
1531 &(ev->xbutton.x), &(ev->xbutton.y),
1532 &unused_mask);
1533 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1534 scrollbar_size());
1535 R->scr_refresh (R->refresh_type);
1536 R->refresh_limit = 0;
1537 rxvt_scrollbar_show(aR_ 1);
1538 }
1539 break;
1540 }
1541}
1542
1543/* INTPROTO */
1544void
1545rxvt_button_press(pR_ XButtonEvent *ev)
1546{
1547 int reportmode = 0, clickintime;
1548
1549 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1550 if (!R->bypass_keystate)
1551 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1552/*
1553 * VT window processing of button press
1554 */
1555 if (ev->window == R->TermWin.vt)
1556 {
1557#if RXVT_GRAPHICS
1558 if (ev->subwindow != None)
1559 rxvt_Gr_ButtonPress (ev->x, ev->y);
1560 else
1561#endif
1562 {
1563 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1564 if (reportmode)
1565 {
1566 /* mouse report from vt window */
1567 /* save the xbutton state (for ButtonRelease) */
1568 R->MEvent.state = ev->state;
1569#ifdef MOUSE_REPORT_DOUBLECLICK
1570 if (ev->button == R->MEvent.button && clickintime)
1571 {
1572 /* same button, within alloted time */
1573 R->MEvent.clicks++;
1574 if (R->MEvent.clicks > 1)
1575 { 1483 {
1576 /* only report double clicks */ 1484 int dist;
1577 R->MEvent.clicks = 2;
1578 rxvt_mouse_report(aR_ ev);
1579 1485
1580 /* don't report the release */ 1486 pending_scroll_selection=1;
1581 R->MEvent.clicks = 0; 1487
1582 R->MEvent.button = AnyButton; 1488 /* don't clobber the current delay if we are
1583 } 1489 * already in the middle of scrolling.
1584 }
1585 else
1586 { 1490 */
1587 /* different button, or time expired */ 1491 if (scroll_selection_delay<=0)
1588 R->MEvent.clicks = 1; 1492 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1589 R->MEvent.button = ev->button; 1493
1590 rxvt_mouse_report(aR_ ev); 1494 /* save the event params so we can highlight
1591 } 1495 * the selection in the pending-scroll loop
1592#else
1593 R->MEvent.button = ev->button;
1594 rxvt_mouse_report(aR_ ev);
1595#endif /* MOUSE_REPORT_DOUBLECLICK */
1596 }
1597 else
1598 {
1599 if (ev->button != R->MEvent.button)
1600 R->MEvent.clicks = 0;
1601 switch (ev->button)
1602 { 1496 */
1603 case Button1: 1497 selection_save_x=ev.xbutton.x;
1604 /* allow shift+left click to extend selection */ 1498 selection_save_y=ev.xbutton.y;
1605 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report)) 1499 selection_save_state=
1500 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1501
1502 /* calc number of lines to scroll */
1503 if (ev.xbutton.y<TermWin.int_bwidth)
1606 { 1504 {
1607 if (R->MEvent.button == Button1 && clickintime) 1505 scroll_selection_dir = UP;
1608 R->selection_rotate (ev->x, ev->y); 1506 dist = TermWin.int_bwidth - ev.xbutton.y;
1609 else
1610 R->selection_extend (ev->x, ev->y, 1);
1611 } 1507 }
1612 else 1508 else
1613 { 1509 {
1614 if (R->MEvent.button == Button1 && clickintime) 1510 scroll_selection_dir = DN;
1615 R->MEvent.clicks++; 1511 dist = ev.xbutton.y -
1616 else 1512 (TermWin.int_bwidth + TermWin.height);
1617 R->MEvent.clicks = 1;
1618
1619 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1620 } 1513 }
1514 scroll_selection_lines=(Pixel2Height(dist)/
1515 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1516 MIN_IT(scroll_selection_lines,
1517 SELECTION_SCROLL_MAX_LINES);
1518 }
1519 else
1520 {
1521 /* we are within the text window, so we
1522 * shouldn't be scrolling
1523 */
1524 pending_scroll_selection = 0;
1525 }
1526#endif
1527#ifdef MOUSE_THRESHOLD
1621 1528
1529 }
1530#endif
1531
1532 }
1533 }
1534 else if (isScrollbarWindow(ev.xany.window) && scrollbar_isMotion())
1535 {
1536 while (XCheckTypedWindowEvent(display->display, scrollBar.win,
1537 MotionNotify, &ev)) ;
1538 XQueryPointer(display->display, scrollBar.win,
1539 &unused_root, &unused_child,
1540 &unused_root_x, &unused_root_y,
1541 &(ev.xbutton.x), &(ev.xbutton.y),
1542 &unused_mask);
1543 scr_move_to (scrollbar_position(ev.xbutton.y) - csrO,
1544 scrollbar_size());
1545 scr_refresh (refresh_type);
1546 refresh_limit = 0;
1547 scrollbar_show (1);
1548 }
1549 break;
1550 }
1551}
1552
1553void
1554rxvt_term::rootwin_cb (XEvent &ev)
1555{
1556 SET_R (this);
1557 SET_LOCALE (locale);
1558
1559 if (ev.type == PropertyNotify)
1560 {
1561 /*
1562 * if user used some Esetroot compatible prog to set the root bg,
1563 * use the property to determine the pixmap. We use it later on.
1564 */
1565 if (xa[XA_XROOTPMAPID] == 0)
1566 xa[XA_XROOTPMAPID] = XInternAtom(display->display, "_XROOTPMAP_ID", False);
1567
1568 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1569 return;
1570 }
1571
1572 if ((Options & Opt_transparent) && check_our_parents ())
1573 {
1574 if (am_transparent)
1575 want_full_refresh = 1;
1576 }
1577}
1578
1579void
1580rxvt_term::button_press (const XButtonEvent &ev)
1581{
1582 int reportmode = 0, clickintime;
1583
1584 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1585 if (!bypass_keystate)
1586 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1587 /*
1588 * VT window processing of button press
1589 */
1590 if (ev.window == TermWin.vt)
1591 {
1592#if RXVT_GRAPHICS
1593 if (ev.subwindow != None)
1594 rxvt_Gr_ButtonPress (ev.x, ev.y);
1595 else
1596#endif
1597
1598 {
1599 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1600 if (reportmode)
1601 {
1602 /* mouse report from vt window */
1603 /* save the xbutton state (for ButtonRelease) */
1604 MEvent.state = ev.state;
1605#ifdef MOUSE_REPORT_DOUBLECLICK
1606 if (ev.button == MEvent.button && clickintime)
1607 {
1608 /* same button, within alloted time */
1609 MEvent.clicks++;
1610 if (MEvent.clicks > 1)
1611 {
1612 /* only report double clicks */
1613 MEvent.clicks = 2;
1614 mouse_report (ev);
1615
1616 /* don't report the release */
1617 MEvent.clicks = 0;
1618 MEvent.button = AnyButton;
1619 }
1620 }
1621 else
1622 {
1623 /* different button, or time expired */
1624 MEvent.clicks = 1;
1625 MEvent.button = ev.button;
1626 mouse_report (ev);
1627 }
1628#else
1629 MEvent.button = ev.button;
1630 mouse_report (ev);
1631#endif /* MOUSE_REPORT_DOUBLECLICK */
1632
1633 }
1634 else
1635 {
1636 if (ev.button != MEvent.button)
1637 MEvent.clicks = 0;
1638 switch (ev.button)
1639 {
1640 case Button1:
1641 /* allow shift+left click to extend selection */
1642 if (ev.state & ShiftMask && !(PrivateModes & PrivMode_mouse_report))
1643 {
1644 if (MEvent.button == Button1 && clickintime)
1645 selection_rotate (ev.x, ev.y);
1646 else
1647 selection_extend (ev.x, ev.y, 1);
1648 }
1649 else
1650 {
1651 if (MEvent.button == Button1 && clickintime)
1652 MEvent.clicks++;
1653 else
1654 MEvent.clicks = 1;
1655
1656 selection_click (MEvent.clicks, ev.x, ev.y);
1657 }
1658
1622 R->MEvent.button = Button1; 1659 MEvent.button = Button1;
1660 break;
1661
1662 case Button3:
1663 if (MEvent.button == Button3 && clickintime)
1664 selection_rotate (ev.x, ev.y);
1665 else
1666 selection_extend (ev.x, ev.y, 1);
1667 MEvent.button = Button3;
1668 break;
1669 }
1670 }
1671 MEvent.time = ev.time;
1672 return;
1673 }
1674 }
1675
1676 /*
1677 * Scrollbar window processing of button press
1678 */
1679 if (isScrollbarWindow(ev.window))
1680 {
1681 scrollBar.setIdle ();
1682 /*
1683 * Rxvt-style scrollbar:
1684 * move up if mouse is above slider
1685 * move dn if mouse is below slider
1686 *
1687 * XTerm-style scrollbar:
1688 * Move display proportional to pointer location
1689 * pointer near top -> scroll one line
1690 * pointer near bot -> scroll full page
1691 */
1692#ifndef NO_SCROLLBAR_REPORT
1693 if (reportmode)
1694 {
1695 /*
1696 * Mouse report disabled scrollbar:
1697 * arrow buttons - send up/down
1698 * click on scrollbar - send pageup/down
1699 */
1700 if ((scrollBar.style == R_SB_NEXT
1701 && scrollbarnext_upButton(ev.y))
1702 || (scrollBar.style == R_SB_RXVT
1703 && scrollbarrxvt_upButton(ev.y)))
1704 tt_printf("\033[A");
1705 else if ((scrollBar.style == R_SB_NEXT
1706 && scrollbarnext_dnButton(ev.y))
1707 || (scrollBar.style == R_SB_RXVT
1708 && scrollbarrxvt_dnButton(ev.y)))
1709 tt_printf("\033[B");
1710 else
1711 switch (ev.button)
1712 {
1713 case Button2:
1714 tt_printf("\014");
1715 break;
1716 case Button1:
1717 tt_printf("\033[6~");
1718 break;
1719 case Button3:
1720 tt_printf("\033[5~");
1721 break;
1722 }
1723 }
1724 else
1725#endif /* NO_SCROLLBAR_REPORT */
1726
1727 {
1728 char upordown = 0;
1729
1730 if (scrollBar.style == R_SB_NEXT)
1731 {
1732 if (scrollbarnext_upButton(ev.y))
1733 upordown = -1; /* up */
1734 else if (scrollbarnext_dnButton(ev.y))
1735 upordown = 1; /* down */
1736 }
1737 else if (scrollBar.style == R_SB_RXVT)
1738 {
1739 if (scrollbarrxvt_upButton(ev.y))
1740 upordown = -1; /* up */
1741 else if (scrollbarrxvt_dnButton(ev.y))
1742 upordown = 1; /* down */
1743 }
1744 if (upordown)
1745 {
1746#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1747 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1748#endif
1749 if (scr_page (upordown < 0 ? UP : DN, 1))
1750 {
1751 if (upordown < 0)
1752 scrollBar.setUp ();
1753 else
1754 scrollBar.setDn ();
1755 }
1756 }
1757 else
1758 switch (ev.button)
1759 {
1760 case Button2:
1761 switch (scrollbar_align)
1762 {
1763 case R_SB_ALIGN_TOP:
1764 csrO = 0;
1623 break; 1765 break;
1624 1766 case R_SB_ALIGN_CENTRE:
1625 case Button3: 1767 csrO = (scrollBar.bot - scrollBar.top) / 2;
1626 if (R->MEvent.button == Button3 && clickintime)
1627 R->selection_rotate (ev->x, ev->y);
1628 else
1629 R->selection_extend (ev->x, ev->y, 1);
1630 R->MEvent.button = Button3;
1631 break; 1768 break;
1769 case R_SB_ALIGN_BOTTOM:
1770 csrO = scrollBar.bot - scrollBar.top;
1771 break;
1772 }
1773 if (scrollBar.style == R_SB_XTERM
1774 || scrollbar_above_slider(ev.y)
1775 || scrollbar_below_slider(ev.y))
1776 scr_move_to ( scrollbar_position(ev.y) - csrO,
1777 scrollbar_size());
1778 scrollBar.setMotion ();
1779 break;
1780
1781 case Button1:
1782 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1783 csrO = ev.y - scrollBar.top;
1784 /* FALLTHROUGH */
1785
1786 case Button3:
1787 if (scrollBar.style != R_SB_XTERM)
1788 {
1789 if (scrollbar_above_slider(ev.y))
1790# ifdef RXVT_SCROLL_FULL
1791 scr_page (UP, TermWin.nrow - 1);
1792# else
1793 scr_page (UP, TermWin.nrow / 4);
1794# endif
1795 else if (scrollbar_below_slider(ev.y))
1796# ifdef RXVT_SCROLL_FULL
1797 scr_page (DN, TermWin.nrow - 1);
1798# else
1799 scr_page (DN, TermWin.nrow / 4);
1800# endif
1801 else
1802 scrollBar.setMotion ();
1803 }
1804 else
1805 {
1806 scr_page ((ev.button == Button1 ? DN : UP),
1807 (TermWin.nrow
1808 * scrollbar_position(ev.y)
1809 / scrollbar_size()));
1810 }
1811 break;
1812 }
1632 } 1813 }
1633 }
1634 R->MEvent.time = ev->time;
1635 return; 1814 return;
1636 }
1637 }
1638
1639/*
1640 * Scrollbar window processing of button press
1641 */
1642 if (isScrollbarWindow(ev->window))
1643 {
1644 R->scrollBar.setIdle ();
1645 /*
1646 * Rxvt-style scrollbar:
1647 * move up if mouse is above slider
1648 * move dn if mouse is below slider
1649 *
1650 * XTerm-style scrollbar:
1651 * Move display proportional to pointer location
1652 * pointer near top -> scroll one line
1653 * pointer near bot -> scroll full page
1654 */
1655#ifndef NO_SCROLLBAR_REPORT
1656 if (reportmode) {
1657 /*
1658 * Mouse report disabled scrollbar:
1659 * arrow buttons - send up/down
1660 * click on scrollbar - send pageup/down
1661 */
1662 if ((R->scrollBar.style == R_SB_NEXT
1663 && scrollbarnext_upButton(ev->y))
1664 || (R->scrollBar.style == R_SB_RXVT
1665 && scrollbarrxvt_upButton(ev->y)))
1666 R->tt_printf("\033[A");
1667 else if ((R->scrollBar.style == R_SB_NEXT
1668 && scrollbarnext_dnButton(ev->y))
1669 || (R->scrollBar.style == R_SB_RXVT
1670 && scrollbarrxvt_dnButton(ev->y)))
1671 R->tt_printf("\033[B");
1672 else
1673 switch (ev->button) {
1674 case Button2:
1675 R->tt_printf("\014");
1676 break;
1677 case Button1:
1678 R->tt_printf("\033[6~");
1679 break;
1680 case Button3:
1681 R->tt_printf("\033[5~");
1682 break;
1683 }
1684 }
1685 else
1686#endif /* NO_SCROLLBAR_REPORT */
1687 {
1688 char upordown = 0;
1689
1690 if (R->scrollBar.style == R_SB_NEXT) {
1691 if (scrollbarnext_upButton(ev->y))
1692 upordown = -1; /* up */
1693 else if (scrollbarnext_dnButton(ev->y))
1694 upordown = 1; /* down */
1695 } else if (R->scrollBar.style == R_SB_RXVT) {
1696 if (scrollbarrxvt_upButton(ev->y))
1697 upordown = -1; /* up */
1698 else if (scrollbarrxvt_dnButton(ev->y))
1699 upordown = 1; /* down */
1700 } 1815 }
1701 if (upordown) { 1816#if MENUBAR
1817 /*
1818 * Menubar window processing of button press
1819 */
1820 if (isMenuBarWindow(ev.window))
1821 menubar_control (ev);
1822#endif
1823}
1824
1825void
1826rxvt_term::button_release (const XButtonEvent &ev)
1827{
1828 int reportmode = 0;
1829
1830 csrO = 0; /* reset csr Offset */
1831 if (!bypass_keystate)
1832 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1833
1834 if (scrollbar_isUpDn())
1835 {
1836 scrollBar.setIdle ();
1837 scrollbar_show (0);
1702#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1838#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1703 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1839 refresh_type &= ~SMOOTH_REFRESH;
1704#endif
1705 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1706 if (upordown < 0)
1707 R->scrollBar.setUp ();
1708 else
1709 R->scrollBar.setDn ();
1710 }
1711 } else
1712 switch (ev->button) {
1713 case Button2:
1714 switch (R->scrollbar_align) {
1715 case R_SB_ALIGN_TOP:
1716 R->csrO = 0;
1717 break;
1718 case R_SB_ALIGN_CENTRE:
1719 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2;
1720 break;
1721 case R_SB_ALIGN_BOTTOM:
1722 R->csrO = R->scrollBar.bot - R->scrollBar.top;
1723 break;
1724 }
1725 if (R->scrollBar.style == R_SB_XTERM
1726 || scrollbar_above_slider(ev->y)
1727 || scrollbar_below_slider(ev->y))
1728 rxvt_scr_move_to(aR_
1729 scrollbar_position(ev->y) - R->csrO,
1730 scrollbar_size());
1731 R->scrollBar.setMotion ();
1732 break;
1733
1734 case Button1:
1735 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1736 R->csrO = ev->y - R->scrollBar.top;
1737 /* FALLTHROUGH */
1738
1739 case Button3:
1740 if (R->scrollBar.style != R_SB_XTERM) {
1741 if (scrollbar_above_slider(ev->y))
1742# ifdef RXVT_SCROLL_FULL
1743 rxvt_scr_page(aR_ UP, R->TermWin.nrow - 1);
1744# else
1745 rxvt_scr_page(aR_ UP, R->TermWin.nrow / 4);
1746# endif 1840#endif
1747 else if (scrollbar_below_slider(ev->y))
1748# ifdef RXVT_SCROLL_FULL
1749 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1750# else
1751 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1752# endif
1753 else
1754 R->scrollBar.setMotion ();
1755 } else {
1756 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1757 (R->TermWin.nrow
1758 * scrollbar_position(ev->y)
1759 / scrollbar_size()));
1760 }
1761 break;
1762 }
1763 }
1764 return;
1765 }
1766#if MENUBAR
1767 /*
1768 * Menubar window processing of button press
1769 */
1770 if (isMenuBarWindow(ev->window))
1771 rxvt_menubar_control(aR_ ev);
1772#endif
1773}
1774 1841
1775/* INTPROTO */
1776void
1777rxvt_button_release(pR_ XButtonEvent *ev)
1778{
1779 int reportmode = 0;
1780
1781 R->csrO = 0; /* reset csr Offset */
1782 if (!R->bypass_keystate)
1783 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1784
1785 if (scrollbar_isUpDn()) {
1786 R->scrollBar.setIdle ();
1787 rxvt_scrollbar_show(aR_ 0);
1788#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1789 R->refresh_type &= ~SMOOTH_REFRESH;
1790#endif
1791 } 1842 }
1792#ifdef SELECTION_SCROLLING 1843#ifdef SELECTION_SCROLLING
1793 R->pending_scroll_selection=0; 1844 pending_scroll_selection=0;
1794#endif 1845#endif
1795 if (ev->window == R->TermWin.vt) 1846 if (ev.window == TermWin.vt)
1796 { 1847 {
1797#ifdef RXVT_GRAPHICS 1848#ifdef RXVT_GRAPHICS
1798 if (ev->subwindow != None) 1849 if (ev.subwindow != None)
1799 rxvt_Gr_ButtonRelease(ev->x, ev->y); 1850 rxvt_Gr_ButtonRelease(ev.x, ev.y);
1800 else 1851 else
1801#endif 1852#endif
1853
1802 { 1854 {
1803 if (reportmode) 1855 if (reportmode)
1804 { 1856 {
1805 /* mouse report from vt window */ 1857 /* mouse report from vt window */
1806 /* don't report release of wheel "buttons" */ 1858 /* don't report release of wheel "buttons" */
1807 if (ev->button >= 4) 1859 if (ev.button >= 4)
1808 return; 1860 return;
1809#ifdef MOUSE_REPORT_DOUBLECLICK 1861#ifdef MOUSE_REPORT_DOUBLECLICK
1810 /* only report the release of 'slow' single clicks */ 1862 /* only report the release of 'slow' single clicks */
1811 if (R->MEvent.button != AnyButton 1863 if (MEvent.button != AnyButton
1812 && (ev->button != R->MEvent.button 1864 && (ev.button != MEvent.button
1813 || (ev->time - R->MEvent.time 1865 || (ev.time - MEvent.time
1814 > MULTICLICK_TIME / 2))) 1866 > MULTICLICK_TIME / 2)))
1815 { 1867 {
1816 R->MEvent.clicks = 0; 1868 MEvent.clicks = 0;
1817 R->MEvent.button = AnyButton; 1869 MEvent.button = AnyButton;
1818 rxvt_mouse_report(aR_ ev); 1870 mouse_report (ev);
1819 } 1871 }
1820#else /* MOUSE_REPORT_DOUBLECLICK */ 1872#else /* MOUSE_REPORT_DOUBLECLICK */
1821 R->MEvent.button = AnyButton; 1873 MEvent.button = AnyButton;
1822 rxvt_mouse_report(aR_ ev); 1874 mouse_report (ev);
1823#endif /* MOUSE_REPORT_DOUBLECLICK */ 1875#endif /* MOUSE_REPORT_DOUBLECLICK */
1824 return; 1876 return;
1825 } 1877 }
1826 /* 1878 /*
1827 * dumb hack to compensate for the failure of click-and-drag 1879 * dumb hack to compensate for the failure of click-and-drag
1828 * when overriding mouse reporting 1880 * when overriding mouse reporting
1829 */ 1881 */
1830 if (R->PrivateModes & PrivMode_mouse_report 1882 if (PrivateModes & PrivMode_mouse_report
1831 && R->bypass_keystate 1883 && bypass_keystate
1832 && ev->button == Button1 && R->MEvent.clicks <= 1) 1884 && ev.button == Button1 && MEvent.clicks <= 1)
1833 R->selection_extend (ev->x, ev->y, 0); 1885 selection_extend (ev.x, ev.y, 0);
1834 1886
1835 switch (ev->button) { 1887 switch (ev.button)
1888 {
1836 case Button1: 1889 case Button1:
1837 case Button3: 1890 case Button3:
1838 rxvt_selection_make(aR_ ev->time); 1891 selection_make (ev.time);
1839 break; 1892 break;
1840 case Button2: 1893 case Button2:
1841 rxvt_selection_request(aR_ ev->time, ev->x, ev->y); 1894 selection_request (ev.time, ev.x, ev.y);
1842 break; 1895 break;
1843#ifdef MOUSE_WHEEL 1896#ifdef MOUSE_WHEEL
1844 case Button4: 1897 case Button4:
1845 case Button5: 1898 case Button5:
1846 { 1899 {
1847 int i; 1900 int i;
1848 page_dirn v; 1901 page_dirn v;
1849 1902
1850 v = (ev->button == Button4) ? UP : DN; 1903 v = (ev.button == Button4) ? UP : DN;
1851 if (ev->state & ShiftMask) 1904 if (ev.state & ShiftMask)
1852 i = 1; 1905 i = 1;
1853 else if ((R->Options & Opt_mouseWheelScrollPage)) 1906 else if ((Options & Opt_mouseWheelScrollPage))
1854 i = R->TermWin.nrow - 1; 1907 i = TermWin.nrow - 1;
1855 else 1908 else
1856 i = 5; 1909 i = 5;
1857# ifdef MOUSE_SLIP_WHEELING 1910# ifdef MOUSE_SLIP_WHEELING
1858 if (ev->state & ControlMask) 1911 if (ev.state & ControlMask)
1859 { 1912 {
1860 R->mouse_slip_wheel_speed += (v ? -1 : 1); 1913 mouse_slip_wheel_speed += (v ? -1 : 1);
1861 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1914 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1862 } 1915 }
1863# endif 1916# endif
1864# ifdef JUMP_MOUSE_WHEEL 1917# ifdef JUMP_MOUSE_WHEEL
1865 rxvt_scr_page(aR_ v, i); 1918 scr_page (v, i);
1866 R->scr_refresh (SMOOTH_REFRESH); 1919 scr_refresh (SMOOTH_REFRESH);
1867 rxvt_scrollbar_show(aR_ 1); 1920 scrollbar_show (1);
1868# else 1921# else
1869 while (i--) 1922 while (i--)
1870 { 1923 {
1871 rxvt_scr_page(aR_ v, 1); 1924 scr_page (v, 1);
1872 R->scr_refresh (SMOOTH_REFRESH); 1925 scr_refresh (SMOOTH_REFRESH);
1873 rxvt_scrollbar_show(aR_ 1); 1926 scrollbar_show (1);
1874 } 1927 }
1875# endif 1928# endif
1876 } 1929
1877 break; 1930 }
1931 break;
1878#endif 1932#endif
1879 } 1933
1880 } 1934 }
1881 } 1935 }
1936 }
1882#ifdef MENUBAR 1937#ifdef MENUBAR
1883 else if (isMenuBarWindow(ev->window)) 1938 else if (isMenuBarWindow(ev.window))
1884 rxvt_menubar_control(aR_ ev); 1939 menubar_control (ev);
1885#endif 1940#endif
1886} 1941}
1887 1942
1888 1943
1889#ifdef TRANSPARENT 1944#ifdef TRANSPARENT
1890/* 1945/*
1891 * Check our parents are still who we think they are. 1946 * Check our parents are still who we think they are.
1892 * Do transparency updates if required 1947 * Do transparency updates if required
1893 */ 1948 */
1894/* EXTPROTO */
1895int 1949int
1896rxvt_check_our_parents(pR) 1950rxvt_term::check_our_parents ()
1897{ 1951{
1898 int i, pchanged, aformat, have_pixmap, rootdepth; 1952 int i, pchanged, aformat, have_pixmap, rootdepth;
1899 unsigned long nitems, bytes_after; 1953 unsigned long nitems, bytes_after;
1900 Atom atype; 1954 Atom atype;
1901 unsigned char *prop = NULL; 1955 unsigned char *prop = NULL;
1902 Window root, oldp, *list; 1956 Window root, oldp, *list;
1903 Pixmap rootpixmap = None; 1957 Pixmap rootpixmap = None;
1904 XWindowAttributes wattr, wrootattr; 1958 XWindowAttributes wattr, wrootattr;
1905 1959
1906 pchanged = 0; 1960 pchanged = 0;
1907 1961
1908 if (!(R->Options & Opt_transparent)) 1962 if (!(Options & Opt_transparent))
1909 return pchanged; /* Don't try any more */ 1963 return pchanged; /* Don't try any more */
1910 1964
1911 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 1965 XGetWindowAttributes(display->display, display->root, &wrootattr);
1912 rootdepth = wrootattr.depth; 1966 rootdepth = wrootattr.depth;
1913 1967
1914 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 1968 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr);
1915 if (rootdepth != wattr.depth) { 1969 if (rootdepth != wattr.depth)
1970 {
1916 if (R->am_transparent) { 1971 if (am_transparent)
1972 {
1917 pchanged = 1; 1973 pchanged = 1;
1918 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1974 XSetWindowBackground(display->display, TermWin.vt,
1919 R->PixColors[Color_bg]); 1975 PixColors[Color_bg]);
1920 R->am_transparent = R->am_pixmap_trans = 0; 1976 am_transparent = am_pixmap_trans = 0;
1921 } 1977 }
1922 return pchanged; /* Don't try any more */ 1978 return pchanged; /* Don't try any more */
1923 } 1979 }
1924 1980
1925/* Get all X ops out of the queue so that our information is up-to-date. */ 1981 /* Get all X ops out of the queue so that our information is up-to-date. */
1926 XSync(R->Xdisplay, False); 1982 XSync(display->display, False);
1927 1983
1928/* 1984 /*
1929 * Make the frame window set by the window manager have 1985 * Make the frame window set by the window manager have
1930 * the root background. Some window managers put multiple nested frame 1986 * the root background. Some window managers put multiple nested frame
1931 * windows for each client, so we have to take care about that. 1987 * windows for each client, so we have to take care about that.
1932 */ 1988 */
1933 i = (R->xa[XA_XROOTPMAPID] != 0 1989 i = (xa[XA_XROOTPMAPID] != 0
1934 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID], 1990 && (XGetWindowProperty(display->display, display->root, xa[XA_XROOTPMAPID],
1935 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1991 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1936 &nitems, &bytes_after, &prop) == Success)); 1992 &nitems, &bytes_after, &prop) == Success));
1937 if (!i || prop == NULL) 1993 if (!i || prop == NULL)
1938 have_pixmap = 0; 1994 have_pixmap = 0;
1939 else { 1995 else
1996 {
1940 have_pixmap = 1; 1997 have_pixmap = 1;
1941 rootpixmap = *((Pixmap *)prop); 1998 rootpixmap = *((Pixmap *)prop);
1942 XFree(prop); 1999 XFree(prop);
1943 } 2000 }
1944 if (have_pixmap) { 2001 if (have_pixmap)
1945/* 2002 {
2003 /*
1946 * Copy Xroot pixmap transparency 2004 * Copy display->root pixmap transparency
1947 */ 2005 */
1948 int sx, sy, nx, ny; 2006 int sx, sy, nx, ny;
1949 unsigned int nw, nh; 2007 unsigned int nw, nh;
1950 Window cr; 2008 Window cr;
1951 XImage *image; 2009 XImage *image;
1952 GC gc; 2010 GC gc;
1953 XGCValues gcvalue; 2011 XGCValues gcvalue;
1954 2012
1955 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 2013 XTranslateCoordinates(display->display, TermWin.parent[0], display->root,
1956 0, 0, &sx, &sy, &cr); 2014 0, 0, &sx, &sy, &cr);
1957 nw = (unsigned int)R->szHint.width; 2015 nw = (unsigned int)szHint.width;
1958 nh = (unsigned int)R->szHint.height; 2016 nh = (unsigned int)szHint.height;
1959 nx = ny = 0; 2017 nx = ny = 0;
1960 if (sx < 0) { 2018 if (sx < 0)
2019 {
1961 nw += sx; 2020 nw += sx;
1962 nx = -sx; 2021 nx = -sx;
1963 sx = 0; 2022 sx = 0;
1964 } 2023 }
1965 if (sy < 0) { 2024 if (sy < 0)
2025 {
1966 nh += sy; 2026 nh += sy;
1967 ny = -sy; 2027 ny = -sy;
1968 sy = 0; 2028 sy = 0;
1969 } 2029 }
1970 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2030 MIN_IT(nw, (unsigned int)(wrootattr.width - sx));
1971 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2031 MIN_IT(nh, (unsigned int)(wrootattr.height - sy));
1972 R->allowedxerror = -1; 2032 allowedxerror = -1;
1973 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2033 image = XGetImage(display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1974 ZPixmap); 2034 ZPixmap);
1975 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1976 /* XXX: may need a delay here? */ 2036 /* XXX: may need a delay here? */
1977 R->allowedxerror = 0; 2037 allowedxerror = 0;
1978 if (image == NULL) { 2038 if (image == NULL)
2039 {
1979 if (R->am_transparent && R->am_pixmap_trans) { 2040 if (am_transparent && am_pixmap_trans)
1980 pchanged = 1; 2041 {
2042 pchanged = 1;
2043 if (TermWin.pixmap != None)
2044 {
2045 XFreePixmap(display->display, TermWin.pixmap);
2046 TermWin.pixmap = None;
2047 }
2048 }
2049 am_pixmap_trans = 0;
2050 }
2051 else
2052 {
1981 if (R->TermWin.pixmap != None) { 2053 if (TermWin.pixmap != None)
1982 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 2054 XFreePixmap(display->display, TermWin.pixmap);
1983 R->TermWin.pixmap = None; 2055 TermWin.pixmap = XCreatePixmap(display->display, TermWin.vt,
1984 } 2056 (unsigned int)szHint.width,
2057 (unsigned int)szHint.height,
2058 (unsigned int)image->depth);
2059 gc = XCreateGC(display->display, TermWin.vt, 0UL, &gcvalue);
2060 XPutImage(display->display, TermWin.pixmap, gc, image, 0, 0,
2061 nx, ny, (unsigned int)image->width,
2062 (unsigned int)image->height);
2063 XFreeGC(display->display, gc);
2064 XDestroyImage(image);
2065 XSetWindowBackgroundPixmap(display->display, TermWin.vt,
2066 TermWin.pixmap);
2067 if (!am_transparent || !am_pixmap_trans)
2068 pchanged = 1;
2069 am_transparent = am_pixmap_trans = 1;
2070 }
1985 } 2071 }
1986 R->am_pixmap_trans = 0;
1987 } else {
1988 if (R->TermWin.pixmap != None)
1989 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1990 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt,
1991 (unsigned int)R->szHint.width,
1992 (unsigned int)R->szHint.height,
1993 (unsigned int)image->depth);
1994 gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 0UL, &gcvalue);
1995 XPutImage(R->Xdisplay, R->TermWin.pixmap, gc, image, 0, 0,
1996 nx, ny, (unsigned int)image->width,
1997 (unsigned int)image->height);
1998 XFreeGC(R->Xdisplay, gc);
1999 XDestroyImage(image);
2000 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
2001 R->TermWin.pixmap);
2002 if (!R->am_transparent || !R->am_pixmap_trans)
2003 pchanged = 1;
2004 R->am_transparent = R->am_pixmap_trans = 1;
2005 }
2006 }
2007 if (!R->am_pixmap_trans) { 2072 if (!am_pixmap_trans)
2073 {
2008 unsigned int n; 2074 unsigned int n;
2009/* 2075 /*
2010 * InheritPixmap transparency 2076 * InheritPixmap transparency
2011 */ 2077 */
2012 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2078 D_X((stderr, "InheritPixmap Seeking to %08lx", display->root));
2013 for (i = 1; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 2079 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window));
2014 i++) { 2080 i++)
2081 {
2015 oldp = R->TermWin.parent[i]; 2082 oldp = TermWin.parent[i];
2016 XQueryTree(R->Xdisplay, R->TermWin.parent[i - 1], &root, 2083 XQueryTree(display->display, TermWin.parent[i - 1], &root,
2017 &R->TermWin.parent[i], &list, &n); 2084 &TermWin.parent[i], &list, &n);
2018 XFree(list); 2085 XFree(list);
2019 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, R->TermWin.parent[i])); 2086 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2020 if (R->TermWin.parent[i] == Xroot) { 2087 if (TermWin.parent[i] == display->root)
2021 if (oldp != None) 2088 {
2022 pchanged = 1; 2089 if (oldp != None)
2023 break; 2090 pchanged = 1;
2024 } 2091 break;
2092 }
2025 if (oldp != R->TermWin.parent[i]) 2093 if (oldp != TermWin.parent[i])
2026 pchanged = 1; 2094 pchanged = 1;
2027 } 2095 }
2028 n = 0; 2096 n = 0;
2029 if (pchanged) { 2097 if (pchanged)
2098 {
2030 for (; n < (unsigned int)i; n++) { 2099 for (; n < (unsigned int)i; n++)
2100 {
2031 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2101 XGetWindowAttributes(display->display, TermWin.parent[n], &wattr);
2032 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2102 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2033 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { 2103 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2104 {
2034 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2105 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1;
2035 break; 2106 break;
2036 } 2107 }
2037 } 2108 }
2038 } 2109 }
2039 if (n > (int)(sizeof(R->TermWin.parent) 2110 if (n > (int)(sizeof(TermWin.parent)
2040 / sizeof(R->TermWin.parent[0]))) { 2111 / sizeof(TermWin.parent[0])))
2112 {
2041 D_X((stderr, "InheritPixmap Turning off")); 2113 D_X((stderr, "InheritPixmap Turning off"));
2042 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2114 XSetWindowBackground(display->display, TermWin.parent[0],
2043 R->PixColors[Color_fg]); 2115 PixColors[Color_fg]);
2044 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2116 XSetWindowBackground(display->display, TermWin.vt,
2045 R->PixColors[Color_bg]); 2117 PixColors[Color_bg]);
2046 R->am_transparent = 0; 2118 am_transparent = 0;
2047 /* XXX: also turn off Opt_transparent? */ 2119 /* XXX: also turn off Opt_transparent? */
2048 } else { 2120 }
2121 else
2122 {
2049 /* wait (an arbitrary period) for the WM to do its thing 2123 /* wait (an arbitrary period) for the WM to do its thing
2050 * needed for fvwm2.2.2 (and before?) */ 2124 * needed for fvwm2.2.2 (and before?) */
2051# ifdef HAVE_NANOSLEEP 2125# ifdef HAVE_NANOSLEEP
2052 struct timespec rqt; 2126 struct timespec rqt;
2053 2127
2054 rqt.tv_sec = 1; 2128 rqt.tv_sec = 1;
2055 rqt.tv_nsec = 0; 2129 rqt.tv_nsec = 0;
2056 nanosleep(&rqt, NULL); 2130 nanosleep(&rqt, NULL);
2057# else 2131# else
2058 sleep(1); 2132 sleep(1);
2059# endif 2133# endif
2060 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2134 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2061 for (n = 0; n < (unsigned int)i; n++) 2135 for (n = 0; n < (unsigned int)i; n++)
2062 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2136 XSetWindowBackgroundPixmap(display->display, TermWin.parent[n],
2063 ParentRelative); 2137 ParentRelative);
2064 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2138 XSetWindowBackgroundPixmap(display->display, TermWin.vt,
2065 ParentRelative); 2139 ParentRelative);
2066 R->am_transparent = 1; 2140 am_transparent = 1;
2067 } 2141 }
2068 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2142 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++)
2069 R->TermWin.parent[i] = None; 2143 TermWin.parent[i] = None;
2070 } 2144 }
2071 return pchanged; 2145 return pchanged;
2072} 2146}
2073#endif 2147#endif
2074 2148
2075/*}}} */ 2149/*}}} */
2076 2150
2077/*{{{ print pipe */ 2151/*{{{ print pipe */
2078/*----------------------------------------------------------------------*/ 2152/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2153#ifdef PRINTPIPE
2080/* EXTPROTO */ 2154FILE *
2081FILE *
2082rxvt_popen_printer(pR) 2155rxvt_term::popen_printer ()
2083{ 2156{
2084 FILE *stream = popen(R->rs[Rs_print_pipe], "w"); 2157 FILE *stream = popen(rs[Rs_print_pipe], "w");
2085 2158
2086 if (stream == NULL) 2159 if (stream == NULL)
2087 rxvt_print_error("can't open printer pipe"); 2160 rxvt_print_error("can't open printer pipe");
2088 return stream; 2161 return stream;
2089} 2162}
2090 2163
2091/* EXTPROTO */
2092int 2164int
2093rxvt_pclose_printer (FILE *stream) 2165rxvt_term::pclose_printer (FILE *stream)
2094{ 2166{
2095 fflush (stream); 2167 fflush (stream);
2096/* pclose() reported not to work on SunOS 4.1.3 */ 2168 /* pclose() reported not to work on SunOS 4.1.3 */
2097# if defined (__sun__) /* TODO: RESOLVE THIS */ 2169# if defined (__sun__) /* TODO: RESOLVE THIS */
2098/* pclose works provided SIGCHLD handler uses waitpid */ 2170 /* pclose works provided SIGCHLD handler uses waitpid */
2099 return pclose (stream); /* return fclose (stream); */ 2171 return pclose (stream); /* return fclose (stream); */
2100# else 2172# else
2101 return pclose (stream); 2173 return pclose (stream);
2102# endif 2174# endif
2103} 2175}
2104 2176
2105/* 2177/*
2106 * simulate attached vt100 printer 2178 * simulate attached vt100 printer
2107 */ 2179 */
2108/* INTPROTO */
2109void 2180void
2110rxvt_process_print_pipe(pR) 2181rxvt_term::process_print_pipe ()
2111{ 2182{
2112 int done; 2183 int done;
2113 FILE *fd; 2184 FILE *fd;
2114 2185
2115 if ((fd = rxvt_popen_printer(aR)) == NULL) 2186 if ((fd = popen_printer ()) == NULL)
2116 return; 2187 return;
2117 2188
2118/* 2189 /*
2119 * Send all input to the printer until either ESC[4i or ESC[?4i 2190 * Send all input to the printer until either ESC[4i or ESC[?4i
2120 * is received. 2191 * is received.
2121 */ 2192 */
2122 for (done = 0; !done;) { 2193 for (done = 0; !done;)
2194 {
2123 unsigned char buf[8]; 2195 unsigned char buf[8];
2124 unsigned char ch; 2196 unsigned char ch;
2125 unsigned int i, len; 2197 unsigned int i, len;
2126 2198
2127 if ((ch = rxvt_cmd_getc(aR)) != C0_ESC) { 2199 if ((ch = cmd_getc ()) != C0_ESC)
2200 {
2128 if (putc(ch, fd) == EOF) 2201 if (putc(ch, fd) == EOF)
2129 break; /* done = 1 */ 2202 break; /* done = 1 */
2130 } else { 2203 }
2204 else
2205 {
2131 len = 0; 2206 len = 0;
2132 buf[len++] = ch; 2207 buf[len++] = ch;
2133 2208
2134 if ((buf[len++] = rxvt_cmd_getc(aR)) == '[') { 2209 if ((buf[len++] = cmd_getc ()) == '[')
2135 if ((ch = rxvt_cmd_getc(aR)) == '?') { 2210 {
2136 buf[len++] = '?'; 2211 if ((ch = cmd_getc ()) == '?')
2137 ch = rxvt_cmd_getc(aR); 2212 {
2138 } 2213 buf[len++] = '?';
2214 ch = cmd_getc ();
2215 }
2139 if ((buf[len++] = ch) == '4') { 2216 if ((buf[len++] = ch) == '4')
2217 {
2140 if ((buf[len++] = rxvt_cmd_getc(aR)) == 'i') 2218 if ((buf[len++] = cmd_getc ()) == 'i')
2141 break; /* done = 1 */ 2219 break; /* done = 1 */
2142 } 2220 }
2221 }
2222 for (i = 0; i < len; i++)
2223 if (putc(buf[i], fd) == EOF)
2224 {
2225 done = 1;
2226 break;
2227 }
2228 }
2143 } 2229 }
2144 for (i = 0; i < len; i++)
2145 if (putc(buf[i], fd) == EOF) {
2146 done = 1;
2147 break;
2148 }
2149 }
2150 }
2151 rxvt_pclose_printer(fd); 2230 pclose_printer (fd);
2152} 2231}
2153#endif /* PRINTPIPE */ 2232#endif /* PRINTPIPE */
2154/*}}} */ 2233/*}}} */
2155 2234
2156/* *INDENT-OFF* */ 2235/* *INDENT-OFF* */
2157enum { 2236enum {
2158 C1_40 = 0x40, 2237 C1_40 = 0x40,
2159 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2238 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2160 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2239 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2161 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2240 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2162 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2241 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC
2163}; 2242};
2164/* *INDENT-ON* */ 2243/* *INDENT-ON* */
2165 2244
2166/*{{{ process non-printing single characters */ 2245/*{{{ process non-printing single characters */
2167/* INTPROTO */
2168void 2246void
2169rxvt_process_nonprinting(pR_ unsigned char ch) 2247rxvt_term::process_nonprinting (unsigned char ch)
2170{ 2248{
2171 switch (ch) { 2249 switch (ch)
2250 {
2172 case C0_ENQ: /* terminal Status */ 2251 case C0_ENQ: /* terminal Status */
2173 if (R->rs[Rs_answerbackstring]) 2252 if (rs[Rs_answerbackstring])
2174 R->tt_write( 2253 tt_write(
2175 (const unsigned char *)R->rs[Rs_answerbackstring], 2254 (const unsigned char *)rs[Rs_answerbackstring],
2176 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2255 (unsigned int)STRLEN(rs[Rs_answerbackstring]));
2177 else 2256 else
2178 R->tt_write((unsigned char *)VT100_ANS, 2257 tt_write((unsigned char *)VT100_ANS,
2179 (unsigned int)STRLEN(VT100_ANS)); 2258 (unsigned int)STRLEN(VT100_ANS));
2180 break; 2259 break;
2181 case C0_BEL: /* bell */ 2260 case C0_BEL: /* bell */
2182 rxvt_scr_bell(aR); 2261 scr_bell ();
2183 break; 2262 break;
2184 case C0_BS: /* backspace */ 2263 case C0_BS: /* backspace */
2185 rxvt_scr_backspace(aR); 2264 scr_backspace ();
2186 break; 2265 break;
2187 case C0_HT: /* tab */ 2266 case C0_HT: /* tab */
2188 rxvt_scr_tab(aR_ 1); 2267 scr_tab (1);
2189 break; 2268 break;
2190 case C0_CR: /* carriage return */ 2269 case C0_CR: /* carriage return */
2191 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 2270 scr_gotorc (0, 0, R_RELATIVE);
2192 break; 2271 break;
2193 case C0_VT: /* vertical tab, form feed */ 2272 case C0_VT: /* vertical tab, form feed */
2194 case C0_FF: 2273 case C0_FF:
2195 case C0_LF: /* line feed */ 2274 case C0_LF: /* line feed */
2196 rxvt_scr_index(aR_ UP); 2275 scr_index (UP);
2197 break; 2276 break;
2198 case C0_SO: /* shift out - acs */ 2277 case C0_SO: /* shift out - acs */
2199 rxvt_scr_charset_choose(aR_ 1); 2278 scr_charset_choose (1);
2200 break; 2279 break;
2201 case C0_SI: /* shift in - acs */ 2280 case C0_SI: /* shift in - acs */
2202 rxvt_scr_charset_choose(aR_ 0); 2281 scr_charset_choose (0);
2203 break; 2282 break;
2204 } 2283 }
2205} 2284}
2206/*}}} */ 2285/*}}} */
2207 2286
2208 2287
2209/*{{{ process VT52 escape sequences */ 2288/*{{{ process VT52 escape sequences */
2210/* INTPROTO */
2211void 2289void
2212rxvt_process_escape_vt52(pR_ unsigned char ch) 2290rxvt_term::process_escape_vt52 (unsigned char ch)
2213{ 2291{
2214 int row, col; 2292 int row, col;
2293
2294 switch (ch)
2215 2295 {
2216 switch (ch) {
2217 case 'A': /* cursor up */ 2296 case 'A': /* cursor up */
2218 rxvt_scr_gotorc(aR_ -1, 0, R_RELATIVE | C_RELATIVE); 2297 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2219 break; 2298 break;
2220 case 'B': /* cursor down */ 2299 case 'B': /* cursor down */
2221 rxvt_scr_gotorc(aR_ 1, 0, R_RELATIVE | C_RELATIVE); 2300 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2222 break; 2301 break;
2223 case 'C': /* cursor right */ 2302 case 'C': /* cursor right */
2224 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 2303 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2225 break; 2304 break;
2226 case 'D': /* cursor left */ 2305 case 'D': /* cursor left */
2227 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 2306 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2228 break; 2307 break;
2229 case 'H': /* cursor home */ 2308 case 'H': /* cursor home */
2230 rxvt_scr_gotorc(aR_ 0, 0, 0); 2309 scr_gotorc (0, 0, 0);
2231 break; 2310 break;
2232 case 'I': /* cursor up and scroll down if needed */ 2311 case 'I': /* cursor up and scroll down if needed */
2233 rxvt_scr_index(aR_ DN); 2312 scr_index (DN);
2234 break; 2313 break;
2235 case 'J': /* erase to end of screen */ 2314 case 'J': /* erase to end of screen */
2236 R->scr_erase_screen (0); 2315 scr_erase_screen (0);
2237 break; 2316 break;
2238 case 'K': /* erase to end of line */ 2317 case 'K': /* erase to end of line */
2239 rxvt_scr_erase_line(aR_ 0); 2318 scr_erase_line (0);
2240 break; 2319 break;
2241 case 'Y': /* move to specified row and col */ 2320 case 'Y': /* move to specified row and col */
2242 /* full command is 'ESC Y row col' where row and col 2321 /* full command is 'ESC Y row col' where row and col
2243 * are encoded by adding 32 and sending the ascii 2322 * are encoded by adding 32 and sending the ascii
2244 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2323 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2245 * etc. */ 2324 * etc. */
2246 row = rxvt_cmd_getc(aR) - ' '; 2325 row = cmd_getc () - ' ';
2247 col = rxvt_cmd_getc(aR) - ' '; 2326 col = cmd_getc () - ' ';
2248 rxvt_scr_gotorc(aR_ row, col, 0); 2327 scr_gotorc (row, col, 0);
2249 break; 2328 break;
2250 case 'Z': /* identify the terminal type */ 2329 case 'Z': /* identify the terminal type */
2251 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2330 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2252 break; 2331 break;
2253 case '<': /* turn off VT52 mode */ 2332 case '<': /* turn off VT52 mode */
2254 PrivMode(0, PrivMode_vt52); 2333 PrivMode(0, PrivMode_vt52);
2255 break; 2334 break;
2256 case 'F': /* use special graphics character set */ 2335 case 'F': /* use special graphics character set */
2257 case 'G': /* use regular character set */ 2336 case 'G': /* use regular character set */
2258 /* unimplemented */ 2337 /* unimplemented */
2259 break; 2338 break;
2260 case '=': /* use alternate keypad mode */ 2339 case '=': /* use alternate keypad mode */
2261 case '>': /* use regular keypad mode */ 2340 case '>': /* use regular keypad mode */
2262 /* unimplemented */ 2341 /* unimplemented */
2263 break; 2342 break;
2264 } 2343 }
2265} 2344}
2266/*}}} */ 2345/*}}} */
2267 2346
2268 2347
2269/*{{{ process escape sequences */ 2348/*{{{ process escape sequences */
2270/* INTPROTO */
2271void 2349void
2272rxvt_process_escape_seq(pR) 2350rxvt_term::process_escape_seq ()
2273{ 2351{
2274 unsigned char ch = rxvt_cmd_getc(aR); 2352 unsigned char ch = cmd_getc ();
2275 2353
2276 if (R->PrivateModes & PrivMode_vt52) { 2354 if (PrivateModes & PrivMode_vt52)
2277 rxvt_process_escape_vt52(aR_ ch);
2278 return;
2279 }
2280 2355 {
2356 process_escape_vt52 (ch);
2357 return;
2358 }
2359
2281 switch (ch) { 2360 switch (ch)
2361 {
2282 /* case 1: do_tek_mode (); break; */ 2362 /* case 1: do_tek_mode (); break; */
2283 case '#': 2363 case '#':
2284 if (rxvt_cmd_getc(aR) == '8') 2364 if (cmd_getc () == '8')
2285 rxvt_scr_E(aR); 2365 scr_E ();
2286 break; 2366 break;
2287 case '(': 2367 case '(':
2288 rxvt_scr_charset_set(aR_ 0, (unsigned int)rxvt_cmd_getc(aR)); 2368 scr_charset_set (0, (unsigned int)cmd_getc ());
2289 break; 2369 break;
2290 case ')': 2370 case ')':
2291 rxvt_scr_charset_set(aR_ 1, (unsigned int)rxvt_cmd_getc(aR)); 2371 scr_charset_set (1, (unsigned int)cmd_getc ());
2292 break; 2372 break;
2293 case '*': 2373 case '*':
2294 rxvt_scr_charset_set(aR_ 2, (unsigned int)rxvt_cmd_getc(aR)); 2374 scr_charset_set (2, (unsigned int)cmd_getc ());
2295 break; 2375 break;
2296 case '+': 2376 case '+':
2297 rxvt_scr_charset_set(aR_ 3, (unsigned int)rxvt_cmd_getc(aR)); 2377 scr_charset_set (3, (unsigned int)cmd_getc ());
2298 break; 2378 break;
2299#ifdef MULTICHAR_SET 2379#ifdef MULTICHAR_SET
2300 case '$': 2380 case '$':
2301 rxvt_scr_charset_set(aR_ -2, (unsigned int)rxvt_cmd_getc(aR)); 2381 scr_charset_set (-2, (unsigned int)cmd_getc ());
2302 break; 2382 break;
2303#endif 2383#endif
2304#ifndef NO_FRILLS 2384#ifndef NO_FRILLS
2305 case '6': 2385 case '6':
2306 rxvt_scr_backindex(aR); 2386 scr_backindex ();
2307 break; 2387 break;
2308#endif 2388#endif
2309 case '7': 2389 case '7':
2310 rxvt_scr_cursor(aR_ SAVE); 2390 scr_cursor (SAVE);
2311 break; 2391 break;
2312 case '8': 2392 case '8':
2313 rxvt_scr_cursor(aR_ RESTORE); 2393 scr_cursor (RESTORE);
2314 break; 2394 break;
2315#ifndef NO_FRILLS 2395#ifndef NO_FRILLS
2316 case '9': 2396 case '9':
2317 rxvt_scr_forwardindex(aR); 2397 scr_forwardindex ();
2318 break; 2398 break;
2319#endif 2399#endif
2320 case '=': 2400 case '=':
2321 case '>': 2401 case '>':
2322 PrivMode((ch == '='), PrivMode_aplKP); 2402 PrivMode((ch == '='), PrivMode_aplKP);
2323 break; 2403 break;
2324 2404
2325 case C1_40: 2405 case C1_40:
2326 rxvt_cmd_getc(aR); 2406 cmd_getc ();
2327 break; 2407 break;
2328 case C1_44: 2408 case C1_44:
2329 rxvt_scr_index(aR_ UP); 2409 scr_index (UP);
2330 break; 2410 break;
2331 2411
2332 /* 8.3.87: NEXT LINE */ 2412 /* 8.3.87: NEXT LINE */
2333 case C1_NEL: /* ESC E */ 2413 case C1_NEL: /* ESC E */
2334 { 2414 {
2335 uint32_t nlcr[] = { '\n', '\r' }; 2415 uint32_t nlcr[] = { '\n', '\r' };
2336 rxvt_scr_add_lines(aR_ nlcr, 1, 2); 2416 scr_add_lines (nlcr, 1, 2);
2337 } 2417 }
2338 break; 2418 break;
2339 2419
2340 /* kidnapped escape sequence: Should be 8.3.48 */ 2420 /* kidnapped escape sequence: Should be 8.3.48 */
2341 case C1_ESA: /* ESC G */ 2421 case C1_ESA: /* ESC G */
2342 rxvt_process_graphics(aR); 2422 process_graphics ();
2343 break; 2423 break;
2344 2424
2345 /* 8.3.63: CHARACTER TABULATION SET */ 2425 /* 8.3.63: CHARACTER TABULATION SET */
2346 case C1_HTS: /* ESC H */ 2426 case C1_HTS: /* ESC H */
2347 rxvt_scr_set_tab(aR_ 1); 2427 scr_set_tab (1);
2348 break; 2428 break;
2349 2429
2350 /* 8.3.105: REVERSE LINE FEED */ 2430 /* 8.3.105: REVERSE LINE FEED */
2351 case C1_RI: /* ESC M */ 2431 case C1_RI: /* ESC M */
2352 rxvt_scr_index(aR_ DN); 2432 scr_index (DN);
2353 break; 2433 break;
2354 2434
2355 /* 8.3.142: SINGLE-SHIFT TWO */ 2435 /* 8.3.142: SINGLE-SHIFT TWO */
2356 /*case C1_SS2: scr_single_shift (2); break; */ 2436 /*case C1_SS2: scr_single_shift (2); break; */
2357 2437
2358 /* 8.3.143: SINGLE-SHIFT THREE */ 2438 /* 8.3.143: SINGLE-SHIFT THREE */
2359 /*case C1_SS3: scr_single_shift (3); break; */ 2439 /*case C1_SS3: scr_single_shift (3); break; */
2360 2440
2361 /* 8.3.27: DEVICE CONTROL STRING */ 2441 /* 8.3.27: DEVICE CONTROL STRING */
2362 case C1_DCS: /* ESC P */ 2442 case C1_DCS: /* ESC P */
2363 rxvt_process_dcs_seq(aR); 2443 process_dcs_seq ();
2364 break; 2444 break;
2365 2445
2366 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2446 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2367 case C1_SCI: /* ESC Z */ 2447 case C1_SCI: /* ESC Z */
2368 R->tt_write((const unsigned char *)ESCZ_ANSWER, 2448 tt_write((const unsigned char *)ESCZ_ANSWER,
2369 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2449 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2370 break; /* steal obsolete ESC [ c */ 2450 break; /* steal obsolete ESC [ c */
2371 2451
2372 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2452 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2373 case C1_CSI: /* ESC [ */ 2453 case C1_CSI: /* ESC [ */
2374 rxvt_process_csi_seq(aR); 2454 process_csi_seq ();
2375 break; 2455 break;
2376 2456
2377 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2457 /* 8.3.90: OPERATING SYSTEM COMMAND */
2378 case C1_OSC: /* ESC ] */ 2458 case C1_OSC: /* ESC ] */
2379 rxvt_process_osc_seq(aR); 2459 process_osc_seq ();
2380 break; 2460 break;
2381 2461
2382 /* 8.3.106: RESET TO INITIAL STATE */ 2462 /* 8.3.106: RESET TO INITIAL STATE */
2383 case 'c': 2463 case 'c':
2384 rxvt_scr_poweron(aR); 2464 scr_poweron ();
2385 rxvt_scrollbar_show(aR_ 1); 2465 scrollbar_show (1);
2386 break; 2466 break;
2387 2467
2388 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2468 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2389 case 'n': 2469 case 'n':
2390 rxvt_scr_charset_choose(aR_ 2); 2470 scr_charset_choose (2);
2391 break; 2471 break;
2392 2472
2393 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2473 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2394 case 'o': 2474 case 'o':
2395 rxvt_scr_charset_choose(aR_ 3); 2475 scr_charset_choose (3);
2396 break; 2476 break;
2397 } 2477 }
2398} 2478}
2399/*}}} */ 2479/*}}} */
2400 2480
2401/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2481/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2402/* *INDENT-OFF* */ 2482/* *INDENT-OFF* */
2403enum { 2483enum {
2404 CSI_ICH = 0x40, 2484 CSI_ICH = 0x40,
2405 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2485 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2406 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2486 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2407 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2487 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2408 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2488 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2409 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2489 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2410 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2490 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2411 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2491 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2412 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2492 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2413}; 2493};
2414 2494
2415#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2495#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2416 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2496 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2417 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2497 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2418#define get_byte_array_bit(array, bit) \ 2498#define get_byte_array_bit(array, bit) \
2419 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2499 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7))))
2420 2500
2421const unsigned char csi_defaults[] = { 2501const unsigned char csi_defaults[] =
2502 {
2422 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2503 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2423 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2504 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2424 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2505 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2425 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2506 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2426 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2507 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2427 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2508 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2428 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), /* p, q, r, s, t, u, v, w, */
2429 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2510 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2430}; 2511 };
2431/* *INDENT-ON* */ 2512/* *INDENT-ON* */
2432 2513
2433/* INTPROTO */
2434void 2514void
2435rxvt_process_csi_seq(pR) 2515rxvt_term::process_csi_seq ()
2436{ 2516{
2437 unsigned char ch, priv, i; 2517 unsigned char ch, priv, i;
2438 unsigned int nargs, p; 2518 unsigned int nargs, p;
2439 int n, ndef; 2519 int n, ndef;
2440 int arg[ESC_ARGS]; 2520 int arg[ESC_ARGS];
2441 2521
2442 for (nargs = ESC_ARGS; nargs > 0;) 2522 for (nargs = ESC_ARGS; nargs > 0;)
2443 arg[--nargs] = 0; 2523 arg[--nargs] = 0;
2444 2524
2445 priv = 0; 2525 priv = 0;
2526 ch = cmd_getc ();
2527 if (ch >= '<' && ch <= '?')
2528 { /* '<' '=' '>' '?' */
2529 priv = ch;
2446 ch = rxvt_cmd_getc(aR); 2530 ch = cmd_getc ();
2447 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2448 priv = ch;
2449 ch = rxvt_cmd_getc(aR);
2450 } 2531 }
2451/* read any numerical arguments */ 2532 /* read any numerical arguments */
2452 for (n = -1; ch < CSI_ICH; ) { 2533 for (n = -1; ch < CSI_ICH; )
2534 {
2453 if (isdigit(ch)) { 2535 if (isdigit(ch))
2536 {
2454 if (n < 0) 2537 if (n < 0)
2455 n = ch - '0'; 2538 n = ch - '0';
2456 else 2539 else
2457 n = n * 10 + ch - '0'; 2540 n = n * 10 + ch - '0';
2541 }
2458 } else if (ch == ';') { 2542 else if (ch == ';')
2543 {
2459 if (nargs < ESC_ARGS) 2544 if (nargs < ESC_ARGS)
2460 arg[nargs++] = n; 2545 arg[nargs++] = n;
2461 n = -1; 2546 n = -1;
2547 }
2462 } else if (ch == '\b') { 2548 else if (ch == '\b')
2463 rxvt_scr_backspace(aR); 2549 {
2550 scr_backspace ();
2551 }
2464 } else if (ch == C0_ESC) { 2552 else if (ch == C0_ESC)
2465 rxvt_process_escape_seq(aR); 2553 {
2554 process_escape_seq ();
2555 return;
2556 }
2557 else if (ch < ' ')
2558 {
2559 process_nonprinting (ch);
2560 }
2561 ch = cmd_getc ();
2562 }
2563
2564 if (ch > CSI_7F)
2466 return; 2565 return;
2467 } else if (ch < ' ') {
2468 rxvt_process_nonprinting(aR_ ch);
2469 }
2470 ch = rxvt_cmd_getc(aR);
2471 }
2472 2566
2473 if (ch > CSI_7F)
2474 return;
2475
2476 if (nargs < ESC_ARGS) 2567 if (nargs < ESC_ARGS)
2477 arg[nargs++] = n; 2568 arg[nargs++] = n;
2478 2569
2479 i = ch - CSI_ICH; 2570 i = ch - CSI_ICH;
2480 ndef = get_byte_array_bit(csi_defaults, i); 2571 ndef = get_byte_array_bit(csi_defaults, i);
2481 for (p = 0; p < nargs; p++) 2572 for (p = 0; p < nargs; p++)
2482 if (arg[p] == -1) 2573 if (arg[p] == -1)
2483 arg[p] = ndef; 2574 arg[p] = ndef;
2484 2575
2485#ifdef DEBUG_CMD 2576#ifdef DEBUG_CMD
2486 fprintf(stderr, "CSI "); 2577 fprintf(stderr, "CSI ");
2487 for (p = 0; p < nargs; p++) 2578 for (p = 0; p < nargs; p++)
2488 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2579 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2489 fprintf(stderr, "%c\n", ch); 2580 fprintf(stderr, "%c\n", ch);
2490#endif 2581#endif
2491 2582
2492/* 2583 /*
2493 * private mode handling 2584 * private mode handling
2494 */ 2585 */
2495 if (priv) { 2586 if (priv)
2496 switch (priv) { 2587 {
2497 case '>': 2588 switch (priv)
2589 {
2590 case '>':
2498 if (ch == CSI_DA) /* secondary device attributes */ 2591 if (ch == CSI_DA) /* secondary device attributes */
2499 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2592 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2500 break; 2593 break;
2501 case '?': 2594 case '?':
2502 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2595 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2503 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2596 process_terminal_mode (ch, priv, nargs, arg);
2504 break; 2597 break;
2505 } 2598 }
2506 return; 2599 return;
2507 } 2600 }
2508 2601
2509 switch (ch) { 2602 switch (ch)
2510/* 2603 {
2604 /*
2511 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2605 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses)
2512 */ 2606 */
2513#ifdef PRINTPIPE 2607#ifdef PRINTPIPE
2514 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2608 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2515 switch (arg[0]) { 2609 switch (arg[0])
2610 {
2516 case 0: /* initiate transfer to primary aux device */ 2611 case 0: /* initiate transfer to primary aux device */
2517 rxvt_scr_printscreen(aR_ 0); 2612 scr_printscreen (0);
2518 break; 2613 break;
2519 case 5: /* start relay to primary aux device */ 2614 case 5: /* start relay to primary aux device */
2520 rxvt_process_print_pipe(aR); 2615 process_print_pipe ();
2616 break;
2617 }
2521 break; 2618 break;
2522 }
2523 break;
2524#endif 2619#endif
2525 2620
2526 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2621 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2527 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2622 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2528 arg[0] = -arg[0]; 2623 arg[0] = -arg[0];
2529 /* FALLTHROUGH */ 2624 /* FALLTHROUGH */
2530 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2625 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2531 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2626 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2532 rxvt_scr_gotorc(aR_ arg[0], 0, RELATIVE); 2627 scr_gotorc (arg[0], 0, RELATIVE);
2533 break; 2628 break;
2534 2629
2535 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2630 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2536 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2631 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2537#ifdef ISO6429 2632#ifdef ISO6429
2538 arg[0] = -arg[0]; 2633 arg[0] = -arg[0];
2539#else /* emulate common DEC VTs */ 2634#else /* emulate common DEC VTs */
2540 arg[0] = arg[0] ? -arg[0] : -1; 2635 arg[0] = arg[0] ? -arg[0] : -1;
2541#endif 2636#endif
2542 /* FALLTHROUGH */ 2637 /* FALLTHROUGH */
2543 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2638 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2544 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2639 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2545#ifdef ISO6429 2640#ifdef ISO6429
2546 rxvt_scr_gotorc(aR_ 0, arg[0], RELATIVE); 2641 scr_gotorc (0, arg[0], RELATIVE);
2547#else /* emulate common DEC VTs */ 2642#else /* emulate common DEC VTs */
2548 rxvt_scr_gotorc(aR_ 0, arg[0] ? arg[0] : 1, RELATIVE); 2643 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2549#endif 2644#endif
2550 break; 2645 break;
2551 2646
2552 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2647 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2553 arg[0] = -arg[0]; 2648 arg[0] = -arg[0];
2554 /* FALLTHROUGH */ 2649 /* FALLTHROUGH */
2555 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2650 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2556 rxvt_scr_gotorc(aR_ arg[0], 0, R_RELATIVE); 2651 scr_gotorc (arg[0], 0, R_RELATIVE);
2557 break; 2652 break;
2558 2653
2559 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2654 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2560 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2655 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2561 rxvt_scr_gotorc(aR_ 0, arg[0] - 1, R_RELATIVE); 2656 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2562 break; 2657 break;
2563 2658
2564 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2659 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2565 rxvt_scr_gotorc(aR_ arg[0] - 1, 0, C_RELATIVE); 2660 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2566 break; 2661 break;
2567 2662
2568 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2663 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2569 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2664 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
2570 rxvt_scr_gotorc(aR_ arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); 2665 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2571 break; 2666 break;
2572 2667
2573 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2668 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2574 arg[0] = -arg[0]; 2669 arg[0] = -arg[0];
2575 /* FALLTHROUGH */ 2670 /* FALLTHROUGH */
2576 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2671 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2577 rxvt_scr_tab(aR_ arg[0]); 2672 scr_tab (arg[0]);
2578 break; 2673 break;
2579 2674
2580 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2675 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2581 R->scr_erase_screen (arg[0]); 2676 scr_erase_screen (arg[0]);
2582 break; 2677 break;
2583 2678
2584 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2679 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2585 rxvt_scr_erase_line(aR_ arg[0]); 2680 scr_erase_line (arg[0]);
2586 break; 2681 break;
2587 2682
2588 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2683 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2589 rxvt_scr_insdel_chars(aR_ arg[0], INSERT); 2684 scr_insdel_chars (arg[0], INSERT);
2590 break; 2685 break;
2591 2686
2592 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2687 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2593 rxvt_scr_insdel_lines(aR_ arg[0], INSERT); 2688 scr_insdel_lines (arg[0], INSERT);
2594 break; 2689 break;
2595 2690
2596 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2691 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2597 rxvt_scr_insdel_lines(aR_ arg[0], DELETE); 2692 scr_insdel_lines (arg[0], DELETE);
2598 break; 2693 break;
2599 2694
2600 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2695 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2601 rxvt_scr_insdel_chars(aR_ arg[0], ERASE); 2696 scr_insdel_chars (arg[0], ERASE);
2602 break; 2697 break;
2603 2698
2604 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2699 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2605 rxvt_scr_insdel_chars(aR_ arg[0], DELETE); 2700 scr_insdel_chars (arg[0], DELETE);
2606 break; 2701 break;
2607 2702
2608 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2703 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2609 arg[0] = -arg[0]; 2704 arg[0] = -arg[0];
2610 /* FALLTHROUGH */ 2705 /* FALLTHROUGH */
2611 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2706 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2612 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2707 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2613 break; 2708 break;
2614 2709
2615 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2710 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2616 R->tt_write((const unsigned char *)VT100_ANS, 2711 tt_write((const unsigned char *)VT100_ANS,
2617 (unsigned int)(sizeof(VT100_ANS) - 1)); 2712 (unsigned int)(sizeof(VT100_ANS) - 1));
2618 break; 2713 break;
2619 2714
2620 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2715 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2621 rxvt_process_sgr_mode(aR_ nargs, arg); 2716 process_sgr_mode (nargs, arg);
2622 break; 2717 break;
2623 2718
2624 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2719 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2625 switch (arg[0]) { 2720 switch (arg[0])
2721 {
2626 case 5: /* DSR requested */ 2722 case 5: /* DSR requested */
2627 R->tt_printf("\033[0n"); 2723 tt_printf("\033[0n");
2628 break; 2724 break;
2629 case 6: /* CPR requested */ 2725 case 6: /* CPR requested */
2630 rxvt_scr_report_position(aR); 2726 scr_report_position ();
2631 break; 2727 break;
2632#if defined (ENABLE_DISPLAY_ANSWER) 2728#if defined (ENABLE_DISPLAY_ANSWER)
2633 case 7: /* unofficial extension */ 2729 case 7: /* unofficial extension */
2634 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]); 2730 tt_printf("%-.250s\n", rs[Rs_display_name]);
2635 break; 2731 break;
2636#endif 2732#endif
2637 case 8: /* unofficial extension */ 2733 case 8: /* unofficial extension */
2638 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2734 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2735 break;
2736 }
2639 break; 2737 break;
2640 }
2641 break;
2642 2738
2643 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2739 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2644 switch (arg[0]) { 2740 switch (arg[0])
2741 {
2645 case 0: /* char tab stop cleared at active position */ 2742 case 0: /* char tab stop cleared at active position */
2646 rxvt_scr_set_tab(aR_ 0); 2743 scr_set_tab (0);
2647 break; 2744 break;
2648 /* case 1: */ /* line tab stop cleared in active line */ 2745 /* case 1: */ /* line tab stop cleared in active line */
2649 /* case 2: */ /* char tab stops cleared in active line */ 2746 /* case 2: */ /* char tab stops cleared in active line */
2650 case 3: /* all char tab stops are cleared */ 2747 case 3: /* all char tab stops are cleared */
2651 /* case 4: */ /* all line tab stops are cleared */ 2748 /* case 4: */ /* all line tab stops are cleared */
2652 case 5: /* all tab stops are cleared */ 2749 case 5: /* all tab stops are cleared */
2653 rxvt_scr_set_tab(aR_ -1); 2750 scr_set_tab (-1);
2751 break;
2752 }
2654 break; 2753 break;
2655 }
2656 break;
2657 2754
2658 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2755 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2659 switch (arg[0]) { 2756 switch (arg[0])
2757 {
2660 case 0: /* char tab stop set at active position */ 2758 case 0: /* char tab stop set at active position */
2661 rxvt_scr_set_tab(aR_ 1); 2759 scr_set_tab (1);
2662 break; /* = ESC H */ 2760 break; /* = ESC H */
2663 /* case 1: */ /* line tab stop set at active line */ 2761 /* case 1: */ /* line tab stop set at active line */
2664 case 2: /* char tab stop cleared at active position */ 2762 case 2: /* char tab stop cleared at active position */
2665 rxvt_scr_set_tab(aR_ 0); 2763 scr_set_tab (0);
2666 break; /* = ESC [ 0 g */ 2764 break; /* = ESC [ 0 g */
2667 /* case 3: */ /* line tab stop cleared at active line */ 2765 /* case 3: */ /* line tab stop cleared at active line */
2668 /* case 4: */ /* char tab stops cleared at active line */ 2766 /* case 4: */ /* char tab stops cleared at active line */
2669 case 5: /* all char tab stops are cleared */ 2767 case 5: /* all char tab stops are cleared */
2670 rxvt_scr_set_tab(aR_ -1); 2768 scr_set_tab (-1);
2671 break; /* = ESC [ 3 g */ 2769 break; /* = ESC [ 3 g */
2672 /* case 6: */ /* all line tab stops are cleared */ 2770 /* case 6: */ /* all line tab stops are cleared */
2673 } 2771 }
2674 break; 2772 break;
2675 2773
2676 case CSI_RM: /* 8.3.107: RESET MODE */ 2774 case CSI_RM: /* 8.3.107: RESET MODE */
2677 if (arg[0] == 4) 2775 if (arg[0] == 4)
2678 rxvt_scr_insert_mode(aR_ 0); 2776 scr_insert_mode (0);
2679 break; 2777 break;
2680 2778
2681 case CSI_SM: /* 8.3.126: SET MODE */ 2779 case CSI_SM: /* 8.3.126: SET MODE */
2682 if (arg[0] == 4) 2780 if (arg[0] == 4)
2683 rxvt_scr_insert_mode(aR_ 1); 2781 scr_insert_mode (1);
2684 break; 2782 break;
2685 2783
2686/* 2784 /*
2687 * PRIVATE USE beyond this point. All CSI_7? sequences here 2785 * PRIVATE USE beyond this point. All CSI_7? sequences here
2688 */ 2786 */
2689 case CSI_72: /* DECSTBM: set top and bottom margins */ 2787 case CSI_72: /* DECSTBM: set top and bottom margins */
2690 if (nargs == 1) 2788 if (nargs == 1)
2691 rxvt_scr_scroll_region(aR_ arg[0] - 1, MAX_ROWS - 1); 2789 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2692 else if (nargs == 0 || arg[0] >= arg[1]) 2790 else if (nargs == 0 || arg[0] >= arg[1])
2693 rxvt_scr_scroll_region(aR_ 0, MAX_ROWS - 1); 2791 scr_scroll_region (0, MAX_ROWS - 1);
2694 else 2792 else
2695 rxvt_scr_scroll_region(aR_ arg[0] - 1, arg[1] - 1); 2793 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2696 break; 2794 break;
2697 2795
2698 case CSI_73: 2796 case CSI_73:
2699 rxvt_scr_cursor(aR_ SAVE); 2797 scr_cursor (SAVE);
2700 break; 2798 break;
2701 case CSI_75: 2799 case CSI_75:
2702 rxvt_scr_cursor(aR_ RESTORE); 2800 scr_cursor (RESTORE);
2703 break; 2801 break;
2704 2802
2705#ifndef NO_FRILLS 2803#ifndef NO_FRILLS
2706 case CSI_74: 2804 case CSI_74:
2707 rxvt_process_window_ops(aR_ arg, nargs); 2805 process_window_ops (arg, nargs);
2708 break; 2806 break;
2709#endif 2807#endif
2710 2808
2711 case CSI_78: /* DECREQTPARM */ 2809 case CSI_78: /* DECREQTPARM */
2712 if (arg[0] == 0 || arg[0] == 1) 2810 if (arg[0] == 0 || arg[0] == 1)
2713 R->tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2811 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2714 /* FALLTHROUGH */ 2812 /* FALLTHROUGH */
2715 2813
2716 default: 2814 default:
2717 break; 2815 break;
2718 } 2816 }
2719} 2817}
2720/*}}} */ 2818/*}}} */
2721 2819
2722#ifndef NO_FRILLS 2820#ifndef NO_FRILLS
2723/* ARGSUSED */ 2821/* ARGSUSED */
2724/* INTPROTO */
2725void 2822void
2726rxvt_process_window_ops(pR_ const int *args, unsigned int nargs) 2823rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2727{ 2824{
2728 int x, y; 2825 int x, y;
2729#if 0 2826#if 0
2730 char *s; 2827 char *s;
2731#endif 2828#endif
2732 XWindowAttributes wattr; 2829 XWindowAttributes wattr;
2733 Window wdummy; 2830 Window wdummy;
2734 2831
2735 if (nargs == 0) 2832 if (nargs == 0)
2736 return; 2833 return;
2737 switch (args[0]) { 2834 switch (args[0])
2835 {
2738 /* 2836 /*
2739 * commands 2837 * commands
2740 */ 2838 */
2741 case 1: /* deiconify window */ 2839 case 1: /* deiconify window */
2742 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 2840 XMapWindow(display->display, TermWin.parent[0]);
2743 break; 2841 break;
2744 case 2: /* iconify window */ 2842 case 2: /* iconify window */
2745 XIconifyWindow(R->Xdisplay, R->TermWin.parent[0], 2843 XIconifyWindow(display->display, TermWin.parent[0],
2746 DefaultScreen(R->Xdisplay)); 2844 DefaultScreen(display->display));
2747 break; 2845 break;
2748 case 3: /* set position (pixels) */ 2846 case 3: /* set position (pixels) */
2749 XMoveWindow(R->Xdisplay, R->TermWin.parent[0], args[1], args[2]); 2847 XMoveWindow(display->display, TermWin.parent[0], args[1], args[2]);
2750 break; 2848 break;
2751 case 4: /* set size (pixels) */ 2849 case 4: /* set size (pixels) */
2752 rxvt_set_widthheight(aR_ (unsigned int)args[2], (unsigned int)args[1]); 2850 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2753 break; 2851 break;
2754 case 5: /* raise window */ 2852 case 5: /* raise window */
2755 XRaiseWindow(R->Xdisplay, R->TermWin.parent[0]); 2853 XRaiseWindow(display->display, TermWin.parent[0]);
2756 break; 2854 break;
2757 case 6: /* lower window */ 2855 case 6: /* lower window */
2758 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2856 XLowerWindow(display->display, TermWin.parent[0]);
2759 break; 2857 break;
2760 case 7: /* refresh window */ 2858 case 7: /* refresh window */
2761 R->scr_touch (true); 2859 scr_touch (true);
2762 break; 2860 break;
2763 case 8: /* set size (chars) */ 2861 case 8: /* set size (chars) */
2764 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2862 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth),
2765 (unsigned int)(args[1] * R->TermWin.fheight)); 2863 (unsigned int)(args[1] * TermWin.fheight));
2766 break; 2864 break;
2767 default: 2865 default:
2768 if (args[0] >= 24) /* set height (chars) */ 2866 if (args[0] >= 24) /* set height (chars) */
2769 rxvt_set_widthheight(aR_ (unsigned int)R->TermWin.width, 2867 set_widthheight ((unsigned int)TermWin.width,
2770 (unsigned int)(args[1] * R->TermWin.fheight)); 2868 (unsigned int)(args[1] * TermWin.fheight));
2771 break; 2869 break;
2772 /* 2870 /*
2773 * reports - some output format copied from XTerm 2871 * reports - some output format copied from XTerm
2774 */ 2872 */
2775 case 11: /* report window state */ 2873 case 11: /* report window state */
2776 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2874 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr);
2777 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2875 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2778 break; 2876 break;
2779 case 13: /* report window position */ 2877 case 13: /* report window position */
2780 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2878 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr);
2781 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2879 XTranslateCoordinates(display->display, TermWin.parent[0], wattr.root,
2782 -wattr.border_width, -wattr.border_width, 2880 -wattr.border_width, -wattr.border_width,
2783 &x, &y, &wdummy); 2881 &x, &y, &wdummy);
2784 R->tt_printf("\033[3;%d;%dt", x, y); 2882 tt_printf("\033[3;%d;%dt", x, y);
2785 break; 2883 break;
2786 case 14: /* report window size (pixels) */ 2884 case 14: /* report window size (pixels) */
2787 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2885 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr);
2788 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2886 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2789 break; 2887 break;
2790 case 18: /* report window size (chars) */ 2888 case 18: /* report window size (chars) */
2791 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2889 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2792 break; 2890 break;
2793#if 0 /* XXX: currently disabled due to security concerns */ 2891#if 0 /* XXX: currently disabled due to security concerns */
2794 case 20: /* report icon label */ 2892 case 20: /* report icon label */
2795 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2893 XGetIconName(display->display, TermWin.parent[0], &s);
2796 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2894 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2797 break; 2895 break;
2798 case 21: /* report window title */ 2896 case 21: /* report window title */
2799 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2897 XFetchName(display->display, TermWin.parent[0], &s);
2800 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2898 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2801 break; 2899 break;
2802#endif 2900#endif
2901
2803 } 2902 }
2804} 2903}
2805#endif 2904#endif
2806 2905
2807/*----------------------------------------------------------------------*/ 2906/*----------------------------------------------------------------------*/
2808/* 2907/*
2809 * get input up until STRING TERMINATOR (or BEL) 2908 * get input up until STRING TERMINATOR (or BEL)
2810 * ends_how is terminator used. returned input must be free()d 2909 * ends_how is terminator used. returned input must be free()d
2811 */ 2910 */
2812/* INTPROTO */
2813unsigned char * 2911unsigned char *
2814rxvt_get_to_st(pR_ unsigned char *ends_how) 2912rxvt_term::get_to_st (unsigned char *ends_how)
2815{ 2913{
2816 int seen_esc = 0; /* seen escape? */ 2914 int seen_esc = 0; /* seen escape? */
2817 unsigned int n = 0; 2915 unsigned int n = 0;
2818 unsigned char *s; 2916 unsigned char *s;
2819 unsigned char ch, string[STRING_MAX]; 2917 unsigned char ch, string[STRING_MAX];
2820 2918
2821 for (; (ch = rxvt_cmd_getc(aR));) { 2919 for (; (ch = cmd_getc ());)
2920 {
2822 if (ch == C0_BEL 2921 if (ch == C0_BEL
2823 || ch == CHAR_ST 2922 || ch == CHAR_ST
2824 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2923 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2825 break; 2924 break;
2826 if (ch == C0_ESC) { 2925 if (ch == C0_ESC)
2926 {
2827 seen_esc = 1; 2927 seen_esc = 1;
2828 continue; 2928 continue;
2929 }
2829 } else if (ch == '\t') 2930 else if (ch == '\t')
2830 ch = ' '; /* translate '\t' to space */ 2931 ch = ' '; /* translate '\t' to space */
2831 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2932 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2832 return NULL; /* other control character - exit */ 2933 return NULL; /* other control character - exit */
2833 if (n < sizeof(string) - 1) 2934 if (n < sizeof(string) - 1)
2834 string[n++] = ch; 2935 string[n++] = ch;
2835 seen_esc = 0; 2936 seen_esc = 0;
2836 } 2937 }
2837 string[n++] = '\0'; 2938 string[n++] = '\0';
2838 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2939 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL)
2839 return NULL; 2940 return NULL;
2840 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2941 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2841 STRNCPY(s, string, n); 2942 STRNCPY(s, string, n);
2842 return s; 2943 return s;
2843} 2944}
2844 2945
2845/*----------------------------------------------------------------------*/ 2946/*----------------------------------------------------------------------*/
2846/* 2947/*
2847 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 2948 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2848 */ 2949 */
2849/* INTPROTO */
2850void 2950void
2851rxvt_process_dcs_seq(pR) 2951rxvt_term::process_dcs_seq ()
2852{ 2952{
2853 unsigned char eh, *s; 2953 unsigned char eh, *s;
2854/* 2954 /*
2855 * Not handled yet 2955 * Not handled yet
2856 */ 2956 */
2857 s = rxvt_get_to_st(aR_ &eh); 2957 s = get_to_st (&eh);
2858 if (s) 2958 if (s)
2859 free(s); 2959 free(s);
2860 return; 2960 return;
2861} 2961}
2862 2962
2863/*----------------------------------------------------------------------*/ 2963/*----------------------------------------------------------------------*/
2864/* 2964/*
2865 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2965 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2866 */ 2966 */
2867/* INTPROTO */
2868void 2967void
2869rxvt_process_osc_seq(pR) 2968rxvt_term::process_osc_seq ()
2870{ 2969{
2871 unsigned char ch, eh, *s; 2970 unsigned char ch, eh, *s;
2872 int arg; 2971 int arg;
2873 2972
2874 ch = rxvt_cmd_getc(aR); 2973 ch = cmd_getc ();
2875 for (arg = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 2974 for (arg = 0; isdigit(ch); ch = cmd_getc ())
2876 arg = arg * 10 + (ch - '0'); 2975 arg = arg * 10 + (ch - '0');
2877 2976
2878 if (ch == ';') { 2977 if (ch == ';')
2879 s = rxvt_get_to_st(aR_ &eh); 2978 {
2880 if (s) { 2979 s = get_to_st (&eh);
2881 /* 2980 if (s)
2981 {
2982 /*
2882 * rxvt_menubar_dispatch() violates the constness of the string, 2983 * rxvt_menubar_dispatch() violates the constness of the string,
2883 * so do it here 2984 * so do it here
2884 */ 2985 */
2885 if (arg == XTerm_Menu) 2986 if (arg == XTerm_Menu)
2886#if 0 /* XXX: currently disabled due to security concerns */ 2987#if 0 /* XXX: currently disabled due to security concerns */
2887 rxvt_menubar_dispatch(aR_ (char *)s); 2988 menubar_dispatch ((char *)s);
2888#else 2989#else
2889 0; 2990 (void)0;
2890#endif 2991#endif
2891 else 2992 else
2892 rxvt_xterm_seq(aR_ arg, (char *)s, eh); 2993 xterm_seq (arg, (char *)s, eh);
2893 free(s); 2994 free(s);
2894 } 2995 }
2895 } 2996 }
2896} 2997}
2897/* 2998/*
2898 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2999 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2899 * 0 = change iconName/title 3000 * 0 = change iconName/title
… …
2913 * 20 = bg pixmap 3014 * 20 = bg pixmap
2914 * 39 = change default fg color 3015 * 39 = change default fg color
2915 * 49 = change default bg color 3016 * 49 = change default bg color
2916 * 55 = dump scrollback buffer and all of screen 3017 * 55 = dump scrollback buffer and all of screen
2917 */ 3018 */
2918/* EXTPROTO */
2919void 3019void
2920rxvt_xterm_seq(pR_ int op, const char *str, unsigned char resp __attribute__((unused))) 3020rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused)))
2921{ 3021{
2922 int changed = 0; 3022 int changed = 0;
2923 int color; 3023 int color;
2924 char *buf, *name; 3024 char *buf, *name;
2925 3025
2926 assert(str != NULL); 3026 assert(str != NULL);
2927 switch (op) { 3027 switch (op)
3028 {
2928 case XTerm_name: 3029 case XTerm_name:
2929 rxvt_set_title(aR_ str); 3030 set_title (str);
2930 /* FALLTHROUGH */ 3031 /* FALLTHROUGH */
2931 case XTerm_iconName: 3032 case XTerm_iconName:
2932 rxvt_set_iconName(aR_ str); 3033 set_iconName (str);
2933 break; 3034 break;
2934 case XTerm_title: 3035 case XTerm_title:
2935 rxvt_set_title(aR_ str); 3036 set_title (str);
2936 break; 3037 break;
2937 case XTerm_Color: 3038 case XTerm_Color:
2938 for (buf = (char *)str; buf && *buf;) { 3039 for (buf = (char *)str; buf && *buf;)
3040 {
2939 if ((name = STRCHR(buf, ';')) == NULL) 3041 if ((name = STRCHR(buf, ';')) == NULL)
2940 break; 3042 break;
2941 *name++ = '\0'; 3043 *name++ = '\0';
2942 color = atoi(buf); 3044 color = atoi(buf);
2943 if (color < 0 || color >= TOTAL_COLORS) 3045 if (color < 0 || color >= TOTAL_COLORS)
2944 break; 3046 break;
2945 if ((buf = STRCHR(name, ';')) != NULL) 3047 if ((buf = STRCHR(name, ';')) != NULL)
2946 *buf++ = '\0'; 3048 *buf++ = '\0';
2947 rxvt_set_window_color(aR_ color + minCOLOR, name); 3049 set_window_color (color + minCOLOR, name);
2948 } 3050 }
2949 break; 3051 break;
2950#ifndef NO_CURSORCOLOR 3052#ifndef NO_CURSORCOLOR
2951 case XTerm_Color_cursor: 3053 case XTerm_Color_cursor:
2952 rxvt_set_window_color(aR_ Color_cursor, str); 3054 set_window_color (Color_cursor, str);
2953 break; 3055 break;
2954#endif 3056#endif
2955 case XTerm_Color_pointer: 3057 case XTerm_Color_pointer:
2956 rxvt_set_window_color(aR_ Color_pointer, str); 3058 set_window_color (Color_pointer, str);
2957 break; 3059 break;
2958#ifndef NO_BOLD_UNDERLINE_REVERSE 3060#ifndef NO_BOLD_UNDERLINE_REVERSE
2959 case XTerm_Color_BD: 3061 case XTerm_Color_BD:
2960 rxvt_set_window_color(aR_ Color_BD, str); 3062 set_window_color (Color_BD, str);
2961 break; 3063 break;
2962 case XTerm_Color_UL: 3064 case XTerm_Color_UL:
2963 rxvt_set_window_color(aR_ Color_UL, str); 3065 set_window_color (Color_UL, str);
2964 break; 3066 break;
2965 case XTerm_Color_RV: 3067 case XTerm_Color_RV:
2966 rxvt_set_window_color(aR_ Color_RV, str); 3068 set_window_color (Color_RV, str);
2967 break; 3069 break;
2968#endif 3070#endif
2969 3071
2970 case XTerm_Menu: 3072 case XTerm_Menu:
2971 /* 3073 /*
2972 * rxvt_menubar_dispatch() violates the constness of the string, 3074 * rxvt_menubar_dispatch() violates the constness of the string,
2973 * so DON'T do it here 3075 * so DON'T do it here
2974 */ 3076 */
2975 break; 3077 break;
2976 case XTerm_Pixmap: 3078 case XTerm_Pixmap:
2977 if (*str != ';') { 3079 if (*str != ';')
3080 {
2978#if XPM_BACKGROUND 3081#if XPM_BACKGROUND
2979 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 3082 scale_pixmap (""); /* reset to default scaling */
2980 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 3083 set_bgPixmap (str); /* change pixmap */
2981#endif 3084#endif
2982 R->scr_touch (true); 3085 scr_touch (true);
2983 } 3086 }
2984 while ((str = STRCHR(str, ';')) != NULL) { 3087 while ((str = STRCHR(str, ';')) != NULL)
2985 str++; 3088 {
3089 str++;
2986#if XPM_BACKGROUND 3090#if XPM_BACKGROUND
2987 changed += rxvt_scale_pixmap(aR_ str); 3091 changed += scale_pixmap (str);
2988#endif 3092#endif
2989 } 3093
2990 if (changed) { 3094 }
3095 if (changed)
3096 {
2991#ifdef XPM_BACKGROUND 3097#ifdef XPM_BACKGROUND
2992 rxvt_resize_pixmap(aR); 3098 resize_pixmap ();
2993#endif 3099#endif
2994 R->scr_touch (true); 3100 scr_touch (true);
2995 } 3101 }
2996 break; 3102 break;
2997 3103
2998 case XTerm_restoreFG: 3104 case XTerm_restoreFG:
2999 rxvt_set_window_color(aR_ Color_fg, str); 3105 set_window_color (Color_fg, str);
3000 break; 3106 break;
3001 case XTerm_restoreBG: 3107 case XTerm_restoreBG:
3002 rxvt_set_window_color(aR_ Color_bg, str); 3108 set_window_color (Color_bg, str);
3003 break; 3109 break;
3004 case XTerm_logfile: 3110 case XTerm_logfile:
3005 break; 3111 break;
3006 case XTerm_font: 3112 case XTerm_font:
3007 rxvt_change_font(aR_ 0, str); 3113 change_font (0, str);
3008 break; 3114 break;
3009#if 0 3115#if 0
3010 case XTerm_dumpscreen: /* no error notices */ 3116 case XTerm_dumpscreen: /* no error notices */
3011 { 3117 {
3012 int fd; 3118 int fd;
3013 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { 3119 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3014 rxvt_scr_dump(aR_ fd); 3120 {
3015 close(fd); 3121 scr_dump (fd);
3016 } 3122 close(fd);
3017 } 3123 }
3018 break; 3124 }
3125 break;
3019#endif 3126#endif
3127
3020 } 3128 }
3021} 3129}
3022/*----------------------------------------------------------------------*/ 3130/*----------------------------------------------------------------------*/
3023 3131
3024/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3132/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3029 * 's' = save 3137 * 's' = save
3030 * 'r' = restore 3138 * 'r' = restore
3031 * 't' = toggle 3139 * 't' = toggle
3032 * so no need for fancy checking 3140 * so no need for fancy checking
3033 */ 3141 */
3034/* INTPROTO */
3035int 3142int
3036rxvt_privcases(pR_ int mode, unsigned long bit) 3143rxvt_term::privcases (int mode, unsigned long bit)
3037{ 3144{
3038 int state; 3145 int state;
3039 3146
3040 if (mode == 's') { 3147 if (mode == 's')
3148 {
3041 R->SavedModes |= (R->PrivateModes & bit); 3149 SavedModes |= (PrivateModes & bit);
3042 return -1; 3150 return -1;
3043 } else { 3151 }
3152 else
3153 {
3044 if (mode == 'r') 3154 if (mode == 'r')
3045 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3155 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3046 else 3156 else
3047 state = (mode == 't') ? !(R->PrivateModes & bit) : mode; 3157 state = (mode == 't') ? !(PrivateModes & bit) : mode;
3048 PrivMode(state, bit); 3158 PrivMode(state, bit);
3049 } 3159 }
3050 return state; 3160 return state;
3051} 3161}
3052 3162
3053/* we're not using priv _yet_ */ 3163/* we're not using priv _yet_ */
3054/* INTPROTO */
3055void 3164void
3056rxvt_process_terminal_mode(pR_ int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3165rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg)
3057{ 3166{
3058 unsigned int i, j; 3167 unsigned int i, j;
3059 int state; 3168 int state;
3060 static const struct { 3169 static const struct
3170 {
3061 const int argval; 3171 const int argval;
3062 const unsigned long bit; 3172 const unsigned long bit;
3173 }
3063 } argtopriv[] = { 3174 argtopriv[] = {
3064 { 1, PrivMode_aplCUR }, 3175 { 1, PrivMode_aplCUR },
3065 { 2, PrivMode_vt52 }, 3176 { 2, PrivMode_vt52 },
3066 { 3, PrivMode_132 }, 3177 { 3, PrivMode_132 },
3067 { 4, PrivMode_smoothScroll }, 3178 { 4, PrivMode_smoothScroll },
3068 { 5, PrivMode_rVideo }, 3179 { 5, PrivMode_rVideo },
3069 { 6, PrivMode_relOrigin }, 3180 { 6, PrivMode_relOrigin },
3070 { 7, PrivMode_Autowrap }, 3181 { 7, PrivMode_Autowrap },
3071 { 9, PrivMode_MouseX10 }, 3182 { 9, PrivMode_MouseX10 },
3072#ifdef menuBar_esc 3183#ifdef menuBar_esc
3073 { menuBar_esc, PrivMode_menuBar }, 3184 { menuBar_esc, PrivMode_menuBar },
3074#endif 3185#endif
3075#ifdef scrollBar_esc 3186#ifdef scrollBar_esc
3076 { scrollBar_esc, PrivMode_scrollBar }, 3187 { scrollBar_esc, PrivMode_scrollBar },
3077#endif 3188#endif
3078 { 25, PrivMode_VisibleCursor }, 3189 { 25, PrivMode_VisibleCursor },
3079 { 35, PrivMode_ShiftKeys }, 3190 { 35, PrivMode_ShiftKeys },
3080 { 40, PrivMode_132OK }, 3191 { 40, PrivMode_132OK },
3081 { 47, PrivMode_Screen }, 3192 { 47, PrivMode_Screen },
3082 { 66, PrivMode_aplKP }, 3193 { 66, PrivMode_aplKP },
3083#ifndef NO_BACKSPACE_KEY 3194#ifndef NO_BACKSPACE_KEY
3084 { 67, PrivMode_BackSpace }, 3195 { 67, PrivMode_BackSpace },
3085#endif 3196#endif
3086 { 1000, PrivMode_MouseX11 }, 3197 { 1000, PrivMode_MouseX11 },
3087 { 1010, PrivMode_TtyOutputInh }, 3198 { 1010, PrivMode_TtyOutputInh },
3088 { 1011, PrivMode_Keypress }, 3199 { 1011, PrivMode_Keypress },
3089 { 1047, PrivMode_Screen }, 3200 { 1047, PrivMode_Screen },
3090 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3201 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3091 }; 3202 };
3092 3203
3093 if (nargs == 0) 3204 if (nargs == 0)
3094 return; 3205 return;
3095 3206
3096/* make lo/hi boolean */ 3207 /* make lo/hi boolean */
3097 if (mode == 'l') 3208 if (mode == 'l')
3098 mode = 0; /* reset */ 3209 mode = 0; /* reset */
3099 else if (mode == 'h') 3210 else if (mode == 'h')
3100 mode = 1; /* set */ 3211 mode = 1; /* set */
3101 3212
3102 for (i = 0; i < nargs; i++) { 3213 for (i = 0; i < nargs; i++)
3214 {
3103 state = -1; 3215 state = -1;
3104 3216
3105 /* basic handling */ 3217 /* basic handling */
3106 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3218 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++)
3107 if (argtopriv[j].argval == arg[i]) { 3219 if (argtopriv[j].argval == arg[i])
3220 {
3108 state = rxvt_privcases(aR_ mode, argtopriv[j].bit); 3221 state = privcases (mode, argtopriv[j].bit);
3109 break; 3222 break;
3110 } 3223 }
3111 3224
3112 /* extra handling for values with state unkept */ 3225 /* extra handling for values with state unkept */
3113 if (state == -1) 3226 if (state == -1)
3114 switch (arg[i]) { 3227 switch (arg[i])
3228 {
3115 case 1048: /* alternative cursor save */ 3229 case 1048: /* alternative cursor save */
3116 if (mode == 0) 3230 if (mode == 0)
3117 rxvt_scr_cursor(aR_ RESTORE); 3231 scr_cursor (RESTORE);
3118 else if (mode == 1) 3232 else if (mode == 1)
3119 rxvt_scr_cursor(aR_ SAVE); 3233 scr_cursor (SAVE);
3120 /* FALLTHROUGH */ 3234 /* FALLTHROUGH */
3121 default: 3235 default:
3122 continue; /* for(;i;) */ 3236 continue; /* for(;i;) */
3123 } 3237 }
3124 3238
3125 /* extra handling for values with valid 0 or 1 state */ 3239 /* extra handling for values with valid 0 or 1 state */
3126 switch (arg[i]) { 3240 switch (arg[i])
3241 {
3127 /* case 1: - application cursor keys */ 3242 /* case 1: - application cursor keys */
3128 case 2: /* VT52 mode */ 3243 case 2: /* VT52 mode */
3129 /* oddball mode. should be set regardless of set/reset 3244 /* oddball mode. should be set regardless of set/reset
3130 * parameter. Return from VT52 mode with an ESC < from 3245 * parameter. Return from VT52 mode with an ESC < from
3131 * within VT52 mode 3246 * within VT52 mode
3132 */ 3247 */
3133 PrivMode(1, PrivMode_vt52); 3248 PrivMode(1, PrivMode_vt52);
3134 break; 3249 break;
3135 case 3: /* 80/132 */ 3250 case 3: /* 80/132 */
3136 if (R->PrivateModes & PrivMode_132OK) 3251 if (PrivateModes & PrivMode_132OK)
3137 rxvt_set_widthheight(aR_
3138 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3252 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth),
3139 (unsigned int)R->TermWin.height); 3253 (unsigned int)TermWin.height);
3140 break; 3254 break;
3141 case 4: /* smooth scrolling */ 3255 case 4: /* smooth scrolling */
3142 if (state) 3256 if (state)
3143 R->Options &= ~Opt_jumpScroll; 3257 Options &= ~Opt_jumpScroll;
3144 else 3258 else
3145 R->Options |= Opt_jumpScroll; 3259 Options |= Opt_jumpScroll;
3146 break; 3260 break;
3147 case 5: /* reverse video */ 3261 case 5: /* reverse video */
3148 rxvt_scr_rvideo_mode(aR_ state); 3262 scr_rvideo_mode (state);
3149 break; 3263 break;
3150 case 6: /* relative/absolute origins */ 3264 case 6: /* relative/absolute origins */
3151 rxvt_scr_relative_origin(aR_ state); 3265 scr_relative_origin (state);
3152 break; 3266 break;
3153 case 7: /* autowrap */ 3267 case 7: /* autowrap */
3154 rxvt_scr_autowrap(aR_ state); 3268 scr_autowrap (state);
3155 break; 3269 break;
3156 /* case 8: - auto repeat, can't do on a per window basis */ 3270 /* case 8: - auto repeat, can't do on a per window basis */
3157 case 9: /* X10 mouse reporting */ 3271 case 9: /* X10 mouse reporting */
3158 if (state) /* orthogonal */ 3272 if (state) /* orthogonal */
3159 R->PrivateModes &= ~(PrivMode_MouseX11); 3273 PrivateModes &= ~(PrivMode_MouseX11);
3160 break; 3274 break;
3161#ifdef menuBar_esc 3275#ifdef menuBar_esc
3162 case menuBar_esc: 3276 case menuBar_esc:
3163#ifdef MENUBAR 3277#ifdef MENUBAR
3164 rxvt_map_menuBar(aR_ state); 3278 map_menuBar (state);
3165#endif 3279#endif
3166 break; 3280 break;
3167#endif 3281#endif
3168#ifdef scrollBar_esc 3282#ifdef scrollBar_esc
3169 case scrollBar_esc: 3283 case scrollBar_esc:
3170 if (rxvt_scrollbar_mapping(aR_ state)) { 3284 if (scrollbar_mapping (state))
3171 R->resize_all_windows (0, 0, 0); 3285 {
3286 resize_all_windows (0, 0, 0);
3172 R->scr_touch (true); 3287 scr_touch (true);
3173 } 3288 }
3174 break; 3289 break;
3175#endif 3290#endif
3176 case 25: /* visible/invisible cursor */ 3291 case 25: /* visible/invisible cursor */
3177 rxvt_scr_cursor_visible(aR_ state); 3292 scr_cursor_visible (state);
3178 break; 3293 break;
3179 /* case 35: - shift keys */ 3294 /* case 35: - shift keys */
3180 /* case 40: - 80 <--> 132 mode */ 3295 /* case 40: - 80 <--> 132 mode */
3181 case 47: /* secondary screen */ 3296 case 47: /* secondary screen */
3182 rxvt_scr_change_screen(aR_ state); 3297 scr_change_screen (state);
3183 break; 3298 break;
3184 /* case 66: - application key pad */ 3299 /* case 66: - application key pad */
3185 /* case 67: - backspace key */ 3300 /* case 67: - backspace key */
3186 case 1000: /* X11 mouse reporting */ 3301 case 1000: /* X11 mouse reporting */
3187 if (state) /* orthogonal */ 3302 if (state) /* orthogonal */
3188 R->PrivateModes &= ~(PrivMode_MouseX10); 3303 PrivateModes &= ~(PrivMode_MouseX10);
3189 break; 3304 break;
3190#if 0 3305#if 0
3191 case 1001: 3306 case 1001:
3192 break; /* X11 mouse highlighting */ 3307 break; /* X11 mouse highlighting */
3193#endif 3308#endif
3194 case 1010: /* scroll to bottom on TTY output inhibit */ 3309 case 1010: /* scroll to bottom on TTY output inhibit */
3195 if (state) 3310 if (state)
3196 R->Options &= ~Opt_scrollTtyOutput; 3311 Options &= ~Opt_scrollTtyOutput;
3197 else 3312 else
3198 R->Options |= Opt_scrollTtyOutput; 3313 Options |= Opt_scrollTtyOutput;
3199 break; 3314 break;
3200 case 1011: /* scroll to bottom on key press */ 3315 case 1011: /* scroll to bottom on key press */
3201 if (state) 3316 if (state)
3202 R->Options |= Opt_scrollTtyKeypress; 3317 Options |= Opt_scrollTtyKeypress;
3203 else 3318 else
3204 R->Options &= ~Opt_scrollTtyKeypress; 3319 Options &= ~Opt_scrollTtyKeypress;
3205 break; 3320 break;
3206 case 1047: /* secondary screen w/ clearing */ 3321 case 1047: /* secondary screen w/ clearing */
3207 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3322 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3208 if (R->current_screen != PRIMARY) 3323 if (current_screen != PRIMARY)
3209 R->scr_erase_screen (2); 3324 scr_erase_screen (2);
3210 rxvt_scr_change_screen(aR_ state); 3325 scr_change_screen (state);
3211 /* FALLTHROUGH */ 3326 /* FALLTHROUGH */
3212 default: 3327 default:
3213 break; 3328 break;
3214 } 3329 }
3215 } 3330 }
3216} 3331}
3217/*}}} */ 3332/*}}} */
3218 3333
3219/*{{{ process sgr sequences */ 3334/*{{{ process sgr sequences */
3220/* INTPROTO */
3221void 3335void
3222rxvt_process_sgr_mode(pR_ unsigned int nargs, const int *arg) 3336rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3223{ 3337{
3224 unsigned int i; 3338 unsigned int i;
3225 short rendset; 3339 short rendset;
3226 int rendstyle; 3340 int rendstyle;
3227 3341
3228 if (nargs == 0) { 3342 if (nargs == 0)
3229 rxvt_scr_rendition(aR_ 0, ~RS_None);
3230 return;
3231 } 3343 {
3344 scr_rendition (0, ~RS_None);
3345 return;
3346 }
3232 for (i = 0; i < nargs; i++) { 3347 for (i = 0; i < nargs; i++)
3348 {
3233 rendset = -1; 3349 rendset = -1;
3234 switch (arg[i]) { 3350 switch (arg[i])
3235 case 0: 3351 {
3352 case 0:
3236 rendset = 0, rendstyle = ~RS_None; 3353 rendset = 0, rendstyle = ~RS_None;
3237 break; 3354 break;
3238 case 1: 3355 case 1:
3239 rendset = 1, rendstyle = RS_Bold; 3356 rendset = 1, rendstyle = RS_Bold;
3240 break; 3357 break;
3241 case 4: 3358 case 4:
3242 rendset = 1, rendstyle = RS_Uline; 3359 rendset = 1, rendstyle = RS_Uline;
3243 break; 3360 break;
3244 case 5: 3361 case 5:
3245 rendset = 1, rendstyle = RS_Blink; 3362 rendset = 1, rendstyle = RS_Blink;
3246 break; 3363 break;
3247 case 7: 3364 case 7:
3248 rendset = 1, rendstyle = RS_RVid; 3365 rendset = 1, rendstyle = RS_RVid;
3249 break; 3366 break;
3250 case 22: 3367 case 22:
3251 rendset = 0, rendstyle = RS_Bold; 3368 rendset = 0, rendstyle = RS_Bold;
3252 break; 3369 break;
3253 case 24: 3370 case 24:
3254 rendset = 0, rendstyle = RS_Uline; 3371 rendset = 0, rendstyle = RS_Uline;
3255 break; 3372 break;
3256 case 25: 3373 case 25:
3257 rendset = 0, rendstyle = RS_Blink; 3374 rendset = 0, rendstyle = RS_Blink;
3258 break; 3375 break;
3259 case 27: 3376 case 27:
3260 rendset = 0, rendstyle = RS_RVid; 3377 rendset = 0, rendstyle = RS_RVid;
3261 break; 3378 break;
3262 } 3379 }
3263 if (rendset != -1) { 3380 if (rendset != -1)
3264 rxvt_scr_rendition(aR_ rendset, rendstyle); 3381 {
3382 scr_rendition (rendset, rendstyle);
3265 continue; /* for(;i;) */ 3383 continue; /* for(;i;) */
3266 } 3384 }
3267 3385
3268 switch (arg[i]) { 3386 switch (arg[i])
3269 case 30: 3387 {
3388 case 30:
3270 case 31: /* set fg color */ 3389 case 31: /* set fg color */
3271 case 32: 3390 case 32:
3272 case 33: 3391 case 33:
3273 case 34: 3392 case 34:
3274 case 35: 3393 case 35:
3275 case 36: 3394 case 36:
3276 case 37: 3395 case 37:
3277 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 30)), 3396 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)),
3278 Color_fg); 3397 Color_fg);
3279 break; 3398 break;
3280#ifdef TTY_256COLOR 3399#ifdef TTY_256COLOR
3281 case 38: 3400 case 38:
3282 if (nargs > i + 2 && arg[i + 1] == 5) { 3401 if (nargs > i + 2 && arg[i + 1] == 5)
3402 {
3283 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3403 scr_color ((unsigned int)(minCOLOR + arg[i + 2]),
3284 Color_fg); 3404 Color_fg);
3285 i += 2; 3405 i += 2;
3286 } 3406 }
3287 break; 3407 break;
3288#endif 3408#endif
3289 case 39: /* default fg */ 3409 case 39: /* default fg */
3290 rxvt_scr_color(aR_ Color_fg, Color_fg); 3410 scr_color (Color_fg, Color_fg);
3291 break; 3411 break;
3292 3412
3293 case 40: 3413 case 40:
3294 case 41: /* set bg color */ 3414 case 41: /* set bg color */
3295 case 42: 3415 case 42:
3296 case 43: 3416 case 43:
3297 case 44: 3417 case 44:
3298 case 45: 3418 case 45:
3299 case 46: 3419 case 46:
3300 case 47: 3420 case 47:
3301 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 40)), 3421 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)),
3302 Color_bg); 3422 Color_bg);
3303 break; 3423 break;
3304#ifdef TTY_256COLOR 3424#ifdef TTY_256COLOR
3305 case 48: 3425 case 48:
3306 if (nargs > i + 2 && arg[i + 1] == 5) { 3426 if (nargs > i + 2 && arg[i + 1] == 5)
3427 {
3307 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3428 scr_color ((unsigned int)(minCOLOR + arg[i + 2]),
3308 Color_bg); 3429 Color_bg);
3309 i += 2; 3430 i += 2;
3310 } 3431 }
3311 break; 3432 break;
3312#endif 3433#endif
3313 case 49: /* default bg */ 3434 case 49: /* default bg */
3314 rxvt_scr_color(aR_ Color_bg, Color_bg); 3435 scr_color (Color_bg, Color_bg);
3315 break; 3436 break;
3316 3437
3317#ifndef NO_BRIGHTCOLOR 3438#ifndef NO_BRIGHTCOLOR
3318 case 90: 3439 case 90:
3319 case 91: /* set bright fg color */ 3440 case 91: /* set bright fg color */
3320 case 92: 3441 case 92:
3321 case 93: 3442 case 93:
3322 case 94: 3443 case 94:
3323 case 95: 3444 case 95:
3324 case 96: 3445 case 96:
3325 case 97: 3446 case 97:
3326 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3447 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)),
3327 Color_fg); 3448 Color_fg);
3328 break; 3449 break;
3329 case 100: 3450 case 100:
3330 case 101: /* set bright bg color */ 3451 case 101: /* set bright bg color */
3331 case 102: 3452 case 102:
3332 case 103: 3453 case 103:
3333 case 104: 3454 case 104:
3334 case 105: 3455 case 105:
3335 case 106: 3456 case 106:
3336 case 107: 3457 case 107:
3337 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3458 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)),
3338 Color_bg); 3459 Color_bg);
3339 break; 3460 break;
3340#endif 3461#endif
3341 } 3462
3463 }
3342 } 3464 }
3343} 3465}
3344/*}}} */ 3466/*}}} */
3345 3467
3346/*{{{ process Rob Nation's own graphics mode sequences */ 3468/*{{{ process Rob Nation's own graphics mode sequences */
3347/* INTPROTO */
3348void 3469void
3349rxvt_process_graphics(pR) 3470rxvt_term::process_graphics ()
3350{ 3471{
3351 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3472 unsigned char ch, cmd = cmd_getc ();
3352 3473
3353#ifndef RXVT_GRAPHICS 3474#ifndef RXVT_GRAPHICS
3475 if (cmd == 'Q')
3354 if (cmd == 'Q') { /* query graphics */ 3476 { /* query graphics */
3355 R->tt_printf("\033G0\n"); /* no graphics */ 3477 tt_printf("\033G0\n"); /* no graphics */
3356 return; 3478 return;
3357 } 3479 }
3358/* swallow other graphics sequences until terminating ':' */ 3480 /* swallow other graphics sequences until terminating ':' */
3359 do 3481 do
3360 ch = rxvt_cmd_getc(aR); 3482 ch = cmd_getc ();
3361 while (ch != ':'); 3483 while (ch != ':');
3362#else 3484#else
3363 unsigned int nargs; 3485 unsigned int nargs;
3364 int args[NGRX_PTS]; 3486 int args[NGRX_PTS];
3365 unsigned char *text = NULL; 3487 unsigned char *text = NULL;
3366 3488
3489 if (cmd == 'Q')
3367 if (cmd == 'Q') { /* query graphics */ 3490 { /* query graphics */
3368 R->tt_printf("\033G1\n"); /* yes, graphics (color) */ 3491 tt_printf("\033G1\n"); /* yes, graphics (color) */
3369 return; 3492 return;
3370 } 3493 }
3371 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3494 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;)
3495 {
3372 int neg; 3496 int neg;
3373 3497
3374 ch = rxvt_cmd_getc(aR); 3498 ch = cmd_getc ();
3375 neg = (ch == '-'); 3499 neg = (ch == '-');
3376 if (neg || ch == '+') 3500 if (neg || ch == '+')
3377 ch = rxvt_cmd_getc(aR); 3501 ch = cmd_getc ();
3378 3502
3379 for (args[nargs] = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 3503 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3380 args[nargs] = args[nargs] * 10 + (ch - '0'); 3504 args[nargs] = args[nargs] * 10 + (ch - '0');
3381 if (neg) 3505 if (neg)
3382 args[nargs] = -args[nargs]; 3506 args[nargs] = -args[nargs];
3383 3507
3384 nargs++; 3508 nargs++;
3385 args[nargs] = 0; 3509 args[nargs] = 0;
3386 if (ch != ';') 3510 if (ch != ';')
3387 break; 3511 break;
3388 } 3512 }
3389 3513
3390 if ((cmd == 'T') && (nargs >= 5)) { 3514 if ((cmd == 'T') && (nargs >= 5))
3515 {
3391 int i, len = args[4]; 3516 int i, len = args[4];
3392 3517
3393 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char)); 3518 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3394 3519
3395 if (text != NULL) { 3520 if (text != NULL)
3521 {
3396 for (i = 0; i < len; i++) 3522 for (i = 0; i < len; i++)
3397 text[i] = rxvt_cmd_getc(aR); 3523 text[i] = cmd_getc ();
3398 text[len] = '\0'; 3524 text[len] = '\0';
3399 } 3525 }
3400 } 3526 }
3401 rxvt_Gr_do_graphics(aR_ cmd, nargs, args, text); 3527 Gr_do_graphics (cmd, nargs, args, text);
3402#endif 3528#endif
3403} 3529}
3404/*}}} */ 3530/*}}} */
3405 3531
3406/* ------------------------------------------------------------------------- */ 3532/* ------------------------------------------------------------------------- */
… …
3432 3558
3433 if (len) 3559 if (len)
3434 { 3560 {
3435 if (v_buflen == 0) 3561 if (v_buflen == 0)
3436 { 3562 {
3437 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 3563 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3564
3438 if (written == len) 3565 if ((unsigned int)written == len)
3439 return; 3566 return;
3440 3567
3441 data += written; 3568 data += written;
3442 len -= written; 3569 len -= written;
3443 } 3570 }

Diff Legend

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