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.10 by pcg, Thu Nov 27 16:49:45 2003 UTC vs.
Revision 1.51 by pcg, Sun Feb 22 08:28:36 2004 UTC

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

Diff Legend

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