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.13 by pcg, Wed Dec 17 09:00:35 2003 UTC vs.
Revision 1.28 by pcg, Mon Feb 9 22:45:29 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines