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.29 by pcg, Mon Jan 19 17:26:43 2004 UTC vs.
Revision 1.39 by pcg, Mon Feb 9 07:15:46 2004 UTC

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

Diff Legend

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