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

Diff Legend

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