ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.257 by root, Tue May 30 02:22:02 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 2006 UTC

…		…
26		26
27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;	27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;	28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};	29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};	30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
31	}	33	}
32		34
33	$layout	35	$layout
34	}	36	}
35		37
36	sub set_layout {	38	sub set_layout {
37	my ($layout) = @_;	39	my ($layout) = @_;
		40
38	$LAYOUT = $layout;	41	$LAYOUT = $layout;
39	}	42	}
40		43
41	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
42	if (!$GRAB) {	47	if (!$GRAB) {
43	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
44	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
45
46	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
47	$TOOLTIP->hide;	51	$TOOLTIP->hide;
48		52
49	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
50		54
…		…
167	sub rescale_widgets {	171	sub rescale_widgets {
168	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
169		173
170	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
171	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
172	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174		178
175	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
176	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
177	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
178	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
179	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
180	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
181		185
182	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184		188
185	}	189	}
186	}	190	}
187		191
188	reconfigure_widgets;	192	reconfigure_widgets;
…		…
207	h => undef,	211	h => undef,
208	can_events => 1,	212	can_events => 1,
209	@_	213	@_
210	}, $class;	214	}, $class;
211		215
212	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220	}
221
222	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
223		217
224	for (keys %$self) {	218	for (keys %$self) {
225	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
226	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
227	}	221	}
228	}	222	}
229		223
		224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
		234	}
		235
230	$self	236	$self
231	}	237	}
232		238
233	sub destroy {	239	sub destroy {
234	my ($self) = @_;	240	my ($self) = @_;
…		…
350	$self->{x} = $x;	356	$self->{x} = $x;
351	$self->{y} = $y;	357	$self->{y} = $y;
352	$self->update;	358	$self->update;
353	}	359	}
354		360
355	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
356	return unless $self->{visible};	362	return unless $self->{visible};
357		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
358	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	367	$self->{root}{size_alloc}{$self+0} = $self;
359	}	368	}
360	}	369	}
361		370
362	sub size_allocate {	371	sub size_allocate {
363	# nothing to be done	372	# nothing to be done
364	}	373	}
365		374
366	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
367	}	381	}
368		382
369	sub set_max_size {	383	sub set_max_size {
370	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
371		385
…		…
430		444
431	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
432	unless $FOCUS;	446	unless $FOCUS;
433	}	447	}
434		448
435	sub mouse_motion { }	449	sub mouse_motion { 0 }
436	sub button_up { }	450	sub button_up { 0 }
437	sub key_down { }	451	sub key_down { 0 }
438	sub key_up { }	452	sub key_up { 0 }
439		453
440	sub button_down {	454	sub button_down {
441	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
442		456
443	$self->focus_in;	457	$self->focus_in;
444	}
445		458
446	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
447	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
448	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
449	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
450	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
451		461
452	sub find_widget {	462	sub find_widget {
453	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
454		464
455	return () unless $self->{can_events};	465	return () unless $self->{can_events};
…		…
463		473
464	sub set_parent {	474	sub set_parent {
465	my ($self, $parent) = @_;	475	my ($self, $parent) = @_;
466		476
467	Scalar::Util::weaken ($self->{parent} = $parent);	477	Scalar::Util::weaken ($self->{parent} = $parent);
468
469	$self->set_visible if $parent->{visible};	478	$self->set_visible if $parent->{visible};
470	}	479	}
471		480
472	sub connect {	481	sub connect {
473	my ($self, $signal, $cb) = @_;	482	my ($self, $signal, $cb) = @_;
…		…
494		503
495	sub realloc {	504	sub realloc {
496	my ($self) = @_;	505	my ($self) = @_;
497		506
498	if ($self->{visible}) {	507	if ($self->{visible}) {
499	return if $self->{root}{realloc}{$self};	508	return if $self->{root}{realloc}{$self+0};
500		509
501	$self->{root}{realloc}{$self} = $self;	510	$self->{root}{realloc}{$self+0} = $self;
502	$self->{root}->update;	511	$self->{root}->update;
503	} else {	512	} else {
504	delete $self->{req_w};	513	delete $self->{req_w};
		514	delete $self->{req_h};
505	}	515	}
506	}	516	}
507		517
508	sub update {	518	sub update {
509	my ($self) = @_;	519	my ($self) = @_;
…		…
517		527
518	$self->realloc;	528	$self->realloc;
519	$self->update;	529	$self->update;
520	}	530	}
521		531
		532	# using global variables seems a bit hacky, but passing through all drawing
		533	# functions seems pointless.
		534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		535
522	sub draw {	536	sub draw {
523	my ($self) = @_;	537	my ($self) = @_;
524		538
525	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
		540
		541	# update screen rectangle
		542	local $draw_x = $draw_x + $self->{x};
		543	local $draw_y = $draw_y + $self->{y};
		544	local $draw_w = $draw_x + $self->{w};
		545	local $draw_h = $draw_y + $self->{h};
		546
		547	# skip widgets that are entirely outside the drawing area
		548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
526		550
527	glPushMatrix;	551	glPushMatrix;
528	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
529	$self->_draw;	553	$self->_draw;
530	glPopMatrix;	554	glPopMatrix;
…		…
542	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
543	glEnd;	567	glEnd;
544	glDisable GL_BLEND;	568	glDisable GL_BLEND;
545	}	569	}
546		570
547	if ($ENV{CFPLUS_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
548	glPushMatrix;	572	glPushMatrix;
549	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
550	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
551	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
552	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
644	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
645		669
646	sub new {	670	sub new {
647	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
648		672
649	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
650		674
651	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
652	children => [],	676	children => [],
653	can_events => 0,	677	can_events => 0,
654	%arg,	678	%arg,
655	);	679	);
		680
656	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
657		683
658	$self	684	$self
659	}	685	}
660		686
661	sub add {	687	sub add {
…		…
709	$x -= $self->{x};	735	$x -= $self->{x};
710	$y -= $self->{y};	736	$y -= $self->{y};
711		737
712	my $res;	738	my $res;
713		739
714	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
715	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
716	and return $res;	742	and return $res;
717	}	743	}
718		744
719	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
761	sub size_request {	787	sub size_request {
762	$_[0]{children}[0]->size_request	788	$_[0]{children}[0]->size_request
763	}	789	}
764		790
765	sub size_allocate {	791	sub size_allocate {
766	my ($self, $w, $h, $changed) = @_;	792	my ($self, $w, $h) = @_;
767		793
768	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
769	}	795	}
770		796
771	#############################################################################	797	#############################################################################
		798
		799	# back-buffered drawing area
772		800
773	package CFClient::UI::Window;	801	package CFClient::UI::Window;
774		802
775	our @ISA = CFClient::UI::Bin::;	803	our @ISA = CFClient::UI::Bin::;
776		804
…		…
788	$ROOT->on_post_alloc ($self => sub { $self->render_child });	816	$ROOT->on_post_alloc ($self => sub { $self->render_child });
789	$self->SUPER::update;	817	$self->SUPER::update;
790	}	818	}
791		819
792	sub size_allocate {	820	sub size_allocate {
793	my ($self, $w, $h, $changed) = @_;	821	my ($self, $w, $h) = @_;
794		822
795	$self->SUPER::size_allocate ($w, $h, $changed);	823	$self->SUPER::size_allocate ($w, $h);
796	$self->update	824	$self->update;
797	if $changed;
798	}	825	}
799		826
800	sub _render {	827	sub _render {
		828	my ($self) = @_;
		829
801	$_[0]{children}[0]->draw;	830	$self->{children}[0]->draw;
802	}	831	}
803		832
804	sub render_child {	833	sub render_child {
805	my ($self) = @_;	834	my ($self) = @_;
806		835
807	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	836	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
808	glClearColor 0, 0, 0, 0;	837	glClearColor 0, 0, 0, 0;
809	glClear GL_COLOR_BUFFER_BIT;	838	glClear GL_COLOR_BUFFER_BIT;
810		839
		840	{
		841	package CFClient::UI::Base;
		842
		843	($draw_x, $draw_y, $draw_w, $draw_h) =
		844	(0, 0, $self->{w}, $self->{h});
		845	}
		846
811	$self->_render;	847	$self->_render;
812	};	848	};
813	}	849	}
814		850
815	sub _draw {	851	sub _draw {
816	my ($self) = @_;	852	my ($self) = @_;
817		853
818	my ($w, $h) = ($self->w, $self->h);	854	my ($w, $h) = @$self{qw(w h)};
819		855
820	my $tex = $self->{texture}	856	my $tex = $self->{texture}
821	or return;	857	or return;
822		858
823	glEnable GL_TEXTURE_2D;	859	glEnable GL_TEXTURE_2D;
…		…
846	}	882	}
847		883
848	sub size_request {	884	sub size_request {
849	my ($self) = @_;	885	my ($self) = @_;
850		886
851	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	887	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852		888
853	$w = 10 if $self->{scroll_x};	889	$w = 10 if $self->{scroll_x};
854	$h = 10 if $self->{scroll_y};	890	$h = 10 if $self->{scroll_y};
855		891
856	($w, $h)	892	($w, $h)
857	}	893	}
858		894
859	sub size_allocate {	895	sub size_allocate {
860	my ($self, $w, $h, $changed) = @_;	896	my ($self, $w, $h) = @_;
861		897
		898	my $child = $self->child;
		899
862	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	900	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	901	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864		902
865	$self->child->configure (0, 0, $w, $h);	903	$self->child->configure (0, 0, $w, $h);
866	$self->update;	904	$self->update;
867	}	905	}
868		906
…		…
904	}	942	}
905		943
906	sub _render {	944	sub _render {
907	my ($self) = @_;	945	my ($self) = @_;
908		946
		947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		949
909	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
910		951
911	$self->SUPER::_render;	952	$self->SUPER::_render;
912	}	953	}
913		954
…		…
916	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
917		958
918	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
919		960
920	sub new {	961	sub new {
921	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
922		965
923	my $self;	966	my $self;
924		967
925	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
926	vertical => 1,	969	vertical => 1,
…		…
931	;	974	;
932		975
933	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
934	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
935	slider => $slider,	978	slider => $slider,
936	@_,	979	%arg,
937	);	980	);
938		981
939	$self->{vp}->add ($self->{scrolled});
940	$self->add ($self->{vp});
941	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
942		984
943	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
944	}	992	}
945		993
946	sub update {	994	sub update {
947	my ($self) = @_;	995	my ($self) = @_;
948		996
…		…
952	my $child = $self->{vp}->child;	1000	my $child = $self->{vp}->child;
953	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954	}	1002	}
955		1003
956	sub size_allocate {	1004	sub size_allocate {
957	my ($self, $w, $h, $changed) = @_;	1005	my ($self, $w, $h) = @_;
958		1006
959	$self->SUPER::size_allocate ($w, $h, $changed);	1007	$self->SUPER::size_allocate ($w, $h);
960		1008
961	my $child = $self->{vp}->child;	1009	my $child = $self->{vp}->child;
962	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1010	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963	}	1011	}
964		1012
…		…
1020	my @border =	1068	my @border =
1021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1022	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1023		1071
1024	sub new {	1072	sub new {
1025	my $class = shift;	1073	my ($class, %arg) = @_;
		1074
		1075	my $title = delete $arg{title};
1026		1076
1027	my $self = $class->SUPER::new (	1077	my $self = $class->SUPER::new (
1028	bg => [1, 1, 1, 1],	1078	bg => [1, 1, 1, 1],
1029	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
1030	border => 0.6,	1080	border => 0.6,
1031	can_events => 1,	1081	can_events => 1,
1032	@_	1082	min_w => 16,
		1083	min_h => 16,
		1084	%arg,
1033	);	1085	);
1034		1086
1035	$self->{title} &&= new CFClient::UI::Label	1087	$self->{title} = new CFClient::UI::Label
1036	align => 0,	1088	align => 0,
1037	valign => 1,	1089	valign => 1,
1038	text => $self->{title},	1090	text => $title,
1039	fontsize => $self->{border};	1091	fontsize => $self->{border}
		1092	if defined $title;
1040		1093
1041	$self	1094	$self
		1095	}
		1096
		1097	sub add {
		1098	my ($self, @widgets) = @_;
		1099
		1100	$self->SUPER::add (@widgets);
		1101	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1042	}	1102	}
1043		1103
1044	sub border {	1104	sub border {
1045	int $_[0]{border} * $::FONTSIZE	1105	int $_[0]{border} * $::FONTSIZE
1046	}	1106	}
1047		1107
1048	sub size_request {	1108	sub size_request {
1049	my ($self) = @_;	1109	my ($self) = @_;
		1110
		1111	$self->{title}->size_request
		1112	if $self->{title};
1050		1113
1051	my ($w, $h) = $self->SUPER::size_request;	1114	my ($w, $h) = $self->SUPER::size_request;
1052		1115
1053	(	1116	(
1054	$w + $self->border * 2,	1117	$w + $self->border * 2,
1055	$h + $self->border * 2,	1118	$h + $self->border * 2,
1056	)	1119	)
1057	}	1120	}
1058		1121
1059	sub size_allocate {	1122	sub size_allocate {
1060	my ($self, $w, $h, $changed) = @_;	1123	my ($self, $w, $h) = @_;
1061		1124
1062	return unless $changed;	1125	if ($self->{title}) {
		1126	$self->{title}{w} = $w;
		1127	$self->{title}{h} = $h;
		1128	$self->{title}->size_allocate ($w, $h);
		1129	}
1063		1130
		1131	my $border = $self->border;
		1132
1064	$h -= List::Util::max 0, $self->border * 2;	1133	$h -= List::Util::max 0, $border * 2;
1065	$w -= List::Util::max 0, $self->border * 2;	1134	$w -= List::Util::max 0, $border * 2;
1066		1135
1067	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1068	if $self->{title};
1069
1070	$self->child->configure ($self->border, $self->border, $w, $h);	1136	$self->child->configure ($border, $border, $w, $h);
1071	}	1137	}
1072		1138
1073	sub button_down {	1139	sub button_down {
1074	my ($self, $ev, $x, $y) = @_;	1140	my ($self, $ev, $x, $y) = @_;
1075		1141
…		…
1094	my $dy = $ev->{y} - $oy;	1160	my $dy = $ev->{y} - $oy;
1095		1161
1096	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1097	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1098		1164
		1165	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1099	$self->realloc;	1166	$self->realloc;
1100	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1101	};	1167	};
1102		1168
1103	} elsif ($lr ^ $td) {	1169	} elsif ($lr ^ $td) {
1104	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1105	my ($bx, $by) = ($self->{x}, $self->{y});	1171	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1108	my ($ev, $x, $y) = @_;	1174	my ($ev, $x, $y) = @_;
1109		1175
1110	($x, $y) = ($ev->{x}, $ev->{y});	1176	($x, $y) = ($ev->{x}, $ev->{y});
1111		1177
1112	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1179	# HACK: the next line is required to enforce placement
		1180	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1113	};	1181	};
		1182	} else {
		1183	return 0;
		1184	}
		1185
1114	}	1186	1
1115	}	1187	}
1116		1188
1117	sub button_up {	1189	sub button_up {
1118	my ($self, $ev, $x, $y) = @_;	1190	my ($self, $ev, $x, $y) = @_;
1119		1191
1120	delete $self->{motion};	1192	!!delete $self->{motion}
1121	}	1193	}
1122		1194
1123	sub mouse_motion {	1195	sub mouse_motion {
1124	my ($self, $ev, $x, $y) = @_;	1196	my ($self, $ev, $x, $y) = @_;
1125		1197
1126	$self->{motion}->($ev, $x, $y) if $self->{motion};	1198	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1199
		1200	!!$self->{motion}
1127	}	1201	}
1128		1202
1129	sub _draw {	1203	sub _draw {
1130	my ($self) = @_;	1204	my ($self) = @_;
1131		1205
		1206	my $child = $self->{children}[0];
		1207
1132	my ($w, $h ) = ($self->{w}, $self->{h});	1208	my ($w, $h ) = ($self->{w}, $self->{h});
1133	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1209	my ($cw, $ch) = ($child->{w}, $child->{h});
1134		1210
1135	glEnable GL_TEXTURE_2D;	1211	glEnable GL_TEXTURE_2D;
1136	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1212	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1137		1213
1138	my $border = $self->border;	1214	my $border = $self->border;
…		…
1153	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1229	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154	}	1230	}
1155		1231
1156	glDisable GL_TEXTURE_2D;	1232	glDisable GL_TEXTURE_2D;
1157		1233
1158	$self->{title}->draw if $self->{title};
1159
1160	$self->child->draw;	1234	$child->draw;
		1235
		1236	if ($self->{title}) {
		1237	glTranslate 0, $border - $self->{h};
		1238	$self->{title}->_draw;
		1239	}
1161	}	1240	}
1162		1241
1163	#############################################################################	1242	#############################################################################
1164		1243
1165	package CFClient::UI::Table;	1244	package CFClient::UI::Table;
…		…
1239	(sum @$hs),	1318	(sum @$hs),
1240	)	1319	)
1241	}	1320	}
1242		1321
1243	sub size_allocate {	1322	sub size_allocate {
1244	my ($self, $w, $h, $changed) = @_;	1323	my ($self, $w, $h) = @_;
1245		1324
1246	my ($ws, $hs) = $self->get_wh;	1325	my ($ws, $hs) = $self->get_wh;
1247		1326
1248	my $req_w = (sum @$ws) || 1;	1327	my $req_w = (sum @$ws) || 1;
1249	my $req_h = (sum @$hs) || 1;	1328	my $req_h = (sum @$hs) || 1;
…		…
1327	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1406	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1328	)	1407	)
1329	}	1408	}
1330		1409
1331	sub size_allocate {	1410	sub size_allocate {
1332	my ($self, $w, $h, $changed) = @_;	1411	my ($self, $w, $h) = @_;
1333		1412
1334	my $space = $self->{vertical} ? $h : $w;	1413	my $space = $self->{vertical} ? $h : $w;
1335	my $children = $self->{children};	1414	my $children = $self->{children};
1336		1415
1337	my @req;	1416	my @req;
…		…
1420	ellipsise => 3, # end	1499	ellipsise => 3, # end
1421	layout => (new CFClient::Layout),	1500	layout => (new CFClient::Layout),
1422	fontsize => 1,	1501	fontsize => 1,
1423	align => -1,	1502	align => -1,
1424	valign => -1,	1503	valign => -1,
1425	padding => 2,	1504	padding_x => 2,
		1505	padding_y => 2,
1426	can_events => 0,	1506	can_events => 0,
1427	%arg	1507	%arg
1428	);	1508	);
1429		1509
1430	if (exists $self->{template}) {	1510	if (exists $self->{template}) {
…		…
1506		1586
1507	$w = List::Util::max $w, $w2;	1587	$w = List::Util::max $w, $w2;
1508	$h = List::Util::max $h, $h2;	1588	$h = List::Util::max $h, $h2;
1509	}	1589	}
1510		1590
1511	(	1591	($w, $h)
1512	$w + $self->{padding} * 2,
1513	$h + $self->{padding} * 2,
1514	)
1515	}	1592	}
1516		1593
1517	sub size_allocate {	1594	sub size_allocate {
1518	my ($self, $w, $h, $changed) = @_;	1595	my ($self, $w, $h) = @_;
		1596
		1597	delete $self->{ox};
1519		1598
1520	delete $self->{texture}	1599	delete $self->{texture}
1521	if $changed;	1600	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522	}	1601	}
1523		1602
1524	sub set_fontsize {	1603	sub set_fontsize {
1525	my ($self, $fontsize) = @_;	1604	my ($self, $fontsize) = @_;
1526		1605
…		…
1541	$self->{layout}->set_width ($self->{w});	1620	$self->{layout}->set_width ($self->{w});
1542	$self->{layout}->set_ellipsise ($self->{ellipsise});	1621	$self->{layout}->set_ellipsise ($self->{ellipsise});
1543	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1622	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1623	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545		1624
1546	my $tex = new_from_layout CFClient::Texture $self->{layout};	1625	new_from_layout CFClient::Texture $self->{layout}
		1626	};
1547		1627
		1628	unless (exists $self->{ox}) {
1548	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1629	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1630	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550	: ($self->{w} - $tex->{w}) * 0.5);	1631	: ($self->{w} - $tex->{w}) * 0.5);
1551		1632
1552	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1633	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1634	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554	: ($self->{h} - $tex->{h}) * 0.5);	1635	: ($self->{h} - $tex->{h}) * 0.5);
1555
1556	$tex
1557	};	1636	};
1558		1637
1559	glEnable GL_TEXTURE_2D;	1638	glEnable GL_TEXTURE_2D;
1560	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1639	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561		1640
…		…
1599		1678
1600	delete $self->{cur_h};	1679	delete $self->{cur_h};
1601		1680
1602	return if $self->{text} eq $text;	1681	return if $self->{text} eq $text;
1603		1682
1604	delete $self->{texture};
1605
1606	$self->{last_activity} = $::NOW;	1683	$self->{last_activity} = $::NOW;
1607	$self->{text} = $text;	1684	$self->{text} = $text;
1608		1685
1609	$text =~ s/./*/g if $self->{hidden};	1686	$text =~ s/./*/g if $self->{hidden};
1610	$self->{layout}->set_text ("$text ");	1687	$self->{layout}->set_text ("$text ");
1611		1688
1612	$self->_emit (changed => $self->{text});	1689	$self->_emit (changed => $self->{text});
		1690	$self->update;
1613	}	1691	}
1614		1692
1615	sub set_text {	1693	sub set_text {
1616	my ($self, $text) = @_;	1694	my ($self, $text) = @_;
1617		1695
…		…
1656	$self->{cursor} = length $text;	1734	$self->{cursor} = length $text;
1657	} elsif ($uni == 27) {	1735	} elsif ($uni == 27) {
1658	$self->_emit ('escape');	1736	$self->_emit ('escape');
1659	} elsif ($uni) {	1737	} elsif ($uni) {
1660	substr $text, $self->{cursor}++, 0, chr $uni;	1738	substr $text, $self->{cursor}++, 0, chr $uni;
		1739	} else {
		1740	return 0;
1661	}	1741	}
1662		1742
1663	$self->_set_text ($text);	1743	$self->_set_text ($text);
1664		1744
1665	$self->realloc;	1745	$self->realloc;
		1746
		1747	1
1666	}	1748	}
1667		1749
1668	sub focus_in {	1750	sub focus_in {
1669	my ($self) = @_;	1751	my ($self) = @_;
1670		1752
…		…
1685	utf8::encode $text;	1767	utf8::encode $text;
1686	$self->{cursor} = length substr $text, 0, $idx;	1768	$self->{cursor} = length substr $text, 0, $idx;
1687		1769
1688	$self->_set_text ($self->{text});	1770	$self->_set_text ($self->{text});
1689	$self->update;	1771	$self->update;
		1772
		1773	1
1690	}	1774	}
1691		1775
1692	sub mouse_motion {	1776	sub mouse_motion {
1693	my ($self, $ev, $x, $y) = @_;	1777	my ($self, $ev, $x, $y) = @_;
1694	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1778	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1779
		1780	0
1695	}	1781	}
1696		1782
1697	sub _draw {	1783	sub _draw {
1698	my ($self) = @_;	1784	my ($self) = @_;
1699		1785
…		…
1776	} else {	1862	} else {
1777	$self->set_text ($self->{history_saveback});	1863	$self->set_text ($self->{history_saveback});
1778	}	1864	}
1779		1865
1780	} else {	1866	} else {
1781	$self->SUPER::key_down ($ev);	1867	return $self->SUPER::key_down ($ev)
		1868	}
		1869
1782	}	1870	1
1783
1784	}	1871	}
1785		1872
1786	#############################################################################	1873	#############################################################################
1787		1874
1788	package CFClient::UI::Button;	1875	package CFClient::UI::Button;
…		…
1797		1884
1798	sub new {	1885	sub new {
1799	my $class = shift;	1886	my $class = shift;
1800		1887
1801	$class->SUPER::new (	1888	$class->SUPER::new (
1802	padding => 4,	1889	padding_x => 4,
		1890	padding_y => 4,
1803	fg => [1, 1, 1],	1891	fg => [1, 1, 1],
1804	active_fg => [0, 0, 1],	1892	active_fg => [0, 0, 1],
1805	can_hover => 1,	1893	can_hover => 1,
1806	align => 0,	1894	align => 0,
1807	valign => 0,	1895	valign => 0,
…		…
1816	my ($self, $ev, $x, $y) = @_;	1904	my ($self, $ev, $x, $y) = @_;
1817		1905
1818	$self->emit ("activate")	1906	$self->emit ("activate")
1819	if $x >= 0 && $x < $self->{w}	1907	if $x >= 0 && $x < $self->{w}
1820	&& $y >= 0 && $y < $self->{h};	1908	&& $y >= 0 && $y < $self->{h};
		1909
		1910	1
1821	}	1911	}
1822		1912
1823	sub _draw {	1913	sub _draw {
1824	my ($self) = @_;	1914	my ($self) = @_;
1825		1915
…		…
1854		1944
1855	sub new {	1945	sub new {
1856	my $class = shift;	1946	my $class = shift;
1857		1947
1858	$class->SUPER::new (	1948	$class->SUPER::new (
1859	padding => 2,	1949	padding_x => 2,
		1950	padding_y => 2,
1860	fg => [1, 1, 1],	1951	fg => [1, 1, 1],
1861	active_fg => [1, 1, 0],	1952	active_fg => [1, 1, 0],
1862	bg => [0, 0, 0, 0.2],	1953	bg => [0, 0, 0, 0.2],
1863	active_bg => [1, 1, 1, 0.5],	1954	active_bg => [1, 1, 1, 0.5],
1864	state => 0,	1955	state => 0,
…		…
1868	}	1959	}
1869		1960
1870	sub size_request {	1961	sub size_request {
1871	my ($self) = @_;	1962	my ($self) = @_;
1872		1963
1873	($self->{padding} * 2 + 6) x 2	1964	(6) x 2
1874	}	1965	}
1875		1966
1876	sub button_down {	1967	sub button_down {
1877	my ($self, $ev, $x, $y) = @_;	1968	my ($self, $ev, $x, $y) = @_;
1878		1969
1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1970	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1971	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881	$self->{state} = !$self->{state};	1972	$self->{state} = !$self->{state};
1882	$self->_emit (changed => $self->{state});	1973	$self->_emit (changed => $self->{state});
		1974	} else {
		1975	return 0
		1976	}
		1977
1883	}	1978	1
1884	}	1979	}
1885		1980
1886	sub _draw {	1981	sub _draw {
1887	my ($self) = @_;	1982	my ($self) = @_;
1888		1983
1889	$self->SUPER::_draw;	1984	$self->SUPER::_draw;
1890		1985
1891	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1986	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892		1987
1893	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1988	my ($w, $h) = @$self{qw(w h)};
		1989
		1990	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894		1991
1895	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1992	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896		1993
1897	my $tex = $self->{state} ? $tex[1] : $tex[0];	1994	my $tex = $self->{state} ? $tex[1] : $tex[0];
1898		1995
…		…
2224		2321
2225	$self->SUPER::button_down ($ev, $x, $y);	2322	$self->SUPER::button_down ($ev, $x, $y);
2226		2323
2227	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2324	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2228		2325
2229	$self->mouse_motion ($ev, $x, $y);	2326	$self->mouse_motion ($ev, $x, $y)
2230	}	2327	}
2231		2328
2232	sub mouse_motion {	2329	sub mouse_motion {
2233	my ($self, $ev, $x, $y) = @_;	2330	my ($self, $ev, $x, $y) = @_;
2234		2331
…		…
2238	my (undef, $lo, $hi, $page) = @{$self->{range}};	2335	my (undef, $lo, $hi, $page) = @{$self->{range}};
2239		2336
2240	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2337	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2241		2338
2242	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2339	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2340	} else {
		2341	return 0;
		2342	}
		2343
2243	}	2344	1
2244	}	2345	}
2245		2346
2246	sub update {	2347	sub update {
2247	my ($self) = @_;	2348	my ($self) = @_;
2248		2349
2249	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2350	delete $self->{knob_w};
		2351	$self->SUPER::update;
		2352	}
		2353
		2354	sub _draw {
		2355	my ($self) = @_;
		2356
		2357	unless ($self->{knob_w}) {
2250	$self->set_value ($self->{range}[0]);	2358	$self->set_value ($self->{range}[0]);
2251		2359
2252	my ($value, $lo, $hi, $page) = @{$self->{range}};	2360	my ($value, $lo, $hi, $page) = @{$self->{range}};
2253	my $range = ($hi - $page - $lo) || 1e-100;	2361	my $range = ($hi - $page - $lo) || 1e-100;
2254		2362
…		…
2260	$value = ($value - $lo) / $range;	2368	$value = ($value - $lo) / $range;
2261	$value = $value * $self->{scale} + $self->{offset};	2369	$value = $value * $self->{scale} + $self->{offset};
2262		2370
2263	$self->{knob_x} = $value - $knob_w * 0.5;	2371	$self->{knob_x} = $value - $knob_w * 0.5;
2264	$self->{knob_w} = $knob_w;	2372	$self->{knob_w} = $knob_w;
2265	});	2373	}
2266
2267	$self->SUPER::update;
2268	}
2269
2270	sub _draw {
2271	my ($self) = @_;
2272		2374
2273	$self->SUPER::_draw ();	2375	$self->SUPER::_draw ();
2274		2376
2275	glScale $self->{w}, $self->{h};	2377	glScale $self->{w}, $self->{h};
2276		2378
…		…
2374	$self->{fontsize} = $fontsize;	2476	$self->{fontsize} = $fontsize;
2375	$self->reflow;	2477	$self->reflow;
2376	}	2478	}
2377		2479
2378	sub size_allocate {	2480	sub size_allocate {
2379	my ($self, $w, $h, $changed) = @_;	2481	my ($self, $w, $h) = @_;
2380		2482
2381	$self->SUPER::size_allocate ($w, $h, $changed);	2483	$self->SUPER::size_allocate ($w, $h);
2382
2383	return unless $changed;
2384		2484
2385	$self->{layout}->set_font ($self->{font}) if $self->{font};	2485	$self->{layout}->set_font ($self->{font}) if $self->{font};
2386	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2486	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387	$self->{layout}->set_width ($self->{children}[0]{w});	2487	$self->{layout}->set_width ($self->{children}[0]{w});
2388		2488
…		…
2611	}	2711	}
2612		2712
2613	sub set_tooltip_from {	2713	sub set_tooltip_from {
2614	my ($self, $widget) = @_;	2714	my ($self, $widget) = @_;
2615		2715
		2716	my $tooltip = $widget->{tooltip};
		2717
		2718	if ($ENV{CFPLUS_DEBUG} & 2) {
		2719	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2720	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2721	. "req $widget->{req_w} $widget->{req_h}\n"
		2722	. "visible $widget->{visible}";
		2723	}
		2724
2616	$self->add (new CFClient::UI::Label	2725	$self->add (new CFClient::UI::Label
2617	markup => $widget->{tooltip},	2726	markup => $tooltip,
2618	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2727	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619	fontsize => 0.8,	2728	fontsize => 0.8,
2620	fg => [0, 0, 0, 1],	2729	fg => [0, 0, 0, 1],
2621	ellipsise => 0,	2730	ellipsise => 0,
2622	font => ($widget->{tooltip_font} || $::FONT_PROP),	2731	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2630		2739
2631	($w + 4, $h + 4)	2740	($w + 4, $h + 4)
2632	}	2741	}
2633		2742
2634	sub size_allocate {	2743	sub size_allocate {
2635	my ($self, $w, $h, $changed) = @_;	2744	my ($self, $w, $h) = @_;
2636		2745
2637	return unless $changed;
2638
2639	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2746	$self->SUPER::size_allocate ($w - 4, $h - 4);
2640	}	2747	}
2641		2748
2642	sub visibility_change {	2749	sub visibility_change {
2643	my ($self, $visible) = @_;	2750	my ($self, $visible) = @_;
2644		2751
…		…
2765	$self->SUPER::DESTROY;	2872	$self->SUPER::DESTROY;
2766	}	2873	}
2767		2874
2768	#############################################################################	2875	#############################################################################
2769		2876
2770	package CFClient::UI::Inventory;	2877	package CFClient::UI::Buttonbar;
2771		2878
2772	our @ISA = CFClient::UI::ScrolledWindow::;	2879	our @ISA = CFClient::UI::HBox::;
2773		2880
2774	sub new {	2881	# TODO: should actualyl wrap buttons and other goodies.
2775	my $class = shift;
2776
2777	my $self = $class->SUPER::new (
2778	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2779	@_,
2780	);
2781
2782	$self
2783	}
2784
2785	sub set_items {
2786	my ($self, $items) = @_;
2787
2788	$self->{scrolled}->clear;
2789	return unless $items;
2790
2791	my @items = sort {
2792	($a->{type} <=> $b->{type})
2793	or ($a->{name} cmp $b->{name})
2794	} @$items;
2795
2796	$self->{real_items} = \@items;
2797
2798	my $row = 0;
2799	for my $item (@items) {
2800	CFClient::Item::update_widgets $item;
2801
2802	$self->{scrolled}->add (0, $row, $item->{face_widget});
2803	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2804	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2805
2806	$row++;
2807	}
2808	}
2809		2882
2810	#############################################################################	2883	#############################################################################
2811		2884
2812	package CFClient::UI::Menu;	2885	package CFClient::UI::Menu;
2813		2886
…		…
2854	# maybe save $GRAB? must be careful about events...	2927	# maybe save $GRAB? must be careful about events...
2855	$GRAB = $self;	2928	$GRAB = $self;
2856	$self->{button} = $ev->{button};	2929	$self->{button} = $ev->{button};
2857		2930
2858	$self->show;	2931	$self->show;
2859	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2932	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2860	}	2933	}
2861		2934
2862	sub mouse_motion {	2935	sub mouse_motion {
2863	my ($self, $ev, $x, $y) = @_;	2936	my ($self, $ev, $x, $y) = @_;
2864		2937
2865	# TODO: should use vbox->find_widget or so	2938	# TODO: should use vbox->find_widget or so
2866	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2939	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2867	$self->{hover} = $self->{item}{$HOVER};	2940	$self->{hover} = $self->{item}{$HOVER};
		2941
		2942	0
2868	}	2943	}
2869		2944
2870	sub button_up {	2945	sub button_up {
2871	my ($self, $ev, $x, $y) = @_;	2946	my ($self, $ev, $x, $y) = @_;
2872		2947
…		…
2874	undef $GRAB;	2949	undef $GRAB;
2875	$self->hide;	2950	$self->hide;
2876		2951
2877	$self->_emit ("popdown");	2952	$self->_emit ("popdown");
2878	$self->{hover}[1]->() if $self->{hover};	2953	$self->{hover}[1]->() if $self->{hover};
		2954	} else {
		2955	return 0
		2956	}
		2957
		2958	1
		2959	}
		2960
		2961	#############################################################################
		2962
		2963	package CFClient::UI::Multiplexer;
		2964
		2965	our @ISA = CFClient::UI::Container::;
		2966
		2967	sub new {
		2968	my $class = shift;
		2969
		2970	my $self = $class->SUPER::new (
		2971	@_,
		2972	);
		2973
		2974	$self->{current} = $self->{children}[0]
		2975	if @{ $self->{children} };
		2976
		2977	$self
		2978	}
		2979
		2980	sub add {
		2981	my ($self, @widgets) = @_;
		2982
		2983	$self->SUPER::add (@widgets);
		2984
		2985	$self->{current} = $self->{children}[0]
		2986	if @{ $self->{children} };
		2987	}
		2988
		2989	sub set_current_page {
		2990	my ($self, $page_or_widget) = @_;
		2991
		2992	my $widget = ref $page_or_widget
		2993	? $page_or_widget
		2994	: $self->{children}[$page_or_widget];
		2995
		2996	$self->{current} = $widget;
		2997	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2998
		2999	$self->_emit (page_changed => $self->{current});
		3000
		3001	$self->realloc;
		3002	}
		3003
		3004	sub visible_children {
		3005	$_[0]{current}
		3006	}
		3007
		3008	sub size_request {
		3009	my ($self) = @_;
		3010
		3011	$self->{current}->size_request
		3012	}
		3013
		3014	sub size_allocate {
		3015	my ($self, $w, $h) = @_;
		3016
		3017	$self->{current}->configure (0, 0, $w, $h);
		3018	}
		3019
		3020	sub _draw {
		3021	my ($self) = @_;
		3022
		3023	$self->{current}->draw;
		3024	}
		3025
		3026	#############################################################################
		3027
		3028	package CFClient::UI::Notebook;
		3029
		3030	our @ISA = CFClient::UI::VBox::;
		3031
		3032	sub new {
		3033	my $class = shift;
		3034
		3035	my $self = $class->SUPER::new (
		3036	buttonbar => (new CFClient::UI::Buttonbar),
		3037	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3038	# filter => # will be put between multiplexer and $self
		3039	@_,
		3040	);
2879	}	3041
		3042	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3043	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3044
		3045	$self
		3046	}
		3047
		3048	sub add {
		3049	my ($self, $title, $widget, $tooltip) = @_;
		3050
		3051	Scalar::Util::weaken $self;
		3052
		3053	$self->{buttonbar}->add (new CFClient::UI::Button
		3054	markup => $title,
		3055	tooltip => $tooltip,
		3056	on_activate => sub { $self->set_current_page ($widget) },
		3057	);
		3058
		3059	$self->{multiplexer}->add ($widget);
		3060	}
		3061
		3062	sub set_current_page {
		3063	my ($self, $page) = @_;
		3064
		3065	$self->{multiplexer}->set_current_page ($page);
		3066	$self->_emit (page_changed => $self->{multiplexer}{current});
2880	}	3067	}
2881		3068
2882	#############################################################################	3069	#############################################################################
2883		3070
2884	package CFClient::UI::Statusbox;	3071	package CFClient::UI::Statusbox;
…		…
2989	$self->SUPER::reconfigure;	3176	$self->SUPER::reconfigure;
2990	}	3177	}
2991		3178
2992	#############################################################################	3179	#############################################################################
2993		3180
		3181	package CFClient::UI::Inventory;
		3182
		3183	our @ISA = CFClient::UI::ScrolledWindow::;
		3184
		3185	sub new {
		3186	my $class = shift;
		3187
		3188	my $self = $class->SUPER::new (
		3189	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3190	@_,
		3191	);
		3192
		3193	$self
		3194	}
		3195
		3196	sub set_items {
		3197	my ($self, $items) = @_;
		3198
		3199	$self->{child}->clear;
		3200	return unless $items;
		3201
		3202	my @items = sort {
		3203	($a->{type} <=> $b->{type})
		3204	or ($a->{name} cmp $b->{name})
		3205	} @$items;
		3206
		3207	$self->{real_items} = \@items;
		3208
		3209	my $row = 0;
		3210	for my $item (@items) {
		3211	CFClient::Item::update_widgets $item;
		3212
		3213	$self->{child}->add (0, $row, $item->{face_widget});
		3214	$self->{child}->add (1, $row, $item->{desc_widget});
		3215	$self->{child}->add (2, $row, $item->{weight_widget});
		3216
		3217	$row++;
		3218	}
		3219	}
		3220
		3221	#############################################################################
		3222
		3223	package CFClient::UI::BindEditor;
		3224
		3225	our @ISA = CFClient::UI::FancyFrame::;
		3226
		3227	sub new {
		3228	my $class = shift;
		3229
		3230	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3231
		3232	$self->add (my $vb = new CFClient::UI::VBox);
		3233
		3234
		3235	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3236	text => "start recording",
		3237	tooltip => "Start/Stops recording of actions."
		3238	."All subsequent actions after the recording started will be captured."
		3239	."The actions are displayed after the record was stopped."
		3240	."To bind the action you have to click on the 'Bind' button",
		3241	on_activate => sub {
		3242	unless ($self->{recording}) {
		3243	$self->start;
		3244	} else {
		3245	$self->stop;
		3246	}
		3247	});
		3248
		3249	$vb->add (new CFClient::UI::Label text => "Actions:");
		3250	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3251
		3252	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3253	$vb->add (my $hb = new CFClient::UI::HBox);
		3254	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3255	$hb->add (new CFClient::UI::Button
		3256	text => "bind",
		3257	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3258	on_activate => sub {
		3259	$self->ask_for_bind;
		3260	});
		3261
		3262	$vb->add (my $hb = new CFClient::UI::HBox);
		3263	$hb->add (new CFClient::UI::Button
		3264	text => "ok",
		3265	expand => 1,
		3266	tooltip => "This closes the binding editor and saves the binding",
		3267	on_activate => sub {
		3268	$self->hide;
		3269	$self->commit;
		3270	});
		3271
		3272	$hb->add (new CFClient::UI::Button
		3273	text => "cancel",
		3274	expand => 1,
		3275	tooltip => "This closes the binding editor without saving",
		3276	on_activate => sub {
		3277	$self->hide;
		3278	$self->{binding_cancel}->()
		3279	if $self->{binding_cancel};
		3280	});
		3281
		3282	$self->update_binding_widgets;
		3283
		3284	$self
		3285	}
		3286
		3287	sub commit {
		3288	my ($self) = @_;
		3289	my ($mod, $sym, $cmds) = $self->get_binding;
		3290	if ($sym != 0 && @$cmds > 0) {
		3291	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3292	."'. Don't forget 'Save Config'!");
		3293	$self->{binding_change}->($mod, $sym, $cmds)
		3294	if $self->{binding_change};
		3295	} else {
		3296	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3297	$self->{binding_cancel}->()
		3298	if $self->{binding_cancel};
		3299	}
		3300	}
		3301
		3302	sub start {
		3303	my ($self) = @_;
		3304
		3305	$self->{rec_btn}->set_text ("stop recording");
		3306	$self->{recording} = 1;
		3307	$self->clear_command_list;
		3308	$::CONN->start_record if $::CONN;
		3309	}
		3310
		3311	sub stop {
		3312	my ($self) = @_;
		3313
		3314	$self->{rec_btn}->set_text ("start recording");
		3315	$self->{recording} = 0;
		3316
		3317	my $rec;
		3318	$rec = $::CONN->stop_record if $::CONN;
		3319	return unless ref $rec eq 'ARRAY';
		3320	$self->set_command_list ($rec);
		3321	}
		3322
		3323
		3324	sub ask_for_bind_and_commit {
		3325	my ($self) = @_;
		3326	$self->ask_for_bind (1);
		3327	}
		3328
		3329	sub ask_for_bind {
		3330	my ($self, $commit) = @_;
		3331
		3332	CFClient::Binder::open_binding_dialog (sub {
		3333	my ($mod, $sym) = @_;
		3334	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3335	$self->update_binding_widgets;
		3336	$self->commit if $commit;
		3337	});
		3338	}
		3339
		3340	# $mod and $sym are the modifiers and key symbol
		3341	# $cmds is a array ref of strings (the commands)
		3342	# $cb is the callback that is executed on OK
		3343	# $ccb is the callback that is executed on CANCEL and
		3344	# when the binding was unsuccessful on OK
		3345	sub set_binding {
		3346	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3347
		3348	$self->clear_command_list;
		3349	$self->{recording} = 0;
		3350	$self->{rec_btn}->set_text ("start recording");
		3351
		3352	$self->{binding} = [$mod, $sym];
		3353	$self->{commands} = $cmds;
		3354
		3355	$self->{binding_change} = $cb;
		3356	$self->{binding_cancel} = $ccb;
		3357
		3358	$self->update_binding_widgets;
		3359	}
		3360
		3361	# this is a shortcut method that asks for a binding
		3362	# and then just binds it.
		3363	sub do_quick_binding {
		3364	my ($self, $cmds) = @_;
		3365	$self->set_binding (undef, undef, $cmds, sub {
		3366	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3367	});
		3368	$self->ask_for_bind (1);
		3369	}
		3370
		3371	sub update_binding_widgets {
		3372	my ($self) = @_;
		3373	my ($mod, $sym, $cmds) = $self->get_binding;
		3374	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3375	$self->set_command_list ($cmds);
		3376	}
		3377
		3378	sub get_binding {
		3379	my ($self) = @_;
		3380	return (
		3381	$self->{binding}->[0],
		3382	$self->{binding}->[1],
		3383	[ grep { defined $_ } @{$self->{commands}} ]
		3384	);
		3385	}
		3386
		3387	sub clear_command_list {
		3388	my ($self) = @_;
		3389	$self->{cmdbox}->clear ();
		3390	}
		3391
		3392	sub set_command_list {
		3393	my ($self, $cmds) = @_;
		3394
		3395	$self->{cmdbox}->clear ();
		3396	$self->{commands} = $cmds;
		3397
		3398	my $idx = 0;
		3399
		3400	for (@$cmds) {
		3401	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3402
		3403	my $i = $idx;
		3404	$hb->add (new CFClient::UI::Label text => $_);
		3405	$hb->add (new CFClient::UI::Button
		3406	text => "delete",
		3407	tooltip => "Deletes the action from the record",
		3408	on_activate => sub {
		3409	$self->{cmdbox}->remove ($hb);
		3410	$cmds->[$i] = undef;
		3411	});
		3412
		3413
		3414	$idx++
		3415	}
		3416	}
		3417
		3418	#############################################################################
		3419
		3420	package CFClient::UI::SpellList;
		3421
		3422	our @ISA = CFClient::UI::Table::;
		3423
		3424	sub new {
		3425	my $class = shift;
		3426
		3427	my $self = $class->SUPER::new (
		3428	binding => [],
		3429	commands => [],
		3430	@_,
		3431	)
		3432	}
		3433
		3434	# XXX: Do sorting? Argl...
		3435	sub add_spell {
		3436	my ($self, $spell) = @_;
		3437	$self->{spells}->{$spell->{name}} = $spell;
		3438
		3439	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3440	face => $spell->{face},
		3441	can_hover => 1,
		3442	can_events => 1,
		3443	tooltip => $spell->{message});
		3444
		3445	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3446	text => $spell->{name},
		3447	can_hover => 1,
		3448	can_events => 1,
		3449	tooltip => $spell->{message},
		3450	expand => 1);
		3451
		3452	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3453	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3454	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3455	expand => 1);
		3456
		3457	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3458	text => "bind to key",
		3459	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3460	}
		3461
		3462	sub rebuild_spell_list {
		3463	my ($self) = @_;
		3464	$self->{tbl_idx} = 0;
		3465	$self->add_spell ($_) for values %{$self->{spells}};
		3466	}
		3467
		3468	sub remove_spell {
		3469	my ($self, $spell) = @_;
		3470	delete $self->{spells}->{$spell->{name}};
		3471	$self->rebuild_spell_list;
		3472	}
		3473
		3474	#############################################################################
		3475
2994	package CFClient::UI::Root;	3476	package CFClient::UI::Root;
2995		3477
2996	our @ISA = CFClient::UI::Container::;	3478	our @ISA = CFClient::UI::Container::;
2997		3479
2998	use CFClient::OpenGL;	3480	use CFClient::OpenGL;
…		…
3008	Scalar::Util::weaken ($self->{root} = $self);	3490	Scalar::Util::weaken ($self->{root} = $self);
3009		3491
3010	$self	3492	$self
3011	}	3493	}
3012		3494
3013	sub configure {
3014	my ($self, $x, $y, $w, $h) = @_;
3015
3016	$self->{w} = $w;
3017	$self->{h} = $h;
3018	}
3019
3020	sub reconfigure {
3021	my ($self) = @_;
3022
3023	$self->SUPER::reconfigure;
3024
3025	$self->size_allocate ($self->{w}, $self->{h}, 1)
3026	if $self->{w};
3027	}
3028
3029	sub size_request {	3495	sub size_request {
3030	my ($self) = @_;	3496	my ($self) = @_;
3031		3497
3032	($self->{w}, $self->{h})	3498	($self->{w}, $self->{h})
3033	}	3499	}
…		…
3045		3511
3046	int $coord + 0.5	3512	int $coord + 0.5
3047	}	3513	}
3048		3514
3049	sub size_allocate {	3515	sub size_allocate {
3050	my ($self, $w, $h, $changed) = @_;	3516	my ($self, $w, $h) = @_;
3051		3517
3052	for my $child ($self->children) {	3518	for my $child ($self->children) {
3053	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3519	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3054		3520
3055	$X = $child->{force_x} if exists $child->{force_x};	3521	$X = $child->{force_x} if exists $child->{force_x};
…		…
3123	$_->()	3589	$_->()
3124	for values %{delete $self->{refresh_hook}};	3590	for values %{delete $self->{refresh_hook}};
3125	}	3591	}
3126		3592
3127	if ($self->{realloc}) {	3593	if ($self->{realloc}) {
		3594	my %queue;
3128	my @queue;	3595	my @queue;
		3596	my $widget;
3129		3597
		3598	outer:
3130	while () {	3599	while () {
3131	if ($self->{realloc}) {	3600	if (my $realloc = delete $self->{realloc}) {
3132	#TODO use array-of-depth approach	3601	for $widget (values %$realloc) {
		3602	$widget->{visible} or next; # do not resize invisible widgets
3133		3603
3134	@queue = sort { $a->{visible} <=> $b->{visible} }	3604	$queue{$widget+0}++ and next; # duplicates are common
3135	@queue, values %{delete $self->{realloc}};	3605
		3606	push @{ $queue[$widget->{visible}] }, $widget;
		3607	}
3136	}	3608	}
3137		3609
		3610	while () {
		3611	@queue or last outer;
		3612
3138	my $widget = pop @queue || last;	3613	$widget = pop @{ $queue[-1] || [] }
		3614	and last;
		3615
		3616	pop @queue;
		3617	}
3139		3618
3140	$widget->{visible} or last; # do not resize invisible widgets	3619	delete $queue{$widget+0};
3141		3620
3142	my ($w, $h) = $widget->size_request;	3621	my ($w, $h) = $widget->size_request;
3143		3622
3144	my $min_size = $widget->{is_toplevel} ? 16 : 0;
3145
3146	$w = List::Util::max $widget->{min_w} || $widget->{is_toplevel} * 16, $w;	3623	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3147	$h = List::Util::max $widget->{min_h} || $widget->{is_toplevel} * 16, $h;	3624	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3148		3625
3149	$w = $widget->{force_w} if exists $widget->{force_w};	3626	$w = $widget->{force_w} if exists $widget->{force_w};
3150	$h = $widget->{force_h} if exists $widget->{force_h};	3627	$h = $widget->{force_h} if exists $widget->{force_h};
3151		3628
		3629	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3630	|| delete $widget->{force_realloc}) {
3152	$widget->{req_w} = $w;	3631	$widget->{req_w} = $w;
3153	$widget->{req_h} = $h;	3632	$widget->{req_h} = $h;
3154		3633
3155	$self->{size_alloc}{$widget} = [$widget, undef, undef];	3634	$self->{size_alloc}{$widget+0} = $widget;
3156		3635
3157	push @queue, $widget->{parent}	3636	if (my $parent = $widget->{parent}) {
3158	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};	3637	$self->{realloc}{$parent+0} = $parent
		3638	unless $queue{$parent+0};
		3639
		3640	$parent->{force_size_alloc} = 1;
		3641	$self->{size_alloc}{$parent+0} = $parent;
		3642	}
		3643	}
		3644
		3645	delete $self->{realloc}{$widget+0};
3159	}	3646	}
3160	}	3647	}
3161		3648
3162	while (my $size_alloc = delete $self->{size_alloc}) {	3649	while (my $size_alloc = delete $self->{size_alloc}) {
3163	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	3650	my @queue = sort { $b->{visible} <=> $a->{visible} }
3164	values %$size_alloc;	3651	values %$size_alloc;
3165		3652
3166	while () {	3653	while () {
3167	my ($widget, $w, $h) = @{ pop @queue or last };	3654	my $widget = pop @queue || last;
3168		3655
3169	$w = $widget->{w} || $widget->{req_w} unless defined $w;	3656	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3170	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3171		3657
3172	$w = 0 if $w < 0;	3658	$w = 0 if $w < 0;
3173	$h = 0 if $h < 0;	3659	$h = 0 if $h < 0;
3174		3660
3175	$w = int $w + 0.5;	3661	$w = int $w + 0.5;
3176	$h = int $h + 0.5;	3662	$h = int $h + 0.5;
3177		3663
3178	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3664	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3665	$widget->{old_w} = $widget->{w};
		3666	$widget->{old_h} = $widget->{h};
3179		3667
3180	$widget->{w} = $w;	3668	$widget->{w} = $w;
3181	$widget->{h} = $h;	3669	$widget->{h} = $h;
3182		3670
3183	$widget->emit (size_allocate => $w, $h, $changed);	3671	$widget->emit (size_allocate => $w, $h);
		3672	}
3184	}	3673	}
3185	}	3674	}
3186		3675
3187	while ($self->{post_alloc_hook}) {	3676	while ($self->{post_alloc_hook}) {
3188	$_->()	3677	$_->()
3189	for values %{delete $self->{post_alloc_hook}};	3678	for values %{delete $self->{post_alloc_hook}};
3190	}	3679	}
		3680
3191		3681
3192	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3682	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3683	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194	glClear GL_COLOR_BUFFER_BIT;	3684	glClear GL_COLOR_BUFFER_BIT;
3195		3685
…		…
3197	glLoadIdentity;	3687	glLoadIdentity;
3198	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3688	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199	glMatrixMode GL_MODELVIEW;	3689	glMatrixMode GL_MODELVIEW;
3200	glLoadIdentity;	3690	glLoadIdentity;
3201		3691
		3692	{
		3693	package CFClient::UI::Base;
		3694
		3695	($draw_x, $draw_y, $draw_w, $draw_h) =
		3696	(0, 0, $self->{w}, $self->{h});
		3697	}
		3698
3202	$self->_draw;	3699	$self->_draw;
3203	}	3700	}
3204		3701
3205	#############################################################################	3702	#############################################################################
3206		3703

Diff Legend

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