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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.85 by elmex, Wed Apr 12 12:55:56 2006 UTC vs.
Revision 1.99 by elmex, Fri Apr 14 10:57:35 2006 UTC

…		…
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
643	my $rep_x = $cw / $bg->{w};	640	my $rep_x = $cw / $bg->{w};
644	my $rep_y = $ch / $bg->{h};	641	my $rep_y = $ch / $bg->{h};
645		642
		643	glColor @{ $self->{bg} };
646	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);	644	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
647		645
648	glDisable GL_TEXTURE_2D;	646	glDisable GL_TEXTURE_2D;
649	glDisable GL_BLEND;	647	glDisable GL_BLEND;
650		648
651	$self->child->draw;	649	$self->child->draw;
652
653	}	650	}
654		651
655	#############################################################################	652	#############################################################################
656		653
657	package CFClient::UI::Table;	654	package CFClient::UI::Table;
…		…
801	}	798	}
802		799
803	sub size_allocate {	800	sub size_allocate {
804	my ($self, $x, $y, $w, $h) = @_;	801	my ($self, $x, $y, $w, $h) = @_;
805		802
806	$self->_size_allocate ($x, $y, $w, $h) or return;	803	$self->_size_allocate ($x, $y, $w, $h);
807
808	return unless $self->{w};
809		804
810	($h, $w) = ($w, $h);	805	($h, $w) = ($w, $h);
811		806
812	my $children = $self->{children};	807	my $children = $self->{children};
813		808
…		…
861	}	856	}
862		857
863	sub size_allocate {	858	sub size_allocate {
864	my ($self, $x, $y, $w, $h) = @_;	859	my ($self, $x, $y, $w, $h) = @_;
865		860
866	$self->_size_allocate ($x, $y, $w, $h) or return;	861	$self->_size_allocate ($x, $y, $w, $h);
867
868	return unless $self->{h};
869		862
870	my $children = $self->{children};	863	my $children = $self->{children};
871		864
872	my @h = map +($_->size_request)[1], @$children;	865	my @h = map +($_->size_request)[1], @$children;
873		866
…		…
997	my $x =	990	my $x =
998	$self->{align} < 0 ? $self->{padding}	991	$self->{align} < 0 ? $self->{padding}
999	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	992	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1000	: ($self->{w} - $tex->{w}) * 0.5;	993	: ($self->{w} - $tex->{w}) * 0.5;
1001		994
1002	glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;	995	glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
1003	$tex->draw_quad (0, 0);	996	$tex->draw_quad (0, 0);
1004		997
1005	glDisable GL_TEXTURE_2D;	998	glDisable GL_TEXTURE_2D;
1006	glDisable GL_BLEND;	999	glDisable GL_BLEND;
1007	}	1000	}
…		…
1021	$class->SUPER::new (	1014	$class->SUPER::new (
1022	fg => [1, 1, 1],	1015	fg => [1, 1, 1],
1023	bg => [0, 0, 0, 0.2],	1016	bg => [0, 0, 0, 0.2],
1024	active_bg => [1, 1, 1, 0.5],	1017	active_bg => [1, 1, 1, 0.5],
1025	active_fg => [0, 0, 0],	1018	active_fg => [0, 0, 0],
		1019	can_hover => 1,
		1020	can_focus => 1,
1026	@_	1021	@_
1027	)	1022	)
1028	}	1023	}
1029		1024
1030	sub _set_text {	1025	sub _set_text {
…		…
1161	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1156	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1162	glEnd;	1157	glEnd;
1163	}	1158	}
1164	}	1159	}
1165		1160
		1161	package CFClient::UI::LineEntry;
		1162
		1163	our @ISA = CFClient::UI::Entry::;
		1164
		1165	use SDL;
		1166	use SDL::OpenGL;
		1167
		1168	sub key_down {
		1169	my ($self, $ev) = @_;
		1170
		1171	my $sym = $ev->key_sym;
		1172
		1173	if ($sym == SDLK_RETURN) {
		1174	$self->emit (activate => $self->get_text);
		1175	$self->update;
		1176
		1177	} else {
		1178	$self->SUPER::key_down ($ev);
		1179	}
		1180
		1181	}
		1182
1166	#############################################################################	1183	#############################################################################
1167		1184
1168	package CFClient::UI::Button;	1185	package CFClient::UI::Button;
1169		1186
1170	our @ISA = CFClient::UI::Label::;	1187	our @ISA = CFClient::UI::Label::;
…		…
1182	$class->SUPER::new (	1199	$class->SUPER::new (
1183	padding => 4,	1200	padding => 4,
1184	fg => [1, 1, 1],	1201	fg => [1, 1, 1],
1185	bg => [1, 1, 1, 0.2],	1202	bg => [1, 1, 1, 0.2],
1186	active_fg => [1, 1, 0],	1203	active_fg => [1, 1, 0],
1187	# active_bg => [0, 0, 0, 0.5],	1204	can_hover => 1,
1188	# border_fg => [1, 1, 0],
1189	@_	1205	@_
1190	)	1206	)
1191	}	1207	}
1192		1208
1193	sub button_up {	1209	sub button_up {
…		…
1224	$self->SUPER::_draw;	1240	$self->SUPER::_draw;
1225	}	1241	}
1226		1242
1227	#############################################################################	1243	#############################################################################
1228		1244
1229	package CFClient::UI::Slider;	1245	package CFClient::UI::CheckBox;
1230		1246
1231	use strict;	1247	our @ISA = CFClient::UI::DrawBG::;
1232		1248
		1249	use SDL;
1233	use SDL::OpenGL;	1250	use SDL::OpenGL;
1234
1235	our @ISA = CFClient::UI::DrawBG::;
1236		1251
1237	sub new {	1252	sub new {
1238	my $class = shift;	1253	my $class = shift;
1239		1254
		1255	$class->SUPER::new (
		1256	padding => 2,
		1257	fg => [1, 1, 1],
		1258	active_fg => [1, 1, 0],
		1259	state => 0,
		1260	can_hover => 1,
		1261	@_
		1262	)
		1263	}
		1264
		1265	sub size_request {
		1266	my ($self) = @_;
		1267
		1268	($self->{padding} * 2 + 6) x 2
		1269	}
		1270
		1271	sub size_allocate {
		1272	my ($self, $x, $y, $w, $h) = @_;
		1273
		1274	$self->_size_allocate ($x, $y, $w, $h);
		1275	}
		1276
		1277	sub button_down {
		1278	my ($self, $ev, $x, $y) = @_;
		1279
		1280	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
		1281	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
		1282	$self->{state} = !$self->{state};
		1283	$self->emit (changed => $self->{state});
		1284	}
		1285	}
		1286
		1287	sub _draw {
		1288	my ($self) = @_;
		1289
		1290	$self->SUPER::_draw;
		1291
		1292	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
		1293
		1294	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
		1295
		1296	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		1297
		1298	glBegin GL_LINE_LOOP;
		1299	glVertex 0 , 0;
		1300	glVertex 0 , $s;
		1301	glVertex $s, $s;
		1302	glVertex $s, 0;
		1303	glEnd;
		1304
		1305	if ($self->{state}) {
		1306	glBegin GL_LINES;
		1307	glVertex 0 , 0;
		1308	glVertex $s, $s;
		1309	glVertex $s, 0;
		1310	glVertex 0 , $s;
		1311	glEnd;
		1312	}
		1313	}
		1314
		1315	#############################################################################
		1316
		1317	package CFClient::UI::Slider;
		1318
		1319	use strict;
		1320
		1321	use SDL::OpenGL;
		1322
		1323	our @ISA = CFClient::UI::DrawBG::;
		1324
		1325	my @tex =
		1326	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1327	qw(s1_slider.png s1_slider_bg.png);
		1328
		1329	sub new {
		1330	my $class = shift;
		1331
1240	# range [value, low, high, page]	1332	# range [value, low, high, page]
1241		1333
		1334	# TODO: 0-width page
		1335	# TODO: req_w/h are wrong with vertical
		1336	# TODO: calculations are off
1242	my $self = $class->SUPER::new (	1337	my $self = $class->SUPER::new (
1243	fg => [1, 1, 1],	1338	fg => [1, 1, 1],
1244	active_fg => [0, 0, 0],	1339	active_fg => [0, 0, 0],
1245	range => [0, 0, 100, 10],	1340	range => [0, 0, 100, 10],
1246	req_w => 40,	1341	req_w => 40,
1247	req_h => 10,	1342	req_h => 13,
1248	vertical => 0,	1343	vertical => 0,
		1344	can_hover => 1,
1249	@_	1345	@_
1250	);	1346	);
1251		1347
1252	$self	1348	$self
1253	}	1349	}
…		…
1305	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1401	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1306	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1402	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1307		1403
1308	my ($value, $lo, $hi, $page) = @{$self->{range}};	1404	my ($value, $lo, $hi, $page) = @{$self->{range}};
1309		1405
		1406	# the inner_* stuff is for generating a padding for the slider handle,
		1407	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1408	# correct propably, but it does the job for now
		1409	my $inner_pad = 5; # 5% of width for slider bg texture border
		1410	my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
		1411	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1412
1310	$page = int $page * $w / ($hi - $lo);	1413	$page = int $page * $inner_w / ($hi - $lo);
1311	$value = int +($value - $lo) * $w / ($hi - $lo);	1414	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1312		1415
1313	$w -= $page;	1416	$w -= $page;
1314	$page &= ~1;	1417	$page &= ~1;
1315	glTranslate $page * 0.5, 0, 0;	1418	glTranslate $page * 0.5, 0, 0;
1316	$page \|\|= 2;	1419	$page \|\|= 2;
1317		1420
1318	glColor @$fg;
1319	glBegin GL_LINES;
1320	glVertex 0, 0; glVertex 0, $h;
1321	glVertex $w - 1, 0; glVertex $w - 1, $h;
1322	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1323	glEnd;
1324
1325	my $knob_a = $value - $page * 0.5;	1421	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1326	my $knob_b = $value + $page * 0.5;	1422	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1327		1423
1328	glBegin GL_QUADS;	1424	glEnable GL_BLEND;
1329	glColor @$fg;	1425	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1330	glVertex $knob_a, 0;	1426	glEnable GL_TEXTURE_2D;
1331	glVertex $knob_a, $h;	1427	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1332	glVertex $knob_b, $h;
1333	glVertex $knob_b, 0;
1334		1428
1335	if ($knob_a < $knob_b - 2) {	1429	# draw background
1336	glColor @$bg;	1430	$tex[1]->draw_quad (0, 0, $w, $h);
1337	glVertex $knob_a + 1, 1;	1431
1338	glVertex $knob_a + 1, $h - 1;	1432	# draw handle
1339	glVertex $knob_b - 1, $h - 1;	1433	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1340	glVertex $knob_b - 1, 1;	1434
		1435	glDisable GL_BLEND;
		1436	glDisable GL_TEXTURE_2D;
		1437	}
		1438
		1439	#############################################################################
		1440
		1441	package CFClient::UI::TextView;
		1442
		1443	our @ISA = CFClient::UI::HBox::;
		1444
		1445	use SDL::OpenGL;
		1446
		1447	sub new {
		1448	my $class = shift;
		1449
		1450	my $self = $class->SUPER::new (
		1451	par => [],
		1452	@_,
		1453	children => [
		1454	(new CFClient::UI::Empty expand => 1),
		1455	(new CFClient::UI::Slider vertical => 1),
		1456	],
		1457	);
		1458
		1459	$self
		1460	}
		1461
		1462	sub add_paragraph {
		1463	my ($self, $color, $text) = @_;
		1464
		1465	push @{$self->{par}}, [$color, $text];
		1466	my $count = scalar @{$self->{par}};
		1467	$self->{children}[1]{range} = [$count - 1, 0, $count, 1];
		1468	$self->{children}[1]->update;
		1469	}
		1470
		1471	sub _draw {
		1472	my ($self) = @_;
		1473
		1474	my $par = $self->{par};
		1475
		1476	my $bottom = (scalar @$par) - 1;
		1477
		1478	my $w = $self->{children}[0]{w};
		1479	my $y = $self->{h};
		1480
		1481	glEnable GL_BLEND;
		1482	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1483	glEnable GL_TEXTURE_2D;
		1484	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1485
		1486	# TODO: everything!
		1487	while ($y > 0 && $bottom >= 0) {
		1488	my $par = $par->[$bottom--];
		1489
		1490	my $layout = new CFClient::Layout;
		1491
		1492	$layout->set_height ($::FONTSIZE);
		1493	$layout->set_width ($w);
		1494	$layout->set_text ($par->[1]);
		1495	my $tex = new_from_layout CFClient::Texture $layout;
		1496	$y -= $tex->{h};
		1497
		1498	glColor @{ $par->[0] };
		1499	$tex->draw_quad (0, $y);
1341	}	1500	}
1342	glEnd;	1501
		1502	glDisable GL_TEXTURE_2D;
		1503	glDisable GL_BLEND;
1343	}	1504	}
1344		1505
1345	#############################################################################	1506	#############################################################################
1346		1507
1347	package CFClient::UI::MapWidget;	1508	package CFClient::UI::MapWidget;
…		…
1357		1518
1358	sub new {	1519	sub new {
1359	my $class = shift;	1520	my $class = shift;
1360		1521
1361	$class->SUPER::new (	1522	$class->SUPER::new (
1362	z => -1,	1523	z => -1,
		1524	can_focus => 1,
1363	list => (glGenLists 1),	1525	list => (glGenLists 1),
1364	@_	1526	@_
1365	)	1527	)
1366	}	1528	}
1367		1529
1368	sub key_down {	1530	sub key_down {
…		…
1387	}	1549	}
1388		1550
1389	sub draw {	1551	sub draw {
1390	my ($self) = @_;	1552	my ($self) = @_;
1391		1553
		1554	$self->{need_update}++;#d#
1392	if (delete $self->{need_update}) {	1555	if (delete $self->{need_update}) {
1393	glNewList $self->{list}, GL_COMPILE;	1556	glNewList $self->{list}, GL_COMPILE;
1394		1557
1395	my $mx = $::CONN->{mapx};
1396	my $my = $::CONN->{mapy};
1397
1398	my $map = $::CONN->{map};
1399
1400	my ($xofs, $yofs);
1401
1402	my $sw = 1 + int $::WIDTH / 32;	1558	my $sw = int $::WIDTH / 32;
1403	my $sh = 1 + int $::HEIGHT / 32;	1559	my $sh = int $::HEIGHT / 32;
1404		1560
1405	if ($::CONN->{mapw} > $sw) {	1561	if ($::MAP) {
1406	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1562	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1407	} else {
1408	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1409	}
1410		1563
1411	if ($::CONN->{maph} > $sh) {	1564	if ($::CFG->{fow_enable}) {
1412	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;	1565	if ($::CFG->{fow_smooth}) { # smooth fog of war
1413	} else {	1566	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1414	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	1567	glConvolutionFilter2D
1415	}	1568	GL_CONVOLUTION_2D,
1416		1569	GL_ALPHA,
1417	glEnable GL_TEXTURE_2D;	1570	3, 3,
1418	glEnable GL_BLEND;	1571	GL_ALPHA, GL_FLOAT,
1419	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1572	pack "f*",
1420	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1573	0.1, 0.1, 0.1,
1421		1574	0.1, 0.2, 0.1,
1422	my $sw4 = ($sw + 3) & ~3;	1575	0.1, 0.1, 0.1,
1423	my $darkness = "\x00" x ($sw4 * $sh);
1424
1425	for my $x (0 .. $sw - 1) {
1426	my $row = $map->[$x + $xofs];
1427	for my $y (0 .. $sh - 1) {
1428
1429	my $cell = $row->[$y + $yofs]
1430	or next;	1576	;
1431		1577	glEnable GL_CONVOLUTION_2D;
1432	my $dark = $cell->[0];
1433	if ($dark < 0) {
1434	substr $darkness, $y * $sw4 + $x, 1, chr 224;
1435	} else {
1436	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1437	}	1578	}
1438		1579
1439	for my $num (grep $_, @$cell[1,2,3]) {	1580	my $tex = new CFClient::Texture
1440	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	1581	w => $w,
1441		1582	h => $h,
1442	my ($w, $h) = @$tex{qw(w h)};	1583	data => $data,
		1584	internalformat => GL_ALPHA,
		1585	format => GL_ALPHA;
1443		1586
1444	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);	1587	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1445	}	1588
		1589	glEnable GL_BLEND;
		1590	glEnable GL_TEXTURE_2D;
		1591	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1592
		1593	glColor +($::CFG->{fow_intensity}) x 3, 1;
		1594	$tex->draw_quad (0, 0, $w * 32, $h * 32);
		1595
		1596	glDisable GL_TEXTURE_2D;
		1597	glDisable GL_BLEND;
1446	}	1598	}
1447	}	1599	}
1448		1600
1449	# if (1) { # higher quality darkness
1450	# $lighting =~ s/(.)/$1$1$1/gs;
1451	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1452	#
1453	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1454	#
1455	# $lighting = $pb->get_pixels;
1456	# $lighting =~ s/(.)../$1/gs;
1457	# }
1458
1459	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1460
1461	$darkness = new CFClient::Texture
1462	w => $sw4,
1463	h => $sh,
1464	data => $darkness,
1465	internalformat => GL_ALPHA,
1466	format => GL_ALPHA;
1467
1468	glColor 0.45, 0.45, 0.45, 1;
1469	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1470
1471	glDisable GL_TEXTURE_2D;
1472	glDisable GL_BLEND;
1473
1474	glEndList;	1601	glEndList;
1475	}	1602	}
1476		1603
1477	glCallList $self->{list};	1604	glCallList $self->{list};
		1605
		1606	if ($FOCUS != $self) {
		1607	glColor 64/255, 64/255, 64/255;
		1608	glLogicOp GL_AND;
		1609	glEnable GL_COLOR_LOGIC_OP;
		1610	glBegin GL_QUADS;
		1611	glVertex 0, 0;
		1612	glVertex 0, $::HEIGHT;
		1613	glVertex $::WIDTH, $::HEIGHT;
		1614	glVertex $::WIDTH, 0;
		1615	glEnd;
		1616	glDisable GL_COLOR_LOGIC_OP;
		1617	}
1478	}	1618	}
1479		1619
1480	my %DIR = (	1620	my %DIR = (
1481	SDLK_KP8, [1, "north"],	1621	SDLK_KP8, [1, "north"],
1482	SDLK_KP9, [2, "northeast"],	1622	SDLK_KP9, [2, "northeast"],
…		…
1498		1638
1499	my $mod = $ev->key_mod;	1639	my $mod = $ev->key_mod;
1500	my $sym = $ev->key_sym;	1640	my $sym = $ev->key_sym;
1501		1641
1502	if ($sym == SDLK_KP5) {	1642	if ($sym == SDLK_KP5) {
1503	$::CONN->send ("command stay fire");	1643	$::CONN->user_send ("command stay fire");
1504	} elsif ($sym == SDLK_a) {	1644	} elsif ($sym == SDLK_a) {
1505	$::CONN->send ("command apply");	1645	$::CONN->user_send ("command apply");
1506	} elsif (exists $DIR{$sym}) {	1646	} elsif (exists $DIR{$sym}) {
1507	if ($mod & KMOD_SHIFT) {	1647	if ($mod & KMOD_SHIFT) {
1508	$self->{shft}++;	1648	$self->{shft}++;
1509	$::CONN->send ("command fire $DIR{$sym}[0]");	1649	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1510	} elsif ($mod & KMOD_CTRL) {	1650	} elsif ($mod & KMOD_CTRL) {
1511	$self->{ctrl}++;	1651	$self->{ctrl}++;
1512	$::CONN->send ("command run $DIR{$sym}[0]");	1652	$::CONN->user_send ("command run $DIR{$sym}[0]");
1513	} else {	1653	} else {
1514	$::CONN->send ("command $DIR{$sym}[1]");	1654	$::CONN->user_send ("command $DIR{$sym}[1]");
1515	}	1655	}
1516	}	1656	}
1517	}	1657	}
1518		1658
1519	sub key_up {	1659	sub key_up {
…		…
1521		1661
1522	my $mod = $ev->key_mod;	1662	my $mod = $ev->key_mod;
1523	my $sym = $ev->key_sym;	1663	my $sym = $ev->key_sym;
1524		1664
1525	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	1665	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1526	$::CONN->send ("command fire_stop");	1666	$::CONN->user_send ("command fire_stop");
1527	}	1667	}
1528	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	1668	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1529	$::CONN->send ("command run_stop");	1669	$::CONN->user_send ("command run_stop");
1530	}	1670	}
1531	}	1671	}
1532		1672
1533	#############################################################################	1673	#############################################################################
1534		1674
…		…
1572	glPopMatrix;	1712	glPopMatrix;
1573	}	1713	}
1574		1714
1575	#############################################################################	1715	#############################################################################
1576		1716
		1717	package CFClient::UI::Flopper;
		1718
		1719	our @ISA = CFClient::UI::Button::;
		1720
		1721	sub new {
		1722	my $class = shift;
		1723
		1724	my $self = $class->SUPER::new (
		1725	state => 0,
		1726	connect_activate => \&toggle_flopper,
		1727	@_
		1728	);
		1729
		1730	if ($self->{state}) {
		1731	$self->{state} = 0;
		1732	$self->toggle_flopper;
		1733	}
		1734
		1735	$self
		1736	}
		1737
		1738	sub toggle_flopper {
		1739	my ($self) = @_;
		1740
		1741	# TODO: use animation
		1742	if ($self->{state} = !$self->{state}) {
		1743	$CFClient::UI::TOPLEVEL->add ($self->{other});
		1744	$self->{other}->move (
		1745	($::WIDTH - $self->{other}{w}) * 0.5,
		1746	($::HEIGHT - $self->{other}{h}) * 0.5,
		1747	);
		1748	} else {
		1749	$CFClient::UI::TOPLEVEL->remove ($self->{other});
		1750	}
		1751	}
		1752
		1753	#############################################################################
		1754
1577	package CFClient::UI::Toplevel;	1755	package CFClient::UI::Toplevel;
1578		1756
1579	our @ISA = CFClient::UI::Container::;	1757	our @ISA = CFClient::UI::Container::;
1580		1758
1581	sub size_request {	1759	sub size_request {

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.85 by elmex, Wed Apr 12 12:55:56 2006 UTC vs. Revision 1.99 by elmex, Fri Apr 14 10:57:35 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.85 by elmex, Wed Apr 12 12:55:56 2006 UTC vs.
Revision 1.99 by elmex, Fri Apr 14 10:57:35 2006 UTC