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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.80 by root, Wed Apr 12 00:36:13 2006 UTC vs.
Revision 1.100 by elmex, Fri Apr 14 11:32:22 2006 UTC

…		…
133	my ($self, $x, $y, $w, $h) = @_;	133	my ($self, $x, $y, $w, $h) = @_;
134		134
135	$self->_size_allocate ($x, $y, $w, $h);	135	$self->_size_allocate ($x, $y, $w, $h);
136	}	136	}
137		137
138	# translate global koordinates to local coordinate system	138	# translate global coordinates to local coordinate system
139	sub translate {	139	sub translate {
140	my ($self, $x, $y) = @_;	140	my ($self, $x, $y) = @_;
141		141
142	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});	142	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
143	}	143	}
144		144
145	sub focus_in {	145	sub focus_in {
146	my ($self) = @_;	146	my ($self) = @_;
147		147
148	return if $FOCUS == $self;	148	return if $FOCUS == $self;
		149	return unless $self->{can_focus};
149		150
150	my $focus = $FOCUS; $FOCUS = $self;	151	my $focus = $FOCUS; $FOCUS = $self;
151	$focus->update if $focus;	152	$focus->update if $focus;
152	$FOCUS->update;	153	$FOCUS->update;
153	}	154	}
…		…
186	glPushMatrix;	187	glPushMatrix;
187	glTranslate $self->{x}, $self->{y}, 0;	188	glTranslate $self->{x}, $self->{y}, 0;
188	$self->_draw;	189	$self->_draw;
189	glPopMatrix;	190	glPopMatrix;
190		191
191	if ($self == $HOVER) {	192	if ($self == $HOVER && $self->{can_hover}) {
192	my ($x, $y) = @$self{qw(x y)};	193	my ($x, $y) = @$self{qw(x y)};
193		194
194	glColor 0, 0, 1, 0.2;	195	glColor 0, 0, 1, 0.2;
195	glEnable GL_BLEND;	196	glEnable GL_BLEND;
196	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	197	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
…		…
529		530
530	my @tex =	531	my @tex =
531	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	532	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
532	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	533	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
533		534
		535	sub new {
		536	my $class = shift;
		537
		538	# TODO: user_x, user_y, overwrite moveto?
		539
		540	$class->SUPER::new (
		541	bg => [1, 1, 1, 1],
		542	border_bg => [1, 1, 1, 1],
		543	border => $::FONTSIZE * 0.8,
		544	@_
		545	)
		546	}
		547
534	sub size_request {	548	sub size_request {
535	my ($self) = @_;	549	my ($self) = @_;
536		550
537	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};	551	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538		552
539	my ($w, $h) = $self->SUPER::size_request;	553	my ($w, $h) = $self->SUPER::size_request;
540		554
541	$h += $tex[1]->{h};	555	(
542	$h += $tex[4]->{h};	556	$w + $self->{border} * 2,
543	$w += $tex[2]->{w};	557	$h + $self->{border} * 2,
544	$w += $tex[3]->{w};	558	)
545
546	($w, $h)
547	}	559	}
548		560
549	sub size_allocate {	561	sub size_allocate {
550	my ($self, $x, $y, $w, $h) = @_;	562	my ($self, $x, $y, $w, $h) = @_;
551		563
552	$self->_size_allocate ($x, $y, $w, $h) or return;	564	$self->_size_allocate ($x, $y, $w, $h) or return;
553		565
554	$h -= $tex[1]{h};	566	$h -= List::Util::max 0, $self->{border} * 2;
555	$h -= $tex[4]{h};	567	$w -= List::Util::max 0, $self->{border} * 2;
556	$w -= $tex[2]{w};
557	$w -= $tex[3]{w};
558		568
559	$h = $h < 0 ? 0 : $h;	569	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
560	$w = $w < 0 ? 0 : $w;
561
562	my $child = $self->child;
563
564	$child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565	}	570	}
566		571
567	sub button_down {	572	sub button_down {
568	my ($self, $ev, $x, $y) = @_;	573	my ($self, $ev, $x, $y) = @_;
569		574
570	if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}	575	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
571	&& $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {	576	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
572		577
573	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	578	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574	my ($bw, $bh) = ($self->{w}, $self->{h});	579	my ($bw, $bh) = ($self->{w}, $self->{h});
575		580
576	$self->{motion} = sub {	581	$self->{motion} = sub {
…		…
582	$self->{user_h} = $bh + $y - $oy;	587	$self->{user_h} = $bh + $y - $oy;
583	$self->update;	588	$self->update;
584	};	589	};
585		590
586	} elsif ($x >= 0 && $x < $self->{w}	591	} elsif ($x >= 0 && $x < $self->{w}
587	&& $y >= 0 && $y < $tex[1]{h}) {	592	&& $y >= 0 && $y < $self->{border}) {
588		593
589	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	594	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590	my ($bx, $by) = ($self->{x}, $self->{y});	595	my ($bx, $by) = ($self->{x}, $self->{y});
591		596
592	$self->{motion} = sub {	597	$self->{motion} = sub {
…		…
613	}	618	}
614		619
615	sub _draw {	620	sub _draw {
616	my ($self) = @_;	621	my ($self) = @_;
617		622
618	my ($w, $h) = ($self->{w}, $self->{h});	623	my ($w, $h ) = ($self->{w}, $self->{h});
619	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	624	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
620		625
621	glEnable GL_BLEND;	626	glEnable GL_BLEND;
622	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	627	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
623	glEnable GL_TEXTURE_2D;	628	glEnable GL_TEXTURE_2D;
624	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	629	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
625		630
626	my $top = $tex[1];	631	glColor @{ $self->{border_bg} };
627	$top->draw_quad (0, 0, $w, $top->{h});	632	$tex[1]->draw_quad (0, 0, $w, $self->{border});
628		633	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
629	my $left = $tex[3];	634	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
630	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);	635	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
631
632	my $right = $tex[2];
633	$right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
634
635	my $bottom = $tex[4];
636	$bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
637		636
638	my $bg = $tex[0];	637	my $bg = $tex[0];
639		638
640	glBindTexture GL_TEXTURE_2D, $bg->{name};	639	# TODO: repeat texture not scale
641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
643	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
644
645	my $rep_x = $cw / $bg->{w};	640	my $rep_x = $cw / $bg->{w};
646	my $rep_y = $ch / $bg->{h};	641	my $rep_y = $ch / $bg->{h};
647		642
		643	glColor @{ $self->{bg} };
		644
		645	$bg->{s} = $rep_x;
		646	$bg->{t} = $rep_y;
		647	$bg->{wrap_mode} = 1;
648	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);	648	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
649		649
650	glDisable GL_TEXTURE_2D;	650	glDisable GL_TEXTURE_2D;
651	glDisable GL_BLEND;	651	glDisable GL_BLEND;
652		652
653	$self->child->draw;	653	$self->child->draw;
654
655	}	654	}
656		655
657	#############################################################################	656	#############################################################################
658		657
659	package CFClient::UI::Table;	658	package CFClient::UI::Table;
…		…
743		742
744	my $x = 0;	743	my $x = 0;
745	my $row_h = $hs->[$r];	744	my $row_h = $hs->[$r];
746		745
747	for my $c (0 .. $#$row) {	746	for my $c (0 .. $#$row) {
748	my $widget = $row->[$c]
749	or next;
750
751	my $col_w = $ws->[$c];	747	my $col_w = $ws->[$c];
752		748
		749	if (my $widget = $row->[$c]) {
753	$widget->size_allocate ($x, $y, $col_w, $row_h);	750	$widget->size_allocate ($x, $y, $col_w, $row_h);
		751	}
754		752
755	$x += $col_w;	753	$x += $col_w;
756	}	754	}
757		755
758	$y += $row_h;	756	$y += $row_h;
…		…
804	}	802	}
805		803
806	sub size_allocate {	804	sub size_allocate {
807	my ($self, $x, $y, $w, $h) = @_;	805	my ($self, $x, $y, $w, $h) = @_;
808		806
809	$self->_size_allocate ($x, $y, $w, $h) or return;	807	$self->_size_allocate ($x, $y, $w, $h);
810
811	return unless $self->{w};
812		808
813	($h, $w) = ($w, $h);	809	($h, $w) = ($w, $h);
814		810
815	my $children = $self->{children};	811	my $children = $self->{children};
816		812
…		…
864	}	860	}
865		861
866	sub size_allocate {	862	sub size_allocate {
867	my ($self, $x, $y, $w, $h) = @_;	863	my ($self, $x, $y, $w, $h) = @_;
868		864
869	$self->_size_allocate ($x, $y, $w, $h) or return;	865	$self->_size_allocate ($x, $y, $w, $h);
870
871	return unless $self->{h};
872		866
873	my $children = $self->{children};	867	my $children = $self->{children};
874		868
875	my @h = map +($_->size_request)[1], @$children;	869	my @h = map +($_->size_request)[1], @$children;
876		870
…		…
941		935
942	$self->{text} = $text;	936	$self->{text} = $text;
943	$self->{layout}->set_markup ($text);	937	$self->{layout}->set_markup ($text);
944		938
945	delete $self->{texture};	939	delete $self->{texture};
		940	# $self->{w} = $self->{h} = -1;
946	$self->update;	941	$self->update;
947	}	942	}
948		943
949	sub get_text {	944	sub get_text {
950	my ($self, $text) = @_;	945	my ($self, $text) = @_;
…		…
983	sub _draw {	978	sub _draw {
984	my ($self) = @_;	979	my ($self) = @_;
985		980
986	my $tex = $self->{texture} \|\|= do {	981	my $tex = $self->{texture} \|\|= do {
987	$self->{layout}->set_width ($self->{w});	982	$self->{layout}->set_width ($self->{w});
988	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{height});	983	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
989	new_from_layout CFClient::Texture $self->{layout}	984	new_from_layout CFClient::Texture $self->{layout}
990	};	985	};
991		986
992	glEnable GL_BLEND;	987	glEnable GL_BLEND;
993	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	988	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
…		…
999	my $x =	994	my $x =
1000	$self->{align} < 0 ? $self->{padding}	995	$self->{align} < 0 ? $self->{padding}
1001	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	996	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1002	: ($self->{w} - $tex->{w}) * 0.5;	997	: ($self->{w} - $tex->{w}) * 0.5;
1003		998
1004	$tex->draw_quad ($x, $self->{padding});	999	glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
		1000	$tex->draw_quad (0, 0);
1005		1001
1006	glDisable GL_TEXTURE_2D;	1002	glDisable GL_TEXTURE_2D;
1007	glDisable GL_BLEND;	1003	glDisable GL_BLEND;
1008	}	1004	}
1009		1005
…		…
1022	$class->SUPER::new (	1018	$class->SUPER::new (
1023	fg => [1, 1, 1],	1019	fg => [1, 1, 1],
1024	bg => [0, 0, 0, 0.2],	1020	bg => [0, 0, 0, 0.2],
1025	active_bg => [1, 1, 1, 0.5],	1021	active_bg => [1, 1, 1, 0.5],
1026	active_fg => [0, 0, 0],	1022	active_fg => [0, 0, 0],
		1023	can_hover => 1,
		1024	can_focus => 1,
1027	@_	1025	@_
1028	)	1026	)
1029	}	1027	}
1030		1028
1031	sub _set_text {	1029	sub _set_text {
1032	my ($self, $text) = @_;	1030	my ($self, $text) = @_;
1033		1031
		1032	my $old_text = $self->{text};
		1033
1034	$self->{last_activity} = $::NOW;	1034	$self->{last_activity} = $::NOW;
1035		1035
1036	$self->{text} = $text;	1036	$self->{text} = $text;
1037	$self->{layout}->set_width ($self->{w});	1037	$self->{layout}->set_width ($self->{w});
		1038	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1038		1039
1039	$text =~ s/./*/g if $self->{hidden};	1040	$text =~ s/./*/g if $self->{hidden};
1040		1041
1041	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1042	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
1042		1043
1043	$text = substr $text, 0, $self->{cursor};	1044	$text = substr $text, 0, $self->{cursor};
1044	utf8::encode $text;	1045	utf8::encode $text;
1045		1046
1046	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);	1047	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
		1048
		1049	$self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
		1050	if $old_text ne $self->{text};
1047	}	1051	}
1048		1052
1049	sub size_request {	1053	sub size_request {
1050	my ($self) = @_;	1054	my ($self) = @_;
1051		1055
…		…
1161	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1165	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1162	glEnd;	1166	glEnd;
1163	}	1167	}
1164	}	1168	}
1165		1169
1166	#############################################################################
1167
1168	package CFClient::UI::Button;	1170	package CFClient::UI::LineEntry;
1169		1171
1170	our @ISA = CFClient::UI::Label::;	1172	our @ISA = CFClient::UI::Entry::;
1171		1173
1172	use SDL;	1174	use SDL;
1173	use SDL::OpenGL;	1175	use SDL::OpenGL;
		1176
		1177	sub key_down {
		1178	my ($self, $ev) = @_;
		1179
		1180	my $sym = $ev->key_sym;
		1181
		1182	if ($sym == SDLK_RETURN) {
		1183	$self->emit (activate => $self->get_text);
		1184	$self->update;
		1185
		1186	} else {
		1187	$self->SUPER::key_down ($ev);
		1188	}
		1189
		1190	}
		1191
		1192	#############################################################################
		1193
		1194	package CFClient::UI::Button;
		1195
		1196	our @ISA = CFClient::UI::Label::;
		1197
		1198	use SDL;
		1199	use SDL::OpenGL;
		1200
		1201	my @tex =
		1202	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1203	qw(b1_button_active.png);
1174		1204
1175	sub new {	1205	sub new {
1176	my $class = shift;	1206	my $class = shift;
1177		1207
1178	$class->SUPER::new (	1208	$class->SUPER::new (
1179	padding => 4,	1209	padding => 4,
1180	fg => [1, 1, 1],	1210	fg => [1, 1, 1],
1181	bg => [1, 1, 1, 0.2],	1211	bg => [1, 1, 1, 0.2],
1182	active_bg => [0, 0, 0, 0.5],
1183	active_fg => [1, 1, 0],	1212	active_fg => [1, 1, 0],
1184	border_fg => [1, 1, 0],	1213	can_hover => 1,
1185	@_	1214	@_
1186	)	1215	)
1187	}	1216	}
1188		1217
1189	sub button_up {	1218	sub button_up {
…		…
1197		1226
1198	sub _draw {	1227	sub _draw {
1199	my ($self) = @_;	1228	my ($self) = @_;
1200		1229
1201	local $self->{fg} = $self->{fg};	1230	local $self->{fg} = $self->{fg};
		1231	my $tex = $tex[0];
1202		1232
1203	glEnable GL_BLEND;	1233	glEnable GL_BLEND;
		1234	glEnable GL_TEXTURE_2D;
1204	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1235	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205		1236
1206	glTranslate 0.375, 0.375, 0; # make line and polyogon coordinates behave similarly
1207
1208	glBegin GL_LINE_LOOP;
1209	glColor @{$self->{border_fg}};
1210	glVertex 1 , 1;
1211	glVertex 1 , $self->{h} - 2;
1212	glVertex $self->{w} - 2, $self->{h} - 2;
1213	glVertex $self->{w} - 2, 1;
1214	glEnd;
1215
1216	if ($GRAB == $self) {	1237	if ($GRAB == $self) {
1217	glColor @{$self->{active_bg}};
1218	$self->{fg} = $self->{active_fg};	1238	$self->{fg} = $self->{active_fg};
1219	} else {
1220	glColor @{$self->{bg}};
1221	}	1239	}
1222		1240
1223	glBegin GL_QUADS;	1241	glBindTexture GL_TEXTURE_2D, $tex->{name};
1224	glVertex 2 , 2;	1242	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1225	glVertex 2 , $self->{h} - 2;	1243
1226	glVertex $self->{w} - 2, $self->{h} - 2;	1244	$tex->draw_quad (0, 0, $self->{w}, $self->{h});
1227	glVertex $self->{w} - 2, 2;	1245
1228	glEnd;	1246	glDisable GL_TEXTURE_2D;
1229	glDisable GL_BLEND;	1247	glDisable GL_BLEND;
1230		1248
1231	$self->SUPER::_draw;	1249	$self->SUPER::_draw;
1232	}	1250	}
1233		1251
1234	#############################################################################	1252	#############################################################################
1235		1253
1236	package CFClient::UI::Slider;	1254	package CFClient::UI::CheckBox;
1237		1255
1238	use strict;	1256	our @ISA = CFClient::UI::DrawBG::;
1239		1257
		1258	use SDL;
1240	use SDL::OpenGL;	1259	use SDL::OpenGL;
1241
1242	our @ISA = CFClient::UI::DrawBG::;
1243		1260
1244	sub new {	1261	sub new {
1245	my $class = shift;	1262	my $class = shift;
1246		1263
		1264	$class->SUPER::new (
		1265	padding => 2,
		1266	fg => [1, 1, 1],
		1267	active_fg => [1, 1, 0],
		1268	state => 0,
		1269	can_hover => 1,
		1270	@_
		1271	)
		1272	}
		1273
		1274	sub size_request {
		1275	my ($self) = @_;
		1276
		1277	($self->{padding} * 2 + 6) x 2
		1278	}
		1279
		1280	sub size_allocate {
		1281	my ($self, $x, $y, $w, $h) = @_;
		1282
		1283	$self->_size_allocate ($x, $y, $w, $h);
		1284	}
		1285
		1286	sub button_down {
		1287	my ($self, $ev, $x, $y) = @_;
		1288
		1289	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
		1290	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
		1291	$self->{state} = !$self->{state};
		1292	$self->emit (changed => $self->{state});
		1293	}
		1294	}
		1295
		1296	sub _draw {
		1297	my ($self) = @_;
		1298
		1299	$self->SUPER::_draw;
		1300
		1301	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
		1302
		1303	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
		1304
		1305	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		1306
		1307	glBegin GL_LINE_LOOP;
		1308	glVertex 0 , 0;
		1309	glVertex 0 , $s;
		1310	glVertex $s, $s;
		1311	glVertex $s, 0;
		1312	glEnd;
		1313
		1314	if ($self->{state}) {
		1315	glBegin GL_LINES;
		1316	glVertex 0 , 0;
		1317	glVertex $s, $s;
		1318	glVertex $s, 0;
		1319	glVertex 0 , $s;
		1320	glEnd;
		1321	}
		1322	}
		1323
		1324	#############################################################################
		1325
		1326	package CFClient::UI::Slider;
		1327
		1328	use strict;
		1329
		1330	use SDL::OpenGL;
		1331
		1332	our @ISA = CFClient::UI::DrawBG::;
		1333
		1334	my @tex =
		1335	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1336	qw(s1_slider.png s1_slider_bg.png);
		1337
		1338	sub new {
		1339	my $class = shift;
		1340
1247	# range [value, low, high, page]	1341	# range [value, low, high, page]
1248		1342
		1343	# TODO: 0-width page
		1344	# TODO: req_w/h are wrong with vertical
		1345	# TODO: calculations are off
1249	my $self = $class->SUPER::new (	1346	my $self = $class->SUPER::new (
1250	fg => [1, 1, 1],	1347	fg => [1, 1, 1],
1251	active_fg => [0, 0, 0],	1348	active_fg => [0, 0, 0],
1252	range => [0, 0, 100, 10],	1349	range => [0, 0, 100, 10],
1253	req_w => 40,	1350	req_w => 40,
1254	req_h => 10,	1351	req_h => 13,
1255	vertical => 0,	1352	vertical => 0,
		1353	can_hover => 1,
1256	@_	1354	@_
1257	);	1355	);
1258		1356
1259	$self	1357	$self
1260	}	1358	}
…		…
1312	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1410	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1313	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1411	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1314		1412
1315	my ($value, $lo, $hi, $page) = @{$self->{range}};	1413	my ($value, $lo, $hi, $page) = @{$self->{range}};
1316		1414
		1415	# the inner_* stuff is for generating a padding for the slider handle,
		1416	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1417	# correct propably, but it does the job for now
		1418	my $inner_pad = 5; # 5% of width for slider bg texture border
		1419	my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
		1420	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1421
1317	$page = int $page * $w / ($hi - $lo);	1422	$page = int $page * $inner_w / ($hi - $lo);
1318	$value = int +($value - $lo) * $w / ($hi - $lo);	1423	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1319		1424
1320	$w -= $page;	1425	$w -= $page;
1321	$page &= ~1;	1426	$page &= ~1;
1322	glTranslate $page * 0.5, 0, 0;	1427	glTranslate $page * 0.5, 0, 0;
1323	$page \|\|= 2;	1428	$page \|\|= 2;
1324		1429
1325	glColor @$fg;
1326	glBegin GL_LINES;
1327	glVertex 0, 0; glVertex 0, $h;
1328	glVertex $w - 1, 0; glVertex $w - 1, $h;
1329	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1330	glEnd;
1331
1332	my $knob_a = $value - $page * 0.5;	1430	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1333	my $knob_b = $value + $page * 0.5;	1431	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1334		1432
1335	glBegin GL_QUADS;	1433	glEnable GL_BLEND;
1336	glColor @$fg;	1434	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1337	glVertex $knob_a, 0;	1435	glEnable GL_TEXTURE_2D;
1338	glVertex $knob_a, $h;	1436	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1339	glVertex $knob_b, $h;
1340	glVertex $knob_b, 0;
1341		1437
1342	if ($knob_a < $knob_b - 2) {	1438	# draw background
1343	glColor @$bg;	1439	$tex[1]->draw_quad (0, 0, $w, $h);
1344	glVertex $knob_a + 1, 1;	1440
1345	glVertex $knob_a + 1, $h - 1;	1441	# draw handle
1346	glVertex $knob_b - 1, $h - 1;	1442	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1347	glVertex $knob_b - 1, 1;	1443
		1444	glDisable GL_BLEND;
		1445	glDisable GL_TEXTURE_2D;
		1446	}
		1447
		1448	#############################################################################
		1449
		1450	package CFClient::UI::TextView;
		1451
		1452	our @ISA = CFClient::UI::HBox::;
		1453
		1454	use SDL::OpenGL;
		1455
		1456	sub new {
		1457	my $class = shift;
		1458
		1459	my $self = $class->SUPER::new (
		1460	par => [],
		1461	@_,
		1462	children => [
		1463	(new CFClient::UI::Empty expand => 1),
		1464	(new CFClient::UI::Slider vertical => 1),
		1465	],
		1466	);
		1467
		1468	$self
		1469	}
		1470
		1471	sub add_paragraph {
		1472	my ($self, $color, $text) = @_;
		1473
		1474	push @{$self->{par}}, [$color, $text];
		1475	my $count = scalar @{$self->{par}};
		1476	$self->{children}[1]{range} = [$count - 1, 0, $count, 1];
		1477	$self->{children}[1]->update;
		1478	}
		1479
		1480	sub _draw {
		1481	my ($self) = @_;
		1482
		1483	my $par = $self->{par};
		1484
		1485	my $bottom = (scalar @$par) - 1;
		1486
		1487	my $w = $self->{children}[0]{w};
		1488	my $y = $self->{h};
		1489
		1490	glEnable GL_BLEND;
		1491	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1492	glEnable GL_TEXTURE_2D;
		1493	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1494
		1495	# TODO: everything!
		1496	while ($y > 0 && $bottom >= 0) {
		1497	my $par = $par->[$bottom--];
		1498
		1499	my $layout = new CFClient::Layout;
		1500
		1501	$layout->set_height ($::FONTSIZE);
		1502	$layout->set_width ($w);
		1503	$layout->set_text ($par->[1]);
		1504	my $tex = new_from_layout CFClient::Texture $layout;
		1505	$y -= $tex->{h};
		1506
		1507	glColor @{ $par->[0] };
		1508	$tex->draw_quad (0, $y);
1348	}	1509	}
1349	glEnd;	1510
		1511	glDisable GL_TEXTURE_2D;
		1512	glDisable GL_BLEND;
1350	}	1513	}
1351		1514
1352	#############################################################################	1515	#############################################################################
1353		1516
1354	package CFClient::UI::MapWidget;	1517	package CFClient::UI::MapWidget;
…		…
1364		1527
1365	sub new {	1528	sub new {
1366	my $class = shift;	1529	my $class = shift;
1367		1530
1368	$class->SUPER::new (	1531	$class->SUPER::new (
1369	z => -1,	1532	z => -1,
		1533	can_focus => 1,
1370	list => (glGenLists 1),	1534	list => (glGenLists 1),
1371	@_	1535	@_
1372	)	1536	)
1373	}	1537	}
1374		1538
1375	sub key_down {	1539	sub key_down {
…		…
1394	}	1558	}
1395		1559
1396	sub draw {	1560	sub draw {
1397	my ($self) = @_;	1561	my ($self) = @_;
1398		1562
		1563	$self->{need_update}++;#d#
1399	if (delete $self->{need_update}) {	1564	if (delete $self->{need_update}) {
1400	glNewList $self->{list}, GL_COMPILE;	1565	glNewList $self->{list}, GL_COMPILE;
1401		1566
1402	my $mx = $::CONN->{mapx};
1403	my $my = $::CONN->{mapy};
1404
1405	my $map = $::CONN->{map};
1406
1407	my ($xofs, $yofs);
1408
1409	my $sw = 1 + int $::WIDTH / 32;	1567	my $sw = int $::WIDTH / 32;
1410	my $sh = 1 + int $::HEIGHT / 32;	1568	my $sh = int $::HEIGHT / 32;
1411		1569
1412	if ($::CONN->{mapw} > $sw) {	1570	if ($::MAP) {
1413	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1571	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1414	} else {
1415	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1416	}
1417		1572
1418	if ($::CONN->{maph} > $sh) {	1573	if ($::CFG->{fow_enable}) {
1419	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;	1574	if ($::CFG->{fow_smooth}) { # smooth fog of war
1420	} else {	1575	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1421	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	1576	glConvolutionFilter2D
1422	}	1577	GL_CONVOLUTION_2D,
1423		1578	GL_ALPHA,
1424	glEnable GL_TEXTURE_2D;	1579	3, 3,
1425	glEnable GL_BLEND;	1580	GL_ALPHA, GL_FLOAT,
1426	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1581	pack "f*",
1427	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1582	0.1, 0.1, 0.1,
1428		1583	0.1, 0.2, 0.1,
1429	my $sw4 = ($sw + 3) & ~3;	1584	0.1, 0.1, 0.1,
1430	my $darkness = "\x00" x ($sw4 * $sh);
1431
1432	for my $x (0 .. $sw - 1) {
1433	my $row = $map->[$x + $xofs];
1434	for my $y (0 .. $sh - 1) {
1435
1436	my $cell = $row->[$y + $yofs]
1437	or next;	1585	;
1438		1586	glEnable GL_CONVOLUTION_2D;
1439	my $dark = $cell->[0];
1440	if ($dark < 0) {
1441	substr $darkness, $y * $sw4 + $x, 1, chr 224;
1442	} else {
1443	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1444	}	1587	}
1445		1588
1446	for my $num (grep $_, @$cell[1,2,3]) {	1589	my $tex = new CFClient::Texture
1447	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	1590	w => $w,
1448		1591	h => $h,
1449	my ($w, $h) = @$tex{qw(w h)};	1592	data => $data,
		1593	internalformat => GL_ALPHA,
		1594	format => GL_ALPHA;
1450		1595
1451	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);	1596	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1452	}	1597
		1598	glEnable GL_BLEND;
		1599	glEnable GL_TEXTURE_2D;
		1600	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1601
		1602	glColor +($::CFG->{fow_intensity}) x 3, 1;
		1603	$tex->draw_quad (0, 0, $w * 32, $h * 32);
		1604
		1605	glDisable GL_TEXTURE_2D;
		1606	glDisable GL_BLEND;
1453	}	1607	}
1454	}	1608	}
1455		1609
1456	# if (1) { # higher quality darkness
1457	# $lighting =~ s/(.)/$1$1$1/gs;
1458	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1459	#
1460	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1461	#
1462	# $lighting = $pb->get_pixels;
1463	# $lighting =~ s/(.)../$1/gs;
1464	# }
1465
1466	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1467
1468	$darkness = new CFClient::Texture
1469	w => $sw4,
1470	h => $sh,
1471	data => $darkness,
1472	internalformat => GL_ALPHA,
1473	format => GL_ALPHA;
1474
1475	glColor 0.45, 0.45, 0.45, 1;
1476	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1477
1478	glDisable GL_TEXTURE_2D;
1479	glDisable GL_BLEND;
1480
1481	glEndList;	1610	glEndList;
1482	}	1611	}
1483		1612
1484	glCallList $self->{list};	1613	glCallList $self->{list};
		1614
		1615	if ($FOCUS != $self) {
		1616	glColor 64/255, 64/255, 64/255;
		1617	glLogicOp GL_AND;
		1618	glEnable GL_COLOR_LOGIC_OP;
		1619	glBegin GL_QUADS;
		1620	glVertex 0, 0;
		1621	glVertex 0, $::HEIGHT;
		1622	glVertex $::WIDTH, $::HEIGHT;
		1623	glVertex $::WIDTH, 0;
		1624	glEnd;
		1625	glDisable GL_COLOR_LOGIC_OP;
		1626	}
1485	}	1627	}
1486		1628
1487	my %DIR = (	1629	my %DIR = (
1488	SDLK_KP8, [1, "north"],	1630	SDLK_KP8, [1, "north"],
1489	SDLK_KP9, [2, "northeast"],	1631	SDLK_KP9, [2, "northeast"],
…		…
1505		1647
1506	my $mod = $ev->key_mod;	1648	my $mod = $ev->key_mod;
1507	my $sym = $ev->key_sym;	1649	my $sym = $ev->key_sym;
1508		1650
1509	if ($sym == SDLK_KP5) {	1651	if ($sym == SDLK_KP5) {
1510	$::CONN->send ("command stay fire");	1652	$::CONN->user_send ("command stay fire");
		1653	} elsif ($sym == SDLK_a) {
		1654	$::CONN->user_send ("command apply");
1511	} elsif (exists $DIR{$sym}) {	1655	} elsif (exists $DIR{$sym}) {
1512	if ($mod & KMOD_SHIFT) {	1656	if ($mod & KMOD_SHIFT) {
1513	$self->{shft}++;	1657	$self->{shft}++;
1514	$::CONN->send ("command fire $DIR{$sym}[0]");	1658	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1515	} elsif ($mod & KMOD_CTRL) {	1659	} elsif ($mod & KMOD_CTRL) {
1516	$self->{ctrl}++;	1660	$self->{ctrl}++;
1517	$::CONN->send ("command run $DIR{$sym}[0]");	1661	$::CONN->user_send ("command run $DIR{$sym}[0]");
1518	} else {	1662	} else {
1519	$::CONN->send ("command $DIR{$sym}[1]");	1663	$::CONN->user_send ("command $DIR{$sym}[1]");
1520	}	1664	}
1521	}	1665	}
1522	}	1666	}
1523		1667
1524	sub key_up {	1668	sub key_up {
…		…
1526		1670
1527	my $mod = $ev->key_mod;	1671	my $mod = $ev->key_mod;
1528	my $sym = $ev->key_sym;	1672	my $sym = $ev->key_sym;
1529		1673
1530	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	1674	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1531	$::CONN->send ("command fire_stop");	1675	$::CONN->user_send ("command fire_stop");
1532	}	1676	}
1533	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	1677	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1534	$::CONN->send ("command run_stop");	1678	$::CONN->user_send ("command run_stop");
1535	}	1679	}
1536	}	1680	}
1537		1681
1538	#############################################################################	1682	#############################################################################
1539		1683
…		…
1577	glPopMatrix;	1721	glPopMatrix;
1578	}	1722	}
1579		1723
1580	#############################################################################	1724	#############################################################################
1581		1725
		1726	package CFClient::UI::Flopper;
		1727
		1728	our @ISA = CFClient::UI::Button::;
		1729
		1730	sub new {
		1731	my $class = shift;
		1732
		1733	my $self = $class->SUPER::new (
		1734	state => 0,
		1735	connect_activate => \&toggle_flopper,
		1736	@_
		1737	);
		1738
		1739	if ($self->{state}) {
		1740	$self->{state} = 0;
		1741	$self->toggle_flopper;
		1742	}
		1743
		1744	$self
		1745	}
		1746
		1747	sub toggle_flopper {
		1748	my ($self) = @_;
		1749
		1750	# TODO: use animation
		1751	if ($self->{state} = !$self->{state}) {
		1752	$CFClient::UI::TOPLEVEL->add ($self->{other});
		1753	$self->{other}->move (
		1754	($::WIDTH - $self->{other}{w}) * 0.5,
		1755	($::HEIGHT - $self->{other}{h}) * 0.5,
		1756	);
		1757	} else {
		1758	$CFClient::UI::TOPLEVEL->remove ($self->{other});
		1759	}
		1760	}
		1761
		1762	#############################################################################
		1763
1582	package CFClient::UI::Toplevel;	1764	package CFClient::UI::Toplevel;
1583		1765
1584	our @ISA = CFClient::UI::Container::;	1766	our @ISA = CFClient::UI::Container::;
1585		1767
1586	sub size_request {	1768	sub size_request {

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.80 by root, Wed Apr 12 00:36:13 2006 UTC vs. Revision 1.100 by elmex, Fri Apr 14 11:32:22 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.80 by root, Wed Apr 12 00:36:13 2006 UTC vs.
Revision 1.100 by elmex, Fri Apr 14 11:32:22 2006 UTC