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.202 by root, Sun May 14 20:51:19 2006 UTC vs.
Revision 1.249 by root, Sun May 28 01:40:02 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;
16		18
17	our %WIDGET; # all widgets, weak-referenced	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	}
18		38
19	sub check_tooltip {	39	sub check_tooltip {
20	if (!$GRAB) {	40	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
31	$TOOLTIP->set_tooltip_from ($widget);	51	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	52	$TOOLTIP->show;
33		53
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35		55
36	if ($x + $TOOLTIP->{w} > $::WIDTH) {
37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38	}	57	if $x + $TOOLTIP->{w} > $::WIDTH;
39		58
40	$TOOLTIP->move ($x, $y);	59	$TOOLTIP->move ($x, $y);
41	$TOOLTIP->check_size;	60	$TOOLTIP->check_size;
42	$TOOLTIP->update;	61	$TOOLTIP->update;
43	}	62	}
…		…
51	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
52	}	71	}
53		72
54	# class methods for events	73	# class methods for events
55	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
56	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
57	if $FOCUS;	76	if $FOCUS;
58	}	77	}
59		78
60	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
61	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
62	if $FOCUS;	81	if $FOCUS;
63	}	82	}
64		83
65	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
66	my ($ev) = @_;	85	my ($ev) = @_;
…		…
75	check_tooltip;	94	check_tooltip;
76	}	95	}
77		96
78	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
79		98
80	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
82	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83	}
84	}	101	}
85		102
86	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
87	my ($ev) = @_;	104	my ($ev) = @_;
88	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
89		106
90	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91		108
92	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93		110
94	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
96	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97	}
98		113
99	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
100	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
101	$grab->update if $grab;	116	$grab->update if $grab;
102	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
118	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
119		134
120	check_tooltip;	135	check_tooltip;
121	}	136	}
122		137
123	if ($HOVER) {
124	($x, $y) = $HOVER->coord2local ($x, $y);
125	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126	}	139	if $HOVER;
127	}	140	}
128		141
129	# convert position array to integers	142	# convert position array to integers
130	sub harmonize {	143	sub harmonize {
131	my ($vals) = @_;	144	my ($vals) = @_;
…		…
137	$rem += $_ - $i;	150	$rem += $_ - $i;
138	$_ = $i;	151	$_ = $i;
139	}	152	}
140	}	153	}
141		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
142	# call when resolution changes etc.	171	# call when resolution changes etc.
143	sub rescale_widgets {	172	sub rescale_widgets {
144	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
145		174
146	for my $widget (values %WIDGET) {	175	for my $widget (values %WIDGET) {
147	if ($widget->{toplevel}) {	176	if ($widget->{is_toplevel}) {
148	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
149	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
151	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	180	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
153	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	181	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
154	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	182	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
155	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
156	}	183	}
157
158	$widget->reconfigure;
159	}	184	}
		185
		186	reconfigure_widgets;
160	}	187	}
161		188
162	#############################################################################	189	#############################################################################
163		190
164	package CFClient::UI::Base;	191	package CFClient::UI::Base;
…		…
177	can_events => 1,	204	can_events => 1,
178	@_	205	@_
179	}, $class;	206	}, $class;
180		207
181	for (keys %$self) {	208	for (keys %$self) {
182	if (/^connect_(.*)$/) {	209	if (/^on_(.*)$/) {
183	$self->connect ($1 => delete $self->{$_});	210	$self->connect ($1 => delete $self->{$_});
184	}	211	}
185	}	212	}
186		213
187	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
188		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
189	$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	}
190	}	234	}
191		235
192	sub destroy {	236	sub destroy {
193	my ($self) = @_;	237	my ($self) = @_;
194		238
…		…
199	sub show {	243	sub show {
200	my ($self) = @_;	244	my ($self) = @_;
201		245
202	return if $self->{parent};	246	return if $self->{parent};
203		247
204	$self->{toplevel} = 1;
205	$CFClient::UI::ROOT->add ($self);	248	$CFClient::UI::ROOT->add ($self);
206	}	249	}
207		250
208	sub hide {	251	sub center {
209	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};
210		283
211	undef $GRAB if $GRAB == $self;	284	undef $GRAB if $GRAB == $self;
212	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;
213		299
214	$self->{parent}->remove ($self)	300	$self->{parent}->remove ($self)
215	if $self->{parent};	301	if $self->{parent};
216	}	302	}
217		303
…		…
226	}	312	}
227		313
228	sub set_size {	314	sub set_size {
229	my ($self, $w, $h) = @_;	315	my ($self, $w, $h) = @_;
230		316
231	$self->{user_w} = $w;	317	$self->{def_w} = $w;
232	$self->{user_h} = $h;	318	$self->{def_h} = $h;
233		319
234	$self->check_size;	320	$self->check_size;
235	}	321	}
236		322
237	sub size_request {	323	sub size_request {
…		…
284		370
285	delete $self->{max_w}; $self->{max_w} = $w if $w;	371	delete $self->{max_w}; $self->{max_w} = $w if $w;
286	delete $self->{max_h}; $self->{max_h} = $h if $h;	372	delete $self->{max_h}; $self->{max_h} = $h if $h;
287	}	373	}
288		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	}
		389	}
		390
289	# translate global coordinates to local coordinate system	391	# translate global coordinates to local coordinate system
290	sub coord2local {	392	sub coord2local {
291	my ($self, $x, $y) = @_;	393	my ($self, $x, $y) = @_;
292		394
293	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	395	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
…		…
306	return if $FOCUS == $self;	408	return if $FOCUS == $self;
307	return unless $self->{can_focus};	409	return unless $self->{can_focus};
308		410
309	my $focus = $FOCUS; $FOCUS = $self;	411	my $focus = $FOCUS; $FOCUS = $self;
310		412
311	$self->emit (focus_in => $focus);	413	$self->_emit (focus_in => $focus);
312		414
313	$focus->update if $focus;	415	$focus->update if $focus;
314	$FOCUS->update;	416	$FOCUS->update;
315	}	417	}
316		418
…		…
319		421
320	return unless $FOCUS == $self;	422	return unless $FOCUS == $self;
321		423
322	my $focus = $FOCUS; undef $FOCUS;	424	my $focus = $FOCUS; undef $FOCUS;
323		425
324	$self->emit (focus_out => $focus);	426	$self->_emit (focus_out => $focus);
325		427
326	$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;
327	}	432	}
328		433
329	sub mouse_motion { }	434	sub mouse_motion { }
330	sub button_up { }	435	sub button_up { }
331	sub key_down { }	436	sub key_down { }
332	sub key_up { }	437	sub key_up { }
333		438
334	sub button_down {	439	sub button_down {
335	my ($self, $ev, $x, $y) = @_;	440	my ($self, $ev, $x, $y) = @_;
336		441
337	$self->focus_in;	442	$self->focus_in;
…		…
371	if ($ENV{PCLIENT_DEBUG}) {	476	if ($ENV{PCLIENT_DEBUG}) {
372	glPushMatrix;	477	glPushMatrix;
373	glColor 1, 1, 0, 1;	478	glColor 1, 1, 0, 1;
374	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
375	glBegin GL_LINE_LOOP;	480	glBegin GL_LINE_LOOP;
376	glVertex 0 , 0;	481	glVertex 0 , 0;
377	glVertex $self->{w}, 0;	482	glVertex $self->{w} - 1, 0;
378	glVertex $self->{w}, $self->{h};	483	glVertex $self->{w} - 1, $self->{h} - 1;
379	glVertex 0 , $self->{h};	484	glVertex 0 , $self->{h} - 1;
380	glEnd;	485	glEnd;
381	glPopMatrix;	486	glPopMatrix;
382	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;
383	}	488	}
384	}	489	}
385		490
386	sub _draw {	491	sub _draw {
387	my ($self) = @_;	492	my ($self) = @_;
…		…
404	sub set_parent {	509	sub set_parent {
405	my ($self, $parent) = @_;	510	my ($self, $parent) = @_;
406		511
407	Scalar::Util::weaken ($self->{parent} = $parent);	512	Scalar::Util::weaken ($self->{parent} = $parent);
408		513
409	# TODO: req_w _does_change after ->reconfigure	514	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
		515
410	$self->check_size	516	$self->check_size;
411	unless exists $self->{req_w};
412	}	517	}
413		518
414	sub check_size {	519	sub check_size {
415	my ($self, $forced) = @_;	520	my ($self, $forced) = @_;
416		521
…		…
429	my ($self, $signal, $cb) = @_;	534	my ($self, $signal, $cb) = @_;
430		535
431	push @{ $self->{signal_cb}{$signal} }, $cb;	536	push @{ $self->{signal_cb}{$signal} }, $cb;
432	}	537	}
433		538
		539	sub _emit {
		540	my ($self, $signal, @args) = @_;
		541
		542	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		543	}
		544
434	sub emit {	545	sub emit {
435	my ($self, $signal, @args) = @_;	546	my ($self, $signal, @args) = @_;
436		547
437	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) = @_;
438	}	554	}
439		555
440	sub DESTROY {	556	sub DESTROY {
441	my ($self) = @_;	557	my ($self) = @_;
442		558
…		…
457	my $class = shift;	573	my $class = shift;
458		574
459	# range [value, low, high, page]	575	# range [value, low, high, page]
460		576
461	$class->SUPER::new (	577	$class->SUPER::new (
462	bg => [0, 0, 0, 0.2],	578	#bg => [0, 0, 0, 0.2],
463	active_bg => [1, 1, 1, 0.5],	579	#active_bg => [1, 1, 1, 0.5],
464	@_	580	@_
465	)	581	)
466	}	582	}
467		583
468	sub _draw {	584	sub _draw {
469	my ($self) = @_;	585	my ($self) = @_;
470		586
		587	my $color = $FOCUS == $self && $self->{active_bg}
		588	? $self->{active_bg}
		589	: $self->{bg};
		590
		591	if ($color && (@$color < 4 || $color->[3])) {
471	my ($w, $h) = @$self{qw(w h)};	592	my ($w, $h) = @$self{qw(w h)};
472		593
473	glEnable GL_BLEND;	594	glEnable GL_BLEND;
474	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	595	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
475	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	596	glColor @$color;
476		597
477	glBegin GL_QUADS;	598	glBegin GL_QUADS;
478	glVertex 0 , 0;	599	glVertex 0 , 0;
479	glVertex 0 , $h;	600	glVertex 0 , $h;
480	glVertex $w, $h;	601	glVertex $w, $h;
481	glVertex $w, 0;	602	glVertex $w, 0;
482	glEnd;	603	glEnd;
483		604
484	glDisable GL_BLEND;	605	glDisable GL_BLEND;
		606	}
485	}	607	}
486		608
487	#############################################################################	609	#############################################################################
488		610
489	package CFClient::UI::Empty;	611	package CFClient::UI::Empty;
…		…
549	delete $child->{parent};	671	delete $child->{parent};
550	$child->hide;	672	$child->hide;
551		673
552	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	674	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
553		675
554	$self->check_size;	676	$self->check_size (1);
555	$self->update;	677	$self->update;
556	}	678	}
557		679
558	sub clear {	680	sub clear {
559	my ($self) = @_;	681	my ($self) = @_;
…		…
673	$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 {
674	glClearColor 0, 0, 0, 0;	796	glClearColor 0, 0, 0, 0;
675	glClear GL_COLOR_BUFFER_BIT;	797	glClear GL_COLOR_BUFFER_BIT;
676		798
677	$self->_render;	799	$self->_render;
678	# glColorMask 1, 1, 1, 0;
679	# glEnable GL_BLEND;
680	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
681	# glRasterPos 0, 0;
682	# glCopyPixels 0, 0, $self->{w}, $self->{h};
683	# glDisable GL_BLEND;
684	# glColorMask 1, 1, 1, 1;
685	};	800	};
686	}	801	}
687		802
688	sub _draw {	803	sub _draw {
689	my ($self) = @_;	804	my ($self) = @_;
…		…
693	my $tex = $self->{texture}	808	my $tex = $self->{texture}
694	or return;	809	or return;
695		810
696	glEnable GL_TEXTURE_2D;	811	glEnable GL_TEXTURE_2D;
697	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	812	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
698	glColor 0, 0, 0, 1;	813	glColor 1, 1, 1, 1;
699		814
700	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	815	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
701		816
702	glDisable GL_TEXTURE_2D;	817	glDisable GL_TEXTURE_2D;
703	}	818	}
…		…
706		821
707	package CFClient::UI::ViewPort;	822	package CFClient::UI::ViewPort;
708		823
709	our @ISA = CFClient::UI::Window::;	824	our @ISA = CFClient::UI::Window::;
710		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
711	sub size_request {	836	sub size_request {
712	my ($self) = @_;	837	my ($self) = @_;
713		838
714	@$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)};
715	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
716		840
717	@$self{qw(child_w child_h)}	841	$w = 10 if $self->{scroll_x};
		842	$h = 10 if $self->{scroll_y};
		843
		844	($w, $h)
718	}	845	}
719		846
720	sub size_allocate {	847	sub size_allocate {
721	my ($self, $w, $h) = @_;	848	my ($self, $w, $h) = @_;
722		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);
723	$self->update;	854	$self->update;
724	}	855	}
725		856
726	sub set_offset {	857	sub set_offset {
727	my ($self, $x, $y) = @_;	858	my ($self, $x, $y) = @_;
…		…
778	my $class = shift;	909	my $class = shift;
779		910
780	my $self;	911	my $self;
781		912
782	my $slider = new CFClient::UI::Slider	913	my $slider = new CFClient::UI::Slider
783	vertical => 1,	914	vertical => 1,
784	range => [0, 0, 1, 0.01], # HACK fix	915	range => [0, 0, 1, 0.01], # HACK fix
785	connect_changed => sub {	916	on_changed => sub {
786	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	917	$self->{vp}->set_offset (0, $_[1]);
787	},	918	},
788	;	919	;
789		920
790	$self = $class->SUPER::new (	921	$self = $class->SUPER::new (
791	vp => (new CFClient::UI::ViewPort),	922	vp => (new CFClient::UI::ViewPort expand => 1),
792	slider => $slider,	923	slider => $slider,
793	@_,	924	@_,
794	);	925	);
795		926
796	$self->{vp}->add ($self->{scrolled});	927	$self->{vp}->add ($self->{scrolled});
797	$self->add ($self->{vp});	928	$self->add ($self->{vp});
798	$self->add ($self->{slider});	929	$self->add ($self->{slider});
799		930
800	$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]);
801	}	951	}
802		952
803	#TODO# update range on size_allocate depending on child	953	#TODO# update range on size_allocate depending on child
804	# update viewport offset on scroll	954	# update viewport offset on scroll
805		955
…		…
856	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);
857		1007
858	sub new {	1008	sub new {
859	my $class = shift;	1009	my $class = shift;
860		1010
861	# TODO: user_x, user_y, overwrite moveto?
862
863	my $self = $class->SUPER::new (	1011	my $self = $class->SUPER::new (
864	bg => [1, 1, 1, 1],	1012	bg => [1, 1, 1, 1],
865	border_bg => [1, 1, 1, 1],	1013	border_bg => [1, 1, 1, 1],
866	border => 0.6,	1014	border => 0.6,
867	toplevel => 1,	1015	is_toplevel => 1,
868	can_events => 1,	1016	can_events => 1,
869	@_	1017	@_
870	);	1018	);
871		1019
872	$self->{title} &&= new CFClient::UI::Label	1020	$self->{title} &&= new CFClient::UI::Label
873	align => 0,	1021	align => 0,
…		…
897	my ($self, $w, $h) = @_;	1045	my ($self, $w, $h) = @_;
898		1046
899	$h -= List::Util::max 0, $self->border * 2;	1047	$h -= List::Util::max 0, $self->border * 2;
900	$w -= List::Util::max 0, $self->border * 2;	1048	$w -= List::Util::max 0, $self->border * 2;
901		1049
902	$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)
903	if $self->{title};	1051	if $self->{title};
904		1052
905	$self->child->configure ($self->border, $self->border, $w, $h);	1053	$self->child->configure ($self->border, $self->border, $w, $h);
906	}	1054	}
907		1055
…		…
926	my ($ev, $x, $y) = @_;	1074	my ($ev, $x, $y) = @_;
927		1075
928	my $dx = $ev->{x} - $ox;	1076	my $dx = $ev->{x} - $ox;
929	my $dy = $ev->{y} - $oy;	1077	my $dy = $ev->{y} - $oy;
930		1078
		1079	$self->{user_x} = $wx + $dx * $mx;
		1080	$self->{user_y} = $wy + $dy * $my;
931	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1081	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
932	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1082	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
933	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1083	$self->move ($self->{user_x}, $self->{user_y});
934	$self->check_size;	1084	$self->check_size;
935	};	1085	};
936		1086
937	} elsif ($lr ^ $td) {	1087	} elsif ($lr ^ $td) {
938	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
941	$self->{motion} = sub {	1091	$self->{motion} = sub {
942	my ($ev, $x, $y) = @_;	1092	my ($ev, $x, $y) = @_;
943		1093
944	($x, $y) = ($ev->{x}, $ev->{y});	1094	($x, $y) = ($ev->{x}, $ev->{y});
945		1095
946	$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});
947	$self->update;	1100	$self->update;
948	};	1101	};
949	}	1102	}
950	}	1103	}
951		1104
…		…
1013	sub new {	1166	sub new {
1014	my $class = shift;	1167	my $class = shift;
1015		1168
1016	$class->SUPER::new (	1169	$class->SUPER::new (
1017	col_expand => [],	1170	col_expand => [],
1018	@_	1171	@_,
1019	)	1172	)
		1173	}
		1174
		1175	sub children {
		1176	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1020	}	1177	}
1021		1178
1022	sub add {	1179	sub add {
1023	my ($self, $x, $y, $child) = @_;	1180	my ($self, $x, $y, $child) = @_;
1024		1181
1025	$child->set_parent ($self);	1182	$child->set_parent ($self);
1026	$self->{children}[$y][$x] = $child;	1183	$self->{children}[$y][$x] = $child;
1027		1184
1028	$child->check_size;	1185	$self->check_size (1);
1029	}	1186	}
1030		1187
1031	sub children {
1032	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1033	}
1034
1035	# 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?
1036	sub clear {	1189	sub clear {
1037	my ($self) = @_;	1190	my ($self) = @_;
1038		1191
1039	my @children = $self->children;	1192	my @children = $self->children;
1040	delete $self->{children};	1193	delete $self->{children};
…		…
1042	for (@children) {	1195	for (@children) {
1043	delete $_->{parent};	1196	delete $_->{parent};
1044	$_->hide;	1197	$_->hide;
1045	}	1198	}
1046		1199
		1200	$self->check_size (1);
1047	$self->update;	1201	$self->update;
1048	}	1202	}
1049		1203
1050	sub get_wh {	1204	sub get_wh {
1051	my ($self) = @_;	1205	my ($self) = @_;
…		…
1083	sub size_allocate {	1237	sub size_allocate {
1084	my ($self, $w, $h) = @_;	1238	my ($self, $w, $h) = @_;
1085		1239
1086	my ($ws, $hs) = $self->get_wh;	1240	my ($ws, $hs) = $self->get_wh;
1087		1241
1088	my $req_w = sum @$ws;	1242	my $req_w = (sum @$ws) || 1;
1089	my $req_h = sum @$hs;	1243	my $req_h = (sum @$hs) || 1;
1090		1244
1091	# TODO: nicer code && do row_expand	1245	# TODO: nicer code && do row_expand
1092	my @col_expand = @{$self->{col_expand}};	1246	my @col_expand = @{$self->{col_expand}};
1093	@col_expand = (1) x @$ws unless @col_expand;	1247	@col_expand = (1) x @$ws unless @col_expand;
1094	my $col_expand = (sum @col_expand) || 1;	1248	my $col_expand = (sum @col_expand) || 1;
…		…
1148	}	1302	}
1149	}	1303	}
1150		1304
1151	#############################################################################	1305	#############################################################################
1152		1306
1153	package CFClient::UI::HBox;	1307	package CFClient::UI::Box;
1154
1155	# TODO: wrap into common Box base class
1156		1308
1157	our @ISA = CFClient::UI::Container::;	1309	our @ISA = CFClient::UI::Container::;
1158		1310
1159	sub size_request {	1311	sub size_request {
1160	my ($self) = @_;	1312	my ($self) = @_;
1161		1313
1162	my @alloc = map [$_->size_request], @{$self->{children}};	1314	$self->{vertical}
1163		1315	? (
1164	(	1316	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1165	(List::Util::sum map $_->[0], @alloc),	1317	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1166	(List::Util::max map $_->[1], @alloc),	1318	)
1167	)	1319	: (
		1320	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1321	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1322	)
1168	}	1323	}
1169		1324
1170	sub size_allocate {	1325	sub size_allocate {
1171	my ($self, $w, $h) = @_;	1326	my ($self, $w, $h) = @_;
1172		1327
1173	($h, $w) = ($w, $h);	1328	my $space = $self->{vertical} ? $h : $w;
1174
1175	my $children = $self->{children};	1329	my $children = $self->{children};
1176		1330
1177	my @h = map $_->{req_w}, @$children;	1331	my @req;
1178		1332
1179	my $req_h = List::Util::sum @h;	1333	if ($self->{homogeneous}) {
1180		1334	@req = ($space / (@$children || 1)) x @$children;
1181	if ($req_h > $h) {
1182	# ah well, not enough space
1183	$_ *= $h / $req_h for @h;
1184	} 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 {
1185	my $exp = List::Util::sum map $_->{expand}, @$children;	1343	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1186	$exp ||= 1;
1187		1344
		1345	$space = ($space - $req) / $expand; # remaining space to give away
		1346
		1347	$req[$_] += $space * $children->[$_]{expand}
1188	for (0 .. $#$children) {	1348	for 0 .. $#$children;
1189	my $child = $children->[$_];
1190
1191	my $alloc_h = $h[$_];
1192	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1193	$h[$_] = $alloc_h;
1194	}	1349	}
1195	}	1350	}
1196		1351
1197	CFClient::UI::harmonize \@h;	1352	CFClient::UI::harmonize \@req;
1198		1353
1199	my $y = 0;	1354	my $pos = 0;
1200	for (0 .. $#$children) {	1355	for (0 .. $#$children) {
1201	my $child = $children->[$_];
1202	my $h = $h[$_];	1356	my $alloc = $req[$_];
1203	$child->configure ($y, 0, $h, $w);	1357	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1204		1358
1205	$y += $h;	1359	$pos += $alloc;
1206	}	1360	}
1207		1361
1208	1	1362	1
1209	}	1363	}
1210		1364
1211	#############################################################################	1365	#############################################################################
1212		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
1213	package CFClient::UI::VBox;	1382	package CFClient::UI::VBox;
1214		1383
1215	# TODO: wrap into common Box base class
1216
1217	our @ISA = CFClient::UI::Container::;	1384	our @ISA = CFClient::UI::Box::;
1218		1385
1219	sub size_request {	1386	sub new {
1220	my ($self) = @_;	1387	my $class = shift;
1221		1388
1222	my @alloc = map [$_->size_request], @{$self->{children}};	1389	$class->SUPER::new (
1223		1390	vertical => 1,
1224	(	1391	@_,
1225	(List::Util::max map $_->[0], @alloc),
1226	(List::Util::sum map $_->[1], @alloc),
1227	)	1392	)
1228	}	1393	}
1229		1394
1230	sub size_allocate {
1231	my ($self, $w, $h) = @_;
1232
1233	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1234
1235	my $children = $self->{children};
1236
1237	my @h = map $_->{req_h}, @$children;
1238
1239	my $req_h = List::Util::sum @h;
1240
1241	if ($req_h > $h) {
1242	# ah well, not enough space
1243	$_ *= $h / $req_h for @h;
1244	} else {
1245	my $exp = List::Util::sum map $_->{expand}, @$children;
1246	$exp ||= 1;
1247
1248	for (0 .. $#$children) {
1249	my $child = $children->[$_];
1250
1251	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1252	}
1253	}
1254
1255	CFClient::UI::harmonize \@h;
1256
1257	my $y = 0;
1258	for (0 .. $#$children) {
1259	my $child = $children->[$_];
1260	my $h = $h[$_];
1261	$child->configure (0, $y, $w, $h);
1262
1263	$y += $h;
1264	}
1265
1266	1
1267	}
1268
1269	#############################################################################	1395	#############################################################################
1270		1396
1271	package CFClient::UI::Label;	1397	package CFClient::UI::Label;
1272		1398
1273	our @ISA = CFClient::UI::Base::;	1399	our @ISA = CFClient::UI::DrawBG::;
1274		1400
1275	use CFClient::OpenGL;	1401	use CFClient::OpenGL;
1276		1402
1277	sub new {	1403	sub new {
1278	my ($class, %arg) = @_;	1404	my ($class, %arg) = @_;
1279		1405
1280	my $self = $class->SUPER::new (	1406	my $self = $class->SUPER::new (
1281	fg => [1, 1, 1],	1407	fg => [1, 1, 1],
		1408	#bg => none
		1409	#active_bg => none
1282	#font => default_font	1410	#font => default_font
1283	#text => initial text	1411	#text => initial text
1284	#markup => initial narkup	1412	#markup => initial narkup
		1413	#max_w => maximum pixel width
		1414	ellipsise => 3, # end
1285	layout => (new CFClient::Layout),	1415	layout => (new CFClient::Layout),
1286	fontsize => 1,	1416	fontsize => 1,
1287	align => -1,	1417	align => -1,
1288	valign => -1,	1418	valign => -1,
1289	padding => 2,	1419	padding => 2,
…		…
1304	}	1434	}
1305		1435
1306	$self	1436	$self
1307	}	1437	}
1308		1438
1309	sub escape {	1439	sub escape($) {
1310	local $_ = $_[1];	1440	local $_ = $_[0];
1311		1441
1312	s/&/&amp;/g;	1442	s/&/&amp;/g;
1313	s/>/&gt;/g;	1443	s/>/&gt;/g;
1314	s/</&lt;/g;	1444	s/</&lt;/g;
1315		1445
1316	$_[1]	1446	$_
1317	}	1447	}
1318		1448
1319	sub update {	1449	sub update {
1320	my ($self) = @_;	1450	my ($self) = @_;
1321		1451
…		…
1354	sub size_request {	1484	sub size_request {
1355	my ($self) = @_;	1485	my ($self) = @_;
1356		1486
1357	$self->{layout}->set_font ($self->{font}) if $self->{font};	1487	$self->{layout}->set_font ($self->{font}) if $self->{font};
1358	$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});
1359	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1491	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1360		1492
1361	my ($w, $h) = $self->{layout}->size;	1493	my ($w, $h) = $self->{layout}->size;
1362		1494
1363	if (exists $self->{template}) {	1495	if (exists $self->{template}) {
…		…
1393	}	1525	}
1394		1526
1395	sub _draw {	1527	sub _draw {
1396	my ($self) = @_;	1528	my ($self) = @_;
1397		1529
		1530	$self->SUPER::_draw; # draw background, if applicable
		1531
1398	my $tex = $self->{texture} ||= do {	1532	my $tex = $self->{texture} ||= do {
1399	$self->{layout}->set_foreground (@{$self->{fg}});	1533	$self->{layout}->set_foreground (@{$self->{fg}});
1400	$self->{layout}->set_font ($self->{font}) if $self->{font};	1534	$self->{layout}->set_font ($self->{font}) if $self->{font};
1401	$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});
1402	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1538	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1403		1539
1404	my $tex = new_from_layout CFClient::Texture $self->{layout};	1540	my $tex = new_from_layout CFClient::Texture $self->{layout};
1405		1541
1406	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1542	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1407	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1543	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1408	: ($self->{w} - $tex->{w}) * 0.5;	1544	: ($self->{w} - $tex->{w}) * 0.5);
1409		1545
1410	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1546	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1411	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1547	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1412	: ($self->{h} - $tex->{h}) * 0.5;	1548	: ($self->{h} - $tex->{h}) * 0.5);
1413		1549
1414	$tex	1550	$tex
1415	};	1551	};
1416		1552
1417	glEnable GL_TEXTURE_2D;	1553	glEnable GL_TEXTURE_2D;
…		…
1445	active_fg => [0, 0, 0],	1581	active_fg => [0, 0, 0],
1446	can_hover => 1,	1582	can_hover => 1,
1447	can_focus => 1,	1583	can_focus => 1,
1448	valign => 0,	1584	valign => 0,
1449	can_events => 1,	1585	can_events => 1,
		1586	#text => ...
1450	@_	1587	@_
1451	)	1588	)
1452	}	1589	}
1453		1590
1454	sub _set_text {	1591	sub _set_text {
…		…
1464	$self->{text} = $text;	1601	$self->{text} = $text;
1465		1602
1466	$text =~ s/./*/g if $self->{hidden};	1603	$text =~ s/./*/g if $self->{hidden};
1467	$self->{layout}->set_text ("$text ");	1604	$self->{layout}->set_text ("$text ");
1468		1605
1469	$self->emit (changed => $self->{text});	1606	$self->_emit (changed => $self->{text});
1470	}	1607	}
1471		1608
1472	sub set_text {	1609	sub set_text {
1473	my ($self, $text) = @_;	1610	my ($self, $text) = @_;
1474		1611
1475	$self->{cursor} = length $text;	1612	$self->{cursor} = length $text;
1476	$self->_set_text ($text);	1613	$self->_set_text ($text);
		1614	$self->update;
1477	$self->check_size;	1615	$self->check_size;
1478	$self->update;
1479	}	1616	}
1480		1617
1481	sub get_text {	1618	sub get_text {
1482	$_[0]{text}	1619	$_[0]{text}
1483	}	1620	}
…		…
1486	my ($self) = @_;	1623	my ($self) = @_;
1487		1624
1488	my ($w, $h) = $self->SUPER::size_request;	1625	my ($w, $h) = $self->SUPER::size_request;
1489		1626
1490	($w + 1, $h) # add 1 for cursor	1627	($w + 1, $h) # add 1 for cursor
1491	}
1492
1493	sub size_allocate {
1494	my ($self, $w, $h) = @_;
1495
1496	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1497	}	1628	}
1498		1629
1499	sub key_down {	1630	sub key_down {
1500	my ($self, $ev) = @_;	1631	my ($self, $ev) = @_;
1501		1632
…		…
1516	} elsif ($sym == CFClient::SDLK_HOME) {	1647	} elsif ($sym == CFClient::SDLK_HOME) {
1517	$self->{cursor} = 0;	1648	$self->{cursor} = 0;
1518	} elsif ($sym == CFClient::SDLK_END) {	1649	} elsif ($sym == CFClient::SDLK_END) {
1519	$self->{cursor} = length $text;	1650	$self->{cursor} = length $text;
1520	} elsif ($uni == 27) {	1651	} elsif ($uni == 27) {
1521	$self->emit ('escape');	1652	$self->_emit ('escape');
1522	} elsif ($uni) {	1653	} elsif ($uni) {
1523	substr $text, $self->{cursor}++, 0, chr $uni;	1654	substr $text, $self->{cursor}++, 0, chr $uni;
1524	}	1655	}
1525		1656
1526	$self->_set_text ($text);	1657	$self->_set_text ($text);
1527	$self->update;	1658	$self->update;
		1659	$self->check_size;
1528	}	1660	}
1529		1661
1530	sub focus_in {	1662	sub focus_in {
1531	my ($self) = @_;	1663	my ($self) = @_;
1532		1664
…		…
1612	if ($sym == 13) {	1744	if ($sym == 13) {
1613	unshift @{$self->{history}},	1745	unshift @{$self->{history}},
1614	my $txt = $self->get_text;	1746	my $txt = $self->get_text;
1615	$self->{history_pointer} = -1;	1747	$self->{history_pointer} = -1;
1616	$self->{history_saveback} = '';	1748	$self->{history_saveback} = '';
1617	$self->emit (activate => $txt);	1749	$self->_emit (activate => $txt);
1618	$self->update;	1750	$self->update;
1619		1751
1620	} elsif ($sym == CFClient::SDLK_UP) {	1752	} elsif ($sym == CFClient::SDLK_UP) {
1621	if ($self->{history_pointer} < 0) {	1753	if ($self->{history_pointer} < 0) {
1622	$self->{history_saveback} = $self->get_text;	1754	$self->{history_saveback} = $self->get_text;
…		…
1661	my $class = shift;	1793	my $class = shift;
1662		1794
1663	$class->SUPER::new (	1795	$class->SUPER::new (
1664	padding => 4,	1796	padding => 4,
1665	fg => [1, 1, 1],	1797	fg => [1, 1, 1],
1666	bg => [1, 1, 1, 0.2],
1667	active_fg => [0, 0, 1],	1798	active_fg => [0, 0, 1],
1668	can_hover => 1,	1799	can_hover => 1,
1669	align => 0,	1800	align => 0,
1670	valign => 0,	1801	valign => 0,
1671	can_events => 1,	1802	can_events => 1,
1672	@_	1803	@_
1673	)	1804	)
1674	}	1805	}
1675		1806
		1807	sub activate { }
		1808
1676	sub button_up {	1809	sub button_up {
1677	my ($self, $ev, $x, $y) = @_;	1810	my ($self, $ev, $x, $y) = @_;
1678		1811
		1812	$self->emit ("activate")
1679	if ($x >= 0 && $x < $self->{w}	1813	if $x >= 0 && $x < $self->{w}
1680	&& $y >= 0 && $y < $self->{h}) {	1814	&& $y >= 0 && $y < $self->{h};
1681	$self->emit ("activate");
1682	}
1683	}	1815	}
1684		1816
1685	sub _draw {	1817	sub _draw {
1686	my ($self) = @_;	1818	my ($self) = @_;
1687		1819
…		…
1719		1851
1720	$class->SUPER::new (	1852	$class->SUPER::new (
1721	padding => 2,	1853	padding => 2,
1722	fg => [1, 1, 1],	1854	fg => [1, 1, 1],
1723	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],
1724	state => 0,	1858	state => 0,
1725	can_hover => 1,	1859	can_hover => 1,
1726	@_	1860	@_
1727	)	1861	)
1728	}	1862	}
…		…
1737	my ($self, $ev, $x, $y) = @_;	1871	my ($self, $ev, $x, $y) = @_;
1738		1872
1739	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1873	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1740	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1874	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1741	$self->{state} = !$self->{state};	1875	$self->{state} = !$self->{state};
1742	$self->emit (changed => $self->{state});	1876	$self->_emit (changed => $self->{state});
1743	}	1877	}
1744	}	1878	}
1745		1879
1746	sub _draw {	1880	sub _draw {
1747	my ($self) = @_;	1881	my ($self) = @_;
…		…
2012	qw(s1_slider.png s1_slider_bg.png);	2146	qw(s1_slider.png s1_slider_bg.png);
2013		2147
2014	sub new {	2148	sub new {
2015	my $class = shift;	2149	my $class = shift;
2016		2150
2017	# range [value, low, high, page]	2151	# range [value, low, high, page, unit]
2018		2152
2019	# TODO: 0-width page	2153	# TODO: 0-width page
2020	# TODO: req_w/h are wrong with vertical	2154	# TODO: req_w/h are wrong with vertical
2021	# TODO: calculations are off	2155	# TODO: calculations are off
2022	my $self = $class->SUPER::new (	2156	my $self = $class->SUPER::new (
2023	fg => [1, 1, 1],	2157	fg => [1, 1, 1],
2024	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],
2025	range => [0, 0, 100, 10],	2161	range => [0, 0, 100, 10, 0],
2026	req_w => $::WIDTH / 80,	2162	req_w => $::WIDTH / 80,
2027	req_h => $::WIDTH / 80,	2163	req_h => $::WIDTH / 80,
2028	vertical => 0,	2164	vertical => 0,
2029	can_hover => 1,	2165	can_hover => 1,
2030	inner_pad => 5,	2166	inner_pad => 0.02,
2031	@_	2167	@_
2032	);	2168	);
2033		2169
		2170	$self->set_value ($self->{range}[0]);
		2171	$self->update;
		2172
2034	$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	}
2035	}	2206	}
2036		2207
2037	sub size_request {	2208	sub size_request {
2038	my ($self) = @_;	2209	my ($self) = @_;
2039		2210
…		…
2045		2216
2046	sub button_down {	2217	sub button_down {
2047	my ($self, $ev, $x, $y) = @_;	2218	my ($self, $ev, $x, $y) = @_;
2048		2219
2049	$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
2050	$self->mouse_motion ($ev, $x, $y);	2224	$self->mouse_motion ($ev, $x, $y);
2051	}	2225	}
2052		2226
2053	sub mouse_motion {	2227	sub mouse_motion {
2054	my ($self, $ev, $x, $y) = @_;	2228	my ($self, $ev, $x, $y) = @_;
2055		2229
2056	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
2057	my ($value, $lo, $hi, $page) = @{$self->{range}};	2247	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2248	my $range = ($hi - $page - $lo) || 1e-100;
2058		2249
2059	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2250	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2060		2251
2061	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2252	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2062	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2253	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2063		2254
2064	$x -= $inner_pad_px; # substract the padding	2255	$value = ($value - $lo) / $range;
2065	$x = $x * ($hi - $lo) / $inner_w + $lo;	2256	$value = $value * $self->{scale} + $self->{offset};
2066	$x = $lo if $x < $lo;
2067	$x = $hi - $page if $x > $hi - $page;
2068	$self->{range}[0] = $x;
2069		2257
2070	$self->emit (changed => $x);	2258	$self->{knob_x} = $value - $knob_w * 0.5;
2071	$self->update;	2259	$self->{knob_w} = $knob_w;
2072	}	2260	});
2073	}
2074		2261
2075	# the inner_* stuff is for generating a padding for the slider handle,	2262	$self->SUPER::update;
2076	# so that the handle doesn't leave the texture. This calculation isn't 100%
2077	# correct propably, but it does the job for now
2078	sub _calc_inner_pad_px {
2079	my ($self, $w) = @_;
2080	($w / 100) * $self->{inner_pad} # % to pixels
2081	}	2263	}
2082		2264
2083	sub _draw {	2265	sub _draw {
2084	my ($self) = @_;	2266	my ($self) = @_;
2085		2267
2086	$self->SUPER::_draw ();	2268	$self->SUPER::_draw ();
2087		2269
2088	my ($w, $h) = @$self{qw(w h)};	2270	glScale $self->{w}, $self->{h};
2089		2271
2090	if ($self->{vertical}) {	2272	if ($self->{vertical}) {
2091	# draw a vertical slider like a rotated horizontal slider	2273	# draw a vertical slider like a rotated horizontal slider
2092		2274
		2275	glTranslate 1, 0, 0;
2093	glRotate 90, 0, 0, 1;	2276	glRotate 90, 0, 0, 1;
2094	glTranslate 0, -$self->{w}, 0;
2095
2096	($w, $h) = ($h, $w);
2097	}	2277	}
2098		2278
2099	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2279	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2100	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2280	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2101		2281
2102	my ($value, $lo, $hi, $page) = @{$self->{range}};
2103
2104	$hi = $value + 1 if $lo == $hi;
2105
2106	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2107	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2108
2109	$page = int $page * $inner_w / ($hi - $lo);
2110	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2111
2112	$w -= $page;
2113	$page &= ~1;
2114	glTranslate $page * 0.5, 0, 0;
2115	$page ||= 2;
2116
2117	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2118	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2119
2120	glEnable GL_TEXTURE_2D;	2282	glEnable GL_TEXTURE_2D;
2121	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2283	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2122		2284
2123	# draw background	2285	# draw background
2124	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2286	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2125		2287
2126	# draw handle	2288	# draw handle
2127	$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);
2128		2290
2129	glDisable GL_TEXTURE_2D;	2291	glDisable GL_TEXTURE_2D;
2130	}	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 (@_) }
2131		2334
2132	#############################################################################	2335	#############################################################################
2133		2336
2134	package CFClient::UI::TextView;	2337	package CFClient::UI::TextView;
2135		2338
…		…
2165		2368
2166	$self->{fontsize} = $fontsize;	2369	$self->{fontsize} = $fontsize;
2167	$self->reflow;	2370	$self->reflow;
2168	}	2371	}
2169		2372
2170	sub text_height {
2171	my ($self, $text) = @_;
2172
2173	my $layout = $self->{layout};
2174
2175	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2176	$layout->set_width ($self->{children}[0]{w});
2177	$layout->set_markup ($text);
2178
2179	($layout->size)[1]
2180	}
2181
2182	sub reflow {
2183	my ($self) = @_;
2184
2185	$self->{need_reflow}++;
2186	$self->update;
2187	}
2188
2189	sub size_allocate {	2373	sub size_allocate {
2190	my ($self, $w, $h) = @_;	2374	my ($self, $w, $h) = @_;
2191		2375
2192	$self->SUPER::size_allocate ($w, $h);	2376	$self->SUPER::size_allocate ($w, $h);
2193		2377
…		…
2196	$self->{layout}->set_width ($self->{children}[0]{w});	2380	$self->{layout}->set_width ($self->{children}[0]{w});
2197		2381
2198	$self->reflow;	2382	$self->reflow;
2199	}	2383	}
2200		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
2201	sub add_paragraph {	2419	sub add_paragraph {
2202	my ($self, $color, $text) = @_;	2420	my ($self, $color, $text, $indent) = @_;
2203		2421
2204	#TODO: intelligently "reformat" paragraph	2422	for my $line (split /\n/, $text) {
2205		2423	my ($w, $h) = $self->text_size ($line);
2206	my $height = $self->text_height ($text);
2207
2208	$self->{height} += $height;	2424	$self->{height} += $h;
		2425	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2426	}
2209		2427
2210	push @{$self->{par}}, [$height, $color, $text];
2211
2212	$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]);
2213	$self->{children}[1]->update;
2214	}	2429	}
2215		2430
2216	sub update {	2431	sub update {
2217	my ($self) = @_;	2432	my ($self) = @_;
2218		2433
…		…
2221	return unless $self->{h} > 0;	2436	return unless $self->{h} > 0;
2222		2437
2223	delete $self->{texture};	2438	delete $self->{texture};
2224		2439
2225	$ROOT->on_post_alloc ($self, sub {	2440	$ROOT->on_post_alloc ($self, sub {
		2441	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2442
2226	if (delete $self->{need_reflow}) {	2443	if (delete $self->{need_reflow}) {
2227	my $height = 0;	2444	my $height = 0;
2228		2445
2229	$height += $_->[0] = $self->text_height ($_->[2])	2446	my $layout = $self->{layout};
		2447
		2448	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2449
2230	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	}
2231		2461
2232	$self->{height} = $height;	2462	$self->{height} = $height;
2233		2463
2234	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2464	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2235		2465
2236	delete $self->{texture};	2466	delete $self->{texture};
2237	}	2467	}
2238		2468
2239	$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 {
2240	glClearColor 0, 0, 0, 0;	2470	glClearColor 0.5, 0.5, 0.5, 0;
2241	glClear GL_COLOR_BUFFER_BIT;	2471	glClear GL_COLOR_BUFFER_BIT;
2242		2472
2243	glEnable GL_TEXTURE_2D;
2244	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245
2246	my $top = int $self->{children}[1]{range}[0];	2473	my $top = int $self->{children}[1]{range}[0];
2247		2474
2248	my $y0 = $top;	2475	my $y0 = $top;
2249	my $y1 = $top + $self->{h};	2476	my $y1 = $top + $H;
2250		2477
2251	my $y = 0;	2478	my $y = 0;
2252		2479
2253	my $layout = $self->{layout};	2480	my $layout = $self->{layout};
2254		2481
2255	$layout->set_font ($self->{font}) if $self->{font};	2482	$layout->set_font ($self->{font}) if $self->{font};
2256		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
2257	for my $par (@{$self->{par}}) {	2488	for my $par (@{$self->{par}}) {
2258	my $h = $par->[0];	2489	my $h = $par->[1];
2259		2490
2260	if ($y0 < $y + $h && $y < $y1) {	2491	if ($y0 < $y + $h && $y < $y1) {
2261	$layout->set_foreground (@{ $par->[1] });	2492	$layout->set_foreground (@{ $par->[2] });
		2493	$layout->set_width ($W - $par->[3]);
2262	$layout->set_markup ($par->[2]);	2494	$layout->set_markup ($par->[4]);
2263		2495
2264	my ($W, $H) = $layout->size;	2496	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2265	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;
2266	}	2500	}
2267		2501
2268	$y += $h;	2502	$y += $h;
2269	}	2503	}
2270		2504
2271	glDisable GL_TEXTURE_2D;	2505	glDisable GL_BLEND;
2272	};	2506	};
2273	});	2507	});
2274	}	2508	}
2275		2509
2276	sub _draw {	2510	sub _draw {
2277	my ($self) = @_;	2511	my ($self) = @_;
2278		2512
2279	glEnable GL_TEXTURE_2D;	2513	glEnable GL_TEXTURE_2D;
2280	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2514	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2281	glColor 1, 1, 1, 1;	2515	glColor 1, 1, 1, 1;
2282	$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});
2283	glDisable GL_TEXTURE_2D;	2517	glDisable GL_TEXTURE_2D;
2284		2518
2285	$self->{children}[1]->draw;	2519	$self->{children}[1]->draw;
2286		2520
2287	}	2521	}
…		…
2336		2570
2337	sub new {	2571	sub new {
2338	my $class = shift;	2572	my $class = shift;
2339		2573
2340	my $self = $class->SUPER::new (	2574	my $self = $class->SUPER::new (
2341	state => 0,	2575	state => 0,
2342	connect_activate => \&toggle_flopper,	2576	on_activate => \&toggle_flopper,
2343	@_	2577	@_
2344	);	2578	);
2345		2579
2346	if ($self->{state}) {
2347	$self->{state} = 0;
2348	$self->toggle_flopper;
2349	}
2350
2351	$self	2580	$self
2352	}	2581	}
2353		2582
2354	sub toggle_flopper {	2583	sub toggle_flopper {
2355	my ($self) = @_;	2584	my ($self) = @_;
2356		2585
2357	# TODO: use animation	2586	$self->{other}->toggle_visibility;
2358	if ($self->{state} = !$self->{state}) {
2359	$CFClient::UI::ROOT->add ($self->{other});
2360	$self->{other}->move ($self->coord2global (0, $self->{h}));
2361	$self->emit ("open");
2362	} else {
2363	$CFClient::UI::ROOT->remove ($self->{other});
2364	$self->emit ("close");
2365	}
2366
2367	$self->emit (changed => $self->{state});
2368	}	2587	}
2369		2588
2370	#############################################################################	2589	#############################################################################
2371		2590
2372	package CFClient::UI::Tooltip;	2591	package CFClient::UI::Tooltip;
…		…
2386		2605
2387	sub set_tooltip_from {	2606	sub set_tooltip_from {
2388	my ($self, $widget) = @_;	2607	my ($self, $widget) = @_;
2389		2608
2390	$self->add (new CFClient::UI::Label	2609	$self->add (new CFClient::UI::Label
2391	markup => $widget->{tooltip},	2610	markup => $widget->{tooltip},
2392	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2611	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2393	fontsize => 0.8,	2612	fontsize => 0.8,
2394	fg => [0, 0, 0, 1],	2613	fg => [0, 0, 0, 1],
		2614	ellipsise => 0,
2395	font => ($widget->{tooltip_font} || $::FONT_PROP),	2615	font => ($widget->{tooltip_font} || $::FONT_PROP),
2396	);	2616	);
2397	}	2617	}
2398		2618
2399	sub size_request {	2619	sub size_request {
2400	my ($self) = @_;	2620	my ($self) = @_;
…		…
2446	use CFClient::OpenGL;	2666	use CFClient::OpenGL;
2447		2667
2448	sub new {	2668	sub new {
2449	my $class = shift;	2669	my $class = shift;
2450		2670
2451	$class->SUPER::new (	2671	my $self = $class->SUPER::new (
2452	aspect => 1,	2672	aspect => 1,
		2673	can_events => 0,
2453	@_,	2674	@_,
2454	)	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
2455	}	2692	}
2456		2693
2457	sub size_request {	2694	sub size_request {
2458	(32, 8)	2695	(32, 8)
2459	}	2696	}
2460		2697
		2698	sub update {
		2699	my ($self) = @_;
		2700
		2701	return unless $self->{visible};
		2702
		2703	$self->SUPER::update;
		2704	}
		2705
2461	sub _draw {	2706	sub _draw {
2462	my ($self) = @_;	2707	my ($self) = @_;
2463		2708
2464	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
2465	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2720	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2466		2721
2467	# TODO animation
2468	if ($tex) {	2722	if ($tex) {
2469	glEnable GL_TEXTURE_2D;	2723	glEnable GL_TEXTURE_2D;
2470	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2724	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2471	glColor 1, 1, 1, 1;	2725	glColor 1, 1, 1, 1;
2472	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2726	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2473	glDisable GL_TEXTURE_2D;	2727	glDisable GL_TEXTURE_2D;
2474	}	2728	}
2475	}	2729	}
2476		2730
2477	#############################################################################	2731	sub DESTROY {
		2732	my ($self) = @_;
2478		2733
		2734	$self->{timer}->cancel
		2735	if $self->{timer};
		2736
		2737	$self->SUPER::DESTROY;
		2738	}
		2739
		2740	#############################################################################
		2741
2479	package CFClient::UI::InventoryItem;	2742	package CFClient::UI::Inventory;
2480		2743
2481	our @ISA = CFClient::UI::HBox::;	2744	our @ISA = CFClient::UI::ScrolledWindow::;
2482		2745
2483	sub new {	2746	sub new {
2484	my $class = shift;	2747	my $class = shift;
2485		2748
2486	my %args = @_;
2487
2488	my $item = delete $args{item};
2489
2490	my $desc = $item->{nrof} < 2
2491	? $item->{name}
2492	: "$item->{nrof} $item->{name_pl}";
2493
2494
2495	my $self = $class->SUPER::new (	2749	my $self = $class->SUPER::new (
2496	can_hover => 1,	2750	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2497	can_events => 1,
2498	tooltip => (CFClient::UI::Label->escape ($desc)
2499	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2500	connect_button_down => sub {
2501	my ($self, $ev, $x, $y) = @_;
2502
2503	# todo: maybe put examine on 1? but should just be a tooltip :(
2504	if ($ev->{button} == 1) {
2505	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2506	} elsif ($ev->{button} == 2) {
2507	$::CONN->send ("apply $item->{tag}");
2508	} elsif ($ev->{button} == 3) {
2509	CFClient::UI::Menu->new (
2510	items => [
2511	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2512	[
2513	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514	sub { $::CONN->send ("lock $item->{tag}") },
2515	],
2516	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2517	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2518	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2519	],
2520	)->popup ($ev);
2521	}
2522
2523	1
2524	},
2525	%args
2526	);
2527
2528	$self->add (new CFClient::UI::Face
2529	can_events => 0,
2530	face => $item->{face},
2531	anim => $item->{anim},
2532	animspeed => $item->{animspeed},
2533	);
2534
2535	$self->add (new CFClient::UI::Label
2536	can_events => 0,
2537	text => $desc,
2538	);
2539
2540	$self
2541	}
2542
2543	#############################################################################
2544
2545	package CFClient::UI::Inventory;
2546
2547	our @ISA = CFClient::UI::ScrolledWindow::;
2548
2549	sub new {
2550	my $class = shift;
2551
2552	my $self = $class->SUPER::new (
2553	scrolled => (new CFClient::UI::VBox),
2554	@_,	2751	@_,
2555	);	2752	);
2556		2753
2557	$self	2754	$self
2558	}	2755	}
…		…
2568	or ($a->{name} cmp $b->{name})	2765	or ($a->{name} cmp $b->{name})
2569	} @$items;	2766	} @$items;
2570		2767
2571	$self->{real_items} = \@items;	2768	$self->{real_items} = \@items;
2572		2769
		2770	my $row = 0;
2573	for my $item (@items) {	2771	for my $item (@items) {
2574	my $desc = $item->{nrof} < 2	2772	CFClient::Item::update_widgets $item;
2575	? $item->{name}
2576	: "$item->{nrof} $item->{name_pl}";
2577		2773
2578	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2774	$self->{scrolled}->add (0, $row, $item->{face_widget});
2579	}	2775	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2776	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2580		2777
2581	$self->{scrolled}->add (@items);	2778	$row++;
2582		2779	}
2583	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2584	}
2585
2586	sub size_request {
2587	my ($self) = @_;
2588	($self->{req_w}, $self->{req_h});
2589	}	2780	}
2590		2781
2591	#############################################################################	2782	#############################################################################
2592		2783
2593	package CFClient::UI::Menu;	2784	package CFClient::UI::Menu;
…		…
2628		2819
2629	# 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)
2630	sub popup {	2821	sub popup {
2631	my ($self, $ev) = @_;	2822	my ($self, $ev) = @_;
2632		2823
2633	$self->emit ("popdown");	2824	$self->_emit ("popdown");
2634		2825
2635	# maybe save $GRAB? must be careful about events...	2826	# maybe save $GRAB? must be careful about events...
2636	$GRAB = $self;	2827	$GRAB = $self;
2637	$self->{button} = $ev->{button};	2828	$self->{button} = $ev->{button};
2638		2829
…		…
2653		2844
2654	if ($ev->{button} == $self->{button}) {	2845	if ($ev->{button} == $self->{button}) {
2655	undef $GRAB;	2846	undef $GRAB;
2656	$self->hide;	2847	$self->hide;
2657		2848
2658	$self->emit ("popdown");	2849	$self->_emit ("popdown");
2659	$self->{hover}[1]->() if $self->{hover};	2850	$self->{hover}[1]->() if $self->{hover};
2660	}	2851	}
2661	}	2852	}
2662		2853
2663	#############################################################################	2854	#############################################################################
2664		2855
2665	package CFClient::UI::Statusbox;	2856	package CFClient::UI::Statusbox;
2666		2857
2667	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	}
2668		2868
2669	sub reorder {	2869	sub reorder {
2670	my ($self) = @_;	2870	my ($self) = @_;
2671	my $NOW = time;	2871	my $NOW = time;
2672		2872
…		…
2691	? "<b>$item->{count} ×</b> $item->{text}"	2891	? "<b>$item->{count} ×</b> $item->{text}"
2692	: $item->{text};	2892	: $item->{text};
2693		2893
2694	for ($short) {	2894	for ($short) {
2695	s/^\s+//;	2895	s/^\s+//;
2696	s/\012.*/…/s;	2896	s/\s+/ /g;
2697	my $len = int 40 / $item->{fontsize};
2698	substr $_, $len, length, "…" if $len < length;
2699	}	2897	}
2700		2898
2701	new CFClient::UI::Label	2899	new CFClient::UI::Label
2702	markup => $short,	2900	markup => $short,
2703	tooltip => $item->{tooltip},	2901	tooltip => $item->{tooltip},
2704	tooltip_font => $::FONT_PROP,	2902	tooltip_font => $::FONT_PROP,
2705	tooltip_width => 0.67,	2903	tooltip_width => 0.67,
2706	fontsize => $item->{fontsize},	2904	fontsize => $item->{fontsize} || $self->{fontsize},
		2905	max_w => $::WIDTH * 0.44,
2707	color => $item->{color},	2906	fg => $item->{fg},
2708	can_events => 1,	2907	can_events => 1,
2709	can_hover => 1	2908	can_hover => 1
2710	};	2909	};
2711	}	2910	}
2712		2911
…		…
2717	sub add {	2916	sub add {
2718	my ($self, $text, %arg) = @_;	2917	my ($self, $text, %arg) = @_;
2719		2918
2720	$text =~ s/^\s+//;	2919	$text =~ s/^\s+//;
2721	$text =~ s/\s+$//;	2920	$text =~ s/\s+$//;
		2921
		2922	return unless $text;
2722		2923
2723	my $timeout = time + ((delete $arg{timeout}) || 60);	2924	my $timeout = time + ((delete $arg{timeout}) || 60);
2724		2925
2725	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2926	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2726		2927
…		…
2738	$self->{item}{$group} = {	2939	$self->{item}{$group} = {
2739	id => ++$self->{id},	2940	id => ++$self->{id},
2740	text => $text,	2941	text => $text,
2741	timeout => $timeout,	2942	timeout => $timeout,
2742	tooltip => $text,	2943	tooltip => $text,
2743	fontsize => 0.8,
2744	color => [0.8, 0.8, 0.8, 0.8],	2944	fg => [0.8, 0.8, 0.8, 0.8],
2745	pri => 0,	2945	pri => 0,
2746	count => 1,	2946	count => 1,
2747	%arg,	2947	%arg,
2748	};	2948	};
2749	}	2949	}
2750		2950
2751	$self->reorder;	2951	$self->reorder;
2752	}	2952	}
2753		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
2754	#############################################################################	2964	#############################################################################
2755		2965
2756	package CFClient::UI::Root;	2966	package CFClient::UI::Root;
2757		2967
2758	our @ISA = CFClient::UI::Container::;	2968	our @ISA = CFClient::UI::Container::;
…		…
2761		2971
2762	sub new {	2972	sub new {
2763	my $class = shift;	2973	my $class = shift;
2764		2974
2765	$class->SUPER::new (	2975	$class->SUPER::new (
		2976	visible => 1,
2766	@_,	2977	@_,
2767	)	2978	)
2768	}	2979	}
2769		2980
2770	sub configure {	2981	sub configure {
…		…
2788	}	2999	}
2789		3000
2790	sub size_allocate {	3001	sub size_allocate {
2791	my ($self, $w, $h) = @_;	3002	my ($self, $w, $h) = @_;
2792		3003
2793	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2794	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2795
2796	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2797	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2798
2799	for my $child ($self->children) {	3004	for my $child ($self->children) {
2800	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)};
2801		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
2802	$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;
2803	$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
2804	$child->configure ($X, $Y, $W, $H);	3018	$child->configure ($X, $Y, $W, $H);
2805	}	3019	}
2806	}	3020	}
2807		3021
2808	sub coord2local {	3022	sub coord2local {
…		…
2823	$self->check_size;	3037	$self->check_size;
2824	$::WANT_REFRESH++;	3038	$::WANT_REFRESH++;
2825	}	3039	}
2826		3040
2827	sub add {	3041	sub add {
2828	my ($self, $child) = @_;	3042	my ($self, @children) = @_;
2829		3043
		3044	for my $child (@children) {
		3045	$child->{is_toplevel} = 1;
		3046
2830	# integerise window positions	3047	# integerise window positions
2831	$child->{x} = int $child->{x};	3048	$child->{x} = int $child->{x};
2832	$child->{y} = int $child->{y};	3049	$child->{y} = int $child->{y};
		3050	}
2833		3051
2834	$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	}
2835	}	3071	}
2836		3072
2837	sub on_refresh {	3073	sub on_refresh {
2838	my ($self, $id, $cb) = @_;	3074	my ($self, $id, $cb) = @_;
2839		3075
…		…
2853	$_->()	3089	$_->()
2854	for values %{delete $self->{refresh_hook}};	3090	for values %{delete $self->{refresh_hook}};
2855	}	3091	}
2856		3092
2857	if ($self->{check_size}) {	3093	if ($self->{check_size}) {
2858	my @queue = ([], []);	3094	my @queue;
2859		3095
2860	for (;;) {	3096	for (;;) {
2861	if ($self->{check_size}) {	3097	if ($self->{check_size}) {
2862	# heuristic: check containers last	3098	#TODO use array-of-depth approach
2863	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3099
		3100	@queue = sort { $a->{visible} <=> $b->{visible} }
2864	for values %{delete $self->{check_size}}	3101	@queue, values %{delete $self->{check_size}};
2865	}	3102	}
2866		3103
2867	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3104	my $widget = pop @queue || last;
2868		3105
		3106	defined $widget->{visible} or last; # do not resize invisible widgets
		3107
2869	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3108	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2870	? @$widget{qw(user_w user_h)}	3109	? @$widget{qw(def_w def_h)}
2871	: $widget->size_request;	3110	: $widget->size_request;
2872		3111
2873	if (delete $widget->{force_alloc}	3112	if (delete $widget->{force_alloc}
2874	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3113	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2875	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#
…		…
2884	}	3123	}
2885	}	3124	}
2886	}	3125	}
2887		3126
2888	while ($self->{size_alloc}) {	3127	while ($self->{size_alloc}) {
		3128	for (
		3129	sort { $a->[0]{visible} <=> $b->[0]{visible} }
2889	for (values %{delete $self->{size_alloc}}) {	3130	values %{delete $self->{size_alloc}}
		3131	) {
2890	my ($widget, $w, $h) = @$_;	3132	my ($widget, $w, $h) = @$_;
2891		3133
2892	$w = 0 if $w < 0;	3134	$w = 0 if $w < 0;
2893	$h = 0 if $h < 0;	3135	$h = 0 if $h < 0;
2894		3136
2895	$widget->{w} = $w;	3137	$widget->{w} = $w;
2896	$widget->{h} = $h;	3138	$widget->{h} = $h;
2897	$widget->size_allocate ($w, $h);
2898	$widget->emit (size_allocate => $w, $h);	3139	$widget->emit (size_allocate => $w, $h);
2899	}	3140	}
2900	}	3141	}
2901		3142
2902	while ($self->{post_alloc_hook}) {	3143	while ($self->{post_alloc_hook}) {
…		…
2908	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3149	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2909	glClear GL_COLOR_BUFFER_BIT;	3150	glClear GL_COLOR_BUFFER_BIT;
2910		3151
2911	glMatrixMode GL_PROJECTION;	3152	glMatrixMode GL_PROJECTION;
2912	glLoadIdentity;	3153	glLoadIdentity;
2913	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3154	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2914	glMatrixMode GL_MODELVIEW;	3155	glMatrixMode GL_MODELVIEW;
2915	glLoadIdentity;	3156	glLoadIdentity;
2916		3157
2917	$self->_draw;	3158	$self->_draw;
2918	}	3159	}
…		…
2920	#############################################################################	3161	#############################################################################
2921		3162
2922	package CFClient::UI;	3163	package CFClient::UI;
2923		3164
2924	$ROOT = new CFClient::UI::Root;	3165	$ROOT = new CFClient::UI::Root;
2925	$TOOLTIP = new CFClient::UI::Tooltip;	3166	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2926		3167
2927	1	3168	1
2928		3169

Diff Legend

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