ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.198 by root, Fri May 12 02:08:52 2006 UTC vs.
Revision 1.243 by root, Sat May 27 20:46:54 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
		18
		19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
16		38
17	sub check_tooltip {	39	sub check_tooltip {
18	if (!$GRAB) {	40	if (!$GRAB) {
19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
29	$TOOLTIP->set_tooltip_from ($widget);	51	$TOOLTIP->set_tooltip_from ($widget);
30	$TOOLTIP->show;	52	$TOOLTIP->show;
31		53
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		55
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	57	if $x + $TOOLTIP->{w} > $::WIDTH;
37		58
38	$TOOLTIP->move ($x, $y);	59	$TOOLTIP->move ($x, $y);
39	$TOOLTIP->check_size;	60	$TOOLTIP->check_size;
40	$TOOLTIP->update;	61	$TOOLTIP->update;
41	}	62	}
…		…
49	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
50	}	71	}
51		72
52	# class methods for events	73	# class methods for events
53	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
54	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
55	if $FOCUS;	76	if $FOCUS;
56	}	77	}
57		78
58	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
59	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
60	if $FOCUS;	81	if $FOCUS;
61	}	82	}
62		83
63	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
64	my ($ev) = @_;	85	my ($ev) = @_;
…		…
73	check_tooltip;	94	check_tooltip;
74	}	95	}
75		96
76	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
77		98
78	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
80	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81	}
82	}	101	}
83		102
84	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
85	my ($ev) = @_;	104	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
87		106
88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89		108
90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91		110
92	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
94	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95	}
96		113
97	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
98	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
99	$grab->update if $grab;	116	$grab->update if $grab;
100	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
116	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
117		134
118	check_tooltip;	135	check_tooltip;
119	}	136	}
120		137
121	if ($HOVER) {
122	($x, $y) = $HOVER->coord2local ($x, $y);
123	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124	}	139	if $HOVER;
125	}	140	}
126		141
127	# convert position array to integers	142	# convert position array to integers
128	sub harmonize {	143	sub harmonize {
129	my ($vals) = @_;	144	my ($vals) = @_;
…		…
133	for (@$vals) {	148	for (@$vals) {
134	my $i = int $_ + $rem;	149	my $i = int $_ + $rem;
135	$rem += $_ - $i;	150	$rem += $_ - $i;
136	$_ = $i;	151	$_ = $i;
137	}	152	}
		153	}
		154
		155	sub full_refresh {
		156	# make a copy, otherwise for complains about freed values.
		157	my @widgets = values %WIDGET;
		158
		159	$_->update
		160	for @widgets;
		161	}
		162
		163	sub reconfigure_widgets {
		164	# make a copy, otherwise C<for> complains about freed values.
		165	my @widgets = values %WIDGET;
		166
		167	$_->reconfigure
		168	for @widgets;
		169	}
		170
		171	# call when resolution changes etc.
		172	sub rescale_widgets {
		173	my ($sx, $sy) = @_;
		174
		175	for my $widget (values %WIDGET) {
		176	if ($widget->{is_toplevel}) {
		177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		180	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		181	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		183	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		184	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		185	}
		186	}
		187
		188	reconfigure_widgets;
138	}	189	}
139		190
140	#############################################################################	191	#############################################################################
141		192
142	package CFClient::UI::Base;	193	package CFClient::UI::Base;
…		…
155	can_events => 1,	206	can_events => 1,
156	@_	207	@_
157	}, $class;	208	}, $class;
158		209
159	for (keys %$self) {	210	for (keys %$self) {
160	if (/^connect_(.*)$/) {	211	if (/^on_(.*)$/) {
161	$self->connect ($1 => delete $self->{$_});	212	$self->connect ($1 => delete $self->{$_});
162	}	213	}
163	}	214	}
164		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
		218	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		219	$self->{user_x} = $layout->{x} * $::WIDTH;
		220	$self->{user_y} = $layout->{y} * $::HEIGHT;
		221	$self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		222	$self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		223	}
		224
165	$self	225	$self
166	}	226	}
167		227
168	sub destroy {	228	sub destroy {
169	my ($self) = @_;	229	my ($self) = @_;
…		…
172	%$self = ();	232	%$self = ();
173	}	233	}
174		234
175	sub show {	235	sub show {
176	my ($self) = @_;	236	my ($self) = @_;
177
178	return if $self->{parent};	237	return if $self->{parent};
179		238
180	$CFClient::UI::ROOT->add ($self);	239	$CFClient::UI::ROOT->add ($self);
181	}	240	}
182		241
183	sub hide {	242	sub show_centered {
184	my ($self) = @_;	243	my ($self) = @_;
		244	return if $self->{parent};
		245
		246	$self->show;
		247
		248	$CFClient::UI::ROOT->on_post_alloc (
		249	"centered $self" => sub {
		250	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		251	},
		252	);
		253	}
		254
		255	sub set_invisible {
		256	my ($self) = @_;
		257
		258	# broken show/hide model
		259
		260	delete $self->{root};
		261	delete $self->{visible};
185		262
186	undef $GRAB if $GRAB == $self;	263	undef $GRAB if $GRAB == $self;
187	undef $HOVER if $HOVER == $self;	264	undef $HOVER if $HOVER == $self;
		265
		266	CFClient::UI::check_tooltip
		267	if $CFClient::UI::TOOLTIP->{owner} == $self;
		268
		269	$self->focus_out;
		270	}
		271
		272	sub hide {
		273	my ($self) = @_;
		274
		275	$self->set_invisible;
188		276
189	$self->{parent}->remove ($self)	277	$self->{parent}->remove ($self)
190	if $self->{parent};	278	if $self->{parent};
191	}	279	}
192		280
…		…
242		330
243	sub size_allocate {	331	sub size_allocate {
244	# nothing to be done	332	# nothing to be done
245	}	333	}
246		334
247	sub children {
248	}
249
250	# call when resolution changes etc.
251	sub reconfigure {	335	sub reconfigure {
252	my ($self) = @_;	336	my ($self) = @_;
253
254	$_->reconfigure
255	for $self->children;
256		337
257	$self->check_size (1);	338	$self->check_size (1);
258	$self->update;	339	$self->update;
259	}	340	}
260		341
		342	sub children {
		343	}
		344
261	sub set_max_size {	345	sub set_max_size {
262	my ($self, $w, $h) = @_;	346	my ($self, $w, $h) = @_;
263		347
264	delete $self->{max_w}; $self->{max_w} = $w if $w;	348	delete $self->{max_w}; $self->{max_w} = $w if $w;
265	delete $self->{max_h}; $self->{max_h} = $h if $h;	349	delete $self->{max_h}; $self->{max_h} = $h if $h;
		350	}
		351
		352	sub set_tooltip {
		353	my ($self, $tooltip) = @_;
		354
		355	$tooltip =~ s/^\s+//;
		356	$tooltip =~ s/\s+$//;
		357
		358	return if $self->{tooltip} eq $tooltip;
		359
		360	$self->{tooltip} = $tooltip;
		361
		362	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		363	delete $CFClient::UI::TOOLTIP->{owner};
		364	CFClient::UI::check_tooltip;
		365	}
266	}	366	}
267		367
268	# translate global coordinates to local coordinate system	368	# translate global coordinates to local coordinate system
269	sub coord2local {	369	sub coord2local {
270	my ($self, $x, $y) = @_;	370	my ($self, $x, $y) = @_;
…		…
285	return if $FOCUS == $self;	385	return if $FOCUS == $self;
286	return unless $self->{can_focus};	386	return unless $self->{can_focus};
287		387
288	my $focus = $FOCUS; $FOCUS = $self;	388	my $focus = $FOCUS; $FOCUS = $self;
289		389
290	$self->emit (focus_in => $focus);	390	$self->_emit (focus_in => $focus);
291		391
292	$focus->update if $focus;	392	$focus->update if $focus;
293	$FOCUS->update;	393	$FOCUS->update;
294	}	394	}
295		395
…		…
298		398
299	return unless $FOCUS == $self;	399	return unless $FOCUS == $self;
300		400
301	my $focus = $FOCUS; undef $FOCUS;	401	my $focus = $FOCUS; undef $FOCUS;
302		402
303	$self->emit (focus_out => $focus);	403	$self->_emit (focus_out => $focus);
304		404
305	$focus->update if $focus; #?	405	$focus->update if $focus; #?
		406
		407	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		408	unless $FOCUS;
306	}	409	}
307		410
308	sub mouse_motion { }	411	sub mouse_motion { }
309	sub button_up { }	412	sub button_up { }
310	sub key_down { }	413	sub key_down { }
311	sub key_up { }	414	sub key_up { }
312		415
313	sub button_down {	416	sub button_down {
314	my ($self, $ev, $x, $y) = @_;	417	my ($self, $ev, $x, $y) = @_;
315		418
316	$self->focus_in;	419	$self->focus_in;
…		…
350	if ($ENV{PCLIENT_DEBUG}) {	453	if ($ENV{PCLIENT_DEBUG}) {
351	glPushMatrix;	454	glPushMatrix;
352	glColor 1, 1, 0, 1;	455	glColor 1, 1, 0, 1;
353	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	456	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354	glBegin GL_LINE_LOOP;	457	glBegin GL_LINE_LOOP;
355	glVertex 0 , 0;	458	glVertex 0 , 0;
356	glVertex $self->{w}, 0;	459	glVertex $self->{w} - 1, 0;
357	glVertex $self->{w}, $self->{h};	460	glVertex $self->{w} - 1, $self->{h} - 1;
358	glVertex 0 , $self->{h};	461	glVertex 0 , $self->{h} - 1;
359	glEnd;	462	glEnd;
360	glPopMatrix;	463	glPopMatrix;
361	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	464	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362	}	465	}
363	}	466	}
364		467
365	sub _draw {	468	sub _draw {
366	my ($self) = @_;	469	my ($self) = @_;
…		…
383	sub set_parent {	486	sub set_parent {
384	my ($self, $parent) = @_;	487	my ($self, $parent) = @_;
385		488
386	Scalar::Util::weaken ($self->{parent} = $parent);	489	Scalar::Util::weaken ($self->{parent} = $parent);
387		490
		491	$self->{root} = $parent->{root};
		492	$self->{visible} = $parent->{visible} + 1;
388		493
389	# TODO: req_w _does_change after ->reconfigure	494	# TODO: req_w _does_change after ->reconfigure
390	$self->check_size	495	$self->check_size
391	unless exists $self->{req_w};	496	unless exists $self->{req_w};
		497
		498	$self->show;
392	}	499	}
393		500
394	sub check_size {	501	sub check_size {
395	my ($self, $forced) = @_;	502	my ($self, $forced) = @_;
396		503
…		…
409	my ($self, $signal, $cb) = @_;	516	my ($self, $signal, $cb) = @_;
410		517
411	push @{ $self->{signal_cb}{$signal} }, $cb;	518	push @{ $self->{signal_cb}{$signal} }, $cb;
412	}	519	}
413		520
		521	sub _emit {
		522	my ($self, $signal, @args) = @_;
		523
		524	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		525	}
		526
414	sub emit {	527	sub emit {
415	my ($self, $signal, @args) = @_;	528	my ($self, $signal, @args) = @_;
416		529
417	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	530	$self->_emit ($signal, @args)
		531	|| $self->$signal (@args);
418	}	532	}
419		533
420	sub DESTROY {	534	sub DESTROY {
421	my ($self) = @_;	535	my ($self) = @_;
422		536
		537	delete $WIDGET{$self+0};
423	#$self->deactivate;	538	#$self->deactivate;
424	}	539	}
425		540
426	#############################################################################	541	#############################################################################
427		542
…		…
436	my $class = shift;	551	my $class = shift;
437		552
438	# range [value, low, high, page]	553	# range [value, low, high, page]
439		554
440	$class->SUPER::new (	555	$class->SUPER::new (
441	bg => [0, 0, 0, 0.2],	556	#bg => [0, 0, 0, 0.2],
442	active_bg => [1, 1, 1, 0.5],	557	#active_bg => [1, 1, 1, 0.5],
443	@_	558	@_
444	)	559	)
445	}	560	}
446		561
447	sub _draw {	562	sub _draw {
448	my ($self) = @_;	563	my ($self) = @_;
449		564
		565	my $color = $FOCUS == $self && $self->{active_bg}
		566	? $self->{active_bg}
		567	: $self->{bg};
		568
		569	if ($color && (@$color < 4 || $color->[3])) {
450	my ($w, $h) = @$self{qw(w h)};	570	my ($w, $h) = @$self{qw(w h)};
451		571
452	glEnable GL_BLEND;	572	glEnable GL_BLEND;
453	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	573	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
454	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	574	glColor @$color;
455		575
456	glBegin GL_QUADS;	576	glBegin GL_QUADS;
457	glVertex 0 , 0;	577	glVertex 0 , 0;
458	glVertex 0 , $h;	578	glVertex 0 , $h;
459	glVertex $w, $h;	579	glVertex $w, $h;
460	glVertex $w, 0;	580	glVertex $w, 0;
461	glEnd;	581	glEnd;
462		582
463	glDisable GL_BLEND;	583	glDisable GL_BLEND;
		584	}
464	}	585	}
465		586
466	#############################################################################	587	#############################################################################
467		588
468	package CFClient::UI::Empty;	589	package CFClient::UI::Empty;
…		…
528	delete $child->{parent};	649	delete $child->{parent};
529	$child->hide;	650	$child->hide;
530		651
531	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	652	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
532		653
533	$self->check_size;	654	$self->check_size (1);
534	$self->update;	655	$self->update;
535	}	656	}
536		657
537	sub clear {	658	sub clear {
538	my ($self) = @_;	659	my ($self) = @_;
…		…
652	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	773	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
653	glClearColor 0, 0, 0, 0;	774	glClearColor 0, 0, 0, 0;
654	glClear GL_COLOR_BUFFER_BIT;	775	glClear GL_COLOR_BUFFER_BIT;
655		776
656	$self->_render;	777	$self->_render;
657	# glColorMask 1, 1, 1, 0;
658	# glEnable GL_BLEND;
659	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
660	# glRasterPos 0, 0;
661	# glCopyPixels 0, 0, $self->{w}, $self->{h};
662	# glDisable GL_BLEND;
663	# glColorMask 1, 1, 1, 1;
664	};	778	};
665	}	779	}
666		780
667	sub _draw {	781	sub _draw {
668	my ($self) = @_;	782	my ($self) = @_;
…		…
672	my $tex = $self->{texture}	786	my $tex = $self->{texture}
673	or return;	787	or return;
674		788
675	glEnable GL_TEXTURE_2D;	789	glEnable GL_TEXTURE_2D;
676	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	790	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
677	glColor 0, 0, 0, 1;	791	glColor 1, 1, 1, 1;
678		792
679	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	793	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
680		794
681	glDisable GL_TEXTURE_2D;	795	glDisable GL_TEXTURE_2D;
682	}	796	}
…		…
685		799
686	package CFClient::UI::ViewPort;	800	package CFClient::UI::ViewPort;
687		801
688	our @ISA = CFClient::UI::Window::;	802	our @ISA = CFClient::UI::Window::;
689		803
		804	sub new {
		805	my $class = shift;
		806
		807	$class->SUPER::new (
		808	scroll_x => 0,
		809	scroll_y => 1,
		810	@_,
		811	)
		812	}
		813
690	sub size_request {	814	sub size_request {
691	my ($self) = @_;	815	my ($self) = @_;
692		816
693	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	817	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
694	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
695		818
696	@$self{qw(child_w child_h)}	819	@$self{qw(child_w child_h)}
697	}	820	}
698		821
699	sub size_allocate {	822	sub size_allocate {
700	my ($self, $w, $h) = @_;	823	my ($self, $w, $h) = @_;
701		824
		825	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		826	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		827
		828	$self->child->configure (0, 0, $w, $h);
702	$self->update;	829	$self->update;
703	}	830	}
704		831
705	sub set_offset {	832	sub set_offset {
706	my ($self, $x, $y) = @_;	833	my ($self, $x, $y) = @_;
…		…
757	my $class = shift;	884	my $class = shift;
758		885
759	my $self;	886	my $self;
760		887
761	my $slider = new CFClient::UI::Slider	888	my $slider = new CFClient::UI::Slider
762	vertical => 1,	889	vertical => 1,
763	range => [0, 0, 1, 0.01], # HACK fix	890	range => [0, 0, 1, 0.01], # HACK fix
764	connect_changed => sub {	891	on_changed => sub {
765	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	892	$self->{vp}->set_offset (0, $_[1]);
766	},	893	},
767	;	894	;
768		895
769	$self = $class->SUPER::new (	896	$self = $class->SUPER::new (
770	vp => (new CFClient::UI::ViewPort),	897	vp => (new CFClient::UI::ViewPort expand => 1),
771	slider => $slider,	898	slider => $slider,
772	@_,	899	@_,
773	);	900	);
774		901
775	$self->{vp}->add ($self->{scrolled});	902	$self->{vp}->add ($self->{scrolled});
…		…
777	$self->add ($self->{slider});	904	$self->add ($self->{slider});
778		905
779	$self	906	$self
780	}	907	}
781		908
		909	sub update {
		910	my ($self) = @_;
		911
		912	$self->SUPER::update;
		913
		914	# todo: overwrite size_allocate of child
		915	my $child = $self->{vp}->child;
		916	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		917	}
		918
		919	sub size_allocate {
		920	my ($self, $w, $h) = @_;
		921
		922	$self->SUPER::size_allocate ($w, $h);
		923
		924	my $child = $self->{vp}->child;
		925	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		926	}
		927
782	#TODO# update range on size_allocate depeneing on child	928	#TODO# update range on size_allocate depending on child
783	# update viewport offset on scroll	929	# update viewport offset on scroll
784		930
785	#############################################################################	931	#############################################################################
786		932
787	package CFClient::UI::Frame;	933	package CFClient::UI::Frame;
788		934
789	our @ISA = CFClient::UI::Bin::;	935	our @ISA = CFClient::UI::Bin::;
790		936
791	use CFClient::OpenGL;	937	use CFClient::OpenGL;
		938
		939	sub new {
		940	my $class = shift;
		941
		942	$class->SUPER::new (
		943	bg => undef,
		944	@_,
		945	)
		946	}
		947
		948	sub _draw {
		949	my ($self) = @_;
		950
		951	if ($self->{bg}) {
		952	my ($w, $h) = @$self{qw(w h)};
		953
		954	glEnable GL_BLEND;
		955	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		956	glColor @{ $self->{bg} };
		957
		958	glBegin GL_QUADS;
		959	glVertex 0 , 0;
		960	glVertex 0 , $h;
		961	glVertex $w, $h;
		962	glVertex $w, 0;
		963	glEnd;
		964
		965	glDisable GL_BLEND;
		966	}
		967
		968	$self->SUPER::_draw;
		969	}
792		970
793	#############################################################################	971	#############################################################################
794		972
795	package CFClient::UI::FancyFrame;	973	package CFClient::UI::FancyFrame;
796		974
…		…
806	my $class = shift;	984	my $class = shift;
807		985
808	# TODO: user_x, user_y, overwrite moveto?	986	# TODO: user_x, user_y, overwrite moveto?
809		987
810	my $self = $class->SUPER::new (	988	my $self = $class->SUPER::new (
811	bg => [1, 1, 1, 1],	989	bg => [1, 1, 1, 1],
812	border_bg => [1, 1, 1, 1],	990	border_bg => [1, 1, 1, 1],
813	border => 0.6,	991	border => 0.6,
		992	is_toplevel => 1,
814	can_events => 1,	993	can_events => 1,
815	@_	994	@_
816	);	995	);
817		996
818	$self->{title} &&= new CFClient::UI::Label	997	$self->{title} &&= new CFClient::UI::Label
819	align => 0,	998	align => 0,
…		…
843	my ($self, $w, $h) = @_;	1022	my ($self, $w, $h) = @_;
844		1023
845	$h -= List::Util::max 0, $self->border * 2;	1024	$h -= List::Util::max 0, $self->border * 2;
846	$w -= List::Util::max 0, $self->border * 2;	1025	$w -= List::Util::max 0, $self->border * 2;
847		1026
848	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1027	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
849	if $self->{title};	1028	if $self->{title};
850		1029
851	$self->child->configure ($self->border, $self->border, $w, $h);	1030	$self->child->configure ($self->border, $self->border, $w, $h);
852	}	1031	}
853		1032
…		…
872	my ($ev, $x, $y) = @_;	1051	my ($ev, $x, $y) = @_;
873		1052
874	my $dx = $ev->{x} - $ox;	1053	my $dx = $ev->{x} - $ox;
875	my $dy = $ev->{y} - $oy;	1054	my $dy = $ev->{y} - $oy;
876		1055
		1056	$self->{user_x} = $wx + $dx * $mx;
		1057	$self->{user_y} = $wy + $dy * $my;
877	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1058	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
878	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1059	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
879	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1060	$self->move ($self->{user_x}, $self->{user_y});
880	$self->check_size;	1061	$self->check_size;
881	};	1062	};
882		1063
883	} elsif ($lr ^ $td) {	1064	} elsif ($lr ^ $td) {
884	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1065	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
887	$self->{motion} = sub {	1068	$self->{motion} = sub {
888	my ($ev, $x, $y) = @_;	1069	my ($ev, $x, $y) = @_;
889		1070
890	($x, $y) = ($ev->{x}, $ev->{y});	1071	($x, $y) = ($ev->{x}, $ev->{y});
891		1072
892	$self->move ($bx + $x - $ox, $by + $y - $oy);	1073	$self->{user_x} = $bx + $x - $ox;
		1074	$self->{user_y} = $by + $y - $oy;
		1075	$self->move ($self->{user_x}, $self->{user_y});
893	$self->update;	1076	$self->update;
894	};	1077	};
895	}	1078	}
896	}	1079	}
897		1080
…		…
959	sub new {	1142	sub new {
960	my $class = shift;	1143	my $class = shift;
961		1144
962	$class->SUPER::new (	1145	$class->SUPER::new (
963	col_expand => [],	1146	col_expand => [],
964	@_	1147	@_,
965	)	1148	)
		1149	}
		1150
		1151	sub children {
		1152	grep $_, map @$_, grep $_, @{ $_[0]{children} }
966	}	1153	}
967		1154
968	sub add {	1155	sub add {
969	my ($self, $x, $y, $child) = @_;	1156	my ($self, $x, $y, $child) = @_;
970		1157
971	$child->set_parent ($self);	1158	$child->set_parent ($self);
972	$self->{children}[$y][$x] = $child;	1159	$self->{children}[$y][$x] = $child;
973		1160
974	$child->check_size;	1161	$self->check_size (1);
975	}	1162	}
976		1163
977	sub children {
978	grep $_, map @$_, grep $_, @{ $_[0]{children} }
979	}
980
981	# TODO: move to container class maybe? send childs a signal on removal?	1164	# TODO: move to container class maybe? send children a signal on removal?
982	sub clear {	1165	sub clear {
983	my ($self) = @_;	1166	my ($self) = @_;
984		1167
985	my @children = $self->children;	1168	my @children = $self->children;
986	delete $self->{children};	1169	delete $self->{children};
…		…
988	for (@children) {	1171	for (@children) {
989	delete $_->{parent};	1172	delete $_->{parent};
990	$_->hide;	1173	$_->hide;
991	}	1174	}
992		1175
		1176	$self->check_size (1);
993	$self->update;	1177	$self->update;
994	}	1178	}
995		1179
996	sub get_wh {	1180	sub get_wh {
997	my ($self) = @_;	1181	my ($self) = @_;
…		…
1029	sub size_allocate {	1213	sub size_allocate {
1030	my ($self, $w, $h) = @_;	1214	my ($self, $w, $h) = @_;
1031		1215
1032	my ($ws, $hs) = $self->get_wh;	1216	my ($ws, $hs) = $self->get_wh;
1033		1217
1034	my $req_w = sum @$ws;	1218	my $req_w = (sum @$ws) || 1;
1035	my $req_h = sum @$hs;	1219	my $req_h = (sum @$hs) || 1;
1036		1220
1037	# TODO: nicer code && do row_expand	1221	# TODO: nicer code && do row_expand
1038	my @col_expand = @{$self->{col_expand}};	1222	my @col_expand = @{$self->{col_expand}};
1039	@col_expand = (1) x @$ws unless @col_expand;	1223	@col_expand = (1) x @$ws unless @col_expand;
1040	my $col_expand = (sum @col_expand) || 1;	1224	my $col_expand = (sum @col_expand) || 1;
…		…
1214		1398
1215	#############################################################################	1399	#############################################################################
1216		1400
1217	package CFClient::UI::Label;	1401	package CFClient::UI::Label;
1218		1402
1219	our @ISA = CFClient::UI::Base::;	1403	our @ISA = CFClient::UI::DrawBG::;
1220		1404
1221	use CFClient::OpenGL;	1405	use CFClient::OpenGL;
1222		1406
1223	sub new {	1407	sub new {
1224	my ($class, %arg) = @_;	1408	my ($class, %arg) = @_;
1225		1409
1226	my $self = $class->SUPER::new (	1410	my $self = $class->SUPER::new (
1227	fg => [1, 1, 1],	1411	fg => [1, 1, 1],
		1412	#bg => none
		1413	#active_bg => none
1228	#font => default_font	1414	#font => default_font
1229	#text => initial text	1415	#text => initial text
1230	#markup => initial narkup	1416	#markup => initial narkup
		1417	#max_w => maximum pixel width
		1418	ellipsise => 3, # end
1231	layout => (new CFClient::Layout),	1419	layout => (new CFClient::Layout),
1232	fontsize => 1,	1420	fontsize => 1,
1233	align => -1,	1421	align => -1,
1234	valign => -1,	1422	valign => -1,
1235	padding => 2,	1423	padding => 2,
…		…
1250	}	1438	}
1251		1439
1252	$self	1440	$self
1253	}	1441	}
1254		1442
1255	sub escape {	1443	sub escape($) {
1256	local $_ = $_[1];	1444	local $_ = $_[0];
1257		1445
1258	s/&/&amp;/g;	1446	s/&/&amp;/g;
1259	s/>/&gt;/g;	1447	s/>/&gt;/g;
1260	s/</&lt;/g;	1448	s/</&lt;/g;
1261		1449
1262	$_[1]	1450	$_
1263	}	1451	}
1264		1452
1265	sub update {	1453	sub update {
1266	my ($self) = @_;	1454	my ($self) = @_;
1267		1455
…		…
1300	sub size_request {	1488	sub size_request {
1301	my ($self) = @_;	1489	my ($self) = @_;
1302		1490
1303	$self->{layout}->set_font ($self->{font}) if $self->{font};	1491	$self->{layout}->set_font ($self->{font}) if $self->{font};
1304	$self->{layout}->set_width ($self->{max_w} || -1);	1492	$self->{layout}->set_width ($self->{max_w} || -1);
		1493	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1494	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1305	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1495	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1306		1496
1307	my ($w, $h) = $self->{layout}->size;	1497	my ($w, $h) = $self->{layout}->size;
1308		1498
1309	if (exists $self->{template}) {	1499	if (exists $self->{template}) {
…		…
1339	}	1529	}
1340		1530
1341	sub _draw {	1531	sub _draw {
1342	my ($self) = @_;	1532	my ($self) = @_;
1343		1533
		1534	$self->SUPER::_draw; # draw background, if applicable
		1535
1344	my $tex = $self->{texture} ||= do {	1536	my $tex = $self->{texture} ||= do {
1345	$self->{layout}->set_foreground (@{$self->{fg}});	1537	$self->{layout}->set_foreground (@{$self->{fg}});
1346	$self->{layout}->set_font ($self->{font}) if $self->{font};	1538	$self->{layout}->set_font ($self->{font}) if $self->{font};
1347	$self->{layout}->set_width ($self->{w});	1539	$self->{layout}->set_width ($self->{w});
		1540	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1541	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1348	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1542	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1349		1543
1350	my $tex = new_from_layout CFClient::Texture $self->{layout};	1544	my $tex = new_from_layout CFClient::Texture $self->{layout};
1351		1545
1352	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1546	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1353	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1547	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1354	: ($self->{w} - $tex->{w}) * 0.5;	1548	: ($self->{w} - $tex->{w}) * 0.5);
1355		1549
1356	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1550	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1357	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1551	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1358	: ($self->{h} - $tex->{h}) * 0.5;	1552	: ($self->{h} - $tex->{h}) * 0.5);
1359		1553
1360	$tex	1554	$tex
1361	};	1555	};
1362		1556
1363	glEnable GL_TEXTURE_2D;	1557	glEnable GL_TEXTURE_2D;
…		…
1391	active_fg => [0, 0, 0],	1585	active_fg => [0, 0, 0],
1392	can_hover => 1,	1586	can_hover => 1,
1393	can_focus => 1,	1587	can_focus => 1,
1394	valign => 0,	1588	valign => 0,
1395	can_events => 1,	1589	can_events => 1,
		1590	#text => ...
1396	@_	1591	@_
1397	)	1592	)
1398	}	1593	}
1399		1594
1400	sub _set_text {	1595	sub _set_text {
…		…
1410	$self->{text} = $text;	1605	$self->{text} = $text;
1411		1606
1412	$text =~ s/./*/g if $self->{hidden};	1607	$text =~ s/./*/g if $self->{hidden};
1413	$self->{layout}->set_text ("$text ");	1608	$self->{layout}->set_text ("$text ");
1414		1609
1415	$self->emit (changed => $self->{text});	1610	$self->_emit (changed => $self->{text});
1416	}	1611	}
1417		1612
1418	sub set_text {	1613	sub set_text {
1419	my ($self, $text) = @_;	1614	my ($self, $text) = @_;
1420		1615
1421	$self->{cursor} = length $text;	1616	$self->{cursor} = length $text;
1422	$self->_set_text ($text);	1617	$self->_set_text ($text);
		1618	$self->update;
1423	$self->check_size;	1619	$self->check_size;
1424	$self->update;
1425	}	1620	}
1426		1621
1427	sub get_text {	1622	sub get_text {
1428	$_[0]{text}	1623	$_[0]{text}
1429	}	1624	}
…		…
1432	my ($self) = @_;	1627	my ($self) = @_;
1433		1628
1434	my ($w, $h) = $self->SUPER::size_request;	1629	my ($w, $h) = $self->SUPER::size_request;
1435		1630
1436	($w + 1, $h) # add 1 for cursor	1631	($w + 1, $h) # add 1 for cursor
1437	}
1438
1439	sub size_allocate {
1440	my ($self, $w, $h) = @_;
1441
1442	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1443	}	1632	}
1444		1633
1445	sub key_down {	1634	sub key_down {
1446	my ($self, $ev) = @_;	1635	my ($self, $ev) = @_;
1447		1636
…		…
1449	my $sym = $ev->{sym};	1638	my $sym = $ev->{sym};
1450	my $uni = $ev->{unicode};	1639	my $uni = $ev->{unicode};
1451		1640
1452	my $text = $self->get_text;	1641	my $text = $self->get_text;
1453		1642
1454	if ($sym == 8) {	1643	if ($uni == 8) {
1455	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1644	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1456	} elsif ($sym == 127) {	1645	} elsif ($uni == 127) {
1457	substr $text, $self->{cursor}, 1, "";	1646	substr $text, $self->{cursor}, 1, "";
1458	} elsif ($sym == CFClient::SDLK_LEFT) {	1647	} elsif ($sym == CFClient::SDLK_LEFT) {
1459	--$self->{cursor} if $self->{cursor};	1648	--$self->{cursor} if $self->{cursor};
1460	} elsif ($sym == CFClient::SDLK_RIGHT) {	1649	} elsif ($sym == CFClient::SDLK_RIGHT) {
1461	++$self->{cursor} if $self->{cursor} < length $self->{text};	1650	++$self->{cursor} if $self->{cursor} < length $self->{text};
1462	} elsif ($sym == CFClient::SDLK_HOME) {	1651	} elsif ($sym == CFClient::SDLK_HOME) {
1463	$self->{cursor} = 0;	1652	$self->{cursor} = 0;
1464	} elsif ($sym == CFClient::SDLK_END) {	1653	} elsif ($sym == CFClient::SDLK_END) {
1465	$self->{cursor} = length $text;	1654	$self->{cursor} = length $text;
1466	} elsif ($sym == 27) {	1655	} elsif ($uni == 27) {
1467	$self->emit ('escape');	1656	$self->_emit ('escape');
1468	} elsif ($uni) {	1657	} elsif ($uni) {
1469	substr $text, $self->{cursor}++, 0, chr $uni;	1658	substr $text, $self->{cursor}++, 0, chr $uni;
1470	}	1659	}
1471		1660
1472	$self->_set_text ($text);	1661	$self->_set_text ($text);
1473	$self->update;	1662	$self->update;
		1663	$self->check_size;
1474	}	1664	}
1475		1665
1476	sub focus_in {	1666	sub focus_in {
1477	my ($self) = @_;	1667	my ($self) = @_;
1478		1668
…		…
1558	if ($sym == 13) {	1748	if ($sym == 13) {
1559	unshift @{$self->{history}},	1749	unshift @{$self->{history}},
1560	my $txt = $self->get_text;	1750	my $txt = $self->get_text;
1561	$self->{history_pointer} = -1;	1751	$self->{history_pointer} = -1;
1562	$self->{history_saveback} = '';	1752	$self->{history_saveback} = '';
1563	$self->emit (activate => $txt);	1753	$self->_emit (activate => $txt);
1564	$self->update;	1754	$self->update;
1565		1755
1566	} elsif ($sym == CFClient::SDLK_UP) {	1756	} elsif ($sym == CFClient::SDLK_UP) {
1567	if ($self->{history_pointer} < 0) {	1757	if ($self->{history_pointer} < 0) {
1568	$self->{history_saveback} = $self->get_text;	1758	$self->{history_saveback} = $self->get_text;
…		…
1607	my $class = shift;	1797	my $class = shift;
1608		1798
1609	$class->SUPER::new (	1799	$class->SUPER::new (
1610	padding => 4,	1800	padding => 4,
1611	fg => [1, 1, 1],	1801	fg => [1, 1, 1],
1612	bg => [1, 1, 1, 0.2],
1613	active_fg => [0, 0, 1],	1802	active_fg => [0, 0, 1],
1614	can_hover => 1,	1803	can_hover => 1,
1615	align => 0,	1804	align => 0,
1616	valign => 0,	1805	valign => 0,
1617	can_events => 1,	1806	can_events => 1,
1618	@_	1807	@_
1619	)	1808	)
1620	}	1809	}
1621		1810
		1811	sub activate { }
		1812
1622	sub button_up {	1813	sub button_up {
1623	my ($self, $ev, $x, $y) = @_;	1814	my ($self, $ev, $x, $y) = @_;
1624		1815
		1816	$self->emit ("activate")
1625	if ($x >= 0 && $x < $self->{w}	1817	if $x >= 0 && $x < $self->{w}
1626	&& $y >= 0 && $y < $self->{h}) {	1818	&& $y >= 0 && $y < $self->{h};
1627	$self->emit ("activate");
1628	}
1629	}	1819	}
1630		1820
1631	sub _draw {	1821	sub _draw {
1632	my ($self) = @_;	1822	my ($self) = @_;
1633		1823
…		…
1665		1855
1666	$class->SUPER::new (	1856	$class->SUPER::new (
1667	padding => 2,	1857	padding => 2,
1668	fg => [1, 1, 1],	1858	fg => [1, 1, 1],
1669	active_fg => [1, 1, 0],	1859	active_fg => [1, 1, 0],
		1860	bg => [0, 0, 0, 0.2],
		1861	active_bg => [1, 1, 1, 0.5],
1670	state => 0,	1862	state => 0,
1671	can_hover => 1,	1863	can_hover => 1,
1672	@_	1864	@_
1673	)	1865	)
1674	}	1866	}
…		…
1683	my ($self, $ev, $x, $y) = @_;	1875	my ($self, $ev, $x, $y) = @_;
1684		1876
1685	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1877	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1686	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1878	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1687	$self->{state} = !$self->{state};	1879	$self->{state} = !$self->{state};
1688	$self->emit (changed => $self->{state});	1880	$self->_emit (changed => $self->{state});
1689	}	1881	}
1690	}	1882	}
1691		1883
1692	sub _draw {	1884	sub _draw {
1693	my ($self) = @_;	1885	my ($self) = @_;
…		…
1958	qw(s1_slider.png s1_slider_bg.png);	2150	qw(s1_slider.png s1_slider_bg.png);
1959		2151
1960	sub new {	2152	sub new {
1961	my $class = shift;	2153	my $class = shift;
1962		2154
1963	# range [value, low, high, page]	2155	# range [value, low, high, page, unit]
1964		2156
1965	# TODO: 0-width page	2157	# TODO: 0-width page
1966	# TODO: req_w/h are wrong with vertical	2158	# TODO: req_w/h are wrong with vertical
1967	# TODO: calculations are off	2159	# TODO: calculations are off
1968	my $self = $class->SUPER::new (	2160	my $self = $class->SUPER::new (
1969	fg => [1, 1, 1],	2161	fg => [1, 1, 1],
1970	active_fg => [0, 0, 0],	2162	active_fg => [0, 0, 0],
		2163	bg => [0, 0, 0, 0.2],
		2164	active_bg => [1, 1, 1, 0.5],
1971	range => [0, 0, 100, 10],	2165	range => [0, 0, 100, 10, 0],
1972	req_w => $::WIDTH / 80,	2166	req_w => $::WIDTH / 80,
1973	req_h => $::WIDTH / 80,	2167	req_h => $::WIDTH / 80,
1974	vertical => 0,	2168	vertical => 0,
1975	can_hover => 1,	2169	can_hover => 1,
1976	inner_pad => 5,	2170	inner_pad => 0.02,
1977	@_	2171	@_
1978	);	2172	);
1979		2173
		2174	$self->set_value ($self->{range}[0]);
		2175	$self->update;
		2176
1980	$self	2177	$self
		2178	}
		2179
		2180	sub set_range {
		2181	my ($self, $range) = @_;
		2182
		2183	($range, $self->{range}) = ($self->{range}, $range);
		2184
		2185	$self->update
		2186	if "@$range" ne "@{$self->{range}}";
		2187	}
		2188
		2189	sub set_value {
		2190	my ($self, $value) = @_;
		2191
		2192	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2193
		2194	$hi = $lo + 1 if $hi <= $lo;
		2195
		2196	$page = $hi - $lo if $page > $hi - $lo;
		2197
		2198	$value = $lo if $value < $lo;
		2199	$value = $hi - $page if $value > $hi - $page;
		2200
		2201	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2202	if $unit;
		2203
		2204	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2205
		2206	if ($value != $old_value) {
		2207	$self->_emit (changed => $value);
		2208	$self->update;
		2209	}
1981	}	2210	}
1982		2211
1983	sub size_request {	2212	sub size_request {
1984	my ($self) = @_;	2213	my ($self) = @_;
1985		2214
…		…
1991		2220
1992	sub button_down {	2221	sub button_down {
1993	my ($self, $ev, $x, $y) = @_;	2222	my ($self, $ev, $x, $y) = @_;
1994		2223
1995	$self->SUPER::button_down ($ev, $x, $y);	2224	$self->SUPER::button_down ($ev, $x, $y);
		2225
		2226	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2227
1996	$self->mouse_motion ($ev, $x, $y);	2228	$self->mouse_motion ($ev, $x, $y);
1997	}	2229	}
1998		2230
1999	sub mouse_motion {	2231	sub mouse_motion {
2000	my ($self, $ev, $x, $y) = @_;	2232	my ($self, $ev, $x, $y) = @_;
2001		2233
2002	if ($GRAB == $self) {	2234	if ($GRAB == $self) {
		2235	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2236
		2237	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2238
		2239	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2240
		2241	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2242	}
		2243	}
		2244
		2245	sub update {
		2246	my ($self) = @_;
		2247
		2248	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2249	$self->set_value ($self->{range}[0]);
		2250
2003	my ($value, $lo, $hi, $page) = @{$self->{range}};	2251	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2252	my $range = ($hi - $page - $lo) || 1e-100;
2004		2253
2005	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2254	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2006		2255
2007	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2256	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2008	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2257	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2009		2258
2010	$x -= $inner_pad_px; # substract the padding	2259	$value = ($value - $lo) / $range;
2011	$x = $x * ($hi - $lo) / $inner_w + $lo;	2260	$value = $value * $self->{scale} + $self->{offset};
2012	$x = $lo if $x < $lo;
2013	$x = $hi - $page if $x > $hi - $page;
2014	$self->{range}[0] = $x;
2015		2261
2016	$self->emit (changed => $x);	2262	$self->{knob_x} = $value - $knob_w * 0.5;
2017	$self->update;	2263	$self->{knob_w} = $knob_w;
2018	}	2264	});
2019	}
2020		2265
2021	# the inner_* stuff is for generating a padding for the slider handle,	2266	$self->SUPER::update;
2022	# so that the handle doesn't leave the texture. This calculation isn't 100%
2023	# correct propably, but it does the job for now
2024	sub _calc_inner_pad_px {
2025	my ($self, $w) = @_;
2026	($w / 100) * $self->{inner_pad} # % to pixels
2027	}	2267	}
2028		2268
2029	sub _draw {	2269	sub _draw {
2030	my ($self) = @_;	2270	my ($self) = @_;
2031		2271
2032	$self->SUPER::_draw ();	2272	$self->SUPER::_draw ();
2033		2273
2034	my ($w, $h) = @$self{qw(w h)};	2274	glScale $self->{w}, $self->{h};
2035		2275
2036	if ($self->{vertical}) {	2276	if ($self->{vertical}) {
2037	# draw a vertical slider like a rotated horizontal slider	2277	# draw a vertical slider like a rotated horizontal slider
2038		2278
		2279	glTranslate 1, 0, 0;
2039	glRotate 90, 0, 0, 1;	2280	glRotate 90, 0, 0, 1;
2040	glTranslate 0, -$self->{w}, 0;
2041
2042	($w, $h) = ($h, $w);
2043	}	2281	}
2044		2282
2045	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2283	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2046	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2284	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2047		2285
2048	my ($value, $lo, $hi, $page) = @{$self->{range}};
2049
2050	$hi = $value + 1 if $lo == $hi;
2051
2052	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2053	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2054
2055	$page = int $page * $inner_w / ($hi - $lo);
2056	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2057
2058	$w -= $page;
2059	$page &= ~1;
2060	glTranslate $page * 0.5, 0, 0;
2061	$page ||= 2;
2062
2063	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2064	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2065
2066	glEnable GL_TEXTURE_2D;	2286	glEnable GL_TEXTURE_2D;
2067	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2287	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2068		2288
2069	# draw background	2289	# draw background
2070	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2290	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2071		2291
2072	# draw handle	2292	# draw handle
2073	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2293	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2074		2294
2075	glDisable GL_TEXTURE_2D;	2295	glDisable GL_TEXTURE_2D;
2076	}	2296	}
		2297
		2298	#############################################################################
		2299
		2300	package CFClient::UI::ValSlider;
		2301
		2302	our @ISA = CFClient::UI::HBox::;
		2303
		2304	sub new {
		2305	my ($class, %arg) = @_;
		2306
		2307	my $range = delete $arg{range};
		2308
		2309	my $self = $class->SUPER::new (
		2310	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2311	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2312	to_value => sub { shift },
		2313	from_value => sub { shift },
		2314	%arg,
		2315	);
		2316
		2317	$self->{slider}->connect (changed => sub {
		2318	my ($self, $value) = @_;
		2319	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2320	$self->{parent}->emit (changed => $value);
		2321	});
		2322
		2323	# $self->{entry}->connect (changed => sub {
		2324	# my ($self, $value) = @_;
		2325	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2326	# $self->{parent}->emit (changed => $value);
		2327	# });
		2328
		2329	$self->add ($self->{slider}, $self->{entry});
		2330
		2331	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2332
		2333	$self
		2334	}
		2335
		2336	sub set_range { shift->{slider}->set_range (@_) }
		2337	sub set_value { shift->{slider}->set_value (@_) }
2077		2338
2078	#############################################################################	2339	#############################################################################
2079		2340
2080	package CFClient::UI::TextView;	2341	package CFClient::UI::TextView;
2081		2342
…		…
2111		2372
2112	$self->{fontsize} = $fontsize;	2373	$self->{fontsize} = $fontsize;
2113	$self->reflow;	2374	$self->reflow;
2114	}	2375	}
2115		2376
2116	sub text_height {
2117	my ($self, $text) = @_;
2118
2119	my $layout = $self->{layout};
2120
2121	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2122	$layout->set_width ($self->{children}[0]{w});
2123	$layout->set_markup ($text);
2124
2125	($layout->size)[1]
2126	}
2127
2128	sub reflow {
2129	my ($self) = @_;
2130
2131	$self->{need_reflow}++;
2132	$self->update;
2133	}
2134
2135	sub size_allocate {	2377	sub size_allocate {
2136	my ($self, $w, $h) = @_;	2378	my ($self, $w, $h) = @_;
2137		2379
2138	$self->SUPER::size_allocate ($w, $h);	2380	$self->SUPER::size_allocate ($w, $h);
2139		2381
…		…
2142	$self->{layout}->set_width ($self->{children}[0]{w});	2384	$self->{layout}->set_width ($self->{children}[0]{w});
2143		2385
2144	$self->reflow;	2386	$self->reflow;
2145	}	2387	}
2146		2388
		2389	sub text_size {
		2390	my ($self, $text, $indent) = @_;
		2391
		2392	my $layout = $self->{layout};
		2393
		2394	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2395	$layout->set_width ($self->{children}[0]{w} - $indent);
		2396	$layout->set_markup ($text);
		2397
		2398	$layout->size
		2399	}
		2400
		2401	sub reflow {
		2402	my ($self) = @_;
		2403
		2404	$self->{need_reflow}++;
		2405	$self->update;
		2406	}
		2407
		2408	sub set_offset {
		2409	my ($self, $offset) = @_;
		2410
		2411	# todo: base offset on lines or so, not on pixels
		2412	$self->{children}[1]->set_value ($offset);
		2413	}
		2414
		2415	sub clear {
		2416	my ($self) = @_;
		2417
		2418	$self->{par} = [];
		2419	$self->{height} = 0;
		2420	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2421	}
		2422
2147	sub add_paragraph {	2423	sub add_paragraph {
2148	my ($self, $color, $text) = @_;	2424	my ($self, $color, $text, $indent) = @_;
2149		2425
2150	#TODO: intelligently "reformat" paragraph	2426	for my $line (split /\n/, $text) {
2151		2427	my ($w, $h) = $self->text_size ($line);
2152	my $height = $self->text_height ($text);
2153
2154	$self->{height} += $height;	2428	$self->{height} += $h;
		2429	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2430	}
2155		2431
2156	push @{$self->{par}}, [$height, $color, $text];
2157
2158	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2432	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2159	$self->{children}[1]->update;
2160	}	2433	}
2161		2434
2162	sub update {	2435	sub update {
2163	my ($self) = @_;	2436	my ($self) = @_;
2164		2437
…		…
2167	return unless $self->{h} > 0;	2440	return unless $self->{h} > 0;
2168		2441
2169	delete $self->{texture};	2442	delete $self->{texture};
2170		2443
2171	$ROOT->on_post_alloc ($self, sub {	2444	$ROOT->on_post_alloc ($self, sub {
		2445	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2446
2172	if (delete $self->{need_reflow}) {	2447	if (delete $self->{need_reflow}) {
2173	my $height = 0;	2448	my $height = 0;
2174		2449
2175	$height += $_->[0] = $self->text_height ($_->[2])	2450	my $layout = $self->{layout};
		2451
		2452	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2453
2176	for @{$self->{par}};	2454	for (@{$self->{par}}) {
		2455	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2456	$layout->set_width ($W - $_->[3]);
		2457	$layout->set_markup ($_->[4]);
		2458	my ($w, $h) = $layout->size;
		2459	$_->[0] = $w + $_->[3];
		2460	$_->[1] = $h;
		2461	}
		2462
		2463	$height += $_->[1];
		2464	}
2177		2465
2178	$self->{height} = $height;	2466	$self->{height} = $height;
2179		2467
2180	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2468	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2181		2469
2182	delete $self->{texture};	2470	delete $self->{texture};
2183	}	2471	}
2184		2472
2185	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2473	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2186	glClearColor 0, 0, 0, 0;	2474	glClearColor 0.5, 0.5, 0.5, 0;
2187	glClear GL_COLOR_BUFFER_BIT;	2475	glClear GL_COLOR_BUFFER_BIT;
2188		2476
2189	glEnable GL_TEXTURE_2D;
2190	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2191
2192	my $top = int $self->{children}[1]{range}[0];	2477	my $top = int $self->{children}[1]{range}[0];
2193		2478
2194	my $y0 = $top;	2479	my $y0 = $top;
2195	my $y1 = $top + $self->{h};	2480	my $y1 = $top + $H;
2196		2481
2197	my $y = 0;	2482	my $y = 0;
2198		2483
2199	my $layout = $self->{layout};	2484	my $layout = $self->{layout};
2200		2485
2201	$layout->set_font ($self->{font}) if $self->{font};	2486	$layout->set_font ($self->{font}) if $self->{font};
2202		2487
		2488	glEnable GL_BLEND;
		2489	#TODO# not correct in windows where rgba is forced off
		2490	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2491
2203	for my $par (@{$self->{par}}) {	2492	for my $par (@{$self->{par}}) {
2204	my $h = $par->[0];	2493	my $h = $par->[1];
2205		2494
2206	if ($y0 < $y + $h && $y < $y1) {	2495	if ($y0 < $y + $h && $y < $y1) {
2207	$layout->set_foreground (@{ $par->[1] });	2496	$layout->set_foreground (@{ $par->[2] });
		2497	$layout->set_width ($W - $par->[3]);
2208	$layout->set_markup ($par->[2]);	2498	$layout->set_markup ($par->[4]);
2209		2499
2210	my ($W, $H) = $layout->size;	2500	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2211	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2501
		2502	glRasterPos $par->[3], $y - $y0;
		2503	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2212	}	2504	}
2213		2505
2214	$y += $h;	2506	$y += $h;
2215	}	2507	}
2216		2508
2217	glDisable GL_TEXTURE_2D;	2509	glDisable GL_BLEND;
2218	};	2510	};
2219	});	2511	});
2220	}	2512	}
2221		2513
2222	sub _draw {	2514	sub _draw {
2223	my ($self) = @_;	2515	my ($self) = @_;
2224		2516
2225	glEnable GL_TEXTURE_2D;	2517	glEnable GL_TEXTURE_2D;
2226	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2518	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2227	glColor 1, 1, 1, 1;	2519	glColor 1, 1, 1, 1;
2228	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2520	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2229	glDisable GL_TEXTURE_2D;	2521	glDisable GL_TEXTURE_2D;
2230		2522
2231	$self->{children}[1]->draw;	2523	$self->{children}[1]->draw;
2232		2524
2233	}	2525	}
…		…
2282		2574
2283	sub new {	2575	sub new {
2284	my $class = shift;	2576	my $class = shift;
2285		2577
2286	my $self = $class->SUPER::new (	2578	my $self = $class->SUPER::new (
2287	state => 0,	2579	state => 0,
2288	connect_activate => \&toggle_flopper,	2580	on_activate => \&toggle_flopper,
2289	@_	2581	@_
2290	);	2582	);
2291		2583
2292	if ($self->{state}) {	2584	if ($self->{state}) {
2293	$self->{state} = 0;	2585	$self->{state} = 0;
…		…
2302		2594
2303	# TODO: use animation	2595	# TODO: use animation
2304	if ($self->{state} = !$self->{state}) {	2596	if ($self->{state} = !$self->{state}) {
2305	$CFClient::UI::ROOT->add ($self->{other});	2597	$CFClient::UI::ROOT->add ($self->{other});
2306	$self->{other}->move ($self->coord2global (0, $self->{h}));	2598	$self->{other}->move ($self->coord2global (0, $self->{h}));
2307	$self->emit ("open");	2599	$self->_emit ("open");
2308	} else {	2600	} else {
2309	$CFClient::UI::ROOT->remove ($self->{other});	2601	$CFClient::UI::ROOT->remove ($self->{other});
2310	$self->emit ("close");	2602	$self->_emit ("close");
2311	}	2603	}
2312		2604
2313	$self->emit (changed => $self->{state});	2605	$self->_emit (changed => $self->{state});
2314	}	2606	}
2315		2607
2316	#############################################################################	2608	#############################################################################
2317		2609
2318	package CFClient::UI::Tooltip;	2610	package CFClient::UI::Tooltip;
…		…
2332		2624
2333	sub set_tooltip_from {	2625	sub set_tooltip_from {
2334	my ($self, $widget) = @_;	2626	my ($self, $widget) = @_;
2335		2627
2336	$self->add (new CFClient::UI::Label	2628	$self->add (new CFClient::UI::Label
2337	markup => $widget->{tooltip},	2629	markup => $widget->{tooltip},
2338	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2630	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2339	fontsize => 0.8,	2631	fontsize => 0.8,
2340	fg => [0, 0, 0, 1],	2632	fg => [0, 0, 0, 1],
		2633	ellipsise => 0,
2341	font => ($widget->{tooltip_font} || $::FONT_PROP),	2634	font => ($widget->{tooltip_font} || $::FONT_PROP),
2342	);	2635	);
2343	}	2636	}
2344		2637
2345	sub size_request {	2638	sub size_request {
2346	my ($self) = @_;	2639	my ($self) = @_;
…		…
2392	use CFClient::OpenGL;	2685	use CFClient::OpenGL;
2393		2686
2394	sub new {	2687	sub new {
2395	my $class = shift;	2688	my $class = shift;
2396		2689
2397	$class->SUPER::new (	2690	my $self = $class->SUPER::new (
2398	aspect => 1,	2691	aspect => 1,
		2692	can_events => 0,
2399	@_,	2693	@_,
2400	)	2694	);
		2695
		2696	if ($self->{anim} && $self->{animspeed}) {
		2697	Scalar::Util::weaken (my $widget = $self);
		2698
		2699	$self->{timer} = Event->timer (
		2700	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2701	hard => 1,
		2702	interval => $self->{animspeed},
		2703	cb => sub {
		2704	++$widget->{frame};
		2705	$widget->update;
		2706	},
		2707	);
		2708	}
		2709
		2710	$self
2401	}	2711	}
2402		2712
2403	sub size_request {	2713	sub size_request {
2404	(32, 8)	2714	(32, 8)
2405	}	2715	}
2406		2716
		2717	sub update {
		2718	my ($self) = @_;
		2719
		2720	return unless $self->{visible};
		2721
		2722	$self->SUPER::update;
		2723	}
		2724
2407	sub _draw {	2725	sub _draw {
2408	my ($self) = @_;	2726	my ($self) = @_;
2409		2727
2410	return unless $::CONN;#d# manage and cache textures differently	2728	return unless $::CONN;
		2729
		2730	my $face;
		2731
		2732	if ($self->{frame}) {
		2733	my $anim = $::CONN->{anim}[$self->{anim}];
		2734
		2735	$face = $anim->[ $self->{frame} % @$anim ]
		2736	if $anim && @$anim;
		2737	}
		2738
2411	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2739	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2412		2740
2413	# TODO animation
2414	if ($tex) {	2741	if ($tex) {
2415	glEnable GL_TEXTURE_2D;	2742	glEnable GL_TEXTURE_2D;
2416	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2743	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417	glColor 1, 1, 1, 1;	2744	glColor 1, 1, 1, 1;
2418	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2745	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419	glDisable GL_TEXTURE_2D;	2746	glDisable GL_TEXTURE_2D;
2420	}	2747	}
2421	}	2748	}
2422		2749
		2750	sub DESTROY {
		2751	my ($self) = @_;
		2752
		2753	$self->{timer}->cancel
		2754	if $self->{timer};
		2755
		2756	$self->SUPER::DESTROY;
		2757	}
		2758
2423	#############################################################################	2759	#############################################################################
2424		2760
2425	package CFClient::UI::InventoryItem;	2761	package CFClient::UI::Inventory;
2426		2762
2427	our @ISA = CFClient::UI::HBox::;	2763	our @ISA = CFClient::UI::ScrolledWindow::;
2428		2764
2429	sub new {	2765	sub new {
2430	my $class = shift;	2766	my $class = shift;
2431		2767
2432	my %args = @_;
2433
2434	my $item = delete $args{item};
2435
2436	my $desc = $item->{nrof} < 2
2437	? $item->{name}
2438	: "$item->{nrof} $item->{name_pl}";
2439
2440
2441	my $self = $class->SUPER::new (	2768	my $self = $class->SUPER::new (
2442	can_hover => 1,	2769	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2443	can_events => 1,
2444	tooltip => (CFClient::UI::Label->escape ($desc)
2445	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2446	connect_button_down => sub {
2447	my ($self, $ev, $x, $y) = @_;
2448
2449	# todo: maybe put examine on 1? but should just be a tooltip :(
2450	if ($ev->{button} == 1) {
2451	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2452	} elsif ($ev->{button} == 2) {
2453	$::CONN->send ("apply $item->{tag}");
2454	} elsif ($ev->{button} == 3) {
2455	CFClient::UI::Menu->new (
2456	items => [
2457	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2458	[
2459	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2460	sub { $::CONN->send ("lock $item->{tag}") },
2461	],
2462	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2463	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2464	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2465	],
2466	)->popup ($ev);
2467	}
2468
2469	1
2470	},
2471	%args
2472	);
2473
2474	$self->add (new CFClient::UI::Face
2475	can_events => 0,
2476	face => $item->{face},
2477	anim => $item->{anim},
2478	animspeed => $item->{animspeed},
2479	);
2480
2481	$self->add (new CFClient::UI::Label
2482	can_events => 0,
2483	text => $desc,
2484	);
2485
2486	$self
2487	}
2488
2489	#############################################################################
2490
2491	package CFClient::UI::Inventory;
2492
2493	our @ISA = CFClient::UI::ScrolledWindow::;
2494
2495	sub new {
2496	my $class = shift;
2497
2498	my $self = $class->SUPER::new (
2499	scrolled => (new CFClient::UI::VBox),
2500	@_,	2770	@_,
2501	);	2771	);
2502		2772
2503	$self	2773	$self
2504	}	2774	}
…		…
2507	my ($self, $items) = @_;	2777	my ($self, $items) = @_;
2508		2778
2509	$self->{scrolled}->clear;	2779	$self->{scrolled}->clear;
2510	return unless $items;	2780	return unless $items;
2511		2781
2512	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2782	my @items = sort {
		2783	($a->{type} <=> $b->{type})
		2784	or ($a->{name} cmp $b->{name})
		2785	} @$items;
2513		2786
2514	$self->{real_items} = \@items;	2787	$self->{real_items} = \@items;
2515		2788
		2789	my $row = 0;
2516	for my $item (@items) {	2790	for my $item (@items) {
2517	my $desc = $item->{nrof} < 2	2791	CFClient::Item::update_widgets $item;
2518	? $item->{name}
2519	: "$item->{nrof} $item->{name_pl}";
2520		2792
2521	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2793	$self->{scrolled}->add (0, $row, $item->{face_widget});
2522	}	2794	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2795	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2523		2796
2524	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2797	$row++;
		2798	}
2525	}	2799	}
2526		2800
2527	sub size_request {	2801	sub size_request {
2528	my ($self) = @_;	2802	my ($self) = @_;
2529	($self->{req_w}, $self->{req_h});	2803	($self->{req_w}, $self->{req_h});
…		…
2569		2843
2570	# popup given the event (must be a mouse button down event currently)	2844	# popup given the event (must be a mouse button down event currently)
2571	sub popup {	2845	sub popup {
2572	my ($self, $ev) = @_;	2846	my ($self, $ev) = @_;
2573		2847
2574	$self->emit ("popdown");	2848	$self->_emit ("popdown");
2575		2849
2576	# maybe save $GRAB? must be careful about events...	2850	# maybe save $GRAB? must be careful about events...
2577	$GRAB = $self;	2851	$GRAB = $self;
2578	$self->{button} = $ev->{button};	2852	$self->{button} = $ev->{button};
2579		2853
…		…
2594		2868
2595	if ($ev->{button} == $self->{button}) {	2869	if ($ev->{button} == $self->{button}) {
2596	undef $GRAB;	2870	undef $GRAB;
2597	$self->hide;	2871	$self->hide;
2598		2872
2599	$self->emit ("popdown");	2873	$self->_emit ("popdown");
2600	$self->{hover}[1]->() if $self->{hover};	2874	$self->{hover}[1]->() if $self->{hover};
2601	}	2875	}
2602	}	2876	}
2603		2877
2604	#############################################################################	2878	#############################################################################
2605		2879
2606	package CFClient::UI::Statusbox;	2880	package CFClient::UI::Statusbox;
2607		2881
2608	our @ISA = CFClient::UI::VBox::;	2882	our @ISA = CFClient::UI::VBox::;
		2883
		2884	sub new {
		2885	my $class = shift;
		2886
		2887	$class->SUPER::new (
		2888	fontsize => 0.8,
		2889	@_,
		2890	)
		2891	}
2609		2892
2610	sub reorder {	2893	sub reorder {
2611	my ($self) = @_;	2894	my ($self) = @_;
2612	my $NOW = time;	2895	my $NOW = time;
2613		2896
…		…
2632	? "<b>$item->{count} ×</b> $item->{text}"	2915	? "<b>$item->{count} ×</b> $item->{text}"
2633	: $item->{text};	2916	: $item->{text};
2634		2917
2635	for ($short) {	2918	for ($short) {
2636	s/^\s+//;	2919	s/^\s+//;
2637	s/\012.*/…/s;	2920	s/\s+/ /g;
2638	my $len = int 40 / $item->{fontsize};
2639	substr $_, $len, length, "…" if $len < length;
2640	}	2921	}
2641		2922
2642	new CFClient::UI::Label	2923	new CFClient::UI::Label
2643	markup => $short,	2924	markup => $short,
2644	tooltip => $item->{tooltip},	2925	tooltip => $item->{tooltip},
2645	tooltip_font => $::FONT_PROP,	2926	tooltip_font => $::FONT_PROP,
2646	tooltip_width => 0.67,	2927	tooltip_width => 0.67,
2647	fontsize => $item->{fontsize},	2928	fontsize => $item->{fontsize} || $self->{fontsize},
		2929	max_w => $::WIDTH * 0.44,
2648	color => $item->{color},	2930	fg => $item->{fg},
2649	can_events => 1,	2931	can_events => 1,
2650	can_hover => 1	2932	can_hover => 1
2651	};	2933	};
2652	}	2934	}
2653		2935
…		…
2658	sub add {	2940	sub add {
2659	my ($self, $text, %arg) = @_;	2941	my ($self, $text, %arg) = @_;
2660		2942
2661	$text =~ s/^\s+//;	2943	$text =~ s/^\s+//;
2662	$text =~ s/\s+$//;	2944	$text =~ s/\s+$//;
		2945
		2946	return unless $text;
2663		2947
2664	my $timeout = time + ((delete $arg{timeout}) || 60);	2948	my $timeout = time + ((delete $arg{timeout}) || 60);
2665		2949
2666	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2950	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2667		2951
…		…
2679	$self->{item}{$group} = {	2963	$self->{item}{$group} = {
2680	id => ++$self->{id},	2964	id => ++$self->{id},
2681	text => $text,	2965	text => $text,
2682	timeout => $timeout,	2966	timeout => $timeout,
2683	tooltip => $text,	2967	tooltip => $text,
2684	fontsize => 0.8,
2685	color => [0.8, 0.8, 0.8, 0.8],	2968	fg => [0.8, 0.8, 0.8, 0.8],
2686	pri => 0,	2969	pri => 0,
2687	count => 1,	2970	count => 1,
2688	%arg,	2971	%arg,
2689	};	2972	};
2690	}	2973	}
2691		2974
2692	$self->reorder;	2975	$self->reorder;
2693	}	2976	}
2694		2977
		2978	sub reconfigure {
		2979	my ($self) = @_;
		2980
		2981	delete $_->{label}
		2982	for values %{ $self->{item} || {} };
		2983
		2984	$self->reorder;
		2985	$self->SUPER::reconfigure;
		2986	}
		2987
2695	#############################################################################	2988	#############################################################################
2696		2989
2697	package CFClient::UI::Root;	2990	package CFClient::UI::Root;
2698		2991
2699	our @ISA = CFClient::UI::Container::;	2992	our @ISA = CFClient::UI::Container::;
…		…
2702		2995
2703	sub new {	2996	sub new {
2704	my $class = shift;	2997	my $class = shift;
2705		2998
2706	$class->SUPER::new (	2999	$class->SUPER::new (
		3000	visible => 1,
2707	@_,	3001	@_,
2708	)	3002	)
2709	}	3003	}
2710		3004
2711	sub configure {	3005	sub configure {
…		…
2729	}	3023	}
2730		3024
2731	sub size_allocate {	3025	sub size_allocate {
2732	my ($self, $w, $h) = @_;	3026	my ($self, $w, $h) = @_;
2733		3027
2734	my $old_w = $self->{old_w};
2735	my $old_h = $self->{old_h};
2736
2737	if ($old_w && $old_h) {
2738	for my $child ($self->children) {
2739	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2740	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2741	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2742	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2743	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2744	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2745	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2746	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2747	}
2748	}
2749
2750	for my $child ($self->children) {	3028	for my $child ($self->children) {
2751	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3029	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2752		3030
		3031	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3032	if exists $child->{req_x};
		3033
		3034	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3035	if exists $child->{req_y};
		3036
2753	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3037	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2754	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3038	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3039
2755	$child->configure ($X, $Y, $W, $H);	3040	$child->configure ($X, $Y, $W, $H);
2756	}	3041	}
2757
2758	$self->{old_w} = $w;
2759	$self->{old_h} = $h;
2760	}	3042	}
2761		3043
2762	sub coord2local {	3044	sub coord2local {
2763	my ($self, $x, $y) = @_;	3045	my ($self, $x, $y) = @_;
2764		3046
…		…
2777	$self->check_size;	3059	$self->check_size;
2778	$::WANT_REFRESH++;	3060	$::WANT_REFRESH++;
2779	}	3061	}
2780		3062
2781	sub add {	3063	sub add {
2782	my ($self, $child) = @_;	3064	my ($self, @children) = @_;
2783		3065
		3066	for (my @widgets = @children; my $w = pop @widgets; ) {
		3067	push @widgets, $w->children;
		3068	$w->{root} = $self;
		3069	$w->{visible} = $self->{visible} + 1;
		3070	}
		3071
		3072	for my $child (@children) {
		3073	$child->{is_toplevel} = 1;
		3074
2784	# integerise window positions	3075	# integerise window positions
2785	$child->{x} = int $child->{x};	3076	$child->{x} = int $child->{x};
2786	$child->{y} = int $child->{y};	3077	$child->{y} = int $child->{y};
		3078	}
2787		3079
2788	$self->SUPER::add ($child);	3080	$self->SUPER::add (@children);
		3081	}
		3082
		3083	sub remove {
		3084	my ($self, @children) = @_;
		3085
		3086	$self->SUPER::remove (@children);
		3087
		3088	while (@children) {
		3089	my $w = pop @children;
		3090	push @children, $w->children;
		3091	$w->set_invisible;
		3092	}
2789	}	3093	}
2790		3094
2791	sub on_refresh {	3095	sub on_refresh {
2792	my ($self, $id, $cb) = @_;	3096	my ($self, $id, $cb) = @_;
2793		3097
…		…
2807	$_->()	3111	$_->()
2808	for values %{delete $self->{refresh_hook}};	3112	for values %{delete $self->{refresh_hook}};
2809	}	3113	}
2810		3114
2811	if ($self->{check_size}) {	3115	if ($self->{check_size}) {
2812	my @queue = ([], []);	3116	my @queue;
2813		3117
2814	for (;;) {	3118	for (;;) {
2815	if ($self->{check_size}) {	3119	if ($self->{check_size}) {
2816	# heuristic: check containers last	3120	#TODO use array-of-depth approach
2817	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3121
		3122	@queue = sort { $a->{visible} <=> $b->{visible} }
2818	for values %{delete $self->{check_size}}	3123	@queue, values %{delete $self->{check_size}};
2819	}	3124	}
2820		3125
2821	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3126	my $widget = pop @queue || last;
		3127
		3128	defined $widget->{visible} or last; # do not resize invisible widgets
2822		3129
2823	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3130	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2824	? @$widget{qw(user_w user_h)}	3131	? @$widget{qw(user_w user_h)}
2825	: $widget->size_request;	3132	: $widget->size_request;
2826		3133
…		…
2846	$w = 0 if $w < 0;	3153	$w = 0 if $w < 0;
2847	$h = 0 if $h < 0;	3154	$h = 0 if $h < 0;
2848		3155
2849	$widget->{w} = $w;	3156	$widget->{w} = $w;
2850	$widget->{h} = $h;	3157	$widget->{h} = $h;
2851	$widget->size_allocate ($w, $h);
2852	$widget->emit (size_allocate => $w, $h);	3158	$widget->emit (size_allocate => $w, $h);
2853	}	3159	}
2854	}	3160	}
2855		3161
2856	while ($self->{post_alloc_hook}) {	3162	while ($self->{post_alloc_hook}) {
…		…
2862	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3168	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2863	glClear GL_COLOR_BUFFER_BIT;	3169	glClear GL_COLOR_BUFFER_BIT;
2864		3170
2865	glMatrixMode GL_PROJECTION;	3171	glMatrixMode GL_PROJECTION;
2866	glLoadIdentity;	3172	glLoadIdentity;
2867	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3173	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2868	glMatrixMode GL_MODELVIEW;	3174	glMatrixMode GL_MODELVIEW;
2869	glLoadIdentity;	3175	glLoadIdentity;
2870		3176
2871	$self->_draw;	3177	$self->_draw;
2872	}	3178	}
…		…
2874	#############################################################################	3180	#############################################################################
2875		3181
2876	package CFClient::UI;	3182	package CFClient::UI;
2877		3183
2878	$ROOT = new CFClient::UI::Root;	3184	$ROOT = new CFClient::UI::Root;
2879	$TOOLTIP = new CFClient::UI::Tooltip;	3185	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2880		3186
2881	1	3187	1
2882		3188

Diff Legend

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