[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.165 by root, Sun Jan 8 00:20:12 2006 UTC vs.
Revision 1.205 by root, Wed Jan 25 13:24:45 2006 UTC

…		…
48	# include <termios.h>	48	# include <termios.h>
49	#endif	49	#endif
50		50
51	vector<rxvt_term *> rxvt_term::termlist;	51	vector<rxvt_term *> rxvt_term::termlist;
52		52
		53	// used to tell global functions which terminal instance is "active"
		54	rxvt_t rxvt_current_term;
		55
53	static char curlocale[128], savelocale[128];	56	static char curlocale[128], savelocale[128];
54		57
55	bool	58	bool
56	rxvt_set_locale (const char *locale)	59	rxvt_set_locale (const char *locale) NOTHROW
57	{	60	{
58	if (!locale \|\| !strncmp (locale, curlocale, 128))	61	if (!locale \|\| !strncmp (locale, curlocale, 128))
59	return false;	62	return false;
60		63
61	strncpy (curlocale, locale, 128);	64	strncpy (curlocale, locale, 128);
62	setlocale (LC_CTYPE, curlocale);	65	setlocale (LC_CTYPE, curlocale);
63	return true;	66	return true;
64	}	67	}
65		68
66	bool	69	void
67	rxvt_push_locale (const char *locale)	70	rxvt_push_locale (const char *locale) NOTHROW
68	{	71	{
69	strcpy (savelocale, curlocale);	72	strcpy (savelocale, curlocale);
70	rxvt_set_locale (locale);	73	rxvt_set_locale (locale);
71	}	74	}
72		75
73	void	76	void
74	rxvt_pop_locale ()	77	rxvt_pop_locale () NOTHROW
75	{	78	{
76	rxvt_set_locale (savelocale);	79	rxvt_set_locale (savelocale);
77	}	80	}
78		81
79	#if ENABLE_COMBINING	82	#if ENABLE_COMBINING
…		…
146	rootwin_ev (this, &rxvt_term::rootwin_cb),	149	rootwin_ev (this, &rxvt_term::rootwin_cb),
147	#endif	150	#endif
148	#ifdef HAVE_SCROLLBARS	151	#ifdef HAVE_SCROLLBARS
149	scrollbar_ev (this, &rxvt_term::x_cb),	152	scrollbar_ev (this, &rxvt_term::x_cb),
150	#endif	153	#endif
151	#ifdef MENUBAR
152	menubar_ev (this, &rxvt_term::x_cb),
153	#endif
154	#ifdef CURSOR_BLINK	154	#ifdef CURSOR_BLINK
155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156	#endif	156	#endif
157	#ifdef TEXT_BLINK	157	#ifdef TEXT_BLINK
158	text_blink_ev (this, &rxvt_term::text_blink_cb),	158	text_blink_ev (this, &rxvt_term::text_blink_cb),
…		…
170	pointer_ev (this, &rxvt_term::pointer_cb),	170	pointer_ev (this, &rxvt_term::pointer_cb),
171	#endif	171	#endif
172	#ifdef USE_XIM	172	#ifdef USE_XIM
173	im_ev (this, &rxvt_term::im_cb),	173	im_ev (this, &rxvt_term::im_cb),
174	#endif	174	#endif
		175	#ifndef NO_BELL
		176	bell_ev (this, &rxvt_term::bell_cb),
		177	#endif
175	termwin_ev (this, &rxvt_term::x_cb),	178	termwin_ev (this, &rxvt_term::x_cb),
176	vt_ev (this, &rxvt_term::x_cb),	179	vt_ev (this, &rxvt_term::x_cb),
		180	child_ev (this, &rxvt_term::child_cb),
177	check_ev (this, &rxvt_term::check_cb),	181	check_ev (this, &rxvt_term::check_cb),
178	flush_ev (this, &rxvt_term::flush_cb),	182	flush_ev (this, &rxvt_term::flush_cb),
179	destroy_ev (this, &rxvt_term::destroy_cb),	183	destroy_ev (this, &rxvt_term::destroy_cb),
180	pty_ev (this, &rxvt_term::pty_cb),	184	pty_ev (this, &rxvt_term::pty_cb),
181	incr_ev (this, &rxvt_term::incr_cb)	185	incr_ev (this, &rxvt_term::incr_cb)
…		…
184		188
185	termlist.push_back (this);	189	termlist.push_back (this);
186		190
187	#ifdef KEYSYM_RESOURCE	191	#ifdef KEYSYM_RESOURCE
188	keyboard = new keyboard_manager;	192	keyboard = new keyboard_manager;
189
190	if (!keyboard)
191	rxvt_fatal ("out of memory, aborting.\n");
192	#endif	193	#endif
193	}	194	}
194		195
195	// clean up the most important stuff, do not call x or free mem etc.	196	// clean up the most important stuff, do not call x or free mem etc.
196	// for use before an emergency exit	197	// for use before an emergency exit
197	void rxvt_term::emergency_cleanup ()	198	void rxvt_term::emergency_cleanup ()
198	{	199	{
199	if (cmd_pid)	200	if (cmd_pid)
200	kill (-cmd_pid, SIGHUP);	201	kill (-cmd_pid, SIGHUP);
201		202
202	#ifdef UTMP_SUPPORT	203	delete pty; pty = 0;
203	privileged_utmp (RESTORE);
204	#endif
205
206	pty.put ();
207	}	204	}
208		205
209	rxvt_term::~rxvt_term ()	206	rxvt_term::~rxvt_term ()
210	{	207	{
211	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
212
213	termlist.erase (find (termlist.begin (), termlist.end(), this));	208	termlist.erase (find (termlist.begin (), termlist.end(), this));
214		209
215	emergency_cleanup ();	210	emergency_cleanup ();
216		211
217	#if ENABLE_STYLES	212	#if ENABLE_STYLES
…		…
227		222
228	selection_clear ();	223	selection_clear ();
229		224
230	#ifdef USE_XIM	225	#ifdef USE_XIM
231	im_destroy ();	226	im_destroy ();
232	#endif
233	#ifdef MENUBAR
234	if (menubarGC) XFreeGC (disp, menubarGC);
235	#endif	227	#endif
236	#ifdef XTERM_SCROLLBAR	228	#ifdef XTERM_SCROLLBAR
237	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	229	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
238	if (ShadowGC) XFreeGC (disp, ShadowGC);	230	if (ShadowGC) XFreeGC (disp, ShadowGC);
239	#endif	231	#endif
…		…
250	if (upArrow) XFreePixmap (disp, upArrow);	242	if (upArrow) XFreePixmap (disp, upArrow);
251	if (downArrow) XFreePixmap (disp, downArrow);	243	if (downArrow) XFreePixmap (disp, downArrow);
252	if (upArrowHi) XFreePixmap (disp, upArrowHi);	244	if (upArrowHi) XFreePixmap (disp, upArrowHi);
253	if (downArrowHi) XFreePixmap (disp, downArrowHi);	245	if (downArrowHi) XFreePixmap (disp, downArrowHi);
254	#endif	246	#endif
255	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	247	#ifdef RXVT_SCROLLBAR
256	if (topShadowGC) XFreeGC (disp, topShadowGC);	248	if (topShadowGC) XFreeGC (disp, topShadowGC);
257	if (botShadowGC) XFreeGC (disp, botShadowGC);	249	if (botShadowGC) XFreeGC (disp, botShadowGC);
258	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	250	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
259	#endif	251	#endif
260	if (gc) XFreeGC (disp, gc);	252	if (gc) XFreeGC (disp, gc);
261		253
262	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
263	delete menuBar.drawable;
264	//if (menuBar.win)
265	// XDestroyWindow (disp, menuBar.win);
266	#endif
267	delete drawable;	254	delete drawable;
268	// destroy all windows	255	// destroy all windows
269	if (parent[0])	256	if (parent[0])
270	XDestroyWindow (disp, parent[0]);	257	XDestroyWindow (disp, parent[0]);
271	}	258	}
272		259
273	// TODO: free pixcolours, colours should become part of rxvt_display	260	// TODO: free pixcolours, colours should become part of rxvt_display
274
275	delete pix_colors_focused;	261	delete pix_colors_focused;
276	#if OFF_FOCUS_FADING	262	#if OFF_FOCUS_FADING
277	delete pix_colors_unfocused;	263	delete pix_colors_unfocused;
278	#endif	264	#endif
279		265
…		…
285	for (int i = 0; i < allocated.size (); i++)	271	for (int i = 0; i < allocated.size (); i++)
286	free (allocated [i]);	272	free (allocated [i]);
287		273
288	free (selection.text);	274	free (selection.text);
289	// TODO: manage env vars in child only(!)	275	// TODO: manage env vars in child only(!)
290	free (env_windowid);
291	free (env_display);	276	free (env_display);
292	free (env_term);	277	free (env_term);
293	free (env_colorfgbg);
294	free (locale);	278	free (locale);
295	free (v_buffer);	279	free (v_buffer);
296	free (incr_buf);	280	free (incr_buf);
297		281
298	delete envv;	282	delete envv;
…		…
301	#ifdef KEYSYM_RESOURCE	285	#ifdef KEYSYM_RESOURCE
302	delete keyboard;	286	delete keyboard;
303	#endif	287	#endif
304	}	288	}
305		289
		290	// child has exited, usually destroys
306	void	291	void
307	rxvt_term::child_exit ()	292	rxvt_term::child_cb (child_watcher &w, int status)
308	{	293	{
		294	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		295
309	cmd_pid = 0;	296	cmd_pid = 0;
310		297
311	if (!OPTION (Opt_hold))	298	if (!OPTION (Opt_hold))
312	destroy ();	299	destroy ();
313	}	300	}
…		…
316	rxvt_term::destroy ()	303	rxvt_term::destroy ()
317	{	304	{
318	if (destroy_ev.active)	305	if (destroy_ev.active)
319	return;	306	return;
320		307
		308	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		309
321	#if ENABLE_OVERLAY	310	#if ENABLE_OVERLAY
322	scr_overlay_off ();	311	scr_overlay_off ();
323	#endif	312	#endif
324		313
325	if (display)	314	if (display)
…		…
327	#if USE_XIM	316	#if USE_XIM
328	im_ev.stop (display);	317	im_ev.stop (display);
329	#endif	318	#endif
330	#if HAVE_SCROLLBARS	319	#if HAVE_SCROLLBARS
331	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
332	#endif
333	#if MENUBAR
334	menubar_ev.stop (display);
335	#endif	321	#endif
336	#if TRANSPARENT	322	#if TRANSPARENT
337	rootwin_ev.stop (display);	323	rootwin_ev.stop (display);
338	#endif	324	#endif
339	incr_ev.stop ();	325	incr_ev.stop ();
…		…
363	}	349	}
364		350
365	void	351	void
366	rxvt_term::destroy_cb (time_watcher &w)	352	rxvt_term::destroy_cb (time_watcher &w)
367	{	353	{
368	SET_R (this);	354	make_current ();
369		355
370	delete this;	356	delete this;
371	}	357	}
372		358
373	/----------------------------------------------------------------------/	359	/----------------------------------------------------------------------/
…		…
461	_exit (EXIT_FAILURE);	447	_exit (EXIT_FAILURE);
462	}	448	}
463		449
464	/----------------------------------------------------------------------/	450	/----------------------------------------------------------------------/
465	bool	451	bool
466	rxvt_term::init (int argc, const char const argv)	452	rxvt_term::init (int argc, const char const argv, stringvec *envv)
467	{	453	{
		454	this->envv = envv;
		455
468	SET_R (this);	456	SET_R (this);
469
470	set_locale ("");	457	set_locale ("");
		458	set_environ (envv); // few things in X do not call setlocale :(
471		459
472	if (!init_vars ())	460	if (!init_vars ())
473	return false;	461	return false;
474		462
475	init_secondary ();	463	init_secondary ();
…		…
478		466
479	#ifdef KEYSYM_RESOURCE	467	#ifdef KEYSYM_RESOURCE
480	keyboard->register_done ();	468	keyboard->register_done ();
481	#endif	469	#endif
482		470
483	#if MENUBAR_MAX
484	menubar_read (rs[Rs_menu]);
485	#endif
486	#ifdef HAVE_SCROLLBARS	471	#ifdef HAVE_SCROLLBARS
487	if (OPTION (Opt_scrollBar))	472	if (OPTION (Opt_scrollBar))
488	scrollBar.setIdle (); /* set existence for size calculations */	473	scrollBar.setIdle (); /* set existence for size calculations */
489	#endif	474	#endif
490		475
491	#if ENABLE_PERL	476	pty = ptytty::create ();
492	if (!rs[Rs_perl_ext_1])
493	rs[Rs_perl_ext_1] = "default";
494
495	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
496	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
497	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498	{
499	rxvt_perl.init ();
500	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
501	}
502	#endif
503		477
504	create_windows (argc, argv);	478	create_windows (argc, argv);
505		479
506	dDisp;	480	dDisp;
507		481
508	init_xlocale ();	482	init_xlocale ();
509		483
510	scr_reset (); /* initialize screen */	484	scr_reset (); // initialize screen
511		485
512	#if 0	486	#if 0
513	XSynchronize (disp, True);	487	XSynchronize (disp, True);
514	#endif	488	#endif
515		489
516	#ifdef HAVE_SCROLLBARS	490	#ifdef HAVE_SCROLLBARS
517	if (OPTION (Opt_scrollBar))	491	if (OPTION (Opt_scrollBar))
518	resize_scrollbar (); /* create and map scrollbar */	492	resize_scrollbar (); /* create and map scrollbar */
519	#endif	493	#endif
520	#if (MENUBAR_MAX)
521	if (menubar_visible ())
522	XMapWindow (disp, menuBar.win);
523	#endif
524	#ifdef TRANSPARENT	494	#ifdef TRANSPARENT
525	if (OPTION (Opt_transparent))	495	if (OPTION (Opt_transparent))
526	{	496	{
527	XSelectInput (disp, display->root, PropertyChangeMask);	497	XSelectInput (disp, display->root, PropertyChangeMask);
528	check_our_parents ();	498	check_our_parents ();
529	rootwin_ev.start (display, display->root);	499	rootwin_ev.start (display, display->root);
530	}	500	}
531	#endif	501	#endif
532		502
		503	set_colorfgbg ();
		504
		505	init_command (cmd_argv);
		506
		507	free (cmd_argv);
		508
		509	if (pty->pty >= 0)
		510	pty_ev.start (pty->pty, EVENT_READ);
		511
		512	check_ev.start ();
		513
		514	HOOK_INVOKE ((this, HOOK_START, DT_END));
		515
		516	#if ENABLE_XEMBED
		517	if (rs[Rs_embed])
		518	{
		519	long info[2] = { 0, XEMBED_MAPPED };
		520
		521	XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		522	32, PropModeReplace, (unsigned char *)&info, 2);
		523	}
		524	#endif
		525
533	XMapWindow (disp, vt);	526	XMapWindow (disp, vt);
534	XMapWindow (disp, parent[0]);	527	XMapWindow (disp, parent[0]);
535		528
536	set_colorfgbg ();
537
538	init_command (cmd_argv);
539
540	free (cmd_argv);
541
542	if (pty.pty >= 0)
543	pty_ev.start (pty.pty, EVENT_READ);
544
545	check_ev.start ();
546
547	HOOK_INVOKE ((this, HOOK_START, DT_END));
548
549	return true;	529	return true;
550	}	530	}
551		531
552	static struct sig_handlers	532	static struct sig_handlers
553	{	533	{
554	sig_watcher sw_chld, sw_term, sw_int;	534	sig_watcher sw_term, sw_int;
555		535
556	void sig_chld (sig_watcher &w)
557	{
558	// we are being called for every SIGCHLD, find the corresponding term
559	int pid;
560
561	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
562	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
563	if (pid == (*t)->cmd_pid)
564	{
565	(*t)->child_exit ();
566	break;
567	}
568	}
569
570	/*	536	/*
571	* Catch a fatal signal and tidy up before quitting	537	* Catch a fatal signal and tidy up before quitting
572	*/	538	*/
573	void	539	void
574	sig_term (sig_watcher &w)	540	sig_term (sig_watcher &w)
575	{	541	{
576	#ifdef DEBUG_CMD
577	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
578	#endif
579	rxvt_emergency_cleanup ();	542	rxvt_emergency_cleanup ();
580	signal (w.signum, SIG_DFL);	543	signal (w.signum, SIG_DFL);
581	kill (getpid (), w.signum);	544	kill (getpid (), w.signum);
582	}	545	}
583		546
584	sig_handlers ()	547	sig_handlers ()
585	: sw_chld (this, &sig_handlers::sig_chld),
586	sw_term (this, &sig_handlers::sig_term),	548	: sw_term (this, &sig_handlers::sig_term),
587	sw_int (this, &sig_handlers::sig_term)	549	sw_int (this, &sig_handlers::sig_term)
588	{	550	{
589	}	551	}
590	} sig_handlers;	552	} sig_handlers;
591		553
		554	char **rxvt_environ; // startup environment
		555
592	void	556	void
593	rxvt_init ()	557	rxvt_init ()
594	{	558	{
595	/*	559	ptytty::init ();
596	* Save and then give up any super-user privileges	560
597	* If we need privileges in any area then we must specifically request it.	561	rxvt_environ = environ;
598	* We should only need to be root in these cases:
599	* 1. write utmp entries on some systems
600	* 2. chown tty on some systems
601	*/
602	rxvt_privileges (SAVE);
603	rxvt_privileges (IGNORE);
604		562
605	signal (SIGHUP, SIG_IGN);	563	signal (SIGHUP, SIG_IGN);
606	signal (SIGPIPE, SIG_IGN);	564	signal (SIGPIPE, SIG_IGN);
607		565
608	sig_handlers.sw_chld.start (SIGCHLD);
609	sig_handlers.sw_term.start (SIGTERM);	566	sig_handlers.sw_term.start (SIGTERM);
610	sig_handlers.sw_int.start (SIGINT);	567	sig_handlers.sw_int.start (SIGINT);
611		568
612	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	569	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
613	/* signal (SIGURG, SIG_DFL); */	570	/* signal (SIGURG, SIG_DFL); */
614		571
615	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	572	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
616	// TODO: handle this with exceptions and tolerate the memory loss	573	// TODO: handle this with exceptions and tolerate the memory loss
617	XSetIOErrorHandler (rxvt_xioerror_handler);	574	XSetIOErrorHandler (rxvt_xioerror_handler);
		575
		576	XrmInitialize ();
618	}	577	}
619		578
620	/* ------------------------------------------------------------------------- *	579	/* ------------------------------------------------------------------------- *
621	* MEMORY ALLOCATION WRAPPERS *	580	* MEMORY ALLOCATION WRAPPERS *
622	* ------------------------------------------------------------------------- */	581	* ------------------------------------------------------------------------- */
…		…
640	rxvt_fatal ("memory allocation failure. aborting.\n");	599	rxvt_fatal ("memory allocation failure. aborting.\n");
641		600
642	return p;	601	return p;
643	}	602	}
644		603
645	void *	604	void *
646	rxvt_realloc (void *ptr, size_t size)	605	rxvt_realloc (void *ptr, size_t size)
647	{	606	{
648	void *p = realloc (ptr, size);	607	void *p = realloc (ptr, size);
649		608
650	if (!p)	609	if (!p)
651	rxvt_fatal ("memory allocation failure. aborting.\n");	610	rxvt_fatal ("memory allocation failure. aborting.\n");
652		611
653	return p;	612	return p;
654	}	613	}
655
656	/* ------------------------------------------------------------------------- *
657	* PRIVILEGED OPERATIONS *
658	* ------------------------------------------------------------------------- */
659	/* take care of suid/sgid super-user (root) privileges */
660	void
661	rxvt_privileges (rxvt_privaction action)
662	{
663	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
664	static uid_t euid;
665	static gid_t egid;
666	#endif
667
668	#if ! defined(__CYGWIN32__)
669	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
670	/* setreuid () is the poor man's setuid (), seteuid () */
671	# define seteuid(a) setreuid(-1, (a))
672	# define setegid(a) setregid(-1, (a))
673	# define HAVE_SETEUID
674	# endif
675	# ifdef HAVE_SETEUID
676	switch (action)
677	{
678	case IGNORE:
679	/*
680	* change effective uid/gid - not real uid/gid - so we can switch
681	* back to root later, as required
682	*/
683	seteuid (getuid ());
684	setegid (getgid ());
685	break;
686	case SAVE:
687	euid = geteuid ();
688	egid = getegid ();
689	break;
690	case RESTORE:
691	seteuid (euid);
692	setegid (egid);
693	break;
694	}
695	# else
696	switch (action)
697	{
698	case IGNORE:
699	setuid (getuid ());
700	setgid (getgid ());
701	/* FALLTHROUGH */
702	case SAVE:
703	/* FALLTHROUGH */
704	case RESTORE:
705	break;
706	}
707	# endif
708	#endif
709	}
710
711	#ifdef UTMP_SUPPORT
712	void
713	rxvt_term::privileged_utmp (rxvt_privaction action)
714	{
715	if (OPTION (Opt_utmpInhibit)
716	\|\| !pty.name \|\| !*pty.name)
717	return;
718
719	rxvt_privileges (RESTORE);
720
721	if (action == SAVE)
722	makeutent (pty.name, rs[Rs_display_name]);
723	else
724	cleanutent ();
725
726	rxvt_privileges (IGNORE);
727	}
728	#endif
729		614
730	/----------------------------------------------------------------------/	615	/----------------------------------------------------------------------/
731	/*	616	/*
732	* window size/position calculcations for XSizeHint and other storage.	617	* window size/position calculcations for XSizeHint and other storage.
733	* if width/height are non-zero then override calculated width/height	618	* if width/height are non-zero then override calculated width/height
734	*/	619	*/
735	void	620	void
736	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	621	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
737	{	622	{
738	short recalc_x, recalc_y;	623	short recalc_x, recalc_y;
739	int x, y, sb_w, mb_h, flags;	624	int x, y, sb_w, flags;
740	unsigned int w, h;	625	unsigned int w, h;
741	unsigned int max_width, max_height;	626	unsigned int max_width, max_height;
742	dDisp;	627	dDisp;
743
744	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
745	ncol, nrow, szHint.width, szHint.height));
746		628
747	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	629	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
748	szHint.win_gravity = NorthWestGravity;	630	szHint.win_gravity = NorthWestGravity;
749	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	631	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
750		632
…		…
805	max_width = MAX_COLS * fwidth;	687	max_width = MAX_COLS * fwidth;
806	max_height = MAX_ROWS * fheight;	688	max_height = MAX_ROWS * fheight;
807		689
808	szHint.base_width = szHint.base_height = 2 * int_bwidth;	690	szHint.base_width = szHint.base_height = 2 * int_bwidth;
809		691
810	sb_w = mb_h = 0;	692	sb_w = 0;
811	window_vt_x = window_vt_y = int_bwidth;	693	window_vt_x = window_vt_y = int_bwidth;
812		694
813	if (scrollbar_visible ())	695	if (scrollBar.state)
814	{	696	{
815	sb_w = scrollbar_TotalWidth ();	697	sb_w = scrollbar_TotalWidth ();
816	szHint.base_width += sb_w;	698	szHint.base_width += sb_w;
817	if (!OPTION (Opt_scrollBar_right))	699	if (!OPTION (Opt_scrollBar_right))
818	window_vt_x += sb_w;	700	window_vt_x += sb_w;
819	}	701	}
820		702
821	if (menubar_visible ())
822	{
823	mb_h = menuBar_TotalHeight ();
824	szHint.base_height += mb_h;
825	window_vt_y += mb_h;
826	}
827
828	szHint.width_inc = fwidth;	703	szHint.width_inc = fwidth;
829	szHint.height_inc = fheight;	704	szHint.height_inc = fheight;
830	szHint.min_width = szHint.base_width + szHint.width_inc;	705	szHint.min_width = szHint.base_width + szHint.width_inc;
831	szHint.min_height = szHint.base_height + szHint.height_inc;	706	szHint.min_height = szHint.base_height + szHint.height_inc;
832		707
…		…
850	{	725	{
851	min_it (height, max_height);	726	min_it (height, max_height);
852	szHint.height = szHint.base_height + height;	727	szHint.height = szHint.base_height + height;
853	}	728	}
854		729
855	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	730	if (scrollBar.state && OPTION (Opt_scrollBar_right))
856	window_sb_x = szHint.width - sb_w;	731	window_sb_x = szHint.width - sb_w;
857		732
858	if (recalc_x)	733	if (recalc_x)
859	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	734	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
860	if (recalc_y)	735	if (recalc_y)
861	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	736	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
862		737
863	ncol = width / fwidth;	738	ncol = width / fwidth;
864	nrow = height / fheight;	739	nrow = height / fheight;
865	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
866	ncol, nrow, szHint.width,
867	szHint.height));
868	return;
869	}	740	}
870		741
871	/----------------------------------------------------------------------/	742	/----------------------------------------------------------------------/
872	/*	743	/*
873	* Tell the teletype handler what size the window is.	744	* Tell the teletype handler what size the window is.
874	* Called after a window size change.	745	* Called after a window size change.
875	*/	746	*/
876	void	747	void
877	rxvt_term::tt_winch ()	748	rxvt_term::tt_winch ()
878	{	749	{
879	if (pty.pty < 0)	750	if (pty->pty < 0)
880	return;	751	return;
881		752
882	struct winsize ws;	753	struct winsize ws;
883		754
884	ws.ws_col = ncol;	755	ws.ws_col = ncol;
885	ws.ws_row = nrow;	756	ws.ws_row = nrow;
886	ws.ws_xpixel = width;	757	ws.ws_xpixel = width;
887	ws.ws_ypixel = height;	758	ws.ws_ypixel = height;
888	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	759	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
889		760
890	#if 0	761	#if 0
891	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	762	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
892	if (cmd_pid) /* force through to the command */	763	if (cmd_pid) /* force through to the command */
893	kill (-cmd_pid, SIGWINCH);	764	kill (-cmd_pid, SIGWINCH);
…		…
1113	{	984	{
1114	unsigned int i;	985	unsigned int i;
1115	const char *xpmb = "\0";	986	const char *xpmb = "\0";
1116	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	987	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1117		988
1118	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1119	strcpy (fstr, "default");	989	strcpy (fstr, "default");
1120	strcpy (bstr, "default");	990	strcpy (bstr, "default");
1121	for (i = Color_Black; i <= Color_White; i++)	991	for (i = Color_Black; i <= Color_White; i++)
1122	if (pix_colors[Color_fg] == pix_colors[i])	992	if (pix_colors[Color_fg] == pix_colors[i])
1123	{	993	{
…		…
1157	* -------------------------------------------------------------------- */	1027	* -------------------------------------------------------------------- */
1158	void	1028	void
1159	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	1029	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1160	{	1030	{
1161	int fix_screen;	1031	int fix_screen;
1162	int old_width = szHint.width, old_height = szHint.height;	1032	int old_width = szHint.width;
		1033	int old_height = szHint.height;
1163	dDisp;	1034	dDisp;
1164		1035
1165	window_calc (newwidth, newheight);	1036	window_calc (newwidth, newheight);
1166	XSetWMNormalHints (disp, parent[0], &szHint);	1037	XSetWMNormalHints (disp, parent[0], &szHint);
1167		1038
…		…
1189	{	1060	{
1190	x -= x1;	1061	x -= x1;
1191	y -= y1;	1062	y -= y1;
1192	}	1063	}
1193		1064
1194	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1065	x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1195	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1066	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1196	dx = old_width - szHint.width;	1067	dx = old_width - szHint.width;
1197	dy = old_height - szHint.height;	1068	dy = old_height - szHint.height;
1198		1069
1199	/* Check position of the center of the window */	1070	/* Check position of the center of the window */
1200	if (x < x1) /* left half */	1071	if (x < x1) /* left half */
1201	dx = 0;	1072	dx = 0;
…		…
1215		1086
1216	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1087	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1217		1088
1218	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1089	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1219	{	1090	{
1220	if (scrollbar_visible ())	1091	if (scrollBar.state)
1221	{	1092	{
1222	XMoveResizeWindow (disp, scrollBar.win,	1093	XMoveResizeWindow (disp, scrollBar.win,
1223	window_sb_x, 0,	1094	window_sb_x, 0,
1224	scrollbar_TotalWidth (), szHint.height);	1095	scrollbar_TotalWidth (), szHint.height);
1225	resize_scrollbar ();	1096	resize_scrollbar ();
1226	}	1097	}
1227		1098
1228	if (menubar_visible ())
1229	XMoveResizeWindow (disp, menuBar.win,
1230	window_vt_x, 0,
1231	width, menuBar_TotalHeight ());
1232
1233	XMoveResizeWindow (disp, vt,	1099	XMoveResizeWindow (disp, vt,
1234	window_vt_x, window_vt_y,	1100	window_vt_x, window_vt_y,
1235	width, height);	1101	width, height);
1236		1102
1237	scr_clear ();	1103	scr_clear ();
…		…
1239	resize_pixmap ();	1105	resize_pixmap ();
1240	#endif	1106	#endif
1241	}	1107	}
1242		1108
1243	if (fix_screen \|\| old_height == 0)	1109	if (fix_screen \|\| old_height == 0)
1244	{
1245	int curr_screen = -1;
1246	int old_ncol = prev_ncol;
1247
1248	/* scr_reset only works on the primary screen */
1249	if (old_height) /* this is not the first time through */
1250	{
1251	unsigned int ocol = ncol;
1252	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1253	curr_screen = scr_change_screen (PRIMARY);
1254	ncol = ocol;
1255	}
1256
1257	scr_reset ();	1110	scr_reset ();
1258
1259	if (curr_screen >= 0) /* this is not the first time through */
1260	{
1261	scr_change_screen (curr_screen);
1262	selection_check (old_ncol != ncol ? 4 : 0);
1263	}
1264	}
1265
1266	old_width = szHint.width;
1267	old_height = szHint.height;
1268		1111
1269	#ifdef XPM_BACKGROUND	1112	#ifdef XPM_BACKGROUND
1270	if (pixmap)	1113	if (pixmap)
1271	scr_touch (false);	1114	scr_touch (false);
1272	#endif	1115	#endif
…		…
1375	XPoint nspot;	1218	XPoint nspot;
1376	XVaNestedList preedit_attr;	1219	XVaNestedList preedit_attr;
1377		1220
1378	if (!Input_Context	1221	if (!Input_Context
1379	\|\| !focus	1222	\|\| !focus
1380	\|\| !(input_style & XIMPreeditPosition))	1223	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1381	return;	1224	return;
1382		1225
1383	im_set_position (nspot);	1226	im_set_position (nspot);
1384		1227
1385	if (nspot.x == spot.x && nspot.y == spot.y)	1228	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1404	input_method = 0;	1247	input_method = 0;
1405	}	1248	}
1406		1249
1407	Input_Context = 0;	1250	Input_Context = 0;
1408	}	1251	}
		1252
		1253	#ifdef ENABLE_XIM_ONTHESPOT
		1254
		1255	static void
		1256	xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
		1257	{
		1258	((rxvt_term *)client_data)->make_current ();
		1259	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
		1260	}
		1261
		1262	static void
		1263	xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
		1264	{
		1265	((rxvt_term *)client_data)->make_current ();
		1266	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
		1267	}
		1268
		1269	static void
		1270	xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
		1271	{
		1272	rxvt_term term = (rxvt_term )client_data;
		1273	XIMText *text = call_data->text;
		1274
		1275	term->make_current ();
		1276
		1277	if (text)
		1278	{
		1279	void *str;
		1280
		1281	if (!text->encoding_is_wchar && text->string.multi_byte)
		1282	{
		1283	// of course, X makes it ugly again
		1284	if (term->rs[Rs_imLocale])
		1285	SET_LOCALE (term->rs[Rs_imLocale]);
		1286
		1287	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
		1288	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
		1289
		1290	if (term->rs[Rs_imLocale])
		1291	SET_LOCALE (term->locale);
		1292	}
		1293	else
		1294	str = (void *)text->string.wide_char;
		1295
		1296	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1297	DT_INT, call_data->caret,
		1298	DT_INT, call_data->chg_first,
		1299	DT_INT, call_data->chg_length,
		1300	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
		1301	DT_WCS_LEN, str, str ? (int)text->length : 0,
		1302	DT_END));
		1303	}
		1304	else
		1305	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1306	DT_INT, call_data->caret,
		1307	DT_INT, call_data->chg_first,
		1308	DT_INT, call_data->chg_length,
		1309	DT_END));
		1310	}
		1311
		1312	#if 0
		1313	static void
		1314	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1315	{
		1316	((rxvt_term *)client_data)->make_current ();
		1317	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1318	DT_INT, call_data->position,
		1319	DT_INT, call_data->direction,
		1320	DT_INT, call_data->style,
		1321	DT_END));
		1322	}
		1323	#endif
		1324
		1325	#endif
1409		1326
1410	/*	1327	/*
1411	* Try to open a XIM with the current modifiers, then see if we can	1328	* Try to open a XIM with the current modifiers, then see if we can
1412	* open a suitable preedit type	1329	* open a suitable preedit type
1413	*/	1330	*/
…		…
1420	XRectangle rect, status_rect, needed_rect;	1337	XRectangle rect, status_rect, needed_rect;
1421	unsigned long fg, bg;	1338	unsigned long fg, bg;
1422	const char *p;	1339	const char *p;
1423	char **s;	1340	char **s;
1424	XIMStyles *xim_styles;	1341	XIMStyles *xim_styles;
		1342	#ifdef ENABLE_XIM_ONTHESPOT
		1343	XIMCallback xcb[4];
		1344	#endif
		1345
		1346	set_environ (envv);
1425		1347
1426	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1348	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1427	return false;	1349	return false;
1428		1350
1429	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1430	input_method = display->get_xim (locale, modifiers);	1351	input_method = display->get_xim (locale, modifiers);
1431	if (input_method == NULL)	1352	if (input_method == NULL)
1432	return false;	1353	return false;
1433		1354
1434	xim = input_method->xim;	1355	xim = input_method->xim;
…		…
1454	s = rxvt_splitcommastring (p);	1375	s = rxvt_splitcommastring (p);
1455		1376
1456	for (i = found = 0; !found && s[i]; i++)	1377	for (i = found = 0; !found && s[i]; i++)
1457	{	1378	{
1458	if (!strcmp (s[i], "OverTheSpot"))	1379	if (!strcmp (s[i], "OverTheSpot"))
1459	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1380	input_style = XIMPreeditPosition \| XIMStatusNothing;
1460	else if (!strcmp (s[i], "OffTheSpot"))	1381	else if (!strcmp (s[i], "OffTheSpot"))
1461	input_style = (XIMPreeditArea \| XIMStatusArea);	1382	input_style = XIMPreeditArea \| XIMStatusArea;
1462	else if (!strcmp (s[i], "Root"))	1383	else if (!strcmp (s[i], "Root"))
1463	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1384	input_style = XIMPreeditNothing \| XIMStatusNothing;
1464	else if (!strcmp (s[i], "None"))	1385	else if (!strcmp (s[i], "None"))
1465	input_style = (XIMPreeditNone \| XIMStatusNone);	1386	input_style = XIMPreeditNone \| XIMStatusNone;
		1387	#ifdef ENABLE_XIM_ONTHESPOT
		1388	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1389	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1390	#endif
		1391	else
		1392	input_style = XIMPreeditNothing \| XIMStatusNothing;
1466		1393
1467	for (j = 0; j < xim_styles->count_styles; j++)	1394	for (j = 0; j < xim_styles->count_styles; j++)
1468	if (input_style == xim_styles->supported_styles[j])	1395	if (input_style == xim_styles->supported_styles[j])
1469	{	1396	{
1470	rxvt_freecommastring (s);	1397	rxvt_freecommastring (s);
…		…
1559	XNBackground, bg,	1486	XNBackground, bg,
1560	XNArea, &status_rect,	1487	XNArea, &status_rect,
1561	XNFontSet, fs,	1488	XNFontSet, fs,
1562	NULL);	1489	NULL);
1563	}	1490	}
		1491	#if ENABLE_XIM_ONTHESPOT
		1492	else if (input_style & XIMPreeditCallbacks)
		1493	{
		1494	im_set_position (spot);
		1495
		1496	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1497	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1498	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1499	# if 0
		1500	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1501	# endif
		1502
		1503	preedit_attr = XVaCreateNestedList (0,
		1504	XNSpotLocation, &spot,
		1505	XNPreeditStartCallback, &xcb[0],
		1506	XNPreeditDoneCallback , &xcb[1],
		1507	XNPreeditDrawCallback , &xcb[2],
		1508	# if 0
		1509	XNPreeditCaretCallback, &xcb[3],
		1510	# endif
		1511	NULL);
		1512	}
		1513	#endif
1564		1514
1565	Input_Context = XCreateIC (xim,	1515	Input_Context = XCreateIC (xim,
1566	XNInputStyle, input_style,	1516	XNInputStyle, input_style,
1567	XNClientWindow, vt,	1517	XNClientWindow, vt,
1568	XNFocusWindow, parent[0],	1518	XNFocusWindow, parent[0],
…		…
1580	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1530	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1581	im_destroy ();	1531	im_destroy ();
1582	return false;	1532	return false;
1583	}	1533	}
1584		1534
		1535	#if 0
		1536	// unfortunately, only the focus window is used by XIM, hard to fix
		1537	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1538	vt_select_input ();
		1539	#endif
		1540
1585	if (input_style & XIMPreeditArea)	1541	if (input_style & XIMPreeditArea)
1586	IMSetStatusPosition ();	1542	IMSetStatusPosition ();
1587		1543
1588	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1589	return true;	1544	return true;
1590	}	1545	}
1591		1546
1592	void	1547	void
1593	rxvt_term::im_cb ()	1548	rxvt_term::im_cb ()
…		…
1595	int i;	1550	int i;
1596	const char *p;	1551	const char *p;
1597	char **s;	1552	char **s;
1598	char buf[IMBUFSIZ];	1553	char buf[IMBUFSIZ];
1599		1554
1600	SET_R (this);	1555	make_current ();
1601		1556
1602	im_destroy ();	1557	im_destroy ();
1603		1558
1604	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1605	if (Input_Context)	1559	if (Input_Context)
1606	return;	1560	return;
1607		1561
1608	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1562	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1609	if (rs[Rs_imLocale])	1563	if (rs[Rs_imLocale])
…		…
1682	XFree (preedit_attr);	1636	XFree (preedit_attr);
1683	XFree (status_attr);	1637	XFree (status_attr);
1684	}	1638	}
1685	#endif /* USE_XIM */	1639	#endif /* USE_XIM */
1686		1640
1687	/----------------------------------------------------------------------/
1688	rxvt_t rxvt_current_term;
1689
1690	/----------------------- end-of-file (C source) -----------------------/	1641	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.165 by root, Sun Jan 8 00:20:12 2006 UTC vs. Revision 1.205 by root, Wed Jan 25 13:24:45 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.165 by root, Sun Jan 8 00:20:12 2006 UTC vs.
Revision 1.205 by root, Wed Jan 25 13:24:45 2006 UTC