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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.204 by root, Sun May 14 22:24:16 2006 UTC vs.
Revision 1.208 by root, Mon May 15 22:52:17 2006 UTC

…		…
375	glVertex $self->{w}, 0;	375	glVertex $self->{w}, 0;
376	glVertex $self->{w}, $self->{h};	376	glVertex $self->{w}, $self->{h};
377	glVertex 0 , $self->{h};	377	glVertex 0 , $self->{h};
378	glEnd;	378	glEnd;
379	glPopMatrix;	379	glPopMatrix;
380	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	380	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
381	}	381	}
382	}	382	}
383		383
384	sub _draw {	384	sub _draw {
385	my ($self) = @_;	385	my ($self) = @_;
…		…
895	my ($self, $w, $h) = @_;	895	my ($self, $w, $h) = @_;
896		896
897	$h -= List::Util::max 0, $self->border * 2;	897	$h -= List::Util::max 0, $self->border * 2;
898	$w -= List::Util::max 0, $self->border * 2;	898	$w -= List::Util::max 0, $self->border * 2;
899		899
900	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	900	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
901	if $self->{title};	901	if $self->{title};
902		902
903	$self->child->configure ($self->border, $self->border, $w, $h);	903	$self->child->configure ($self->border, $self->border, $w, $h);
904	}	904	}
905		905
…		…
1399	$self->{layout}->set_width ($self->{w});	1399	$self->{layout}->set_width ($self->{w});
1400	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1400	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1401		1401
1402	my $tex = new_from_layout CFClient::Texture $self->{layout};	1402	my $tex = new_from_layout CFClient::Texture $self->{layout};
1403		1403
1404	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1404	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1405	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406	: ($self->{w} - $tex->{w}) * 0.5;	1406	: ($self->{w} - $tex->{w}) * 0.5);
1407		1407
1408	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1408	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1409	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1409	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410	: ($self->{h} - $tex->{h}) * 0.5;	1410	: ($self->{h} - $tex->{h}) * 0.5);
1411		1411
1412	$tex	1412	$tex
1413	};	1413	};
1414		1414
1415	glEnable GL_TEXTURE_2D;	1415	glEnable GL_TEXTURE_2D;
…		…
1470	sub set_text {	1470	sub set_text {
1471	my ($self, $text) = @_;	1471	my ($self, $text) = @_;
1472		1472
1473	$self->{cursor} = length $text;	1473	$self->{cursor} = length $text;
1474	$self->_set_text ($text);	1474	$self->_set_text ($text);
		1475	$self->update;
1475	$self->check_size;	1476	$self->check_size;
1476	$self->update;
1477	}	1477	}
1478		1478
1479	sub get_text {	1479	sub get_text {
1480	$_[0]{text}	1480	$_[0]{text}
1481	}	1481	}
…		…
1521	substr $text, $self->{cursor}++, 0, chr $uni;	1521	substr $text, $self->{cursor}++, 0, chr $uni;
1522	}	1522	}
1523		1523
1524	$self->_set_text ($text);	1524	$self->_set_text ($text);
1525	$self->update;	1525	$self->update;
		1526	$self->check_size;
1526	}	1527	}
1527		1528
1528	sub focus_in {	1529	sub focus_in {
1529	my ($self) = @_;	1530	my ($self) = @_;
1530		1531
…		…
2010	qw(s1_slider.png s1_slider_bg.png);	2011	qw(s1_slider.png s1_slider_bg.png);
2011		2012
2012	sub new {	2013	sub new {
2013	my $class = shift;	2014	my $class = shift;
2014		2015
2015	# range [value, low, high, page]	2016	# range [value, low, high, page, unit]
2016		2017
2017	# TODO: 0-width page	2018	# TODO: 0-width page
2018	# TODO: req_w/h are wrong with vertical	2019	# TODO: req_w/h are wrong with vertical
2019	# TODO: calculations are off	2020	# TODO: calculations are off
2020	my $self = $class->SUPER::new (	2021	my $self = $class->SUPER::new (
…		…
2023	range => [0, 0, 100, 10],	2024	range => [0, 0, 100, 10],
2024	req_w => $::WIDTH / 80,	2025	req_w => $::WIDTH / 80,
2025	req_h => $::WIDTH / 80,	2026	req_h => $::WIDTH / 80,
2026	vertical => 0,	2027	vertical => 0,
2027	can_hover => 1,	2028	can_hover => 1,
2028	inner_pad => 5,	2029	inner_pad => .05,
2029	@_	2030	@_
2030	);	2031	);
2031		2032
		2033	$self->set_value ($self->{range}[0]);
		2034	$self->update;
		2035
2032	$self	2036	$self
		2037	}
		2038
		2039	sub set_value {
		2040	my ($self, $value) = @_;
		2041
		2042	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2043
		2044	$hi = $lo + 1 if $hi <= $lo;
		2045
		2046	$value = $lo if $value < $lo;
		2047	$value = $hi if $value > $hi;
		2048
		2049	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2050	if $unit;
		2051
		2052	$page = $hi - $lo if $page > $hi - $lo;
		2053
		2054	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2055
		2056	if ($value != $old_value) {
		2057	$self->emit (changed => $value);
		2058	$self->update;
		2059	}
2033	}	2060	}
2034		2061
2035	sub size_request {	2062	sub size_request {
2036	my ($self) = @_;	2063	my ($self) = @_;
2037		2064
…		…
2050		2077
2051	sub mouse_motion {	2078	sub mouse_motion {
2052	my ($self, $ev, $x, $y) = @_;	2079	my ($self, $ev, $x, $y) = @_;
2053		2080
2054	if ($GRAB == $self) {	2081	if ($GRAB == $self) {
		2082	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2083
		2084	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2085
		2086	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2087
		2088	$self->set_value ($x * ($hi - $lo) + $lo);
		2089	}
		2090	}
		2091
		2092	sub update {
		2093	my ($self) = @_;
		2094
		2095	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2096	$self->set_value ($self->{range}[0]);
		2097
2055	my ($value, $lo, $hi, $page) = @{$self->{range}};	2098	my ($value, $lo, $hi, $page) = @{$self->{range}};
2056		2099
2057	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2100	my $inner_w = 1 - 2 * $self->{inner_pad};
2058		2101
2059	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2102	$self->{scale} = ($inner_w / ($hi - $lo)) \|\| 1;
2060	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2061		2103
2062	$x -= $inner_pad_px; # substract the padding	2104	$page = $self->{scale} * $page \|\| 10 / ($self->{w} \|\| 1);
2063	$x = $x * ($hi - $lo) / $inner_w + $lo;	2105	$value = $self->{scale} * ($value - $lo);
2064	$x = $lo if $x < $lo;
2065	$x = $hi - $page if $x > $hi - $page;
2066	$self->{range}[0] = $x;
2067		2106
2068	$self->emit (changed => $x);	2107	$value = $self->{inner_pad} + ($value - $page * 0.5);
2069	$self->update;	2108
		2109	$value = 0 if $value < 0;
		2110	$page = 1 - $value if $value + $page > 1;
		2111
		2112	$self->{knob_x} = $value;
		2113	$self->{knob_w} = $page;
2070	}	2114	});
2071	}
2072		2115
2073	# the inner_* stuff is for generating a padding for the slider handle,	2116	$self->SUPER::update;
2074	# so that the handle doesn't leave the texture. This calculation isn't 100%
2075	# correct propably, but it does the job for now
2076	sub _calc_inner_pad_px {
2077	my ($self, $w) = @_;
2078	($w / 100) * $self->{inner_pad} # % to pixels
2079	}	2117	}
2080		2118
2081	sub _draw {	2119	sub _draw {
2082	my ($self) = @_;	2120	my ($self) = @_;
2083		2121
2084	$self->SUPER::_draw ();	2122	$self->SUPER::_draw ();
2085		2123
2086	my ($w, $h) = @$self{qw(w h)};	2124	glScale $self->{w}, $self->{h};
2087		2125
2088	if ($self->{vertical}) {	2126	if ($self->{vertical}) {
2089	# draw a vertical slider like a rotated horizontal slider	2127	# draw a vertical slider like a rotated horizontal slider
2090		2128
2091	glRotate 90, 0, 0, 1;	2129	glRotate 90, 0, 0, 1;
2092	glTranslate 0, -$self->{w}, 0;	2130	glTranslate 0, 1, 0;
2093
2094	($w, $h) = ($h, $w);
2095	}	2131	}
2096		2132
2097	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2133	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2098	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2134	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2099		2135
2100	my ($value, $lo, $hi, $page) = @{$self->{range}};
2101
2102	$hi = $value + 1 if $lo == $hi;
2103
2104	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2105	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2106
2107	$page = int $page * $inner_w / ($hi - $lo);
2108	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2109
2110	$w -= $page;
2111	$page &= ~1;
2112	glTranslate $page * 0.5, 0, 0;
2113	$page \|\|= 2;
2114
2115	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2116	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2117
2118	glEnable GL_TEXTURE_2D;	2136	glEnable GL_TEXTURE_2D;
2119	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2137	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2120		2138
2121	# draw background	2139	# draw background
2122	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2140	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2123		2141
2124	# draw handle	2142	# draw handle
2125	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2143	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2126		2144
2127	glDisable GL_TEXTURE_2D;	2145	glDisable GL_TEXTURE_2D;
2128	}	2146	}
2129		2147
2130	#############################################################################	2148	#############################################################################
…		…
2487		2505
2488	my $desc = $item->{nrof} < 2	2506	my $desc = $item->{nrof} < 2
2489	? $item->{name}	2507	? $item->{name}
2490	: "$item->{nrof} $item->{name_pl}";	2508	: "$item->{nrof} $item->{name_pl}";
2491		2509
		2510	$item->{flags} & Crossfire::Protocol::F_OPEN
		2511	and $desc .= " (open)";
		2512	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2513	and $desc .= " (applied)";
		2514	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2515	and $desc .= " (unpaid)";
		2516	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2517	and $desc .= " (magic)";
		2518	$item->{flags} & Crossfire::Protocol::F_CURSED
		2519	and $desc .= " (cursed)";
		2520	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2521	and $desc .= " (damned)";
		2522	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2523	and $desc .= " *";
2492		2524
2493	my $self = $class->SUPER::new (	2525	my $self = $class->SUPER::new (
2494	can_hover => 1,	2526	can_hover => 1,
2495	can_events => 1,	2527	can_events => 1,
2496	tooltip => (CFClient::UI::Label->escape ($desc)	2528	tooltip => (CFClient::UI::Label->escape ($desc)
…		…
2502	if ($ev->{button} == 1) {	2534	if ($ev->{button} == 1) {
2503	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2535	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504	} elsif ($ev->{button} == 2) {	2536	} elsif ($ev->{button} == 2) {
2505	$::CONN->send ("apply $item->{tag}");	2537	$::CONN->send ("apply $item->{tag}");
2506	} elsif ($ev->{button} == 3) {	2538	} elsif ($ev->{button} == 3) {
2507	CFClient::UI::Menu->new (	2539	my @menu_items = (
2508	items => [
2509	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2540	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2541	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2542	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2543	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2510	[	2544	[
2511	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",	2545	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512	sub { $::CONN->send ("lock $item->{tag}") },	2546	sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2513	],
2514	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517	],	2547	],
2518	)->popup ($ev);	2548	);
		2549
		2550	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2519	}	2551	}
2520		2552
2521	1	2553	1
2522	},	2554	},
2523	%args	2555	%args
…		…
2689	? "<b>$item->{count} ×</b> $item->{text}"	2721	? "<b>$item->{count} ×</b> $item->{text}"
2690	: $item->{text};	2722	: $item->{text};
2691		2723
2692	for ($short) {	2724	for ($short) {
2693	s/^\s+//;	2725	s/^\s+//;
2694	s/\012.*/…/s;	2726	s/\s+/ /g;
2695	my $len = int 40 / $item->{fontsize};	2727	my $len = int 40 / $item->{fontsize};
2696	substr $_, $len, length, "…" if $len < length;	2728	substr $_, $len, length, "…" if $len < length;
2697	}	2729	}
2698		2730
2699	new CFClient::UI::Label	2731	new CFClient::UI::Label
2700	markup => $short,	2732	markup => $short,
2701	tooltip => $item->{tooltip},	2733	tooltip => $item->{tooltip},
2702	tooltip_font => $::FONT_PROP,	2734	tooltip_font => $::FONT_PROP,
2703	tooltip_width => 0.67,	2735	tooltip_width => 0.67,
2704	fontsize => $item->{fontsize},	2736	fontsize => $item->{fontsize},
2705	color => $item->{color},	2737	fg => $item->{fg},
2706	can_events => 1,	2738	can_events => 1,
2707	can_hover => 1	2739	can_hover => 1
2708	};	2740	};
2709	}	2741	}
2710		2742
…		…
2737	id => ++$self->{id},	2769	id => ++$self->{id},
2738	text => $text,	2770	text => $text,
2739	timeout => $timeout,	2771	timeout => $timeout,
2740	tooltip => $text,	2772	tooltip => $text,
2741	fontsize => 0.8,	2773	fontsize => 0.8,
2742	color => [0.8, 0.8, 0.8, 0.8],	2774	fg => [0.8, 0.8, 0.8, 0.8],
2743	pri => 0,	2775	pri => 0,
2744	count => 1,	2776	count => 1,
2745	%arg,	2777	%arg,
2746	};	2778	};
2747	}	2779	}
…		…
2795	if $old_w && $old_h && ($old_w != $w \|\| $old_h != $h);	2827	if $old_w && $old_h && ($old_w != $w \|\| $old_h != $h);
2796		2828
2797	for my $child ($self->children) {	2829	for my $child ($self->children) {
2798	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2830	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2799		2831
		2832	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2833	if exists $child->{req_x};
		2834
		2835	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2836	if exists $child->{req_y};
		2837
2800	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2838	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2801	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2839	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2840
2802	$child->configure ($X, $Y, $W, $H);	2841	$child->configure ($X, $Y, $W, $H);
2803	}	2842	}
2804	}	2843	}
2805		2844
2806	sub coord2local {	2845	sub coord2local {

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.204 by root, Sun May 14 22:24:16 2006 UTC vs. Revision 1.208 by root, Mon May 15 22:52:17 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.204 by root, Sun May 14 22:24:16 2006 UTC vs.
Revision 1.208 by root, Mon May 15 22:52:17 2006 UTC