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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.245 by elmex, Sat May 27 21:15:57 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
		226	}
		227
		228	sub toggle_visibility {
		229	my ($self) = @_;
		230
		231	if ($self->{visible}) {
		232	$self->hide;
		233	} else {
		234	$self->show;
		235	}
166	}	236	}
167		237
168	sub destroy {	238	sub destroy {
169	my ($self) = @_;	239	my ($self) = @_;
170		240
…		…
172	%$self = ();	242	%$self = ();
173	}	243	}
174		244
175	sub show {	245	sub show {
176	my ($self) = @_;	246	my ($self) = @_;
177
178	return if $self->{parent};	247	return if $self->{parent};
179		248
180	$CFClient::UI::ROOT->add ($self);	249	$CFClient::UI::ROOT->add ($self);
181	}	250	}
182		251
183	sub hide {	252	sub show_centered {
184	my ($self) = @_;	253	my ($self) = @_;
		254	return if $self->{parent};
		255
		256	$self->show;
		257
		258	$CFClient::UI::ROOT->on_post_alloc (
		259	"centered $self" => sub {
		260	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		261	},
		262	);
		263	}
		264
		265	sub set_invisible {
		266	my ($self) = @_;
		267
		268	return unless $self->{visible};
		269
		270	# broken show/hide model
		271
		272	delete $self->{root};
		273	delete $self->{visible};
185		274
186	undef $GRAB if $GRAB == $self;	275	undef $GRAB if $GRAB == $self;
187	undef $HOVER if $HOVER == $self;	276	undef $HOVER if $HOVER == $self;
		277
		278	CFClient::UI::check_tooltip
		279	if $CFClient::UI::TOOLTIP->{owner} == $self;
		280
		281	$self->focus_out;
		282
		283	$self->emit (visibility_change => 0);
		284	}
		285
		286	sub hide {
		287	my ($self) = @_;
		288
		289	$self->set_invisible;
188		290
189	$self->{parent}->remove ($self)	291	$self->{parent}->remove ($self)
190	if $self->{parent};	292	if $self->{parent};
191	}	293	}
192		294
…		…
242		344
243	sub size_allocate {	345	sub size_allocate {
244	# nothing to be done	346	# nothing to be done
245	}	347	}
246		348
		349	sub reconfigure {
		350	my ($self) = @_;
		351
		352	$self->check_size (1);
		353	$self->update;
		354	}
		355
247	sub children {	356	sub children {
248	}
249
250	# call when resolution changes etc.
251	sub reconfigure {
252	my ($self) = @_;
253
254	$_->reconfigure
255	for $self->children;
256
257	$self->check_size;
258	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259	$self->update;
260	}	357	}
261		358
262	sub set_max_size {	359	sub set_max_size {
263	my ($self, $w, $h) = @_;	360	my ($self, $w, $h) = @_;
264		361
265	delete $self->{max_w}; $self->{max_w} = $w if $w;	362	delete $self->{max_w}; $self->{max_w} = $w if $w;
266	delete $self->{max_h}; $self->{max_h} = $h if $h;	363	delete $self->{max_h}; $self->{max_h} = $h if $h;
		364	}
		365
		366	sub set_tooltip {
		367	my ($self, $tooltip) = @_;
		368
		369	$tooltip =~ s/^\s+//;
		370	$tooltip =~ s/\s+$//;
		371
		372	return if $self->{tooltip} eq $tooltip;
		373
		374	$self->{tooltip} = $tooltip;
		375
		376	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		377	delete $CFClient::UI::TOOLTIP->{owner};
		378	CFClient::UI::check_tooltip;
		379	}
267	}	380	}
268		381
269	# translate global coordinates to local coordinate system	382	# translate global coordinates to local coordinate system
270	sub coord2local {	383	sub coord2local {
271	my ($self, $x, $y) = @_;	384	my ($self, $x, $y) = @_;
…		…
286	return if $FOCUS == $self;	399	return if $FOCUS == $self;
287	return unless $self->{can_focus};	400	return unless $self->{can_focus};
288		401
289	my $focus = $FOCUS; $FOCUS = $self;	402	my $focus = $FOCUS; $FOCUS = $self;
290		403
291	$self->emit (focus_in => $focus);	404	$self->_emit (focus_in => $focus);
292		405
293	$focus->update if $focus;	406	$focus->update if $focus;
294	$FOCUS->update;	407	$FOCUS->update;
295	}	408	}
296		409
…		…
299		412
300	return unless $FOCUS == $self;	413	return unless $FOCUS == $self;
301		414
302	my $focus = $FOCUS; undef $FOCUS;	415	my $focus = $FOCUS; undef $FOCUS;
303		416
304	$self->emit (focus_out => $focus);	417	$self->_emit (focus_out => $focus);
305		418
306	$focus->update if $focus; #?	419	$focus->update if $focus; #?
		420
		421	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		422	unless $FOCUS;
307	}	423	}
308		424
309	sub mouse_motion { }	425	sub mouse_motion { }
310	sub button_up { }	426	sub button_up { }
311	sub key_down { }	427	sub key_down { }
312	sub key_up { }	428	sub key_up { }
313		429
314	sub button_down {	430	sub button_down {
315	my ($self, $ev, $x, $y) = @_;	431	my ($self, $ev, $x, $y) = @_;
316		432
317	$self->focus_in;	433	$self->focus_in;
…		…
351	if ($ENV{PCLIENT_DEBUG}) {	467	if ($ENV{PCLIENT_DEBUG}) {
352	glPushMatrix;	468	glPushMatrix;
353	glColor 1, 1, 0, 1;	469	glColor 1, 1, 0, 1;
354	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	470	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
355	glBegin GL_LINE_LOOP;	471	glBegin GL_LINE_LOOP;
356	glVertex 0 , 0;	472	glVertex 0 , 0;
357	glVertex $self->{w}, 0;	473	glVertex $self->{w} - 1, 0;
358	glVertex $self->{w}, $self->{h};	474	glVertex $self->{w} - 1, $self->{h} - 1;
359	glVertex 0 , $self->{h};	475	glVertex 0 , $self->{h} - 1;
360	glEnd;	476	glEnd;
361	glPopMatrix;	477	glPopMatrix;
362	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	478	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
363	}	479	}
364	}	480	}
365		481
366	sub _draw {	482	sub _draw {
367	my ($self) = @_;	483	my ($self) = @_;
…		…
384	sub set_parent {	500	sub set_parent {
385	my ($self, $parent) = @_;	501	my ($self, $parent) = @_;
386		502
387	Scalar::Util::weaken ($self->{parent} = $parent);	503	Scalar::Util::weaken ($self->{parent} = $parent);
388		504
		505	if ($parent->{visible} || 1) {
		506	$self->{root} = $parent->{root};
		507	$self->{visible} = $parent->{visible} + 1;
		508
		509	$self->emit (visibility_change => 1)
		510	unless $self->{parent}{visible};
		511	}
		512
		513	# TODO: req_w _does_change after ->reconfigure
389	$self->check_size	514	$self->check_size
390	unless exists $self->{req_w};	515	unless exists $self->{req_w};
		516
		517	$self->show;
391	}	518	}
392		519
393	sub check_size {	520	sub check_size {
394	my ($self, $forced) = @_;	521	my ($self, $forced) = @_;
395		522
…		…
408	my ($self, $signal, $cb) = @_;	535	my ($self, $signal, $cb) = @_;
409		536
410	push @{ $self->{signal_cb}{$signal} }, $cb;	537	push @{ $self->{signal_cb}{$signal} }, $cb;
411	}	538	}
412		539
		540	sub _emit {
		541	my ($self, $signal, @args) = @_;
		542
		543	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		544	}
		545
413	sub emit {	546	sub emit {
414	my ($self, $signal, @args) = @_;	547	my ($self, $signal, @args) = @_;
415		548
416	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	549	$self->_emit ($signal, @args)
		550	|| $self->$signal (@args);
		551	}
		552
		553	sub visibility_change {
		554	#my ($self, $visible) = @_;
417	}	555	}
418		556
419	sub DESTROY {	557	sub DESTROY {
420	my ($self) = @_;	558	my ($self) = @_;
421		559
		560	delete $WIDGET{$self+0};
422	#$self->deactivate;	561	#$self->deactivate;
423	}	562	}
424		563
425	#############################################################################	564	#############################################################################
426		565
…		…
435	my $class = shift;	574	my $class = shift;
436		575
437	# range [value, low, high, page]	576	# range [value, low, high, page]
438		577
439	$class->SUPER::new (	578	$class->SUPER::new (
440	bg => [0, 0, 0, 0.2],	579	#bg => [0, 0, 0, 0.2],
441	active_bg => [1, 1, 1, 0.5],	580	#active_bg => [1, 1, 1, 0.5],
442	@_	581	@_
443	)	582	)
444	}	583	}
445		584
446	sub _draw {	585	sub _draw {
447	my ($self) = @_;	586	my ($self) = @_;
448		587
		588	my $color = $FOCUS == $self && $self->{active_bg}
		589	? $self->{active_bg}
		590	: $self->{bg};
		591
		592	if ($color && (@$color < 4 || $color->[3])) {
449	my ($w, $h) = @$self{qw(w h)};	593	my ($w, $h) = @$self{qw(w h)};
450		594
451	glEnable GL_BLEND;	595	glEnable GL_BLEND;
452	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	596	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	597	glColor @$color;
454		598
455	glBegin GL_QUADS;	599	glBegin GL_QUADS;
456	glVertex 0 , 0;	600	glVertex 0 , 0;
457	glVertex 0 , $h;	601	glVertex 0 , $h;
458	glVertex $w, $h;	602	glVertex $w, $h;
459	glVertex $w, 0;	603	glVertex $w, 0;
460	glEnd;	604	glEnd;
461		605
462	glDisable GL_BLEND;	606	glDisable GL_BLEND;
		607	}
463	}	608	}
464		609
465	#############################################################################	610	#############################################################################
466		611
467	package CFClient::UI::Empty;	612	package CFClient::UI::Empty;
…		…
527	delete $child->{parent};	672	delete $child->{parent};
528	$child->hide;	673	$child->hide;
529		674
530	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	675	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531		676
532	$self->check_size;	677	$self->check_size (1);
533	$self->update;	678	$self->update;
534	}	679	}
535		680
536	sub clear {	681	sub clear {
537	my ($self) = @_;	682	my ($self) = @_;
…		…
628	}	773	}
629		774
630	sub update {	775	sub update {
631	my ($self) = @_;	776	my ($self) = @_;
632		777
633	$ROOT->on_refresh ($self => sub { $self->render_child });	778	$ROOT->on_post_alloc ($self => sub { $self->render_child });
634	$self->SUPER::update;	779	$self->SUPER::update;
635	}	780	}
636		781
637	sub size_allocate {	782	sub size_allocate {
638	my ($self, $w, $h) = @_;	783	my ($self, $w, $h) = @_;
…		…
651	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	796	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652	glClearColor 0, 0, 0, 0;	797	glClearColor 0, 0, 0, 0;
653	glClear GL_COLOR_BUFFER_BIT;	798	glClear GL_COLOR_BUFFER_BIT;
654		799
655	$self->_render;	800	$self->_render;
656	# glColorMask 1, 1, 1, 0;
657	# glEnable GL_BLEND;
658	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659	# glRasterPos 0, 0;
660	# glCopyPixels 0, 0, $self->{w}, $self->{h};
661	# glDisable GL_BLEND;
662	# glColorMask 1, 1, 1, 1;
663	};	801	};
664	}	802	}
665		803
666	sub _draw {	804	sub _draw {
667	my ($self) = @_;	805	my ($self) = @_;
…		…
671	my $tex = $self->{texture}	809	my $tex = $self->{texture}
672	or return;	810	or return;
673		811
674	glEnable GL_TEXTURE_2D;	812	glEnable GL_TEXTURE_2D;
675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676	glColor 0, 0, 0, 1;	814	glColor 1, 1, 1, 1;
677		815
678	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679		817
680	glDisable GL_TEXTURE_2D;	818	glDisable GL_TEXTURE_2D;
681	}	819	}
…		…
684		822
685	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
686		824
687	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
688		826
		827	sub new {
		828	my $class = shift;
		829
		830	$class->SUPER::new (
		831	scroll_x => 0,
		832	scroll_y => 1,
		833	@_,
		834	)
		835	}
		836
689	sub size_request {	837	sub size_request {
690	my ($self) = @_;	838	my ($self) = @_;
691		839
692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	840	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
694		841
695	@$self{qw(child_w child_h)}	842	@$self{qw(child_w child_h)}
696	}	843	}
697		844
698	sub size_allocate {	845	sub size_allocate {
699	my ($self, $w, $h) = @_;	846	my ($self, $w, $h) = @_;
700		847
		848	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		849	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		850
		851	$self->child->configure (0, 0, $w, $h);
701	$self->update;	852	$self->update;
702	}	853	}
703		854
704	sub set_offset {	855	sub set_offset {
705	my ($self, $x, $y) = @_;	856	my ($self, $x, $y) = @_;
…		…
756	my $class = shift;	907	my $class = shift;
757		908
758	my $self;	909	my $self;
759		910
760	my $slider = new CFClient::UI::Slider	911	my $slider = new CFClient::UI::Slider
761	vertical => 1,	912	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	913	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	914	on_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	915	$self->{vp}->set_offset (0, $_[1]);
765	},	916	},
766	;	917	;
767		918
768	$self = $class->SUPER::new (	919	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	920	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	921	slider => $slider,
771	@_,	922	@_,
772	);	923	);
773		924
774	$self->{vp}->add ($self->{scrolled});	925	$self->{vp}->add ($self->{scrolled});
…		…
776	$self->add ($self->{slider});	927	$self->add ($self->{slider});
777		928
778	$self	929	$self
779	}	930	}
780		931
		932	sub update {
		933	my ($self) = @_;
		934
		935	$self->SUPER::update;
		936
		937	# todo: overwrite size_allocate of child
		938	my $child = $self->{vp}->child;
		939	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		940	}
		941
		942	sub size_allocate {
		943	my ($self, $w, $h) = @_;
		944
		945	$self->SUPER::size_allocate ($w, $h);
		946
		947	my $child = $self->{vp}->child;
		948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		949	}
		950
781	#TODO# update range on size_allocate depeneing on child	951	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	952	# update viewport offset on scroll
783		953
784	#############################################################################	954	#############################################################################
785		955
786	package CFClient::UI::Frame;	956	package CFClient::UI::Frame;
787		957
788	our @ISA = CFClient::UI::Bin::;	958	our @ISA = CFClient::UI::Bin::;
789		959
790	use CFClient::OpenGL;	960	use CFClient::OpenGL;
		961
		962	sub new {
		963	my $class = shift;
		964
		965	$class->SUPER::new (
		966	bg => undef,
		967	@_,
		968	)
		969	}
		970
		971	sub _draw {
		972	my ($self) = @_;
		973
		974	if ($self->{bg}) {
		975	my ($w, $h) = @$self{qw(w h)};
		976
		977	glEnable GL_BLEND;
		978	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		979	glColor @{ $self->{bg} };
		980
		981	glBegin GL_QUADS;
		982	glVertex 0 , 0;
		983	glVertex 0 , $h;
		984	glVertex $w, $h;
		985	glVertex $w, 0;
		986	glEnd;
		987
		988	glDisable GL_BLEND;
		989	}
		990
		991	$self->SUPER::_draw;
		992	}
791		993
792	#############################################################################	994	#############################################################################
793		995
794	package CFClient::UI::FancyFrame;	996	package CFClient::UI::FancyFrame;
795		997
…		…
805	my $class = shift;	1007	my $class = shift;
806		1008
807	# TODO: user_x, user_y, overwrite moveto?	1009	# TODO: user_x, user_y, overwrite moveto?
808		1010
809	my $self = $class->SUPER::new (	1011	my $self = $class->SUPER::new (
810	bg => [1, 1, 1, 1],	1012	bg => [1, 1, 1, 1],
811	border_bg => [1, 1, 1, 1],	1013	border_bg => [1, 1, 1, 1],
812	border => 0.6,	1014	border => 0.6,
		1015	is_toplevel => 1,
813	can_events => 1,	1016	can_events => 1,
814	@_	1017	@_
815	);	1018	);
816		1019
817	$self->{title} &&= new CFClient::UI::Label	1020	$self->{title} &&= new CFClient::UI::Label
818	align => 0,	1021	align => 0,
…		…
842	my ($self, $w, $h) = @_;	1045	my ($self, $w, $h) = @_;
843		1046
844	$h -= List::Util::max 0, $self->border * 2;	1047	$h -= List::Util::max 0, $self->border * 2;
845	$w -= List::Util::max 0, $self->border * 2;	1048	$w -= List::Util::max 0, $self->border * 2;
846		1049
847	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1050	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
848	if $self->{title};	1051	if $self->{title};
849		1052
850	$self->child->configure ($self->border, $self->border, $w, $h);	1053	$self->child->configure ($self->border, $self->border, $w, $h);
851	}	1054	}
852		1055
…		…
871	my ($ev, $x, $y) = @_;	1074	my ($ev, $x, $y) = @_;
872		1075
873	my $dx = $ev->{x} - $ox;	1076	my $dx = $ev->{x} - $ox;
874	my $dy = $ev->{y} - $oy;	1077	my $dy = $ev->{y} - $oy;
875		1078
		1079	$self->{user_x} = $wx + $dx * $mx;
		1080	$self->{user_y} = $wy + $dy * $my;
876	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1081	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
877	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1082	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
878	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1083	$self->move ($self->{user_x}, $self->{user_y});
879	$self->check_size;	1084	$self->check_size;
880	};	1085	};
881		1086
882	} elsif ($lr ^ $td) {	1087	} elsif ($lr ^ $td) {
883	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
886	$self->{motion} = sub {	1091	$self->{motion} = sub {
887	my ($ev, $x, $y) = @_;	1092	my ($ev, $x, $y) = @_;
888		1093
889	($x, $y) = ($ev->{x}, $ev->{y});	1094	($x, $y) = ($ev->{x}, $ev->{y});
890		1095
891	$self->move ($bx + $x - $ox, $by + $y - $oy);	1096	$self->{user_x} = $bx + $x - $ox;
		1097	$self->{user_y} = $by + $y - $oy;
		1098	$self->move ($self->{user_x}, $self->{user_y});
892	$self->update;	1099	$self->update;
893	};	1100	};
894	}	1101	}
895	}	1102	}
896		1103
…		…
958	sub new {	1165	sub new {
959	my $class = shift;	1166	my $class = shift;
960		1167
961	$class->SUPER::new (	1168	$class->SUPER::new (
962	col_expand => [],	1169	col_expand => [],
963	@_	1170	@_,
964	)	1171	)
		1172	}
		1173
		1174	sub children {
		1175	grep $_, map @$_, grep $_, @{ $_[0]{children} }
965	}	1176	}
966		1177
967	sub add {	1178	sub add {
968	my ($self, $x, $y, $child) = @_;	1179	my ($self, $x, $y, $child) = @_;
969		1180
970	$child->set_parent ($self);	1181	$child->set_parent ($self);
971	$self->{children}[$y][$x] = $child;	1182	$self->{children}[$y][$x] = $child;
972		1183
973	$child->check_size;	1184	$self->check_size (1);
974	}	1185	}
975		1186
976	sub children {
977	grep $_, map @$_, grep $_, @{ $_[0]{children} }
978	}
979
980	# TODO: move to container class maybe? send childs a signal on removal?	1187	# TODO: move to container class maybe? send children a signal on removal?
981	sub clear {	1188	sub clear {
982	my ($self) = @_;	1189	my ($self) = @_;
983		1190
984	my @children = $self->children;	1191	my @children = $self->children;
985	delete $self->{children};	1192	delete $self->{children};
…		…
987	for (@children) {	1194	for (@children) {
988	delete $_->{parent};	1195	delete $_->{parent};
989	$_->hide;	1196	$_->hide;
990	}	1197	}
991		1198
		1199	$self->check_size (1);
992	$self->update;	1200	$self->update;
993	}	1201	}
994		1202
995	sub get_wh {	1203	sub get_wh {
996	my ($self) = @_;	1204	my ($self) = @_;
…		…
1028	sub size_allocate {	1236	sub size_allocate {
1029	my ($self, $w, $h) = @_;	1237	my ($self, $w, $h) = @_;
1030		1238
1031	my ($ws, $hs) = $self->get_wh;	1239	my ($ws, $hs) = $self->get_wh;
1032		1240
1033	my $req_w = sum @$ws;	1241	my $req_w = (sum @$ws) || 1;
1034	my $req_h = sum @$hs;	1242	my $req_h = (sum @$hs) || 1;
1035		1243
1036	# TODO: nicer code && do row_expand	1244	# TODO: nicer code && do row_expand
1037	my @col_expand = @{$self->{col_expand}};	1245	my @col_expand = @{$self->{col_expand}};
1038	@col_expand = (1) x @$ws unless @col_expand;	1246	@col_expand = (1) x @$ws unless @col_expand;
1039	my $col_expand = (sum @col_expand) || 1;	1247	my $col_expand = (sum @col_expand) || 1;
…		…
1213		1421
1214	#############################################################################	1422	#############################################################################
1215		1423
1216	package CFClient::UI::Label;	1424	package CFClient::UI::Label;
1217		1425
1218	our @ISA = CFClient::UI::Base::;	1426	our @ISA = CFClient::UI::DrawBG::;
1219		1427
1220	use CFClient::OpenGL;	1428	use CFClient::OpenGL;
1221		1429
1222	sub new {	1430	sub new {
1223	my ($class, %arg) = @_;	1431	my ($class, %arg) = @_;
1224		1432
1225	my $self = $class->SUPER::new (	1433	my $self = $class->SUPER::new (
1226	fg => [1, 1, 1],	1434	fg => [1, 1, 1],
		1435	#bg => none
		1436	#active_bg => none
1227	#font => default_font	1437	#font => default_font
1228	#text => initial text	1438	#text => initial text
1229	#markup => initial narkup	1439	#markup => initial narkup
		1440	#max_w => maximum pixel width
		1441	ellipsise => 3, # end
1230	layout => (new CFClient::Layout),	1442	layout => (new CFClient::Layout),
1231	fontsize => 1,	1443	fontsize => 1,
1232	align => -1,	1444	align => -1,
1233	valign => -1,	1445	valign => -1,
1234	padding => 2,	1446	padding => 2,
…		…
1249	}	1461	}
1250		1462
1251	$self	1463	$self
1252	}	1464	}
1253		1465
1254	sub escape {	1466	sub escape($) {
1255	local $_ = $_[1];	1467	local $_ = $_[0];
1256		1468
1257	s/&/&amp;/g;	1469	s/&/&amp;/g;
1258	s/>/&gt;/g;	1470	s/>/&gt;/g;
1259	s/</&lt;/g;	1471	s/</&lt;/g;
1260		1472
1261	$_[1]	1473	$_
1262	}	1474	}
1263		1475
1264	sub update {	1476	sub update {
1265	my ($self) = @_;	1477	my ($self) = @_;
1266		1478
…		…
1299	sub size_request {	1511	sub size_request {
1300	my ($self) = @_;	1512	my ($self) = @_;
1301		1513
1302	$self->{layout}->set_font ($self->{font}) if $self->{font};	1514	$self->{layout}->set_font ($self->{font}) if $self->{font};
1303	$self->{layout}->set_width ($self->{max_w} || -1);	1515	$self->{layout}->set_width ($self->{max_w} || -1);
		1516	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1517	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1518	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305		1519
1306	my ($w, $h) = $self->{layout}->size;	1520	my ($w, $h) = $self->{layout}->size;
1307		1521
1308	if (exists $self->{template}) {	1522	if (exists $self->{template}) {
…		…
1338	}	1552	}
1339		1553
1340	sub _draw {	1554	sub _draw {
1341	my ($self) = @_;	1555	my ($self) = @_;
1342		1556
		1557	$self->SUPER::_draw; # draw background, if applicable
		1558
1343	my $tex = $self->{texture} ||= do {	1559	my $tex = $self->{texture} ||= do {
1344	$self->{layout}->set_foreground (@{$self->{fg}});	1560	$self->{layout}->set_foreground (@{$self->{fg}});
1345	$self->{layout}->set_font ($self->{font}) if $self->{font};	1561	$self->{layout}->set_font ($self->{font}) if $self->{font};
1346	$self->{layout}->set_width ($self->{w});	1562	$self->{layout}->set_width ($self->{w});
		1563	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1564	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1347	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1565	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348		1566
1349	my $tex = new_from_layout CFClient::Texture $self->{layout};	1567	my $tex = new_from_layout CFClient::Texture $self->{layout};
1350		1568
1351	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1569	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1352	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1570	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353	: ($self->{w} - $tex->{w}) * 0.5;	1571	: ($self->{w} - $tex->{w}) * 0.5);
1354		1572
1355	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1573	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1356	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1574	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357	: ($self->{h} - $tex->{h}) * 0.5;	1575	: ($self->{h} - $tex->{h}) * 0.5);
1358		1576
1359	$tex	1577	$tex
1360	};	1578	};
1361		1579
1362	glEnable GL_TEXTURE_2D;	1580	glEnable GL_TEXTURE_2D;
…		…
1390	active_fg => [0, 0, 0],	1608	active_fg => [0, 0, 0],
1391	can_hover => 1,	1609	can_hover => 1,
1392	can_focus => 1,	1610	can_focus => 1,
1393	valign => 0,	1611	valign => 0,
1394	can_events => 1,	1612	can_events => 1,
		1613	#text => ...
1395	@_	1614	@_
1396	)	1615	)
1397	}	1616	}
1398		1617
1399	sub _set_text {	1618	sub _set_text {
…		…
1409	$self->{text} = $text;	1628	$self->{text} = $text;
1410		1629
1411	$text =~ s/./*/g if $self->{hidden};	1630	$text =~ s/./*/g if $self->{hidden};
1412	$self->{layout}->set_text ("$text ");	1631	$self->{layout}->set_text ("$text ");
1413		1632
1414	$self->emit (changed => $self->{text});	1633	$self->_emit (changed => $self->{text});
1415	}	1634	}
1416		1635
1417	sub set_text {	1636	sub set_text {
1418	my ($self, $text) = @_;	1637	my ($self, $text) = @_;
1419		1638
1420	$self->{cursor} = length $text;	1639	$self->{cursor} = length $text;
1421	$self->_set_text ($text);	1640	$self->_set_text ($text);
		1641	$self->update;
1422	$self->check_size;	1642	$self->check_size;
1423	$self->update;
1424	}	1643	}
1425		1644
1426	sub get_text {	1645	sub get_text {
1427	$_[0]{text}	1646	$_[0]{text}
1428	}	1647	}
…		…
1431	my ($self) = @_;	1650	my ($self) = @_;
1432		1651
1433	my ($w, $h) = $self->SUPER::size_request;	1652	my ($w, $h) = $self->SUPER::size_request;
1434		1653
1435	($w + 1, $h) # add 1 for cursor	1654	($w + 1, $h) # add 1 for cursor
1436	}
1437
1438	sub size_allocate {
1439	my ($self, $w, $h) = @_;
1440
1441	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1442	}	1655	}
1443		1656
1444	sub key_down {	1657	sub key_down {
1445	my ($self, $ev) = @_;	1658	my ($self, $ev) = @_;
1446		1659
…		…
1448	my $sym = $ev->{sym};	1661	my $sym = $ev->{sym};
1449	my $uni = $ev->{unicode};	1662	my $uni = $ev->{unicode};
1450		1663
1451	my $text = $self->get_text;	1664	my $text = $self->get_text;
1452		1665
1453	if ($sym == 8) {	1666	if ($uni == 8) {
1454	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1667	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455	} elsif ($sym == 127) {	1668	} elsif ($uni == 127) {
1456	substr $text, $self->{cursor}, 1, "";	1669	substr $text, $self->{cursor}, 1, "";
1457	} elsif ($sym == CFClient::SDLK_LEFT) {	1670	} elsif ($sym == CFClient::SDLK_LEFT) {
1458	--$self->{cursor} if $self->{cursor};	1671	--$self->{cursor} if $self->{cursor};
1459	} elsif ($sym == CFClient::SDLK_RIGHT) {	1672	} elsif ($sym == CFClient::SDLK_RIGHT) {
1460	++$self->{cursor} if $self->{cursor} < length $self->{text};	1673	++$self->{cursor} if $self->{cursor} < length $self->{text};
1461	} elsif ($sym == CFClient::SDLK_HOME) {	1674	} elsif ($sym == CFClient::SDLK_HOME) {
1462	$self->{cursor} = 0;	1675	$self->{cursor} = 0;
1463	} elsif ($sym == CFClient::SDLK_END) {	1676	} elsif ($sym == CFClient::SDLK_END) {
1464	$self->{cursor} = length $text;	1677	$self->{cursor} = length $text;
1465	} elsif ($sym == 27) {	1678	} elsif ($uni == 27) {
1466	$self->emit ('escape');	1679	$self->_emit ('escape');
1467	} elsif ($uni) {	1680	} elsif ($uni) {
1468	substr $text, $self->{cursor}++, 0, chr $uni;	1681	substr $text, $self->{cursor}++, 0, chr $uni;
1469	}	1682	}
1470		1683
1471	$self->_set_text ($text);	1684	$self->_set_text ($text);
1472	$self->update;	1685	$self->update;
		1686	$self->check_size;
1473	}	1687	}
1474		1688
1475	sub focus_in {	1689	sub focus_in {
1476	my ($self) = @_;	1690	my ($self) = @_;
1477		1691
…		…
1557	if ($sym == 13) {	1771	if ($sym == 13) {
1558	unshift @{$self->{history}},	1772	unshift @{$self->{history}},
1559	my $txt = $self->get_text;	1773	my $txt = $self->get_text;
1560	$self->{history_pointer} = -1;	1774	$self->{history_pointer} = -1;
1561	$self->{history_saveback} = '';	1775	$self->{history_saveback} = '';
1562	$self->emit (activate => $txt);	1776	$self->_emit (activate => $txt);
1563	$self->update;	1777	$self->update;
1564		1778
1565	} elsif ($sym == CFClient::SDLK_UP) {	1779	} elsif ($sym == CFClient::SDLK_UP) {
1566	if ($self->{history_pointer} < 0) {	1780	if ($self->{history_pointer} < 0) {
1567	$self->{history_saveback} = $self->get_text;	1781	$self->{history_saveback} = $self->get_text;
…		…
1606	my $class = shift;	1820	my $class = shift;
1607		1821
1608	$class->SUPER::new (	1822	$class->SUPER::new (
1609	padding => 4,	1823	padding => 4,
1610	fg => [1, 1, 1],	1824	fg => [1, 1, 1],
1611	bg => [1, 1, 1, 0.2],
1612	active_fg => [0, 0, 1],	1825	active_fg => [0, 0, 1],
1613	can_hover => 1,	1826	can_hover => 1,
1614	align => 0,	1827	align => 0,
1615	valign => 0,	1828	valign => 0,
1616	can_events => 1,	1829	can_events => 1,
1617	@_	1830	@_
1618	)	1831	)
1619	}	1832	}
1620		1833
		1834	sub activate { }
		1835
1621	sub button_up {	1836	sub button_up {
1622	my ($self, $ev, $x, $y) = @_;	1837	my ($self, $ev, $x, $y) = @_;
1623		1838
		1839	$self->emit ("activate")
1624	if ($x >= 0 && $x < $self->{w}	1840	if $x >= 0 && $x < $self->{w}
1625	&& $y >= 0 && $y < $self->{h}) {	1841	&& $y >= 0 && $y < $self->{h};
1626	$self->emit ("activate");
1627	}
1628	}	1842	}
1629		1843
1630	sub _draw {	1844	sub _draw {
1631	my ($self) = @_;	1845	my ($self) = @_;
1632		1846
…		…
1664		1878
1665	$class->SUPER::new (	1879	$class->SUPER::new (
1666	padding => 2,	1880	padding => 2,
1667	fg => [1, 1, 1],	1881	fg => [1, 1, 1],
1668	active_fg => [1, 1, 0],	1882	active_fg => [1, 1, 0],
		1883	bg => [0, 0, 0, 0.2],
		1884	active_bg => [1, 1, 1, 0.5],
1669	state => 0,	1885	state => 0,
1670	can_hover => 1,	1886	can_hover => 1,
1671	@_	1887	@_
1672	)	1888	)
1673	}	1889	}
…		…
1682	my ($self, $ev, $x, $y) = @_;	1898	my ($self, $ev, $x, $y) = @_;
1683		1899
1684	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1900	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1685	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1901	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1686	$self->{state} = !$self->{state};	1902	$self->{state} = !$self->{state};
1687	$self->emit (changed => $self->{state});	1903	$self->_emit (changed => $self->{state});
1688	}	1904	}
1689	}	1905	}
1690		1906
1691	sub _draw {	1907	sub _draw {
1692	my ($self) = @_;	1908	my ($self) = @_;
…		…
1957	qw(s1_slider.png s1_slider_bg.png);	2173	qw(s1_slider.png s1_slider_bg.png);
1958		2174
1959	sub new {	2175	sub new {
1960	my $class = shift;	2176	my $class = shift;
1961		2177
1962	# range [value, low, high, page]	2178	# range [value, low, high, page, unit]
1963		2179
1964	# TODO: 0-width page	2180	# TODO: 0-width page
1965	# TODO: req_w/h are wrong with vertical	2181	# TODO: req_w/h are wrong with vertical
1966	# TODO: calculations are off	2182	# TODO: calculations are off
1967	my $self = $class->SUPER::new (	2183	my $self = $class->SUPER::new (
1968	fg => [1, 1, 1],	2184	fg => [1, 1, 1],
1969	active_fg => [0, 0, 0],	2185	active_fg => [0, 0, 0],
		2186	bg => [0, 0, 0, 0.2],
		2187	active_bg => [1, 1, 1, 0.5],
1970	range => [0, 0, 100, 10],	2188	range => [0, 0, 100, 10, 0],
1971	req_w => $::WIDTH / 80,	2189	req_w => $::WIDTH / 80,
1972	req_h => $::WIDTH / 80,	2190	req_h => $::WIDTH / 80,
1973	vertical => 0,	2191	vertical => 0,
1974	can_hover => 1,	2192	can_hover => 1,
1975	inner_pad => 5,	2193	inner_pad => 0.02,
1976	@_	2194	@_
1977	);	2195	);
1978		2196
		2197	$self->set_value ($self->{range}[0]);
		2198	$self->update;
		2199
1979	$self	2200	$self
		2201	}
		2202
		2203	sub set_range {
		2204	my ($self, $range) = @_;
		2205
		2206	($range, $self->{range}) = ($self->{range}, $range);
		2207
		2208	$self->update
		2209	if "@$range" ne "@{$self->{range}}";
		2210	}
		2211
		2212	sub set_value {
		2213	my ($self, $value) = @_;
		2214
		2215	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2216
		2217	$hi = $lo + 1 if $hi <= $lo;
		2218
		2219	$page = $hi - $lo if $page > $hi - $lo;
		2220
		2221	$value = $lo if $value < $lo;
		2222	$value = $hi - $page if $value > $hi - $page;
		2223
		2224	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2225	if $unit;
		2226
		2227	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2228
		2229	if ($value != $old_value) {
		2230	$self->_emit (changed => $value);
		2231	$self->update;
		2232	}
1980	}	2233	}
1981		2234
1982	sub size_request {	2235	sub size_request {
1983	my ($self) = @_;	2236	my ($self) = @_;
1984		2237
…		…
1990		2243
1991	sub button_down {	2244	sub button_down {
1992	my ($self, $ev, $x, $y) = @_;	2245	my ($self, $ev, $x, $y) = @_;
1993		2246
1994	$self->SUPER::button_down ($ev, $x, $y);	2247	$self->SUPER::button_down ($ev, $x, $y);
		2248
		2249	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2250
1995	$self->mouse_motion ($ev, $x, $y);	2251	$self->mouse_motion ($ev, $x, $y);
1996	}	2252	}
1997		2253
1998	sub mouse_motion {	2254	sub mouse_motion {
1999	my ($self, $ev, $x, $y) = @_;	2255	my ($self, $ev, $x, $y) = @_;
2000		2256
2001	if ($GRAB == $self) {	2257	if ($GRAB == $self) {
		2258	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2259
		2260	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2261
		2262	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2263
		2264	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2265	}
		2266	}
		2267
		2268	sub update {
		2269	my ($self) = @_;
		2270
		2271	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2272	$self->set_value ($self->{range}[0]);
		2273
2002	my ($value, $lo, $hi, $page) = @{$self->{range}};	2274	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2275	my $range = ($hi - $page - $lo) || 1e-100;
2003		2276
2004	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2277	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2005		2278
2006	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2279	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2007	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2280	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2008		2281
2009	$x -= $inner_pad_px; # substract the padding	2282	$value = ($value - $lo) / $range;
2010	$x = $x * ($hi - $lo) / $inner_w + $lo;	2283	$value = $value * $self->{scale} + $self->{offset};
2011	$x = $lo if $x < $lo;
2012	$x = $hi - $page if $x > $hi - $page;
2013	$self->{range}[0] = $x;
2014		2284
2015	$self->emit (changed => $x);	2285	$self->{knob_x} = $value - $knob_w * 0.5;
2016	$self->update;	2286	$self->{knob_w} = $knob_w;
2017	}	2287	});
2018	}
2019		2288
2020	# the inner_* stuff is for generating a padding for the slider handle,	2289	$self->SUPER::update;
2021	# so that the handle doesn't leave the texture. This calculation isn't 100%
2022	# correct propably, but it does the job for now
2023	sub _calc_inner_pad_px {
2024	my ($self, $w) = @_;
2025	($w / 100) * $self->{inner_pad} # % to pixels
2026	}	2290	}
2027		2291
2028	sub _draw {	2292	sub _draw {
2029	my ($self) = @_;	2293	my ($self) = @_;
2030		2294
2031	$self->SUPER::_draw ();	2295	$self->SUPER::_draw ();
2032		2296
2033	my ($w, $h) = @$self{qw(w h)};	2297	glScale $self->{w}, $self->{h};
2034		2298
2035	if ($self->{vertical}) {	2299	if ($self->{vertical}) {
2036	# draw a vertical slider like a rotated horizontal slider	2300	# draw a vertical slider like a rotated horizontal slider
2037		2301
		2302	glTranslate 1, 0, 0;
2038	glRotate 90, 0, 0, 1;	2303	glRotate 90, 0, 0, 1;
2039	glTranslate 0, -$self->{w}, 0;
2040
2041	($w, $h) = ($h, $w);
2042	}	2304	}
2043		2305
2044	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2306	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2307	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046		2308
2047	my ($value, $lo, $hi, $page) = @{$self->{range}};
2048
2049	$hi = $value + 1 if $lo == $hi;
2050
2051	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2052	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2053
2054	$page = int $page * $inner_w / ($hi - $lo);
2055	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2056
2057	$w -= $page;
2058	$page &= ~1;
2059	glTranslate $page * 0.5, 0, 0;
2060	$page ||= 2;
2061
2062	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2063	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2064
2065	glEnable GL_TEXTURE_2D;	2309	glEnable GL_TEXTURE_2D;
2066	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2310	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067		2311
2068	# draw background	2312	# draw background
2069	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2313	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070		2314
2071	# draw handle	2315	# draw handle
2072	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2316	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2073		2317
2074	glDisable GL_TEXTURE_2D;	2318	glDisable GL_TEXTURE_2D;
2075	}	2319	}
		2320
		2321	#############################################################################
		2322
		2323	package CFClient::UI::ValSlider;
		2324
		2325	our @ISA = CFClient::UI::HBox::;
		2326
		2327	sub new {
		2328	my ($class, %arg) = @_;
		2329
		2330	my $range = delete $arg{range};
		2331
		2332	my $self = $class->SUPER::new (
		2333	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2334	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2335	to_value => sub { shift },
		2336	from_value => sub { shift },
		2337	%arg,
		2338	);
		2339
		2340	$self->{slider}->connect (changed => sub {
		2341	my ($self, $value) = @_;
		2342	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2343	$self->{parent}->emit (changed => $value);
		2344	});
		2345
		2346	# $self->{entry}->connect (changed => sub {
		2347	# my ($self, $value) = @_;
		2348	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2349	# $self->{parent}->emit (changed => $value);
		2350	# });
		2351
		2352	$self->add ($self->{slider}, $self->{entry});
		2353
		2354	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2355
		2356	$self
		2357	}
		2358
		2359	sub set_range { shift->{slider}->set_range (@_) }
		2360	sub set_value { shift->{slider}->set_value (@_) }
2076		2361
2077	#############################################################################	2362	#############################################################################
2078		2363
2079	package CFClient::UI::TextView;	2364	package CFClient::UI::TextView;
2080		2365
…		…
2110		2395
2111	$self->{fontsize} = $fontsize;	2396	$self->{fontsize} = $fontsize;
2112	$self->reflow;	2397	$self->reflow;
2113	}	2398	}
2114		2399
2115	sub text_height {
2116	my ($self, $text) = @_;
2117
2118	my $layout = $self->{layout};
2119
2120	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2121	$layout->set_width ($self->{children}[0]{w});
2122	$layout->set_markup ($text);
2123
2124	($layout->size)[1]
2125	}
2126
2127	sub reflow {
2128	my ($self) = @_;
2129
2130	$self->{need_reflow}++;
2131	$self->update;
2132	}
2133
2134	sub size_allocate {	2400	sub size_allocate {
2135	my ($self, $w, $h) = @_;	2401	my ($self, $w, $h) = @_;
2136		2402
2137	$self->SUPER::size_allocate ($w, $h);	2403	$self->SUPER::size_allocate ($w, $h);
2138		2404
…		…
2141	$self->{layout}->set_width ($self->{children}[0]{w});	2407	$self->{layout}->set_width ($self->{children}[0]{w});
2142		2408
2143	$self->reflow;	2409	$self->reflow;
2144	}	2410	}
2145		2411
		2412	sub text_size {
		2413	my ($self, $text, $indent) = @_;
		2414
		2415	my $layout = $self->{layout};
		2416
		2417	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2418	$layout->set_width ($self->{children}[0]{w} - $indent);
		2419	$layout->set_markup ($text);
		2420
		2421	$layout->size
		2422	}
		2423
		2424	sub reflow {
		2425	my ($self) = @_;
		2426
		2427	$self->{need_reflow}++;
		2428	$self->update;
		2429	}
		2430
		2431	sub set_offset {
		2432	my ($self, $offset) = @_;
		2433
		2434	# todo: base offset on lines or so, not on pixels
		2435	$self->{children}[1]->set_value ($offset);
		2436	}
		2437
		2438	sub clear {
		2439	my ($self) = @_;
		2440
		2441	$self->{par} = [];
		2442	$self->{height} = 0;
		2443	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2444	}
		2445
2146	sub add_paragraph {	2446	sub add_paragraph {
2147	my ($self, $color, $text) = @_;	2447	my ($self, $color, $text, $indent) = @_;
2148		2448
2149	#TODO: intelligently "reformat" paragraph	2449	for my $line (split /\n/, $text) {
2150		2450	my ($w, $h) = $self->text_size ($line);
2151	my $height = $self->text_height ($text);
2152
2153	$self->{height} += $height;	2451	$self->{height} += $h;
		2452	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2453	}
2154		2454
2155	push @{$self->{par}}, [$height, $color, $text];
2156
2157	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2455	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2158	$self->{children}[1]->update;
2159	}	2456	}
2160		2457
2161	sub update {	2458	sub update {
2162	my ($self) = @_;	2459	my ($self) = @_;
2163		2460
…		…
2165		2462
2166	return unless $self->{h} > 0;	2463	return unless $self->{h} > 0;
2167		2464
2168	delete $self->{texture};	2465	delete $self->{texture};
2169		2466
2170	$ROOT->on_refresh ($self, sub {	2467	$ROOT->on_post_alloc ($self, sub {
		2468	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2469
2171	if (delete $self->{need_reflow}) {	2470	if (delete $self->{need_reflow}) {
2172	my $height = 0;	2471	my $height = 0;
2173		2472
2174	$height += $_->[0] = $self->text_height ($_->[2])	2473	my $layout = $self->{layout};
		2474
		2475	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2476
2175	for @{$self->{par}};	2477	for (@{$self->{par}}) {
		2478	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2479	$layout->set_width ($W - $_->[3]);
		2480	$layout->set_markup ($_->[4]);
		2481	my ($w, $h) = $layout->size;
		2482	$_->[0] = $w + $_->[3];
		2483	$_->[1] = $h;
		2484	}
		2485
		2486	$height += $_->[1];
		2487	}
2176		2488
2177	$self->{height} = $height;	2489	$self->{height} = $height;
2178		2490
2179	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2491	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2180		2492
2181	delete $self->{texture};	2493	delete $self->{texture};
2182	}	2494	}
2183		2495
2184	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2496	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2185	glClearColor 0, 0, 0, 0;	2497	glClearColor 0.5, 0.5, 0.5, 0;
2186	glClear GL_COLOR_BUFFER_BIT;	2498	glClear GL_COLOR_BUFFER_BIT;
2187		2499
2188	glEnable GL_TEXTURE_2D;
2189	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2190
2191	my $top = int $self->{children}[1]{range}[0];	2500	my $top = int $self->{children}[1]{range}[0];
2192		2501
2193	my $y0 = $top;	2502	my $y0 = $top;
2194	my $y1 = $top + $self->{h};	2503	my $y1 = $top + $H;
2195		2504
2196	my $y = 0;	2505	my $y = 0;
2197		2506
2198	my $layout = $self->{layout};	2507	my $layout = $self->{layout};
2199		2508
2200	$layout->set_font ($self->{font}) if $self->{font};	2509	$layout->set_font ($self->{font}) if $self->{font};
2201		2510
		2511	glEnable GL_BLEND;
		2512	#TODO# not correct in windows where rgba is forced off
		2513	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2514
2202	for my $par (@{$self->{par}}) {	2515	for my $par (@{$self->{par}}) {
2203	my $h = $par->[0];	2516	my $h = $par->[1];
2204		2517
2205	if ($y0 < $y + $h && $y < $y1) {	2518	if ($y0 < $y + $h && $y < $y1) {
2206	$layout->set_foreground (@{ $par->[1] });	2519	$layout->set_foreground (@{ $par->[2] });
		2520	$layout->set_width ($W - $par->[3]);
2207	$layout->set_markup ($par->[2]);	2521	$layout->set_markup ($par->[4]);
2208		2522
2209	my ($W, $H) = $layout->size;	2523	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2210	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2524
		2525	glRasterPos $par->[3], $y - $y0;
		2526	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2211	}	2527	}
2212		2528
2213	$y += $h;	2529	$y += $h;
2214	}	2530	}
2215		2531
2216	glDisable GL_TEXTURE_2D;	2532	glDisable GL_BLEND;
2217	};	2533	};
2218	});	2534	});
2219	}	2535	}
2220		2536
2221	sub _draw {	2537	sub _draw {
2222	my ($self) = @_;	2538	my ($self) = @_;
2223		2539
2224	glEnable GL_TEXTURE_2D;	2540	glEnable GL_TEXTURE_2D;
2225	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2541	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2226	glColor 1, 1, 1, 1;	2542	glColor 1, 1, 1, 1;
2227	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2543	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2228	glDisable GL_TEXTURE_2D;	2544	glDisable GL_TEXTURE_2D;
2229		2545
2230	$self->{children}[1]->draw;	2546	$self->{children}[1]->draw;
2231		2547
2232	}	2548	}
…		…
2281		2597
2282	sub new {	2598	sub new {
2283	my $class = shift;	2599	my $class = shift;
2284		2600
2285	my $self = $class->SUPER::new (	2601	my $self = $class->SUPER::new (
2286	state => 0,	2602	state => 0,
2287	connect_activate => \&toggle_flopper,	2603	on_activate => \&toggle_flopper,
2288	@_	2604	@_
2289	);	2605	);
2290		2606
2291	if ($self->{state}) {
2292	$self->{state} = 0;
2293	$self->toggle_flopper;
2294	}
2295
2296	$self	2607	$self
2297	}	2608	}
2298		2609
2299	sub toggle_flopper {	2610	sub toggle_flopper {
2300	my ($self) = @_;	2611	my ($self) = @_;
2301		2612
2302	# TODO: use animation	2613	$self->{other}->toggle_visibility;
2303	if ($self->{state} = !$self->{state}) {
2304	$CFClient::UI::ROOT->add ($self->{other});
2305	$self->{other}->move ($self->coord2global (0, $self->{h}));
2306	$self->emit ("open");
2307	} else {
2308	$CFClient::UI::ROOT->remove ($self->{other});
2309	$self->emit ("close");
2310	}
2311
2312	$self->emit (changed => $self->{state});
2313	}	2614	}
2314		2615
2315	#############################################################################	2616	#############################################################################
2316		2617
2317	package CFClient::UI::Tooltip;	2618	package CFClient::UI::Tooltip;
…		…
2331		2632
2332	sub set_tooltip_from {	2633	sub set_tooltip_from {
2333	my ($self, $widget) = @_;	2634	my ($self, $widget) = @_;
2334		2635
2335	$self->add (new CFClient::UI::Label	2636	$self->add (new CFClient::UI::Label
2336	markup => $widget->{tooltip},	2637	markup => $widget->{tooltip},
2337	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2638	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338	fontsize => 0.8,	2639	fontsize => 0.8,
2339	fg => [0, 0, 0, 1],	2640	fg => [0, 0, 0, 1],
		2641	ellipsise => 0,
2340	font => ($widget->{tooltip_font} || $::FONT_PROP),	2642	font => ($widget->{tooltip_font} || $::FONT_PROP),
2341	);	2643	);
2342	}	2644	}
2343		2645
2344	sub size_request {	2646	sub size_request {
2345	my ($self) = @_;	2647	my ($self) = @_;
…		…
2391	use CFClient::OpenGL;	2693	use CFClient::OpenGL;
2392		2694
2393	sub new {	2695	sub new {
2394	my $class = shift;	2696	my $class = shift;
2395		2697
2396	$class->SUPER::new (	2698	my $self = $class->SUPER::new (
2397	aspect => 1,	2699	aspect => 1,
		2700	can_events => 0,
2398	@_,	2701	@_,
2399	)	2702	);
		2703
		2704	if ($self->{anim} && $self->{animspeed}) {
		2705	Scalar::Util::weaken (my $widget = $self);
		2706
		2707	$self->{timer} = Event->timer (
		2708	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2709	hard => 1,
		2710	interval => $self->{animspeed},
		2711	cb => sub {
		2712	++$widget->{frame};
		2713	$widget->update;
		2714	},
		2715	);
		2716	}
		2717
		2718	$self
2400	}	2719	}
2401		2720
2402	sub size_request {	2721	sub size_request {
2403	(32, 8)	2722	(32, 8)
2404	}	2723	}
2405		2724
		2725	sub update {
		2726	my ($self) = @_;
		2727
		2728	return unless $self->{visible};
		2729
		2730	$self->SUPER::update;
		2731	}
		2732
2406	sub _draw {	2733	sub _draw {
2407	my ($self) = @_;	2734	my ($self) = @_;
2408		2735
2409	return unless $::CONN;#d# manage and cache textures differently	2736	return unless $::CONN;
		2737
		2738	my $face;
		2739
		2740	if ($self->{frame}) {
		2741	my $anim = $::CONN->{anim}[$self->{anim}];
		2742
		2743	$face = $anim->[ $self->{frame} % @$anim ]
		2744	if $anim && @$anim;
		2745	}
		2746
2410	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2747	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411		2748
2412	# TODO animation
2413	if ($tex) {	2749	if ($tex) {
2414	glEnable GL_TEXTURE_2D;	2750	glEnable GL_TEXTURE_2D;
2415	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2751	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416	glColor 1, 1, 1, 1;	2752	glColor 1, 1, 1, 1;
2417	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2753	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418	glDisable GL_TEXTURE_2D;	2754	glDisable GL_TEXTURE_2D;
2419	}	2755	}
2420	}	2756	}
2421		2757
		2758	sub DESTROY {
		2759	my ($self) = @_;
		2760
		2761	$self->{timer}->cancel
		2762	if $self->{timer};
		2763
		2764	$self->SUPER::DESTROY;
		2765	}
		2766
2422	#############################################################################	2767	#############################################################################
2423		2768
2424	package CFClient::UI::InventoryItem;	2769	package CFClient::UI::Inventory;
2425		2770
2426	our @ISA = CFClient::UI::HBox::;	2771	our @ISA = CFClient::UI::ScrolledWindow::;
2427		2772
2428	sub new {	2773	sub new {
2429	my $class = shift;	2774	my $class = shift;
2430		2775
2431	my %args = @_;
2432
2433	my $item = delete $args{item};
2434
2435	my $desc = $item->{nrof} < 2
2436	? $item->{name}
2437	: "$item->{nrof} $item->{name_pl}";
2438
2439
2440	my $self = $class->SUPER::new (	2776	my $self = $class->SUPER::new (
2441	can_hover => 1,	2777	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2442	can_events => 1,
2443	tooltip => (CFClient::UI::Label->escape ($desc)
2444	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445	connect_button_down => sub {
2446	my ($self, $ev, $x, $y) = @_;
2447
2448	# todo: maybe put examine on 1? but should just be a tooltip :(
2449	if ($ev->{button} == 1) {
2450	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2451	} elsif ($ev->{button} == 2) {
2452	$::CONN->send ("apply $item->{tag}");
2453	} elsif ($ev->{button} == 3) {
2454	CFClient::UI::Menu->new (
2455	items => [
2456	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457	[
2458	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459	sub { $::CONN->send ("lock $item->{tag}") },
2460	],
2461	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2462	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2463	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2464	],
2465	)->popup ($ev);
2466	}
2467
2468	1
2469	},
2470	%args
2471	);
2472
2473	$self->add (new CFClient::UI::Face
2474	can_events => 0,
2475	face => $item->{face},
2476	anim => $item->{anim},
2477	animspeed => $item->{animspeed},
2478	);
2479
2480	$self->add (new CFClient::UI::Label
2481	can_events => 0,
2482	text => $desc,
2483	);
2484
2485	$self
2486	}
2487
2488	#############################################################################
2489
2490	package CFClient::UI::Inventory;
2491
2492	our @ISA = CFClient::UI::ScrolledWindow::;
2493
2494	sub new {
2495	my $class = shift;
2496
2497	my $self = $class->SUPER::new (
2498	scrolled => (new CFClient::UI::VBox),
2499	@_,	2778	@_,
2500	);	2779	);
2501		2780
2502	$self	2781	$self
2503	}	2782	}
…		…
2506	my ($self, $items) = @_;	2785	my ($self, $items) = @_;
2507		2786
2508	$self->{scrolled}->clear;	2787	$self->{scrolled}->clear;
2509	return unless $items;	2788	return unless $items;
2510		2789
2511	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2790	my @items = sort {
		2791	($a->{type} <=> $b->{type})
		2792	or ($a->{name} cmp $b->{name})
		2793	} @$items;
2512		2794
2513	$self->{real_items} = \@items;	2795	$self->{real_items} = \@items;
2514		2796
		2797	my $row = 0;
2515	for my $item (@items) {	2798	for my $item (@items) {
2516	my $desc = $item->{nrof} < 2	2799	CFClient::Item::update_widgets $item;
2517	? $item->{name}
2518	: "$item->{nrof} $item->{name_pl}";
2519		2800
2520	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2801	$self->{scrolled}->add (0, $row, $item->{face_widget});
2521	}	2802	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2803	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2522		2804
2523	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2805	$row++;
		2806	}
2524	}	2807	}
2525		2808
2526	sub size_request {	2809	sub size_request {
2527	my ($self) = @_;	2810	my ($self) = @_;
2528	($self->{req_w}, $self->{req_h});	2811	($self->{req_w}, $self->{req_h});
…		…
2568		2851
2569	# popup given the event (must be a mouse button down event currently)	2852	# popup given the event (must be a mouse button down event currently)
2570	sub popup {	2853	sub popup {
2571	my ($self, $ev) = @_;	2854	my ($self, $ev) = @_;
2572		2855
2573	$self->emit ("popdown");	2856	$self->_emit ("popdown");
2574		2857
2575	# maybe save $GRAB? must be careful about events...	2858	# maybe save $GRAB? must be careful about events...
2576	$GRAB = $self;	2859	$GRAB = $self;
2577	$self->{button} = $ev->{button};	2860	$self->{button} = $ev->{button};
2578		2861
…		…
2593		2876
2594	if ($ev->{button} == $self->{button}) {	2877	if ($ev->{button} == $self->{button}) {
2595	undef $GRAB;	2878	undef $GRAB;
2596	$self->hide;	2879	$self->hide;
2597		2880
2598	$self->emit ("popdown");	2881	$self->_emit ("popdown");
2599	$self->{hover}[1]->() if $self->{hover};	2882	$self->{hover}[1]->() if $self->{hover};
2600	}	2883	}
2601	}	2884	}
2602		2885
2603	#############################################################################	2886	#############################################################################
2604		2887
2605	package CFClient::UI::Statusbox;	2888	package CFClient::UI::Statusbox;
2606		2889
2607	our @ISA = CFClient::UI::VBox::;	2890	our @ISA = CFClient::UI::VBox::;
		2891
		2892	sub new {
		2893	my $class = shift;
		2894
		2895	$class->SUPER::new (
		2896	fontsize => 0.8,
		2897	@_,
		2898	)
		2899	}
2608		2900
2609	sub reorder {	2901	sub reorder {
2610	my ($self) = @_;	2902	my ($self) = @_;
2611	my $NOW = time;	2903	my $NOW = time;
2612		2904
…		…
2631	? "<b>$item->{count} ×</b> $item->{text}"	2923	? "<b>$item->{count} ×</b> $item->{text}"
2632	: $item->{text};	2924	: $item->{text};
2633		2925
2634	for ($short) {	2926	for ($short) {
2635	s/^\s+//;	2927	s/^\s+//;
2636	s/\012.*/…/s;	2928	s/\s+/ /g;
2637	my $len = int 30 / $item->{fontsize};
2638	substr $_, $len, length, "…" if $len < length;
2639	}	2929	}
2640		2930
2641	new CFClient::UI::Label	2931	new CFClient::UI::Label
2642	markup => $short,	2932	markup => $short,
2643	tooltip => $item->{tooltip},	2933	tooltip => $item->{tooltip},
2644	tooltip_font => $::FONT_PROP,	2934	tooltip_font => $::FONT_PROP,
2645	tooltip_width => 0.67,	2935	tooltip_width => 0.67,
2646	fontsize => $item->{fontsize},	2936	fontsize => $item->{fontsize} || $self->{fontsize},
		2937	max_w => $::WIDTH * 0.44,
2647	color => $item->{color},	2938	fg => $item->{fg},
2648	can_events => 1,	2939	can_events => 1,
2649	can_hover => 1	2940	can_hover => 1
2650	};	2941	};
2651	}	2942	}
2652		2943
…		…
2654	$self->SUPER::add (reverse @widgets);	2945	$self->SUPER::add (reverse @widgets);
2655	}	2946	}
2656		2947
2657	sub add {	2948	sub add {
2658	my ($self, $text, %arg) = @_;	2949	my ($self, $text, %arg) = @_;
		2950
		2951	$text =~ s/^\s+//;
		2952	$text =~ s/\s+$//;
		2953
		2954	return unless $text;
2659		2955
2660	my $timeout = time + ((delete $arg{timeout}) || 60);	2956	my $timeout = time + ((delete $arg{timeout}) || 60);
2661		2957
2662	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2958	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663		2959
…		…
2666	$item->{count}++;	2962	$item->{count}++;
2667	} else {	2963	} else {
2668	$item->{count} = 1;	2964	$item->{count} = 1;
2669	$item->{text} = $item->{tooltip} = $text;	2965	$item->{text} = $item->{tooltip} = $text;
2670	}	2966	}
		2967	$item->{id} = ++$self->{id};
2671	$item->{timeout} = $timeout;	2968	$item->{timeout} = $timeout;
2672	delete $item->{label};	2969	delete $item->{label};
2673	} else {	2970	} else {
2674	$self->{item}{$group} = {	2971	$self->{item}{$group} = {
2675	id => ++$self->{id},	2972	id => ++$self->{id},
2676	text => $text,	2973	text => $text,
2677	timeout => $timeout,	2974	timeout => $timeout,
2678	tooltip => $text,	2975	tooltip => $text,
2679	fontsize => 0.8,
2680	color => [0.8, 0.8, 0.8, 0.8],	2976	fg => [0.8, 0.8, 0.8, 0.8],
2681	pri => 0,	2977	pri => 0,
2682	count => 1,	2978	count => 1,
2683	%arg,	2979	%arg,
2684	};	2980	};
2685	}	2981	}
2686		2982
2687	$self->reorder;	2983	$self->reorder;
2688	}	2984	}
2689		2985
		2986	sub reconfigure {
		2987	my ($self) = @_;
		2988
		2989	delete $_->{label}
		2990	for values %{ $self->{item} || {} };
		2991
		2992	$self->reorder;
		2993	$self->SUPER::reconfigure;
		2994	}
		2995
2690	#############################################################################	2996	#############################################################################
2691		2997
2692	package CFClient::UI::Root;	2998	package CFClient::UI::Root;
2693		2999
2694	our @ISA = CFClient::UI::Container::;	3000	our @ISA = CFClient::UI::Container::;
…		…
2697		3003
2698	sub new {	3004	sub new {
2699	my $class = shift;	3005	my $class = shift;
2700		3006
2701	$class->SUPER::new (	3007	$class->SUPER::new (
		3008	visible => 1,
2702	@_,	3009	@_,
2703	)	3010	)
2704	}	3011	}
2705		3012
2706	sub configure {	3013	sub configure {
…		…
2724	}	3031	}
2725		3032
2726	sub size_allocate {	3033	sub size_allocate {
2727	my ($self, $w, $h) = @_;	3034	my ($self, $w, $h) = @_;
2728		3035
2729	my $old_w = $self->{old_w};
2730	my $old_h = $self->{old_h};
2731
2732	if ($old_w && $old_h) {
2733	for my $child ($self->children) {
2734	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742	}
2743	}
2744
2745	for my $child ($self->children) {	3036	for my $child ($self->children) {
2746	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3037	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2747		3038
		3039	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3040	if exists $child->{req_x};
		3041
		3042	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3043	if exists $child->{req_y};
		3044
		3045	$X = $self->{user_x} if exists $self->{user_x};
		3046	$Y = $self->{user_y} if exists $self->{user_y};
		3047
2748	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3048	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2749	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3049	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3050
2750	$child->configure ($X, $Y, $W, $H);	3051	$child->configure ($X, $Y, $W, $H);
2751	}	3052	}
2752
2753	$self->{old_w} = $w;
2754	$self->{old_h} = $h;
2755	}	3053	}
2756		3054
2757	sub coord2local {	3055	sub coord2local {
2758	my ($self, $x, $y) = @_;	3056	my ($self, $x, $y) = @_;
2759		3057
…		…
2772	$self->check_size;	3070	$self->check_size;
2773	$::WANT_REFRESH++;	3071	$::WANT_REFRESH++;
2774	}	3072	}
2775		3073
2776	sub add {	3074	sub add {
2777	my ($self, $child) = @_;	3075	my ($self, @children) = @_;
2778		3076
		3077	for (my @widgets = @children; my $w = pop @widgets; ) {
		3078	push @widgets, $w->children;
		3079	$w->{root} = $self;
		3080	$w->{visible} = $self->{visible} + 1;
		3081	}
		3082
		3083	for my $child (@children) {
		3084	$child->{is_toplevel} = 1;
		3085
2779	# integerise window positions	3086	# integerise window positions
2780	$child->{x} = int $child->{x};	3087	$child->{x} = int $child->{x};
2781	$child->{y} = int $child->{y};	3088	$child->{y} = int $child->{y};
		3089	}
2782		3090
2783	$self->SUPER::add ($child);	3091	$self->SUPER::add (@children);
		3092	}
		3093
		3094	sub remove {
		3095	my ($self, @children) = @_;
		3096
		3097	$self->SUPER::remove (@children);
		3098
		3099	while (@children) {
		3100	my $w = pop @children;
		3101	push @children, $w->children;
		3102	$w->set_invisible;
		3103	}
2784	}	3104	}
2785		3105
2786	sub on_refresh {	3106	sub on_refresh {
2787	my ($self, $id, $cb) = @_;	3107	my ($self, $id, $cb) = @_;
2788		3108
2789	$self->{refresh_hook}{$id} = $cb;	3109	$self->{refresh_hook}{$id} = $cb;
2790	}	3110	}
2791		3111
		3112	sub on_post_alloc {
		3113	my ($self, $id, $cb) = @_;
		3114
		3115	$self->{post_alloc_hook}{$id} = $cb;
		3116	}
		3117
2792	sub draw {	3118	sub draw {
2793	my ($self) = @_;	3119	my ($self) = @_;
2794		3120
		3121	while ($self->{refresh_hook}) {
		3122	$_->()
		3123	for values %{delete $self->{refresh_hook}};
		3124	}
		3125
2795	if ($self->{check_size}) {	3126	if ($self->{check_size}) {
2796	my @queue = ([], []);	3127	my @queue;
2797		3128
2798	for (;;) {	3129	for (;;) {
2799	if ($self->{check_size}) {	3130	if ($self->{check_size}) {
2800	# heuristic: check containers last	3131	#TODO use array-of-depth approach
2801	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3132
		3133	@queue = sort { $a->{visible} <=> $b->{visible} }
2802	for values %{delete $self->{check_size}}	3134	@queue, values %{delete $self->{check_size}};
2803	}	3135	}
2804		3136
2805	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3137	my $widget = pop @queue || last;
		3138
		3139	defined $widget->{visible} or last; # do not resize invisible widgets
2806		3140
2807	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3141	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2808	? @$widget{qw(user_w user_h)}	3142	? @$widget{qw(user_w user_h)}
2809	: $widget->size_request;	3143	: $widget->size_request;
2810		3144
…		…
2830	$w = 0 if $w < 0;	3164	$w = 0 if $w < 0;
2831	$h = 0 if $h < 0;	3165	$h = 0 if $h < 0;
2832		3166
2833	$widget->{w} = $w;	3167	$widget->{w} = $w;
2834	$widget->{h} = $h;	3168	$widget->{h} = $h;
2835	$widget->size_allocate ($w, $h);
2836	$widget->emit (size_allocate => $w, $h);	3169	$widget->emit (size_allocate => $w, $h);
2837	}	3170	}
2838	}	3171	}
2839		3172
2840	while ($self->{refresh_hook}) {	3173	while ($self->{post_alloc_hook}) {
2841	$_->()	3174	$_->()
2842	for values %{delete $self->{refresh_hook}};	3175	for values %{delete $self->{post_alloc_hook}};
2843	}	3176	}
2844		3177
2845	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3178	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3179	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847	glClear GL_COLOR_BUFFER_BIT;	3180	glClear GL_COLOR_BUFFER_BIT;
2848		3181
2849	glMatrixMode GL_PROJECTION;	3182	glMatrixMode GL_PROJECTION;
2850	glLoadIdentity;	3183	glLoadIdentity;
2851	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3184	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2852	glMatrixMode GL_MODELVIEW;	3185	glMatrixMode GL_MODELVIEW;
2853	glLoadIdentity;	3186	glLoadIdentity;
2854		3187
2855	$self->_draw;	3188	$self->_draw;
2856	}	3189	}
…		…
2858	#############################################################################	3191	#############################################################################
2859		3192
2860	package CFClient::UI;	3193	package CFClient::UI;
2861		3194
2862	$ROOT = new CFClient::UI::Root;	3195	$ROOT = new CFClient::UI::Root;
2863	$TOOLTIP = new CFClient::UI::Tooltip;	3196	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864		3197
2865	1	3198	1
2866		3199

Diff Legend

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