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.258 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

…		…
40		40
41	$LAYOUT = $layout;	41	$LAYOUT = $layout;
42	}	42	}
43		43
44	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
45	if (!$GRAB) {	47	if (!$GRAB) {
46	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
48
49	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
50	$TOOLTIP->hide;	51	$TOOLTIP->hide;
51		52
52	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
53		54
…		…
170	sub rescale_widgets {	171	sub rescale_widgets {
171	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
172		173
173	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
174	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
175	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177		178
178	$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.]+$/;
179	$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};
180	$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};
181	$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.]+$/;
182	$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};
183	$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};
184		185
185	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187		188
188	}	189	}
189	}	190	}
190		191
191	reconfigure_widgets;	192	reconfigure_widgets;
…		…
219	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
220	}	221	}
221	}	222	}
222		223
223	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};	228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228		229
229	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231		232
232	$self->show if $layout->{show};	233	$self->show if $layout->{show};
…		…
355	$self->{x} = $x;	356	$self->{x} = $x;
356	$self->{y} = $y;	357	$self->{y} = $y;
357	$self->update;	358	$self->update;
358	}	359	}
359		360
360	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361	return unless $self->{visible};	362	return unless $self->{visible};
362		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
363	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	367	$self->{root}{size_alloc}{$self+0} = $self;
364	}	368	}
365	}	369	}
366		370
367	sub size_allocate {	371	sub size_allocate {
368	# nothing to be done	372	# nothing to be done
369	}	373	}
370		374
371	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
372	}	381	}
373		382
374	sub set_max_size {	383	sub set_max_size {
375	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
376		385
…		…
435		444
436	$::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
437	unless $FOCUS;	446	unless $FOCUS;
438	}	447	}
439		448
440	sub mouse_motion { }	449	sub mouse_motion { 0 }
441	sub button_up { }	450	sub button_up { 0 }
442	sub key_down { }	451	sub key_down { 0 }
443	sub key_up { }	452	sub key_up { 0 }
444		453
445	sub button_down {	454	sub button_down {
446	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
447		456
448	$self->focus_in;	457	$self->focus_in;
449	}
450		458
451	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
452	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
453	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
454	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
455	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
456		461
457	sub find_widget {	462	sub find_widget {
458	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
459		464
460	return () unless $self->{can_events};	465	return () unless $self->{can_events};
…		…
498		503
499	sub realloc {	504	sub realloc {
500	my ($self) = @_;	505	my ($self) = @_;
501		506
502	if ($self->{visible}) {	507	if ($self->{visible}) {
503	return if $self->{root}{realloc}{$self};	508	return if $self->{root}{realloc}{$self+0};
504		509
505	$self->{root}{realloc}{$self} = $self;	510	$self->{root}{realloc}{$self+0} = $self;
506	$self->{root}->update;	511	$self->{root}->update;
507	} else {	512	} else {
508	delete $self->{req_w};	513	delete $self->{req_w};
		514	delete $self->{req_h};
509	}	515	}
510	}	516	}
511		517
512	sub update {	518	sub update {
513	my ($self) = @_;	519	my ($self) = @_;
…		…
521		527
522	$self->realloc;	528	$self->realloc;
523	$self->update;	529	$self->update;
524	}	530	}
525		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
526	sub draw {	536	sub draw {
527	my ($self) = @_;	537	my ($self) = @_;
528		538
529	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);
530		550
531	glPushMatrix;	551	glPushMatrix;
532	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
533	$self->_draw;
534	glPopMatrix;
535		553
536	if ($self == $HOVER && $self->{can_hover}) {	554	if ($self == $HOVER && $self->{can_hover}) {
537	my ($x, $y) = @$self{qw(x y)};
538
539	glColor 1, 0.8, 0.5, 0.2;	555	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
540	glEnable GL_BLEND;	556	glEnable GL_BLEND;
541	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	557	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
542	glBegin GL_QUADS;	558	glBegin GL_QUADS;
543	glVertex $x , $y;	559	glVertex 0 , 0;
544	glVertex $x + $self->{w}, $y;	560	glVertex $self->{w}, 0;
545	glVertex $x + $self->{w}, $y + $self->{h};	561	glVertex $self->{w}, $self->{h};
546	glVertex $x , $y + $self->{h};	562	glVertex 0 , $self->{h};
547	glEnd;	563	glEnd;
548	glDisable GL_BLEND;	564	glDisable GL_BLEND;
549	}	565	}
550		566
551	if ($ENV{CFPLUS_DEBUG}) {	567	if ($ENV{CFPLUS_DEBUG} & 1) {
552	glPushMatrix;	568	glPushMatrix;
553	glColor 1, 1, 0, 1;	569	glColor 1, 1, 0, 1;
554	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	570	glTranslate 0.375, 0.375;
555	glBegin GL_LINE_LOOP;	571	glBegin GL_LINE_LOOP;
556	glVertex 0 , 0;	572	glVertex 0 , 0;
557	glVertex $self->{w} - 1, 0;	573	glVertex $self->{w} - 1, 0;
558	glVertex $self->{w} - 1, $self->{h} - 1;	574	glVertex $self->{w} - 1, $self->{h} - 1;
559	glVertex 0 , $self->{h} - 1;	575	glVertex 0 , $self->{h} - 1;
560	glEnd;	576	glEnd;
561	glPopMatrix;	577	glPopMatrix;
562	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	578	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
563	}	579	}
		580
		581	$self->_draw;
		582	glPopMatrix;
564	}	583	}
565		584
566	sub _draw {	585	sub _draw {
567	my ($self) = @_;	586	my ($self) = @_;
568		587
…		…
606		625
607	if ($color && (@$color < 4 || $color->[3])) {	626	if ($color && (@$color < 4 || $color->[3])) {
608	my ($w, $h) = @$self{qw(w h)};	627	my ($w, $h) = @$self{qw(w h)};
609		628
610	glEnable GL_BLEND;	629	glEnable GL_BLEND;
611	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612	glColor @$color;	631	glColor_premultiply @$color;
613		632
614	glBegin GL_QUADS;	633	glBegin GL_QUADS;
615	glVertex 0 , 0;	634	glVertex 0 , 0;
616	glVertex 0 , $h;	635	glVertex 0 , $h;
617	glVertex $w, $h;	636	glVertex $w, $h;
…		…
648	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFClient::UI::Base::;
649		668
650	sub new {	669	sub new {
651	my ($class, %arg) = @_;	670	my ($class, %arg) = @_;
652		671
653	my $children = delete $arg{children} || [];	672	my $children = delete $arg{children};
654		673
655	my $self = $class->SUPER::new (	674	my $self = $class->SUPER::new (
656	children => [],	675	children => [],
657	can_events => 0,	676	can_events => 0,
658	%arg,	677	%arg,
659	);	678	);
		679
660	$self->add ($_) for @$children;	680	$self->add (@$children)
		681	if $children;
661		682
662	$self	683	$self
663	}	684	}
664		685
665	sub add {	686	sub add {
…		…
713	$x -= $self->{x};	734	$x -= $self->{x};
714	$y -= $self->{y};	735	$y -= $self->{y};
715		736
716	my $res;	737	my $res;
717		738
718	for (reverse @{ $self->{children} }) {	739	for (reverse $self->visible_children) {
719	$res = $_->find_widget ($x, $y)	740	$res = $_->find_widget ($x, $y)
720	and return $res;	741	and return $res;
721	}	742	}
722		743
723	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	744	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
765	sub size_request {	786	sub size_request {
766	$_[0]{children}[0]->size_request	787	$_[0]{children}[0]->size_request
767	}	788	}
768		789
769	sub size_allocate {	790	sub size_allocate {
770	my ($self, $w, $h, $changed) = @_;	791	my ($self, $w, $h) = @_;
771		792
772	$self->{children}[0]->configure (0, 0, $w, $h);	793	$self->{children}[0]->configure (0, 0, $w, $h);
773	}	794	}
774		795
775	#############################################################################	796	#############################################################################
		797
		798	# back-buffered drawing area
776		799
777	package CFClient::UI::Window;	800	package CFClient::UI::Window;
778		801
779	our @ISA = CFClient::UI::Bin::;	802	our @ISA = CFClient::UI::Bin::;
780		803
…		…
792	$ROOT->on_post_alloc ($self => sub { $self->render_child });	815	$ROOT->on_post_alloc ($self => sub { $self->render_child });
793	$self->SUPER::update;	816	$self->SUPER::update;
794	}	817	}
795		818
796	sub size_allocate {	819	sub size_allocate {
797	my ($self, $w, $h, $changed) = @_;	820	my ($self, $w, $h) = @_;
798		821
799	$self->SUPER::size_allocate ($w, $h, $changed);	822	$self->SUPER::size_allocate ($w, $h);
800	$self->update	823	$self->update;
801	if $changed;
802	}	824	}
803		825
804	sub _render {	826	sub _render {
		827	my ($self) = @_;
		828
805	$_[0]{children}[0]->draw;	829	$self->{children}[0]->draw;
806	}	830	}
807		831
808	sub render_child {	832	sub render_child {
809	my ($self) = @_;	833	my ($self) = @_;
810		834
811	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	835	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
812	glClearColor 0, 0, 0, 0;	836	glClearColor 0, 0, 0, 0;
813	glClear GL_COLOR_BUFFER_BIT;	837	glClear GL_COLOR_BUFFER_BIT;
814		838
		839	{
		840	package CFClient::UI::Base;
		841
		842	($draw_x, $draw_y, $draw_w, $draw_h) =
		843	(0, 0, $self->{w}, $self->{h});
		844	}
		845
815	$self->_render;	846	$self->_render;
816	};	847	};
817	}	848	}
818		849
819	sub _draw {	850	sub _draw {
820	my ($self) = @_;	851	my ($self) = @_;
821		852
822	my ($w, $h) = ($self->w, $self->h);	853	my ($w, $h) = @$self{qw(w h)};
823		854
824	my $tex = $self->{texture}	855	my $tex = $self->{texture}
825	or return;	856	or return;
826		857
827	glEnable GL_TEXTURE_2D;	858	glEnable GL_TEXTURE_2D;
828	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		860	glEnable GL_BLEND;
		861	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
829	glColor 1, 1, 1, 1;	862	glColor 0, 0, 0, 1;
830		863
831	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	864	$tex->draw_quad (0, 0, $w, $h);
832		865
		866	glDisable GL_BLEND;
833	glDisable GL_TEXTURE_2D;	867	glDisable GL_TEXTURE_2D;
834	}	868	}
835		869
836	#############################################################################	870	#############################################################################
837		871
…		…
850	}	884	}
851		885
852	sub size_request {	886	sub size_request {
853	my ($self) = @_;	887	my ($self) = @_;
854		888
855	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	889	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
856		890
857	$w = 10 if $self->{scroll_x};	891	$w = 10 if $self->{scroll_x};
858	$h = 10 if $self->{scroll_y};	892	$h = 10 if $self->{scroll_y};
859		893
860	($w, $h)	894	($w, $h)
861	}	895	}
862		896
863	sub size_allocate {	897	sub size_allocate {
864	my ($self, $w, $h, $changed) = @_;	898	my ($self, $w, $h) = @_;
865		899
		900	my $child = $self->child;
		901
866	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
867	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
868		904
869	$self->child->configure (0, 0, $w, $h);	905	$self->child->configure (0, 0, $w, $h);
870	$self->update;	906	$self->update;
871	}	907	}
872		908
…		…
908	}	944	}
909		945
910	sub _render {	946	sub _render {
911	my ($self) = @_;	947	my ($self) = @_;
912		948
		949	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		950	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		951
913	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	952	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914		953
915	$self->SUPER::_render;	954	$self->SUPER::_render;
916	}	955	}
917		956
…		…
920	package CFClient::UI::ScrolledWindow;	959	package CFClient::UI::ScrolledWindow;
921		960
922	our @ISA = CFClient::UI::HBox::;	961	our @ISA = CFClient::UI::HBox::;
923		962
924	sub new {	963	sub new {
925	my $class = shift;	964	my ($class, %arg) = @_;
		965
		966	my $child = delete $arg{child};
926		967
927	my $self;	968	my $self;
928		969
929	my $slider = new CFClient::UI::Slider	970	my $slider = new CFClient::UI::Slider
930	vertical => 1,	971	vertical => 1,
…		…
935	;	976	;
936		977
937	$self = $class->SUPER::new (	978	$self = $class->SUPER::new (
938	vp => (new CFClient::UI::ViewPort expand => 1),	979	vp => (new CFClient::UI::ViewPort expand => 1),
939	slider => $slider,	980	slider => $slider,
940	@_,	981	%arg,
941	);	982	);
942		983
943	$self->{vp}->add ($self->{scrolled});
944	$self->add ($self->{vp});
945	$self->add ($self->{slider});	984	$self->SUPER::add ($self->{vp}, $self->{slider});
		985	$self->add ($child) if $child;
946		986
947	$self	987	$self
		988	}
		989
		990	sub add {
		991	my ($self, $widget) = @_;
		992
		993	$self->{vp}->add ($self->{child} = $widget);
948	}	994	}
949		995
950	sub update {	996	sub update {
951	my ($self) = @_;	997	my ($self) = @_;
952		998
…		…
956	my $child = $self->{vp}->child;	1002	my $child = $self->{vp}->child;
957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1003	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958	}	1004	}
959		1005
960	sub size_allocate {	1006	sub size_allocate {
961	my ($self, $w, $h, $changed) = @_;	1007	my ($self, $w, $h) = @_;
962		1008
963	$self->SUPER::size_allocate ($w, $h, $changed);	1009	$self->SUPER::size_allocate ($w, $h);
964		1010
965	my $child = $self->{vp}->child;	1011	my $child = $self->{vp}->child;
966	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1012	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
967	}	1013	}
968		1014
…		…
991		1037
992	if ($self->{bg}) {	1038	if ($self->{bg}) {
993	my ($w, $h) = @$self{qw(w h)};	1039	my ($w, $h) = @$self{qw(w h)};
994		1040
995	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
996	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
997	glColor @{ $self->{bg} };	1043	glColor_premultiply @{ $self->{bg} };
998		1044
999	glBegin GL_QUADS;	1045	glBegin GL_QUADS;
1000	glVertex 0 , 0;	1046	glVertex 0 , 0;
1001	glVertex 0 , $h;	1047	glVertex 0 , $h;
1002	glVertex $w, $h;	1048	glVertex $w, $h;
…		…
1024	my @border =	1070	my @border =
1025	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1026	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1072	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027		1073
1028	sub new {	1074	sub new {
1029	my $class = shift;	1075	my ($class, %arg) = @_;
		1076
		1077	my $title = delete $arg{title};
1030		1078
1031	my $self = $class->SUPER::new (	1079	my $self = $class->SUPER::new (
1032	bg => [1, 1, 1, 1],	1080	bg => [1, 1, 1, 1],
1033	border_bg => [1, 1, 1, 1],	1081	border_bg => [1, 1, 1, 1],
1034	border => 0.6,	1082	border => 0.6,
1035	can_events => 1,	1083	can_events => 1,
1036	min_w => 16,	1084	min_w => 16,
1037	min_h => 16,	1085	min_h => 16,
1038	@_	1086	%arg,
1039	);	1087	);
1040		1088
1041	$self->{title} &&= new CFClient::UI::Label	1089	$self->{title} = new CFClient::UI::Label
1042	align => 0,	1090	align => 0,
1043	valign => 1,	1091	valign => 1,
1044	text => $self->{title},	1092	text => $title,
1045	fontsize => $self->{border};	1093	fontsize => $self->{border}
		1094	if defined $title;
1046		1095
1047	$self	1096	$self
		1097	}
		1098
		1099	sub add {
		1100	my ($self, @widgets) = @_;
		1101
		1102	$self->SUPER::add (@widgets);
		1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1048	}	1104	}
1049		1105
1050	sub border {	1106	sub border {
1051	int $_[0]{border} * $::FONTSIZE	1107	int $_[0]{border} * $::FONTSIZE
1052	}	1108	}
1053		1109
1054	sub size_request {	1110	sub size_request {
1055	my ($self) = @_;	1111	my ($self) = @_;
		1112
		1113	$self->{title}->size_request
		1114	if $self->{title};
1056		1115
1057	my ($w, $h) = $self->SUPER::size_request;	1116	my ($w, $h) = $self->SUPER::size_request;
1058		1117
1059	(	1118	(
1060	$w + $self->border * 2,	1119	$w + $self->border * 2,
1061	$h + $self->border * 2,	1120	$h + $self->border * 2,
1062	)	1121	)
1063	}	1122	}
1064		1123
1065	sub size_allocate {	1124	sub size_allocate {
1066	my ($self, $w, $h, $changed) = @_;	1125	my ($self, $w, $h) = @_;
1067		1126
1068	return unless $changed;	1127	if ($self->{title}) {
		1128	$self->{title}{w} = $w;
		1129	$self->{title}{h} = $h;
		1130	$self->{title}->size_allocate ($w, $h);
		1131	}
1069		1132
		1133	my $border = $self->border;
		1134
1070	$h -= List::Util::max 0, $self->border * 2;	1135	$h -= List::Util::max 0, $border * 2;
1071	$w -= List::Util::max 0, $self->border * 2;	1136	$w -= List::Util::max 0, $border * 2;
1072		1137
1073	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1074	if $self->{title};
1075
1076	$self->child->configure ($self->border, $self->border, $w, $h);	1138	$self->child->configure ($border, $border, $w, $h);
1077	}	1139	}
1078		1140
1079	sub button_down {	1141	sub button_down {
1080	my ($self, $ev, $x, $y) = @_;	1142	my ($self, $ev, $x, $y) = @_;
1081		1143
…		…
1100	my $dy = $ev->{y} - $oy;	1162	my $dy = $ev->{y} - $oy;
1101		1163
1102	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1164	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1103	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1165	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104		1166
		1167	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1105	$self->realloc;	1168	$self->realloc;
1106	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1107	};	1169	};
1108		1170
1109	} elsif ($lr ^ $td) {	1171	} elsif ($lr ^ $td) {
1110	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1172	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1111	my ($bx, $by) = ($self->{x}, $self->{y});	1173	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1114	my ($ev, $x, $y) = @_;	1176	my ($ev, $x, $y) = @_;
1115		1177
1116	($x, $y) = ($ev->{x}, $ev->{y});	1178	($x, $y) = ($ev->{x}, $ev->{y});
1117		1179
1118	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1181	# HACK: the next line is required to enforce placement
		1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1119	};	1183	};
		1184	} else {
		1185	return 0;
		1186	}
		1187
1120	}	1188	1
1121	}	1189	}
1122		1190
1123	sub button_up {	1191	sub button_up {
1124	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
1125		1193
1126	delete $self->{motion};	1194	!!delete $self->{motion}
1127	}	1195	}
1128		1196
1129	sub mouse_motion {	1197	sub mouse_motion {
1130	my ($self, $ev, $x, $y) = @_;	1198	my ($self, $ev, $x, $y) = @_;
1131		1199
1132	$self->{motion}->($ev, $x, $y) if $self->{motion};	1200	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1201
		1202	!!$self->{motion}
1133	}	1203	}
1134		1204
1135	sub _draw {	1205	sub _draw {
1136	my ($self) = @_;	1206	my ($self) = @_;
1137		1207
		1208	my $child = $self->{children}[0];
		1209
1138	my ($w, $h ) = ($self->{w}, $self->{h});	1210	my ($w, $h ) = ($self->{w}, $self->{h});
1139	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1211	my ($cw, $ch) = ($child->{w}, $child->{h});
1140		1212
1141	glEnable GL_TEXTURE_2D;	1213	glEnable GL_TEXTURE_2D;
1142	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1214	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143		1215
1144	my $border = $self->border;	1216	my $border = $self->border;
…		…
1159	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1231	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160	}	1232	}
1161		1233
1162	glDisable GL_TEXTURE_2D;	1234	glDisable GL_TEXTURE_2D;
1163		1235
1164	$self->{title}->draw if $self->{title};
1165
1166	$self->child->draw;	1236	$child->draw;
		1237
		1238	if ($self->{title}) {
		1239	glTranslate 0, $border - $self->{h};
		1240	$self->{title}->_draw;
		1241	}
1167	}	1242	}
1168		1243
1169	#############################################################################	1244	#############################################################################
1170		1245
1171	package CFClient::UI::Table;	1246	package CFClient::UI::Table;
…		…
1245	(sum @$hs),	1320	(sum @$hs),
1246	)	1321	)
1247	}	1322	}
1248		1323
1249	sub size_allocate {	1324	sub size_allocate {
1250	my ($self, $w, $h, $changed) = @_;	1325	my ($self, $w, $h) = @_;
1251		1326
1252	my ($ws, $hs) = $self->get_wh;	1327	my ($ws, $hs) = $self->get_wh;
1253		1328
1254	my $req_w = (sum @$ws) || 1;	1329	my $req_w = (sum @$ws) || 1;
1255	my $req_h = (sum @$hs) || 1;	1330	my $req_h = (sum @$hs) || 1;
…		…
1333	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1334	)	1409	)
1335	}	1410	}
1336		1411
1337	sub size_allocate {	1412	sub size_allocate {
1338	my ($self, $w, $h, $changed) = @_;	1413	my ($self, $w, $h) = @_;
1339		1414
1340	my $space = $self->{vertical} ? $h : $w;	1415	my $space = $self->{vertical} ? $h : $w;
1341	my $children = $self->{children};	1416	my $children = $self->{children};
1342		1417
1343	my @req;	1418	my @req;
…		…
1517		1592
1518	($w, $h)	1593	($w, $h)
1519	}	1594	}
1520		1595
1521	sub size_allocate {	1596	sub size_allocate {
1522	my ($self, $w, $h, $changed) = @_;	1597	my ($self, $w, $h) = @_;
		1598
		1599	delete $self->{ox};
1523		1600
1524	delete $self->{texture}	1601	delete $self->{texture}
1525	if $changed;	1602	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1526	}	1603	}
1527		1604
1528	sub set_fontsize {	1605	sub set_fontsize {
1529	my ($self, $fontsize) = @_;	1606	my ($self, $fontsize) = @_;
1530		1607
…		…
1545	$self->{layout}->set_width ($self->{w});	1622	$self->{layout}->set_width ($self->{w});
1546	$self->{layout}->set_ellipsise ($self->{ellipsise});	1623	$self->{layout}->set_ellipsise ($self->{ellipsise});
1547	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1624	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1625	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549		1626
1550	my $tex = new_from_layout CFClient::Texture $self->{layout};	1627	new_from_layout CFClient::Texture $self->{layout}
		1628	};
1551		1629
		1630	unless (exists $self->{ox}) {
1552	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1631	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1632	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1554	: ($self->{w} - $tex->{w}) * 0.5);	1633	: ($self->{w} - $tex->{w}) * 0.5);
1555		1634
1556	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1635	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1636	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1558	: ($self->{h} - $tex->{h}) * 0.5);	1637	: ($self->{h} - $tex->{h}) * 0.5);
1559
1560	$tex
1561	};	1638	};
1562		1639
1563	glEnable GL_TEXTURE_2D;	1640	glEnable GL_TEXTURE_2D;
1564	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1565		1642
…		…
1603		1680
1604	delete $self->{cur_h};	1681	delete $self->{cur_h};
1605		1682
1606	return if $self->{text} eq $text;	1683	return if $self->{text} eq $text;
1607		1684
1608	delete $self->{texture};
1609
1610	$self->{last_activity} = $::NOW;	1685	$self->{last_activity} = $::NOW;
1611	$self->{text} = $text;	1686	$self->{text} = $text;
1612		1687
1613	$text =~ s/./*/g if $self->{hidden};	1688	$text =~ s/./*/g if $self->{hidden};
1614	$self->{layout}->set_text ("$text ");	1689	$self->{layout}->set_text ("$text ");
1615		1690
1616	$self->_emit (changed => $self->{text});	1691	$self->_emit (changed => $self->{text});
		1692	$self->update;
1617	}	1693	}
1618		1694
1619	sub set_text {	1695	sub set_text {
1620	my ($self, $text) = @_;	1696	my ($self, $text) = @_;
1621		1697
…		…
1660	$self->{cursor} = length $text;	1736	$self->{cursor} = length $text;
1661	} elsif ($uni == 27) {	1737	} elsif ($uni == 27) {
1662	$self->_emit ('escape');	1738	$self->_emit ('escape');
1663	} elsif ($uni) {	1739	} elsif ($uni) {
1664	substr $text, $self->{cursor}++, 0, chr $uni;	1740	substr $text, $self->{cursor}++, 0, chr $uni;
		1741	} else {
		1742	return 0;
1665	}	1743	}
1666		1744
1667	$self->_set_text ($text);	1745	$self->_set_text ($text);
1668		1746
1669	$self->realloc;	1747	$self->realloc;
		1748
		1749	1
1670	}	1750	}
1671		1751
1672	sub focus_in {	1752	sub focus_in {
1673	my ($self) = @_;	1753	my ($self) = @_;
1674		1754
…		…
1689	utf8::encode $text;	1769	utf8::encode $text;
1690	$self->{cursor} = length substr $text, 0, $idx;	1770	$self->{cursor} = length substr $text, 0, $idx;
1691		1771
1692	$self->_set_text ($self->{text});	1772	$self->_set_text ($self->{text});
1693	$self->update;	1773	$self->update;
		1774
		1775	1
1694	}	1776	}
1695		1777
1696	sub mouse_motion {	1778	sub mouse_motion {
1697	my ($self, $ev, $x, $y) = @_;	1779	my ($self, $ev, $x, $y) = @_;
1698	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1780	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1781
		1782	0
1699	}	1783	}
1700		1784
1701	sub _draw {	1785	sub _draw {
1702	my ($self) = @_;	1786	my ($self) = @_;
1703		1787
1704	local $self->{fg} = $self->{fg};	1788	local $self->{fg} = $self->{fg};
1705		1789
1706	if ($FOCUS == $self) {	1790	if ($FOCUS == $self) {
1707	glColor @{$self->{active_bg}};	1791	glColor_premultiply @{$self->{active_bg}};
1708	$self->{fg} = $self->{active_fg};	1792	$self->{fg} = $self->{active_fg};
1709	} else {	1793	} else {
1710	glColor @{$self->{bg}};	1794	glColor_premultiply @{$self->{bg}};
1711	}	1795	}
1712		1796
1713	glEnable GL_BLEND;	1797	glEnable GL_BLEND;
1714	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1798	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1715	glBegin GL_QUADS;	1799	glBegin GL_QUADS;
1716	glVertex 0 , 0;	1800	glVertex 0 , 0;
1717	glVertex 0 , $self->{h};	1801	glVertex 0 , $self->{h};
1718	glVertex $self->{w}, $self->{h};	1802	glVertex $self->{w}, $self->{h};
1719	glVertex $self->{w}, 0;	1803	glVertex $self->{w}, 0;
…		…
1780	} else {	1864	} else {
1781	$self->set_text ($self->{history_saveback});	1865	$self->set_text ($self->{history_saveback});
1782	}	1866	}
1783		1867
1784	} else {	1868	} else {
1785	$self->SUPER::key_down ($ev);	1869	return $self->SUPER::key_down ($ev)
		1870	}
		1871
1786	}	1872	1
1787
1788	}	1873	}
1789		1874
1790	#############################################################################	1875	#############################################################################
1791		1876
1792	package CFClient::UI::Button;	1877	package CFClient::UI::Button;
…		…
1821	my ($self, $ev, $x, $y) = @_;	1906	my ($self, $ev, $x, $y) = @_;
1822		1907
1823	$self->emit ("activate")	1908	$self->emit ("activate")
1824	if $x >= 0 && $x < $self->{w}	1909	if $x >= 0 && $x < $self->{w}
1825	&& $y >= 0 && $y < $self->{h};	1910	&& $y >= 0 && $y < $self->{h};
		1911
		1912	1
1826	}	1913	}
1827		1914
1828	sub _draw {	1915	sub _draw {
1829	my ($self) = @_;	1916	my ($self) = @_;
1830		1917
…		…
1884		1971
1885	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1972	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1973	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887	$self->{state} = !$self->{state};	1974	$self->{state} = !$self->{state};
1888	$self->_emit (changed => $self->{state});	1975	$self->_emit (changed => $self->{state});
		1976	} else {
		1977	return 0
		1978	}
		1979
1889	}	1980	1
1890	}	1981	}
1891		1982
1892	sub _draw {	1983	sub _draw {
1893	my ($self) = @_;	1984	my ($self) = @_;
1894		1985
…		…
2061		2152
2062	my $h1 = $self->{h} * (1 - $ycut1);	2153	my $h1 = $self->{h} * (1 - $ycut1);
2063	my $h2 = $self->{h} * (1 - $ycut2);	2154	my $h2 = $self->{h} * (1 - $ycut2);
2064		2155
2065	glEnable GL_BLEND;	2156	glEnable GL_BLEND;
2066	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2157	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2158	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2067	glEnable GL_TEXTURE_2D;	2159	glEnable GL_TEXTURE_2D;
2068	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2160	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2069		2161
2070	glBindTexture GL_TEXTURE_2D, $t1->{name};	2162	glBindTexture GL_TEXTURE_2D, $t1->{name};
2071	glBegin GL_QUADS;	2163	glBegin GL_QUADS;
…		…
2232		2324
2233	$self->SUPER::button_down ($ev, $x, $y);	2325	$self->SUPER::button_down ($ev, $x, $y);
2234		2326
2235	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2327	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236		2328
2237	$self->mouse_motion ($ev, $x, $y);	2329	$self->mouse_motion ($ev, $x, $y)
2238	}	2330	}
2239		2331
2240	sub mouse_motion {	2332	sub mouse_motion {
2241	my ($self, $ev, $x, $y) = @_;	2333	my ($self, $ev, $x, $y) = @_;
2242		2334
…		…
2246	my (undef, $lo, $hi, $page) = @{$self->{range}};	2338	my (undef, $lo, $hi, $page) = @{$self->{range}};
2247		2339
2248	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2340	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249		2341
2250	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2342	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2343	} else {
		2344	return 0;
		2345	}
		2346
2251	}	2347	1
2252	}	2348	}
2253		2349
2254	sub update {	2350	sub update {
2255	my ($self) = @_;	2351	my ($self) = @_;
2256		2352
2257	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2353	delete $self->{knob_w};
		2354	$self->SUPER::update;
		2355	}
		2356
		2357	sub _draw {
		2358	my ($self) = @_;
		2359
		2360	unless ($self->{knob_w}) {
2258	$self->set_value ($self->{range}[0]);	2361	$self->set_value ($self->{range}[0]);
2259		2362
2260	my ($value, $lo, $hi, $page) = @{$self->{range}};	2363	my ($value, $lo, $hi, $page) = @{$self->{range}};
2261	my $range = ($hi - $page - $lo) || 1e-100;	2364	my $range = ($hi - $page - $lo) || 1e-100;
2262		2365
…		…
2268	$value = ($value - $lo) / $range;	2371	$value = ($value - $lo) / $range;
2269	$value = $value * $self->{scale} + $self->{offset};	2372	$value = $value * $self->{scale} + $self->{offset};
2270		2373
2271	$self->{knob_x} = $value - $knob_w * 0.5;	2374	$self->{knob_x} = $value - $knob_w * 0.5;
2272	$self->{knob_w} = $knob_w;	2375	$self->{knob_w} = $knob_w;
2273	});	2376	}
2274
2275	$self->SUPER::update;
2276	}
2277
2278	sub _draw {
2279	my ($self) = @_;
2280		2377
2281	$self->SUPER::_draw ();	2378	$self->SUPER::_draw ();
2282		2379
2283	glScale $self->{w}, $self->{h};	2380	glScale $self->{w}, $self->{h};
2284		2381
…		…
2382	$self->{fontsize} = $fontsize;	2479	$self->{fontsize} = $fontsize;
2383	$self->reflow;	2480	$self->reflow;
2384	}	2481	}
2385		2482
2386	sub size_allocate {	2483	sub size_allocate {
2387	my ($self, $w, $h, $changed) = @_;	2484	my ($self, $w, $h) = @_;
2388		2485
2389	$self->SUPER::size_allocate ($w, $h, $changed);	2486	$self->SUPER::size_allocate ($w, $h);
2390
2391	return unless $changed;
2392		2487
2393	$self->{layout}->set_font ($self->{font}) if $self->{font};	2488	$self->{layout}->set_font ($self->{font}) if $self->{font};
2394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2489	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395	$self->{layout}->set_width ($self->{children}[0]{w});	2490	$self->{layout}->set_width ($self->{children}[0]{w});
2396		2491
…		…
2619	}	2714	}
2620		2715
2621	sub set_tooltip_from {	2716	sub set_tooltip_from {
2622	my ($self, $widget) = @_;	2717	my ($self, $widget) = @_;
2623		2718
		2719	my $tooltip = $widget->{tooltip};
		2720
		2721	if ($ENV{CFPLUS_DEBUG} & 2) {
		2722	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2723	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2724	. "req $widget->{req_w} $widget->{req_h}\n"
		2725	. "visible $widget->{visible}";
		2726	}
		2727
2624	$self->add (new CFClient::UI::Label	2728	$self->add (new CFClient::UI::Label
2625	markup => $widget->{tooltip},	2729	markup => $tooltip,
2626	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2730	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627	fontsize => 0.8,	2731	fontsize => 0.8,
2628	fg => [0, 0, 0, 1],	2732	fg => [0, 0, 0, 1],
2629	ellipsise => 0,	2733	ellipsise => 0,
2630	font => ($widget->{tooltip_font} || $::FONT_PROP),	2734	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2638		2742
2639	($w + 4, $h + 4)	2743	($w + 4, $h + 4)
2640	}	2744	}
2641		2745
2642	sub size_allocate {	2746	sub size_allocate {
2643	my ($self, $w, $h, $changed) = @_;	2747	my ($self, $w, $h) = @_;
2644		2748
2645	return unless $changed;
2646
2647	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2749	$self->SUPER::size_allocate ($w - 4, $h - 4);
2648	}	2750	}
2649		2751
2650	sub visibility_change {	2752	sub visibility_change {
2651	my ($self, $visible) = @_;	2753	my ($self, $visible) = @_;
2652		2754
…		…
2773	$self->SUPER::DESTROY;	2875	$self->SUPER::DESTROY;
2774	}	2876	}
2775		2877
2776	#############################################################################	2878	#############################################################################
2777		2879
2778	package CFClient::UI::Inventory;	2880	package CFClient::UI::Buttonbar;
2779		2881
2780	our @ISA = CFClient::UI::ScrolledWindow::;	2882	our @ISA = CFClient::UI::HBox::;
2781		2883
2782	sub new {	2884	# TODO: should actualyl wrap buttons and other goodies.
2783	my $class = shift;
2784
2785	my $self = $class->SUPER::new (
2786	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2787	@_,
2788	);
2789
2790	$self
2791	}
2792
2793	sub set_items {
2794	my ($self, $items) = @_;
2795
2796	$self->{scrolled}->clear;
2797	return unless $items;
2798
2799	my @items = sort {
2800	($a->{type} <=> $b->{type})
2801	or ($a->{name} cmp $b->{name})
2802	} @$items;
2803
2804	$self->{real_items} = \@items;
2805
2806	my $row = 0;
2807	for my $item (@items) {
2808	CFClient::Item::update_widgets $item;
2809
2810	$self->{scrolled}->add (0, $row, $item->{face_widget});
2811	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2812	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2813
2814	$row++;
2815	}
2816	}
2817		2885
2818	#############################################################################	2886	#############################################################################
2819		2887
2820	package CFClient::UI::Menu;	2888	package CFClient::UI::Menu;
2821		2889
…		…
2871	my ($self, $ev, $x, $y) = @_;	2939	my ($self, $ev, $x, $y) = @_;
2872		2940
2873	# TODO: should use vbox->find_widget or so	2941	# TODO: should use vbox->find_widget or so
2874	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2942	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875	$self->{hover} = $self->{item}{$HOVER};	2943	$self->{hover} = $self->{item}{$HOVER};
		2944
		2945	0
2876	}	2946	}
2877		2947
2878	sub button_up {	2948	sub button_up {
2879	my ($self, $ev, $x, $y) = @_;	2949	my ($self, $ev, $x, $y) = @_;
2880		2950
…		…
2882	undef $GRAB;	2952	undef $GRAB;
2883	$self->hide;	2953	$self->hide;
2884		2954
2885	$self->_emit ("popdown");	2955	$self->_emit ("popdown");
2886	$self->{hover}[1]->() if $self->{hover};	2956	$self->{hover}[1]->() if $self->{hover};
		2957	} else {
		2958	return 0
		2959	}
		2960
		2961	1
		2962	}
		2963
		2964	#############################################################################
		2965
		2966	package CFClient::UI::Multiplexer;
		2967
		2968	our @ISA = CFClient::UI::Container::;
		2969
		2970	sub new {
		2971	my $class = shift;
		2972
		2973	my $self = $class->SUPER::new (
		2974	@_,
		2975	);
		2976
		2977	$self->{current} = $self->{children}[0]
		2978	if @{ $self->{children} };
		2979
		2980	$self
		2981	}
		2982
		2983	sub add {
		2984	my ($self, @widgets) = @_;
		2985
		2986	$self->SUPER::add (@widgets);
		2987
		2988	$self->{current} = $self->{children}[0]
		2989	if @{ $self->{children} };
		2990	}
		2991
		2992	sub set_current_page {
		2993	my ($self, $page_or_widget) = @_;
		2994
		2995	my $widget = ref $page_or_widget
		2996	? $page_or_widget
		2997	: $self->{children}[$page_or_widget];
		2998
		2999	$self->{current} = $widget;
		3000	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3001
		3002	$self->_emit (page_changed => $self->{current});
		3003
		3004	$self->realloc;
		3005	}
		3006
		3007	sub visible_children {
		3008	$_[0]{current}
		3009	}
		3010
		3011	sub size_request {
		3012	my ($self) = @_;
		3013
		3014	$self->{current}->size_request
		3015	}
		3016
		3017	sub size_allocate {
		3018	my ($self, $w, $h) = @_;
		3019
		3020	$self->{current}->configure (0, 0, $w, $h);
		3021	}
		3022
		3023	sub _draw {
		3024	my ($self) = @_;
		3025
		3026	$self->{current}->draw;
		3027	}
		3028
		3029	#############################################################################
		3030
		3031	package CFClient::UI::Notebook;
		3032
		3033	our @ISA = CFClient::UI::VBox::;
		3034
		3035	sub new {
		3036	my $class = shift;
		3037
		3038	my $self = $class->SUPER::new (
		3039	buttonbar => (new CFClient::UI::Buttonbar),
		3040	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3041	# filter => # will be put between multiplexer and $self
		3042	@_,
		3043	);
2887	}	3044
		3045	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3046	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3047
		3048	$self
		3049	}
		3050
		3051	sub add {
		3052	my ($self, $title, $widget, $tooltip) = @_;
		3053
		3054	Scalar::Util::weaken $self;
		3055
		3056	$self->{buttonbar}->add (new CFClient::UI::Button
		3057	markup => $title,
		3058	tooltip => $tooltip,
		3059	on_activate => sub { $self->set_current_page ($widget) },
		3060	);
		3061
		3062	$self->{multiplexer}->add ($widget);
		3063	}
		3064
		3065	sub set_current_page {
		3066	my ($self, $page) = @_;
		3067
		3068	$self->{multiplexer}->set_current_page ($page);
		3069	$self->_emit (page_changed => $self->{multiplexer}{current});
2888	}	3070	}
2889		3071
2890	#############################################################################	3072	#############################################################################
2891		3073
2892	package CFClient::UI::Statusbox;	3074	package CFClient::UI::Statusbox;
…		…
2997	$self->SUPER::reconfigure;	3179	$self->SUPER::reconfigure;
2998	}	3180	}
2999		3181
3000	#############################################################################	3182	#############################################################################
3001		3183
		3184	package CFClient::UI::Inventory;
		3185
		3186	our @ISA = CFClient::UI::ScrolledWindow::;
		3187
		3188	sub new {
		3189	my $class = shift;
		3190
		3191	my $self = $class->SUPER::new (
		3192	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3193	@_,
		3194	);
		3195
		3196	$self
		3197	}
		3198
		3199	sub set_items {
		3200	my ($self, $items) = @_;
		3201
		3202	$self->{child}->clear;
		3203	return unless $items;
		3204
		3205	my @items = sort {
		3206	($a->{type} <=> $b->{type})
		3207	or ($a->{name} cmp $b->{name})
		3208	} @$items;
		3209
		3210	$self->{real_items} = \@items;
		3211
		3212	my $row = 0;
		3213	for my $item (@items) {
		3214	CFClient::Item::update_widgets $item;
		3215
		3216	$self->{child}->add (0, $row, $item->{face_widget});
		3217	$self->{child}->add (1, $row, $item->{desc_widget});
		3218	$self->{child}->add (2, $row, $item->{weight_widget});
		3219
		3220	$row++;
		3221	}
		3222	}
		3223
		3224	#############################################################################
		3225
		3226	package CFClient::UI::BindEditor;
		3227
		3228	our @ISA = CFClient::UI::FancyFrame::;
		3229
		3230	sub new {
		3231	my $class = shift;
		3232
		3233	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3234
		3235	$self->add (my $vb = new CFClient::UI::VBox);
		3236
		3237
		3238	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3239	text => "start recording",
		3240	tooltip => "Start/Stops recording of actions."
		3241	."All subsequent actions after the recording started will be captured."
		3242	."The actions are displayed after the record was stopped."
		3243	."To bind the action you have to click on the 'Bind' button",
		3244	on_activate => sub {
		3245	unless ($self->{recording}) {
		3246	$self->start;
		3247	} else {
		3248	$self->stop;
		3249	}
		3250	});
		3251
		3252	$vb->add (new CFClient::UI::Label text => "Actions:");
		3253	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3254
		3255	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3256	$vb->add (my $hb = new CFClient::UI::HBox);
		3257	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3258	$hb->add (new CFClient::UI::Button
		3259	text => "bind",
		3260	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3261	on_activate => sub {
		3262	$self->ask_for_bind;
		3263	});
		3264
		3265	$vb->add (my $hb = new CFClient::UI::HBox);
		3266	$hb->add (new CFClient::UI::Button
		3267	text => "ok",
		3268	expand => 1,
		3269	tooltip => "This closes the binding editor and saves the binding",
		3270	on_activate => sub {
		3271	$self->hide;
		3272	$self->commit;
		3273	});
		3274
		3275	$hb->add (new CFClient::UI::Button
		3276	text => "cancel",
		3277	expand => 1,
		3278	tooltip => "This closes the binding editor without saving",
		3279	on_activate => sub {
		3280	$self->hide;
		3281	$self->{binding_cancel}->()
		3282	if $self->{binding_cancel};
		3283	});
		3284
		3285	$self->update_binding_widgets;
		3286
		3287	$self
		3288	}
		3289
		3290	sub commit {
		3291	my ($self) = @_;
		3292	my ($mod, $sym, $cmds) = $self->get_binding;
		3293	if ($sym != 0 && @$cmds > 0) {
		3294	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3295	."'. Don't forget 'Save Config'!");
		3296	$self->{binding_change}->($mod, $sym, $cmds)
		3297	if $self->{binding_change};
		3298	} else {
		3299	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3300	$self->{binding_cancel}->()
		3301	if $self->{binding_cancel};
		3302	}
		3303	}
		3304
		3305	sub start {
		3306	my ($self) = @_;
		3307
		3308	$self->{rec_btn}->set_text ("stop recording");
		3309	$self->{recording} = 1;
		3310	$self->clear_command_list;
		3311	$::CONN->start_record if $::CONN;
		3312	}
		3313
		3314	sub stop {
		3315	my ($self) = @_;
		3316
		3317	$self->{rec_btn}->set_text ("start recording");
		3318	$self->{recording} = 0;
		3319
		3320	my $rec;
		3321	$rec = $::CONN->stop_record if $::CONN;
		3322	return unless ref $rec eq 'ARRAY';
		3323	$self->set_command_list ($rec);
		3324	}
		3325
		3326
		3327	sub ask_for_bind_and_commit {
		3328	my ($self) = @_;
		3329	$self->ask_for_bind (1);
		3330	}
		3331
		3332	sub ask_for_bind {
		3333	my ($self, $commit) = @_;
		3334
		3335	CFClient::Binder::open_binding_dialog (sub {
		3336	my ($mod, $sym) = @_;
		3337	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3338	$self->update_binding_widgets;
		3339	$self->commit if $commit;
		3340	});
		3341	}
		3342
		3343	# $mod and $sym are the modifiers and key symbol
		3344	# $cmds is a array ref of strings (the commands)
		3345	# $cb is the callback that is executed on OK
		3346	# $ccb is the callback that is executed on CANCEL and
		3347	# when the binding was unsuccessful on OK
		3348	sub set_binding {
		3349	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3350
		3351	$self->clear_command_list;
		3352	$self->{recording} = 0;
		3353	$self->{rec_btn}->set_text ("start recording");
		3354
		3355	$self->{binding} = [$mod, $sym];
		3356	$self->{commands} = $cmds;
		3357
		3358	$self->{binding_change} = $cb;
		3359	$self->{binding_cancel} = $ccb;
		3360
		3361	$self->update_binding_widgets;
		3362	}
		3363
		3364	# this is a shortcut method that asks for a binding
		3365	# and then just binds it.
		3366	sub do_quick_binding {
		3367	my ($self, $cmds) = @_;
		3368	$self->set_binding (undef, undef, $cmds, sub {
		3369	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3370	});
		3371	$self->ask_for_bind (1);
		3372	}
		3373
		3374	sub update_binding_widgets {
		3375	my ($self) = @_;
		3376	my ($mod, $sym, $cmds) = $self->get_binding;
		3377	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3378	$self->set_command_list ($cmds);
		3379	}
		3380
		3381	sub get_binding {
		3382	my ($self) = @_;
		3383	return (
		3384	$self->{binding}->[0],
		3385	$self->{binding}->[1],
		3386	[ grep { defined $_ } @{$self->{commands}} ]
		3387	);
		3388	}
		3389
		3390	sub clear_command_list {
		3391	my ($self) = @_;
		3392	$self->{cmdbox}->clear ();
		3393	}
		3394
		3395	sub set_command_list {
		3396	my ($self, $cmds) = @_;
		3397
		3398	$self->{cmdbox}->clear ();
		3399	$self->{commands} = $cmds;
		3400
		3401	my $idx = 0;
		3402
		3403	for (@$cmds) {
		3404	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3405
		3406	my $i = $idx;
		3407	$hb->add (new CFClient::UI::Label text => $_);
		3408	$hb->add (new CFClient::UI::Button
		3409	text => "delete",
		3410	tooltip => "Deletes the action from the record",
		3411	on_activate => sub {
		3412	$self->{cmdbox}->remove ($hb);
		3413	$cmds->[$i] = undef;
		3414	});
		3415
		3416
		3417	$idx++
		3418	}
		3419	}
		3420
		3421	#############################################################################
		3422
		3423	package CFClient::UI::SpellList;
		3424
		3425	our @ISA = CFClient::UI::Table::;
		3426
		3427	sub new {
		3428	my $class = shift;
		3429
		3430	my $self = $class->SUPER::new (
		3431	binding => [],
		3432	commands => [],
		3433	@_,
		3434	)
		3435	}
		3436
		3437	# XXX: Do sorting? Argl...
		3438	sub add_spell {
		3439	my ($self, $spell) = @_;
		3440	$self->{spells}->{$spell->{name}} = $spell;
		3441
		3442	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3443	face => $spell->{face},
		3444	can_hover => 1,
		3445	can_events => 1,
		3446	tooltip => $spell->{message});
		3447
		3448	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3449	text => $spell->{name},
		3450	can_hover => 1,
		3451	can_events => 1,
		3452	tooltip => $spell->{message},
		3453	expand => 1);
		3454
		3455	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3456	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3457	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3458	expand => 1);
		3459
		3460	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3461	text => "bind to key",
		3462	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3463	}
		3464
		3465	sub rebuild_spell_list {
		3466	my ($self) = @_;
		3467	$self->{tbl_idx} = 0;
		3468	$self->add_spell ($_) for values %{$self->{spells}};
		3469	}
		3470
		3471	sub remove_spell {
		3472	my ($self, $spell) = @_;
		3473	delete $self->{spells}->{$spell->{name}};
		3474	$self->rebuild_spell_list;
		3475	}
		3476
		3477	#############################################################################
		3478
3002	package CFClient::UI::Root;	3479	package CFClient::UI::Root;
3003		3480
3004	our @ISA = CFClient::UI::Container::;	3481	our @ISA = CFClient::UI::Container::;
3005		3482
3006	use CFClient::OpenGL;	3483	use CFClient::OpenGL;
…		…
3016	Scalar::Util::weaken ($self->{root} = $self);	3493	Scalar::Util::weaken ($self->{root} = $self);
3017		3494
3018	$self	3495	$self
3019	}	3496	}
3020		3497
3021	sub configure {
3022	my ($self, $x, $y, $w, $h) = @_;
3023
3024	$self->{w} = $w;
3025	$self->{h} = $h;
3026	}
3027
3028	sub reconfigure {
3029	my ($self) = @_;
3030
3031	$self->SUPER::reconfigure;
3032
3033	$self->size_allocate ($self->{w}, $self->{h}, 1)
3034	if $self->{w};
3035	}
3036
3037	sub size_request {	3498	sub size_request {
3038	my ($self) = @_;	3499	my ($self) = @_;
3039		3500
3040	($self->{w}, $self->{h})	3501	($self->{w}, $self->{h})
3041	}	3502	}
…		…
3053		3514
3054	int $coord + 0.5	3515	int $coord + 0.5
3055	}	3516	}
3056		3517
3057	sub size_allocate {	3518	sub size_allocate {
3058	my ($self, $w, $h, $changed) = @_;	3519	my ($self, $w, $h) = @_;
3059		3520
3060	for my $child ($self->children) {	3521	for my $child ($self->children) {
3061	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3522	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062		3523
3063	$X = $child->{force_x} if exists $child->{force_x};	3524	$X = $child->{force_x} if exists $child->{force_x};
…		…
3131	$_->()	3592	$_->()
3132	for values %{delete $self->{refresh_hook}};	3593	for values %{delete $self->{refresh_hook}};
3133	}	3594	}
3134		3595
3135	if ($self->{realloc}) {	3596	if ($self->{realloc}) {
		3597	my %queue;
3136	my @queue;	3598	my @queue;
		3599	my $widget;
3137		3600
		3601	outer:
3138	while () {	3602	while () {
3139	if ($self->{realloc}) {	3603	if (my $realloc = delete $self->{realloc}) {
3140	#TODO use array-of-depth approach	3604	for $widget (values %$realloc) {
		3605	$widget->{visible} or next; # do not resize invisible widgets
3141		3606
3142	@queue = sort { $a->{visible} <=> $b->{visible} }	3607	$queue{$widget+0}++ and next; # duplicates are common
3143	@queue, values %{delete $self->{realloc}};	3608
		3609	push @{ $queue[$widget->{visible}] }, $widget;
		3610	}
3144	}	3611	}
3145		3612
		3613	while () {
		3614	@queue or last outer;
		3615
3146	my $widget = pop @queue || last;	3616	$widget = pop @{ $queue[-1] || [] }
		3617	and last;
		3618
		3619	pop @queue;
		3620	}
3147		3621
3148	$widget->{visible} or last; # do not resize invisible widgets	3622	delete $queue{$widget+0};
3149		3623
3150	my ($w, $h) = $widget->size_request;	3624	my ($w, $h) = $widget->size_request;
3151		3625
3152	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3626	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3627	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3154		3628
3155	$w = $widget->{force_w} if exists $widget->{force_w};	3629	$w = $widget->{force_w} if exists $widget->{force_w};
3156	$h = $widget->{force_h} if exists $widget->{force_h};	3630	$h = $widget->{force_h} if exists $widget->{force_h};
3157		3631
		3632	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3633	|| delete $widget->{force_realloc}) {
3158	$widget->{req_w} = $w;	3634	$widget->{req_w} = $w;
3159	$widget->{req_h} = $h;	3635	$widget->{req_h} = $h;
3160		3636
3161	$self->{size_alloc}{$widget} = [$widget, undef, undef];	3637	$self->{size_alloc}{$widget+0} = $widget;
3162		3638
3163	push @queue, $widget->{parent}	3639	if (my $parent = $widget->{parent}) {
3164	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};	3640	$self->{realloc}{$parent+0} = $parent
		3641	unless $queue{$parent+0};
		3642
		3643	$parent->{force_size_alloc} = 1;
		3644	$self->{size_alloc}{$parent+0} = $parent;
		3645	}
		3646	}
		3647
		3648	delete $self->{realloc}{$widget+0};
3165	}	3649	}
3166	}	3650	}
3167		3651
3168	while (my $size_alloc = delete $self->{size_alloc}) {	3652	while (my $size_alloc = delete $self->{size_alloc}) {
3169	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	3653	my @queue = sort { $b->{visible} <=> $a->{visible} }
3170	values %$size_alloc;	3654	values %$size_alloc;
3171		3655
3172	while () {	3656	while () {
3173	my ($widget, $w, $h) = @{ pop @queue or last };	3657	my $widget = pop @queue || last;
3174		3658
3175	$w = $widget->{w} || $widget->{req_w} unless defined $w;	3659	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3177		3660
3178	$w = 0 if $w < 0;	3661	$w = 0 if $w < 0;
3179	$h = 0 if $h < 0;	3662	$h = 0 if $h < 0;
3180		3663
3181	$w = int $w + 0.5;	3664	$w = int $w + 0.5;
3182	$h = int $h + 0.5;	3665	$h = int $h + 0.5;
3183		3666
3184	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3667	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3668	$widget->{old_w} = $widget->{w};
		3669	$widget->{old_h} = $widget->{h};
3185		3670
3186	$widget->{w} = $w;	3671	$widget->{w} = $w;
3187	$widget->{h} = $h;	3672	$widget->{h} = $h;
3188		3673
3189	$widget->emit (size_allocate => $w, $h, $changed);	3674	$widget->emit (size_allocate => $w, $h);
		3675	}
3190	}	3676	}
3191	}	3677	}
3192		3678
3193	while ($self->{post_alloc_hook}) {	3679	while ($self->{post_alloc_hook}) {
3194	$_->()	3680	$_->()
3195	for values %{delete $self->{post_alloc_hook}};	3681	for values %{delete $self->{post_alloc_hook}};
3196	}	3682	}
		3683
3197		3684
3198	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3685	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3686	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200	glClear GL_COLOR_BUFFER_BIT;	3687	glClear GL_COLOR_BUFFER_BIT;
3201		3688
…		…
3203	glLoadIdentity;	3690	glLoadIdentity;
3204	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3691	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205	glMatrixMode GL_MODELVIEW;	3692	glMatrixMode GL_MODELVIEW;
3206	glLoadIdentity;	3693	glLoadIdentity;
3207		3694
		3695	{
		3696	package CFClient::UI::Base;
		3697
		3698	($draw_x, $draw_y, $draw_w, $draw_h) =
		3699	(0, 0, $self->{w}, $self->{h});
		3700	}
		3701
3208	$self->_draw;	3702	$self->_draw;
3209	}	3703	}
3210		3704
3211	#############################################################################	3705	#############################################################################
3212		3706

Diff Legend

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