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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.219 by root, Sun May 21 00:34:59 2006 UTC vs.
Revision 1.224 by elmex, Tue May 23 20:00:55 2006 UTC

…		…
134	for (@$vals) {	134	for (@$vals) {
135	my $i = int $_ + $rem;	135	my $i = int $_ + $rem;
136	$rem += $_ - $i;	136	$rem += $_ - $i;
137	$_ = $i;	137	$_ = $i;
138	}	138	}
		139	}
		140
		141	sub full_refresh {
		142	# make a copy, otherwise for complains about freed values.
		143	my @widgets = values %WIDGET;
		144
		145	$_->update
		146	for @widgets;
139	}	147	}
140		148
141	# call when resolution changes etc.	149	# call when resolution changes etc.
142	sub rescale_widgets {	150	sub rescale_widgets {
143	my ($sx, $sy) = @_;	151	my ($sx, $sy) = @_;
…		…
198	%$self = ();	206	%$self = ();
199	}	207	}
200		208
201	sub show {	209	sub show {
202	my ($self) = @_;	210	my ($self) = @_;
203
204	return if $self->{parent};	211	return if $self->{parent};
205		212
206	$CFClient::UI::ROOT->add ($self);	213	$CFClient::UI::ROOT->add ($self);
		214	}
		215
		216	sub show_centered {
		217	my ($self) = @_;
		218	return if $self->{parent};
		219
		220	$self->show;
		221
		222	$CFClient::UI::ROOT->on_post_alloc (
		223	"centered $self" => sub {
		224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		225	},
		226	);
207	}	227	}
208		228
209	sub hide {	229	sub hide {
210	my ($self) = @_;	230	my ($self) = @_;
211		231
…		…
419	Scalar::Util::weaken ($self->{parent} = $parent);	439	Scalar::Util::weaken ($self->{parent} = $parent);
420		440
421	# TODO: req_w _does_change after ->reconfigure	441	# TODO: req_w _does_change after ->reconfigure
422	$self->check_size	442	$self->check_size
423	unless exists $self->{req_w};	443	unless exists $self->{req_w};
		444
		445	$self->show;
424	}	446	}
425		447
426	sub check_size {	448	sub check_size {
427	my ($self, $forced) = @_;	449	my ($self, $forced) = @_;
428		450
…		…
2207		2229
2208	$self->{fontsize} = $fontsize;	2230	$self->{fontsize} = $fontsize;
2209	$self->reflow;	2231	$self->reflow;
2210	}	2232	}
2211		2233
		2234	sub size_allocate {
		2235	my ($self, $w, $h) = @_;
		2236
		2237	$self->SUPER::size_allocate ($w, $h);
		2238
		2239	$self->{layout}->set_font ($self->{font}) if $self->{font};
		2240	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		2241	$self->{layout}->set_width ($self->{children}[0]{w});
		2242
		2243	$self->reflow;
		2244	}
		2245
2212	sub text_height {	2246	sub text_height {
2213	my ($self, $text) = @_;	2247	my ($self, $text, $indent) = @_;
2214		2248
2215	my $layout = $self->{layout};	2249	my $layout = $self->{layout};
2216		2250
2217	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2251	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218	$layout->set_width ($self->{children}[0]{w});	2252	$layout->set_width ($self->{children}[0]{w} - $indent);
2219	$layout->set_markup ($text);	2253	$layout->set_markup ($text);
2220		2254
2221	($layout->size)[1]	2255	($layout->size)[1]
2222	}	2256	}
2223		2257
…		…
2226		2260
2227	$self->{need_reflow}++;	2261	$self->{need_reflow}++;
2228	$self->update;	2262	$self->update;
2229	}	2263	}
2230		2264
2231	sub size_allocate {
2232	my ($self, $w, $h) = @_;
2233
2234	$self->SUPER::size_allocate ($w, $h);
2235
2236	$self->{layout}->set_font ($self->{font}) if $self->{font};
2237	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2238	$self->{layout}->set_width ($self->{children}[0]{w});
2239
2240	$self->reflow;
2241	}
2242
2243	sub add_paragraph {	2265	sub add_paragraph {
2244	my ($self, $color, $text) = @_;	2266	my ($self, $color, $text, $indent) = @_;
2245		2267
2246	#TODO: intelligently "reformat" paragraph	2268	#TODO: intelligently "reformat" paragraph
2247		2269
		2270	for my $line (split /\n/, $text) {
2248	my $height = $self->text_height ($text);	2271	my $height = $self->text_height ($line);
2249
2250	$self->{height} += $height;	2272	$self->{height} += $height;
2251
2252	push @{$self->{par}}, [$height, $color, $text];	2273	push @{$self->{par}}, [$height, $color, $indent, $line];
		2274	}
2253		2275
2254	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2276	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2255	$self->{children}[1]->update;	2277	$self->{children}[1]->update;
2256	}	2278	}
2257		2279
…		…
2266		2288
2267	$ROOT->on_post_alloc ($self, sub {	2289	$ROOT->on_post_alloc ($self, sub {
2268	if (delete $self->{need_reflow}) {	2290	if (delete $self->{need_reflow}) {
2269	my $height = 0;	2291	my $height = 0;
2270		2292
2271	$height += $_->[0] = $self->text_height ($_->[2])	2293	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2272	for @{$self->{par}};	2294	for @{$self->{par}};
2273		2295
2274	$self->{height} = $height;	2296	$self->{height} = $height;
2275		2297
2276	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2298	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		2299	$self->{children}[1]->update;
2277		2300
2278	delete $self->{texture};	2301	delete $self->{texture};
2279	}	2302	}
2280		2303
2281	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2304	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2282	glClearColor 0.5, 0.5, 0.5, 0;	2305	glClearColor 0.5, 0.5, 0.5, 0;
2283	glClear GL_COLOR_BUFFER_BIT;	2306	glClear GL_COLOR_BUFFER_BIT;
2284		2307
2285	glEnable GL_TEXTURE_2D;
2286	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288	my $top = int $self->{children}[1]{range}[0];	2308	my $top = int $self->{children}[1]{range}[0];
2289		2309
2290	my $y0 = $top;	2310	my $y0 = $top;
2291	my $y1 = $top + $self->{h};	2311	my $y1 = $top + $self->{h};
2292		2312
…		…
2294		2314
2295	my $layout = $self->{layout};	2315	my $layout = $self->{layout};
2296		2316
2297	$layout->set_font ($self->{font}) if $self->{font};	2317	$layout->set_font ($self->{font}) if $self->{font};
2298		2318
		2319	glEnable GL_BLEND;
		2320	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2321
2299	for my $par (@{$self->{par}}) {	2322	for my $par (@{$self->{par}}) {
2300	my $h = $par->[0];	2323	my $h = $par->[0];
2301		2324
2302	if ($y0 < $y + $h && $y < $y1) {	2325	if ($y0 < $y + $h && $y < $y1) {
2303	$layout->set_foreground (@{ $par->[1] });	2326	$layout->set_foreground (@{ $par->[1] });
		2327	$layout->set_width ($self->{w} - $par->[2]);
2304	$layout->set_markup ($par->[2]);	2328	$layout->set_markup ($par->[3]);
2305		2329
2306	my ($W, $H) = $layout->size;	2330	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2331
		2332	glRasterPos $par->[2], $y - $y0;
		2333	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308	}	2334	}
2309		2335
2310	$y += $h;	2336	$y += $h;
2311	}	2337	}
2312		2338
2313	glDisable GL_TEXTURE_2D;	2339	glDisable GL_BLEND;
2314	};	2340	};
2315	});	2341	});
2316	}	2342	}
2317		2343
2318	sub _draw {	2344	sub _draw {
…		…
2515		2541
2516	sub size_request {	2542	sub size_request {
2517	(32, 8)	2543	(32, 8)
2518	}	2544	}
2519		2545
		2546	sub update {
		2547	my ($self) = @_;
		2548
		2549	return unless $self->{visible};
		2550
		2551	$self->SUPER::update;
		2552	}
		2553
2520	sub _draw {	2554	sub _draw {
2521	my ($self) = @_;	2555	my ($self) = @_;
2522		2556
2523	return unless $::CONN;#d# manage and cache textures differently	2557	return unless $::CONN;#d# manage and cache textures differently
2524		2558
…		…
2594		2628
2595	my $self = $class->SUPER::new (	2629	my $self = $class->SUPER::new (
2596	can_hover => 1,	2630	can_hover => 1,
2597	can_events => 1,	2631	can_events => 1,
2598	tooltip => ((CFClient::UI::Label::escape $desc)	2632	tooltip => ((CFClient::UI::Label::escape $desc)
2599	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2633	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2600	connect_button_down => sub {	2634	connect_button_down => sub {
2601	my ($self, $ev, $x, $y) = @_;	2635	my ($self, $ev, $x, $y) = @_;
2602		2636
2603	# todo: maybe put examine on 1? but should just be a tooltip :(	2637	# todo: maybe put examine on 1? but should just be a tooltip :(
2604	if ($ev->{button} == 1) {	2638	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2605	my $targ = $::CONN->{player}{tag};	2639	my $targ = $::CONN->{player}{tag};
2606		2640
2607	if ($item->{container} == $::CONN->{player}{tag}) {	2641	if ($item->{container} == $::CONN->{player}{tag}) {
2608	$targ = $main::OPENCONT;	2642	$targ = $main::OPENCONT;
2609	}	2643	}
2610		2644
2611	$::CONN->send ("move $targ $item->{tag} 0");	2645	$::CONN->send ("move $targ $item->{tag} 0");
		2646	} elsif ($ev->{button} == 1) {
		2647	$::CONN->send ("examine $item->{tag}");
2612	} elsif ($ev->{button} == 2) {	2648	} elsif ($ev->{button} == 2) {
2613	$::CONN->send ("apply $item->{tag}");	2649	$::CONN->send ("apply $item->{tag}");
2614	} elsif ($ev->{button} == 3) {	2650	} elsif ($ev->{button} == 3) {
2615	my @menu_items = (	2651	my @menu_items = (
2616	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2652	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
…		…
2669		2705
2670	sub new {	2706	sub new {
2671	my $class = shift;	2707	my $class = shift;
2672		2708
2673	my $self = $class->SUPER::new (	2709	my $self = $class->SUPER::new (
2674	scrolled => (new CFClient::UI::VBox),	2710	scrolled => (new CFClient::UI::Table),
2675	@_,	2711	@_,
2676	);	2712	);
2677		2713
2678	$self	2714	$self
2679	}	2715	}
…		…
2690	} @$items;	2726	} @$items;
2691		2727
2692	$self->{real_items} = \@items;	2728	$self->{real_items} = \@items;
2693		2729
2694	for my $item (@items) {	2730	for my $item (@items) {
		2731	$item->{item} = $item;
2695	$item = $item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item;	2732	$item = $item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item;
2696	$item->update_item ();	2733	$item->update_item ();
2697	}	2734	}
2698		2735
		2736	my $i = 0;
		2737	for (@items) {
2699	$self->{scrolled}->add (@items);	2738	$self->{scrolled}->add (0, $i, $_);
		2739	my $nrof = $_->{item}->{nrof} \|\| 1;
		2740	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
		2741	}
2700		2742
2701	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2743	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2702	}	2744	}
2703		2745
2704	sub size_request {	2746	sub size_request {
…		…
2976	$child->{x} = int $child->{x};	3018	$child->{x} = int $child->{x};
2977	$child->{y} = int $child->{y};	3019	$child->{y} = int $child->{y};
2978	}	3020	}
2979		3021
2980	$self->SUPER::add (@children);	3022	$self->SUPER::add (@children);
		3023
		3024	while (@children) {
		3025	my $w = pop @children;
		3026	push @children, $w->children;
		3027	$w->{visible} = 1;
		3028	}
		3029	}
		3030
		3031	sub remove {
		3032	my ($self, @children) = @_;
		3033
		3034	$self->SUPER::remove (@children);
		3035
		3036	while (@children) {
		3037	my $w = pop @children;
		3038	push @children, $w->children;
		3039	delete $w->{visible};
		3040	}
2981	}	3041	}
2982		3042
2983	sub on_refresh {	3043	sub on_refresh {
2984	my ($self, $id, $cb) = @_;	3044	my ($self, $id, $cb) = @_;
2985		3045

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.219 by root, Sun May 21 00:34:59 2006 UTC vs. Revision 1.224 by elmex, Tue May 23 20:00:55 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.219 by root, Sun May 21 00:34:59 2006 UTC vs.
Revision 1.224 by elmex, Tue May 23 20:00:55 2006 UTC