ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.198 by root, Fri May 12 02:08:52 2006 UTC vs.
Revision 1.246 by root, Sun May 28 00:40:51 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
…		…
172	%$self = ();	240	%$self = ();
173	}	241	}
174		242
175	sub show {	243	sub show {
176	my ($self) = @_;	244	my ($self) = @_;
177
178	return if $self->{parent};	245	return if $self->{parent};
179		246
180	$CFClient::UI::ROOT->add ($self);	247	$CFClient::UI::ROOT->add ($self);
181	}	248	}
182		249
183	sub hide {	250	sub show_centered {
184	my ($self) = @_;	251	my ($self) = @_;
		252	return if $self->{parent};
		253
		254	$self->show;
		255
		256	$CFClient::UI::ROOT->on_post_alloc (
		257	"centered $self" => sub {
		258	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		259	},
		260	);
		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
		514	$self->set_visible;
388		515
389	# TODO: req_w _does_change after ->reconfigure
390	$self->check_size	516	$self->check_size;
391	unless exists $self->{req_w};	517	$self->show;
392	}	518	}
393		519
394	sub check_size {	520	sub check_size {
395	my ($self, $forced) = @_;	521	my ($self, $forced) = @_;
396		522
…		…
409	my ($self, $signal, $cb) = @_;	535	my ($self, $signal, $cb) = @_;
410		536
411	push @{ $self->{signal_cb}{$signal} }, $cb;	537	push @{ $self->{signal_cb}{$signal} }, $cb;
412	}	538	}
413		539
		540	sub _emit {
		541	my ($self, $signal, @args) = @_;
		542
		543	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		544	}
		545
414	sub emit {	546	sub emit {
415	my ($self, $signal, @args) = @_;	547	my ($self, $signal, @args) = @_;
416		548
417	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) = @_;
418	}	555	}
419		556
420	sub DESTROY {	557	sub DESTROY {
421	my ($self) = @_;	558	my ($self) = @_;
422		559
		560	delete $WIDGET{$self+0};
423	#$self->deactivate;	561	#$self->deactivate;
424	}	562	}
425		563
426	#############################################################################	564	#############################################################################
427		565
…		…
436	my $class = shift;	574	my $class = shift;
437		575
438	# range [value, low, high, page]	576	# range [value, low, high, page]
439		577
440	$class->SUPER::new (	578	$class->SUPER::new (
441	bg => [0, 0, 0, 0.2],	579	#bg => [0, 0, 0, 0.2],
442	active_bg => [1, 1, 1, 0.5],	580	#active_bg => [1, 1, 1, 0.5],
443	@_	581	@_
444	)	582	)
445	}	583	}
446		584
447	sub _draw {	585	sub _draw {
448	my ($self) = @_;	586	my ($self) = @_;
449		587
		588	my $color = $FOCUS == $self && $self->{active_bg}
		589	? $self->{active_bg}
		590	: $self->{bg};
		591
		592	if ($color && (@$color < 4 || $color->[3])) {
450	my ($w, $h) = @$self{qw(w h)};	593	my ($w, $h) = @$self{qw(w h)};
451		594
452	glEnable GL_BLEND;	595	glEnable GL_BLEND;
453	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	596	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
454	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	597	glColor @$color;
455		598
456	glBegin GL_QUADS;	599	glBegin GL_QUADS;
457	glVertex 0 , 0;	600	glVertex 0 , 0;
458	glVertex 0 , $h;	601	glVertex 0 , $h;
459	glVertex $w, $h;	602	glVertex $w, $h;
460	glVertex $w, 0;	603	glVertex $w, 0;
461	glEnd;	604	glEnd;
462		605
463	glDisable GL_BLEND;	606	glDisable GL_BLEND;
		607	}
464	}	608	}
465		609
466	#############################################################################	610	#############################################################################
467		611
468	package CFClient::UI::Empty;	612	package CFClient::UI::Empty;
…		…
528	delete $child->{parent};	672	delete $child->{parent};
529	$child->hide;	673	$child->hide;
530		674
531	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	675	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
532		676
533	$self->check_size;	677	$self->check_size (1);
534	$self->update;	678	$self->update;
535	}	679	}
536		680
537	sub clear {	681	sub clear {
538	my ($self) = @_;	682	my ($self) = @_;
…		…
652	$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 {
653	glClearColor 0, 0, 0, 0;	797	glClearColor 0, 0, 0, 0;
654	glClear GL_COLOR_BUFFER_BIT;	798	glClear GL_COLOR_BUFFER_BIT;
655		799
656	$self->_render;	800	$self->_render;
657	# glColorMask 1, 1, 1, 0;
658	# glEnable GL_BLEND;
659	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
660	# glRasterPos 0, 0;
661	# glCopyPixels 0, 0, $self->{w}, $self->{h};
662	# glDisable GL_BLEND;
663	# glColorMask 1, 1, 1, 1;
664	};	801	};
665	}	802	}
666		803
667	sub _draw {	804	sub _draw {
668	my ($self) = @_;	805	my ($self) = @_;
…		…
672	my $tex = $self->{texture}	809	my $tex = $self->{texture}
673	or return;	810	or return;
674		811
675	glEnable GL_TEXTURE_2D;	812	glEnable GL_TEXTURE_2D;
676	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
677	glColor 0, 0, 0, 1;	814	glColor 1, 1, 1, 1;
678		815
679	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
680		817
681	glDisable GL_TEXTURE_2D;	818	glDisable GL_TEXTURE_2D;
682	}	819	}
…		…
685		822
686	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
687		824
688	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
689		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
690	sub size_request {	837	sub size_request {
691	my ($self) = @_;	838	my ($self) = @_;
692		839
693	@$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)};
694	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
695		841
696	@$self{qw(child_w child_h)}	842	@$self{qw(child_w child_h)}
697	}	843	}
698		844
699	sub size_allocate {	845	sub size_allocate {
700	my ($self, $w, $h) = @_;	846	my ($self, $w, $h) = @_;
701		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);
702	$self->update;	852	$self->update;
703	}	853	}
704		854
705	sub set_offset {	855	sub set_offset {
706	my ($self, $x, $y) = @_;	856	my ($self, $x, $y) = @_;
…		…
757	my $class = shift;	907	my $class = shift;
758		908
759	my $self;	909	my $self;
760		910
761	my $slider = new CFClient::UI::Slider	911	my $slider = new CFClient::UI::Slider
762	vertical => 1,	912	vertical => 1,
763	range => [0, 0, 1, 0.01], # HACK fix	913	range => [0, 0, 1, 0.01], # HACK fix
764	connect_changed => sub {	914	on_changed => sub {
765	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	915	$self->{vp}->set_offset (0, $_[1]);
766	},	916	},
767	;	917	;
768		918
769	$self = $class->SUPER::new (	919	$self = $class->SUPER::new (
770	vp => (new CFClient::UI::ViewPort),	920	vp => (new CFClient::UI::ViewPort expand => 1),
771	slider => $slider,	921	slider => $slider,
772	@_,	922	@_,
773	);	923	);
774		924
775	$self->{vp}->add ($self->{scrolled});	925	$self->{vp}->add ($self->{scrolled});
…		…
777	$self->add ($self->{slider});	927	$self->add ($self->{slider});
778		928
779	$self	929	$self
780	}	930	}
781		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
782	#TODO# update range on size_allocate depeneing on child	951	#TODO# update range on size_allocate depending on child
783	# update viewport offset on scroll	952	# update viewport offset on scroll
784		953
785	#############################################################################	954	#############################################################################
786		955
787	package CFClient::UI::Frame;	956	package CFClient::UI::Frame;
788		957
789	our @ISA = CFClient::UI::Bin::;	958	our @ISA = CFClient::UI::Bin::;
790		959
791	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	}
792		993
793	#############################################################################	994	#############################################################################
794		995
795	package CFClient::UI::FancyFrame;	996	package CFClient::UI::FancyFrame;
796		997
…		…
803	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1004	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
804		1005
805	sub new {	1006	sub new {
806	my $class = shift;	1007	my $class = shift;
807		1008
808	# TODO: user_x, user_y, overwrite moveto?
809
810	my $self = $class->SUPER::new (	1009	my $self = $class->SUPER::new (
811	bg => [1, 1, 1, 1],	1010	bg => [1, 1, 1, 1],
812	border_bg => [1, 1, 1, 1],	1011	border_bg => [1, 1, 1, 1],
813	border => 0.6,	1012	border => 0.6,
		1013	is_toplevel => 1,
814	can_events => 1,	1014	can_events => 1,
815	@_	1015	@_
816	);	1016	);
817		1017
818	$self->{title} &&= new CFClient::UI::Label	1018	$self->{title} &&= new CFClient::UI::Label
819	align => 0,	1019	align => 0,
…		…
843	my ($self, $w, $h) = @_;	1043	my ($self, $w, $h) = @_;
844		1044
845	$h -= List::Util::max 0, $self->border * 2;	1045	$h -= List::Util::max 0, $self->border * 2;
846	$w -= List::Util::max 0, $self->border * 2;	1046	$w -= List::Util::max 0, $self->border * 2;
847		1047
848	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1048	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
849	if $self->{title};	1049	if $self->{title};
850		1050
851	$self->child->configure ($self->border, $self->border, $w, $h);	1051	$self->child->configure ($self->border, $self->border, $w, $h);
852	}	1052	}
853		1053
…		…
872	my ($ev, $x, $y) = @_;	1072	my ($ev, $x, $y) = @_;
873		1073
874	my $dx = $ev->{x} - $ox;	1074	my $dx = $ev->{x} - $ox;
875	my $dy = $ev->{y} - $oy;	1075	my $dy = $ev->{y} - $oy;
876		1076
		1077	$self->{user_x} = $wx + $dx * $mx;
		1078	$self->{user_y} = $wy + $dy * $my;
877	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1079	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
878	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1080	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
879	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1081	$self->move ($self->{user_x}, $self->{user_y});
880	$self->check_size;	1082	$self->check_size;
881	};	1083	};
882		1084
883	} elsif ($lr ^ $td) {	1085	} elsif ($lr ^ $td) {
884	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1086	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
887	$self->{motion} = sub {	1089	$self->{motion} = sub {
888	my ($ev, $x, $y) = @_;	1090	my ($ev, $x, $y) = @_;
889		1091
890	($x, $y) = ($ev->{x}, $ev->{y});	1092	($x, $y) = ($ev->{x}, $ev->{y});
891		1093
892	$self->move ($bx + $x - $ox, $by + $y - $oy);	1094	$self->{user_x} = $bx + $x - $ox;
		1095	$self->{user_y} = $by + $y - $oy;
		1096
		1097	$self->move ($self->{user_x}, $self->{user_y});
893	$self->update;	1098	$self->update;
894	};	1099	};
895	}	1100	}
896	}	1101	}
897		1102
…		…
959	sub new {	1164	sub new {
960	my $class = shift;	1165	my $class = shift;
961		1166
962	$class->SUPER::new (	1167	$class->SUPER::new (
963	col_expand => [],	1168	col_expand => [],
964	@_	1169	@_,
965	)	1170	)
		1171	}
		1172
		1173	sub children {
		1174	grep $_, map @$_, grep $_, @{ $_[0]{children} }
966	}	1175	}
967		1176
968	sub add {	1177	sub add {
969	my ($self, $x, $y, $child) = @_;	1178	my ($self, $x, $y, $child) = @_;
970		1179
971	$child->set_parent ($self);	1180	$child->set_parent ($self);
972	$self->{children}[$y][$x] = $child;	1181	$self->{children}[$y][$x] = $child;
973		1182
974	$child->check_size;	1183	$self->check_size (1);
975	}	1184	}
976		1185
977	sub children {
978	grep $_, map @$_, grep $_, @{ $_[0]{children} }
979	}
980
981	# TODO: move to container class maybe? send childs a signal on removal?	1186	# TODO: move to container class maybe? send children a signal on removal?
982	sub clear {	1187	sub clear {
983	my ($self) = @_;	1188	my ($self) = @_;
984		1189
985	my @children = $self->children;	1190	my @children = $self->children;
986	delete $self->{children};	1191	delete $self->{children};
…		…
988	for (@children) {	1193	for (@children) {
989	delete $_->{parent};	1194	delete $_->{parent};
990	$_->hide;	1195	$_->hide;
991	}	1196	}
992		1197
		1198	$self->check_size (1);
993	$self->update;	1199	$self->update;
994	}	1200	}
995		1201
996	sub get_wh {	1202	sub get_wh {
997	my ($self) = @_;	1203	my ($self) = @_;
…		…
1029	sub size_allocate {	1235	sub size_allocate {
1030	my ($self, $w, $h) = @_;	1236	my ($self, $w, $h) = @_;
1031		1237
1032	my ($ws, $hs) = $self->get_wh;	1238	my ($ws, $hs) = $self->get_wh;
1033		1239
1034	my $req_w = sum @$ws;	1240	my $req_w = (sum @$ws) || 1;
1035	my $req_h = sum @$hs;	1241	my $req_h = (sum @$hs) || 1;
1036		1242
1037	# TODO: nicer code && do row_expand	1243	# TODO: nicer code && do row_expand
1038	my @col_expand = @{$self->{col_expand}};	1244	my @col_expand = @{$self->{col_expand}};
1039	@col_expand = (1) x @$ws unless @col_expand;	1245	@col_expand = (1) x @$ws unless @col_expand;
1040	my $col_expand = (sum @col_expand) || 1;	1246	my $col_expand = (sum @col_expand) || 1;
…		…
1094	}	1300	}
1095	}	1301	}
1096		1302
1097	#############################################################################	1303	#############################################################################
1098		1304
1099	package CFClient::UI::HBox;	1305	package CFClient::UI::Box;
1100
1101	# TODO: wrap into common Box base class
1102		1306
1103	our @ISA = CFClient::UI::Container::;	1307	our @ISA = CFClient::UI::Container::;
1104		1308
1105	sub size_request {	1309	sub size_request {
1106	my ($self) = @_;	1310	my ($self) = @_;
1107		1311
1108	my @alloc = map [$_->size_request], @{$self->{children}};	1312	$self->{vertical}
1109		1313	? (
1110	(	1314	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1111	(List::Util::sum map $_->[0], @alloc),	1315	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1112	(List::Util::max map $_->[1], @alloc),	1316	)
1113	)	1317	: (
		1318	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1319	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1320	)
1114	}	1321	}
1115		1322
1116	sub size_allocate {	1323	sub size_allocate {
1117	my ($self, $w, $h) = @_;	1324	my ($self, $w, $h) = @_;
1118		1325
1119	($h, $w) = ($w, $h);	1326	my $space = $self->{vertical} ? $h : $w;
1120
1121	my $children = $self->{children};	1327	my $children = $self->{children};
1122		1328
1123	my @h = map $_->{req_w}, @$children;	1329	my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1124
1125	my $req_h = List::Util::sum @h;	1330	my $req = List::Util::sum @req;
1126		1331
1127	if ($req_h > $h) {	1332	if ($req > $space) {
1128	# ah well, not enough space	1333	# ah well, not enough space
1129	$_ *= $h / $req_h for @h;	1334	$_ *= $space / $req for @req;
1130	} else {	1335	} else {
1131	my $exp = List::Util::sum map $_->{expand}, @$children;	1336	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1132	$exp ||= 1;
1133		1337
		1338	$req[$_] += ($space - $req) * $children->[$_]{expand} / $expand
1134	for (0 .. $#$children) {	1339	for 0 .. $#$children;
1135	my $child = $children->[$_];
1136
1137	my $alloc_h = $h[$_];
1138	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1139	$h[$_] = $alloc_h;
1140	}
1141	}	1340	}
1142		1341
1143	CFClient::UI::harmonize \@h;	1342	CFClient::UI::harmonize \@req;
1144		1343
1145	my $y = 0;	1344	my $pos = 0;
1146	for (0 .. $#$children) {	1345	for (0 .. $#$children) {
1147	my $child = $children->[$_];
1148	my $h = $h[$_];	1346	my $alloc = $req[$_];
1149	$child->configure ($y, 0, $h, $w);	1347	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1150		1348
1151	$y += $h;	1349	$pos += $alloc;
1152	}	1350	}
1153		1351
1154	1	1352	1
1155	}	1353	}
1156		1354
1157	#############################################################################	1355	#############################################################################
1158		1356
		1357	package CFClient::UI::HBox;
		1358
		1359	our @ISA = CFClient::UI::Box::;
		1360
		1361	sub new {
		1362	my $class = shift;
		1363
		1364	$class->SUPER::new (
		1365	vertical => 0,
		1366	@_,
		1367	)
		1368	}
		1369
		1370	#############################################################################
		1371
1159	package CFClient::UI::VBox;	1372	package CFClient::UI::VBox;
1160		1373
1161	# TODO: wrap into common Box base class
1162
1163	our @ISA = CFClient::UI::Container::;	1374	our @ISA = CFClient::UI::Box::;
1164		1375
1165	sub size_request {	1376	sub new {
1166	my ($self) = @_;	1377	my $class = shift;
1167		1378
1168	my @alloc = map [$_->size_request], @{$self->{children}};	1379	$class->SUPER::new (
1169		1380	vertical => 1,
1170	(	1381	@_,
1171	(List::Util::max map $_->[0], @alloc),
1172	(List::Util::sum map $_->[1], @alloc),
1173	)	1382	)
1174	}	1383	}
1175		1384
1176	sub size_allocate {
1177	my ($self, $w, $h) = @_;
1178
1179	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1180
1181	my $children = $self->{children};
1182
1183	my @h = map $_->{req_h}, @$children;
1184
1185	my $req_h = List::Util::sum @h;
1186
1187	if ($req_h > $h) {
1188	# ah well, not enough space
1189	$_ *= $h / $req_h for @h;
1190	} else {
1191	my $exp = List::Util::sum map $_->{expand}, @$children;
1192	$exp ||= 1;
1193
1194	for (0 .. $#$children) {
1195	my $child = $children->[$_];
1196
1197	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1198	}
1199	}
1200
1201	CFClient::UI::harmonize \@h;
1202
1203	my $y = 0;
1204	for (0 .. $#$children) {
1205	my $child = $children->[$_];
1206	my $h = $h[$_];
1207	$child->configure (0, $y, $w, $h);
1208
1209	$y += $h;
1210	}
1211
1212	1
1213	}
1214
1215	#############################################################################	1385	#############################################################################
1216		1386
1217	package CFClient::UI::Label;	1387	package CFClient::UI::Label;
1218		1388
1219	our @ISA = CFClient::UI::Base::;	1389	our @ISA = CFClient::UI::DrawBG::;
1220		1390
1221	use CFClient::OpenGL;	1391	use CFClient::OpenGL;
1222		1392
1223	sub new {	1393	sub new {
1224	my ($class, %arg) = @_;	1394	my ($class, %arg) = @_;
1225		1395
1226	my $self = $class->SUPER::new (	1396	my $self = $class->SUPER::new (
1227	fg => [1, 1, 1],	1397	fg => [1, 1, 1],
		1398	#bg => none
		1399	#active_bg => none
1228	#font => default_font	1400	#font => default_font
1229	#text => initial text	1401	#text => initial text
1230	#markup => initial narkup	1402	#markup => initial narkup
		1403	#max_w => maximum pixel width
		1404	ellipsise => 3, # end
1231	layout => (new CFClient::Layout),	1405	layout => (new CFClient::Layout),
1232	fontsize => 1,	1406	fontsize => 1,
1233	align => -1,	1407	align => -1,
1234	valign => -1,	1408	valign => -1,
1235	padding => 2,	1409	padding => 2,
…		…
1250	}	1424	}
1251		1425
1252	$self	1426	$self
1253	}	1427	}
1254		1428
1255	sub escape {	1429	sub escape($) {
1256	local $_ = $_[1];	1430	local $_ = $_[0];
1257		1431
1258	s/&/&amp;/g;	1432	s/&/&amp;/g;
1259	s/>/&gt;/g;	1433	s/>/&gt;/g;
1260	s/</&lt;/g;	1434	s/</&lt;/g;
1261		1435
1262	$_[1]	1436	$_
1263	}	1437	}
1264		1438
1265	sub update {	1439	sub update {
1266	my ($self) = @_;	1440	my ($self) = @_;
1267		1441
…		…
1300	sub size_request {	1474	sub size_request {
1301	my ($self) = @_;	1475	my ($self) = @_;
1302		1476
1303	$self->{layout}->set_font ($self->{font}) if $self->{font};	1477	$self->{layout}->set_font ($self->{font}) if $self->{font};
1304	$self->{layout}->set_width ($self->{max_w} || -1);	1478	$self->{layout}->set_width ($self->{max_w} || -1);
		1479	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1480	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1305	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1481	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1306		1482
1307	my ($w, $h) = $self->{layout}->size;	1483	my ($w, $h) = $self->{layout}->size;
1308		1484
1309	if (exists $self->{template}) {	1485	if (exists $self->{template}) {
…		…
1339	}	1515	}
1340		1516
1341	sub _draw {	1517	sub _draw {
1342	my ($self) = @_;	1518	my ($self) = @_;
1343		1519
		1520	$self->SUPER::_draw; # draw background, if applicable
		1521
1344	my $tex = $self->{texture} ||= do {	1522	my $tex = $self->{texture} ||= do {
1345	$self->{layout}->set_foreground (@{$self->{fg}});	1523	$self->{layout}->set_foreground (@{$self->{fg}});
1346	$self->{layout}->set_font ($self->{font}) if $self->{font};	1524	$self->{layout}->set_font ($self->{font}) if $self->{font};
1347	$self->{layout}->set_width ($self->{w});	1525	$self->{layout}->set_width ($self->{w});
		1526	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1527	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1348	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1528	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1349		1529
1350	my $tex = new_from_layout CFClient::Texture $self->{layout};	1530	my $tex = new_from_layout CFClient::Texture $self->{layout};
1351		1531
1352	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1532	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1353	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1533	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1354	: ($self->{w} - $tex->{w}) * 0.5;	1534	: ($self->{w} - $tex->{w}) * 0.5);
1355		1535
1356	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1536	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1357	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1537	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1358	: ($self->{h} - $tex->{h}) * 0.5;	1538	: ($self->{h} - $tex->{h}) * 0.5);
1359		1539
1360	$tex	1540	$tex
1361	};	1541	};
1362		1542
1363	glEnable GL_TEXTURE_2D;	1543	glEnable GL_TEXTURE_2D;
…		…
1391	active_fg => [0, 0, 0],	1571	active_fg => [0, 0, 0],
1392	can_hover => 1,	1572	can_hover => 1,
1393	can_focus => 1,	1573	can_focus => 1,
1394	valign => 0,	1574	valign => 0,
1395	can_events => 1,	1575	can_events => 1,
		1576	#text => ...
1396	@_	1577	@_
1397	)	1578	)
1398	}	1579	}
1399		1580
1400	sub _set_text {	1581	sub _set_text {
…		…
1410	$self->{text} = $text;	1591	$self->{text} = $text;
1411		1592
1412	$text =~ s/./*/g if $self->{hidden};	1593	$text =~ s/./*/g if $self->{hidden};
1413	$self->{layout}->set_text ("$text ");	1594	$self->{layout}->set_text ("$text ");
1414		1595
1415	$self->emit (changed => $self->{text});	1596	$self->_emit (changed => $self->{text});
1416	}	1597	}
1417		1598
1418	sub set_text {	1599	sub set_text {
1419	my ($self, $text) = @_;	1600	my ($self, $text) = @_;
1420		1601
1421	$self->{cursor} = length $text;	1602	$self->{cursor} = length $text;
1422	$self->_set_text ($text);	1603	$self->_set_text ($text);
		1604	$self->update;
1423	$self->check_size;	1605	$self->check_size;
1424	$self->update;
1425	}	1606	}
1426		1607
1427	sub get_text {	1608	sub get_text {
1428	$_[0]{text}	1609	$_[0]{text}
1429	}	1610	}
…		…
1432	my ($self) = @_;	1613	my ($self) = @_;
1433		1614
1434	my ($w, $h) = $self->SUPER::size_request;	1615	my ($w, $h) = $self->SUPER::size_request;
1435		1616
1436	($w + 1, $h) # add 1 for cursor	1617	($w + 1, $h) # add 1 for cursor
1437	}
1438
1439	sub size_allocate {
1440	my ($self, $w, $h) = @_;
1441
1442	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1443	}	1618	}
1444		1619
1445	sub key_down {	1620	sub key_down {
1446	my ($self, $ev) = @_;	1621	my ($self, $ev) = @_;
1447		1622
…		…
1449	my $sym = $ev->{sym};	1624	my $sym = $ev->{sym};
1450	my $uni = $ev->{unicode};	1625	my $uni = $ev->{unicode};
1451		1626
1452	my $text = $self->get_text;	1627	my $text = $self->get_text;
1453		1628
1454	if ($sym == 8) {	1629	if ($uni == 8) {
1455	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1630	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1456	} elsif ($sym == 127) {	1631	} elsif ($uni == 127) {
1457	substr $text, $self->{cursor}, 1, "";	1632	substr $text, $self->{cursor}, 1, "";
1458	} elsif ($sym == CFClient::SDLK_LEFT) {	1633	} elsif ($sym == CFClient::SDLK_LEFT) {
1459	--$self->{cursor} if $self->{cursor};	1634	--$self->{cursor} if $self->{cursor};
1460	} elsif ($sym == CFClient::SDLK_RIGHT) {	1635	} elsif ($sym == CFClient::SDLK_RIGHT) {
1461	++$self->{cursor} if $self->{cursor} < length $self->{text};	1636	++$self->{cursor} if $self->{cursor} < length $self->{text};
1462	} elsif ($sym == CFClient::SDLK_HOME) {	1637	} elsif ($sym == CFClient::SDLK_HOME) {
1463	$self->{cursor} = 0;	1638	$self->{cursor} = 0;
1464	} elsif ($sym == CFClient::SDLK_END) {	1639	} elsif ($sym == CFClient::SDLK_END) {
1465	$self->{cursor} = length $text;	1640	$self->{cursor} = length $text;
1466	} elsif ($sym == 27) {	1641	} elsif ($uni == 27) {
1467	$self->emit ('escape');	1642	$self->_emit ('escape');
1468	} elsif ($uni) {	1643	} elsif ($uni) {
1469	substr $text, $self->{cursor}++, 0, chr $uni;	1644	substr $text, $self->{cursor}++, 0, chr $uni;
1470	}	1645	}
1471		1646
1472	$self->_set_text ($text);	1647	$self->_set_text ($text);
1473	$self->update;	1648	$self->update;
		1649	$self->check_size;
1474	}	1650	}
1475		1651
1476	sub focus_in {	1652	sub focus_in {
1477	my ($self) = @_;	1653	my ($self) = @_;
1478		1654
…		…
1558	if ($sym == 13) {	1734	if ($sym == 13) {
1559	unshift @{$self->{history}},	1735	unshift @{$self->{history}},
1560	my $txt = $self->get_text;	1736	my $txt = $self->get_text;
1561	$self->{history_pointer} = -1;	1737	$self->{history_pointer} = -1;
1562	$self->{history_saveback} = '';	1738	$self->{history_saveback} = '';
1563	$self->emit (activate => $txt);	1739	$self->_emit (activate => $txt);
1564	$self->update;	1740	$self->update;
1565		1741
1566	} elsif ($sym == CFClient::SDLK_UP) {	1742	} elsif ($sym == CFClient::SDLK_UP) {
1567	if ($self->{history_pointer} < 0) {	1743	if ($self->{history_pointer} < 0) {
1568	$self->{history_saveback} = $self->get_text;	1744	$self->{history_saveback} = $self->get_text;
…		…
1607	my $class = shift;	1783	my $class = shift;
1608		1784
1609	$class->SUPER::new (	1785	$class->SUPER::new (
1610	padding => 4,	1786	padding => 4,
1611	fg => [1, 1, 1],	1787	fg => [1, 1, 1],
1612	bg => [1, 1, 1, 0.2],
1613	active_fg => [0, 0, 1],	1788	active_fg => [0, 0, 1],
1614	can_hover => 1,	1789	can_hover => 1,
1615	align => 0,	1790	align => 0,
1616	valign => 0,	1791	valign => 0,
1617	can_events => 1,	1792	can_events => 1,
1618	@_	1793	@_
1619	)	1794	)
1620	}	1795	}
1621		1796
		1797	sub activate { }
		1798
1622	sub button_up {	1799	sub button_up {
1623	my ($self, $ev, $x, $y) = @_;	1800	my ($self, $ev, $x, $y) = @_;
1624		1801
		1802	$self->emit ("activate")
1625	if ($x >= 0 && $x < $self->{w}	1803	if $x >= 0 && $x < $self->{w}
1626	&& $y >= 0 && $y < $self->{h}) {	1804	&& $y >= 0 && $y < $self->{h};
1627	$self->emit ("activate");
1628	}
1629	}	1805	}
1630		1806
1631	sub _draw {	1807	sub _draw {
1632	my ($self) = @_;	1808	my ($self) = @_;
1633		1809
…		…
1665		1841
1666	$class->SUPER::new (	1842	$class->SUPER::new (
1667	padding => 2,	1843	padding => 2,
1668	fg => [1, 1, 1],	1844	fg => [1, 1, 1],
1669	active_fg => [1, 1, 0],	1845	active_fg => [1, 1, 0],
		1846	bg => [0, 0, 0, 0.2],
		1847	active_bg => [1, 1, 1, 0.5],
1670	state => 0,	1848	state => 0,
1671	can_hover => 1,	1849	can_hover => 1,
1672	@_	1850	@_
1673	)	1851	)
1674	}	1852	}
…		…
1683	my ($self, $ev, $x, $y) = @_;	1861	my ($self, $ev, $x, $y) = @_;
1684		1862
1685	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1863	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1686	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1864	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1687	$self->{state} = !$self->{state};	1865	$self->{state} = !$self->{state};
1688	$self->emit (changed => $self->{state});	1866	$self->_emit (changed => $self->{state});
1689	}	1867	}
1690	}	1868	}
1691		1869
1692	sub _draw {	1870	sub _draw {
1693	my ($self) = @_;	1871	my ($self) = @_;
…		…
1958	qw(s1_slider.png s1_slider_bg.png);	2136	qw(s1_slider.png s1_slider_bg.png);
1959		2137
1960	sub new {	2138	sub new {
1961	my $class = shift;	2139	my $class = shift;
1962		2140
1963	# range [value, low, high, page]	2141	# range [value, low, high, page, unit]
1964		2142
1965	# TODO: 0-width page	2143	# TODO: 0-width page
1966	# TODO: req_w/h are wrong with vertical	2144	# TODO: req_w/h are wrong with vertical
1967	# TODO: calculations are off	2145	# TODO: calculations are off
1968	my $self = $class->SUPER::new (	2146	my $self = $class->SUPER::new (
1969	fg => [1, 1, 1],	2147	fg => [1, 1, 1],
1970	active_fg => [0, 0, 0],	2148	active_fg => [0, 0, 0],
		2149	bg => [0, 0, 0, 0.2],
		2150	active_bg => [1, 1, 1, 0.5],
1971	range => [0, 0, 100, 10],	2151	range => [0, 0, 100, 10, 0],
1972	req_w => $::WIDTH / 80,	2152	req_w => $::WIDTH / 80,
1973	req_h => $::WIDTH / 80,	2153	req_h => $::WIDTH / 80,
1974	vertical => 0,	2154	vertical => 0,
1975	can_hover => 1,	2155	can_hover => 1,
1976	inner_pad => 5,	2156	inner_pad => 0.02,
1977	@_	2157	@_
1978	);	2158	);
1979		2159
		2160	$self->set_value ($self->{range}[0]);
		2161	$self->update;
		2162
1980	$self	2163	$self
		2164	}
		2165
		2166	sub set_range {
		2167	my ($self, $range) = @_;
		2168
		2169	($range, $self->{range}) = ($self->{range}, $range);
		2170
		2171	$self->update
		2172	if "@$range" ne "@{$self->{range}}";
		2173	}
		2174
		2175	sub set_value {
		2176	my ($self, $value) = @_;
		2177
		2178	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2179
		2180	$hi = $lo + 1 if $hi <= $lo;
		2181
		2182	$page = $hi - $lo if $page > $hi - $lo;
		2183
		2184	$value = $lo if $value < $lo;
		2185	$value = $hi - $page if $value > $hi - $page;
		2186
		2187	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2188	if $unit;
		2189
		2190	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2191
		2192	if ($value != $old_value) {
		2193	$self->_emit (changed => $value);
		2194	$self->update;
		2195	}
1981	}	2196	}
1982		2197
1983	sub size_request {	2198	sub size_request {
1984	my ($self) = @_;	2199	my ($self) = @_;
1985		2200
…		…
1991		2206
1992	sub button_down {	2207	sub button_down {
1993	my ($self, $ev, $x, $y) = @_;	2208	my ($self, $ev, $x, $y) = @_;
1994		2209
1995	$self->SUPER::button_down ($ev, $x, $y);	2210	$self->SUPER::button_down ($ev, $x, $y);
		2211
		2212	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2213
1996	$self->mouse_motion ($ev, $x, $y);	2214	$self->mouse_motion ($ev, $x, $y);
1997	}	2215	}
1998		2216
1999	sub mouse_motion {	2217	sub mouse_motion {
2000	my ($self, $ev, $x, $y) = @_;	2218	my ($self, $ev, $x, $y) = @_;
2001		2219
2002	if ($GRAB == $self) {	2220	if ($GRAB == $self) {
		2221	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2222
		2223	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2224
		2225	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2226
		2227	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2228	}
		2229	}
		2230
		2231	sub update {
		2232	my ($self) = @_;
		2233
		2234	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2235	$self->set_value ($self->{range}[0]);
		2236
2003	my ($value, $lo, $hi, $page) = @{$self->{range}};	2237	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2238	my $range = ($hi - $page - $lo) || 1e-100;
2004		2239
2005	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2240	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2006		2241
2007	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2242	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2008	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2243	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2009		2244
2010	$x -= $inner_pad_px; # substract the padding	2245	$value = ($value - $lo) / $range;
2011	$x = $x * ($hi - $lo) / $inner_w + $lo;	2246	$value = $value * $self->{scale} + $self->{offset};
2012	$x = $lo if $x < $lo;
2013	$x = $hi - $page if $x > $hi - $page;
2014	$self->{range}[0] = $x;
2015		2247
2016	$self->emit (changed => $x);	2248	$self->{knob_x} = $value - $knob_w * 0.5;
2017	$self->update;	2249	$self->{knob_w} = $knob_w;
2018	}	2250	});
2019	}
2020		2251
2021	# the inner_* stuff is for generating a padding for the slider handle,	2252	$self->SUPER::update;
2022	# so that the handle doesn't leave the texture. This calculation isn't 100%
2023	# correct propably, but it does the job for now
2024	sub _calc_inner_pad_px {
2025	my ($self, $w) = @_;
2026	($w / 100) * $self->{inner_pad} # % to pixels
2027	}	2253	}
2028		2254
2029	sub _draw {	2255	sub _draw {
2030	my ($self) = @_;	2256	my ($self) = @_;
2031		2257
2032	$self->SUPER::_draw ();	2258	$self->SUPER::_draw ();
2033		2259
2034	my ($w, $h) = @$self{qw(w h)};	2260	glScale $self->{w}, $self->{h};
2035		2261
2036	if ($self->{vertical}) {	2262	if ($self->{vertical}) {
2037	# draw a vertical slider like a rotated horizontal slider	2263	# draw a vertical slider like a rotated horizontal slider
2038		2264
		2265	glTranslate 1, 0, 0;
2039	glRotate 90, 0, 0, 1;	2266	glRotate 90, 0, 0, 1;
2040	glTranslate 0, -$self->{w}, 0;
2041
2042	($w, $h) = ($h, $w);
2043	}	2267	}
2044		2268
2045	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2269	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2046	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2270	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2047		2271
2048	my ($value, $lo, $hi, $page) = @{$self->{range}};
2049
2050	$hi = $value + 1 if $lo == $hi;
2051
2052	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2053	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2054
2055	$page = int $page * $inner_w / ($hi - $lo);
2056	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2057
2058	$w -= $page;
2059	$page &= ~1;
2060	glTranslate $page * 0.5, 0, 0;
2061	$page ||= 2;
2062
2063	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2064	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2065
2066	glEnable GL_TEXTURE_2D;	2272	glEnable GL_TEXTURE_2D;
2067	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2273	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2068		2274
2069	# draw background	2275	# draw background
2070	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2276	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2071		2277
2072	# draw handle	2278	# draw handle
2073	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2279	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2074		2280
2075	glDisable GL_TEXTURE_2D;	2281	glDisable GL_TEXTURE_2D;
2076	}	2282	}
		2283
		2284	#############################################################################
		2285
		2286	package CFClient::UI::ValSlider;
		2287
		2288	our @ISA = CFClient::UI::HBox::;
		2289
		2290	sub new {
		2291	my ($class, %arg) = @_;
		2292
		2293	my $range = delete $arg{range};
		2294
		2295	my $self = $class->SUPER::new (
		2296	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2297	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2298	to_value => sub { shift },
		2299	from_value => sub { shift },
		2300	%arg,
		2301	);
		2302
		2303	$self->{slider}->connect (changed => sub {
		2304	my ($self, $value) = @_;
		2305	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2306	$self->{parent}->emit (changed => $value);
		2307	});
		2308
		2309	# $self->{entry}->connect (changed => sub {
		2310	# my ($self, $value) = @_;
		2311	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2312	# $self->{parent}->emit (changed => $value);
		2313	# });
		2314
		2315	$self->add ($self->{slider}, $self->{entry});
		2316
		2317	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2318
		2319	$self
		2320	}
		2321
		2322	sub set_range { shift->{slider}->set_range (@_) }
		2323	sub set_value { shift->{slider}->set_value (@_) }
2077		2324
2078	#############################################################################	2325	#############################################################################
2079		2326
2080	package CFClient::UI::TextView;	2327	package CFClient::UI::TextView;
2081		2328
…		…
2111		2358
2112	$self->{fontsize} = $fontsize;	2359	$self->{fontsize} = $fontsize;
2113	$self->reflow;	2360	$self->reflow;
2114	}	2361	}
2115		2362
2116	sub text_height {
2117	my ($self, $text) = @_;
2118
2119	my $layout = $self->{layout};
2120
2121	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2122	$layout->set_width ($self->{children}[0]{w});
2123	$layout->set_markup ($text);
2124
2125	($layout->size)[1]
2126	}
2127
2128	sub reflow {
2129	my ($self) = @_;
2130
2131	$self->{need_reflow}++;
2132	$self->update;
2133	}
2134
2135	sub size_allocate {	2363	sub size_allocate {
2136	my ($self, $w, $h) = @_;	2364	my ($self, $w, $h) = @_;
2137		2365
2138	$self->SUPER::size_allocate ($w, $h);	2366	$self->SUPER::size_allocate ($w, $h);
2139		2367
…		…
2142	$self->{layout}->set_width ($self->{children}[0]{w});	2370	$self->{layout}->set_width ($self->{children}[0]{w});
2143		2371
2144	$self->reflow;	2372	$self->reflow;
2145	}	2373	}
2146		2374
		2375	sub text_size {
		2376	my ($self, $text, $indent) = @_;
		2377
		2378	my $layout = $self->{layout};
		2379
		2380	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2381	$layout->set_width ($self->{children}[0]{w} - $indent);
		2382	$layout->set_markup ($text);
		2383
		2384	$layout->size
		2385	}
		2386
		2387	sub reflow {
		2388	my ($self) = @_;
		2389
		2390	$self->{need_reflow}++;
		2391	$self->update;
		2392	}
		2393
		2394	sub set_offset {
		2395	my ($self, $offset) = @_;
		2396
		2397	# todo: base offset on lines or so, not on pixels
		2398	$self->{children}[1]->set_value ($offset);
		2399	}
		2400
		2401	sub clear {
		2402	my ($self) = @_;
		2403
		2404	$self->{par} = [];
		2405	$self->{height} = 0;
		2406	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2407	}
		2408
2147	sub add_paragraph {	2409	sub add_paragraph {
2148	my ($self, $color, $text) = @_;	2410	my ($self, $color, $text, $indent) = @_;
2149		2411
2150	#TODO: intelligently "reformat" paragraph	2412	for my $line (split /\n/, $text) {
2151		2413	my ($w, $h) = $self->text_size ($line);
2152	my $height = $self->text_height ($text);
2153
2154	$self->{height} += $height;	2414	$self->{height} += $h;
		2415	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2416	}
2155		2417
2156	push @{$self->{par}}, [$height, $color, $text];
2157
2158	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2418	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2159	$self->{children}[1]->update;
2160	}	2419	}
2161		2420
2162	sub update {	2421	sub update {
2163	my ($self) = @_;	2422	my ($self) = @_;
2164		2423
…		…
2167	return unless $self->{h} > 0;	2426	return unless $self->{h} > 0;
2168		2427
2169	delete $self->{texture};	2428	delete $self->{texture};
2170		2429
2171	$ROOT->on_post_alloc ($self, sub {	2430	$ROOT->on_post_alloc ($self, sub {
		2431	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2432
2172	if (delete $self->{need_reflow}) {	2433	if (delete $self->{need_reflow}) {
2173	my $height = 0;	2434	my $height = 0;
2174		2435
2175	$height += $_->[0] = $self->text_height ($_->[2])	2436	my $layout = $self->{layout};
		2437
		2438	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2439
2176	for @{$self->{par}};	2440	for (@{$self->{par}}) {
		2441	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2442	$layout->set_width ($W - $_->[3]);
		2443	$layout->set_markup ($_->[4]);
		2444	my ($w, $h) = $layout->size;
		2445	$_->[0] = $w + $_->[3];
		2446	$_->[1] = $h;
		2447	}
		2448
		2449	$height += $_->[1];
		2450	}
2177		2451
2178	$self->{height} = $height;	2452	$self->{height} = $height;
2179		2453
2180	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2454	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2181		2455
2182	delete $self->{texture};	2456	delete $self->{texture};
2183	}	2457	}
2184		2458
2185	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2459	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2186	glClearColor 0, 0, 0, 0;	2460	glClearColor 0.5, 0.5, 0.5, 0;
2187	glClear GL_COLOR_BUFFER_BIT;	2461	glClear GL_COLOR_BUFFER_BIT;
2188		2462
2189	glEnable GL_TEXTURE_2D;
2190	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2191
2192	my $top = int $self->{children}[1]{range}[0];	2463	my $top = int $self->{children}[1]{range}[0];
2193		2464
2194	my $y0 = $top;	2465	my $y0 = $top;
2195	my $y1 = $top + $self->{h};	2466	my $y1 = $top + $H;
2196		2467
2197	my $y = 0;	2468	my $y = 0;
2198		2469
2199	my $layout = $self->{layout};	2470	my $layout = $self->{layout};
2200		2471
2201	$layout->set_font ($self->{font}) if $self->{font};	2472	$layout->set_font ($self->{font}) if $self->{font};
2202		2473
		2474	glEnable GL_BLEND;
		2475	#TODO# not correct in windows where rgba is forced off
		2476	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2477
2203	for my $par (@{$self->{par}}) {	2478	for my $par (@{$self->{par}}) {
2204	my $h = $par->[0];	2479	my $h = $par->[1];
2205		2480
2206	if ($y0 < $y + $h && $y < $y1) {	2481	if ($y0 < $y + $h && $y < $y1) {
2207	$layout->set_foreground (@{ $par->[1] });	2482	$layout->set_foreground (@{ $par->[2] });
		2483	$layout->set_width ($W - $par->[3]);
2208	$layout->set_markup ($par->[2]);	2484	$layout->set_markup ($par->[4]);
2209		2485
2210	my ($W, $H) = $layout->size;	2486	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2211	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2487
		2488	glRasterPos $par->[3], $y - $y0;
		2489	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2212	}	2490	}
2213		2491
2214	$y += $h;	2492	$y += $h;
2215	}	2493	}
2216		2494
2217	glDisable GL_TEXTURE_2D;	2495	glDisable GL_BLEND;
2218	};	2496	};
2219	});	2497	});
2220	}	2498	}
2221		2499
2222	sub _draw {	2500	sub _draw {
2223	my ($self) = @_;	2501	my ($self) = @_;
2224		2502
2225	glEnable GL_TEXTURE_2D;	2503	glEnable GL_TEXTURE_2D;
2226	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2504	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2227	glColor 1, 1, 1, 1;	2505	glColor 1, 1, 1, 1;
2228	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2506	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2229	glDisable GL_TEXTURE_2D;	2507	glDisable GL_TEXTURE_2D;
2230		2508
2231	$self->{children}[1]->draw;	2509	$self->{children}[1]->draw;
2232		2510
2233	}	2511	}
…		…
2282		2560
2283	sub new {	2561	sub new {
2284	my $class = shift;	2562	my $class = shift;
2285		2563
2286	my $self = $class->SUPER::new (	2564	my $self = $class->SUPER::new (
2287	state => 0,	2565	state => 0,
2288	connect_activate => \&toggle_flopper,	2566	on_activate => \&toggle_flopper,
2289	@_	2567	@_
2290	);	2568	);
2291		2569
2292	if ($self->{state}) {
2293	$self->{state} = 0;
2294	$self->toggle_flopper;
2295	}
2296
2297	$self	2570	$self
2298	}	2571	}
2299		2572
2300	sub toggle_flopper {	2573	sub toggle_flopper {
2301	my ($self) = @_;	2574	my ($self) = @_;
2302		2575
2303	# TODO: use animation	2576	$self->{other}->toggle_visibility;
2304	if ($self->{state} = !$self->{state}) {
2305	$CFClient::UI::ROOT->add ($self->{other});
2306	$self->{other}->move ($self->coord2global (0, $self->{h}));
2307	$self->emit ("open");
2308	} else {
2309	$CFClient::UI::ROOT->remove ($self->{other});
2310	$self->emit ("close");
2311	}
2312
2313	$self->emit (changed => $self->{state});
2314	}	2577	}
2315		2578
2316	#############################################################################	2579	#############################################################################
2317		2580
2318	package CFClient::UI::Tooltip;	2581	package CFClient::UI::Tooltip;
…		…
2332		2595
2333	sub set_tooltip_from {	2596	sub set_tooltip_from {
2334	my ($self, $widget) = @_;	2597	my ($self, $widget) = @_;
2335		2598
2336	$self->add (new CFClient::UI::Label	2599	$self->add (new CFClient::UI::Label
2337	markup => $widget->{tooltip},	2600	markup => $widget->{tooltip},
2338	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2601	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2339	fontsize => 0.8,	2602	fontsize => 0.8,
2340	fg => [0, 0, 0, 1],	2603	fg => [0, 0, 0, 1],
		2604	ellipsise => 0,
2341	font => ($widget->{tooltip_font} || $::FONT_PROP),	2605	font => ($widget->{tooltip_font} || $::FONT_PROP),
2342	);	2606	);
2343	}	2607	}
2344		2608
2345	sub size_request {	2609	sub size_request {
2346	my ($self) = @_;	2610	my ($self) = @_;
…		…
2392	use CFClient::OpenGL;	2656	use CFClient::OpenGL;
2393		2657
2394	sub new {	2658	sub new {
2395	my $class = shift;	2659	my $class = shift;
2396		2660
2397	$class->SUPER::new (	2661	my $self = $class->SUPER::new (
2398	aspect => 1,	2662	aspect => 1,
		2663	can_events => 0,
2399	@_,	2664	@_,
2400	)	2665	);
		2666
		2667	if ($self->{anim} && $self->{animspeed}) {
		2668	Scalar::Util::weaken (my $widget = $self);
		2669
		2670	$self->{timer} = Event->timer (
		2671	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2672	hard => 1,
		2673	interval => $self->{animspeed},
		2674	cb => sub {
		2675	++$widget->{frame};
		2676	$widget->update;
		2677	},
		2678	);
		2679	}
		2680
		2681	$self
2401	}	2682	}
2402		2683
2403	sub size_request {	2684	sub size_request {
2404	(32, 8)	2685	(32, 8)
2405	}	2686	}
2406		2687
		2688	sub update {
		2689	my ($self) = @_;
		2690
		2691	return unless $self->{visible};
		2692
		2693	$self->SUPER::update;
		2694	}
		2695
2407	sub _draw {	2696	sub _draw {
2408	my ($self) = @_;	2697	my ($self) = @_;
2409		2698
2410	return unless $::CONN;#d# manage and cache textures differently	2699	return unless $::CONN;
		2700
		2701	my $face;
		2702
		2703	if ($self->{frame}) {
		2704	my $anim = $::CONN->{anim}[$self->{anim}];
		2705
		2706	$face = $anim->[ $self->{frame} % @$anim ]
		2707	if $anim && @$anim;
		2708	}
		2709
2411	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2710	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2412		2711
2413	# TODO animation
2414	if ($tex) {	2712	if ($tex) {
2415	glEnable GL_TEXTURE_2D;	2713	glEnable GL_TEXTURE_2D;
2416	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2714	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417	glColor 1, 1, 1, 1;	2715	glColor 1, 1, 1, 1;
2418	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2716	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419	glDisable GL_TEXTURE_2D;	2717	glDisable GL_TEXTURE_2D;
2420	}	2718	}
2421	}	2719	}
2422		2720
2423	#############################################################################	2721	sub DESTROY {
		2722	my ($self) = @_;
2424		2723
		2724	$self->{timer}->cancel
		2725	if $self->{timer};
		2726
		2727	$self->SUPER::DESTROY;
		2728	}
		2729
		2730	#############################################################################
		2731
2425	package CFClient::UI::InventoryItem;	2732	package CFClient::UI::Inventory;
2426		2733
2427	our @ISA = CFClient::UI::HBox::;	2734	our @ISA = CFClient::UI::ScrolledWindow::;
2428		2735
2429	sub new {	2736	sub new {
2430	my $class = shift;	2737	my $class = shift;
2431		2738
2432	my %args = @_;
2433
2434	my $item = delete $args{item};
2435
2436	my $desc = $item->{nrof} < 2
2437	? $item->{name}
2438	: "$item->{nrof} $item->{name_pl}";
2439
2440
2441	my $self = $class->SUPER::new (	2739	my $self = $class->SUPER::new (
2442	can_hover => 1,	2740	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2443	can_events => 1,
2444	tooltip => (CFClient::UI::Label->escape ($desc)
2445	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2446	connect_button_down => sub {
2447	my ($self, $ev, $x, $y) = @_;
2448
2449	# todo: maybe put examine on 1? but should just be a tooltip :(
2450	if ($ev->{button} == 1) {
2451	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2452	} elsif ($ev->{button} == 2) {
2453	$::CONN->send ("apply $item->{tag}");
2454	} elsif ($ev->{button} == 3) {
2455	CFClient::UI::Menu->new (
2456	items => [
2457	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2458	[
2459	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2460	sub { $::CONN->send ("lock $item->{tag}") },
2461	],
2462	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2463	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2464	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2465	],
2466	)->popup ($ev);
2467	}
2468
2469	1
2470	},
2471	%args
2472	);
2473
2474	$self->add (new CFClient::UI::Face
2475	can_events => 0,
2476	face => $item->{face},
2477	anim => $item->{anim},
2478	animspeed => $item->{animspeed},
2479	);
2480
2481	$self->add (new CFClient::UI::Label
2482	can_events => 0,
2483	text => $desc,
2484	);
2485
2486	$self
2487	}
2488
2489	#############################################################################
2490
2491	package CFClient::UI::Inventory;
2492
2493	our @ISA = CFClient::UI::ScrolledWindow::;
2494
2495	sub new {
2496	my $class = shift;
2497
2498	my $self = $class->SUPER::new (
2499	scrolled => (new CFClient::UI::VBox),
2500	@_,	2741	@_,
2501	);	2742	);
2502		2743
2503	$self	2744	$self
2504	}	2745	}
…		…
2507	my ($self, $items) = @_;	2748	my ($self, $items) = @_;
2508		2749
2509	$self->{scrolled}->clear;	2750	$self->{scrolled}->clear;
2510	return unless $items;	2751	return unless $items;
2511		2752
2512	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2753	my @items = sort {
		2754	($a->{type} <=> $b->{type})
		2755	or ($a->{name} cmp $b->{name})
		2756	} @$items;
2513		2757
2514	$self->{real_items} = \@items;	2758	$self->{real_items} = \@items;
2515		2759
		2760	my $row = 0;
2516	for my $item (@items) {	2761	for my $item (@items) {
2517	my $desc = $item->{nrof} < 2	2762	CFClient::Item::update_widgets $item;
2518	? $item->{name}
2519	: "$item->{nrof} $item->{name_pl}";
2520		2763
2521	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2764	$self->{scrolled}->add (0, $row, $item->{face_widget});
2522	}	2765	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2766	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2523		2767
2524	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2768	$row++;
2525	}	2769	}
2526
2527	sub size_request {
2528	my ($self) = @_;
2529	($self->{req_w}, $self->{req_h});
2530	}	2770	}
2531		2771
2532	#############################################################################	2772	#############################################################################
2533		2773
2534	package CFClient::UI::Menu;	2774	package CFClient::UI::Menu;
…		…
2569		2809
2570	# popup given the event (must be a mouse button down event currently)	2810	# popup given the event (must be a mouse button down event currently)
2571	sub popup {	2811	sub popup {
2572	my ($self, $ev) = @_;	2812	my ($self, $ev) = @_;
2573		2813
2574	$self->emit ("popdown");	2814	$self->_emit ("popdown");
2575		2815
2576	# maybe save $GRAB? must be careful about events...	2816	# maybe save $GRAB? must be careful about events...
2577	$GRAB = $self;	2817	$GRAB = $self;
2578	$self->{button} = $ev->{button};	2818	$self->{button} = $ev->{button};
2579		2819
…		…
2594		2834
2595	if ($ev->{button} == $self->{button}) {	2835	if ($ev->{button} == $self->{button}) {
2596	undef $GRAB;	2836	undef $GRAB;
2597	$self->hide;	2837	$self->hide;
2598		2838
2599	$self->emit ("popdown");	2839	$self->_emit ("popdown");
2600	$self->{hover}[1]->() if $self->{hover};	2840	$self->{hover}[1]->() if $self->{hover};
2601	}	2841	}
2602	}	2842	}
2603		2843
2604	#############################################################################	2844	#############################################################################
2605		2845
2606	package CFClient::UI::Statusbox;	2846	package CFClient::UI::Statusbox;
2607		2847
2608	our @ISA = CFClient::UI::VBox::;	2848	our @ISA = CFClient::UI::VBox::;
		2849
		2850	sub new {
		2851	my $class = shift;
		2852
		2853	$class->SUPER::new (
		2854	fontsize => 0.8,
		2855	@_,
		2856	)
		2857	}
2609		2858
2610	sub reorder {	2859	sub reorder {
2611	my ($self) = @_;	2860	my ($self) = @_;
2612	my $NOW = time;	2861	my $NOW = time;
2613		2862
…		…
2632	? "<b>$item->{count} ×</b> $item->{text}"	2881	? "<b>$item->{count} ×</b> $item->{text}"
2633	: $item->{text};	2882	: $item->{text};
2634		2883
2635	for ($short) {	2884	for ($short) {
2636	s/^\s+//;	2885	s/^\s+//;
2637	s/\012.*/…/s;	2886	s/\s+/ /g;
2638	my $len = int 40 / $item->{fontsize};
2639	substr $_, $len, length, "…" if $len < length;
2640	}	2887	}
2641		2888
2642	new CFClient::UI::Label	2889	new CFClient::UI::Label
2643	markup => $short,	2890	markup => $short,
2644	tooltip => $item->{tooltip},	2891	tooltip => $item->{tooltip},
2645	tooltip_font => $::FONT_PROP,	2892	tooltip_font => $::FONT_PROP,
2646	tooltip_width => 0.67,	2893	tooltip_width => 0.67,
2647	fontsize => $item->{fontsize},	2894	fontsize => $item->{fontsize} || $self->{fontsize},
		2895	max_w => $::WIDTH * 0.44,
2648	color => $item->{color},	2896	fg => $item->{fg},
2649	can_events => 1,	2897	can_events => 1,
2650	can_hover => 1	2898	can_hover => 1
2651	};	2899	};
2652	}	2900	}
2653		2901
…		…
2658	sub add {	2906	sub add {
2659	my ($self, $text, %arg) = @_;	2907	my ($self, $text, %arg) = @_;
2660		2908
2661	$text =~ s/^\s+//;	2909	$text =~ s/^\s+//;
2662	$text =~ s/\s+$//;	2910	$text =~ s/\s+$//;
		2911
		2912	return unless $text;
2663		2913
2664	my $timeout = time + ((delete $arg{timeout}) || 60);	2914	my $timeout = time + ((delete $arg{timeout}) || 60);
2665		2915
2666	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2916	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2667		2917
…		…
2679	$self->{item}{$group} = {	2929	$self->{item}{$group} = {
2680	id => ++$self->{id},	2930	id => ++$self->{id},
2681	text => $text,	2931	text => $text,
2682	timeout => $timeout,	2932	timeout => $timeout,
2683	tooltip => $text,	2933	tooltip => $text,
2684	fontsize => 0.8,
2685	color => [0.8, 0.8, 0.8, 0.8],	2934	fg => [0.8, 0.8, 0.8, 0.8],
2686	pri => 0,	2935	pri => 0,
2687	count => 1,	2936	count => 1,
2688	%arg,	2937	%arg,
2689	};	2938	};
2690	}	2939	}
2691		2940
2692	$self->reorder;	2941	$self->reorder;
2693	}	2942	}
2694		2943
		2944	sub reconfigure {
		2945	my ($self) = @_;
		2946
		2947	delete $_->{label}
		2948	for values %{ $self->{item} || {} };
		2949
		2950	$self->reorder;
		2951	$self->SUPER::reconfigure;
		2952	}
		2953
2695	#############################################################################	2954	#############################################################################
2696		2955
2697	package CFClient::UI::Root;	2956	package CFClient::UI::Root;
2698		2957
2699	our @ISA = CFClient::UI::Container::;	2958	our @ISA = CFClient::UI::Container::;
…		…
2702		2961
2703	sub new {	2962	sub new {
2704	my $class = shift;	2963	my $class = shift;
2705		2964
2706	$class->SUPER::new (	2965	$class->SUPER::new (
		2966	visible => 1,
2707	@_,	2967	@_,
2708	)	2968	)
2709	}	2969	}
2710		2970
2711	sub configure {	2971	sub configure {
…		…
2729	}	2989	}
2730		2990
2731	sub size_allocate {	2991	sub size_allocate {
2732	my ($self, $w, $h) = @_;	2992	my ($self, $w, $h) = @_;
2733		2993
2734	my $old_w = $self->{old_w};
2735	my $old_h = $self->{old_h};
2736
2737	if ($old_w && $old_h) {
2738	for my $child ($self->children) {
2739	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2740	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2741	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2742	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2743	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2744	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2745	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2746	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2747	}
2748	}
2749
2750	for my $child ($self->children) {	2994	for my $child ($self->children) {
2751	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2995	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2752		2996
		2997	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2998	if exists $child->{req_x};
		2999
		3000	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3001	if exists $child->{req_y};
		3002
		3003	delete @$child{qw(req_x req_y)};
		3004
2753	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3005	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2754	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3006	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3007
2755	$child->configure ($X, $Y, $W, $H);	3008	$child->configure ($X, $Y, $W, $H);
2756	}	3009	}
2757
2758	$self->{old_w} = $w;
2759	$self->{old_h} = $h;
2760	}	3010	}
2761		3011
2762	sub coord2local {	3012	sub coord2local {
2763	my ($self, $x, $y) = @_;	3013	my ($self, $x, $y) = @_;
2764		3014
…		…
2777	$self->check_size;	3027	$self->check_size;
2778	$::WANT_REFRESH++;	3028	$::WANT_REFRESH++;
2779	}	3029	}
2780		3030
2781	sub add {	3031	sub add {
2782	my ($self, $child) = @_;	3032	my ($self, @children) = @_;
2783		3033
		3034	for my $child (@children) {
		3035	$child->{is_toplevel} = 1;
		3036
2784	# integerise window positions	3037	# integerise window positions
2785	$child->{x} = int $child->{x};	3038	$child->{x} = int $child->{x};
2786	$child->{y} = int $child->{y};	3039	$child->{y} = int $child->{y};
		3040	}
2787		3041
2788	$self->SUPER::add ($child);	3042	$self->SUPER::add (@children);
		3043
		3044	for (my @widgets = @children; my $w = pop @widgets; ) {
		3045	push @widgets, $w->children;
		3046	$w->set_visible;
		3047	}
		3048
		3049	}
		3050
		3051	sub remove {
		3052	my ($self, @children) = @_;
		3053
		3054	$self->SUPER::remove (@children);
		3055
		3056	while (@children) {
		3057	my $w = pop @children;
		3058	push @children, $w->children;
		3059	$w->set_invisible;
		3060	}
2789	}	3061	}
2790		3062
2791	sub on_refresh {	3063	sub on_refresh {
2792	my ($self, $id, $cb) = @_;	3064	my ($self, $id, $cb) = @_;
2793		3065
…		…
2807	$_->()	3079	$_->()
2808	for values %{delete $self->{refresh_hook}};	3080	for values %{delete $self->{refresh_hook}};
2809	}	3081	}
2810		3082
2811	if ($self->{check_size}) {	3083	if ($self->{check_size}) {
2812	my @queue = ([], []);	3084	my @queue;
2813		3085
2814	for (;;) {	3086	for (;;) {
2815	if ($self->{check_size}) {	3087	if ($self->{check_size}) {
2816	# heuristic: check containers last	3088	#TODO use array-of-depth approach
2817	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3089
		3090	@queue = sort { $a->{visible} <=> $b->{visible} }
2818	for values %{delete $self->{check_size}}	3091	@queue, values %{delete $self->{check_size}};
2819	}	3092	}
2820		3093
2821	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3094	my $widget = pop @queue || last;
2822		3095
		3096	defined $widget->{visible} or last; # do not resize invisible widgets
		3097
2823	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3098	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2824	? @$widget{qw(user_w user_h)}	3099	? @$widget{qw(def_w def_h)}
2825	: $widget->size_request;	3100	: $widget->size_request;
2826		3101
2827	if (delete $widget->{force_alloc}	3102	if (delete $widget->{force_alloc}
2828	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3103	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2829	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3104	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
…		…
2846	$w = 0 if $w < 0;	3121	$w = 0 if $w < 0;
2847	$h = 0 if $h < 0;	3122	$h = 0 if $h < 0;
2848		3123
2849	$widget->{w} = $w;	3124	$widget->{w} = $w;
2850	$widget->{h} = $h;	3125	$widget->{h} = $h;
2851	$widget->size_allocate ($w, $h);
2852	$widget->emit (size_allocate => $w, $h);	3126	$widget->emit (size_allocate => $w, $h);
2853	}	3127	}
2854	}	3128	}
2855		3129
2856	while ($self->{post_alloc_hook}) {	3130	while ($self->{post_alloc_hook}) {
…		…
2862	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3136	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2863	glClear GL_COLOR_BUFFER_BIT;	3137	glClear GL_COLOR_BUFFER_BIT;
2864		3138
2865	glMatrixMode GL_PROJECTION;	3139	glMatrixMode GL_PROJECTION;
2866	glLoadIdentity;	3140	glLoadIdentity;
2867	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3141	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2868	glMatrixMode GL_MODELVIEW;	3142	glMatrixMode GL_MODELVIEW;
2869	glLoadIdentity;	3143	glLoadIdentity;
2870		3144
2871	$self->_draw;	3145	$self->_draw;
2872	}	3146	}
…		…
2874	#############################################################################	3148	#############################################################################
2875		3149
2876	package CFClient::UI;	3150	package CFClient::UI;
2877		3151
2878	$ROOT = new CFClient::UI::Root;	3152	$ROOT = new CFClient::UI::Root;
2879	$TOOLTIP = new CFClient::UI::Tooltip;	3153	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2880		3154
2881	1	3155	1
2882		3156

Diff Legend

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