[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

…		…
171	sub rescale_widgets {	171	sub rescale_widgets {
172	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
173		173
174	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
175	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
176	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178		178
179	$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.]+$/;
180	$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};
181	$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};
182	$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.]+$/;
183	$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};
184	$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};
185		185
186	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188		188
189	}	189	}
190	}	190	}
191		191
192	reconfigure_widgets;	192	reconfigure_widgets;
…		…
371	sub size_allocate {	371	sub size_allocate {
372	# nothing to be done	372	# nothing to be done
373	}	373	}
374		374
375	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
376	}	381	}
377		382
378	sub set_max_size {	383	sub set_max_size {
379	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
380		385
…		…
439		444
440	$::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
441	unless $FOCUS;	446	unless $FOCUS;
442	}	447	}
443		448
444	sub mouse_motion { }	449	sub mouse_motion { 0 }
445	sub button_up { }	450	sub button_up { 0 }
446	sub key_down { }	451	sub key_down { 0 }
447	sub key_up { }	452	sub key_up { 0 }
448		453
449	sub button_down {	454	sub button_down {
450	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
451		456
452	$self->focus_in;	457	$self->focus_in;
453	}
454		458
455	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
456	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
457	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
458	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
459	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
460		461
461	sub find_widget {	462	sub find_widget {
462	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
463		464
464	return () unless $self->{can_events};	465	return () unless $self->{can_events};
…		…
526		527
527	$self->realloc;	528	$self->realloc;
528	$self->update;	529	$self->update;
529	}	530	}
530		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
531	sub draw {	536	sub draw {
532	my ($self) = @_;	537	my ($self) = @_;
533		538
534	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);
535		550
536	glPushMatrix;	551	glPushMatrix;
537	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
538	$self->_draw;
539	glPopMatrix;
540		553
541	if ($self == $HOVER && $self->{can_hover}) {	554	if ($self == $HOVER && $self->{can_hover}) {
542	my ($x, $y) = @$self{qw(x y)};
543
544	glColor 1, 0.8, 0.5, 0.2;	555	glColor 10.2, 0.80.2, 0.5*0.2, 0.2;
545	glEnable GL_BLEND;	556	glEnable GL_BLEND;
546	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	557	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
547	glBegin GL_QUADS;	558	glBegin GL_QUADS;
548	glVertex $x , $y;	559	glVertex 0 , 0;
549	glVertex $x + $self->{w}, $y;	560	glVertex $self->{w}, 0;
550	glVertex $x + $self->{w}, $y + $self->{h};	561	glVertex $self->{w}, $self->{h};
551	glVertex $x , $y + $self->{h};	562	glVertex 0 , $self->{h};
552	glEnd;	563	glEnd;
553	glDisable GL_BLEND;	564	glDisable GL_BLEND;
554	}	565	}
555		566
556	if ($ENV{CFPLUS_DEBUG} & 1) {	567	if ($ENV{CFPLUS_DEBUG} & 1) {
557	glPushMatrix;	568	glPushMatrix;
558	glColor 1, 1, 0, 1;	569	glColor 1, 1, 0, 1;
559	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	570	glTranslate 0.375, 0.375;
560	glBegin GL_LINE_LOOP;	571	glBegin GL_LINE_LOOP;
561	glVertex 0 , 0;	572	glVertex 0 , 0;
562	glVertex $self->{w} - 1, 0;	573	glVertex $self->{w} - 1, 0;
563	glVertex $self->{w} - 1, $self->{h} - 1;	574	glVertex $self->{w} - 1, $self->{h} - 1;
564	glVertex 0 , $self->{h} - 1;	575	glVertex 0 , $self->{h} - 1;
565	glEnd;	576	glEnd;
566	glPopMatrix;	577	glPopMatrix;
567	#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;
568	}	579	}
		580
		581	$self->_draw;
		582	glPopMatrix;
569	}	583	}
570		584
571	sub _draw {	585	sub _draw {
572	my ($self) = @_;	586	my ($self) = @_;
573		587
…		…
611		625
612	if ($color && (@$color < 4 \|\| $color->[3])) {	626	if ($color && (@$color < 4 \|\| $color->[3])) {
613	my ($w, $h) = @$self{qw(w h)};	627	my ($w, $h) = @$self{qw(w h)};
614		628
615	glEnable GL_BLEND;	629	glEnable GL_BLEND;
616	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
617	glColor @$color;	631	glColor_premultiply @$color;
618		632
619	glBegin GL_QUADS;	633	glBegin GL_QUADS;
620	glVertex 0 , 0;	634	glVertex 0 , 0;
621	glVertex 0 , $h;	635	glVertex 0 , $h;
622	glVertex $w, $h;	636	glVertex $w, $h;
…		…
653	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFClient::UI::Base::;
654		668
655	sub new {	669	sub new {
656	my ($class, %arg) = @_;	670	my ($class, %arg) = @_;
657		671
658	my $children = delete $arg{children} \|\| [];	672	my $children = delete $arg{children};
659		673
660	my $self = $class->SUPER::new (	674	my $self = $class->SUPER::new (
661	children => [],	675	children => [],
662	can_events => 0,	676	can_events => 0,
663	%arg,	677	%arg,
664	);	678	);
		679
665	$self->add ($_) for @$children;	680	$self->add (@$children)
		681	if $children;
666		682
667	$self	683	$self
668	}	684	}
669		685
670	sub add {	686	sub add {
…		…
718	$x -= $self->{x};	734	$x -= $self->{x};
719	$y -= $self->{y};	735	$y -= $self->{y};
720		736
721	my $res;	737	my $res;
722		738
723	for (reverse @{ $self->{children} }) {	739	for (reverse $self->visible_children) {
724	$res = $_->find_widget ($x, $y)	740	$res = $_->find_widget ($x, $y)
725	and return $res;	741	and return $res;
726	}	742	}
727		743
728	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	744	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
777	$self->{children}[0]->configure (0, 0, $w, $h);	793	$self->{children}[0]->configure (0, 0, $w, $h);
778	}	794	}
779		795
780	#############################################################################	796	#############################################################################
781		797
		798	# back-buffered drawing area
		799
782	package CFClient::UI::Window;	800	package CFClient::UI::Window;
783		801
784	our @ISA = CFClient::UI::Bin::;	802	our @ISA = CFClient::UI::Bin::;
785		803
786	use CFClient::OpenGL;	804	use CFClient::OpenGL;
…		…
804	$self->SUPER::size_allocate ($w, $h);	822	$self->SUPER::size_allocate ($w, $h);
805	$self->update;	823	$self->update;
806	}	824	}
807		825
808	sub _render {	826	sub _render {
		827	my ($self) = @_;
		828
809	$_[0]{children}[0]->draw;	829	$self->{children}[0]->draw;
810	}	830	}
811		831
812	sub render_child {	832	sub render_child {
813	my ($self) = @_;	833	my ($self) = @_;
814		834
815	$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 {
816	glClearColor 0, 0, 0, 0;	836	glClearColor 0, 0, 0, 0;
817	glClear GL_COLOR_BUFFER_BIT;	837	glClear GL_COLOR_BUFFER_BIT;
818		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
819	$self->_render;	846	$self->_render;
820	};	847	};
821	}	848	}
822		849
823	sub _draw {	850	sub _draw {
824	my ($self) = @_;	851	my ($self) = @_;
825		852
826	my ($w, $h) = ($self->w, $self->h);	853	my ($w, $h) = @$self{qw(w h)};
827		854
828	my $tex = $self->{texture}	855	my $tex = $self->{texture}
829	or return;	856	or return;
830		857
831	glEnable GL_TEXTURE_2D;	858	glEnable GL_TEXTURE_2D;
832	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;
833	glColor 1, 1, 1, 1;	862	glColor 0, 0, 0, 1;
834		863
835	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	864	$tex->draw_quad (0, 0, $w, $h);
836		865
		866	glDisable GL_BLEND;
837	glDisable GL_TEXTURE_2D;	867	glDisable GL_TEXTURE_2D;
838	}	868	}
839		869
840	#############################################################################	870	#############################################################################
841		871
…		…
914	}	944	}
915		945
916	sub _render {	946	sub _render {
917	my ($self) = @_;	947	my ($self) = @_;
918		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
919	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	952	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
920		953
921	$self->SUPER::_render;	954	$self->SUPER::_render;
922	}	955	}
923		956
…		…
926	package CFClient::UI::ScrolledWindow;	959	package CFClient::UI::ScrolledWindow;
927		960
928	our @ISA = CFClient::UI::HBox::;	961	our @ISA = CFClient::UI::HBox::;
929		962
930	sub new {	963	sub new {
931	my $class = shift;	964	my ($class, %arg) = @_;
		965
		966	my $child = delete $arg{child};
932		967
933	my $self;	968	my $self;
934		969
935	my $slider = new CFClient::UI::Slider	970	my $slider = new CFClient::UI::Slider
936	vertical => 1,	971	vertical => 1,
…		…
941	;	976	;
942		977
943	$self = $class->SUPER::new (	978	$self = $class->SUPER::new (
944	vp => (new CFClient::UI::ViewPort expand => 1),	979	vp => (new CFClient::UI::ViewPort expand => 1),
945	slider => $slider,	980	slider => $slider,
946	@_,	981	%arg,
947	);	982	);
948		983
949	$self->{vp}->add ($self->{scrolled});
950	$self->add ($self->{vp});
951	$self->add ($self->{slider});	984	$self->SUPER::add ($self->{vp}, $self->{slider});
		985	$self->add ($child) if $child;
952		986
953	$self	987	$self
		988	}
		989
		990	sub add {
		991	my ($self, $widget) = @_;
		992
		993	$self->{vp}->add ($self->{child} = $widget);
954	}	994	}
955		995
956	sub update {	996	sub update {
957	my ($self) = @_;	997	my ($self) = @_;
958		998
…		…
997		1037
998	if ($self->{bg}) {	1038	if ($self->{bg}) {
999	my ($w, $h) = @$self{qw(w h)};	1039	my ($w, $h) = @$self{qw(w h)};
1000		1040
1001	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
1002	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1003	glColor @{ $self->{bg} };	1043	glColor_premultiply @{ $self->{bg} };
1004		1044
1005	glBegin GL_QUADS;	1045	glBegin GL_QUADS;
1006	glVertex 0 , 0;	1046	glVertex 0 , 0;
1007	glVertex 0 , $h;	1047	glVertex 0 , $h;
1008	glVertex $w, $h;	1048	glVertex $w, $h;
…		…
1030	my @border =	1070	my @border =
1031	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1032	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);
1033		1073
1034	sub new {	1074	sub new {
1035	my $class = shift;	1075	my ($class, %arg) = @_;
		1076
		1077	my $title = delete $arg{title};
1036		1078
1037	my $self = $class->SUPER::new (	1079	my $self = $class->SUPER::new (
1038	bg => [1, 1, 1, 1],	1080	bg => [1, 1, 1, 1],
1039	border_bg => [1, 1, 1, 1],	1081	border_bg => [1, 1, 1, 1],
1040	border => 0.6,	1082	border => 0.6,
1041	can_events => 1,	1083	can_events => 1,
1042	min_w => 16,	1084	min_w => 16,
1043	min_h => 16,	1085	min_h => 16,
1044	@_	1086	%arg,
1045	);	1087	);
1046		1088
1047	$self->{title} &&= new CFClient::UI::Label	1089	$self->{title} = new CFClient::UI::Label
1048	align => 0,	1090	align => 0,
1049	valign => 1,	1091	valign => 1,
1050	text => $self->{title},	1092	text => $title,
1051	fontsize => $self->{border};	1093	fontsize => $self->{border}
		1094	if defined $title;
1052		1095
1053	$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};
1054	}	1104	}
1055		1105
1056	sub border {	1106	sub border {
1057	int $_[0]{border} * $::FONTSIZE	1107	int $_[0]{border} * $::FONTSIZE
1058	}	1108	}
1059		1109
1060	sub size_request {	1110	sub size_request {
1061	my ($self) = @_;	1111	my ($self) = @_;
		1112
		1113	$self->{title}->size_request
		1114	if $self->{title};
1062		1115
1063	my ($w, $h) = $self->SUPER::size_request;	1116	my ($w, $h) = $self->SUPER::size_request;
1064		1117
1065	(	1118	(
1066	$w + $self->border * 2,	1119	$w + $self->border * 2,
…		…
1069	}	1122	}
1070		1123
1071	sub size_allocate {	1124	sub size_allocate {
1072	my ($self, $w, $h) = @_;	1125	my ($self, $w, $h) = @_;
1073		1126
		1127	if ($self->{title}) {
		1128	$self->{title}{w} = $w;
		1129	$self->{title}{h} = $h;
		1130	$self->{title}->size_allocate ($w, $h);
		1131	}
		1132
		1133	my $border = $self->border;
		1134
1074	$h -= List::Util::max 0, $self->border * 2;	1135	$h -= List::Util::max 0, $border * 2;
1075	$w -= List::Util::max 0, $self->border * 2;	1136	$w -= List::Util::max 0, $border * 2;
1076		1137
1077	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1078	if $self->{title};
1079
1080	$self->child->configure ($self->border, $self->border, $w, $h);	1138	$self->child->configure ($border, $border, $w, $h);
1081	}	1139	}
1082		1140
1083	sub button_down {	1141	sub button_down {
1084	my ($self, $ev, $x, $y) = @_;	1142	my ($self, $ev, $x, $y) = @_;
1085		1143
…		…
1104	my $dy = $ev->{y} - $oy;	1162	my $dy = $ev->{y} - $oy;
1105		1163
1106	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1164	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1107	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1165	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1108		1166
		1167	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1109	$self->realloc;	1168	$self->realloc;
1110	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1111	};	1169	};
1112		1170
1113	} elsif ($lr ^ $td) {	1171	} elsif ($lr ^ $td) {
1114	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1172	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1115	my ($bx, $by) = ($self->{x}, $self->{y});	1173	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1118	my ($ev, $x, $y) = @_;	1176	my ($ev, $x, $y) = @_;
1119		1177
1120	($x, $y) = ($ev->{x}, $ev->{y});	1178	($x, $y) = ($ev->{x}, $ev->{y});
1121		1179
1122	$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});
1123	};	1183	};
		1184	} else {
		1185	return 0;
		1186	}
		1187
1124	}	1188	1
1125	}	1189	}
1126		1190
1127	sub button_up {	1191	sub button_up {
1128	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
1129		1193
1130	delete $self->{motion};	1194	!!delete $self->{motion}
1131	}	1195	}
1132		1196
1133	sub mouse_motion {	1197	sub mouse_motion {
1134	my ($self, $ev, $x, $y) = @_;	1198	my ($self, $ev, $x, $y) = @_;
1135		1199
1136	$self->{motion}->($ev, $x, $y) if $self->{motion};	1200	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1201
		1202	!!$self->{motion}
1137	}	1203	}
1138		1204
1139	sub _draw {	1205	sub _draw {
1140	my ($self) = @_;	1206	my ($self) = @_;
1141		1207
		1208	my $child = $self->{children}[0];
		1209
1142	my ($w, $h ) = ($self->{w}, $self->{h});	1210	my ($w, $h ) = ($self->{w}, $self->{h});
1143	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1211	my ($cw, $ch) = ($child->{w}, $child->{h});
1144		1212
1145	glEnable GL_TEXTURE_2D;	1213	glEnable GL_TEXTURE_2D;
1146	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1214	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1147		1215
1148	my $border = $self->border;	1216	my $border = $self->border;
…		…
1163	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1231	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1164	}	1232	}
1165		1233
1166	glDisable GL_TEXTURE_2D;	1234	glDisable GL_TEXTURE_2D;
1167		1235
1168	$self->{title}->draw if $self->{title};
1169
1170	$self->child->draw;	1236	$child->draw;
		1237
		1238	if ($self->{title}) {
		1239	glTranslate 0, $border - $self->{h};
		1240	$self->{title}->_draw;
		1241	}
1171	}	1242	}
1172		1243
1173	#############################################################################	1244	#############################################################################
1174		1245
1175	package CFClient::UI::Table;	1246	package CFClient::UI::Table;
…		…
1523	}	1594	}
1524		1595
1525	sub size_allocate {	1596	sub size_allocate {
1526	my ($self, $w, $h) = @_;	1597	my ($self, $w, $h) = @_;
1527		1598
		1599	delete $self->{ox};
		1600
1528	delete $self->{texture}	1601	delete $self->{texture}
1529	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1602	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1530	}	1603	}
1531		1604
1532	sub set_fontsize {	1605	sub set_fontsize {
…		…
1549	$self->{layout}->set_width ($self->{w});	1622	$self->{layout}->set_width ($self->{w});
1550	$self->{layout}->set_ellipsise ($self->{ellipsise});	1623	$self->{layout}->set_ellipsise ($self->{ellipsise});
1551	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1624	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1552	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1625	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1553		1626
1554	my $tex = new_from_layout CFClient::Texture $self->{layout};	1627	new_from_layout CFClient::Texture $self->{layout}
		1628	};
1555		1629
		1630	unless (exists $self->{ox}) {
1556	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1631	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1557	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1632	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1558	: ($self->{w} - $tex->{w}) * 0.5);	1633	: ($self->{w} - $tex->{w}) * 0.5);
1559		1634
1560	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1635	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1561	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1636	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1562	: ($self->{h} - $tex->{h}) * 0.5);	1637	: ($self->{h} - $tex->{h}) * 0.5);
1563
1564	$tex
1565	};	1638	};
1566		1639
1567	glEnable GL_TEXTURE_2D;	1640	glEnable GL_TEXTURE_2D;
1568	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1569		1642
…		…
1607		1680
1608	delete $self->{cur_h};	1681	delete $self->{cur_h};
1609		1682
1610	return if $self->{text} eq $text;	1683	return if $self->{text} eq $text;
1611		1684
1612	delete $self->{texture};
1613
1614	$self->{last_activity} = $::NOW;	1685	$self->{last_activity} = $::NOW;
1615	$self->{text} = $text;	1686	$self->{text} = $text;
1616		1687
1617	$text =~ s/./*/g if $self->{hidden};	1688	$text =~ s/./*/g if $self->{hidden};
1618	$self->{layout}->set_text ("$text ");	1689	$self->{layout}->set_text ("$text ");
1619		1690
1620	$self->_emit (changed => $self->{text});	1691	$self->_emit (changed => $self->{text});
		1692	$self->update;
1621	}	1693	}
1622		1694
1623	sub set_text {	1695	sub set_text {
1624	my ($self, $text) = @_;	1696	my ($self, $text) = @_;
1625		1697
…		…
1664	$self->{cursor} = length $text;	1736	$self->{cursor} = length $text;
1665	} elsif ($uni == 27) {	1737	} elsif ($uni == 27) {
1666	$self->_emit ('escape');	1738	$self->_emit ('escape');
1667	} elsif ($uni) {	1739	} elsif ($uni) {
1668	substr $text, $self->{cursor}++, 0, chr $uni;	1740	substr $text, $self->{cursor}++, 0, chr $uni;
		1741	} else {
		1742	return 0;
1669	}	1743	}
1670		1744
1671	$self->_set_text ($text);	1745	$self->_set_text ($text);
1672		1746
1673	$self->realloc;	1747	$self->realloc;
		1748
		1749	1
1674	}	1750	}
1675		1751
1676	sub focus_in {	1752	sub focus_in {
1677	my ($self) = @_;	1753	my ($self) = @_;
1678		1754
…		…
1693	utf8::encode $text;	1769	utf8::encode $text;
1694	$self->{cursor} = length substr $text, 0, $idx;	1770	$self->{cursor} = length substr $text, 0, $idx;
1695		1771
1696	$self->_set_text ($self->{text});	1772	$self->_set_text ($self->{text});
1697	$self->update;	1773	$self->update;
		1774
		1775	1
1698	}	1776	}
1699		1777
1700	sub mouse_motion {	1778	sub mouse_motion {
1701	my ($self, $ev, $x, $y) = @_;	1779	my ($self, $ev, $x, $y) = @_;
1702	# 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
1703	}	1783	}
1704		1784
1705	sub _draw {	1785	sub _draw {
1706	my ($self) = @_;	1786	my ($self) = @_;
1707		1787
1708	local $self->{fg} = $self->{fg};	1788	local $self->{fg} = $self->{fg};
1709		1789
1710	if ($FOCUS == $self) {	1790	if ($FOCUS == $self) {
1711	glColor @{$self->{active_bg}};	1791	glColor_premultiply @{$self->{active_bg}};
1712	$self->{fg} = $self->{active_fg};	1792	$self->{fg} = $self->{active_fg};
1713	} else {	1793	} else {
1714	glColor @{$self->{bg}};	1794	glColor_premultiply @{$self->{bg}};
1715	}	1795	}
1716		1796
1717	glEnable GL_BLEND;	1797	glEnable GL_BLEND;
1718	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1798	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1719	glBegin GL_QUADS;	1799	glBegin GL_QUADS;
1720	glVertex 0 , 0;	1800	glVertex 0 , 0;
1721	glVertex 0 , $self->{h};	1801	glVertex 0 , $self->{h};
1722	glVertex $self->{w}, $self->{h};	1802	glVertex $self->{w}, $self->{h};
1723	glVertex $self->{w}, 0;	1803	glVertex $self->{w}, 0;
…		…
1784	} else {	1864	} else {
1785	$self->set_text ($self->{history_saveback});	1865	$self->set_text ($self->{history_saveback});
1786	}	1866	}
1787		1867
1788	} else {	1868	} else {
1789	$self->SUPER::key_down ($ev);	1869	return $self->SUPER::key_down ($ev)
		1870	}
		1871
1790	}	1872	1
1791
1792	}	1873	}
1793		1874
1794	#############################################################################	1875	#############################################################################
1795		1876
1796	package CFClient::UI::Button;	1877	package CFClient::UI::Button;
…		…
1825	my ($self, $ev, $x, $y) = @_;	1906	my ($self, $ev, $x, $y) = @_;
1826		1907
1827	$self->emit ("activate")	1908	$self->emit ("activate")
1828	if $x >= 0 && $x < $self->{w}	1909	if $x >= 0 && $x < $self->{w}
1829	&& $y >= 0 && $y < $self->{h};	1910	&& $y >= 0 && $y < $self->{h};
		1911
		1912	1
1830	}	1913	}
1831		1914
1832	sub _draw {	1915	sub _draw {
1833	my ($self) = @_;	1916	my ($self) = @_;
1834		1917
…		…
1888		1971
1889	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1972	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1890	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1973	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1891	$self->{state} = !$self->{state};	1974	$self->{state} = !$self->{state};
1892	$self->_emit (changed => $self->{state});	1975	$self->_emit (changed => $self->{state});
		1976	} else {
		1977	return 0
		1978	}
		1979
1893	}	1980	1
1894	}	1981	}
1895		1982
1896	sub _draw {	1983	sub _draw {
1897	my ($self) = @_;	1984	my ($self) = @_;
1898		1985
…		…
2065		2152
2066	my $h1 = $self->{h} * (1 - $ycut1);	2153	my $h1 = $self->{h} * (1 - $ycut1);
2067	my $h2 = $self->{h} * (1 - $ycut2);	2154	my $h2 = $self->{h} * (1 - $ycut2);
2068		2155
2069	glEnable GL_BLEND;	2156	glEnable GL_BLEND;
2070	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;
2071	glEnable GL_TEXTURE_2D;	2159	glEnable GL_TEXTURE_2D;
2072	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2160	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2073		2161
2074	glBindTexture GL_TEXTURE_2D, $t1->{name};	2162	glBindTexture GL_TEXTURE_2D, $t1->{name};
2075	glBegin GL_QUADS;	2163	glBegin GL_QUADS;
…		…
2236		2324
2237	$self->SUPER::button_down ($ev, $x, $y);	2325	$self->SUPER::button_down ($ev, $x, $y);
2238		2326
2239	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2327	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240		2328
2241	$self->mouse_motion ($ev, $x, $y);	2329	$self->mouse_motion ($ev, $x, $y)
2242	}	2330	}
2243		2331
2244	sub mouse_motion {	2332	sub mouse_motion {
2245	my ($self, $ev, $x, $y) = @_;	2333	my ($self, $ev, $x, $y) = @_;
2246		2334
…		…
2250	my (undef, $lo, $hi, $page) = @{$self->{range}};	2338	my (undef, $lo, $hi, $page) = @{$self->{range}};
2251		2339
2252	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2340	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253		2341
2254	$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
2255	}	2347	1
2256	}	2348	}
2257		2349
2258	sub update {	2350	sub update {
2259	my ($self) = @_;	2351	my ($self) = @_;
2260		2352
2261	$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}) {
2262	$self->set_value ($self->{range}[0]);	2361	$self->set_value ($self->{range}[0]);
2263		2362
2264	my ($value, $lo, $hi, $page) = @{$self->{range}};	2363	my ($value, $lo, $hi, $page) = @{$self->{range}};
2265	my $range = ($hi - $page - $lo) \|\| 1e-100;	2364	my $range = ($hi - $page - $lo) \|\| 1e-100;
2266		2365
…		…
2272	$value = ($value - $lo) / $range;	2371	$value = ($value - $lo) / $range;
2273	$value = $value * $self->{scale} + $self->{offset};	2372	$value = $value * $self->{scale} + $self->{offset};
2274		2373
2275	$self->{knob_x} = $value - $knob_w * 0.5;	2374	$self->{knob_x} = $value - $knob_w * 0.5;
2276	$self->{knob_w} = $knob_w;	2375	$self->{knob_w} = $knob_w;
2277	});	2376	}
2278
2279	$self->SUPER::update;
2280	}
2281
2282	sub _draw {
2283	my ($self) = @_;
2284		2377
2285	$self->SUPER::_draw ();	2378	$self->SUPER::_draw ();
2286		2379
2287	glScale $self->{w}, $self->{h};	2380	glScale $self->{w}, $self->{h};
2288		2381
…		…
2782	$self->SUPER::DESTROY;	2875	$self->SUPER::DESTROY;
2783	}	2876	}
2784		2877
2785	#############################################################################	2878	#############################################################################
2786		2879
		2880	package CFClient::UI::Buttonbar;
		2881
		2882	our @ISA = CFClient::UI::HBox::;
		2883
		2884	# TODO: should actualyl wrap buttons and other goodies.
		2885
		2886	#############################################################################
		2887
2787	package CFClient::UI::Menu;	2888	package CFClient::UI::Menu;
2788		2889
2789	our @ISA = CFClient::UI::FancyFrame::;	2890	our @ISA = CFClient::UI::FancyFrame::;
2790		2891
2791	use CFClient::OpenGL;	2892	use CFClient::OpenGL;
…		…
2838	my ($self, $ev, $x, $y) = @_;	2939	my ($self, $ev, $x, $y) = @_;
2839		2940
2840	# TODO: should use vbox->find_widget or so	2941	# TODO: should use vbox->find_widget or so
2841	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2942	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2842	$self->{hover} = $self->{item}{$HOVER};	2943	$self->{hover} = $self->{item}{$HOVER};
		2944
		2945	0
2843	}	2946	}
2844		2947
2845	sub button_up {	2948	sub button_up {
2846	my ($self, $ev, $x, $y) = @_;	2949	my ($self, $ev, $x, $y) = @_;
2847		2950
…		…
2849	undef $GRAB;	2952	undef $GRAB;
2850	$self->hide;	2953	$self->hide;
2851		2954
2852	$self->_emit ("popdown");	2955	$self->_emit ("popdown");
2853	$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	);
2854	}	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});
2855	}	3070	}
2856		3071
2857	#############################################################################	3072	#############################################################################
2858		3073
2859	package CFClient::UI::Statusbox;	3074	package CFClient::UI::Statusbox;
…		…
2972		3187
2973	sub new {	3188	sub new {
2974	my $class = shift;	3189	my $class = shift;
2975		3190
2976	my $self = $class->SUPER::new (	3191	my $self = $class->SUPER::new (
2977	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3192	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2978	@_,	3193	@_,
2979	);	3194	);
2980		3195
2981	$self	3196	$self
2982	}	3197	}
2983		3198
2984	sub set_items {	3199	sub set_items {
2985	my ($self, $items) = @_;	3200	my ($self, $items) = @_;
2986		3201
2987	$self->{scrolled}->clear;	3202	$self->{child}->clear;
2988	return unless $items;	3203	return unless $items;
2989		3204
2990	my @items = sort {	3205	my @items = sort {
2991	($a->{type} <=> $b->{type})	3206	($a->{type} <=> $b->{type})
2992	or ($a->{name} cmp $b->{name})	3207	or ($a->{name} cmp $b->{name})
…		…
2996		3211
2997	my $row = 0;	3212	my $row = 0;
2998	for my $item (@items) {	3213	for my $item (@items) {
2999	CFClient::Item::update_widgets $item;	3214	CFClient::Item::update_widgets $item;
3000		3215
3001	$self->{scrolled}->add (0, $row, $item->{face_widget});	3216	$self->{child}->add (0, $row, $item->{face_widget});
3002	$self->{scrolled}->add (1, $row, $item->{desc_widget});	3217	$self->{child}->add (1, $row, $item->{desc_widget});
3003	$self->{scrolled}->add (2, $row, $item->{weight_widget});	3218	$self->{child}->add (2, $row, $item->{weight_widget});
3004		3219
3005	$row++;	3220	$row++;
3006	}	3221	}
3007	}	3222	}
3008		3223
…		…
3106	$rec = $::CONN->stop_record if $::CONN;	3321	$rec = $::CONN->stop_record if $::CONN;
3107	return unless ref $rec eq 'ARRAY';	3322	return unless ref $rec eq 'ARRAY';
3108	$self->set_command_list ($rec);	3323	$self->set_command_list ($rec);
3109	}	3324	}
3110		3325
3111	# if $commit is true, the binding will be set after the user entered a key combo	3326
		3327	sub ask_for_bind_and_commit {
		3328	my ($self) = @_;
		3329	$self->ask_for_bind (1);
		3330	}
		3331
3112	sub ask_for_bind {	3332	sub ask_for_bind {
3113	my ($self, $commit) = @_;	3333	my ($self, $commit) = @_;
3114		3334
3115	CFClient::Binder::open_binding_dialog (sub {	3335	CFClient::Binder::open_binding_dialog (sub {
3116	my ($mod, $sym) = @_;	3336	my ($mod, $sym) = @_;
…		…
3200		3420
3201	#############################################################################	3421	#############################################################################
3202		3422
3203	package CFClient::UI::SpellList;	3423	package CFClient::UI::SpellList;
3204		3424
3205	our @ISA = CFClient::UI::FancyFrame::;	3425	our @ISA = CFClient::UI::Table::;
3206		3426
3207	sub new {	3427	sub new {
3208	my $class = shift;	3428	my $class = shift;
3209		3429
3210	my $self = $class->SUPER::new (binding => [], commands => [], @_);	3430	my $self = $class->SUPER::new (
3211		3431	binding => [],
3212	$self->add (new CFClient::UI::ScrolledWindow	3432	commands => [],
3213	scrolled => $self->{spellbox} = new CFClient::UI::Table);	3433	@_,
3214		3434	)
3215	$self;
3216	}	3435	}
3217		3436
3218	# XXX: Do sorting? Argl...	3437	# XXX: Do sorting? Argl...
3219	sub add_spell {	3438	sub add_spell {
3220	my ($self, $spell) = @_;	3439	my ($self, $spell) = @_;
3221	$self->{spells}->{$spell->{name}} = $spell;	3440	$self->{spells}->{$spell->{name}} = $spell;
3222		3441
3223	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face	3442	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3224	face => $spell->{face},	3443	face => $spell->{face},
3225	can_hover => 1,	3444	can_hover => 1,
3226	can_events => 1,	3445	can_events => 1,
3227	tooltip => $spell->{message});	3446	tooltip => $spell->{message});
3228		3447
3229	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label	3448	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3230	text => $spell->{name},	3449	text => $spell->{name},
3231	can_hover => 1,	3450	can_hover => 1,
3232	can_events => 1,	3451	can_events => 1,
3233	tooltip => $spell->{message},	3452	tooltip => $spell->{message},
3234	expand => 1);	3453	expand => 1);
3235		3454
3236	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label	3455	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3237	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",	3456	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3238	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),	3457	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
3239	expand => 1);	3458	expand => 1);
3240		3459
3241	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button	3460	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3242	text => "bind to key",	3461	text => "bind to key",
3243	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });	3462	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3244	}	3463	}
3245		3464
3246	sub rebuild_spell_list {	3465	sub rebuild_spell_list {
…		…
3471	glLoadIdentity;	3690	glLoadIdentity;
3472	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3691	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3473	glMatrixMode GL_MODELVIEW;	3692	glMatrixMode GL_MODELVIEW;
3474	glLoadIdentity;	3693	glLoadIdentity;
3475		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
3476	$self->_draw;	3702	$self->_draw;
3477	}	3703	}
3478		3704
3479	#############################################################################	3705	#############################################################################
3480		3706

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC vs. Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC