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.201 by root, Sat May 13 23:17:49 2006 UTC vs.
Revision 1.248 by root, Sun May 28 01:37:45 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->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		181	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		182	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		183	}
		184	}
		185
		186	reconfigure_widgets;
138	}	187	}
139		188
140	#############################################################################	189	#############################################################################
141		190
142	package CFClient::UI::Base;	191	package CFClient::UI::Base;
…		…
155	can_events => 1,	204	can_events => 1,
156	@_	205	@_
157	}, $class;	206	}, $class;
158		207
159	for (keys %$self) {	208	for (keys %$self) {
160	if (/^connect_(.*)$/) {	209	if (/^on_(.*)$/) {
161	$self->connect ($1 => delete $self->{$_});	210	$self->connect ($1 => delete $self->{$_});
162	}	211	}
163	}	212	}
164		213
		214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		215
		216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		217	$self->{req_x} = $layout->{x} * $::WIDTH;
		218	$self->{req_y} = $layout->{y} * $::HEIGHT;
		219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		220	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		221	}
		222
165	$self	223	$self
		224	}
		225
		226	sub toggle_visibility {
		227	my ($self) = @_;
		228
		229	if ($self->{visible}) {
		230	$self->hide;
		231	} else {
		232	$self->show;
		233	}
166	}	234	}
167		235
168	sub destroy {	236	sub destroy {
169	my ($self) = @_;	237	my ($self) = @_;
170		238
…		…
178	return if $self->{parent};	246	return if $self->{parent};
179		247
180	$CFClient::UI::ROOT->add ($self);	248	$CFClient::UI::ROOT->add ($self);
181	}	249	}
182		250
183	sub hide {	251	sub center {
184	my ($self) = @_;	252	my ($self) = @_;
		253
		254	$CFClient::UI::ROOT->on_post_alloc (
		255	"center_$self" => sub {
		256	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
		257	},
		258	);
		259
		260	$self->update;
		261	}
		262
		263	sub set_visible {
		264	my ($self) = @_;
		265
		266	return if $self->{visible};
		267
		268	$self->{root} = $self->{parent}{root};
		269	$self->{visible} = $self->{parent}{visible} + 1;
		270
		271	$self->emit (visibility_change => 1);
		272	}
		273
		274	sub set_invisible {
		275	my ($self) = @_;
		276
		277	return unless $self->{visible};
		278
		279	# broken show/hide model
		280
		281	delete $self->{root};
		282	delete $self->{visible};
185		283
186	undef $GRAB if $GRAB == $self;	284	undef $GRAB if $GRAB == $self;
187	undef $HOVER if $HOVER == $self;	285	undef $HOVER if $HOVER == $self;
		286
		287	CFClient::UI::check_tooltip
		288	if $CFClient::UI::TOOLTIP->{owner} == $self;
		289
		290	$self->focus_out;
		291
		292	$self->emit (visibility_change => 0);
		293	}
		294
		295	sub hide {
		296	my ($self) = @_;
		297
		298	$self->set_invisible;
188		299
189	$self->{parent}->remove ($self)	300	$self->{parent}->remove ($self)
190	if $self->{parent};	301	if $self->{parent};
191	}	302	}
192		303
…		…
201	}	312	}
202		313
203	sub set_size {	314	sub set_size {
204	my ($self, $w, $h) = @_;	315	my ($self, $w, $h) = @_;
205		316
206	$self->{user_w} = $w;	317	$self->{def_w} = $w;
207	$self->{user_h} = $h;	318	$self->{def_h} = $h;
208		319
209	$self->check_size;	320	$self->check_size;
210	}	321	}
211		322
212	sub size_request {	323	sub size_request {
…		…
242		353
243	sub size_allocate {	354	sub size_allocate {
244	# nothing to be done	355	# nothing to be done
245	}	356	}
246		357
247	sub children {
248	}
249
250	# call when resolution changes etc.
251	sub reconfigure {	358	sub reconfigure {
252	my ($self) = @_;	359	my ($self) = @_;
253
254	$_->reconfigure
255	for $self->children;
256		360
257	$self->check_size (1);	361	$self->check_size (1);
258	$self->update;	362	$self->update;
259	}	363	}
260		364
		365	sub children {
		366	}
		367
261	sub set_max_size {	368	sub set_max_size {
262	my ($self, $w, $h) = @_;	369	my ($self, $w, $h) = @_;
263		370
264	delete $self->{max_w}; $self->{max_w} = $w if $w;	371	delete $self->{max_w}; $self->{max_w} = $w if $w;
265	delete $self->{max_h}; $self->{max_h} = $h if $h;	372	delete $self->{max_h}; $self->{max_h} = $h if $h;
		373	}
		374
		375	sub set_tooltip {
		376	my ($self, $tooltip) = @_;
		377
		378	$tooltip =~ s/^\s+//;
		379	$tooltip =~ s/\s+$//;
		380
		381	return if $self->{tooltip} eq $tooltip;
		382
		383	$self->{tooltip} = $tooltip;
		384
		385	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		386	delete $CFClient::UI::TOOLTIP->{owner};
		387	CFClient::UI::check_tooltip;
		388	}
266	}	389	}
267		390
268	# translate global coordinates to local coordinate system	391	# translate global coordinates to local coordinate system
269	sub coord2local {	392	sub coord2local {
270	my ($self, $x, $y) = @_;	393	my ($self, $x, $y) = @_;
…		…
285	return if $FOCUS == $self;	408	return if $FOCUS == $self;
286	return unless $self->{can_focus};	409	return unless $self->{can_focus};
287		410
288	my $focus = $FOCUS; $FOCUS = $self;	411	my $focus = $FOCUS; $FOCUS = $self;
289		412
290	$self->emit (focus_in => $focus);	413	$self->_emit (focus_in => $focus);
291		414
292	$focus->update if $focus;	415	$focus->update if $focus;
293	$FOCUS->update;	416	$FOCUS->update;
294	}	417	}
295		418
…		…
298		421
299	return unless $FOCUS == $self;	422	return unless $FOCUS == $self;
300		423
301	my $focus = $FOCUS; undef $FOCUS;	424	my $focus = $FOCUS; undef $FOCUS;
302		425
303	$self->emit (focus_out => $focus);	426	$self->_emit (focus_out => $focus);
304		427
305	$focus->update if $focus; #?	428	$focus->update if $focus; #?
		429
		430	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		431	unless $FOCUS;
306	}	432	}
307		433
308	sub mouse_motion { }	434	sub mouse_motion { }
309	sub button_up { }	435	sub button_up { }
310	sub key_down { }	436	sub key_down { }
311	sub key_up { }	437	sub key_up { }
312		438
313	sub button_down {	439	sub button_down {
314	my ($self, $ev, $x, $y) = @_;	440	my ($self, $ev, $x, $y) = @_;
315		441
316	$self->focus_in;	442	$self->focus_in;
…		…
350	if ($ENV{PCLIENT_DEBUG}) {	476	if ($ENV{PCLIENT_DEBUG}) {
351	glPushMatrix;	477	glPushMatrix;
352	glColor 1, 1, 0, 1;	478	glColor 1, 1, 0, 1;
353	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354	glBegin GL_LINE_LOOP;	480	glBegin GL_LINE_LOOP;
355	glVertex 0 , 0;	481	glVertex 0 , 0;
356	glVertex $self->{w}, 0;	482	glVertex $self->{w} - 1, 0;
357	glVertex $self->{w}, $self->{h};	483	glVertex $self->{w} - 1, $self->{h} - 1;
358	glVertex 0 , $self->{h};	484	glVertex 0 , $self->{h} - 1;
359	glEnd;	485	glEnd;
360	glPopMatrix;	486	glPopMatrix;
361	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	487	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362	}	488	}
363	}	489	}
364		490
365	sub _draw {	491	sub _draw {
366	my ($self) = @_;	492	my ($self) = @_;
…		…
383	sub set_parent {	509	sub set_parent {
384	my ($self, $parent) = @_;	510	my ($self, $parent) = @_;
385		511
386	Scalar::Util::weaken ($self->{parent} = $parent);	512	Scalar::Util::weaken ($self->{parent} = $parent);
387		513
388	# TODO: req_w _does_change after ->reconfigure	514	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
		515
389	$self->check_size	516	$self->check_size;
390	unless exists $self->{req_w};
391	}	517	}
392		518
393	sub check_size {	519	sub check_size {
394	my ($self, $forced) = @_;	520	my ($self, $forced) = @_;
395		521
…		…
408	my ($self, $signal, $cb) = @_;	534	my ($self, $signal, $cb) = @_;
409		535
410	push @{ $self->{signal_cb}{$signal} }, $cb;	536	push @{ $self->{signal_cb}{$signal} }, $cb;
411	}	537	}
412		538
		539	sub _emit {
		540	my ($self, $signal, @args) = @_;
		541
		542	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		543	}
		544
413	sub emit {	545	sub emit {
414	my ($self, $signal, @args) = @_;	546	my ($self, $signal, @args) = @_;
415		547
416	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	548	$self->_emit ($signal, @args)
		549	|| $self->$signal (@args);
		550	}
		551
		552	sub visibility_change {
		553	#my ($self, $visible) = @_;
417	}	554	}
418		555
419	sub DESTROY {	556	sub DESTROY {
420	my ($self) = @_;	557	my ($self) = @_;
421		558
		559	delete $WIDGET{$self+0};
422	#$self->deactivate;	560	#$self->deactivate;
423	}	561	}
424		562
425	#############################################################################	563	#############################################################################
426		564
…		…
435	my $class = shift;	573	my $class = shift;
436		574
437	# range [value, low, high, page]	575	# range [value, low, high, page]
438		576
439	$class->SUPER::new (	577	$class->SUPER::new (
440	bg => [0, 0, 0, 0.2],	578	#bg => [0, 0, 0, 0.2],
441	active_bg => [1, 1, 1, 0.5],	579	#active_bg => [1, 1, 1, 0.5],
442	@_	580	@_
443	)	581	)
444	}	582	}
445		583
446	sub _draw {	584	sub _draw {
447	my ($self) = @_;	585	my ($self) = @_;
448		586
		587	my $color = $FOCUS == $self && $self->{active_bg}
		588	? $self->{active_bg}
		589	: $self->{bg};
		590
		591	if ($color && (@$color < 4 || $color->[3])) {
449	my ($w, $h) = @$self{qw(w h)};	592	my ($w, $h) = @$self{qw(w h)};
450		593
451	glEnable GL_BLEND;	594	glEnable GL_BLEND;
452	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	595	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	596	glColor @$color;
454		597
455	glBegin GL_QUADS;	598	glBegin GL_QUADS;
456	glVertex 0 , 0;	599	glVertex 0 , 0;
457	glVertex 0 , $h;	600	glVertex 0 , $h;
458	glVertex $w, $h;	601	glVertex $w, $h;
459	glVertex $w, 0;	602	glVertex $w, 0;
460	glEnd;	603	glEnd;
461		604
462	glDisable GL_BLEND;	605	glDisable GL_BLEND;
		606	}
463	}	607	}
464		608
465	#############################################################################	609	#############################################################################
466		610
467	package CFClient::UI::Empty;	611	package CFClient::UI::Empty;
…		…
527	delete $child->{parent};	671	delete $child->{parent};
528	$child->hide;	672	$child->hide;
529		673
530	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	674	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531		675
532	$self->check_size;	676	$self->check_size (1);
533	$self->update;	677	$self->update;
534	}	678	}
535		679
536	sub clear {	680	sub clear {
537	my ($self) = @_;	681	my ($self) = @_;
…		…
651	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	795	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652	glClearColor 0, 0, 0, 0;	796	glClearColor 0, 0, 0, 0;
653	glClear GL_COLOR_BUFFER_BIT;	797	glClear GL_COLOR_BUFFER_BIT;
654		798
655	$self->_render;	799	$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	};	800	};
664	}	801	}
665		802
666	sub _draw {	803	sub _draw {
667	my ($self) = @_;	804	my ($self) = @_;
…		…
671	my $tex = $self->{texture}	808	my $tex = $self->{texture}
672	or return;	809	or return;
673		810
674	glEnable GL_TEXTURE_2D;	811	glEnable GL_TEXTURE_2D;
675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	812	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676	glColor 0, 0, 0, 1;	813	glColor 1, 1, 1, 1;
677		814
678	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	815	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679		816
680	glDisable GL_TEXTURE_2D;	817	glDisable GL_TEXTURE_2D;
681	}	818	}
…		…
684		821
685	package CFClient::UI::ViewPort;	822	package CFClient::UI::ViewPort;
686		823
687	our @ISA = CFClient::UI::Window::;	824	our @ISA = CFClient::UI::Window::;
688		825
		826	sub new {
		827	my $class = shift;
		828
		829	$class->SUPER::new (
		830	scroll_x => 0,
		831	scroll_y => 1,
		832	@_,
		833	)
		834	}
		835
689	sub size_request {	836	sub size_request {
690	my ($self) = @_;	837	my ($self) = @_;
691		838
692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	839	my ($w, $h) = @$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		840
695	@$self{qw(child_w child_h)}	841	$w = 10 if $self->{scroll_x};
		842	$h = 10 if $self->{scroll_y};
		843
		844	($w, $h)
696	}	845	}
697		846
698	sub size_allocate {	847	sub size_allocate {
699	my ($self, $w, $h) = @_;	848	my ($self, $w, $h) = @_;
700		849
		850	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		851	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		852
		853	$self->child->configure (0, 0, $w, $h);
701	$self->update;	854	$self->update;
702	}	855	}
703		856
704	sub set_offset {	857	sub set_offset {
705	my ($self, $x, $y) = @_;	858	my ($self, $x, $y) = @_;
…		…
756	my $class = shift;	909	my $class = shift;
757		910
758	my $self;	911	my $self;
759		912
760	my $slider = new CFClient::UI::Slider	913	my $slider = new CFClient::UI::Slider
761	vertical => 1,	914	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	915	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	916	on_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	917	$self->{vp}->set_offset (0, $_[1]);
765	},	918	},
766	;	919	;
767		920
768	$self = $class->SUPER::new (	921	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	922	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	923	slider => $slider,
771	@_,	924	@_,
772	);	925	);
773		926
774	$self->{vp}->add ($self->{scrolled});	927	$self->{vp}->add ($self->{scrolled});
775	$self->add ($self->{vp});	928	$self->add ($self->{vp});
776	$self->add ($self->{slider});	929	$self->add ($self->{slider});
777		930
778	$self	931	$self
		932	}
		933
		934	sub update {
		935	my ($self) = @_;
		936
		937	$self->SUPER::update;
		938
		939	# todo: overwrite size_allocate of child
		940	my $child = $self->{vp}->child;
		941	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		942	}
		943
		944	sub size_allocate {
		945	my ($self, $w, $h) = @_;
		946
		947	$self->SUPER::size_allocate ($w, $h);
		948
		949	my $child = $self->{vp}->child;
		950	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
779	}	951	}
780		952
781	#TODO# update range on size_allocate depending on child	953	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	954	# update viewport offset on scroll
783		955
…		…
834	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1006	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
835		1007
836	sub new {	1008	sub new {
837	my $class = shift;	1009	my $class = shift;
838		1010
839	# TODO: user_x, user_y, overwrite moveto?
840
841	my $self = $class->SUPER::new (	1011	my $self = $class->SUPER::new (
842	bg => [1, 1, 1, 1],	1012	bg => [1, 1, 1, 1],
843	border_bg => [1, 1, 1, 1],	1013	border_bg => [1, 1, 1, 1],
844	border => 0.6,	1014	border => 0.6,
		1015	is_toplevel => 1,
845	can_events => 1,	1016	can_events => 1,
846	@_	1017	@_
847	);	1018	);
848		1019
849	$self->{title} &&= new CFClient::UI::Label	1020	$self->{title} &&= new CFClient::UI::Label
850	align => 0,	1021	align => 0,
…		…
874	my ($self, $w, $h) = @_;	1045	my ($self, $w, $h) = @_;
875		1046
876	$h -= List::Util::max 0, $self->border * 2;	1047	$h -= List::Util::max 0, $self->border * 2;
877	$w -= List::Util::max 0, $self->border * 2;	1048	$w -= List::Util::max 0, $self->border * 2;
878		1049
879	$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)
880	if $self->{title};	1051	if $self->{title};
881		1052
882	$self->child->configure ($self->border, $self->border, $w, $h);	1053	$self->child->configure ($self->border, $self->border, $w, $h);
883	}	1054	}
884		1055
…		…
903	my ($ev, $x, $y) = @_;	1074	my ($ev, $x, $y) = @_;
904		1075
905	my $dx = $ev->{x} - $ox;	1076	my $dx = $ev->{x} - $ox;
906	my $dy = $ev->{y} - $oy;	1077	my $dy = $ev->{y} - $oy;
907		1078
		1079	$self->{user_x} = $wx + $dx * $mx;
		1080	$self->{user_y} = $wy + $dy * $my;
908	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1081	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
909	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1082	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
910	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1083	$self->move ($self->{user_x}, $self->{user_y});
911	$self->check_size;	1084	$self->check_size;
912	};	1085	};
913		1086
914	} elsif ($lr ^ $td) {	1087	} elsif ($lr ^ $td) {
915	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
918	$self->{motion} = sub {	1091	$self->{motion} = sub {
919	my ($ev, $x, $y) = @_;	1092	my ($ev, $x, $y) = @_;
920		1093
921	($x, $y) = ($ev->{x}, $ev->{y});	1094	($x, $y) = ($ev->{x}, $ev->{y});
922		1095
923	$self->move ($bx + $x - $ox, $by + $y - $oy);	1096	$self->{user_x} = $bx + $x - $ox;
		1097	$self->{user_y} = $by + $y - $oy;
		1098
		1099	$self->move ($self->{user_x}, $self->{user_y});
924	$self->update;	1100	$self->update;
925	};	1101	};
926	}	1102	}
927	}	1103	}
928		1104
…		…
990	sub new {	1166	sub new {
991	my $class = shift;	1167	my $class = shift;
992		1168
993	$class->SUPER::new (	1169	$class->SUPER::new (
994	col_expand => [],	1170	col_expand => [],
995	@_	1171	@_,
996	)	1172	)
		1173	}
		1174
		1175	sub children {
		1176	grep $_, map @$_, grep $_, @{ $_[0]{children} }
997	}	1177	}
998		1178
999	sub add {	1179	sub add {
1000	my ($self, $x, $y, $child) = @_;	1180	my ($self, $x, $y, $child) = @_;
1001		1181
1002	$child->set_parent ($self);	1182	$child->set_parent ($self);
1003	$self->{children}[$y][$x] = $child;	1183	$self->{children}[$y][$x] = $child;
1004		1184
1005	$child->check_size;	1185	$self->check_size (1);
1006	}	1186	}
1007		1187
1008	sub children {
1009	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1010	}
1011
1012	# TODO: move to container class maybe? send childs a signal on removal?	1188	# TODO: move to container class maybe? send children a signal on removal?
1013	sub clear {	1189	sub clear {
1014	my ($self) = @_;	1190	my ($self) = @_;
1015		1191
1016	my @children = $self->children;	1192	my @children = $self->children;
1017	delete $self->{children};	1193	delete $self->{children};
…		…
1019	for (@children) {	1195	for (@children) {
1020	delete $_->{parent};	1196	delete $_->{parent};
1021	$_->hide;	1197	$_->hide;
1022	}	1198	}
1023		1199
		1200	$self->check_size (1);
1024	$self->update;	1201	$self->update;
1025	}	1202	}
1026		1203
1027	sub get_wh {	1204	sub get_wh {
1028	my ($self) = @_;	1205	my ($self) = @_;
…		…
1060	sub size_allocate {	1237	sub size_allocate {
1061	my ($self, $w, $h) = @_;	1238	my ($self, $w, $h) = @_;
1062		1239
1063	my ($ws, $hs) = $self->get_wh;	1240	my ($ws, $hs) = $self->get_wh;
1064		1241
1065	my $req_w = sum @$ws;	1242	my $req_w = (sum @$ws) || 1;
1066	my $req_h = sum @$hs;	1243	my $req_h = (sum @$hs) || 1;
1067		1244
1068	# TODO: nicer code && do row_expand	1245	# TODO: nicer code && do row_expand
1069	my @col_expand = @{$self->{col_expand}};	1246	my @col_expand = @{$self->{col_expand}};
1070	@col_expand = (1) x @$ws unless @col_expand;	1247	@col_expand = (1) x @$ws unless @col_expand;
1071	my $col_expand = (sum @col_expand) || 1;	1248	my $col_expand = (sum @col_expand) || 1;
…		…
1125	}	1302	}
1126	}	1303	}
1127		1304
1128	#############################################################################	1305	#############################################################################
1129		1306
1130	package CFClient::UI::HBox;	1307	package CFClient::UI::Box;
1131
1132	# TODO: wrap into common Box base class
1133		1308
1134	our @ISA = CFClient::UI::Container::;	1309	our @ISA = CFClient::UI::Container::;
1135		1310
1136	sub size_request {	1311	sub size_request {
1137	my ($self) = @_;	1312	my ($self) = @_;
1138		1313
1139	my @alloc = map [$_->size_request], @{$self->{children}};	1314	$self->{vertical}
1140		1315	? (
1141	(	1316	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1142	(List::Util::sum map $_->[0], @alloc),	1317	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1143	(List::Util::max map $_->[1], @alloc),	1318	)
1144	)	1319	: (
		1320	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1321	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1322	)
1145	}	1323	}
1146		1324
1147	sub size_allocate {	1325	sub size_allocate {
1148	my ($self, $w, $h) = @_;	1326	my ($self, $w, $h) = @_;
1149		1327
1150	($h, $w) = ($w, $h);	1328	my $space = $self->{vertical} ? $h : $w;
1151
1152	my $children = $self->{children};	1329	my $children = $self->{children};
1153		1330
1154	my @h = map $_->{req_w}, @$children;	1331	my @req;
1155		1332
1156	my $req_h = List::Util::sum @h;	1333	if ($self->{homogeneous}) {
1157		1334	@req = ($space / (@$children || 1)) x @$children;
1158	if ($req_h > $h) {
1159	# ah well, not enough space
1160	$_ *= $h / $req_h for @h;
1161	} else {	1335	} else {
		1336	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1337	my $req = List::Util::sum @req;
		1338
		1339	if ($req > $space) {
		1340	# ah well, not enough space
		1341	$_ *= $space / $req for @req;
		1342	} else {
1162	my $exp = List::Util::sum map $_->{expand}, @$children;	1343	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1163	$exp ||= 1;
1164		1344
		1345	$space = ($space - $req) / $expand; # remaining space to give away
		1346
		1347	$req[$_] += $space * $children->[$_]{expand}
1165	for (0 .. $#$children) {	1348	for 0 .. $#$children;
1166	my $child = $children->[$_];
1167
1168	my $alloc_h = $h[$_];
1169	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1170	$h[$_] = $alloc_h;
1171	}	1349	}
1172	}	1350	}
1173		1351
1174	CFClient::UI::harmonize \@h;	1352	CFClient::UI::harmonize \@req;
1175		1353
1176	my $y = 0;	1354	my $pos = 0;
1177	for (0 .. $#$children) {	1355	for (0 .. $#$children) {
1178	my $child = $children->[$_];
1179	my $h = $h[$_];	1356	my $alloc = $req[$_];
1180	$child->configure ($y, 0, $h, $w);	1357	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1181		1358
1182	$y += $h;	1359	$pos += $alloc;
1183	}	1360	}
1184		1361
1185	1	1362	1
1186	}	1363	}
1187		1364
1188	#############################################################################	1365	#############################################################################
1189		1366
		1367	package CFClient::UI::HBox;
		1368
		1369	our @ISA = CFClient::UI::Box::;
		1370
		1371	sub new {
		1372	my $class = shift;
		1373
		1374	$class->SUPER::new (
		1375	vertical => 0,
		1376	@_,
		1377	)
		1378	}
		1379
		1380	#############################################################################
		1381
1190	package CFClient::UI::VBox;	1382	package CFClient::UI::VBox;
1191		1383
1192	# TODO: wrap into common Box base class
1193
1194	our @ISA = CFClient::UI::Container::;	1384	our @ISA = CFClient::UI::Box::;
1195		1385
1196	sub size_request {	1386	sub new {
1197	my ($self) = @_;	1387	my $class = shift;
1198		1388
1199	my @alloc = map [$_->size_request], @{$self->{children}};	1389	$class->SUPER::new (
1200		1390	vertical => 1,
1201	(	1391	@_,
1202	(List::Util::max map $_->[0], @alloc),
1203	(List::Util::sum map $_->[1], @alloc),
1204	)	1392	)
1205	}	1393	}
1206		1394
1207	sub size_allocate {
1208	my ($self, $w, $h) = @_;
1209
1210	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1212	my $children = $self->{children};
1213
1214	my @h = map $_->{req_h}, @$children;
1215
1216	my $req_h = List::Util::sum @h;
1217
1218	if ($req_h > $h) {
1219	# ah well, not enough space
1220	$_ *= $h / $req_h for @h;
1221	} else {
1222	my $exp = List::Util::sum map $_->{expand}, @$children;
1223	$exp ||= 1;
1224
1225	for (0 .. $#$children) {
1226	my $child = $children->[$_];
1227
1228	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1229	}
1230	}
1231
1232	CFClient::UI::harmonize \@h;
1233
1234	my $y = 0;
1235	for (0 .. $#$children) {
1236	my $child = $children->[$_];
1237	my $h = $h[$_];
1238	$child->configure (0, $y, $w, $h);
1239
1240	$y += $h;
1241	}
1242
1243	1
1244	}
1245
1246	#############################################################################	1395	#############################################################################
1247		1396
1248	package CFClient::UI::Label;	1397	package CFClient::UI::Label;
1249		1398
1250	our @ISA = CFClient::UI::Base::;	1399	our @ISA = CFClient::UI::DrawBG::;
1251		1400
1252	use CFClient::OpenGL;	1401	use CFClient::OpenGL;
1253		1402
1254	sub new {	1403	sub new {
1255	my ($class, %arg) = @_;	1404	my ($class, %arg) = @_;
1256		1405
1257	my $self = $class->SUPER::new (	1406	my $self = $class->SUPER::new (
1258	fg => [1, 1, 1],	1407	fg => [1, 1, 1],
		1408	#bg => none
		1409	#active_bg => none
1259	#font => default_font	1410	#font => default_font
1260	#text => initial text	1411	#text => initial text
1261	#markup => initial narkup	1412	#markup => initial narkup
		1413	#max_w => maximum pixel width
		1414	ellipsise => 3, # end
1262	layout => (new CFClient::Layout),	1415	layout => (new CFClient::Layout),
1263	fontsize => 1,	1416	fontsize => 1,
1264	align => -1,	1417	align => -1,
1265	valign => -1,	1418	valign => -1,
1266	padding => 2,	1419	padding => 2,
…		…
1281	}	1434	}
1282		1435
1283	$self	1436	$self
1284	}	1437	}
1285		1438
1286	sub escape {	1439	sub escape($) {
1287	local $_ = $_[1];	1440	local $_ = $_[0];
1288		1441
1289	s/&/&amp;/g;	1442	s/&/&amp;/g;
1290	s/>/&gt;/g;	1443	s/>/&gt;/g;
1291	s/</&lt;/g;	1444	s/</&lt;/g;
1292		1445
1293	$_[1]	1446	$_
1294	}	1447	}
1295		1448
1296	sub update {	1449	sub update {
1297	my ($self) = @_;	1450	my ($self) = @_;
1298		1451
…		…
1331	sub size_request {	1484	sub size_request {
1332	my ($self) = @_;	1485	my ($self) = @_;
1333		1486
1334	$self->{layout}->set_font ($self->{font}) if $self->{font};	1487	$self->{layout}->set_font ($self->{font}) if $self->{font};
1335	$self->{layout}->set_width ($self->{max_w} || -1);	1488	$self->{layout}->set_width ($self->{max_w} || -1);
		1489	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1490	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1491	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337		1492
1338	my ($w, $h) = $self->{layout}->size;	1493	my ($w, $h) = $self->{layout}->size;
1339		1494
1340	if (exists $self->{template}) {	1495	if (exists $self->{template}) {
…		…
1370	}	1525	}
1371		1526
1372	sub _draw {	1527	sub _draw {
1373	my ($self) = @_;	1528	my ($self) = @_;
1374		1529
		1530	$self->SUPER::_draw; # draw background, if applicable
		1531
1375	my $tex = $self->{texture} ||= do {	1532	my $tex = $self->{texture} ||= do {
1376	$self->{layout}->set_foreground (@{$self->{fg}});	1533	$self->{layout}->set_foreground (@{$self->{fg}});
1377	$self->{layout}->set_font ($self->{font}) if $self->{font};	1534	$self->{layout}->set_font ($self->{font}) if $self->{font};
1378	$self->{layout}->set_width ($self->{w});	1535	$self->{layout}->set_width ($self->{w});
		1536	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1537	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1379	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1538	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1380		1539
1381	my $tex = new_from_layout CFClient::Texture $self->{layout};	1540	my $tex = new_from_layout CFClient::Texture $self->{layout};
1382		1541
1383	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1542	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1384	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1543	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385	: ($self->{w} - $tex->{w}) * 0.5;	1544	: ($self->{w} - $tex->{w}) * 0.5);
1386		1545
1387	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1546	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1388	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1547	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389	: ($self->{h} - $tex->{h}) * 0.5;	1548	: ($self->{h} - $tex->{h}) * 0.5);
1390		1549
1391	$tex	1550	$tex
1392	};	1551	};
1393		1552
1394	glEnable GL_TEXTURE_2D;	1553	glEnable GL_TEXTURE_2D;
…		…
1422	active_fg => [0, 0, 0],	1581	active_fg => [0, 0, 0],
1423	can_hover => 1,	1582	can_hover => 1,
1424	can_focus => 1,	1583	can_focus => 1,
1425	valign => 0,	1584	valign => 0,
1426	can_events => 1,	1585	can_events => 1,
		1586	#text => ...
1427	@_	1587	@_
1428	)	1588	)
1429	}	1589	}
1430		1590
1431	sub _set_text {	1591	sub _set_text {
…		…
1441	$self->{text} = $text;	1601	$self->{text} = $text;
1442		1602
1443	$text =~ s/./*/g if $self->{hidden};	1603	$text =~ s/./*/g if $self->{hidden};
1444	$self->{layout}->set_text ("$text ");	1604	$self->{layout}->set_text ("$text ");
1445		1605
1446	$self->emit (changed => $self->{text});	1606	$self->_emit (changed => $self->{text});
1447	}	1607	}
1448		1608
1449	sub set_text {	1609	sub set_text {
1450	my ($self, $text) = @_;	1610	my ($self, $text) = @_;
1451		1611
1452	$self->{cursor} = length $text;	1612	$self->{cursor} = length $text;
1453	$self->_set_text ($text);	1613	$self->_set_text ($text);
		1614	$self->update;
1454	$self->check_size;	1615	$self->check_size;
1455	$self->update;
1456	}	1616	}
1457		1617
1458	sub get_text {	1618	sub get_text {
1459	$_[0]{text}	1619	$_[0]{text}
1460	}	1620	}
…		…
1463	my ($self) = @_;	1623	my ($self) = @_;
1464		1624
1465	my ($w, $h) = $self->SUPER::size_request;	1625	my ($w, $h) = $self->SUPER::size_request;
1466		1626
1467	($w + 1, $h) # add 1 for cursor	1627	($w + 1, $h) # add 1 for cursor
1468	}
1469
1470	sub size_allocate {
1471	my ($self, $w, $h) = @_;
1472
1473	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1474	}	1628	}
1475		1629
1476	sub key_down {	1630	sub key_down {
1477	my ($self, $ev) = @_;	1631	my ($self, $ev) = @_;
1478		1632
…		…
1493	} elsif ($sym == CFClient::SDLK_HOME) {	1647	} elsif ($sym == CFClient::SDLK_HOME) {
1494	$self->{cursor} = 0;	1648	$self->{cursor} = 0;
1495	} elsif ($sym == CFClient::SDLK_END) {	1649	} elsif ($sym == CFClient::SDLK_END) {
1496	$self->{cursor} = length $text;	1650	$self->{cursor} = length $text;
1497	} elsif ($uni == 27) {	1651	} elsif ($uni == 27) {
1498	$self->emit ('escape');	1652	$self->_emit ('escape');
1499	} elsif ($uni) {	1653	} elsif ($uni) {
1500	substr $text, $self->{cursor}++, 0, chr $uni;	1654	substr $text, $self->{cursor}++, 0, chr $uni;
1501	}	1655	}
1502		1656
1503	$self->_set_text ($text);	1657	$self->_set_text ($text);
1504	$self->update;	1658	$self->update;
		1659	$self->check_size;
1505	}	1660	}
1506		1661
1507	sub focus_in {	1662	sub focus_in {
1508	my ($self) = @_;	1663	my ($self) = @_;
1509		1664
…		…
1589	if ($sym == 13) {	1744	if ($sym == 13) {
1590	unshift @{$self->{history}},	1745	unshift @{$self->{history}},
1591	my $txt = $self->get_text;	1746	my $txt = $self->get_text;
1592	$self->{history_pointer} = -1;	1747	$self->{history_pointer} = -1;
1593	$self->{history_saveback} = '';	1748	$self->{history_saveback} = '';
1594	$self->emit (activate => $txt);	1749	$self->_emit (activate => $txt);
1595	$self->update;	1750	$self->update;
1596		1751
1597	} elsif ($sym == CFClient::SDLK_UP) {	1752	} elsif ($sym == CFClient::SDLK_UP) {
1598	if ($self->{history_pointer} < 0) {	1753	if ($self->{history_pointer} < 0) {
1599	$self->{history_saveback} = $self->get_text;	1754	$self->{history_saveback} = $self->get_text;
…		…
1638	my $class = shift;	1793	my $class = shift;
1639		1794
1640	$class->SUPER::new (	1795	$class->SUPER::new (
1641	padding => 4,	1796	padding => 4,
1642	fg => [1, 1, 1],	1797	fg => [1, 1, 1],
1643	bg => [1, 1, 1, 0.2],
1644	active_fg => [0, 0, 1],	1798	active_fg => [0, 0, 1],
1645	can_hover => 1,	1799	can_hover => 1,
1646	align => 0,	1800	align => 0,
1647	valign => 0,	1801	valign => 0,
1648	can_events => 1,	1802	can_events => 1,
1649	@_	1803	@_
1650	)	1804	)
1651	}	1805	}
1652		1806
		1807	sub activate { }
		1808
1653	sub button_up {	1809	sub button_up {
1654	my ($self, $ev, $x, $y) = @_;	1810	my ($self, $ev, $x, $y) = @_;
1655		1811
		1812	$self->emit ("activate")
1656	if ($x >= 0 && $x < $self->{w}	1813	if $x >= 0 && $x < $self->{w}
1657	&& $y >= 0 && $y < $self->{h}) {	1814	&& $y >= 0 && $y < $self->{h};
1658	$self->emit ("activate");
1659	}
1660	}	1815	}
1661		1816
1662	sub _draw {	1817	sub _draw {
1663	my ($self) = @_;	1818	my ($self) = @_;
1664		1819
…		…
1696		1851
1697	$class->SUPER::new (	1852	$class->SUPER::new (
1698	padding => 2,	1853	padding => 2,
1699	fg => [1, 1, 1],	1854	fg => [1, 1, 1],
1700	active_fg => [1, 1, 0],	1855	active_fg => [1, 1, 0],
		1856	bg => [0, 0, 0, 0.2],
		1857	active_bg => [1, 1, 1, 0.5],
1701	state => 0,	1858	state => 0,
1702	can_hover => 1,	1859	can_hover => 1,
1703	@_	1860	@_
1704	)	1861	)
1705	}	1862	}
…		…
1714	my ($self, $ev, $x, $y) = @_;	1871	my ($self, $ev, $x, $y) = @_;
1715		1872
1716	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1873	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1717	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1874	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1718	$self->{state} = !$self->{state};	1875	$self->{state} = !$self->{state};
1719	$self->emit (changed => $self->{state});	1876	$self->_emit (changed => $self->{state});
1720	}	1877	}
1721	}	1878	}
1722		1879
1723	sub _draw {	1880	sub _draw {
1724	my ($self) = @_;	1881	my ($self) = @_;
…		…
1989	qw(s1_slider.png s1_slider_bg.png);	2146	qw(s1_slider.png s1_slider_bg.png);
1990		2147
1991	sub new {	2148	sub new {
1992	my $class = shift;	2149	my $class = shift;
1993		2150
1994	# range [value, low, high, page]	2151	# range [value, low, high, page, unit]
1995		2152
1996	# TODO: 0-width page	2153	# TODO: 0-width page
1997	# TODO: req_w/h are wrong with vertical	2154	# TODO: req_w/h are wrong with vertical
1998	# TODO: calculations are off	2155	# TODO: calculations are off
1999	my $self = $class->SUPER::new (	2156	my $self = $class->SUPER::new (
2000	fg => [1, 1, 1],	2157	fg => [1, 1, 1],
2001	active_fg => [0, 0, 0],	2158	active_fg => [0, 0, 0],
		2159	bg => [0, 0, 0, 0.2],
		2160	active_bg => [1, 1, 1, 0.5],
2002	range => [0, 0, 100, 10],	2161	range => [0, 0, 100, 10, 0],
2003	req_w => $::WIDTH / 80,	2162	req_w => $::WIDTH / 80,
2004	req_h => $::WIDTH / 80,	2163	req_h => $::WIDTH / 80,
2005	vertical => 0,	2164	vertical => 0,
2006	can_hover => 1,	2165	can_hover => 1,
2007	inner_pad => 5,	2166	inner_pad => 0.02,
2008	@_	2167	@_
2009	);	2168	);
2010		2169
		2170	$self->set_value ($self->{range}[0]);
		2171	$self->update;
		2172
2011	$self	2173	$self
		2174	}
		2175
		2176	sub set_range {
		2177	my ($self, $range) = @_;
		2178
		2179	($range, $self->{range}) = ($self->{range}, $range);
		2180
		2181	$self->update
		2182	if "@$range" ne "@{$self->{range}}";
		2183	}
		2184
		2185	sub set_value {
		2186	my ($self, $value) = @_;
		2187
		2188	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2189
		2190	$hi = $lo + 1 if $hi <= $lo;
		2191
		2192	$page = $hi - $lo if $page > $hi - $lo;
		2193
		2194	$value = $lo if $value < $lo;
		2195	$value = $hi - $page if $value > $hi - $page;
		2196
		2197	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2198	if $unit;
		2199
		2200	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2201
		2202	if ($value != $old_value) {
		2203	$self->_emit (changed => $value);
		2204	$self->update;
		2205	}
2012	}	2206	}
2013		2207
2014	sub size_request {	2208	sub size_request {
2015	my ($self) = @_;	2209	my ($self) = @_;
2016		2210
…		…
2022		2216
2023	sub button_down {	2217	sub button_down {
2024	my ($self, $ev, $x, $y) = @_;	2218	my ($self, $ev, $x, $y) = @_;
2025		2219
2026	$self->SUPER::button_down ($ev, $x, $y);	2220	$self->SUPER::button_down ($ev, $x, $y);
		2221
		2222	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2223
2027	$self->mouse_motion ($ev, $x, $y);	2224	$self->mouse_motion ($ev, $x, $y);
2028	}	2225	}
2029		2226
2030	sub mouse_motion {	2227	sub mouse_motion {
2031	my ($self, $ev, $x, $y) = @_;	2228	my ($self, $ev, $x, $y) = @_;
2032		2229
2033	if ($GRAB == $self) {	2230	if ($GRAB == $self) {
		2231	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2232
		2233	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2234
		2235	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2236
		2237	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2238	}
		2239	}
		2240
		2241	sub update {
		2242	my ($self) = @_;
		2243
		2244	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2245	$self->set_value ($self->{range}[0]);
		2246
2034	my ($value, $lo, $hi, $page) = @{$self->{range}};	2247	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2248	my $range = ($hi - $page - $lo) || 1e-100;
2035		2249
2036	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2250	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2037		2251
2038	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2252	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2039	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2253	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2040		2254
2041	$x -= $inner_pad_px; # substract the padding	2255	$value = ($value - $lo) / $range;
2042	$x = $x * ($hi - $lo) / $inner_w + $lo;	2256	$value = $value * $self->{scale} + $self->{offset};
2043	$x = $lo if $x < $lo;
2044	$x = $hi - $page if $x > $hi - $page;
2045	$self->{range}[0] = $x;
2046		2257
2047	$self->emit (changed => $x);	2258	$self->{knob_x} = $value - $knob_w * 0.5;
2048	$self->update;	2259	$self->{knob_w} = $knob_w;
2049	}	2260	});
2050	}
2051		2261
2052	# the inner_* stuff is for generating a padding for the slider handle,	2262	$self->SUPER::update;
2053	# so that the handle doesn't leave the texture. This calculation isn't 100%
2054	# correct propably, but it does the job for now
2055	sub _calc_inner_pad_px {
2056	my ($self, $w) = @_;
2057	($w / 100) * $self->{inner_pad} # % to pixels
2058	}	2263	}
2059		2264
2060	sub _draw {	2265	sub _draw {
2061	my ($self) = @_;	2266	my ($self) = @_;
2062		2267
2063	$self->SUPER::_draw ();	2268	$self->SUPER::_draw ();
2064		2269
2065	my ($w, $h) = @$self{qw(w h)};	2270	glScale $self->{w}, $self->{h};
2066		2271
2067	if ($self->{vertical}) {	2272	if ($self->{vertical}) {
2068	# draw a vertical slider like a rotated horizontal slider	2273	# draw a vertical slider like a rotated horizontal slider
2069		2274
		2275	glTranslate 1, 0, 0;
2070	glRotate 90, 0, 0, 1;	2276	glRotate 90, 0, 0, 1;
2071	glTranslate 0, -$self->{w}, 0;
2072
2073	($w, $h) = ($h, $w);
2074	}	2277	}
2075		2278
2076	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2279	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2280	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078		2281
2079	my ($value, $lo, $hi, $page) = @{$self->{range}};
2080
2081	$hi = $value + 1 if $lo == $hi;
2082
2083	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2084	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2085
2086	$page = int $page * $inner_w / ($hi - $lo);
2087	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2088
2089	$w -= $page;
2090	$page &= ~1;
2091	glTranslate $page * 0.5, 0, 0;
2092	$page ||= 2;
2093
2094	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2095	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2096
2097	glEnable GL_TEXTURE_2D;	2282	glEnable GL_TEXTURE_2D;
2098	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2283	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099		2284
2100	# draw background	2285	# draw background
2101	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2286	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102		2287
2103	# draw handle	2288	# draw handle
2104	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2289	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2105		2290
2106	glDisable GL_TEXTURE_2D;	2291	glDisable GL_TEXTURE_2D;
2107	}	2292	}
		2293
		2294	#############################################################################
		2295
		2296	package CFClient::UI::ValSlider;
		2297
		2298	our @ISA = CFClient::UI::HBox::;
		2299
		2300	sub new {
		2301	my ($class, %arg) = @_;
		2302
		2303	my $range = delete $arg{range};
		2304
		2305	my $self = $class->SUPER::new (
		2306	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2307	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2308	to_value => sub { shift },
		2309	from_value => sub { shift },
		2310	%arg,
		2311	);
		2312
		2313	$self->{slider}->connect (changed => sub {
		2314	my ($self, $value) = @_;
		2315	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2316	$self->{parent}->emit (changed => $value);
		2317	});
		2318
		2319	# $self->{entry}->connect (changed => sub {
		2320	# my ($self, $value) = @_;
		2321	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2322	# $self->{parent}->emit (changed => $value);
		2323	# });
		2324
		2325	$self->add ($self->{slider}, $self->{entry});
		2326
		2327	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2328
		2329	$self
		2330	}
		2331
		2332	sub set_range { shift->{slider}->set_range (@_) }
		2333	sub set_value { shift->{slider}->set_value (@_) }
2108		2334
2109	#############################################################################	2335	#############################################################################
2110		2336
2111	package CFClient::UI::TextView;	2337	package CFClient::UI::TextView;
2112		2338
…		…
2142		2368
2143	$self->{fontsize} = $fontsize;	2369	$self->{fontsize} = $fontsize;
2144	$self->reflow;	2370	$self->reflow;
2145	}	2371	}
2146		2372
2147	sub text_height {
2148	my ($self, $text) = @_;
2149
2150	my $layout = $self->{layout};
2151
2152	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2153	$layout->set_width ($self->{children}[0]{w});
2154	$layout->set_markup ($text);
2155
2156	($layout->size)[1]
2157	}
2158
2159	sub reflow {
2160	my ($self) = @_;
2161
2162	$self->{need_reflow}++;
2163	$self->update;
2164	}
2165
2166	sub size_allocate {	2373	sub size_allocate {
2167	my ($self, $w, $h) = @_;	2374	my ($self, $w, $h) = @_;
2168		2375
2169	$self->SUPER::size_allocate ($w, $h);	2376	$self->SUPER::size_allocate ($w, $h);
2170		2377
…		…
2173	$self->{layout}->set_width ($self->{children}[0]{w});	2380	$self->{layout}->set_width ($self->{children}[0]{w});
2174		2381
2175	$self->reflow;	2382	$self->reflow;
2176	}	2383	}
2177		2384
		2385	sub text_size {
		2386	my ($self, $text, $indent) = @_;
		2387
		2388	my $layout = $self->{layout};
		2389
		2390	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2391	$layout->set_width ($self->{children}[0]{w} - $indent);
		2392	$layout->set_markup ($text);
		2393
		2394	$layout->size
		2395	}
		2396
		2397	sub reflow {
		2398	my ($self) = @_;
		2399
		2400	$self->{need_reflow}++;
		2401	$self->update;
		2402	}
		2403
		2404	sub set_offset {
		2405	my ($self, $offset) = @_;
		2406
		2407	# todo: base offset on lines or so, not on pixels
		2408	$self->{children}[1]->set_value ($offset);
		2409	}
		2410
		2411	sub clear {
		2412	my ($self) = @_;
		2413
		2414	$self->{par} = [];
		2415	$self->{height} = 0;
		2416	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2417	}
		2418
2178	sub add_paragraph {	2419	sub add_paragraph {
2179	my ($self, $color, $text) = @_;	2420	my ($self, $color, $text, $indent) = @_;
2180		2421
2181	#TODO: intelligently "reformat" paragraph	2422	for my $line (split /\n/, $text) {
2182		2423	my ($w, $h) = $self->text_size ($line);
2183	my $height = $self->text_height ($text);
2184
2185	$self->{height} += $height;	2424	$self->{height} += $h;
		2425	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2426	}
2186		2427
2187	push @{$self->{par}}, [$height, $color, $text];
2188
2189	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2428	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2190	$self->{children}[1]->update;
2191	}	2429	}
2192		2430
2193	sub update {	2431	sub update {
2194	my ($self) = @_;	2432	my ($self) = @_;
2195		2433
…		…
2198	return unless $self->{h} > 0;	2436	return unless $self->{h} > 0;
2199		2437
2200	delete $self->{texture};	2438	delete $self->{texture};
2201		2439
2202	$ROOT->on_post_alloc ($self, sub {	2440	$ROOT->on_post_alloc ($self, sub {
		2441	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2442
2203	if (delete $self->{need_reflow}) {	2443	if (delete $self->{need_reflow}) {
2204	my $height = 0;	2444	my $height = 0;
2205		2445
2206	$height += $_->[0] = $self->text_height ($_->[2])	2446	my $layout = $self->{layout};
		2447
		2448	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2449
2207	for @{$self->{par}};	2450	for (@{$self->{par}}) {
		2451	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2452	$layout->set_width ($W - $_->[3]);
		2453	$layout->set_markup ($_->[4]);
		2454	my ($w, $h) = $layout->size;
		2455	$_->[0] = $w + $_->[3];
		2456	$_->[1] = $h;
		2457	}
		2458
		2459	$height += $_->[1];
		2460	}
2208		2461
2209	$self->{height} = $height;	2462	$self->{height} = $height;
2210		2463
2211	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2464	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2212		2465
2213	delete $self->{texture};	2466	delete $self->{texture};
2214	}	2467	}
2215		2468
2216	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2469	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2217	glClearColor 0, 0, 0, 0;	2470	glClearColor 0.5, 0.5, 0.5, 0;
2218	glClear GL_COLOR_BUFFER_BIT;	2471	glClear GL_COLOR_BUFFER_BIT;
2219		2472
2220	glEnable GL_TEXTURE_2D;
2221	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222
2223	my $top = int $self->{children}[1]{range}[0];	2473	my $top = int $self->{children}[1]{range}[0];
2224		2474
2225	my $y0 = $top;	2475	my $y0 = $top;
2226	my $y1 = $top + $self->{h};	2476	my $y1 = $top + $H;
2227		2477
2228	my $y = 0;	2478	my $y = 0;
2229		2479
2230	my $layout = $self->{layout};	2480	my $layout = $self->{layout};
2231		2481
2232	$layout->set_font ($self->{font}) if $self->{font};	2482	$layout->set_font ($self->{font}) if $self->{font};
2233		2483
		2484	glEnable GL_BLEND;
		2485	#TODO# not correct in windows where rgba is forced off
		2486	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2487
2234	for my $par (@{$self->{par}}) {	2488	for my $par (@{$self->{par}}) {
2235	my $h = $par->[0];	2489	my $h = $par->[1];
2236		2490
2237	if ($y0 < $y + $h && $y < $y1) {	2491	if ($y0 < $y + $h && $y < $y1) {
2238	$layout->set_foreground (@{ $par->[1] });	2492	$layout->set_foreground (@{ $par->[2] });
		2493	$layout->set_width ($W - $par->[3]);
2239	$layout->set_markup ($par->[2]);	2494	$layout->set_markup ($par->[4]);
2240		2495
2241	my ($W, $H) = $layout->size;	2496	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2242	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2497
		2498	glRasterPos $par->[3], $y - $y0;
		2499	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2243	}	2500	}
2244		2501
2245	$y += $h;	2502	$y += $h;
2246	}	2503	}
2247		2504
2248	glDisable GL_TEXTURE_2D;	2505	glDisable GL_BLEND;
2249	};	2506	};
2250	});	2507	});
2251	}	2508	}
2252		2509
2253	sub _draw {	2510	sub _draw {
2254	my ($self) = @_;	2511	my ($self) = @_;
2255		2512
2256	glEnable GL_TEXTURE_2D;	2513	glEnable GL_TEXTURE_2D;
2257	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2514	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2258	glColor 1, 1, 1, 1;	2515	glColor 1, 1, 1, 1;
2259	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2516	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2260	glDisable GL_TEXTURE_2D;	2517	glDisable GL_TEXTURE_2D;
2261		2518
2262	$self->{children}[1]->draw;	2519	$self->{children}[1]->draw;
2263		2520
2264	}	2521	}
…		…
2313		2570
2314	sub new {	2571	sub new {
2315	my $class = shift;	2572	my $class = shift;
2316		2573
2317	my $self = $class->SUPER::new (	2574	my $self = $class->SUPER::new (
2318	state => 0,	2575	state => 0,
2319	connect_activate => \&toggle_flopper,	2576	on_activate => \&toggle_flopper,
2320	@_	2577	@_
2321	);	2578	);
2322		2579
2323	if ($self->{state}) {
2324	$self->{state} = 0;
2325	$self->toggle_flopper;
2326	}
2327
2328	$self	2580	$self
2329	}	2581	}
2330		2582
2331	sub toggle_flopper {	2583	sub toggle_flopper {
2332	my ($self) = @_;	2584	my ($self) = @_;
2333		2585
2334	# TODO: use animation	2586	$self->{other}->toggle_visibility;
2335	if ($self->{state} = !$self->{state}) {
2336	$CFClient::UI::ROOT->add ($self->{other});
2337	$self->{other}->move ($self->coord2global (0, $self->{h}));
2338	$self->emit ("open");
2339	} else {
2340	$CFClient::UI::ROOT->remove ($self->{other});
2341	$self->emit ("close");
2342	}
2343
2344	$self->emit (changed => $self->{state});
2345	}	2587	}
2346		2588
2347	#############################################################################	2589	#############################################################################
2348		2590
2349	package CFClient::UI::Tooltip;	2591	package CFClient::UI::Tooltip;
…		…
2363		2605
2364	sub set_tooltip_from {	2606	sub set_tooltip_from {
2365	my ($self, $widget) = @_;	2607	my ($self, $widget) = @_;
2366		2608
2367	$self->add (new CFClient::UI::Label	2609	$self->add (new CFClient::UI::Label
2368	markup => $widget->{tooltip},	2610	markup => $widget->{tooltip},
2369	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2611	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370	fontsize => 0.8,	2612	fontsize => 0.8,
2371	fg => [0, 0, 0, 1],	2613	fg => [0, 0, 0, 1],
		2614	ellipsise => 0,
2372	font => ($widget->{tooltip_font} || $::FONT_PROP),	2615	font => ($widget->{tooltip_font} || $::FONT_PROP),
2373	);	2616	);
2374	}	2617	}
2375		2618
2376	sub size_request {	2619	sub size_request {
2377	my ($self) = @_;	2620	my ($self) = @_;
…		…
2423	use CFClient::OpenGL;	2666	use CFClient::OpenGL;
2424		2667
2425	sub new {	2668	sub new {
2426	my $class = shift;	2669	my $class = shift;
2427		2670
2428	$class->SUPER::new (	2671	my $self = $class->SUPER::new (
2429	aspect => 1,	2672	aspect => 1,
		2673	can_events => 0,
2430	@_,	2674	@_,
2431	)	2675	);
		2676
		2677	if ($self->{anim} && $self->{animspeed}) {
		2678	Scalar::Util::weaken (my $widget = $self);
		2679
		2680	$self->{timer} = Event->timer (
		2681	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2682	hard => 1,
		2683	interval => $self->{animspeed},
		2684	cb => sub {
		2685	++$widget->{frame};
		2686	$widget->update;
		2687	},
		2688	);
		2689	}
		2690
		2691	$self
2432	}	2692	}
2433		2693
2434	sub size_request {	2694	sub size_request {
2435	(32, 8)	2695	(32, 8)
2436	}	2696	}
2437		2697
		2698	sub update {
		2699	my ($self) = @_;
		2700
		2701	return unless $self->{visible};
		2702
		2703	$self->SUPER::update;
		2704	}
		2705
2438	sub _draw {	2706	sub _draw {
2439	my ($self) = @_;	2707	my ($self) = @_;
2440		2708
2441	return unless $::CONN;#d# manage and cache textures differently	2709	return unless $::CONN;
		2710
		2711	my $face;
		2712
		2713	if ($self->{frame}) {
		2714	my $anim = $::CONN->{anim}[$self->{anim}];
		2715
		2716	$face = $anim->[ $self->{frame} % @$anim ]
		2717	if $anim && @$anim;
		2718	}
		2719
2442	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2720	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2443		2721
2444	# TODO animation
2445	if ($tex) {	2722	if ($tex) {
2446	glEnable GL_TEXTURE_2D;	2723	glEnable GL_TEXTURE_2D;
2447	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2724	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448	glColor 1, 1, 1, 1;	2725	glColor 1, 1, 1, 1;
2449	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2726	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450	glDisable GL_TEXTURE_2D;	2727	glDisable GL_TEXTURE_2D;
2451	}	2728	}
2452	}	2729	}
2453		2730
2454	#############################################################################	2731	sub DESTROY {
		2732	my ($self) = @_;
2455		2733
		2734	$self->{timer}->cancel
		2735	if $self->{timer};
		2736
		2737	$self->SUPER::DESTROY;
		2738	}
		2739
		2740	#############################################################################
		2741
2456	package CFClient::UI::InventoryItem;	2742	package CFClient::UI::Inventory;
2457		2743
2458	our @ISA = CFClient::UI::HBox::;	2744	our @ISA = CFClient::UI::ScrolledWindow::;
2459		2745
2460	sub new {	2746	sub new {
2461	my $class = shift;	2747	my $class = shift;
2462		2748
2463	my %args = @_;
2464
2465	my $item = delete $args{item};
2466
2467	my $desc = $item->{nrof} < 2
2468	? $item->{name}
2469	: "$item->{nrof} $item->{name_pl}";
2470
2471
2472	my $self = $class->SUPER::new (	2749	my $self = $class->SUPER::new (
2473	can_hover => 1,	2750	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2474	can_events => 1,
2475	tooltip => (CFClient::UI::Label->escape ($desc)
2476	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477	connect_button_down => sub {
2478	my ($self, $ev, $x, $y) = @_;
2479
2480	# todo: maybe put examine on 1? but should just be a tooltip :(
2481	if ($ev->{button} == 1) {
2482	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2483	} elsif ($ev->{button} == 2) {
2484	$::CONN->send ("apply $item->{tag}");
2485	} elsif ($ev->{button} == 3) {
2486	CFClient::UI::Menu->new (
2487	items => [
2488	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489	[
2490	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491	sub { $::CONN->send ("lock $item->{tag}") },
2492	],
2493	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496	],
2497	)->popup ($ev);
2498	}
2499
2500	1
2501	},
2502	%args
2503	);
2504
2505	$self->add (new CFClient::UI::Face
2506	can_events => 0,
2507	face => $item->{face},
2508	anim => $item->{anim},
2509	animspeed => $item->{animspeed},
2510	);
2511
2512	$self->add (new CFClient::UI::Label
2513	can_events => 0,
2514	text => $desc,
2515	);
2516
2517	$self
2518	}
2519
2520	#############################################################################
2521
2522	package CFClient::UI::Inventory;
2523
2524	our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526	sub new {
2527	my $class = shift;
2528
2529	my $self = $class->SUPER::new (
2530	scrolled => (new CFClient::UI::VBox),
2531	@_,	2751	@_,
2532	);	2752	);
2533		2753
2534	$self	2754	$self
2535	}	2755	}
…		…
2545	or ($a->{name} cmp $b->{name})	2765	or ($a->{name} cmp $b->{name})
2546	} @$items;	2766	} @$items;
2547		2767
2548	$self->{real_items} = \@items;	2768	$self->{real_items} = \@items;
2549		2769
		2770	my $row = 0;
2550	for my $item (@items) {	2771	for my $item (@items) {
2551	my $desc = $item->{nrof} < 2	2772	CFClient::Item::update_widgets $item;
2552	? $item->{name}
2553	: "$item->{nrof} $item->{name_pl}";
2554		2773
2555	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2774	$self->{scrolled}->add (0, $row, $item->{face_widget});
2556	}	2775	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2776	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2557		2777
2558	$self->{scrolled}->add (@items);	2778	$row++;
2559		2779	}
2560	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2561	}
2562
2563	sub size_request {
2564	my ($self) = @_;
2565	($self->{req_w}, $self->{req_h});
2566	}	2780	}
2567		2781
2568	#############################################################################	2782	#############################################################################
2569		2783
2570	package CFClient::UI::Menu;	2784	package CFClient::UI::Menu;
…		…
2605		2819
2606	# popup given the event (must be a mouse button down event currently)	2820	# popup given the event (must be a mouse button down event currently)
2607	sub popup {	2821	sub popup {
2608	my ($self, $ev) = @_;	2822	my ($self, $ev) = @_;
2609		2823
2610	$self->emit ("popdown");	2824	$self->_emit ("popdown");
2611		2825
2612	# maybe save $GRAB? must be careful about events...	2826	# maybe save $GRAB? must be careful about events...
2613	$GRAB = $self;	2827	$GRAB = $self;
2614	$self->{button} = $ev->{button};	2828	$self->{button} = $ev->{button};
2615		2829
…		…
2630		2844
2631	if ($ev->{button} == $self->{button}) {	2845	if ($ev->{button} == $self->{button}) {
2632	undef $GRAB;	2846	undef $GRAB;
2633	$self->hide;	2847	$self->hide;
2634		2848
2635	$self->emit ("popdown");	2849	$self->_emit ("popdown");
2636	$self->{hover}[1]->() if $self->{hover};	2850	$self->{hover}[1]->() if $self->{hover};
2637	}	2851	}
2638	}	2852	}
2639		2853
2640	#############################################################################	2854	#############################################################################
2641		2855
2642	package CFClient::UI::Statusbox;	2856	package CFClient::UI::Statusbox;
2643		2857
2644	our @ISA = CFClient::UI::VBox::;	2858	our @ISA = CFClient::UI::VBox::;
		2859
		2860	sub new {
		2861	my $class = shift;
		2862
		2863	$class->SUPER::new (
		2864	fontsize => 0.8,
		2865	@_,
		2866	)
		2867	}
2645		2868
2646	sub reorder {	2869	sub reorder {
2647	my ($self) = @_;	2870	my ($self) = @_;
2648	my $NOW = time;	2871	my $NOW = time;
2649		2872
…		…
2668	? "<b>$item->{count} ×</b> $item->{text}"	2891	? "<b>$item->{count} ×</b> $item->{text}"
2669	: $item->{text};	2892	: $item->{text};
2670		2893
2671	for ($short) {	2894	for ($short) {
2672	s/^\s+//;	2895	s/^\s+//;
2673	s/\012.*/…/s;	2896	s/\s+/ /g;
2674	my $len = int 40 / $item->{fontsize};
2675	substr $_, $len, length, "…" if $len < length;
2676	}	2897	}
2677		2898
2678	new CFClient::UI::Label	2899	new CFClient::UI::Label
2679	markup => $short,	2900	markup => $short,
2680	tooltip => $item->{tooltip},	2901	tooltip => $item->{tooltip},
2681	tooltip_font => $::FONT_PROP,	2902	tooltip_font => $::FONT_PROP,
2682	tooltip_width => 0.67,	2903	tooltip_width => 0.67,
2683	fontsize => $item->{fontsize},	2904	fontsize => $item->{fontsize} || $self->{fontsize},
		2905	max_w => $::WIDTH * 0.44,
2684	color => $item->{color},	2906	fg => $item->{fg},
2685	can_events => 1,	2907	can_events => 1,
2686	can_hover => 1	2908	can_hover => 1
2687	};	2909	};
2688	}	2910	}
2689		2911
…		…
2694	sub add {	2916	sub add {
2695	my ($self, $text, %arg) = @_;	2917	my ($self, $text, %arg) = @_;
2696		2918
2697	$text =~ s/^\s+//;	2919	$text =~ s/^\s+//;
2698	$text =~ s/\s+$//;	2920	$text =~ s/\s+$//;
		2921
		2922	return unless $text;
2699		2923
2700	my $timeout = time + ((delete $arg{timeout}) || 60);	2924	my $timeout = time + ((delete $arg{timeout}) || 60);
2701		2925
2702	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2926	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2703		2927
…		…
2715	$self->{item}{$group} = {	2939	$self->{item}{$group} = {
2716	id => ++$self->{id},	2940	id => ++$self->{id},
2717	text => $text,	2941	text => $text,
2718	timeout => $timeout,	2942	timeout => $timeout,
2719	tooltip => $text,	2943	tooltip => $text,
2720	fontsize => 0.8,
2721	color => [0.8, 0.8, 0.8, 0.8],	2944	fg => [0.8, 0.8, 0.8, 0.8],
2722	pri => 0,	2945	pri => 0,
2723	count => 1,	2946	count => 1,
2724	%arg,	2947	%arg,
2725	};	2948	};
2726	}	2949	}
2727		2950
2728	$self->reorder;	2951	$self->reorder;
2729	}	2952	}
2730		2953
		2954	sub reconfigure {
		2955	my ($self) = @_;
		2956
		2957	delete $_->{label}
		2958	for values %{ $self->{item} || {} };
		2959
		2960	$self->reorder;
		2961	$self->SUPER::reconfigure;
		2962	}
		2963
2731	#############################################################################	2964	#############################################################################
2732		2965
2733	package CFClient::UI::Root;	2966	package CFClient::UI::Root;
2734		2967
2735	our @ISA = CFClient::UI::Container::;	2968	our @ISA = CFClient::UI::Container::;
…		…
2738		2971
2739	sub new {	2972	sub new {
2740	my $class = shift;	2973	my $class = shift;
2741		2974
2742	$class->SUPER::new (	2975	$class->SUPER::new (
		2976	visible => 1,
2743	@_,	2977	@_,
2744	)	2978	)
2745	}	2979	}
2746		2980
2747	sub configure {	2981	sub configure {
…		…
2765	}	2999	}
2766		3000
2767	sub size_allocate {	3001	sub size_allocate {
2768	my ($self, $w, $h) = @_;	3002	my ($self, $w, $h) = @_;
2769		3003
2770	my $old_w = $self->{old_w};
2771	my $old_h = $self->{old_h};
2772
2773	if ($old_w && $old_h) {
2774	for my $child ($self->children) {
2775	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2776	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2777	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2778	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2779	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2780	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2781	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2782	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2783	}
2784	}
2785
2786	for my $child ($self->children) {	3004	for my $child ($self->children) {
2787	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3005	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2788		3006
		3007	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3008	if exists $child->{req_x};
		3009
		3010	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3011	if exists $child->{req_y};
		3012
		3013	delete @$child{qw(req_x req_y)};
		3014
2789	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3015	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2790	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3016	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3017
2791	$child->configure ($X, $Y, $W, $H);	3018	$child->configure ($X, $Y, $W, $H);
2792	}	3019	}
2793
2794	$self->{old_w} = $w;
2795	$self->{old_h} = $h;
2796	}	3020	}
2797		3021
2798	sub coord2local {	3022	sub coord2local {
2799	my ($self, $x, $y) = @_;	3023	my ($self, $x, $y) = @_;
2800		3024
…		…
2813	$self->check_size;	3037	$self->check_size;
2814	$::WANT_REFRESH++;	3038	$::WANT_REFRESH++;
2815	}	3039	}
2816		3040
2817	sub add {	3041	sub add {
2818	my ($self, $child) = @_;	3042	my ($self, @children) = @_;
2819		3043
		3044	for my $child (@children) {
		3045	$child->{is_toplevel} = 1;
		3046
2820	# integerise window positions	3047	# integerise window positions
2821	$child->{x} = int $child->{x};	3048	$child->{x} = int $child->{x};
2822	$child->{y} = int $child->{y};	3049	$child->{y} = int $child->{y};
		3050	}
2823		3051
2824	$self->SUPER::add ($child);	3052	$self->SUPER::add (@children);
		3053
		3054	for (my @widgets = @children; my $w = pop @widgets; ) {
		3055	push @widgets, $w->children;
		3056	$w->set_visible;
		3057	}
		3058
		3059	}
		3060
		3061	sub remove {
		3062	my ($self, @children) = @_;
		3063
		3064	$self->SUPER::remove (@children);
		3065
		3066	while (@children) {
		3067	my $w = pop @children;
		3068	push @children, $w->children;
		3069	$w->set_invisible;
		3070	}
2825	}	3071	}
2826		3072
2827	sub on_refresh {	3073	sub on_refresh {
2828	my ($self, $id, $cb) = @_;	3074	my ($self, $id, $cb) = @_;
2829		3075
…		…
2843	$_->()	3089	$_->()
2844	for values %{delete $self->{refresh_hook}};	3090	for values %{delete $self->{refresh_hook}};
2845	}	3091	}
2846		3092
2847	if ($self->{check_size}) {	3093	if ($self->{check_size}) {
2848	my @queue = ([], []);	3094	my @queue;
2849		3095
2850	for (;;) {	3096	for (;;) {
2851	if ($self->{check_size}) {	3097	if ($self->{check_size}) {
2852	# heuristic: check containers last	3098	#TODO use array-of-depth approach
2853	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3099
		3100	@queue = sort { $a->{visible} <=> $b->{visible} }
2854	for values %{delete $self->{check_size}}	3101	@queue, values %{delete $self->{check_size}};
2855	}	3102	}
2856		3103
2857	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3104	my $widget = pop @queue || last;
2858		3105
		3106	defined $widget->{visible} or last; # do not resize invisible widgets
		3107
2859	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3108	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2860	? @$widget{qw(user_w user_h)}	3109	? @$widget{qw(def_w def_h)}
2861	: $widget->size_request;	3110	: $widget->size_request;
2862		3111
2863	if (delete $widget->{force_alloc}	3112	if (delete $widget->{force_alloc}
2864	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3113	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2865	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3114	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
…		…
2882	$w = 0 if $w < 0;	3131	$w = 0 if $w < 0;
2883	$h = 0 if $h < 0;	3132	$h = 0 if $h < 0;
2884		3133
2885	$widget->{w} = $w;	3134	$widget->{w} = $w;
2886	$widget->{h} = $h;	3135	$widget->{h} = $h;
2887	$widget->size_allocate ($w, $h);
2888	$widget->emit (size_allocate => $w, $h);	3136	$widget->emit (size_allocate => $w, $h);
2889	}	3137	}
2890	}	3138	}
2891		3139
2892	while ($self->{post_alloc_hook}) {	3140	while ($self->{post_alloc_hook}) {
…		…
2898	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3146	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2899	glClear GL_COLOR_BUFFER_BIT;	3147	glClear GL_COLOR_BUFFER_BIT;
2900		3148
2901	glMatrixMode GL_PROJECTION;	3149	glMatrixMode GL_PROJECTION;
2902	glLoadIdentity;	3150	glLoadIdentity;
2903	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3151	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2904	glMatrixMode GL_MODELVIEW;	3152	glMatrixMode GL_MODELVIEW;
2905	glLoadIdentity;	3153	glLoadIdentity;
2906		3154
2907	$self->_draw;	3155	$self->_draw;
2908	}	3156	}
…		…
2910	#############################################################################	3158	#############################################################################
2911		3159
2912	package CFClient::UI;	3160	package CFClient::UI;
2913		3161
2914	$ROOT = new CFClient::UI::Root;	3162	$ROOT = new CFClient::UI::Root;
2915	$TOOLTIP = new CFClient::UI::Tooltip;	3163	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2916		3164
2917	1	3165	1
2918		3166

Diff Legend

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