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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.8 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.26 by pcg, Sun Feb 1 01:34:41 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.8 2003/11/27 10:12:10 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>
42 41
43#ifdef HAVE_TERMIOS_H 42#ifdef HAVE_TERMIOS_H
44# include <termios.h> 43# include <termios.h>
45#endif 44#endif
46 45
46#include <cstring>
47
48static char curlocale[128];
49
50void
51rxvt_set_locale (const char *locale)
52{
53 if (locale && STRNCMP (locale, curlocale, 128))
54 {
55 STRNCPY (curlocale, locale, 128);
56 setlocale (LC_CTYPE, curlocale);
57 }
58}
59
47void * 60void *
48rxvt_term::operator new (size_t s) 61rxvt_term::operator new (size_t s)
49{ 62{
50 void *p = malloc (s); 63 void *p = malloc (s);
51 64
58{ 71{
59 free (p); 72 free (p);
60} 73}
61 74
62rxvt_term::rxvt_term () 75rxvt_term::rxvt_term ()
63: pty_ev (this, &rxvt_term::pty_cb), 76 :
64#ifdef CURSOR_BLINK 77#ifdef CURSOR_BLINK
78 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
79#endif
80#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 81 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 82#endif
67#ifdef POINTER_BLANK 83#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 84 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 85#endif
70 x_ev (this, &rxvt_term::x_cb), 86 check_ev (this, &rxvt_term::check_cb),
71 destroy_ev (this, &rxvt_term::destroy_cb) 87 destroy_ev (this, &rxvt_term::destroy_cb),
88 pty_ev (this, &rxvt_term::pty_cb),
89 x_ev (this, &rxvt_term::x_cb),
90 incr_ev (this, &rxvt_term::incr_cb)
72{ 91{
73 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 92 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
74} 93}
75 94
76rxvt_term::~rxvt_term () 95rxvt_term::~rxvt_term ()
77{ 96{
78 rxvt_scr_release (this); 97 scr_release ();
98
99 free (locale);
100 free (codeset);
79 101
80#ifndef NO_SETOWNER_TTYDEV 102#ifndef NO_SETOWNER_TTYDEV
81 rxvt_privileged_ttydev (this, RESTORE); 103 privileged_ttydev (RESTORE);
82#endif 104#endif
83#ifdef UTMP_SUPPORT 105#ifdef UTMP_SUPPORT
84 rxvt_privileged_utmp (this, RESTORE); 106 privileged_utmp (RESTORE);
85#endif 107#endif
86#ifdef USE_XIM 108#ifdef USE_XIM
87 if (Input_Context != NULL) 109 if (Input_Context != NULL)
88 { 110 {
89 XDestroyIC (Input_Context); 111 XDestroyIC (Input_Context);
101} 123}
102 124
103void 125void
104rxvt_term::destroy () 126rxvt_term::destroy ()
105{ 127{
128 check_ev.stop ();
106 pty_ev.stop (); 129 pty_ev.stop ();
107 x_ev.stop (); 130 x_ev.stop ();
108#ifdef CURSOR_BLINK 131#ifdef CURSOR_BLINK
132 cursor_blink_ev.stop ();
133#endif
134#ifdef TEXT_BLINK
109 blink_ev.stop (); 135 text_blink_ev.stop ();
110#endif 136#endif
111#ifdef POINTER_BLANK 137#ifdef POINTER_BLANK
112 pointer_ev.stop (); 138 pointer_ev.stop ();
113#endif 139#endif
114 140
125 151
126/*----------------------------------------------------------------------*/ 152/*----------------------------------------------------------------------*/
127/* rxvt_init() */ 153/* rxvt_init() */
128/* LIBPROTO */ 154/* LIBPROTO */
129rxvt_t 155rxvt_t
130rxvt_init(int argc, const char *const *argv) 156rxvt_init (int argc, const char *const *argv)
131{ 157{
132 SET_R(new rxvt_term); 158 SET_R (new rxvt_term);
133 dR;
134 159
135 if (!R->init_vars () || !R->init (argc, argv)) 160 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
136 { 161 {
137 delete R; 162 delete GET_R;
138 return NULL; 163 SET_R (0);
139 } 164 }
140 165
141 return R; 166 return GET_R;
142} 167}
143 168
144/* EXTPROTO */
145void 169void
146rxvt_init_signals () 170rxvt_init_signals ()
147{ 171{
148/* install exit handler for cleanup */ 172 /* install exit handler for cleanup */
149#if 0 173#if 0
150#ifdef HAVE_ATEXIT 174#ifdef HAVE_ATEXIT
151 atexit(rxvt_clean_exit); 175 atexit(rxvt_clean_exit);
152#else 176#else
153# ifdef HAVE_ON_EXIT
154 on_exit(rxvt_clean_exit, NULL); /* non-ANSI exit handler */
155# endif
156#endif 177#endif
157#endif 178#endif
158 179
159 struct sigaction sa; 180 struct sigaction sa;
160 181
161 sigfillset (&sa.sa_mask); 182 sigfillset (&sa.sa_mask);
162 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; 183 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
163 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGHUP , &sa, 0); //TODO, also: SIGPIPE 184 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
185 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
164 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); 186 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
165 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); 187 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
166 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); 188 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
167 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); 189 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
168 190
169/* need to trap SIGURG for SVR4 (Unixware) rlogin */ 191 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
170/* signal (SIGURG, SIG_DFL); */ 192 /* signal (SIGURG, SIG_DFL); */
171 193
172 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 194 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
173 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 195 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
174} 196}
175 197
176bool 198bool
177rxvt_term::init (int argc, const char *const *argv) 199rxvt_term::init (int argc, const char *const *argv)
178{ 200{
179 dR;//TODO (scrollbar, setidle)
180
181 /* 201 /*
182 * Save and then give up any super-user privileges 202 * Save and then give up any super-user privileges
183 * If we need privileges in any area then we must specifically request it. 203 * If we need privileges in any area then we must specifically request it.
184 * We should only need to be root in these cases: 204 * We should only need to be root in these cases:
185 * 1. write utmp entries on some systems 205 * 1. write utmp entries on some systems
186 * 2. chown tty on some systems 206 * 2. chown tty on some systems
187 */ 207 */
188 rxvt_privileges (this, SAVE); 208 privileges (SAVE);
189 rxvt_privileges (this, IGNORE); 209 privileges (IGNORE);
190 210
191 rxvt_init_secondary (this); 211 init_secondary ();
192 212
193 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 213 const char **cmd_argv = init_resources (argc, argv);
214
215 set_locale ("");
194 216
195#if (MENUBAR_MAX) 217#if (MENUBAR_MAX)
196 rxvt_menubar_read (this, rs[Rs_menu]); 218 menubar_read (rs[Rs_menu]);
197#endif 219#endif
198#ifdef HAVE_SCROLLBARS 220#ifdef HAVE_SCROLLBARS
199 if (Options & Opt_scrollBar) 221 if (Options & Opt_scrollBar)
200 scrollbar_setIdle (); /* set existence for size calculations */ 222 scrollBar.setIdle (); /* set existence for size calculations */
201#endif 223#endif
202 224
203 rxvt_Create_Windows (this, argc, argv); 225 create_windows (argc, argv);
204 226
205 rxvt_init_xlocale (this); 227 init_xlocale ();
206 228
207 rxvt_scr_reset (this); /* initialize screen */ 229 scr_reset (); /* initialize screen */
208#ifdef RXVT_GRAPHICS 230#ifdef RXVT_GRAPHICS
209 rxvt_Gr_reset (this); /* reset graphics */ 231 Gr_reset (); /* reset graphics */
210#endif 232#endif
211 233
212#if 0 234#if 0
213#ifdef DEBUG_X 235#ifdef DEBUG_X
214 XSynchronize(Xdisplay, True); 236 XSynchronize(Xdisplay, True);
215#endif 237#endif
216#endif 238#endif
217 239
218#ifdef HAVE_SCROLLBARS 240#ifdef HAVE_SCROLLBARS
219 if (Options & Opt_scrollBar) 241 if (Options & Opt_scrollBar)
220 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 242 resize_scrollbar (); /* create and map scrollbar */
221#endif 243#endif
222#if (MENUBAR_MAX) 244#if (MENUBAR_MAX)
223 if (menubar_visible(r)) 245 if (menubar_visible(r))
224 XMapWindow (Xdisplay, menuBar.win); 246 XMapWindow (Xdisplay, menuBar.win);
225#endif 247#endif
226#ifdef TRANSPARENT 248#ifdef TRANSPARENT
227 if (Options & Opt_transparent) 249 if (Options & Opt_transparent)
228 { 250 {
229 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 251 XSelectInput (Xdisplay, Xroot, PropertyChangeMask);
230 rxvt_check_our_parents (this); 252 check_our_parents ();
231 } 253 }
232#endif 254#endif
233 XMapWindow (Xdisplay, TermWin.vt); 255 XMapWindow (Xdisplay, TermWin.vt);
234 XMapWindow (Xdisplay, TermWin.parent[0]); 256 XMapWindow (Xdisplay, TermWin.parent[0]);
235 257
236 rxvt_init_env (this); 258 init_env ();
237 rxvt_init_command (this, cmd_argv); 259 init_command (cmd_argv);
238 260
239 x_ev.start (Xfd, EVENT_READ); 261 x_ev.start (Xfd, EVENT_READ);
240 pty_ev.start (cmd_fd, EVENT_READ); 262 pty_ev.start (cmd_fd, EVENT_READ);
241 263
242 flush (); 264 check_ev.start ();
265
266 process_x_events ();
243 267
244 return true; 268 return true;
245} 269}
246 270
247/* ------------------------------------------------------------------------- * 271/* ------------------------------------------------------------------------- *
253/* ARGSUSED */ 277/* ARGSUSED */
254/* EXTPROTO */ 278/* EXTPROTO */
255RETSIGTYPE 279RETSIGTYPE
256rxvt_Child_signal(int sig __attribute__ ((unused))) 280rxvt_Child_signal(int sig __attribute__ ((unused)))
257{ 281{
258 int pid, save_errno = errno; 282 int pid, save_errno = errno;
259 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 283 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
260 ; 284 ;
261 errno = save_errno; 285 errno = save_errno;
262 286
263#if 0 287#if 0
264 if (pid == R->cmd_pid) 288 if (pid == cmd_pid)
265 exit (EXIT_SUCCESS); 289 exit (EXIT_SUCCESS);
266#endif 290#endif
267} 291}
268 292
269/* 293/*
270 * Catch a fatal signal and tidy up before quitting 294 * Catch a fatal signal and tidy up before quitting
271 */ 295 */
272/* EXTPROTO */ 296/* EXTPROTO */
273RETSIGTYPE 297RETSIGTYPE
274rxvt_Exit_signal(int sig) 298rxvt_Exit_signal(int sig)
275{ 299{
276 signal(sig, SIG_DFL); 300 signal(sig, SIG_DFL);
277#ifdef DEBUG_CMD 301#ifdef DEBUG_CMD
278 rxvt_print_error("signal %d", sig); 302 rxvt_print_error("signal %d", sig);
279#endif 303#endif
280 rxvt_clean_exit(); 304 rxvt_clean_exit();
281 kill(getpid(), sig); 305 kill(getpid(), sig);
282} 306}
283 307
284/* ARGSUSED */ 308/* ARGSUSED */
285/* INTPROTO */ 309/* EXTPROTO */
286int 310int
287rxvt_xerror_handler(const Display * display 311rxvt_xerror_handler(const Display * display
288 __attribute__ ((unused)), const XErrorEvent * event) 312 __attribute__ ((unused)), const XErrorEvent * event)
289{ 313{
290 dR;
291
292 if (R->allowedxerror == -1) 314 if (GET_R->allowedxerror == -1)
293 R->allowedxerror = event->error_code; 315 GET_R->allowedxerror = event->error_code;
294 else 316 else
295 { 317 {
296 rxvt_print_error("XError: Request: %d . %d, Error: %d", 318 rxvt_print_error("XError: Request: %d . %d, Error: %d",
297 event->request_code, event->minor_code, 319 event->request_code, event->minor_code,
298 event->error_code); 320 event->error_code);
299 321
300 R->destroy (); 322 GET_R->destroy ();
301 } 323 }
302 324
303 return 0; 325 return 0;
304} 326}
305 327
310 */ 332 */
311/* EXTPROTO */ 333/* EXTPROTO */
312void 334void
313rxvt_clean_exit () 335rxvt_clean_exit ()
314{ 336{
315 dR;
316
317 R->destroy (); 337 GET_R->destroy ();
318} 338}
319 339
320/* ------------------------------------------------------------------------- * 340/* ------------------------------------------------------------------------- *
321 * MEMORY ALLOCATION WRAPPERS * 341 * MEMORY ALLOCATION WRAPPERS *
322 * ------------------------------------------------------------------------- */ 342 * ------------------------------------------------------------------------- */
323/* EXTPROTO */ 343/* EXTPROTO */
324void * 344void *
325rxvt_malloc(size_t size) 345rxvt_malloc(size_t size)
326{ 346{
327 void *p; 347 void *p;
328 348
329 p = malloc(size); 349 p = malloc(size);
330 if (p) 350 if (p)
331 return p; 351 return p;
332 352
333 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 353 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
334 rxvt_clean_exit(); 354 rxvt_clean_exit();
335 exit(EXIT_FAILURE); 355 exit(EXIT_FAILURE);
336/* NOTREACHED */ 356 /* NOTREACHED */
337} 357}
338 358
339/* EXTPROTO */ 359/* EXTPROTO */
340void * 360void *
341rxvt_calloc(size_t number, size_t size) 361rxvt_calloc(size_t number, size_t size)
342{ 362{
343 void *p; 363 void *p;
344 364
345 p = calloc(number, size); 365 p = calloc(number, size);
346 if (p) 366 if (p)
347 return p; 367 return p;
348 368
349 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 369 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
350 rxvt_clean_exit(); 370 rxvt_clean_exit();
351 exit(EXIT_FAILURE); 371 exit(EXIT_FAILURE);
352/* NOTREACHED */ 372 /* NOTREACHED */
353} 373}
354 374
355/* EXTPROTO */ 375/* EXTPROTO */
356void * 376void *
357rxvt_realloc(void *ptr, size_t size) 377rxvt_realloc(void *ptr, size_t size)
358{ 378{
359 void *p; 379 void *p;
360 380
361 if (ptr) 381 if (ptr)
362 p = realloc(ptr, size); 382 p = realloc(ptr, size);
363 else 383 else
364 p = malloc(size); 384 p = malloc(size);
365 if (p) 385 if (p)
366 return p; 386 return p;
367 387
368 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 388 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
369 rxvt_clean_exit(); 389 rxvt_clean_exit();
370 exit(EXIT_FAILURE); 390 exit(EXIT_FAILURE);
371/* NOTREACHED */ 391 /* NOTREACHED */
372} 392}
373 393
374/* ------------------------------------------------------------------------- * 394/* ------------------------------------------------------------------------- *
375 * PRIVILEGED OPERATIONS * 395 * PRIVILEGED OPERATIONS *
376 * ------------------------------------------------------------------------- */ 396 * ------------------------------------------------------------------------- */
377/* take care of suid/sgid super-user (root) privileges */ 397/* take care of suid/sgid super-user (root) privileges */
378/* INTPROTO */
379void 398void
380rxvt_privileges(pR_ int mode) 399rxvt_term::privileges (int mode)
381{ 400{
382#if ! defined(__CYGWIN32__) 401#if ! defined(__CYGWIN32__)
383# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 402# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
384/* setreuid() is the poor man's setuid(), seteuid() */ 403 /* setreuid() is the poor man's setuid(), seteuid() */
385# define seteuid(a) setreuid(-1, (a)) 404# define seteuid(a) setreuid(-1, (a))
386# define setegid(a) setregid(-1, (a)) 405# define setegid(a) setregid(-1, (a))
387# define HAVE_SETEUID 406# define HAVE_SETEUID
388# endif 407# endif
389# ifdef HAVE_SETEUID 408# ifdef HAVE_SETEUID
390 switch (mode) { 409 switch (mode)
410 {
391 case IGNORE: 411 case IGNORE:
392 /* 412 /*
393 * change effective uid/gid - not real uid/gid - so we can switch 413 * change effective uid/gid - not real uid/gid - so we can switch
394 * back to root later, as required 414 * back to root later, as required
395 */ 415 */
396 seteuid(getuid()); 416 seteuid(getuid());
397 setegid(getgid()); 417 setegid(getgid());
398 break; 418 break;
399 case SAVE: 419 case SAVE:
400 R->euid = geteuid(); 420 euid = geteuid();
401 R->egid = getegid(); 421 egid = getegid();
402 break; 422 break;
403 case RESTORE: 423 case RESTORE:
404 seteuid(R->euid); 424 seteuid(euid);
405 setegid(R->egid); 425 setegid(egid);
406 break; 426 break;
407 } 427 }
408# else 428# else
409 switch (mode) { 429 switch (mode)
430 {
410 case IGNORE: 431 case IGNORE:
411 setuid(getuid()); 432 setuid(getuid());
412 setgid(getgid()); 433 setgid(getgid());
413 /* FALLTHROUGH */ 434 /* FALLTHROUGH */
414 case SAVE: 435 case SAVE:
415 /* FALLTHROUGH */ 436 /* FALLTHROUGH */
416 case RESTORE: 437 case RESTORE:
417 break; 438 break;
418 } 439 }
419# endif 440# endif
420#endif 441#endif
421} 442}
422 443
423#ifdef UTMP_SUPPORT 444#ifdef UTMP_SUPPORT
424/* EXTPROTO */
425void 445void
426rxvt_privileged_utmp(pR_ char action) 446rxvt_term::privileged_utmp (char action)
427{ 447{
428 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 448 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)",
429 action, R->next_utmp_action, getpid())); 449 action, next_utmp_action, getpid()));
430 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 450 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
431 || (R->Options & Opt_utmpInhibit) 451 || (Options & Opt_utmpInhibit)
432 || R->ttydev == NULL || *R->ttydev == '\0') 452 || ttydev == NULL || *ttydev == '\0')
433 return; 453 return;
434 454
435 rxvt_privileges(aR_ RESTORE); 455 privileges (RESTORE);
436 if (action == SAVE) { 456 if (action == SAVE)
457 {
437 R->next_utmp_action = RESTORE; 458 next_utmp_action = RESTORE;
438 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 459 makeutent (ttydev, rs[Rs_display_name]);
460 }
461 else
439 } else { /* action == RESTORE */ 462 { /* action == RESTORE */
440 R->next_utmp_action = IGNORE; 463 next_utmp_action = IGNORE;
441 rxvt_cleanutent(aR); 464 cleanutent ();
442 } 465 }
443 rxvt_privileges(aR_ IGNORE); 466 privileges (IGNORE);
444} 467}
445#endif 468#endif
446 469
447#ifndef NO_SETOWNER_TTYDEV 470#ifndef NO_SETOWNER_TTYDEV
448/* EXTPROTO */
449void 471void
450rxvt_privileged_ttydev(pR_ char action) 472rxvt_term::privileged_ttydev (char action)
451{ 473{
452 D_MAIN((stderr, 474 D_MAIN((stderr,
453 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 475 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
454 action, R->next_tty_action, getpid())); 476 action, next_tty_action, getpid()));
455 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 477 if (next_tty_action != action || (action != SAVE && action != RESTORE)
456 || R->ttydev == NULL || *R->ttydev == '\0') 478 || ttydev == NULL || *ttydev == '\0')
457 return; 479 return;
458 480
459 rxvt_privileges(aR_ RESTORE); 481 privileges (RESTORE);
460 482
461 if (action == SAVE) { 483 if (action == SAVE)
484 {
462 R->next_tty_action = RESTORE; 485 next_tty_action = RESTORE;
463# ifndef RESET_TTY_TO_COMMON_DEFAULTS 486# ifndef RESET_TTY_TO_COMMON_DEFAULTS
464/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 487 /* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */
465 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 488 if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */
466 R->next_tty_action = IGNORE; 489 next_tty_action = IGNORE;
467 else 490 else
468# endif 491# endif
492
469 { 493 {
470 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 494 chown(ttydev, getuid(), ttygid); /* fail silently */
471 chmod(R->ttydev, R->ttymode); 495 chmod(ttydev, ttymode);
472# ifdef HAVE_REVOKE 496# ifdef HAVE_REVOKE
473 revoke(R->ttydev); 497 revoke(ttydev);
474# endif 498# endif
499
475 } 500 }
501 }
502 else
476 } else { /* action == RESTORE */ 503 { /* action == RESTORE */
477 R->next_tty_action = IGNORE; 504 next_tty_action = IGNORE;
478# ifndef RESET_TTY_TO_COMMON_DEFAULTS 505# ifndef RESET_TTY_TO_COMMON_DEFAULTS
479 chmod(R->ttydev, R->ttyfd_stat.st_mode); 506 chmod(ttydev, ttyfd_stat.st_mode);
480 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 507 chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
481# else 508# else
482 chmod(R->ttydev, 509 chmod(ttydev,
483 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 510 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
484 chown(R->ttydev, 0, 0); 511 chown(ttydev, 0, 0);
485# endif 512# endif
486 }
487 513
514 }
515
488 rxvt_privileges(aR_ IGNORE); 516 privileges (IGNORE);
489 517
490# ifndef RESET_TTY_TO_COMMON_DEFAULTS 518# ifndef RESET_TTY_TO_COMMON_DEFAULTS
491 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 519 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
492 action == RESTORE ? "Restoring" : (action == 520 action == RESTORE ? "Restoring" : (action ==
493 SAVE ? "Saving" : 521 SAVE ? "Saving" :
494 "UNKNOWN ERROR for"), R->ttydev, 522 "UNKNOWN ERROR for"), ttydev,
495 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 523 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
496 R->ttyfd_stat.st_gid)); 524 ttyfd_stat.st_gid));
497# endif 525# endif
498} 526}
499#endif 527#endif
500 528
501/*----------------------------------------------------------------------*/ 529/*----------------------------------------------------------------------*/
502/* 530/*
503 * window size/position calculcations for XSizeHint and other storage. 531 * window size/position calculcations for XSizeHint and other storage.
504 * if width/height are non-zero then override calculated width/height 532 * if width/height are non-zero then override calculated width/height
505 */ 533 */
506/* EXTPROTO */
507void 534void
508rxvt_window_calc(pR_ unsigned int width, unsigned int height) 535rxvt_term::window_calc (unsigned int width, unsigned int height)
509{ 536{
510 short recalc_x, recalc_y; 537 short recalc_x, recalc_y;
511 int x, y, sb_w, mb_h, flags; 538 int x, y, sb_w, mb_h, flags;
512 unsigned int w, h; 539 unsigned int w, h;
513 unsigned int max_width, max_height; 540 unsigned int max_width, max_height;
514 541
515 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 542 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
516 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 543 TermWin.ncol, TermWin.nrow, szHint.width,
517 R->szHint.height)); 544 szHint.height));
518 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 545 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
519 R->szHint.win_gravity = NorthWestGravity; 546 szHint.win_gravity = NorthWestGravity;
520/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 547 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
521 548
522 recalc_x = recalc_y = 0; 549 recalc_x = recalc_y = 0;
523 flags = 0; 550 flags = 0;
524 if (!R->parsed_geometry) { 551 if (!parsed_geometry)
552 {
525 R->parsed_geometry = 1; 553 parsed_geometry = 1;
526 if (R->rs[Rs_geometry]) 554 if (rs[Rs_geometry])
527 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 555 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h);
528 if (flags & WidthValue) { 556 if (flags & WidthValue)
557 {
529 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 558 TermWin.ncol = BOUND_POSITIVE_INT16(w);
530 R->szHint.flags |= USSize; 559 szHint.flags |= USSize;
531 } 560 }
532 if (flags & HeightValue) { 561 if (flags & HeightValue)
562 {
533 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 563 TermWin.nrow = BOUND_POSITIVE_INT16(h);
534 R->szHint.flags |= USSize; 564 szHint.flags |= USSize;
535 } 565 }
536 if (flags & XValue) { 566 if (flags & XValue)
567 {
537 R->szHint.x = x; 568 szHint.x = x;
538 R->szHint.flags |= USPosition; 569 szHint.flags |= USPosition;
539 if (flags & XNegative) { 570 if (flags & XNegative)
571 {
540 recalc_x = 1; 572 recalc_x = 1;
541 R->szHint.win_gravity = NorthEastGravity; 573 szHint.win_gravity = NorthEastGravity;
542 } 574 }
543 } 575 }
544 if (flags & YValue) { 576 if (flags & YValue)
577 {
545 R->szHint.y = y; 578 szHint.y = y;
546 R->szHint.flags |= USPosition; 579 szHint.flags |= USPosition;
547 if (flags & YNegative) { 580 if (flags & YNegative)
581 {
548 recalc_y = 1; 582 recalc_y = 1;
549 if (R->szHint.win_gravity == NorthEastGravity) 583 if (szHint.win_gravity == NorthEastGravity)
550 R->szHint.win_gravity = SouthEastGravity; 584 szHint.win_gravity = SouthEastGravity;
551 else 585 else
552 R->szHint.win_gravity = SouthWestGravity; 586 szHint.win_gravity = SouthWestGravity;
553 } 587 }
554 } 588 }
555 } 589 }
556/* TODO: BOUNDS */ 590 /* TODO: BOUNDS */
557 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 591 TermWin.width = TermWin.ncol * TermWin.fwidth;
558 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 592 TermWin.height = TermWin.nrow * TermWin.fheight;
559 max_width = MAX_COLS * R->TermWin.fwidth; 593 max_width = MAX_COLS * TermWin.fwidth;
560 max_height = MAX_ROWS * R->TermWin.fheight; 594 max_height = MAX_ROWS * TermWin.fheight;
561 595
562 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 596 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
563 597
564 sb_w = mb_h = 0; 598 sb_w = mb_h = 0;
565 R->window_vt_x = R->window_vt_y = 0; 599 window_vt_x = window_vt_y = 0;
566 if (scrollbar_visible(R)) { 600 if (scrollbar_visible ())
601 {
567 sb_w = scrollbar_TotalWidth(); 602 sb_w = scrollbar_TotalWidth();
568 R->szHint.base_width += sb_w; 603 szHint.base_width += sb_w;
569 if (!(R->Options & Opt_scrollBar_right)) 604 if (!(Options & Opt_scrollBar_right))
570 R->window_vt_x = sb_w; 605 window_vt_x = sb_w;
571 } 606 }
572 if (menubar_visible(R)) { 607 if (menubar_visible ())
608 {
573 mb_h = menuBar_TotalHeight(); 609 mb_h = menuBar_TotalHeight();
574 R->szHint.base_height += mb_h; 610 szHint.base_height += mb_h;
575 R->window_vt_y = mb_h; 611 window_vt_y = mb_h;
576 } 612 }
577 R->szHint.width_inc = R->TermWin.fwidth; 613 szHint.width_inc = TermWin.fwidth;
578 R->szHint.height_inc = R->TermWin.fheight; 614 szHint.height_inc = TermWin.fheight;
579 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 615 szHint.min_width = szHint.base_width + szHint.width_inc;
580 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 616 szHint.min_height = szHint.base_height + szHint.height_inc;
581 617
582 if (width && width - R->szHint.base_width < max_width) { 618 if (width && width - szHint.base_width < max_width)
619 {
583 R->szHint.width = width; 620 szHint.width = width;
584 R->TermWin.width = width - R->szHint.base_width; 621 TermWin.width = width - szHint.base_width;
585 } else { 622 }
623 else
624 {
586 MIN_IT(R->TermWin.width, max_width); 625 MIN_IT(TermWin.width, max_width);
587 R->szHint.width = R->szHint.base_width + R->TermWin.width; 626 szHint.width = szHint.base_width + TermWin.width;
588 } 627 }
589 if (height && height - R->szHint.base_height < max_height) { 628 if (height && height - szHint.base_height < max_height)
629 {
590 R->szHint.height = height; 630 szHint.height = height;
591 R->TermWin.height = height - R->szHint.base_height; 631 TermWin.height = height - szHint.base_height;
592 } else { 632 }
633 else
634 {
593 MIN_IT(R->TermWin.height, max_height); 635 MIN_IT(TermWin.height, max_height);
594 R->szHint.height = R->szHint.base_height + R->TermWin.height; 636 szHint.height = szHint.base_height + TermWin.height;
595 } 637 }
596 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 638 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
597 R->window_sb_x = R->szHint.width - sb_w; 639 window_sb_x = szHint.width - sb_w;
598 640
599 if (recalc_x) 641 if (recalc_x)
600 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 642 szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay))
601 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 643 - szHint.width - 2 * TermWin.ext_bwidth);
602 if (recalc_y) 644 if (recalc_y)
603 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 645 szHint.y += (DisplayHeight (Xdisplay, DefaultScreen (Xdisplay))
604 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 646 - szHint.height - 2 * TermWin.ext_bwidth);
605 647
606 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 648 TermWin.ncol = TermWin.width / TermWin.fwidth;
607 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 649 TermWin.nrow = TermWin.height / TermWin.fheight;
608 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 650 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
609 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 651 TermWin.ncol, TermWin.nrow, szHint.width,
610 R->szHint.height)); 652 szHint.height));
611 return; 653 return;
612} 654}
613 655
614/*----------------------------------------------------------------------*/ 656/*----------------------------------------------------------------------*/
615/* 657/*
616 * Tell the teletype handler what size the window is. 658 * Tell the teletype handler what size the window is.
617 * Called after a window size change. 659 * Called after a window size change.
618 */ 660 */
619/* EXTPROTO */
620void 661void
621rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 662rxvt_term::tt_winch ()
622{ 663{
623 struct winsize ws; 664 struct winsize ws;
624 665
625 if (fd < 0) 666 if (cmd_fd < 0)
626 return; 667 return;
668
627 ws.ws_col = col; 669 ws.ws_col = TermWin.ncol;
628 ws.ws_row = row; 670 ws.ws_row = TermWin.nrow;
629 ws.ws_xpixel = ws.ws_ypixel = 0; 671 ws.ws_xpixel = ws.ws_ypixel = 0;
630#ifndef DEBUG_SIZE 672#ifndef DEBUG_SIZE
631 (void)ioctl(fd, TIOCSWINSZ, &ws); 673 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
632#else 674#else
633 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 675 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
634 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 676 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
635 }
636# ifdef SIGWINCH 677# ifdef SIGWINCH
637 else if (pid) /* force through to the command */ 678 else if (cmd_pid) /* force through to the command */
638 kill(pid, SIGWINCH); 679 kill (cmd_pid, SIGWINCH);
639# endif 680# endif
640#endif 681#endif
641} 682}
642 683
643/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
646 * init = 1 - initialize 687 * init = 1 - initialize
647 * 688 *
648 * fontname == FONT_UP - switch to bigger font 689 * fontname == FONT_UP - switch to bigger font
649 * fontname == FONT_DN - switch to smaller font 690 * fontname == FONT_DN - switch to smaller font
650 */ 691 */
651/* EXTPROTO */
652void 692void
653rxvt_change_font(pR_ int init, const char *fontname) 693rxvt_term::change_font (int init, const char *fontname)
654{ 694{}
655}
656 695
657/* INTPROTO */
658void 696void
659rxvt_font_up_down(pR_ int n, int direction) 697rxvt_term::font_up_down (int n, int direction)
660{ 698{}
661}
662 699
663/*----------------------------------------------------------------------*/ 700/*----------------------------------------------------------------------*/
664/*----------------------------------------------------------------------*/ 701/*----------------------------------------------------------------------*/
665/* xterm sequences - title, iconName, color (exptl) */ 702/* xterm sequences - title, iconName, color (exptl) */
666/* EXTPROTO */
667void 703void
668rxvt_set_title(pR_ const char *str) 704rxvt_term::set_title (const char *str)
669{ 705{
670#ifndef SMART_WINDOW_TITLE 706#ifndef SMART_WINDOW_TITLE
671 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 707 XStoreName(Xdisplay, TermWin.parent[0], str);
672#else 708#else
673 char *name; 709 char *name;
674 710
675 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 711 if (XFetchName(Xdisplay, TermWin.parent[0], &name) == 0)
676 name = NULL; 712 name = NULL;
677 if (name == NULL || STRCMP(name, str)) 713 if (name == NULL || STRCMP(name, str))
678 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 714 XStoreName(Xdisplay, TermWin.parent[0], str);
679 if (name) 715 if (name)
680 XFree(name); 716 XFree(name);
681#endif 717#endif
682} 718}
683 719
684/* EXTPROTO */
685void 720void
686rxvt_set_iconName(pR_ const char *str) 721rxvt_term::set_iconName (const char *str)
687{ 722{
688#ifndef SMART_WINDOW_TITLE 723#ifndef SMART_WINDOW_TITLE
689 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 724 XSetIconName(Xdisplay, TermWin.parent[0], str);
690#else 725#else
691 char *name; 726 char *name;
692 727
693 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 728 if (XGetIconName(Xdisplay, TermWin.parent[0], &name))
694 name = NULL; 729 name = NULL;
695 if (name == NULL || STRCMP(name, str)) 730 if (name == NULL || STRCMP(name, str))
696 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 731 XSetIconName(Xdisplay, TermWin.parent[0], str);
697 if (name) 732 if (name)
698 XFree(name); 733 XFree(name);
699#endif 734#endif
700} 735}
701 736
702#ifdef XTERM_COLOR_CHANGE 737#ifdef XTERM_COLOR_CHANGE
703/* EXTPROTO */
704void 738void
705rxvt_set_window_color(pR_ int idx, const char *color) 739rxvt_term::set_window_color (int idx, const char *color)
706{ 740{
707 rxvt_color xcol; 741 rxvt_color xcol;
708 int i; 742 int i;
709 743
710 if (color == NULL || *color == '\0') 744 if (color == NULL || *color == '\0')
711 return; 745 return;
712 746
713/* handle color aliases */ 747 /* handle color aliases */
714 if (isdigit(*color)) { 748 if (isdigit(*color))
749 {
715 i = atoi(color); 750 i = atoi(color);
751 if (i >= 8 && i <= 15)
716 if (i >= 8 && i <= 15) { /* bright colors */ 752 { /* bright colors */
717 i -= 8; 753 i -= 8;
718# ifndef NO_BRIGHTCOLOR 754# ifndef NO_BRIGHTCOLOR
719 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 755 PixColors[idx] = PixColors[minBrightCOLOR + i];
720 SET_PIXCOLOR(R, idx); 756 SET_PIXCOLOR(idx);
721 goto Done; 757 goto Done;
722# endif 758# endif
759
723 } 760 }
724 if (i >= 0 && i <= 7) { /* normal colors */ 761 if (i >= 0 && i <= 7)
762 { /* normal colors */
725 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 763 PixColors[idx] = PixColors[minCOLOR + i];
726 SET_PIXCOLOR(R, idx); 764 SET_PIXCOLOR(idx);
727 goto Done; 765 goto Done;
728 } 766 }
729 } 767 }
730 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 768 if (!rXParseAllocColor (& xcol, color))
731 return; 769 return;
732/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 770 /* XStoreColor (Xdisplay, XCMAP, XColor*); */
733 771
734/* 772 /*
735 * FIXME: should free colors here, but no idea how to do it so instead, 773 * FIXME: should free colors here, but no idea how to do it so instead,
736 * so just keep gobbling up the colormap 774 * so just keep gobbling up the colormap
737 */ 775 */
738# if 0 776# if 0
739 for (i = Color_Black; i <= Color_White; i++) 777 for (i = Color_Black; i <= Color_White; i++)
740 if (R->PixColors[idx] == R->PixColors[i]) 778 if (PixColors[idx] == PixColors[i])
741 break; 779 break;
742 if (i > Color_White) { 780 if (i > Color_White)
781 {
743 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 782 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
744 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 783 XFreeColors(Xdisplay, XCMAP, (PixColors + idx), 1,
745 DisplayPlanes(R->Xdisplay, Xscreen)); 784 DisplayPlanes(Xdisplay, Xscreen));
746 } 785 }
747# endif 786# endif
748 787
749 R->PixColors[idx] = xcol; 788 PixColors[idx] = xcol;
750 SET_PIXCOLOR(R, idx); 789 SET_PIXCOLOR(idx);
751 790
752/* XSetWindowAttributes attr; */ 791 /* XSetWindowAttributes attr; */
753/* Cursor cursor; */ 792 /* Cursor cursor; */
754 Done: 793Done:
755 if (idx == Color_bg && !(R->Options & Opt_transparent)) 794 if (idx == Color_bg && !(Options & Opt_transparent))
756 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 795 XSetWindowBackground(Xdisplay, TermWin.vt,
757 R->PixColors[Color_bg]); 796 PixColors[Color_bg]);
758 797
759/* handle Color_BD, scrollbar background, etc. */ 798 /* handle Color_BD, scrollbar background, etc. */
760 799
761 rxvt_set_colorfgbg(aR); 800 set_colorfgbg ();
762 rxvt_recolour_cursor(aR); 801 recolour_cursor ();
763/* the only reasonable way to enforce a clean update */ 802 /* the only reasonable way to enforce a clean update */
764 rxvt_scr_poweron(aR); 803 scr_poweron ();
765} 804}
766 805
767#else 806#else
768# define rxvt_set_window_color(aR_ idx,color) ((void)0) 807# define set_window_color (idx,color) ((void)0)
769#endif /* XTERM_COLOR_CHANGE */ 808#endif /* XTERM_COLOR_CHANGE */
770 809
771/* EXTPROTO */
772void 810void
773rxvt_recolour_cursor(pR) 811rxvt_term::recolour_cursor ()
774{ 812{
775 rxvt_color xcol[2];
776
777#if TODO 813#if TODO
814 rxvt_color xcol[2];
815
778 xcol[0] = R->PixColors[Color_pointer]; 816 xcol[0] = PixColors[Color_pointer];
779 xcol[1] = R->PixColors[Color_bg]; 817 xcol[1] = PixColors[Color_bg];
780 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 818 XQueryColors (Xdisplay, XCMAP, xcol, 2);
781 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 819 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1]));
782#endif 820#endif
783} 821}
784 822
785/*----------------------------------------------------------------------*/ 823/*----------------------------------------------------------------------*/
786/* 824/*
787 * find if fg/bg matches any of the normal (low-intensity) colors 825 * find if fg/bg matches any of the normal (low-intensity) colors
788 */ 826 */
789/* INTPROTO */
790void 827void
791rxvt_set_colorfgbg(pR) 828rxvt_term::set_colorfgbg ()
792{ 829{
793 unsigned int i; 830 unsigned int i;
794 const char *xpmb = "\0"; 831 const char *xpmb = "\0";
795 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 832 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1];
796 833
797 R->env_colorfgbg = 834 env_colorfgbg =
798 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 835 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1);
799 STRCPY(fstr, "default"); 836 STRCPY(fstr, "default");
800 STRCPY(bstr, "default"); 837 STRCPY(bstr, "default");
801 for (i = Color_Black; i <= Color_White; i++) 838 for (i = Color_Black; i <= Color_White; i++)
802 if (R->PixColors[Color_fg] == R->PixColors[i]) { 839 if (PixColors[Color_fg] == PixColors[i])
840 {
803 sprintf(fstr, "%d", (i - Color_Black)); 841 sprintf(fstr, "%d", (i - Color_Black));
804 break; 842 break;
805 } 843 }
806 for (i = Color_Black; i <= Color_White; i++) 844 for (i = Color_Black; i <= Color_White; i++)
807 if (R->PixColors[Color_bg] == R->PixColors[i]) { 845 if (PixColors[Color_bg] == PixColors[i])
846 {
808 sprintf(bstr, "%d", (i - Color_Black)); 847 sprintf(bstr, "%d", (i - Color_Black));
809#ifdef XPM_BACKGROUND 848#ifdef XPM_BACKGROUND
810 xpmb = "default;"; 849 xpmb = "default;";
811#endif 850#endif
812 break; 851 break;
813 } 852 }
814 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 853 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
815 putenv(R->env_colorfgbg); 854 putenv(env_colorfgbg);
816 855
817#ifndef NO_BRIGHTCOLOR 856#ifndef NO_BRIGHTCOLOR
818 R->colorfgbg = DEFAULT_RSTYLE; 857 colorfgbg = DEFAULT_RSTYLE;
819 for (i = minCOLOR; i <= maxCOLOR; i++) { 858 for (i = minCOLOR; i <= maxCOLOR; i++)
859 {
820 if (R->PixColors[Color_fg] == R->PixColors[i]) 860 if (PixColors[Color_fg] == PixColors[i])
821 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 861 colorfgbg = SET_FGCOLOR(colorfgbg, i);
822 if (R->PixColors[Color_bg] == R->PixColors[i]) 862 if (PixColors[Color_bg] == PixColors[i])
823 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 863 colorfgbg = SET_BGCOLOR(colorfgbg, i);
824 } 864 }
825#endif 865#endif
826} 866}
827 867
828/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
829/* 869/*
830 * Colour determination for low colour displays, routine from 870 * Colour determination for low colour displays, routine from
831 * Hans de Goede <hans@highrise.nl> 871 * Hans de Goede <hans@highrise.nl>
832 */ 872 */
833 873
834/* EXTPROTO */
835int 874int
836rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 875rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
837{ 876{
838 screen_in_out->set(aR_ colour);
839
840 if (!screen_in_out->set(aR_ colour)) { 877 if (!screen_in_out->set (this, colour))
878 {
841 rxvt_print_error("can't allocate colour: %s", colour); 879 rxvt_print_error("can't allocate colour: %s", colour);
842 return false; 880 return false;
843 } 881 }
844 882
845 return true; 883 return true;
846} 884}
847 885
848/* -------------------------------------------------------------------- * 886/* -------------------------------------------------------------------- *
849 * - WINDOW RESIZING - * 887 * - WINDOW RESIZING - *
850 * -------------------------------------------------------------------- */ 888 * -------------------------------------------------------------------- */
851/* EXTPROTO */
852void 889void
853rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 890rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
854 int ignoreparent)
855{ 891{
856 int fix_screen; 892 int fix_screen;
857 893
858#ifdef SMART_RESIZE 894#ifdef SMART_RESIZE
859 int old_width = R->szHint.width, old_height = R->szHint.height; 895 int old_width = szHint.width, old_height = szHint.height;
860#endif 896#endif
861 897
862 rxvt_window_calc(aR_ width, height); 898 window_calc (width, height);
863 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 899 XSetWMNormalHints (Xdisplay, TermWin.parent[0], &szHint);
864 if (!ignoreparent) { 900 if (!ignoreparent)
901 {
865#ifdef SMART_RESIZE 902#ifdef SMART_RESIZE
866/* 903 /*
867 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 904 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
868 * reposition window on resize depending on placement on screen 905 * reposition window on resize depending on placement on screen
869 */ 906 */
870 int x, y, x1, y1; 907 int x, y, x1, y1;
871 int dx, dy; 908 int dx, dy;
872 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 909 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
873 Window unused_cr; 910 Window unused_cr;
874 911
875 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 912 XTranslateCoordinates (Xdisplay, TermWin.parent[0], Xroot,
876 0, 0, &x, &y, &unused_cr); 913 0, 0, &x, &y, &unused_cr);
877 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 914 XGetGeometry (Xdisplay, TermWin.parent[0], &unused_cr, &x1, &y1,
878 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 915 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
879 /* 916 /*
880 * if Xroot isn't the parent window, a WM will probably have offset 917 * if Xroot isn't the parent window, a WM will probably have offset
881 * our position for handles and decorations. Counter it 918 * our position for handles and decorations. Counter it
882 */ 919 */
883 if (x1 != x || y1 != y) { 920 if (x1 != x || y1 != y)
921 {
884 x -= x1; 922 x -= x1;
885 y -= y1; 923 y -= y1;
886 } 924 }
887 925
888 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 926 x1 = (DisplayWidth (Xdisplay, Xscreen) - old_width) / 2;
889 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 927 y1 = (DisplayHeight (Xdisplay, Xscreen) - old_height) / 2;
890 dx = old_width - R->szHint.width; 928 dx = old_width - szHint.width;
891 dy = old_height - R->szHint.height; 929 dy = old_height - szHint.height;
892 930
893 /* Check position of the center of the window */ 931 /* Check position of the center of the window */
894 if (x < x1) /* left half */ 932 if (x < x1) /* left half */
895 dx = 0; 933 dx = 0;
896 else if (x == x1) /* exact center */ 934 else if (x == x1) /* exact center */
897 dx /= 2; 935 dx /= 2;
898 if (y < y1) /* top half */ 936 if (y < y1) /* top half */
899 dy = 0; 937 dy = 0;
900 else if (y == y1) /* exact center */ 938 else if (y == y1) /* exact center */
901 dy /= 2; 939 dy /= 2;
902 940
903 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 941 XMoveResizeWindow (Xdisplay, TermWin.parent[0], x + dx, y + dy,
904 R->szHint.width, R->szHint.height); 942 szHint.width, szHint.height);
905#else 943#else
906 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 944 XResizeWindow (Xdisplay, TermWin.parent[0], szHint.width,
907 R->szHint.height); 945 szHint.height);
908#endif 946#endif
909 }
910 947
948 }
949
911 fix_screen = (R->TermWin.ncol != R->prev_ncol 950 fix_screen = (TermWin.ncol != prev_ncol
912 || R->TermWin.nrow != R->prev_nrow); 951 || TermWin.nrow != prev_nrow);
952
913 if (fix_screen || width != R->old_width || height != R->old_height) { 953 if (fix_screen || width != old_width || height != old_height)
954 {
914 if (scrollbar_visible(R)) { 955 if (scrollbar_visible ())
956 {
915 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 957 XMoveResizeWindow (Xdisplay, scrollBar.win, window_sb_x,
916 0, scrollbar_TotalWidth(), R->szHint.height); 958 0, scrollbar_TotalWidth (), szHint.height);
917 rxvt_Resize_scrollBar(aR); 959 resize_scrollbar ();
918 } 960 }
961
919 if (menubar_visible(R)) 962 if (menubar_visible ())
920 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 963 XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x,
921 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 964 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
965
922 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 966 XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x,
923 R->window_vt_y, TermWin_TotalWidth(), 967 window_vt_y, TermWin_TotalWidth (),
924 TermWin_TotalHeight()); 968 TermWin_TotalHeight ());
925#ifdef RXVT_GRAPHICS 969#ifdef RXVT_GRAPHICS
926 if (R->old_height) 970 if (old_height)
927 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width, 971 Gr_Resize (old_width - szHint.base_width,
928 R->old_height - R->szHint.base_height); 972 old_height - szHint.base_height);
929#endif 973#endif
930 rxvt_scr_clear(aR); 974 scr_clear ();
931#ifdef XPM_BACKGROUND 975#ifdef XPM_BACKGROUND
932 rxvt_resize_pixmap(aR); 976 resize_pixmap ();
933#endif 977#endif
934 }
935 978
979 }
980
936 if (fix_screen || R->old_height == 0) { 981 if (fix_screen || old_height == 0)
982 {
937 int curr_screen = -1; 983 int curr_screen = -1;
938 uint16_t old_ncol = R->prev_ncol; 984 int old_ncol = prev_ncol;
939 985
940 /* scr_reset only works on the primary screen */ 986 /* scr_reset only works on the primary screen */
941 if (R->old_height) /* this is not the first time through */ 987 if (old_height) /* this is not the first time through */
988 {
989 unsigned int ncol = TermWin.ncol;
990 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
942 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 991 curr_screen = scr_change_screen (PRIMARY);
943 rxvt_scr_reset(aR); 992 TermWin.ncol = ncol;
944 if (curr_screen >= 0) { /* this is not the first time through */
945 rxvt_scr_change_screen(aR_ curr_screen);
946 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
947 } 993 }
948 }
949 994
995 scr_reset();
996
997 if (curr_screen >= 0) /* this is not the first time through */
998 {
999 scr_change_screen (curr_screen);
1000 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1001 }
1002 }
1003
950 R->old_width = R->szHint.width; 1004 old_width = szHint.width;
951 R->old_height = R->szHint.height; 1005 old_height = szHint.height;
952 1006
953#ifdef USE_XIM 1007#ifdef USE_XIM
954 rxvt_IMSetStatusPosition(aR); 1008 IMSetStatusPosition ();
955#endif 1009#endif
956} 1010}
957 1011
958/* 1012/*
959 * Set the width/height of the vt window in characters. Units are pixels. 1013 * Set the width/height of the vt window in characters. Units are pixels.
960 * good for toggling 80/132 columns 1014 * good for toggling 80/132 columns
961 */ 1015 */
962/* EXTPROTO */
963void 1016void
964rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1017rxvt_term::set_widthheight (unsigned int width, unsigned int height)
965{ 1018{
966 XWindowAttributes wattr; 1019 XWindowAttributes wattr;
967 1020
968 if (width == 0 || height == 0) { 1021 if (width == 0 || height == 0)
1022 {
969 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1023 XGetWindowAttributes(Xdisplay, Xroot, &wattr);
970 if (width == 0) 1024 if (width == 0)
971 width = wattr.width - R->szHint.base_width; 1025 width = wattr.width - szHint.base_width;
972 if (height == 0) 1026 if (height == 0)
973 height = wattr.height - R->szHint.base_height; 1027 height = wattr.height - szHint.base_height;
974 } 1028 }
975 if (width != R->TermWin.width || height != R->TermWin.height) { 1029 if (width != TermWin.width || height != TermWin.height)
1030 {
976 width += R->szHint.base_width; 1031 width += szHint.base_width;
977 height += R->szHint.base_height; 1032 height += szHint.base_height;
978 rxvt_resize_all_windows(aR_ width, height, 0); 1033 resize_all_windows (width, height, 0);
979 } 1034 }
980} 1035}
981 1036
982/* -------------------------------------------------------------------- * 1037/* -------------------------------------------------------------------- *
983 * - X INPUT METHOD ROUTINES - * 1038 * - X INPUT METHOD ROUTINES - *
984 * -------------------------------------------------------------------- */ 1039 * -------------------------------------------------------------------- */
985#ifdef USE_XIM 1040#ifdef USE_XIM
986/* INTPROTO */
987void 1041void
988rxvt_setSize(pR_ XRectangle * size) 1042rxvt_term::set_size (XRectangle *size)
989{ 1043{
990 size->x = R->TermWin.int_bwidth; 1044 size->x = TermWin.int_bwidth;
991 size->y = R->TermWin.int_bwidth; 1045 size->y = TermWin.int_bwidth;
992 size->width = Width2Pixel(R->TermWin.ncol); 1046 size->width = Width2Pixel(TermWin.ncol);
993 size->height = Height2Pixel(R->TermWin.nrow); 1047 size->height = Height2Pixel(TermWin.nrow);
994} 1048}
995 1049
996/* INTPROTO */
997void 1050void
998rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1051rxvt_term::set_color (unsigned long *fg, unsigned long *bg)
999{ 1052{
1000 *fg = R->PixColors[Color_fg]; 1053 *fg = PixColors[Color_fg];
1001 *bg = R->PixColors[Color_bg]; 1054 *bg = PixColors[Color_bg];
1002} 1055}
1003 1056
1004/* Checking whether input method is running. */ 1057/* Checking whether input method is running. */
1005/* INTPROTO */
1006Bool 1058bool
1007rxvt_IMisRunning(pR) 1059rxvt_term::IMisRunning ()
1008{ 1060{
1009 char *p; 1061 char *p;
1010 Atom atom; 1062 Atom atom;
1011 Window win; 1063 Window win;
1012 char server[IMBUFSIZ]; 1064 char server[IMBUFSIZ];
1013 1065
1014/* get current locale modifier */ 1066 /* get current locale modifier */
1015 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1067 if ((p = XSetLocaleModifiers(NULL)) != NULL)
1068 {
1016 STRCPY(server, "@server="); 1069 STRCPY(server, "@server=");
1017 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1070 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1018 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1071 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */
1019 *p = '\0'; 1072 *p = '\0';
1020 1073
1021 atom = XInternAtom(R->Xdisplay, server, False); 1074 atom = XInternAtom(Xdisplay, server, False);
1022 win = XGetSelectionOwner(R->Xdisplay, atom); 1075 win = XGetSelectionOwner(Xdisplay, atom);
1023 if (win != None) 1076 if (win != None)
1024 return True; 1077 return True;
1025 } 1078 }
1026 return False; 1079 return False;
1027} 1080}
1028 1081
1082void
1083rxvt_term::IMSendSpot ()
1084{
1085 XPoint spot;
1086 XVaNestedList preedit_attr;
1087
1088 if (Input_Context == NULL
1089 || !TermWin.focus || !(input_style & XIMPreeditPosition)
1090 || !(event_type == KeyPress
1091 || event_type == Expose
1092 || event_type == NoExpose
1093 || event_type == SelectionNotify
1094 || event_type == ButtonRelease || event_type == FocusIn)
1095 || !IMisRunning ())
1096 return;
1097
1098 set_position (&spot);
1099
1100 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
1101 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1102 XFree(preedit_attr);
1103}
1104
1105void
1106rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1107 XRectangle * needed_rect)
1108{
1109 int mbh, vtx = 0;
1110
1111 if (scrollbar_visible () && !(Options & Opt_scrollBar_right))
1112 vtx = scrollbar_TotalWidth();
1113
1114 mbh = menubar_visible () ? menuBar_TotalHeight() : 0;
1115 mbh -= TermWin.lineSpace;
1116
1117 preedit_rect->x = needed_rect->width + vtx;
1118 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1119
1120 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx;
1121 preedit_rect->height = Height2Pixel(1);
1122
1123 status_rect->x = vtx;
1124 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1125
1126 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1);
1127 status_rect->height = Height2Pixel(1);
1128}
1129
1130/* ARGSUSED */
1029/* EXTPROTO */ 1131/* EXTPROTO */
1030void
1031rxvt_IMSendSpot(pR)
1032{
1033 XPoint spot;
1034 XVaNestedList preedit_attr;
1035
1036 if (R->Input_Context == NULL
1037 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition)
1038 || !(R->event_type == KeyPress
1039 || R->event_type == Expose
1040 || R->event_type == NoExpose
1041 || R->event_type == SelectionNotify
1042 || R->event_type == ButtonRelease || R->event_type == FocusIn)
1043 || !rxvt_IMisRunning(aR))
1044 return;
1045
1046 rxvt_setPosition(aR_ & spot);
1047
1048 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
1049 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1050 XFree(preedit_attr);
1051}
1052
1053/* EXTPROTO */
1054void
1055rxvt_setTermFontSet(pR_ int idx)
1056{
1057 char *string;
1058 long length;
1059 int success = 0;
1060
1061 if (idx < 0 || idx >= MAX_NFONTS)
1062 return;
1063}
1064
1065/* INTPROTO */
1066void
1067rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect,
1068 XRectangle * needed_rect)
1069{
1070 int mbh, vtx = 0;
1071
1072 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right))
1073 vtx = scrollbar_TotalWidth();
1074 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0;
1075 mbh -= R->TermWin.lineSpace;
1076
1077 preedit_rect->x = needed_rect->width + vtx;
1078 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh;
1079
1080 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width
1081 + vtx;
1082 preedit_rect->height = Height2Pixel(1);
1083
1084 status_rect->x = vtx;
1085 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh;
1086
1087 status_rect->width = needed_rect->width ? needed_rect->width
1088 : Width2Pixel(R->TermWin.ncol + 1);
1089 status_rect->height = Height2Pixel(1);
1090}
1091
1092/* ARGSUSED */
1093/* INTPROTO */
1094void 1132void
1095rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1133rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data
1096 __attribute__ ((unused)), XPointer call_data 1134 __attribute__ ((unused)), XPointer call_data
1097 __attribute__ ((unused))) 1135 __attribute__ ((unused)))
1098{ 1136{
1099 dR;
1100
1101 R->Input_Context = NULL; 1137 GET_R->Input_Context = NULL;
1102/* To avoid Segmentation Fault in C locale: Solaris only? */ 1138 /* To avoid Segmentation Fault in C locale: Solaris only? */
1103 if (STRCMP(R->locale, "C")) 1139 if (STRCMP (GET_R->locale, "C"))
1104 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1140 XRegisterIMInstantiateCallback(GET_R->Xdisplay, NULL, NULL, NULL,
1105 rxvt_IMInstantiateCallback, NULL); 1141 rxvt_IMInstantiateCallback, NULL);
1142}
1143
1144/*
1145 * Try to open a XIM with the current modifiers, then see if we can
1146 * open a suitable preedit type
1147 */
1148bool
1149rxvt_term::IM_get_IC ()
1150{
1151 int i, j, found;
1152 XIM xim;
1153 XPoint spot;
1154 XRectangle rect, status_rect, needed_rect;
1155 unsigned long fg, bg;
1156 const char *p;
1157 char **s;
1158 XIMStyles *xim_styles;
1159 XVaNestedList preedit_attr, status_attr;
1160 XIMCallback ximcallback;
1161
1162 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1163 xim = XOpenIM (Xdisplay, NULL, NULL, NULL);
1164 if (xim == NULL)
1165 return False;
1166
1167 xim_styles = NULL;
1168 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1169 || !xim_styles || !xim_styles->count_styles)
1170 {
1171 XCloseIM(xim);
1172 return False;
1173 }
1174
1175 p = rs[Rs_preeditType] ? rs[Rs_preeditType]
1176 : "OverTheSpot,OffTheSpot,Root";
1177 s = rxvt_splitcommastring(p);
1178 for (i = found = 0; !found && s[i]; i++)
1179 {
1180 if (!STRCMP(s[i], "OverTheSpot"))
1181 input_style = (XIMPreeditPosition | XIMStatusNothing);
1182 else if (!STRCMP(s[i], "OffTheSpot"))
1183 input_style = (XIMPreeditArea | XIMStatusArea);
1184 else if (!STRCMP(s[i], "Root"))
1185 input_style = (XIMPreeditNothing | XIMStatusNothing);
1186
1187 for (j = 0; j < xim_styles->count_styles; j++)
1188 if (input_style == xim_styles->supported_styles[j])
1189 {
1190 found = 1;
1191 break;
1192 }
1193 }
1194 for (i = 0; s[i]; i++)
1195 free(s[i]);
1196 free(s);
1197 XFree(xim_styles);
1198
1199 if (!found)
1200 {
1201 XCloseIM(xim);
1202 return False;
1203 }
1204
1205 ximcallback.callback = rxvt_IMDestroyCallback;
1206
1207 /* XXX: not sure why we need this (as well as IC one below) */
1208 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1209
1210 preedit_attr = status_attr = NULL;
1211
1212 if (input_style & XIMPreeditPosition)
1213 {
1214 set_size (&rect);
1215 set_position (&spot);
1216 set_color (&fg, &bg);
1217
1218 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1219 XNSpotLocation, &spot,
1220 XNForeground, fg, XNBackground, bg,
1221 //XNFontSet, TermWin.fontset,
1222 NULL);
1223 }
1224 else if (input_style & XIMPreeditArea)
1225 {
1226 set_color (&fg, &bg);
1227
1228 /*
1229 * The necessary width of preedit area is unknown
1230 * until create input context.
1231 */
1232 needed_rect.width = 0;
1233
1234 set_preedit_area(&rect, &status_rect, &needed_rect);
1235
1236 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1237 XNForeground, fg, XNBackground, bg,
1238 //XNFontSet, TermWin.fontset,
1239 NULL);
1240 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1241 XNForeground, fg, XNBackground, bg,
1242 //XNFontSet, TermWin.fontset,
1243 NULL);
1244 }
1245 Input_Context = XCreateIC(xim, XNInputStyle, input_style,
1246 XNClientWindow, TermWin.parent[0],
1247 XNFocusWindow, TermWin.parent[0],
1248 XNDestroyCallback, &ximcallback,
1249 preedit_attr ? XNPreeditAttributes : NULL,
1250 preedit_attr,
1251 status_attr ? XNStatusAttributes : NULL,
1252 status_attr, NULL);
1253 if (preedit_attr)
1254 XFree(preedit_attr);
1255 if (status_attr)
1256 XFree(status_attr);
1257 if (Input_Context == NULL)
1258 {
1259 rxvt_print_error("failed to create input context");
1260 XCloseIM(xim);
1261 return False;
1262 }
1263 if (input_style & XIMPreeditArea)
1264 IMSetStatusPosition ();
1265 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1266 return True;
1106} 1267}
1107 1268
1108/* 1269/*
1109 * X manual pages and include files don't match on some systems: 1270 * X manual pages and include files don't match on some systems:
1110 * some think this is an XIDProc and others an XIMProc so we can't 1271 * some think this is an XIDProc and others an XIMProc so we can't
1117rxvt_IMInstantiateCallback(Display * unused 1278rxvt_IMInstantiateCallback(Display * unused
1118 __attribute__ ((unused)), XPointer client_data 1279 __attribute__ ((unused)), XPointer client_data
1119 __attribute__ ((unused)), XPointer call_data 1280 __attribute__ ((unused)), XPointer call_data
1120 __attribute__ ((unused))) 1281 __attribute__ ((unused)))
1121{ 1282{
1122 dR;
1123 int i, found, had_im; 1283 int i, found, had_im;
1124 const char *p; 1284 const char *p;
1125 char **s; 1285 char **s;
1126 char buf[IMBUFSIZ]; 1286 char buf[IMBUFSIZ];
1127 1287
1128 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1288 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1129 if (R->Input_Context) 1289 if (GET_R->Input_Context)
1130 return; 1290 return;
1131 1291
1132 found = had_im = 0; 1292#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1293 if (GET_R->rs[Rs_imLocale])
1294 setlocale (LC_CTYPE, GET_R->rs[Rs_imLocale]);
1295#endif
1296
1133 p = R->rs[Rs_inputMethod]; 1297 p = GET_R->rs[Rs_inputMethod];
1134 if (p && *p) { 1298 if (p && *p)
1135 had_im = 1; 1299 {
1300 bool found = false;
1301
1136 s = rxvt_splitcommastring(p); 1302 s = rxvt_splitcommastring (p);
1137 for (i = 0; s[i]; i++) { 1303 for (i = 0; s[i]; i++)
1304 {
1138 if (*s[i]) { 1305 if (*s[i])
1306 {
1139 STRCPY(buf, "@im="); 1307 STRCPY (buf, "@im=");
1140 STRNCAT(buf, s[i], IMBUFSIZ - 5); 1308 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1141 if ((p = XSetLocaleModifiers(buf)) != NULL && *p 1309 if ((p = XSetLocaleModifiers (buf)) && *p && GET_R->IM_get_IC ())
1142 && (rxvt_IM_get_IC(aR) == True)) { 1310 {
1143 found = 1; 1311 found = true;
1144 break; 1312 break;
1145 } 1313 }
1146 } 1314 }
1147 } 1315 }
1148 for (i = 0; s[i]; i++) 1316 for (i = 0; s[i]; i++)
1149 free(s[i]);
1150 free(s);
1151 }
1152 if (found)
1153 return;
1154
1155/* try with XMODIFIERS env. var. */
1156 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1157 rxvt_IM_get_IC(aR);
1158 return;
1159 }
1160
1161/* try with no modifiers base IF the user didn't specify an IM */
1162 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1163 && rxvt_IM_get_IC(aR) == True)
1164 return;
1165}
1166
1167/*
1168 * Try to open a XIM with the current modifiers, then see if we can
1169 * open a suitable preedit type
1170 */
1171/* INTPROTO */
1172Bool
1173rxvt_IM_get_IC(pR)
1174{
1175 int i, j, found;
1176 XIM xim;
1177 XPoint spot;
1178 XRectangle rect, status_rect, needed_rect;
1179 unsigned long fg, bg;
1180 const char *p;
1181 char **s;
1182 XIMStyles *xim_styles;
1183 XVaNestedList preedit_attr, status_attr;
1184 XIMCallback ximcallback;
1185
1186 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1187 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL);
1188 if (xim == NULL)
1189 return False;
1190
1191 xim_styles = NULL;
1192 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL)
1193 || !xim_styles || !xim_styles->count_styles) {
1194 XCloseIM(xim);
1195 return False;
1196 }
1197
1198 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType]
1199 : "OverTheSpot,OffTheSpot,Root";
1200 s = rxvt_splitcommastring(p);
1201 for (i = found = 0; !found && s[i]; i++) {
1202 if (!STRCMP(s[i], "OverTheSpot"))
1203 R->input_style = (XIMPreeditPosition | XIMStatusNothing);
1204 else if (!STRCMP(s[i], "OffTheSpot"))
1205 R->input_style = (XIMPreeditArea | XIMStatusArea);
1206 else if (!STRCMP(s[i], "Root"))
1207 R->input_style = (XIMPreeditNothing | XIMStatusNothing);
1208
1209 for (j = 0; j < xim_styles->count_styles; j++)
1210 if (R->input_style == xim_styles->supported_styles[j]) {
1211 found = 1;
1212 break;
1213 }
1214 }
1215 for (i = 0; s[i]; i++)
1216 free(s[i]); 1317 free(s[i]);
1217 free(s); 1318 free(s);
1218 XFree(xim_styles);
1219 1319
1220 if (!found) { 1320 if (found)
1221 XCloseIM(xim); 1321 goto done;
1222 return False;
1223 } 1322 }
1224 1323
1225 ximcallback.callback = rxvt_IMDestroyCallback; 1324 /* try with XMODIFIERS env. var. */
1325 if ((p = XSetLocaleModifiers ("")) && *p
1326 && GET_R->IM_get_IC ())
1327 goto done;
1226 1328
1227/* XXX: not sure why we need this (as well as IC one below) */ 1329 /* try with no modifiers base IF the user didn't specify an IM */
1228 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1330 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1331 && GET_R->IM_get_IC () == True)
1332 goto done;
1229 1333
1230 preedit_attr = status_attr = NULL; 1334done:
1231 1335#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1232 if (R->input_style & XIMPreeditPosition) { 1336 if (GET_R->rs[Rs_imLocale])
1233 rxvt_setSize(aR_ & rect); 1337 setlocale (LC_CTYPE, GET_R->locale);
1234 rxvt_setPosition(aR_ & spot); 1338#endif
1235 rxvt_setColor(aR_ & fg, &bg);
1236
1237 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1238 XNSpotLocation, &spot,
1239 XNForeground, fg, XNBackground, bg,
1240 //XNFontSet, R->TermWin.fontset,
1241 NULL);
1242 } else if (R->input_style & XIMPreeditArea) {
1243 rxvt_setColor(aR_ & fg, &bg);
1244
1245 /*
1246 * The necessary width of preedit area is unknown
1247 * until create input context.
1248 */
1249 needed_rect.width = 0;
1250
1251 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1252
1253 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1254 XNForeground, fg, XNBackground, bg,
1255 //XNFontSet, R->TermWin.fontset,
1256 NULL);
1257 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1258 XNForeground, fg, XNBackground, bg,
1259 //XNFontSet, R->TermWin.fontset,
1260 NULL);
1261 }
1262 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1263 XNClientWindow, R->TermWin.parent[0],
1264 XNFocusWindow, R->TermWin.parent[0],
1265 XNDestroyCallback, &ximcallback,
1266 preedit_attr ? XNPreeditAttributes : NULL,
1267 preedit_attr,
1268 status_attr ? XNStatusAttributes : NULL,
1269 status_attr, NULL);
1270 if (preedit_attr)
1271 XFree(preedit_attr);
1272 if (status_attr)
1273 XFree(status_attr);
1274 if (R->Input_Context == NULL) {
1275 rxvt_print_error("failed to create input context");
1276 XCloseIM(xim);
1277 return False;
1278 }
1279 if (R->input_style & XIMPreeditArea)
1280 rxvt_IMSetStatusPosition(aR);
1281 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1282 return True;
1283} 1339}
1284 1340
1285/* EXTPROTO */
1286void 1341void
1287rxvt_IMSetStatusPosition(pR) 1342rxvt_term::IMSetStatusPosition ()
1288{ 1343{
1289 XRectangle preedit_rect, status_rect, *needed_rect; 1344 XRectangle preedit_rect, status_rect, *needed_rect;
1290 XVaNestedList preedit_attr, status_attr; 1345 XVaNestedList preedit_attr, status_attr;
1291 1346
1292 if (R->Input_Context == NULL 1347 if (Input_Context == NULL
1293 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1348 || !TermWin.focus || !(input_style & XIMPreeditArea)
1294 || !rxvt_IMisRunning(aR)) 1349 || !IMisRunning ())
1295 return; 1350 return;
1296 1351
1297/* Getting the necessary width of preedit area */ 1352 /* Getting the necessary width of preedit area */
1298 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1353 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL);
1299 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1354 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL);
1300 XFree(status_attr); 1355 XFree(status_attr);
1301 1356
1302 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1357 set_preedit_area(&preedit_rect, &status_rect, needed_rect);
1303 1358
1304 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1359 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL);
1305 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1360 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL);
1306 1361
1307 XSetICValues(R->Input_Context, 1362 XSetICValues(Input_Context,
1308 XNPreeditAttributes, preedit_attr, 1363 XNPreeditAttributes, preedit_attr,
1309 XNStatusAttributes, status_attr, NULL); 1364 XNStatusAttributes, status_attr, NULL);
1310 1365
1311 XFree(preedit_attr); 1366 XFree(preedit_attr);
1312 XFree(status_attr); 1367 XFree(status_attr);
1313} 1368}
1314#endif /* USE_XIM */ 1369#endif /* USE_XIM */
1315 1370
1316/*----------------------------------------------------------------------*/ 1371/*----------------------------------------------------------------------*/
1317rxvt_t rxvt_current_term; 1372rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines