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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.379 by root, Tue Jul 17 12:04:18 2007 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC

…		…
113	}	113	}
114		114
115	if ($GRAB) {	115	if ($GRAB) {
116	if ($ev->{button} == 4 \|\| $ev->{button} == 5) {	116	if ($ev->{button} == 4 \|\| $ev->{button} == 5) {
117	# mousewheel	117	# mousewheel
118	$ev->{dx} = 0;
119	$ev->{dy} = $ev->{button} * 2 - 9;	118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
120	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
121	} else {	125	} else {
122	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
123	}	127	}
124	}	128	}
…		…
547		551
548	# parent	552	# parent
549	$self->{parent} && $self->{parent}->emit ($signal, @args)	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
550	}	554	}
551		555
552	sub find_widget {	556	#sub find_widget {
553	my ($self, $x, $y) = @_;	557	# in .xs
554
555	return () unless $self->{can_events};
556
557	return $self
558	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561	()
562	}
563		558
564	sub set_parent {	559	sub set_parent {
565	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
566		561
567	CFPlus::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
…		…
963	sub size_request {	958	sub size_request {
964	my ($self) = @_;	959	my ($self) = @_;
965		960
966	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	961	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967		962
968	$w = 10 if $self->{scroll_x};	963	$w = 1 if $self->{scroll_x};
969	$h = 10 if $self->{scroll_y};	964	$h = 1 if $self->{scroll_y};
970		965
971	($w, $h)	966	($w, $h)
972	}	967	}
973		968
974	sub invoke_size_allocate {	969	sub invoke_size_allocate {
…		…
1020	my ($self, $x, $y) = @_;	1015	my ($self, $x, $y) = @_;
1021		1016
1022	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1023	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1024	) {	1019	) {
1025	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1020	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1026	} else {	1021	} else {
1027	$self->CFPlus::UI::Base::find_widget ($x, $y)	1022	$self->CFPlus::UI::Base::find_widget ($x, $y)
1028	}	1023	}
1029	}	1024	}
1030		1025
…		…
1093		1088
1094	0	1089	0
1095	},	1090	},
1096	;	1091	;
1097		1092
1098	$self->SUPER::add (0, 0, $self->{vp});	1093	$self->SUPER::add_at (0, 0, $self->{vp});
1099		1094
1100	$self->add ($child) if $child;	1095	$self->add ($child) if $child;
1101		1096
1102	$self	1097	$self
1103	}	1098	}
…		…
1118	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});	1113	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);	1114	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120		1115
1121	my $visible = $w1 > $w2;	1116	my $visible = $w1 > $w2;
1122	if ($visible != $self->{hslider}{visible}) {	1117	if ($visible != $self->{hslider}{visible}) {
1123	$visible ? $self->SUPER::add (0, 1, $self->{hslider})	1118	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1124	: $self->{hslider}->hide;	1119	: $self->{hslider}->hide;
1125	}	1120	}
1126		1121
1127	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});	1122	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);	1123	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129		1124
1130	my $visible = $h1 > $h2;	1125	my $visible = $h1 > $h2;
1131	if ($visible != $self->{vslider}{visible}) {	1126	if ($visible != $self->{vslider}{visible}) {
1132	$visible ? $self->SUPER::add (1, 0, $self->{vslider})	1127	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1133	: $self->{vslider}->hide;	1128	: $self->{vslider}->hide;
1134	}	1129	}
1135	}	1130	}
1136		1131
1137	sub update {	1132	sub update {
1138	my ($self) = @_;	1133	my ($self) = @_;
1139		1134
		1135	$self->update_slider;
1140	$self->SUPER::update;	1136	$self->SUPER::update;
1141	$self->update_slider;
1142	}	1137	}
1143		1138
1144	sub invoke_mouse_wheel {	1139	sub invoke_mouse_wheel {
1145	my ($self, $ev) = @_;	1140	my ($self, $ev) = @_;
1146		1141
1147	return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149	$self->{vslider}->emit (mouse_wheel => $ev);	1142	$self->{vslider}->emit (mouse_wheel => $ev)
		1143	if $ev->{dy};
		1144
		1145	$self->{hslider}->emit (mouse_wheel => $ev)
		1146	if $ev->{dx};
1150		1147
1151	1	1148	1
1152	}	1149	}
1153		1150
1154	sub invoke_button_down {	1151	sub invoke_button_down {
…		…
1355		1352
1356	my @border =	1353	my @border =
1357	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1354	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1358	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1355	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1359		1356
		1357	my @icon =
		1358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1359	qw(x1_move.png x1_resize.png);
		1360
1360	sub new {	1361	sub new {
1361	my ($class, %arg) = @_;	1362	my ($class, %arg) = @_;
1362		1363
1363	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
1364	bg => [1, 1, 1, 1],	1365	bg => [1, 1, 1, 1],
…		…
1532	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1533		1534
1534	my $border = $self->border;	1535	my $border = $self->border;
1535		1536
1536	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1537	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1538	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1539	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1540	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1541	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1542
		1543	# move
		1544	my $w2 = ($w - $border) * .5;
		1545	my $h2 = ($h - $border) * .5;
		1546	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1547	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1548	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1549
		1550	# resize
		1551	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1553	unless $self->{has_close_button};
		1554	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1541		1556
1542	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
1543	glColor @{ $self->{bg} };	1558	glColor @{ $self->{bg} };
1544		1559
1545	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
…		…
1589	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1604	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1590	}	1605	}
1591		1606
1592	# TODO: store row/col info in child widget and use standard add/del	1607	# TODO: store row/col info in child widget and use standard add/del
1593	sub add {	1608	sub add {
1594	my ($self) = shift;	1609	my $self = shift;
		1610
		1611	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1612	$self->add_at (@_);
		1613	}
		1614
		1615	sub add_at {
		1616	my $self = shift;
1595		1617
1596	while (@_) {	1618	while (@_) {
1597	my ($x, $y, $child) = splice @_, 0, 3, ();	1619	my ($col, $row, $child) = splice @_, 0, 3, ();
		1620
		1621	$child->{row} = $row;
		1622	$child->{col} = $col;
		1623
		1624	$child->{rowspan} \|\|= 1;
		1625	$child->{colspan} \|\|= 1;
		1626
1598	$child->set_parent ($self);	1627	$child->set_parent ($self);
1599	$self->{children}[$y][$x] = $child;	1628	$self->{children}[$row][$col] = $child;
1600	}	1629	}
1601		1630
1602	$self->{force_realloc} = 1;	1631	$self->{force_realloc} = 1;
1603	$self->{force_size_alloc} = 1;	1632	$self->{force_size_alloc} = 1;
1604	$self->realloc;	1633	$self->realloc;
…		…
1632	sub get_wh {	1661	sub get_wh {
1633	my ($self) = @_;	1662	my ($self) = @_;
1634		1663
1635	my (@w, @h);	1664	my (@w, @h);
1636		1665
1637	for my $y (0 .. $#{$self->{children}}) {	1666	my @children = $self->children;
1638	my $row = $self->{children}[$y]
1639	or next;
1640		1667
1641	for my $x (0 .. $#$row) {	1668	for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {
1642	my $widget = $row->[$x]	1669	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1643	or next;
1644	my ($w, $h) = @$widget{qw(req_w req_h)};
1645		1670
1646	$w[$x] = max $w[$x], $w;	1671	my $sw = sum @w[$c .. $c + $cs - 1];
1647	$h[$y] = max $h[$y], $h;	1672	my $sh = sum @h[$r .. $r + $rs - 1];
		1673
		1674	if ($w > $sw) {
		1675	$_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
		1676	}
		1677
		1678	if ($h > $sh) {
		1679	$_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1648	}	1680	}
1649	}	1681	}
1650		1682
1651	(\@w, \@h)	1683	(\@w, \@h)
1652	}	1684	}
…		…
1668	my ($ws, $hs) = $self->get_wh;	1700	my ($ws, $hs) = $self->get_wh;
1669		1701
1670	my $req_w = (sum @$ws) \|\| 1;	1702	my $req_w = (sum @$ws) \|\| 1;
1671	my $req_h = (sum @$hs) \|\| 1;	1703	my $req_h = (sum @$hs) \|\| 1;
1672		1704
1673	# TODO: nicer code	1705	# now linearly scale the rows/columns to the allocated size
1674	my @col_expand = @{$self->{col_expand}};	1706	my @col_expand = @{$self->{col_expand}};
1675	@col_expand = (1) x @$ws unless @col_expand;	1707	@col_expand = (1) x @$ws unless @col_expand;
1676	my $col_expand = (sum @col_expand) \|\| 1;	1708	my $col_expand = (sum @col_expand) \|\| 1;
1677		1709
1678	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1710	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
…		…
1685		1717
1686	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1718	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1687		1719
1688	CFPlus::UI::harmonize $hs;	1720	CFPlus::UI::harmonize $hs;
1689		1721
1690	my $y;	1722	my (@x, @y);
1691		1723
		1724	for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1725	for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
		1726
1692	for my $r (0 .. $#{$self->{children}}) {	1727	for my $widget ($self->children) {
1693	my $row = $self->{children}[$r]	1728	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1694	or next;
1695		1729
1696	my $x = 0;	1730	$widget->configure (
1697	my $row_h = $hs->[$r];	1731	$x[$c], $y[$r],
		1732	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1698		1733	);
1699	for my $c (0 .. $#$row) {
1700	my $col_w = $ws->[$c];
1701
1702	if (my $widget = $row->[$c]) {
1703	$widget->configure ($x, $y, $col_w, $row_h);
1704	}
1705
1706	$x += $col_w;
1707	}
1708
1709	$y += $row_h;
1710	}	1734	}
1711		1735
1712	1	1736	1
1713	}	1737	}
1714		1738
…		…
2381		2405
2382	use CFPlus::OpenGL;	2406	use CFPlus::OpenGL;
2383		2407
2384	my @tex =	2408	my @tex =
2385	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2409	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2386	qw(b1_button_active.png);	2410	qw(b1_button_inactive.png b1_button_active.png);
2387		2411
2388	sub new {	2412	sub new {
2389	my $class = shift;	2413	my $class = shift;
2390		2414
2391	$class->SUPER::new (	2415	$class->SUPER::new (
2392	padding_x => 4,	2416	padding_x => 4,
2393	padding_y => 4,	2417	padding_y => 4,
2394	fg => [1, 1, 1],	2418	fg => [1.0, 1.0, 1.0],
2395	active_fg => [0, 0, 1],	2419	active_fg => [0.8, 0.8, 0.8],
2396	can_hover => 1,	2420	can_hover => 1,
2397	align => 0,	2421	align => 0,
2398	valign => 0,	2422	valign => 0,
2399	can_events => 1,	2423	can_events => 1,
2400	@_	2424	@_
…		…
2418		2442
2419	glEnable GL_TEXTURE_2D;	2443	glEnable GL_TEXTURE_2D;
2420	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2444	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2421	glColor 0, 0, 0, 1;	2445	glColor 0, 0, 0, 1;
2422		2446
		2447	my $tex = $tex[$GRAB == $self];
2423	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2448	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2424		2449
2425	glDisable GL_TEXTURE_2D;	2450	glDisable GL_TEXTURE_2D;
2426		2451
2427	$self->SUPER::_draw;	2452	$self->SUPER::_draw;
2428	}	2453	}
…		…
3498	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};	3523	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3499	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};	3524	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3500	$self->{timer} = Event->timer (	3525	$self->{timer} = Event->timer (
3501	parked => 1,	3526	parked => 1,
3502	cb => sub {	3527	cb => sub {
3503	return unless $::CONN;	3528	return unless $::CONN && $widget;
3504
3505	if (!$widget) {#d#
3506	warn "animation widget timer active but widgetd estroyed\n";#d#
3507	warn $_[0]->w->active;#d#
3508	}#d#
3509		3529
3510	++$widget->{frame};	3530	++$widget->{frame};
3511	$widget->update_face;	3531	$widget->update_face;
3512	$widget->update;	3532	$widget->update;
3513		3533
…		…
4262	while ($self->{post_alloc_hook}) {	4282	while ($self->{post_alloc_hook}) {
4263	$_->()	4283	$_->()
4264	for values %{delete $self->{post_alloc_hook}};	4284	for values %{delete $self->{post_alloc_hook}};
4265	}	4285	}
4266		4286
4267
4268	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4287	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4269	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4288	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4270	glClear GL_COLOR_BUFFER_BIT;	4289	glClear GL_COLOR_BUFFER_BIT;
4271		4290
4272	glMatrixMode GL_PROJECTION;	4291	glMatrixMode GL_PROJECTION;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.379 by root, Tue Jul 17 12:04:18 2007 UTC vs. Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.379 by root, Tue Jul 17 12:04:18 2007 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC