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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.32 by pcg, Thu Jan 29 23:31:45 2004 UTC vs.
Revision 1.58 by pcg, Wed Feb 25 15:06:03 2004 UTC

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

Diff Legend

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