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.19 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.60 by pcg, Fri Feb 27 02:52:51 2004 UTC

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

Diff Legend

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