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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.214 by root, Wed May 17 22:59:13 2006 UTC vs.
Revision 1.220 by root, Mon May 22 03:28: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) = @_;
…		…
691	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	699	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
692	glClearColor 0, 0, 0, 0;	700	glClearColor 0, 0, 0, 0;
693	glClear GL_COLOR_BUFFER_BIT;	701	glClear GL_COLOR_BUFFER_BIT;
694		702
695	$self->_render;	703	$self->_render;
696	# glColorMask 1, 1, 1, 0;
697	# glEnable GL_BLEND;
698	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
699	# glRasterPos 0, 0;
700	# glCopyPixels 0, 0, $self->{w}, $self->{h};
701	# glDisable GL_BLEND;
702	# glColorMask 1, 1, 1, 1;
703	};	704	};
704	}	705	}
705		706
706	sub _draw {	707	sub _draw {
707	my ($self) = @_;	708	my ($self) = @_;
…		…
711	my $tex = $self->{texture}	712	my $tex = $self->{texture}
712	or return;	713	or return;
713		714
714	glEnable GL_TEXTURE_2D;	715	glEnable GL_TEXTURE_2D;
715	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	716	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
716	glColor 0, 0, 0, 1;	717	glColor 1, 1, 1, 1;
717		718
718	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	719	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
719		720
720	glDisable GL_TEXTURE_2D;	721	glDisable GL_TEXTURE_2D;
721	}	722	}
…		…
804	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	805	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
805	},	806	},
806	;	807	;
807		808
808	$self = $class->SUPER::new (	809	$self = $class->SUPER::new (
809	vp => (new CFClient::UI::ViewPort),	810	vp => (new CFClient::UI::ViewPort expand => 1),
810	slider => $slider,	811	slider => $slider,
811	@_,	812	@_,
812	);	813	);
813		814
814	$self->{vp}->add ($self->{scrolled});	815	$self->{vp}->add ($self->{scrolled});
…		…
2057	range => [0, 0, 100, 10],	2058	range => [0, 0, 100, 10],
2058	req_w => $::WIDTH / 80,	2059	req_w => $::WIDTH / 80,
2059	req_h => $::WIDTH / 80,	2060	req_h => $::WIDTH / 80,
2060	vertical => 0,	2061	vertical => 0,
2061	can_hover => 1,	2062	can_hover => 1,
2062	inner_pad => .05,	2063	inner_pad => 0.02,
2063	@_	2064	@_
2064	);	2065	);
2065		2066
2066	$self->set_value ($self->{range}[0]);	2067	$self->set_value ($self->{range}[0]);
2067	$self->update;	2068	$self->update;
…		…
2214		2215
2215	$self->{fontsize} = $fontsize;	2216	$self->{fontsize} = $fontsize;
2216	$self->reflow;	2217	$self->reflow;
2217	}	2218	}
2218		2219
		2220	sub size_allocate {
		2221	my ($self, $w, $h) = @_;
		2222
		2223	$self->SUPER::size_allocate ($w, $h);
		2224
		2225	$self->{layout}->set_font ($self->{font}) if $self->{font};
		2226	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		2227	$self->{layout}->set_width ($self->{children}[0]{w});
		2228
		2229	$self->reflow;
		2230	}
		2231
2219	sub text_height {	2232	sub text_height {
2220	my ($self, $text) = @_;	2233	my ($self, $text, $indent) = @_;
2221		2234
2222	my $layout = $self->{layout};	2235	my $layout = $self->{layout};
2223		2236
2224	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2237	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225	$layout->set_width ($self->{children}[0]{w});	2238	$layout->set_width ($self->{children}[0]{w} - $indent);
2226	$layout->set_markup ($text);	2239	$layout->set_markup ($text);
2227		2240
2228	($layout->size)[1]	2241	($layout->size)[1]
2229	}	2242	}
2230		2243
…		…
2233		2246
2234	$self->{need_reflow}++;	2247	$self->{need_reflow}++;
2235	$self->update;	2248	$self->update;
2236	}	2249	}
2237		2250
2238	sub size_allocate {
2239	my ($self, $w, $h) = @_;
2240
2241	$self->SUPER::size_allocate ($w, $h);
2242
2243	$self->{layout}->set_font ($self->{font}) if $self->{font};
2244	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2245	$self->{layout}->set_width ($self->{children}[0]{w});
2246
2247	$self->reflow;
2248	}
2249
2250	sub add_paragraph {	2251	sub add_paragraph {
2251	my ($self, $color, $text) = @_;	2252	my ($self, $color, $text, $indent) = @_;
2252		2253
2253	#TODO: intelligently "reformat" paragraph	2254	#TODO: intelligently "reformat" paragraph
2254		2255
		2256	for my $line (split /\n/, $text) {
2255	my $height = $self->text_height ($text);	2257	my $height = $self->text_height ($line);
2256
2257	$self->{height} += $height;	2258	$self->{height} += $height;
2258
2259	push @{$self->{par}}, [$height, $color, $text];	2259	push @{$self->{par}}, [$height, $color, $indent, $line];
		2260	}
2260		2261
2261	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2262	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2262	$self->{children}[1]->update;	2263	$self->{children}[1]->update;
2263	}	2264	}
2264		2265
…		…
2273		2274
2274	$ROOT->on_post_alloc ($self, sub {	2275	$ROOT->on_post_alloc ($self, sub {
2275	if (delete $self->{need_reflow}) {	2276	if (delete $self->{need_reflow}) {
2276	my $height = 0;	2277	my $height = 0;
2277		2278
2278	$height += $_->[0] = $self->text_height ($_->[2])	2279	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2279	for @{$self->{par}};	2280	for @{$self->{par}};
2280		2281
2281	$self->{height} = $height;	2282	$self->{height} = $height;
2282		2283
2283	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2284	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		2285	$self->{children}[1]->update;
2284		2286
2285	delete $self->{texture};	2287	delete $self->{texture};
2286	}	2288	}
2287		2289
2288	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2290	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2289	glClearColor 0, 0, 0, 0;	2291	glClearColor 0.5, 0.5, 0.5, 0;
2290	glClear GL_COLOR_BUFFER_BIT;	2292	glClear GL_COLOR_BUFFER_BIT;
2291
2292	glEnable GL_TEXTURE_2D;
2293	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2294		2293
2295	my $top = int $self->{children}[1]{range}[0];	2294	my $top = int $self->{children}[1]{range}[0];
2296		2295
2297	my $y0 = $top;	2296	my $y0 = $top;
2298	my $y1 = $top + $self->{h};	2297	my $y1 = $top + $self->{h};
…		…
2301		2300
2302	my $layout = $self->{layout};	2301	my $layout = $self->{layout};
2303		2302
2304	$layout->set_font ($self->{font}) if $self->{font};	2303	$layout->set_font ($self->{font}) if $self->{font};
2305		2304
		2305	glEnable GL_BLEND;
		2306	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2307
2306	for my $par (@{$self->{par}}) {	2308	for my $par (@{$self->{par}}) {
2307	my $h = $par->[0];	2309	my $h = $par->[0];
2308		2310
2309	if ($y0 < $y + $h && $y < $y1) {	2311	if ($y0 < $y + $h && $y < $y1) {
2310	$layout->set_foreground (@{ $par->[1] });	2312	$layout->set_foreground (@{ $par->[1] });
		2313	$layout->set_width ($self->{w} - $par->[2]);
2311	$layout->set_markup ($par->[2]);	2314	$layout->set_markup ($par->[3]);
2312		2315
2313	my ($W, $H) = $layout->size;	2316	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2317
		2318	glRasterPos $par->[2], $y - $y0;
		2319	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2315	}	2320	}
2316		2321
2317	$y += $h;	2322	$y += $h;
2318	}	2323	}
2319		2324
2320	glDisable GL_TEXTURE_2D;	2325	glDisable GL_BLEND;
2321	};	2326	};
2322	});	2327	});
2323	}	2328	}
2324		2329
2325	sub _draw {	2330	sub _draw {
2326	my ($self) = @_;	2331	my ($self) = @_;
2327		2332
2328	glEnable GL_TEXTURE_2D;	2333	glEnable GL_TEXTURE_2D;
2329	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2334	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2330	glColor 1, 1, 1, 1;	2335	glColor 1, 1, 1, 1;
2331	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2336	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2332	glDisable GL_TEXTURE_2D;	2337	glDisable GL_TEXTURE_2D;
2333		2338
2334	$self->{children}[1]->draw;	2339	$self->{children}[1]->draw;
2335		2340
2336	}	2341	}
…		…
2496	use CFClient::OpenGL;	2501	use CFClient::OpenGL;
2497		2502
2498	sub new {	2503	sub new {
2499	my $class = shift;	2504	my $class = shift;
2500		2505
2501	$class->SUPER::new (	2506	my $self = $class->SUPER::new (
2502	aspect => 1,	2507	aspect => 1,
2503	@_,	2508	@_,
2504	)	2509	);
		2510
		2511	if ($self->{anim} && $self->{animspeed}) {
		2512	Scalar::Util::weaken (my $widget = $self);
		2513
		2514	$self->{timer} = Event->timer (
		2515	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2516	hard => 1,
		2517	interval => $self->{animspeed},
		2518	cb => sub {
		2519	++$widget->{frame};
		2520	$widget->update;
		2521	},
		2522	);
		2523	}
		2524
		2525	$self
2505	}	2526	}
2506		2527
2507	sub size_request {	2528	sub size_request {
2508	(32, 8)	2529	(32, 8)
2509	}	2530	}
2510		2531
2511	sub _draw {	2532	sub _draw {
2512	my ($self) = @_;	2533	my ($self) = @_;
2513		2534
2514	return unless $::CONN;#d# manage and cache textures differently	2535	return unless $::CONN;#d# manage and cache textures differently
		2536
		2537	my $face;
		2538
		2539	if ($self->{frame}) {
		2540	my $anim = $::CONN->{anim}[$self->{anim}];
		2541
		2542	$face = $anim->[ $self->{frame} % @$anim ]
		2543	if $anim && @$anim;
		2544	}
		2545
2515	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2546	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2516		2547
2517	# TODO animation
2518	if ($tex) {	2548	if ($tex) {
2519	glEnable GL_TEXTURE_2D;	2549	glEnable GL_TEXTURE_2D;
2520	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2550	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521	glColor 1, 1, 1, 1;	2551	glColor 1, 1, 1, 1;
2522	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2552	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523	glDisable GL_TEXTURE_2D;	2553	glDisable GL_TEXTURE_2D;
2524	}	2554	}
2525	}	2555	}
2526		2556
		2557	sub DESTROY {
		2558	my ($self) = @_;
		2559
		2560	$self->{timer}->cancel
		2561	if $self->{timer};
		2562
		2563	$self->SUPER::DESTROY;
		2564	}
		2565
2527	#############################################################################	2566	#############################################################################
2528		2567
2529	package CFClient::UI::InventoryItem;	2568	package CFClient::UI::InventoryItem;
2530		2569
2531	our @ISA = CFClient::UI::HBox::;	2570	our @ISA = CFClient::UI::HBox::;
…		…
2534	my ($item) = @_;	2573	my ($item) = @_;
2535		2574
2536	my $desc =	2575	my $desc =
2537	$item->{nrof} < 2	2576	$item->{nrof} < 2
2538	? $item->{name}	2577	? $item->{name}
2539	: "$item->{nrof} $item->{name_pl}";	2578	: "$item->{nrof} × $item->{name_pl}";
2540		2579
2541	$item->{flags} & Crossfire::Protocol::F_OPEN	2580	$item->{flags} & Crossfire::Protocol::F_OPEN
2542	and $desc .= " (open)";	2581	and $desc .= " (open)";
2543	$item->{flags} & Crossfire::Protocol::F_APPLIED	2582	$item->{flags} & Crossfire::Protocol::F_APPLIED
2544	and $desc .= " (applied)";	2583	and $desc .= " (applied)";
…		…
2564	my $item = delete $args{item};	2603	my $item = delete $args{item};
2565		2604
2566	my $desc = _item_to_desc ($item);	2605	my $desc = _item_to_desc ($item);
2567		2606
2568	my $self = $class->SUPER::new (	2607	my $self = $class->SUPER::new (
2569	can_hover => 1,	2608	can_hover => 1,
2570	can_events => 1,	2609	can_events => 1,
2571	tooltip => ((CFClient::UI::Label::escape $desc)	2610	tooltip => ((CFClient::UI::Label::escape $desc)
2572	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2611	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2573	connect_button_down => sub {	2612	connect_button_down => sub {
2574	my ($self, $ev, $x, $y) = @_;	2613	my ($self, $ev, $x, $y) = @_;
2575		2614
2576	# todo: maybe put examine on 1? but should just be a tooltip :(	2615	# todo: maybe put examine on 1? but should just be a tooltip :(
…		…
2585	} elsif ($ev->{button} == 2) {	2624	} elsif ($ev->{button} == 2) {
2586	$::CONN->send ("apply $item->{tag}");	2625	$::CONN->send ("apply $item->{tag}");
2587	} elsif ($ev->{button} == 3) {	2626	} elsif ($ev->{button} == 3) {
2588	my @menu_items = (	2627	my @menu_items = (
2589	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2628	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590	["mark", sub { $::CONN->send ("mark $item->{tag}") }],	2629	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2591	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2630	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2631	(
		2632	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2633	? (
		2634	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2635	)
		2636	: (
		2637	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2592	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],	2638	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2593	[	2639	)
2594	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2595	sub { $::CONN->send ("lock $item->{tag}") },
2596	],	2640	),
2597	);	2641	);
2598		2642
2599	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	2643	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2600	}	2644	}
2601		2645
…		…
3022	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3066	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3023	glClear GL_COLOR_BUFFER_BIT;	3067	glClear GL_COLOR_BUFFER_BIT;
3024		3068
3025	glMatrixMode GL_PROJECTION;	3069	glMatrixMode GL_PROJECTION;
3026	glLoadIdentity;	3070	glLoadIdentity;
3027	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3071	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3028	glMatrixMode GL_MODELVIEW;	3072	glMatrixMode GL_MODELVIEW;
3029	glLoadIdentity;	3073	glLoadIdentity;
3030		3074
3031	$self->_draw;	3075	$self->_draw;
3032	}	3076	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.214 by root, Wed May 17 22:59:13 2006 UTC vs. Revision 1.220 by root, Mon May 22 03:28:55 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.214 by root, Wed May 17 22:59:13 2006 UTC vs.
Revision 1.220 by root, Mon May 22 03:28:55 2006 UTC