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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.305 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.312 by root, Fri Jun 23 23:54:30 2006 UTC

…		…
335	sub size_request {	335	sub size_request {
336	require Carp;	336	require Carp;
337	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
338	}	338	}
339		339
		340	sub baseline_shift {
		341	0
		342	}
		343
340	sub configure {	344	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	345	my ($self, $x, $y, $w, $h) = @_;
342		346
343	if ($self->{aspect}) {	347	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	348	my ($ow, $oh) = ($w, $h);
…		…
470	}	474	}
471		475
472	sub emit {	476	sub emit {
473	my ($self, $signal, @args) = @_;	477	my ($self, $signal, @args) = @_;
474		478
		479	#d##TODO# stop propagating at first true, do not use sum
475	(List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} \|\| []}), # before	480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} \|\| []}) # before
476	($self->can ("invoke_$signal") \|\| sub { 1 })->($self, @args)) # closure	481	\|\| ($self->can ("invoke_$signal") \|\| sub { 1 })->($self, @args) # closure
477	\|\| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	482	\|\| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
478	}	483	}
479		484
480	sub find_widget {	485	sub find_widget {
481	my ($self, $x, $y) = @_;	486	my ($self, $x, $y) = @_;
482		487
…		…
534	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
535		540
536	# update screen rectangle	541	# update screen rectangle
537	local $draw_x = $draw_x + $self->{x};	542	local $draw_x = $draw_x + $self->{x};
538	local $draw_y = $draw_y + $self->{y};	543	local $draw_y = $draw_y + $self->{y};
539	local $draw_w = $draw_x + $self->{w};
540	local $draw_h = $draw_y + $self->{h};
541		544
542	# skip widgets that are entirely outside the drawing area	545	# skip widgets that are entirely outside the drawing area
543	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)	546	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
544	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);	547	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
545		548
…		…
1090	if exists $self->{title};	1093	if exists $self->{title};
1091		1094
1092	if ($self->{has_close_button}) {	1095	if ($self->{has_close_button}) {
1093	$self->{close_button} =	1096	$self->{close_button} =
1094	new CFClient::UI::ImageButton	1097	new CFClient::UI::ImageButton
1095	image => 'x1_close.png',	1098	path => 'x1_close.png',
1096	on_activate => sub { $self->hide };	1099	on_activate => sub { $self->hide };
1097		1100
1098	$self->CFClient::UI::Container::add ($self->{close_button});	1101	$self->CFClient::UI::Container::add ($self->{close_button});
1099	}	1102	}
1100		1103
…		…
1437		1440
1438	sub invoke_size_allocate {	1441	sub invoke_size_allocate {
1439	my ($self, $w, $h) = @_;	1442	my ($self, $w, $h) = @_;
1440		1443
1441	my $space = $self->{vertical} ? $h : $w;	1444	my $space = $self->{vertical} ? $h : $w;
1442	my $children = $self->{children};	1445	my @children = $self->visible_children;
1443		1446
1444	my @req;	1447	my @req;
1445		1448
1446	if ($self->{homogeneous}) {	1449	if ($self->{homogeneous}) {
1447	@req = ($space / (@$children \|\| 1)) x @$children;	1450	@req = ($space / (@children \|\| 1)) x @children;
1448	} else {	1451	} else {
1449	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1452	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450	my $req = List::Util::sum @req;	1453	my $req = List::Util::sum @req;
1451		1454
1452	if ($req > $space) {	1455	if ($req > $space) {
1453	# ah well, not enough space	1456	# ah well, not enough space
1454	$_ *= $space / $req for @req;	1457	$_ *= $space / $req for @req;
1455	} else {	1458	} else {
1456	my $expand = (List::Util::sum map $_->{expand}, @$children) \|\| 1;	1459	my $expand = (List::Util::sum map $_->{expand}, @children) \|\| 1;
1457		1460
1458	$space = ($space - $req) / $expand; # remaining space to give away	1461	$space = ($space - $req) / $expand; # remaining space to give away
1459		1462
1460	$req[$_] += $space * $children->[$_]{expand}	1463	$req[$_] += $space * $children[$_]{expand}
1461	for 0 .. $#$children;	1464	for 0 .. $#children;
1462	}	1465	}
1463	}	1466	}
1464		1467
1465	CFClient::UI::harmonize \@req;	1468	CFClient::UI::harmonize \@req;
1466		1469
1467	my $pos = 0;	1470	my $pos = 0;
1468	for (0 .. $#$children) {	1471	for (0 .. $#children) {
1469	my $alloc = $req[$_];	1472	my $alloc = $req[$_];
1470	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1473	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471		1474
1472	$pos += $alloc;	1475	$pos += $alloc;
1473	}	1476	}
1474		1477
1475	1	1478	1
…		…
1630	};	1633	};
1631		1634
1632	@{ $self->{size_req} }	1635	@{ $self->{size_req} }
1633	}	1636	}
1634		1637
		1638	sub baseline_shift {
		1639	$_[0]{layout}->descent
		1640	}
		1641
1635	sub invoke_size_allocate {	1642	sub invoke_size_allocate {
1636	my ($self, $w, $h) = @_;	1643	my ($self, $w, $h) = @_;
1637		1644
1638	delete $self->{ox};	1645	delete $self->{ox};
1639		1646
…		…
1891	my $sym = $ev->{sym};	1898	my $sym = $ev->{sym};
1892		1899
1893	if ($sym == 13) {	1900	if ($sym == 13) {
1894	unshift @{$self->{history}},	1901	unshift @{$self->{history}},
1895	my $txt = $self->get_text;	1902	my $txt = $self->get_text;
		1903
1896	$self->{history_pointer} = -1;	1904	$self->{history_pointer} = -1;
1897	$self->{history_saveback} = '';	1905	$self->{history_saveback} = '';
1898	$self->emit (activate => $txt);	1906	$self->emit (activate => $txt);
1899	$self->update;	1907	$self->update;
1900		1908
…		…
2090	package CFClient::UI::Image;	2098	package CFClient::UI::Image;
2091		2099
2092	our @ISA = CFClient::UI::Base::;	2100	our @ISA = CFClient::UI::Base::;
2093		2101
2094	use CFClient::OpenGL;	2102	use CFClient::OpenGL;
2095	use Carp qw/confess/;
2096		2103
2097	our %loaded_images;	2104	our %texture_cache;
2098		2105
2099	sub new {	2106	sub new {
2100	my $class = shift;	2107	my $class = shift;
2101		2108
2102	my $self = $class->SUPER::new (can_events => 0, @_);	2109	my $self = $class->SUPER::new (
		2110	can_events => 0,
		2111	@_,
		2112	);
2103		2113
2104	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2114	$self->{path}
		2115	or Carp::croak "required attribute 'path' not set";
2105		2116
2106	$loaded_images{$self->{image}} \|\|=	2117	$self->{tex} = $texture_cache{$self->{path}} \|\|=
2107	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2118	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2108		2119
2109	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2120	Scalar::Util::weaken $texture_cache{$self->{path}};
2110		2121
2111	Scalar::Util::weaken $loaded_images{$self->{image}};	2122	$self->{aspect} \|\|= $self->{tex}{w} / $self->{tex}{h};
2112
2113	$self->{aspect} = $tex->{w} / $tex->{h};
2114		2123
2115	$self	2124	$self
2116	}	2125	}
2117		2126
2118	sub size_request {	2127	sub size_request {
2119	my ($self) = @_;	2128	my ($self) = @_;
2120		2129
2121	($self->{tex}->{w}, $self->{tex}->{h})	2130	($self->{tex}{w}, $self->{tex}{h})
2122	}	2131	}
2123		2132
2124	sub _draw {	2133	sub _draw {
2125	my ($self) = @_;	2134	my ($self) = @_;
2126		2135
…		…
2409		2418
2410	$self->SUPER::invoke_button_down ($ev, $x, $y);	2419	$self->SUPER::invoke_button_down ($ev, $x, $y);
2411		2420
2412	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2421	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2413		2422
2414	$self->mouse_motion ($ev, $x, $y)	2423	$self->invoke_mouse_motion ($ev, $x, $y)
2415	}	2424	}
2416		2425
2417	sub invoke_mouse_motion {	2426	sub invoke_mouse_motion {
2418	my ($self, $ev, $x, $y) = @_;	2427	my ($self, $ev, $x, $y) = @_;
2419		2428
…		…
2564		2573
2565	$self->{fontsize} = $fontsize;	2574	$self->{fontsize} = $fontsize;
2566	$self->reflow;	2575	$self->reflow;
2567	}	2576	}
2568		2577
		2578	sub size_request {
		2579	my ($self) = @_;
		2580
		2581	my ($empty, $slider) = @{ $self->{children} };
		2582
		2583	local $self->{children} = [$empty, $slider];
		2584	$self->SUPER::size_request
		2585	}
		2586
2569	sub invoke_size_allocate {	2587	sub invoke_size_allocate {
2570	my ($self, $w, $h) = @_;	2588	my ($self, $w, $h) = @_;
2571		2589
		2590	my ($empty, $slider, @other) = @{ $self->{children} };
		2591	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		2592
2572	$self->{layout}->set_font ($self->{font}) if $self->{font};	2593	$self->{layout}->set_font ($self->{font}) if $self->{font};
2573	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2594	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2574	$self->{layout}->set_width ($self->{children}[0]{w});	2595	$self->{layout}->set_width ($empty->{w});
2575	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2596	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2576		2597
2577	$self->reflow;	2598	$self->reflow;
2578		2599
		2600	local $self->{children} = [$empty, $slider];
2579	$self->SUPER::invoke_size_allocate ($w, $h)	2601	$self->SUPER::invoke_size_allocate ($w, $h)
2580	}	2602	}
2581		2603
2582	sub text_size {	2604	sub get_layout {
2583	my ($self, $text, $indent) = @_;	2605	my ($self, $para) = @_;
2584		2606
2585	my $layout = $self->{layout};	2607	my $layout = $self->{layout};
2586		2608
		2609	$layout->set_font ($self->{font}) if $self->{font};
		2610	$layout->set_foreground (@{$para->{fg}});
2587	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2611	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2588	$layout->set_width ($self->{children}[0]{w} - $indent);	2612	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2589	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2613	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590	$layout->set_markup ($text);	2614	$layout->set_markup ($para->{markup});
		2615
		2616	$layout->set_shapes (
		2617	map
		2618	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2619	@{$para->{widget}}
2591		2620	);
		2621
2592	$layout->size	2622	$layout
2593	}	2623	}
2594		2624
2595	sub reflow {	2625	sub reflow {
2596	my ($self) = @_;	2626	my ($self) = @_;
2597		2627
…		…
2606	$self->{children}[1]->set_value ($offset);	2636	$self->{children}[1]->set_value ($offset);
2607	}	2637	}
2608		2638
2609	sub clear {	2639	sub clear {
2610	my ($self) = @_;	2640	my ($self) = @_;
		2641
		2642	my (undef, undef, @other) = @{ $self->{children} };
		2643	$self->remove ($_) for @other;
2611		2644
2612	$self->{par} = [];	2645	$self->{par} = [];
2613	$self->{height} = 0;	2646	$self->{height} = 0;
2614	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2647	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2615	}	2648	}
2616		2649
2617	sub add_paragraph {	2650	sub add_paragraph {
2618	my ($self, $color, $text, $indent) = @_;	2651	my ($self, $color, $para, $indent) = @_;
2619		2652
2620	for my $line (split /\n/, $text) {	2653	my ($text, @w) = ref $para ? @$para : $para;
2621	my ($w, $h) = $self->text_size ($line);	2654
2622	$self->{height} += $h;	2655	$para = {
2623	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2656	w => 1e10,
		2657	wrapped => 1,
		2658	fg => $color,
		2659	indent => $indent,
		2660	markup => $text,
		2661	widget => \@w,
2624	}	2662	};
2625		2663
2626	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2664	$self->add (@w) if @w;
		2665	push @{$self->{par}}, $para;
		2666
		2667	$self->{need_reflow}++;
		2668	$self->update;
		2669	}
		2670
		2671	sub scroll_to_bottom {
		2672	my ($self) = @_;
		2673
		2674	$self->{scroll_to_bottom} = 1;
		2675	$self->update;
2627	}	2676	}
2628		2677
2629	sub update {	2678	sub update {
2630	my ($self) = @_;	2679	my ($self) = @_;
2631		2680
…		…
2639	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2688	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640		2689
2641	if (delete $self->{need_reflow}) {	2690	if (delete $self->{need_reflow}) {
2642	my $height = 0;	2691	my $height = 0;
2643		2692
2644	my $layout = $self->{layout};
2645
2646	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2647
2648	for (@{$self->{par}}) {	2693	for my $para (@{$self->{par}}) {
2649	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2694	if ($para->{w} != $W && ($para->{wrapped} \|\| $para->{w} > $W)) {
2650	$layout->set_width ($W - $_->[3]);	2695	my $layout = $self->get_layout ($para);
2651	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2652	$layout->set_markup ($_->[4]);
2653	my ($w, $h) = $layout->size;	2696	my ($w, $h) = $layout->size;
2654	$_->[0] = $w + $_->[3];	2697
2655	$_->[1] = $h;	2698	$para->{w} = $w + $para->{indent};
		2699	$para->{h} = $h;
		2700	$para->{wrapped} = $layout->has_wrapped;
2656	}	2701	}
2657		2702
2658	$height += $_->[1];	2703	$height += $para->{h};
2659	}	2704	}
2660		2705
2661	$self->{height} = $height;	2706	$self->{height} = $height;
2662		2707
2663	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2708	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2664		2709
2665	delete $self->{texture};	2710	delete $self->{texture};
		2711	}
		2712
		2713	if (delete $self->{scroll_to_bottom}) {
		2714	$self->{children}[1]->set_value (1e10);
2666	}	2715	}
2667		2716
2668	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2717	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2669	glClearColor 0, 0, 0, 0;	2718	glClearColor 0, 0, 0, 0;
2670	glClear GL_COLOR_BUFFER_BIT;	2719	glClear GL_COLOR_BUFFER_BIT;
…		…
2674	my $y0 = $top;	2723	my $y0 = $top;
2675	my $y1 = $top + $H;	2724	my $y1 = $top + $H;
2676		2725
2677	my $y = 0;	2726	my $y = 0;
2678		2727
2679	my $layout = $self->{layout};
2680
2681	$layout->set_font ($self->{font}) if $self->{font};
2682
2683	glEnable GL_BLEND;	2728	glEnable GL_BLEND;
2684	#TODO# not correct in windows where rgba is forced off	2729	#TODO# not correct in windows where rgba is forced off
2685	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2730	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2686		2731
2687	for my $par (@{$self->{par}}) {	2732	for my $para (@{$self->{par}}) {
2688	my $h = $par->[1];	2733	my $h = $para->{h};
2689		2734
2690	if ($y0 < $y + $h && $y < $y1) {	2735	if ($y0 < $y + $h && $y < $y1) {
2691	$layout->set_foreground (@{ $par->[2] });	2736
2692	$layout->set_width ($W - $par->[3]);	2737	my $layout = $self->get_layout ($para);
2693	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2694	$layout->set_markup ($par->[4]);
2695		2738
2696	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2739	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2697		2740
2698	glRasterPos $par->[3], $y - $y0;	2741	glRasterPos $para->{indent}, $y - $y0;
2699	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2742	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
		2743
		2744	if (my @w = @{ $para->{widget} }) {
		2745	my @s = $layout->get_shapes;
		2746
		2747	for (@w) {
		2748	my ($dx, $dy) = splice @s, 0, 2, ();
		2749
		2750	$_->{x} = $dx + $para->{indent};
		2751	$_->{y} = $dy + $y - $y0;
		2752
		2753	$_->draw;
		2754	}
		2755	}
2700	}	2756	}
2701		2757
2702	$y += $h;	2758	$y += $h;
2703	}	2759	}
2704		2760
2705	glDisable GL_BLEND;	2761	glDisable GL_BLEND;
2706	};	2762	};
2707	});	2763	});
		2764	}
		2765
		2766	sub reconfigure {
		2767	my ($self) = @_;
		2768
		2769	$self->SUPER::reconfigure;
		2770
		2771	$_->{w} = 1e10 for @{ $self->{par} };
		2772	$self->reflow;
2708	}	2773	}
2709		2774
2710	sub _draw {	2775	sub _draw {
2711	my ($self) = @_;	2776	my ($self) = @_;
2712		2777
…		…
2715	glColor 0, 0, 0, 1;	2780	glColor 0, 0, 0, 1;
2716	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2781	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2717	glDisable GL_TEXTURE_2D;	2782	glDisable GL_TEXTURE_2D;
2718		2783
2719	$self->{children}[1]->draw;	2784	$self->{children}[1]->draw;
2720
2721	}	2785	}
2722		2786
2723	#############################################################################	2787	#############################################################################
2724		2788
2725	package CFClient::UI::Animator;	2789	package CFClient::UI::Animator;
…		…
3470	$self->update_binding_widgets;	3534	$self->update_binding_widgets;
3471		3535
3472	$self	3536	$self
3473	}	3537	}
3474		3538
		3539	sub cfg_bind {
		3540	my ($self, $mod, $sym, $cmds) = @_;
		3541	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
		3542	::update_bindings ();
		3543	}
		3544
		3545	sub cfg_unbind {
		3546	my ($self, $mod, $sym, $cmds) = @_;
		3547	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
		3548	::update_bindings ();
		3549	}
		3550
3475	sub commit {	3551	sub commit {
3476	my ($self) = @_;	3552	my ($self) = @_;
3477	my ($mod, $sym, $cmds) = $self->get_binding;	3553	my ($mod, $sym, $cmds) = $self->get_binding;
3478	if ($sym != 0 && @$cmds > 0) {	3554	if ($sym != 0 && @$cmds > 0) {
3479	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)	3555	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
…		…
3549		3625
3550	# this is a shortcut method that asks for a binding	3626	# this is a shortcut method that asks for a binding
3551	# and then just binds it.	3627	# and then just binds it.
3552	sub do_quick_binding {	3628	sub do_quick_binding {
3553	my ($self, $cmds, $end_cb) = @_;	3629	my ($self, $cmds, $end_cb) = @_;
3554	$self->set_binding (undef, undef, $cmds, sub {	3630	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3555	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3556	});
3557	$self->ask_for_bind (1, $end_cb);	3631	$self->ask_for_bind (1, $end_cb);
3558	}	3632	}
3559		3633
3560	sub update_binding_widgets {	3634	sub update_binding_widgets {
3561	my ($self) = @_;	3635	my ($self) = @_;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.305 by root, Sun Jun 18 17:13:12 2006 UTC vs. Revision 1.312 by root, Fri Jun 23 23:54:30 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.305 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.312 by root, Fri Jun 23 23:54:30 2006 UTC