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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.374 by root, Mon Jul 16 12:36:48 2007 UTC vs.
Revision 1.386 by root, Fri Jul 20 16:33:45 2007 UTC

…		…
944		944
945	#############################################################################	945	#############################################################################
946		946
947	package CFPlus::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
948		948
		949	use List::Util qw(min max);
		950
949	our @ISA = CFPlus::UI::Window::;	951	our @ISA = CFPlus::UI::Window::;
950		952
951	sub new {	953	sub new {
952	my $class = shift;	954	my $class = shift;
953		955
…		…
984	}	986	}
985		987
986	sub set_offset {	988	sub set_offset {
987	my ($self, $x, $y) = @_;	989	my ($self, $x, $y) = @_;
988		990
		991	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		992	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		993
		994	if ($x != $self->{view_x} or $y != $self->{view_y}) {
989	$self->{view_x} = int $x;	995	$self->{view_x} = $x;
990	$self->{view_y} = int $y;	996	$self->{view_y} = $y;
991		997
		998	$self->emit (changed => $x, $y);
992	$self->update;	999	$self->update;
		1000	}
993	}	1001	}
994		1002
995	# hmm, this does not work for topleft of $self... but we should not ask for that	1003	# hmm, this does not work for topleft of $self... but we should not ask for that
996	sub coord2local {	1004	sub coord2local {
997	my ($self, $x, $y) = @_;	1005	my ($self, $x, $y) = @_;
…		…
1072	row_expand => [1, 0],	1080	row_expand => [1, 0],
1073	%arg,	1081	%arg,
1074	);	1082	);
1075		1083
1076	$self->{vp} = new CFPlus::UI::ViewPort	1084	$self->{vp} = new CFPlus::UI::ViewPort
1077	expand => 1,	1085	expand => 1,
1078	scroll_x => $self->{scroll_x},	1086	scroll_x => $self->{scroll_x},
1079	scroll_y => $self->{scroll_y},	1087	scroll_y => $self->{scroll_y},
		1088	on_changed => sub {
		1089	my ($vp, $x, $y) = @_;
		1090
		1091	$vp->{parent}{hslider}->set_value ($x);
		1092	$vp->{parent}{vslider}->set_value ($y);
		1093
		1094	0
		1095	},
1080	;	1096	;
1081		1097
1082	$self->SUPER::add (0, 0, $self->{vp});	1098	$self->SUPER::add_at (0, 0, $self->{vp});
1083		1099
1084	$self->add ($child) if $child;	1100	$self->add ($child) if $child;
1085		1101
1086	$self	1102	$self
1087	}	1103	}
…		…
1092	my ($self, $widget) = @_;	1108	my ($self, $widget) = @_;
1093		1109
1094	$self->{vp}->add ($self->{child} = $widget);	1110	$self->{vp}->add ($self->{child} = $widget);
1095	}	1111	}
1096		1112
		1113	sub update_slider {
		1114	my ($self) = @_;
		1115
		1116	my $child = ($self->{vp} or return)->child;
		1117
		1118	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1119	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1120
		1121	my $visible = $w1 > $w2;
		1122	if ($visible != $self->{hslider}{visible}) {
		1123	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1124	: $self->{hslider}->hide;
		1125	}
		1126
		1127	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1128	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1129
		1130	my $visible = $h1 > $h2;
		1131	if ($visible != $self->{vslider}{visible}) {
		1132	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1133	: $self->{vslider}->hide;
		1134	}
		1135	}
		1136
		1137	sub update {
		1138	my ($self) = @_;
		1139
		1140	$self->update_slider;
		1141	$self->SUPER::update;
		1142	}
		1143
1097	sub invoke_mouse_wheel {	1144	sub invoke_mouse_wheel {
1098	my ($self, $ev) = @_;	1145	my ($self, $ev) = @_;
1099		1146
1100	return 0 unless $ev->{dy}; # only vertical movements for now	1147	return 0 unless $ev->{dy}; # only vertical movements for now
1101		1148
1102	$self->{vslider}->emit (mouse_wheel => $ev);	1149	$self->{vslider}->emit (mouse_wheel => $ev);
1103		1150
1104	1	1151	1
1105	}	1152	}
1106		1153
1107	sub update_slider {	1154	sub invoke_button_down {
1108	my ($self) = @_;	1155	my ($self, $ev, $x, $y) = @_;
1109		1156
1110	my $child = ($self->{vp} or return)->child;	1157	if ($ev->{button} == 2) {
		1158	$self->grab_focus;
1111		1159
1112	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});	1160	my $ox = $self->{vp}{view_x} + $ev->{x};
1113	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);	1161	my $oy = $self->{vp}{view_y} + $ev->{y};
		1162
		1163	$self->{motion} = sub {
		1164	my ($ev, $x, $y) = @_;
1114		1165
1115	my $visible = $w1 > $w2;	1166	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1116	if ($visible != $self->{hslider}{visible}) {	1167	$self->update;
1117	$visible ? $self->SUPER::add (0, 1, $self->{hslider})	1168	};
1118	: $self->{hslider}->hide;	1169
		1170	return 1;
		1171	}
		1172
1119	}	1173	0
		1174	}
1120		1175
1121	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});	1176	sub invoke_button_up {
1122	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);	1177	my ($self, $ev, $x, $y) = @_;
1123		1178
1124	my $visible = $h1 > $h2;	1179	if (delete $self->{motion}) {
1125	if ($visible != $self->{vslider}{visible}) {	1180	return 1;
1126	$visible ? $self->SUPER::add (1, 0, $self->{vslider})	1181	}
1127	: $self->{vslider}->hide;	1182
1128	}	1183	0
1129	}	1184	}
1130		1185
1131	sub update {	1186	sub invoke_mouse_motion {
1132	my ($self) = @_;	1187	my ($self, $ev, $x, $y) = @_;
1133		1188
1134	$self->SUPER::update;	1189	if ($self->{motion}) {
1135	$self->update_slider;	1190	$self->{motion}->($ev, $x, $y);
		1191	return 1;
		1192	}
		1193
		1194	0
1136	}	1195	}
1137		1196
1138	sub invoke_size_allocate {	1197	sub invoke_size_allocate {
1139	my ($self, $w, $h) = @_;	1198	my ($self, $w, $h) = @_;
1140		1199
…		…
1296		1355
1297	my @border =	1356	my @border =
1298	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1357	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1299	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1358	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1300		1359
		1360	my @icon =
		1361	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1362	qw(x1_move.png x1_resize.png);
		1363
1301	sub new {	1364	sub new {
1302	my ($class, %arg) = @_;	1365	my ($class, %arg) = @_;
1303		1366
1304	my $self = $class->SUPER::new (	1367	my $self = $class->SUPER::new (
1305	bg => [1, 1, 1, 1],	1368	bg => [1, 1, 1, 1],
…		…
1473	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1536	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1474		1537
1475	my $border = $self->border;	1538	my $border = $self->border;
1476		1539
1477	glColor @{ $self->{border_bg} };	1540	glColor @{ $self->{border_bg} };
1478	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1541	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1479	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1542	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1480	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1543	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1481	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1544	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1545
		1546	# move
		1547	my $w2 = ($w - $border) * .5;
		1548	my $h2 = ($h - $border) * .5;
		1549	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1550	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1551	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1552
		1553	# resize
		1554	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1556	unless $self->{has_close_button};
		1557	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1558	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1482		1559
1483	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	1560	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
1484	glColor @{ $self->{bg} };	1561	glColor @{ $self->{bg} };
1485		1562
1486	# TODO: repeat texture not scale	1563	# TODO: repeat texture not scale
…		…
1530	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1607	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1531	}	1608	}
1532		1609
1533	# TODO: store row/col info in child widget and use standard add/del	1610	# TODO: store row/col info in child widget and use standard add/del
1534	sub add {	1611	sub add {
1535	my ($self) = shift;	1612	my $self = shift;
		1613
		1614	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1615	$self->add_at (@_);
		1616	}
		1617
		1618	sub add_at {
		1619	my $self = shift;
1536		1620
1537	while (@_) {	1621	while (@_) {
1538	my ($x, $y, $child) = splice @_, 0, 3, ();	1622	my ($col, $row, $child) = splice @_, 0, 3, ();
		1623
1539	$child->set_parent ($self);	1624	$child->set_parent ($self);
1540	$self->{children}[$y][$x] = $child;	1625	$self->{children}[$row][$col] = $child;
1541	}	1626	}
1542		1627
1543	$self->{force_realloc} = 1;	1628	$self->{force_realloc} = 1;
1544	$self->{force_size_alloc} = 1;	1629	$self->{force_size_alloc} = 1;
1545	$self->realloc;	1630	$self->realloc;
…		…
2322		2407
2323	use CFPlus::OpenGL;	2408	use CFPlus::OpenGL;
2324		2409
2325	my @tex =	2410	my @tex =
2326	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2411	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2327	qw(b1_button_active.png);	2412	qw(b1_button_inactive.png b1_button_active.png);
2328		2413
2329	sub new {	2414	sub new {
2330	my $class = shift;	2415	my $class = shift;
2331		2416
2332	$class->SUPER::new (	2417	$class->SUPER::new (
2333	padding_x => 4,	2418	padding_x => 4,
2334	padding_y => 4,	2419	padding_y => 4,
2335	fg => [1, 1, 1],	2420	fg => [1.0, 1.0, 1.0],
2336	active_fg => [0, 0, 1],	2421	active_fg => [0.8, 0.8, 0.8],
2337	can_hover => 1,	2422	can_hover => 1,
2338	align => 0,	2423	align => 0,
2339	valign => 0,	2424	valign => 0,
2340	can_events => 1,	2425	can_events => 1,
2341	@_	2426	@_
…		…
2359		2444
2360	glEnable GL_TEXTURE_2D;	2445	glEnable GL_TEXTURE_2D;
2361	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2362	glColor 0, 0, 0, 1;	2447	glColor 0, 0, 0, 1;
2363		2448
		2449	my $tex = $tex[$GRAB == $self];
2364	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2450	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365		2451
2366	glDisable GL_TEXTURE_2D;	2452	glDisable GL_TEXTURE_2D;
2367		2453
2368	$self->SUPER::_draw;	2454	$self->SUPER::_draw;
2369	}	2455	}
…		…
3434	);	3520	);
3435		3521
3436	if ($self->{anim} && $self->{animspeed}) {	3522	if ($self->{anim} && $self->{animspeed}) {
3437	CFPlus::weaken (my $widget = $self);	3523	CFPlus::weaken (my $widget = $self);
3438		3524
		3525	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3526	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3439	$self->{timer} = Event->timer (	3527	$self->{timer} = Event->timer (
3440	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3441	hard => 1,	3528	parked => 1,
3442	interval => $self->{animspeed},
3443	cb => sub {	3529	cb => sub {
3444	return unless $::CONN;	3530	return unless $::CONN && $widget;
3445		3531
3446	++$widget->{frame};	3532	++$widget->{frame};
3447	$self->update_face;	3533	$widget->update_face;
3448	$self->update;	3534	$widget->update;
		3535
		3536	$widget->update_timer;
3449	},	3537	},
3450	);	3538	);
3451		3539
3452	$self->update_face;	3540	$self->update_face;
		3541	$self->update_timer;
3453	}	3542	}
3454		3543
3455	$self	3544	$self
		3545	}
		3546
		3547	sub update_timer {
		3548	my ($self) = @_;
		3549
		3550	return unless $self->{timer};
		3551
		3552	if ($self->{visible}) {
		3553	$self->{timer}->at (
		3554	$self->{anim_start}
		3555	+ $self->{animspeed}
		3556	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3557	);
		3558	$self->{timer}->start;
		3559	} else {
		3560	$self->{timer}->stop;
		3561	}
3456	}	3562	}
3457		3563
3458	sub update_face {	3564	sub update_face {
3459	my ($self) = @_;	3565	my ($self) = @_;
3460		3566
…		…
3492	return unless $self->{visible};	3598	return unless $self->{visible};
3493		3599
3494	$self->SUPER::update;	3600	$self->SUPER::update;
3495	}	3601	}
3496		3602
		3603	sub invoke_visibility_change {
		3604	my ($self) = @_;
		3605
		3606	$self->update_timer;
		3607
		3608	0
		3609	}
		3610
3497	sub _draw {	3611	sub _draw {
3498	my ($self) = @_;	3612	my ($self) = @_;
3499		3613
3500	return unless $::CONN;	3614	return unless $::CONN;
3501		3615
…		…
3516	}	3630	}
3517		3631
3518	sub destroy {	3632	sub destroy {
3519	my ($self) = @_;	3633	my ($self) = @_;
3520		3634
3521	$self->{timer}->cancel	3635	(delete $self->{timer})->cancel
3522	if $self->{timer};	3636	if $self->{timer};
3523		3637
3524	$self->SUPER::destroy;	3638	$self->SUPER::destroy;
3525	}	3639	}
3526		3640
…		…
4170	while ($self->{post_alloc_hook}) {	4284	while ($self->{post_alloc_hook}) {
4171	$_->()	4285	$_->()
4172	for values %{delete $self->{post_alloc_hook}};	4286	for values %{delete $self->{post_alloc_hook}};
4173	}	4287	}
4174		4288
4175
4176	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4289	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4177	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4290	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4178	glClear GL_COLOR_BUFFER_BIT;	4291	glClear GL_COLOR_BUFFER_BIT;
4179		4292
4180	glMatrixMode GL_PROJECTION;	4293	glMatrixMode GL_PROJECTION;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.374 by root, Mon Jul 16 12:36:48 2007 UTC vs. Revision 1.386 by root, Fri Jul 20 16:33:45 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.374 by root, Mon Jul 16 12:36:48 2007 UTC vs.
Revision 1.386 by root, Fri Jul 20 16:33:45 2007 UTC