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.207 by elmex, Mon May 15 18:23:33 2006 UTC vs.
Revision 1.250 by root, Sun May 28 02:31:03 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}) {
…		…
50	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
51	}	71	}
52		72
53	# class methods for events	73	# class methods for events
54	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	76	if $FOCUS;
57	}	77	}
58		78
59	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	81	if $FOCUS;
62	}	82	}
63		83
64	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	85	my ($ev) = @_;
…		…
74	check_tooltip;	94	check_tooltip;
75	}	95	}
76		96
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		98
79	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	101	}
84		102
85	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	104	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
88		106
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		108
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		110
93	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		113
98	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	116	$grab->update if $grab;
101	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		134
119	check_tooltip;	135	check_tooltip;
120	}	136	}
121		137
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	139	if $HOVER;
126	}	140	}
127		141
128	# convert position array to integers	142	# convert position array to integers
129	sub harmonize {	143	sub harmonize {
130	my ($vals) = @_;	144	my ($vals) = @_;
…		…
136	$rem += $_ - $i;	150	$rem += $_ - $i;
137	$_ = $i;	151	$_ = $i;
138	}	152	}
139	}	153	}
140		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
141	# call when resolution changes etc.	171	# call when resolution changes etc.
142	sub rescale_widgets {	172	sub rescale_widgets {
143	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
144		174
145	for my $widget (values %WIDGET) {	175	for my $widget (values %WIDGET) {
146	if ($widget->{toplevel}) {	176	if ($widget->{is_toplevel}) {
147	$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};
148	$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};
149	$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};
150	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151	$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};
152	$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};
153	$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};
154	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155	}	183	}
156
157	$widget->reconfigure;
158	}	184	}
		185
		186	reconfigure_widgets;
159	}	187	}
160		188
161	#############################################################################	189	#############################################################################
162		190
163	package CFClient::UI::Base;	191	package CFClient::UI::Base;
…		…
176	can_events => 1,	204	can_events => 1,
177	@_	205	@_
178	}, $class;	206	}, $class;
179		207
180	for (keys %$self) {	208	for (keys %$self) {
181	if (/^connect_(.*)$/) {	209	if (/^on_(.*)$/) {
182	$self->connect ($1 => delete $self->{$_});	210	$self->connect ($1 => delete $self->{$_});
183	}	211	}
184	}	212	}
185		213
186	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187		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
188	$self	223	$self
189	}	224	}
190		225
191	sub destroy {	226	sub destroy {
192	my ($self) = @_;	227	my ($self) = @_;
…		…
201	return if $self->{parent};	236	return if $self->{parent};
202		237
203	$CFClient::UI::ROOT->add ($self);	238	$CFClient::UI::ROOT->add ($self);
204	}	239	}
205		240
206	sub hide {	241	sub center {
207	my ($self) = @_;	242	my ($self) = @_;
		243
		244	$CFClient::UI::ROOT->on_post_alloc (
		245	"center_$self" => sub {
		246	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
		247	},
		248	);
		249
		250	$self->update;
		251	}
		252
		253	sub set_visible {
		254	my ($self) = @_;
		255
		256	return if $self->{visible};
		257
		258	$self->{root} = $self->{parent}{root};
		259	$self->{visible} = $self->{parent}{visible} + 1;
		260
		261	$self->emit (visibility_change => 1);
		262	}
		263
		264	sub set_invisible {
		265	my ($self) = @_;
		266
		267	return unless $self->{visible};
		268
		269	# broken show/hide model
		270
		271	delete $self->{root};
		272	delete $self->{visible};
208		273
209	undef $GRAB if $GRAB == $self;	274	undef $GRAB if $GRAB == $self;
210	undef $HOVER if $HOVER == $self;	275	undef $HOVER if $HOVER == $self;
		276
		277	CFClient::UI::check_tooltip
		278	if $CFClient::UI::TOOLTIP->{owner} == $self;
		279
		280	$self->focus_out;
		281
		282	$self->emit (visibility_change => 0);
		283	}
		284
		285	sub set_visibility {
		286	my ($self, $visible) = @_;
		287
		288	return if $self->{visible} == $visible;
		289
		290	$visible ? $self->hide
		291	: $self->show;
		292	}
		293
		294	sub toggle_visibility {
		295	my ($self) = @_;
		296
		297	$self->{visible}
		298	? $self->hide
		299	: $self->show;
		300	}
		301
		302	sub hide {
		303	my ($self) = @_;
		304
		305	$self->set_invisible;
211		306
212	$self->{parent}->remove ($self)	307	$self->{parent}->remove ($self)
213	if $self->{parent};	308	if $self->{parent};
214	}	309	}
215		310
…		…
224	}	319	}
225		320
226	sub set_size {	321	sub set_size {
227	my ($self, $w, $h) = @_;	322	my ($self, $w, $h) = @_;
228		323
229	$self->{user_w} = $w;	324	$self->{def_w} = $w;
230	$self->{user_h} = $h;	325	$self->{def_h} = $h;
231		326
232	$self->check_size;	327	$self->check_size;
233	}	328	}
234		329
235	sub size_request {	330	sub size_request {
…		…
257	$self->{y} = $y;	352	$self->{y} = $y;
258	$self->update;	353	$self->update;
259	}	354	}
260		355
261	if ($self->{w} != $w || $self->{h} != $h) {	356	if ($self->{w} != $w || $self->{h} != $h) {
262	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	357	$CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h];
263	}	358	}
264	}	359	}
265		360
266	sub size_allocate {	361	sub size_allocate {
267	# nothing to be done	362	# nothing to be done
…		…
280	sub set_max_size {	375	sub set_max_size {
281	my ($self, $w, $h) = @_;	376	my ($self, $w, $h) = @_;
282		377
283	delete $self->{max_w}; $self->{max_w} = $w if $w;	378	delete $self->{max_w}; $self->{max_w} = $w if $w;
284	delete $self->{max_h}; $self->{max_h} = $h if $h;	379	delete $self->{max_h}; $self->{max_h} = $h if $h;
		380	}
		381
		382	sub set_tooltip {
		383	my ($self, $tooltip) = @_;
		384
		385	$tooltip =~ s/^\s+//;
		386	$tooltip =~ s/\s+$//;
		387
		388	return if $self->{tooltip} eq $tooltip;
		389
		390	$self->{tooltip} = $tooltip;
		391
		392	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		393	delete $CFClient::UI::TOOLTIP->{owner};
		394	CFClient::UI::check_tooltip;
		395	}
285	}	396	}
286		397
287	# translate global coordinates to local coordinate system	398	# translate global coordinates to local coordinate system
288	sub coord2local {	399	sub coord2local {
289	my ($self, $x, $y) = @_;	400	my ($self, $x, $y) = @_;
…		…
304	return if $FOCUS == $self;	415	return if $FOCUS == $self;
305	return unless $self->{can_focus};	416	return unless $self->{can_focus};
306		417
307	my $focus = $FOCUS; $FOCUS = $self;	418	my $focus = $FOCUS; $FOCUS = $self;
308		419
309	$self->emit (focus_in => $focus);	420	$self->_emit (focus_in => $focus);
310		421
311	$focus->update if $focus;	422	$focus->update if $focus;
312	$FOCUS->update;	423	$FOCUS->update;
313	}	424	}
314		425
…		…
317		428
318	return unless $FOCUS == $self;	429	return unless $FOCUS == $self;
319		430
320	my $focus = $FOCUS; undef $FOCUS;	431	my $focus = $FOCUS; undef $FOCUS;
321		432
322	$self->emit (focus_out => $focus);	433	$self->_emit (focus_out => $focus);
323		434
324	$focus->update if $focus; #?	435	$focus->update if $focus; #?
		436
		437	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		438	unless $FOCUS;
325	}	439	}
326		440
327	sub mouse_motion { }	441	sub mouse_motion { }
328	sub button_up { }	442	sub button_up { }
329	sub key_down { }	443	sub key_down { }
330	sub key_up { }	444	sub key_up { }
331		445
332	sub button_down {	446	sub button_down {
333	my ($self, $ev, $x, $y) = @_;	447	my ($self, $ev, $x, $y) = @_;
334		448
335	$self->focus_in;	449	$self->focus_in;
…		…
369	if ($ENV{PCLIENT_DEBUG}) {	483	if ($ENV{PCLIENT_DEBUG}) {
370	glPushMatrix;	484	glPushMatrix;
371	glColor 1, 1, 0, 1;	485	glColor 1, 1, 0, 1;
372	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	486	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373	glBegin GL_LINE_LOOP;	487	glBegin GL_LINE_LOOP;
374	glVertex 0 , 0;	488	glVertex 0 , 0;
375	glVertex $self->{w}, 0;	489	glVertex $self->{w} - 1, 0;
376	glVertex $self->{w}, $self->{h};	490	glVertex $self->{w} - 1, $self->{h} - 1;
377	glVertex 0 , $self->{h};	491	glVertex 0 , $self->{h} - 1;
378	glEnd;	492	glEnd;
379	glPopMatrix;	493	glPopMatrix;
380	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	494	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
381	}	495	}
382	}	496	}
…		…
402	sub set_parent {	516	sub set_parent {
403	my ($self, $parent) = @_;	517	my ($self, $parent) = @_;
404		518
405	Scalar::Util::weaken ($self->{parent} = $parent);	519	Scalar::Util::weaken ($self->{parent} = $parent);
406		520
407	# TODO: req_w _does_change after ->reconfigure	521	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
		522
408	$self->check_size	523	$self->check_size;
409	unless exists $self->{req_w};
410	}	524	}
411		525
412	sub check_size {	526	sub check_size {
413	my ($self, $forced) = @_;	527	my ($self, $forced) = @_;
414		528
…		…
427	my ($self, $signal, $cb) = @_;	541	my ($self, $signal, $cb) = @_;
428		542
429	push @{ $self->{signal_cb}{$signal} }, $cb;	543	push @{ $self->{signal_cb}{$signal} }, $cb;
430	}	544	}
431		545
		546	sub _emit {
		547	my ($self, $signal, @args) = @_;
		548
		549	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		550	}
		551
432	sub emit {	552	sub emit {
433	my ($self, $signal, @args) = @_;	553	my ($self, $signal, @args) = @_;
434		554
435	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	555	$self->_emit ($signal, @args)
		556	|| $self->$signal (@args);
		557	}
		558
		559	sub visibility_change {
		560	#my ($self, $visible) = @_;
436	}	561	}
437		562
438	sub DESTROY {	563	sub DESTROY {
439	my ($self) = @_;	564	my ($self) = @_;
440		565
…		…
455	my $class = shift;	580	my $class = shift;
456		581
457	# range [value, low, high, page]	582	# range [value, low, high, page]
458		583
459	$class->SUPER::new (	584	$class->SUPER::new (
460	bg => [0, 0, 0, 0.2],	585	#bg => [0, 0, 0, 0.2],
461	active_bg => [1, 1, 1, 0.5],	586	#active_bg => [1, 1, 1, 0.5],
462	@_	587	@_
463	)	588	)
464	}	589	}
465		590
466	sub _draw {	591	sub _draw {
467	my ($self) = @_;	592	my ($self) = @_;
468		593
		594	my $color = $FOCUS == $self && $self->{active_bg}
		595	? $self->{active_bg}
		596	: $self->{bg};
		597
		598	if ($color && (@$color < 4 || $color->[3])) {
469	my ($w, $h) = @$self{qw(w h)};	599	my ($w, $h) = @$self{qw(w h)};
470		600
471	glEnable GL_BLEND;	601	glEnable GL_BLEND;
472	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	602	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	603	glColor @$color;
474		604
475	glBegin GL_QUADS;	605	glBegin GL_QUADS;
476	glVertex 0 , 0;	606	glVertex 0 , 0;
477	glVertex 0 , $h;	607	glVertex 0 , $h;
478	glVertex $w, $h;	608	glVertex $w, $h;
479	glVertex $w, 0;	609	glVertex $w, 0;
480	glEnd;	610	glEnd;
481		611
482	glDisable GL_BLEND;	612	glDisable GL_BLEND;
		613	}
483	}	614	}
484		615
485	#############################################################################	616	#############################################################################
486		617
487	package CFClient::UI::Empty;	618	package CFClient::UI::Empty;
…		…
547	delete $child->{parent};	678	delete $child->{parent};
548	$child->hide;	679	$child->hide;
549		680
550	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	681	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551		682
552	$self->check_size;	683	$self->check_size (1);
553	$self->update;	684	$self->update;
554	}	685	}
555		686
556	sub clear {	687	sub clear {
557	my ($self) = @_;	688	my ($self) = @_;
…		…
671	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	802	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672	glClearColor 0, 0, 0, 0;	803	glClearColor 0, 0, 0, 0;
673	glClear GL_COLOR_BUFFER_BIT;	804	glClear GL_COLOR_BUFFER_BIT;
674		805
675	$self->_render;	806	$self->_render;
676	# glColorMask 1, 1, 1, 0;
677	# glEnable GL_BLEND;
678	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679	# glRasterPos 0, 0;
680	# glCopyPixels 0, 0, $self->{w}, $self->{h};
681	# glDisable GL_BLEND;
682	# glColorMask 1, 1, 1, 1;
683	};	807	};
684	}	808	}
685		809
686	sub _draw {	810	sub _draw {
687	my ($self) = @_;	811	my ($self) = @_;
…		…
691	my $tex = $self->{texture}	815	my $tex = $self->{texture}
692	or return;	816	or return;
693		817
694	glEnable GL_TEXTURE_2D;	818	glEnable GL_TEXTURE_2D;
695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	819	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696	glColor 0, 0, 0, 1;	820	glColor 1, 1, 1, 1;
697		821
698	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	822	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699		823
700	glDisable GL_TEXTURE_2D;	824	glDisable GL_TEXTURE_2D;
701	}	825	}
…		…
704		828
705	package CFClient::UI::ViewPort;	829	package CFClient::UI::ViewPort;
706		830
707	our @ISA = CFClient::UI::Window::;	831	our @ISA = CFClient::UI::Window::;
708		832
		833	sub new {
		834	my $class = shift;
		835
		836	$class->SUPER::new (
		837	scroll_x => 0,
		838	scroll_y => 1,
		839	@_,
		840	)
		841	}
		842
709	sub size_request {	843	sub size_request {
710	my ($self) = @_;	844	my ($self) = @_;
711		845
712	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	846	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
713	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
714		847
715	@$self{qw(child_w child_h)}	848	$w = 10 if $self->{scroll_x};
		849	$h = 10 if $self->{scroll_y};
		850
		851	($w, $h)
716	}	852	}
717		853
718	sub size_allocate {	854	sub size_allocate {
719	my ($self, $w, $h) = @_;	855	my ($self, $w, $h) = @_;
720		856
		857	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		858	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		859
		860	$self->child->configure (0, 0, $w, $h);
721	$self->update;	861	$self->update;
722	}	862	}
723		863
724	sub set_offset {	864	sub set_offset {
725	my ($self, $x, $y) = @_;	865	my ($self, $x, $y) = @_;
…		…
776	my $class = shift;	916	my $class = shift;
777		917
778	my $self;	918	my $self;
779		919
780	my $slider = new CFClient::UI::Slider	920	my $slider = new CFClient::UI::Slider
781	vertical => 1,	921	vertical => 1,
782	range => [0, 0, 1, 0.01], # HACK fix	922	range => [0, 0, 1, 0.01], # HACK fix
783	connect_changed => sub {	923	on_changed => sub {
784	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	924	$self->{vp}->set_offset (0, $_[1]);
785	},	925	},
786	;	926	;
787		927
788	$self = $class->SUPER::new (	928	$self = $class->SUPER::new (
789	vp => (new CFClient::UI::ViewPort),	929	vp => (new CFClient::UI::ViewPort expand => 1),
790	slider => $slider,	930	slider => $slider,
791	@_,	931	@_,
792	);	932	);
793		933
794	$self->{vp}->add ($self->{scrolled});	934	$self->{vp}->add ($self->{scrolled});
795	$self->add ($self->{vp});	935	$self->add ($self->{vp});
796	$self->add ($self->{slider});	936	$self->add ($self->{slider});
797		937
798	$self	938	$self
		939	}
		940
		941	sub update {
		942	my ($self) = @_;
		943
		944	$self->SUPER::update;
		945
		946	# todo: overwrite size_allocate of child
		947	my $child = $self->{vp}->child;
		948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		949	}
		950
		951	sub size_allocate {
		952	my ($self, $w, $h) = @_;
		953
		954	$self->SUPER::size_allocate ($w, $h);
		955
		956	my $child = $self->{vp}->child;
		957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
799	}	958	}
800		959
801	#TODO# update range on size_allocate depending on child	960	#TODO# update range on size_allocate depending on child
802	# update viewport offset on scroll	961	# update viewport offset on scroll
803		962
…		…
854	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1013	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
855		1014
856	sub new {	1015	sub new {
857	my $class = shift;	1016	my $class = shift;
858		1017
859	# TODO: user_x, user_y, overwrite moveto?
860
861	my $self = $class->SUPER::new (	1018	my $self = $class->SUPER::new (
862	bg => [1, 1, 1, 1],	1019	bg => [1, 1, 1, 1],
863	border_bg => [1, 1, 1, 1],	1020	border_bg => [1, 1, 1, 1],
864	border => 0.6,	1021	border => 0.6,
865	toplevel => 1,	1022	is_toplevel => 1,
866	can_events => 1,	1023	can_events => 1,
867	@_	1024	@_
868	);	1025	);
869		1026
870	$self->{title} &&= new CFClient::UI::Label	1027	$self->{title} &&= new CFClient::UI::Label
871	align => 0,	1028	align => 0,
…		…
895	my ($self, $w, $h) = @_;	1052	my ($self, $w, $h) = @_;
896		1053
897	$h -= List::Util::max 0, $self->border * 2;	1054	$h -= List::Util::max 0, $self->border * 2;
898	$w -= List::Util::max 0, $self->border * 2;	1055	$w -= List::Util::max 0, $self->border * 2;
899		1056
900	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1057	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
901	if $self->{title};	1058	if $self->{title};
902		1059
903	$self->child->configure ($self->border, $self->border, $w, $h);	1060	$self->child->configure ($self->border, $self->border, $w, $h);
904	}	1061	}
905		1062
…		…
924	my ($ev, $x, $y) = @_;	1081	my ($ev, $x, $y) = @_;
925		1082
926	my $dx = $ev->{x} - $ox;	1083	my $dx = $ev->{x} - $ox;
927	my $dy = $ev->{y} - $oy;	1084	my $dy = $ev->{y} - $oy;
928		1085
		1086	$self->{user_x} = $wx + $dx * $mx;
		1087	$self->{user_y} = $wy + $dy * $my;
929	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1088	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
930	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1089	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
931	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1090	$self->move ($self->{user_x}, $self->{user_y});
932	$self->check_size;	1091	$self->check_size;
933	};	1092	};
934		1093
935	} elsif ($lr ^ $td) {	1094	} elsif ($lr ^ $td) {
936	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1095	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
939	$self->{motion} = sub {	1098	$self->{motion} = sub {
940	my ($ev, $x, $y) = @_;	1099	my ($ev, $x, $y) = @_;
941		1100
942	($x, $y) = ($ev->{x}, $ev->{y});	1101	($x, $y) = ($ev->{x}, $ev->{y});
943		1102
944	$self->move ($bx + $x - $ox, $by + $y - $oy);	1103	$self->{user_x} = $bx + $x - $ox;
		1104	$self->{user_y} = $by + $y - $oy;
		1105
		1106	$self->move ($self->{user_x}, $self->{user_y});
945	$self->update;	1107	$self->update;
946	};	1108	};
947	}	1109	}
948	}	1110	}
949		1111
…		…
1011	sub new {	1173	sub new {
1012	my $class = shift;	1174	my $class = shift;
1013		1175
1014	$class->SUPER::new (	1176	$class->SUPER::new (
1015	col_expand => [],	1177	col_expand => [],
1016	@_	1178	@_,
1017	)	1179	)
		1180	}
		1181
		1182	sub children {
		1183	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018	}	1184	}
1019		1185
1020	sub add {	1186	sub add {
1021	my ($self, $x, $y, $child) = @_;	1187	my ($self, $x, $y, $child) = @_;
1022		1188
1023	$child->set_parent ($self);	1189	$child->set_parent ($self);
1024	$self->{children}[$y][$x] = $child;	1190	$self->{children}[$y][$x] = $child;
1025		1191
1026	$child->check_size;	1192	$self->check_size (1);
1027	}	1193	}
1028		1194
1029	sub children {
1030	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031	}
1032
1033	# TODO: move to container class maybe? send childs a signal on removal?	1195	# TODO: move to container class maybe? send children a signal on removal?
1034	sub clear {	1196	sub clear {
1035	my ($self) = @_;	1197	my ($self) = @_;
1036		1198
1037	my @children = $self->children;	1199	my @children = $self->children;
1038	delete $self->{children};	1200	delete $self->{children};
…		…
1040	for (@children) {	1202	for (@children) {
1041	delete $_->{parent};	1203	delete $_->{parent};
1042	$_->hide;	1204	$_->hide;
1043	}	1205	}
1044		1206
		1207	$self->check_size (1);
1045	$self->update;	1208	$self->update;
1046	}	1209	}
1047		1210
1048	sub get_wh {	1211	sub get_wh {
1049	my ($self) = @_;	1212	my ($self) = @_;
…		…
1081	sub size_allocate {	1244	sub size_allocate {
1082	my ($self, $w, $h) = @_;	1245	my ($self, $w, $h) = @_;
1083		1246
1084	my ($ws, $hs) = $self->get_wh;	1247	my ($ws, $hs) = $self->get_wh;
1085		1248
1086	my $req_w = sum @$ws;	1249	my $req_w = (sum @$ws) || 1;
1087	my $req_h = sum @$hs;	1250	my $req_h = (sum @$hs) || 1;
1088		1251
1089	# TODO: nicer code && do row_expand	1252	# TODO: nicer code && do row_expand
1090	my @col_expand = @{$self->{col_expand}};	1253	my @col_expand = @{$self->{col_expand}};
1091	@col_expand = (1) x @$ws unless @col_expand;	1254	@col_expand = (1) x @$ws unless @col_expand;
1092	my $col_expand = (sum @col_expand) || 1;	1255	my $col_expand = (sum @col_expand) || 1;
…		…
1146	}	1309	}
1147	}	1310	}
1148		1311
1149	#############################################################################	1312	#############################################################################
1150		1313
1151	package CFClient::UI::HBox;	1314	package CFClient::UI::Box;
1152
1153	# TODO: wrap into common Box base class
1154		1315
1155	our @ISA = CFClient::UI::Container::;	1316	our @ISA = CFClient::UI::Container::;
1156		1317
1157	sub size_request {	1318	sub size_request {
1158	my ($self) = @_;	1319	my ($self) = @_;
1159		1320
1160	my @alloc = map [$_->size_request], @{$self->{children}};	1321	$self->{vertical}
1161		1322	? (
1162	(	1323	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1163	(List::Util::sum map $_->[0], @alloc),	1324	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1164	(List::Util::max map $_->[1], @alloc),	1325	)
1165	)	1326	: (
		1327	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1328	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1329	)
1166	}	1330	}
1167		1331
1168	sub size_allocate {	1332	sub size_allocate {
1169	my ($self, $w, $h) = @_;	1333	my ($self, $w, $h) = @_;
1170		1334
1171	($h, $w) = ($w, $h);	1335	my $space = $self->{vertical} ? $h : $w;
1172
1173	my $children = $self->{children};	1336	my $children = $self->{children};
1174		1337
1175	my @h = map $_->{req_w}, @$children;	1338	my @req;
1176		1339
1177	my $req_h = List::Util::sum @h;	1340	if ($self->{homogeneous}) {
1178		1341	@req = ($space / (@$children || 1)) x @$children;
1179	if ($req_h > $h) {
1180	# ah well, not enough space
1181	$_ *= $h / $req_h for @h;
1182	} else {	1342	} else {
		1343	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1344	my $req = List::Util::sum @req;
		1345
		1346	if ($req > $space) {
		1347	# ah well, not enough space
		1348	$_ *= $space / $req for @req;
		1349	} else {
1183	my $exp = List::Util::sum map $_->{expand}, @$children;	1350	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1184	$exp ||= 1;
1185		1351
		1352	$space = ($space - $req) / $expand; # remaining space to give away
		1353
		1354	$req[$_] += $space * $children->[$_]{expand}
1186	for (0 .. $#$children) {	1355	for 0 .. $#$children;
1187	my $child = $children->[$_];
1188
1189	my $alloc_h = $h[$_];
1190	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1191	$h[$_] = $alloc_h;
1192	}	1356	}
1193	}	1357	}
1194		1358
1195	CFClient::UI::harmonize \@h;	1359	CFClient::UI::harmonize \@req;
1196		1360
1197	my $y = 0;	1361	my $pos = 0;
1198	for (0 .. $#$children) {	1362	for (0 .. $#$children) {
1199	my $child = $children->[$_];
1200	my $h = $h[$_];	1363	my $alloc = $req[$_];
1201	$child->configure ($y, 0, $h, $w);	1364	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1202		1365
1203	$y += $h;	1366	$pos += $alloc;
1204	}	1367	}
1205		1368
1206	1	1369	1
1207	}	1370	}
1208		1371
1209	#############################################################################	1372	#############################################################################
1210		1373
		1374	package CFClient::UI::HBox;
		1375
		1376	our @ISA = CFClient::UI::Box::;
		1377
		1378	sub new {
		1379	my $class = shift;
		1380
		1381	$class->SUPER::new (
		1382	vertical => 0,
		1383	@_,
		1384	)
		1385	}
		1386
		1387	#############################################################################
		1388
1211	package CFClient::UI::VBox;	1389	package CFClient::UI::VBox;
1212		1390
1213	# TODO: wrap into common Box base class
1214
1215	our @ISA = CFClient::UI::Container::;	1391	our @ISA = CFClient::UI::Box::;
1216		1392
1217	sub size_request {	1393	sub new {
1218	my ($self) = @_;	1394	my $class = shift;
1219		1395
1220	my @alloc = map [$_->size_request], @{$self->{children}};	1396	$class->SUPER::new (
1221		1397	vertical => 1,
1222	(	1398	@_,
1223	(List::Util::max map $_->[0], @alloc),
1224	(List::Util::sum map $_->[1], @alloc),
1225	)	1399	)
1226	}	1400	}
1227		1401
1228	sub size_allocate {
1229	my ($self, $w, $h) = @_;
1230
1231	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1233	my $children = $self->{children};
1234
1235	my @h = map $_->{req_h}, @$children;
1236
1237	my $req_h = List::Util::sum @h;
1238
1239	if ($req_h > $h) {
1240	# ah well, not enough space
1241	$_ *= $h / $req_h for @h;
1242	} else {
1243	my $exp = List::Util::sum map $_->{expand}, @$children;
1244	$exp ||= 1;
1245
1246	for (0 .. $#$children) {
1247	my $child = $children->[$_];
1248
1249	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1250	}
1251	}
1252
1253	CFClient::UI::harmonize \@h;
1254
1255	my $y = 0;
1256	for (0 .. $#$children) {
1257	my $child = $children->[$_];
1258	my $h = $h[$_];
1259	$child->configure (0, $y, $w, $h);
1260
1261	$y += $h;
1262	}
1263
1264	1
1265	}
1266
1267	#############################################################################	1402	#############################################################################
1268		1403
1269	package CFClient::UI::Label;	1404	package CFClient::UI::Label;
1270		1405
1271	our @ISA = CFClient::UI::Base::;	1406	our @ISA = CFClient::UI::DrawBG::;
1272		1407
1273	use CFClient::OpenGL;	1408	use CFClient::OpenGL;
1274		1409
1275	sub new {	1410	sub new {
1276	my ($class, %arg) = @_;	1411	my ($class, %arg) = @_;
1277		1412
1278	my $self = $class->SUPER::new (	1413	my $self = $class->SUPER::new (
1279	fg => [1, 1, 1],	1414	fg => [1, 1, 1],
		1415	#bg => none
		1416	#active_bg => none
1280	#font => default_font	1417	#font => default_font
1281	#text => initial text	1418	#text => initial text
1282	#markup => initial narkup	1419	#markup => initial narkup
		1420	#max_w => maximum pixel width
		1421	ellipsise => 3, # end
1283	layout => (new CFClient::Layout),	1422	layout => (new CFClient::Layout),
1284	fontsize => 1,	1423	fontsize => 1,
1285	align => -1,	1424	align => -1,
1286	valign => -1,	1425	valign => -1,
1287	padding => 2,	1426	padding => 2,
…		…
1302	}	1441	}
1303		1442
1304	$self	1443	$self
1305	}	1444	}
1306		1445
1307	sub escape {	1446	sub escape($) {
1308	local $_ = $_[1];	1447	local $_ = $_[0];
1309		1448
1310	s/&/&amp;/g;	1449	s/&/&amp;/g;
1311	s/>/&gt;/g;	1450	s/>/&gt;/g;
1312	s/</&lt;/g;	1451	s/</&lt;/g;
1313		1452
1314	$_[1]	1453	$_
1315	}	1454	}
1316		1455
1317	sub update {	1456	sub update {
1318	my ($self) = @_;	1457	my ($self) = @_;
1319		1458
…		…
1352	sub size_request {	1491	sub size_request {
1353	my ($self) = @_;	1492	my ($self) = @_;
1354		1493
1355	$self->{layout}->set_font ($self->{font}) if $self->{font};	1494	$self->{layout}->set_font ($self->{font}) if $self->{font};
1356	$self->{layout}->set_width ($self->{max_w} || -1);	1495	$self->{layout}->set_width ($self->{max_w} || -1);
		1496	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1497	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1498	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358		1499
1359	my ($w, $h) = $self->{layout}->size;	1500	my ($w, $h) = $self->{layout}->size;
1360		1501
1361	if (exists $self->{template}) {	1502	if (exists $self->{template}) {
…		…
1391	}	1532	}
1392		1533
1393	sub _draw {	1534	sub _draw {
1394	my ($self) = @_;	1535	my ($self) = @_;
1395		1536
		1537	$self->SUPER::_draw; # draw background, if applicable
		1538
1396	my $tex = $self->{texture} ||= do {	1539	my $tex = $self->{texture} ||= do {
1397	$self->{layout}->set_foreground (@{$self->{fg}});	1540	$self->{layout}->set_foreground (@{$self->{fg}});
1398	$self->{layout}->set_font ($self->{font}) if $self->{font};	1541	$self->{layout}->set_font ($self->{font}) if $self->{font};
1399	$self->{layout}->set_width ($self->{w});	1542	$self->{layout}->set_width ($self->{w});
		1543	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1544	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1545	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401		1546
1402	my $tex = new_from_layout CFClient::Texture $self->{layout};	1547	my $tex = new_from_layout CFClient::Texture $self->{layout};
1403		1548
1404	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1549	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1550	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406	: ($self->{w} - $tex->{w}) * 0.5;	1551	: ($self->{w} - $tex->{w}) * 0.5);
1407		1552
1408	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1553	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1409	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1554	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410	: ($self->{h} - $tex->{h}) * 0.5;	1555	: ($self->{h} - $tex->{h}) * 0.5);
1411		1556
1412	$tex	1557	$tex
1413	};	1558	};
1414		1559
1415	glEnable GL_TEXTURE_2D;	1560	glEnable GL_TEXTURE_2D;
…		…
1443	active_fg => [0, 0, 0],	1588	active_fg => [0, 0, 0],
1444	can_hover => 1,	1589	can_hover => 1,
1445	can_focus => 1,	1590	can_focus => 1,
1446	valign => 0,	1591	valign => 0,
1447	can_events => 1,	1592	can_events => 1,
		1593	#text => ...
1448	@_	1594	@_
1449	)	1595	)
1450	}	1596	}
1451		1597
1452	sub _set_text {	1598	sub _set_text {
…		…
1462	$self->{text} = $text;	1608	$self->{text} = $text;
1463		1609
1464	$text =~ s/./*/g if $self->{hidden};	1610	$text =~ s/./*/g if $self->{hidden};
1465	$self->{layout}->set_text ("$text ");	1611	$self->{layout}->set_text ("$text ");
1466		1612
1467	$self->emit (changed => $self->{text});	1613	$self->_emit (changed => $self->{text});
1468	}	1614	}
1469		1615
1470	sub set_text {	1616	sub set_text {
1471	my ($self, $text) = @_;	1617	my ($self, $text) = @_;
1472		1618
1473	$self->{cursor} = length $text;	1619	$self->{cursor} = length $text;
1474	$self->_set_text ($text);	1620	$self->_set_text ($text);
		1621	$self->update;
1475	$self->check_size;	1622	$self->check_size;
1476	$self->update;
1477	}	1623	}
1478		1624
1479	sub get_text {	1625	sub get_text {
1480	$_[0]{text}	1626	$_[0]{text}
1481	}	1627	}
…		…
1484	my ($self) = @_;	1630	my ($self) = @_;
1485		1631
1486	my ($w, $h) = $self->SUPER::size_request;	1632	my ($w, $h) = $self->SUPER::size_request;
1487		1633
1488	($w + 1, $h) # add 1 for cursor	1634	($w + 1, $h) # add 1 for cursor
1489	}
1490
1491	sub size_allocate {
1492	my ($self, $w, $h) = @_;
1493
1494	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1495	}	1635	}
1496		1636
1497	sub key_down {	1637	sub key_down {
1498	my ($self, $ev) = @_;	1638	my ($self, $ev) = @_;
1499		1639
…		…
1514	} elsif ($sym == CFClient::SDLK_HOME) {	1654	} elsif ($sym == CFClient::SDLK_HOME) {
1515	$self->{cursor} = 0;	1655	$self->{cursor} = 0;
1516	} elsif ($sym == CFClient::SDLK_END) {	1656	} elsif ($sym == CFClient::SDLK_END) {
1517	$self->{cursor} = length $text;	1657	$self->{cursor} = length $text;
1518	} elsif ($uni == 27) {	1658	} elsif ($uni == 27) {
1519	$self->emit ('escape');	1659	$self->_emit ('escape');
1520	} elsif ($uni) {	1660	} elsif ($uni) {
1521	substr $text, $self->{cursor}++, 0, chr $uni;	1661	substr $text, $self->{cursor}++, 0, chr $uni;
1522	}	1662	}
1523		1663
1524	$self->_set_text ($text);	1664	$self->_set_text ($text);
1525	$self->update;	1665	$self->update;
		1666	$self->check_size;
1526	}	1667	}
1527		1668
1528	sub focus_in {	1669	sub focus_in {
1529	my ($self) = @_;	1670	my ($self) = @_;
1530		1671
…		…
1610	if ($sym == 13) {	1751	if ($sym == 13) {
1611	unshift @{$self->{history}},	1752	unshift @{$self->{history}},
1612	my $txt = $self->get_text;	1753	my $txt = $self->get_text;
1613	$self->{history_pointer} = -1;	1754	$self->{history_pointer} = -1;
1614	$self->{history_saveback} = '';	1755	$self->{history_saveback} = '';
1615	$self->emit (activate => $txt);	1756	$self->_emit (activate => $txt);
1616	$self->update;	1757	$self->update;
1617		1758
1618	} elsif ($sym == CFClient::SDLK_UP) {	1759	} elsif ($sym == CFClient::SDLK_UP) {
1619	if ($self->{history_pointer} < 0) {	1760	if ($self->{history_pointer} < 0) {
1620	$self->{history_saveback} = $self->get_text;	1761	$self->{history_saveback} = $self->get_text;
…		…
1659	my $class = shift;	1800	my $class = shift;
1660		1801
1661	$class->SUPER::new (	1802	$class->SUPER::new (
1662	padding => 4,	1803	padding => 4,
1663	fg => [1, 1, 1],	1804	fg => [1, 1, 1],
1664	bg => [1, 1, 1, 0.2],
1665	active_fg => [0, 0, 1],	1805	active_fg => [0, 0, 1],
1666	can_hover => 1,	1806	can_hover => 1,
1667	align => 0,	1807	align => 0,
1668	valign => 0,	1808	valign => 0,
1669	can_events => 1,	1809	can_events => 1,
1670	@_	1810	@_
1671	)	1811	)
1672	}	1812	}
1673		1813
		1814	sub activate { }
		1815
1674	sub button_up {	1816	sub button_up {
1675	my ($self, $ev, $x, $y) = @_;	1817	my ($self, $ev, $x, $y) = @_;
1676		1818
		1819	$self->emit ("activate")
1677	if ($x >= 0 && $x < $self->{w}	1820	if $x >= 0 && $x < $self->{w}
1678	&& $y >= 0 && $y < $self->{h}) {	1821	&& $y >= 0 && $y < $self->{h};
1679	$self->emit ("activate");
1680	}
1681	}	1822	}
1682		1823
1683	sub _draw {	1824	sub _draw {
1684	my ($self) = @_;	1825	my ($self) = @_;
1685		1826
…		…
1717		1858
1718	$class->SUPER::new (	1859	$class->SUPER::new (
1719	padding => 2,	1860	padding => 2,
1720	fg => [1, 1, 1],	1861	fg => [1, 1, 1],
1721	active_fg => [1, 1, 0],	1862	active_fg => [1, 1, 0],
		1863	bg => [0, 0, 0, 0.2],
		1864	active_bg => [1, 1, 1, 0.5],
1722	state => 0,	1865	state => 0,
1723	can_hover => 1,	1866	can_hover => 1,
1724	@_	1867	@_
1725	)	1868	)
1726	}	1869	}
…		…
1735	my ($self, $ev, $x, $y) = @_;	1878	my ($self, $ev, $x, $y) = @_;
1736		1879
1737	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1738	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1739	$self->{state} = !$self->{state};	1882	$self->{state} = !$self->{state};
1740	$self->emit (changed => $self->{state});	1883	$self->_emit (changed => $self->{state});
1741	}	1884	}
1742	}	1885	}
1743		1886
1744	sub _draw {	1887	sub _draw {
1745	my ($self) = @_;	1888	my ($self) = @_;
…		…
2018	# TODO: req_w/h are wrong with vertical	2161	# TODO: req_w/h are wrong with vertical
2019	# TODO: calculations are off	2162	# TODO: calculations are off
2020	my $self = $class->SUPER::new (	2163	my $self = $class->SUPER::new (
2021	fg => [1, 1, 1],	2164	fg => [1, 1, 1],
2022	active_fg => [0, 0, 0],	2165	active_fg => [0, 0, 0],
		2166	bg => [0, 0, 0, 0.2],
		2167	active_bg => [1, 1, 1, 0.5],
2023	range => [0, 0, 100, 10],	2168	range => [0, 0, 100, 10, 0],
2024	req_w => $::WIDTH / 80,	2169	req_w => $::WIDTH / 80,
2025	req_h => $::WIDTH / 80,	2170	req_h => $::WIDTH / 80,
2026	vertical => 0,	2171	vertical => 0,
2027	can_hover => 1,	2172	can_hover => 1,
2028	inner_pad => .05,	2173	inner_pad => 0.02,
2029	@_	2174	@_
2030	);	2175	);
2031		2176
2032	$self->set_value ($self->{range}[0]);	2177	$self->set_value ($self->{range}[0]);
2033	$self->update;	2178	$self->update;
2034		2179
2035	$self	2180	$self
2036	}	2181	}
2037		2182
		2183	sub set_range {
		2184	my ($self, $range) = @_;
		2185
		2186	($range, $self->{range}) = ($self->{range}, $range);
		2187
		2188	$self->update
		2189	if "@$range" ne "@{$self->{range}}";
		2190	}
		2191
2038	sub set_value {	2192	sub set_value {
2039	my ($self, $value) = @_;	2193	my ($self, $value) = @_;
2040		2194
2041	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2195	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2042		2196
2043	$hi = $lo + 1 if $hi <= $lo;	2197	$hi = $lo + 1 if $hi <= $lo;
2044		2198
		2199	$page = $hi - $lo if $page > $hi - $lo;
		2200
2045	$value = $lo if $value < $lo;	2201	$value = $lo if $value < $lo;
2046	$value = $hi if $value > $hi;	2202	$value = $hi - $page if $value > $hi - $page;
2047		2203
2048	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2204	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2049	if $unit;	2205	if $unit;
2050		2206
2051	$page = $hi - $lo if $page > $hi - $lo;
2052
2053	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2207	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2054		2208
2055	if ($value != $old_value) {	2209	if ($value != $old_value) {
2056	$self->emit (changed => $value);	2210	$self->_emit (changed => $value);
2057	$self->update;	2211	$self->update;
2058	}	2212	}
2059	}	2213	}
2060		2214
2061	sub size_request {	2215	sub size_request {
…		…
2069		2223
2070	sub button_down {	2224	sub button_down {
2071	my ($self, $ev, $x, $y) = @_;	2225	my ($self, $ev, $x, $y) = @_;
2072		2226
2073	$self->SUPER::button_down ($ev, $x, $y);	2227	$self->SUPER::button_down ($ev, $x, $y);
		2228
		2229	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2230
2074	$self->mouse_motion ($ev, $x, $y);	2231	$self->mouse_motion ($ev, $x, $y);
2075	}	2232	}
2076		2233
2077	sub mouse_motion {	2234	sub mouse_motion {
2078	my ($self, $ev, $x, $y) = @_;	2235	my ($self, $ev, $x, $y) = @_;
…		…
2080	if ($GRAB == $self) {	2237	if ($GRAB == $self) {
2081	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2238	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2082		2239
2083	my (undef, $lo, $hi, $page) = @{$self->{range}};	2240	my (undef, $lo, $hi, $page) = @{$self->{range}};
2084		2241
2085	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2242	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2086		2243
2087	$self->set_value ($x * ($hi - $lo) + $lo);	2244	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2088	}	2245	}
2089	}	2246	}
2090		2247
2091	sub update {	2248	sub update {
2092	my ($self) = @_;	2249	my ($self) = @_;
2093		2250
2094	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2251	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2095	$self->set_value ($self->{range}[0]);	2252	$self->set_value ($self->{range}[0]);
2096		2253
2097	my ($value, $lo, $hi, $page) = @{$self->{range}};	2254	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2255	my $range = ($hi - $page - $lo) || 1e-100;
2098		2256
2099	my $inner_w = 1 - 2 * $self->{inner_pad};	2257	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2100		2258
2101	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2259	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2260	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2102		2261
2103	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2262	$value = ($value - $lo) / $range;
2104	$value = $self->{scale} * ($value - $lo);	2263	$value = $value * $self->{scale} + $self->{offset};
2105		2264
2106	$value = $self->{inner_pad} + ($value - $page * 0.5);
2107
2108	$value = 0 if $value < 0;
2109	$page = 1 - $value if $value + $page > 1;
2110
2111	$self->{knob_x} = $value;	2265	$self->{knob_x} = $value - $knob_w * 0.5;
2112	$self->{knob_w} = $page;	2266	$self->{knob_w} = $knob_w;
2113	});	2267	});
2114		2268
2115	$self->SUPER::update;	2269	$self->SUPER::update;
2116	}	2270	}
2117		2271
…		…
2123	glScale $self->{w}, $self->{h};	2277	glScale $self->{w}, $self->{h};
2124		2278
2125	if ($self->{vertical}) {	2279	if ($self->{vertical}) {
2126	# draw a vertical slider like a rotated horizontal slider	2280	# draw a vertical slider like a rotated horizontal slider
2127		2281
		2282	glTranslate 1, 0, 0;
2128	glRotate 90, 0, 0, 1;	2283	glRotate 90, 0, 0, 1;
2129	glTranslate 0, 1, 0;
2130	}	2284	}
2131		2285
2132	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2286	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2133	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2287	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2134		2288
…		…
2141	# draw handle	2295	# draw handle
2142	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2296	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2143		2297
2144	glDisable GL_TEXTURE_2D;	2298	glDisable GL_TEXTURE_2D;
2145	}	2299	}
		2300
		2301	#############################################################################
		2302
		2303	package CFClient::UI::ValSlider;
		2304
		2305	our @ISA = CFClient::UI::HBox::;
		2306
		2307	sub new {
		2308	my ($class, %arg) = @_;
		2309
		2310	my $range = delete $arg{range};
		2311
		2312	my $self = $class->SUPER::new (
		2313	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2314	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2315	to_value => sub { shift },
		2316	from_value => sub { shift },
		2317	%arg,
		2318	);
		2319
		2320	$self->{slider}->connect (changed => sub {
		2321	my ($self, $value) = @_;
		2322	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2323	$self->{parent}->emit (changed => $value);
		2324	});
		2325
		2326	# $self->{entry}->connect (changed => sub {
		2327	# my ($self, $value) = @_;
		2328	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2329	# $self->{parent}->emit (changed => $value);
		2330	# });
		2331
		2332	$self->add ($self->{slider}, $self->{entry});
		2333
		2334	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2335
		2336	$self
		2337	}
		2338
		2339	sub set_range { shift->{slider}->set_range (@_) }
		2340	sub set_value { shift->{slider}->set_value (@_) }
2146		2341
2147	#############################################################################	2342	#############################################################################
2148		2343
2149	package CFClient::UI::TextView;	2344	package CFClient::UI::TextView;
2150		2345
…		…
2180		2375
2181	$self->{fontsize} = $fontsize;	2376	$self->{fontsize} = $fontsize;
2182	$self->reflow;	2377	$self->reflow;
2183	}	2378	}
2184		2379
2185	sub text_height {
2186	my ($self, $text) = @_;
2187
2188	my $layout = $self->{layout};
2189
2190	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2191	$layout->set_width ($self->{children}[0]{w});
2192	$layout->set_markup ($text);
2193
2194	($layout->size)[1]
2195	}
2196
2197	sub reflow {
2198	my ($self) = @_;
2199
2200	$self->{need_reflow}++;
2201	$self->update;
2202	}
2203
2204	sub size_allocate {	2380	sub size_allocate {
2205	my ($self, $w, $h) = @_;	2381	my ($self, $w, $h) = @_;
2206		2382
2207	$self->SUPER::size_allocate ($w, $h);	2383	$self->SUPER::size_allocate ($w, $h);
2208		2384
…		…
2211	$self->{layout}->set_width ($self->{children}[0]{w});	2387	$self->{layout}->set_width ($self->{children}[0]{w});
2212		2388
2213	$self->reflow;	2389	$self->reflow;
2214	}	2390	}
2215		2391
		2392	sub text_size {
		2393	my ($self, $text, $indent) = @_;
		2394
		2395	my $layout = $self->{layout};
		2396
		2397	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2398	$layout->set_width ($self->{children}[0]{w} - $indent);
		2399	$layout->set_markup ($text);
		2400
		2401	$layout->size
		2402	}
		2403
		2404	sub reflow {
		2405	my ($self) = @_;
		2406
		2407	$self->{need_reflow}++;
		2408	$self->update;
		2409	}
		2410
		2411	sub set_offset {
		2412	my ($self, $offset) = @_;
		2413
		2414	# todo: base offset on lines or so, not on pixels
		2415	$self->{children}[1]->set_value ($offset);
		2416	}
		2417
		2418	sub clear {
		2419	my ($self) = @_;
		2420
		2421	$self->{par} = [];
		2422	$self->{height} = 0;
		2423	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2424	}
		2425
2216	sub add_paragraph {	2426	sub add_paragraph {
2217	my ($self, $color, $text) = @_;	2427	my ($self, $color, $text, $indent) = @_;
2218		2428
2219	#TODO: intelligently "reformat" paragraph	2429	for my $line (split /\n/, $text) {
2220		2430	my ($w, $h) = $self->text_size ($line);
2221	my $height = $self->text_height ($text);
2222
2223	$self->{height} += $height;	2431	$self->{height} += $h;
		2432	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2433	}
2224		2434
2225	push @{$self->{par}}, [$height, $color, $text];
2226
2227	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2435	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2228	$self->{children}[1]->update;
2229	}	2436	}
2230		2437
2231	sub update {	2438	sub update {
2232	my ($self) = @_;	2439	my ($self) = @_;
2233		2440
…		…
2236	return unless $self->{h} > 0;	2443	return unless $self->{h} > 0;
2237		2444
2238	delete $self->{texture};	2445	delete $self->{texture};
2239		2446
2240	$ROOT->on_post_alloc ($self, sub {	2447	$ROOT->on_post_alloc ($self, sub {
		2448	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2449
2241	if (delete $self->{need_reflow}) {	2450	if (delete $self->{need_reflow}) {
2242	my $height = 0;	2451	my $height = 0;
2243		2452
2244	$height += $_->[0] = $self->text_height ($_->[2])	2453	my $layout = $self->{layout};
		2454
		2455	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2456
2245	for @{$self->{par}};	2457	for (@{$self->{par}}) {
		2458	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2459	$layout->set_width ($W - $_->[3]);
		2460	$layout->set_markup ($_->[4]);
		2461	my ($w, $h) = $layout->size;
		2462	$_->[0] = $w + $_->[3];
		2463	$_->[1] = $h;
		2464	}
		2465
		2466	$height += $_->[1];
		2467	}
2246		2468
2247	$self->{height} = $height;	2469	$self->{height} = $height;
2248		2470
2249	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2471	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2250		2472
2251	delete $self->{texture};	2473	delete $self->{texture};
2252	}	2474	}
2253		2475
2254	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2476	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2255	glClearColor 0, 0, 0, 0;	2477	glClearColor 0.5, 0.5, 0.5, 0;
2256	glClear GL_COLOR_BUFFER_BIT;	2478	glClear GL_COLOR_BUFFER_BIT;
2257		2479
2258	glEnable GL_TEXTURE_2D;
2259	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2260
2261	my $top = int $self->{children}[1]{range}[0];	2480	my $top = int $self->{children}[1]{range}[0];
2262		2481
2263	my $y0 = $top;	2482	my $y0 = $top;
2264	my $y1 = $top + $self->{h};	2483	my $y1 = $top + $H;
2265		2484
2266	my $y = 0;	2485	my $y = 0;
2267		2486
2268	my $layout = $self->{layout};	2487	my $layout = $self->{layout};
2269		2488
2270	$layout->set_font ($self->{font}) if $self->{font};	2489	$layout->set_font ($self->{font}) if $self->{font};
2271		2490
		2491	glEnable GL_BLEND;
		2492	#TODO# not correct in windows where rgba is forced off
		2493	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2494
2272	for my $par (@{$self->{par}}) {	2495	for my $par (@{$self->{par}}) {
2273	my $h = $par->[0];	2496	my $h = $par->[1];
2274		2497
2275	if ($y0 < $y + $h && $y < $y1) {	2498	if ($y0 < $y + $h && $y < $y1) {
2276	$layout->set_foreground (@{ $par->[1] });	2499	$layout->set_foreground (@{ $par->[2] });
		2500	$layout->set_width ($W - $par->[3]);
2277	$layout->set_markup ($par->[2]);	2501	$layout->set_markup ($par->[4]);
2278		2502
2279	my ($W, $H) = $layout->size;	2503	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2504
		2505	glRasterPos $par->[3], $y - $y0;
		2506	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2281	}	2507	}
2282		2508
2283	$y += $h;	2509	$y += $h;
2284	}	2510	}
2285		2511
2286	glDisable GL_TEXTURE_2D;	2512	glDisable GL_BLEND;
2287	};	2513	};
2288	});	2514	});
2289	}	2515	}
2290		2516
2291	sub _draw {	2517	sub _draw {
2292	my ($self) = @_;	2518	my ($self) = @_;
2293		2519
2294	glEnable GL_TEXTURE_2D;	2520	glEnable GL_TEXTURE_2D;
2295	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2521	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296	glColor 1, 1, 1, 1;	2522	glColor 1, 1, 1, 1;
2297	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2523	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2298	glDisable GL_TEXTURE_2D;	2524	glDisable GL_TEXTURE_2D;
2299		2525
2300	$self->{children}[1]->draw;	2526	$self->{children}[1]->draw;
2301		2527
2302	}	2528	}
…		…
2351		2577
2352	sub new {	2578	sub new {
2353	my $class = shift;	2579	my $class = shift;
2354		2580
2355	my $self = $class->SUPER::new (	2581	my $self = $class->SUPER::new (
2356	state => 0,	2582	state => 0,
2357	connect_activate => \&toggle_flopper,	2583	on_activate => \&toggle_flopper,
2358	@_	2584	@_
2359	);	2585	);
2360		2586
2361	if ($self->{state}) {
2362	$self->{state} = 0;
2363	$self->toggle_flopper;
2364	}
2365
2366	$self	2587	$self
2367	}	2588	}
2368		2589
2369	sub toggle_flopper {	2590	sub toggle_flopper {
2370	my ($self) = @_;	2591	my ($self) = @_;
2371		2592
2372	# TODO: use animation	2593	$self->{other}->toggle_visibility;
2373	if ($self->{state} = !$self->{state}) {
2374	$CFClient::UI::ROOT->add ($self->{other});
2375	$self->{other}->move ($self->coord2global (0, $self->{h}));
2376	$self->emit ("open");
2377	} else {
2378	$CFClient::UI::ROOT->remove ($self->{other});
2379	$self->emit ("close");
2380	}
2381
2382	$self->emit (changed => $self->{state});
2383	}	2594	}
2384		2595
2385	#############################################################################	2596	#############################################################################
2386		2597
2387	package CFClient::UI::Tooltip;	2598	package CFClient::UI::Tooltip;
…		…
2401		2612
2402	sub set_tooltip_from {	2613	sub set_tooltip_from {
2403	my ($self, $widget) = @_;	2614	my ($self, $widget) = @_;
2404		2615
2405	$self->add (new CFClient::UI::Label	2616	$self->add (new CFClient::UI::Label
2406	markup => $widget->{tooltip},	2617	markup => $widget->{tooltip},
2407	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2618	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408	fontsize => 0.8,	2619	fontsize => 0.8,
2409	fg => [0, 0, 0, 1],	2620	fg => [0, 0, 0, 1],
		2621	ellipsise => 0,
2410	font => ($widget->{tooltip_font} || $::FONT_PROP),	2622	font => ($widget->{tooltip_font} || $::FONT_PROP),
2411	);	2623	);
2412	}	2624	}
2413		2625
2414	sub size_request {	2626	sub size_request {
2415	my ($self) = @_;	2627	my ($self) = @_;
…		…
2461	use CFClient::OpenGL;	2673	use CFClient::OpenGL;
2462		2674
2463	sub new {	2675	sub new {
2464	my $class = shift;	2676	my $class = shift;
2465		2677
2466	$class->SUPER::new (	2678	my $self = $class->SUPER::new (
2467	aspect => 1,	2679	aspect => 1,
		2680	can_events => 0,
2468	@_,	2681	@_,
2469	)	2682	);
		2683
		2684	if ($self->{anim} && $self->{animspeed}) {
		2685	Scalar::Util::weaken (my $widget = $self);
		2686
		2687	$self->{timer} = Event->timer (
		2688	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2689	hard => 1,
		2690	interval => $self->{animspeed},
		2691	cb => sub {
		2692	++$widget->{frame};
		2693	$widget->update;
		2694	},
		2695	);
		2696	}
		2697
		2698	$self
2470	}	2699	}
2471		2700
2472	sub size_request {	2701	sub size_request {
2473	(32, 8)	2702	(32, 8)
2474	}	2703	}
2475		2704
		2705	sub update {
		2706	my ($self) = @_;
		2707
		2708	return unless $self->{visible};
		2709
		2710	$self->SUPER::update;
		2711	}
		2712
2476	sub _draw {	2713	sub _draw {
2477	my ($self) = @_;	2714	my ($self) = @_;
2478		2715
2479	return unless $::CONN;#d# manage and cache textures differently	2716	return unless $::CONN;
		2717
		2718	my $face;
		2719
		2720	if ($self->{frame}) {
		2721	my $anim = $::CONN->{anim}[$self->{anim}];
		2722
		2723	$face = $anim->[ $self->{frame} % @$anim ]
		2724	if $anim && @$anim;
		2725	}
		2726
2480	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2727	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2481		2728
2482	# TODO animation
2483	if ($tex) {	2729	if ($tex) {
2484	glEnable GL_TEXTURE_2D;	2730	glEnable GL_TEXTURE_2D;
2485	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2731	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2486	glColor 1, 1, 1, 1;	2732	glColor 1, 1, 1, 1;
2487	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2733	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2488	glDisable GL_TEXTURE_2D;	2734	glDisable GL_TEXTURE_2D;
2489	}	2735	}
2490	}	2736	}
2491		2737
2492	#############################################################################	2738	sub DESTROY {
		2739	my ($self) = @_;
2493		2740
		2741	$self->{timer}->cancel
		2742	if $self->{timer};
		2743
		2744	$self->SUPER::DESTROY;
		2745	}
		2746
		2747	#############################################################################
		2748
2494	package CFClient::UI::InventoryItem;	2749	package CFClient::UI::Inventory;
2495		2750
2496	our @ISA = CFClient::UI::HBox::;	2751	our @ISA = CFClient::UI::ScrolledWindow::;
2497		2752
2498	sub new {	2753	sub new {
2499	my $class = shift;	2754	my $class = shift;
2500		2755
2501	my %args = @_;
2502
2503	my $item = delete $args{item};
2504
2505	my $desc = $item->{nrof} < 2
2506	? $item->{name}
2507	: "$item->{nrof} $item->{name_pl}";
2508
2509	$item->{flags} & Crossfire::Protocol::F_OPEN
2510	and $desc .= " (open)";
2511	$item->{flags} & Crossfire::Protocol::F_APPLIED
2512	and $desc .= " (applied)";
2513	$item->{flags} & Crossfire::Protocol::F_UNPAID
2514	and $desc .= " (unpaid)";
2515	$item->{flags} & Crossfire::Protocol::F_MAGIC
2516	and $desc .= " (magic)";
2517	$item->{flags} & Crossfire::Protocol::F_CURSED
2518	and $desc .= " (cursed)";
2519	$item->{flags} & Crossfire::Protocol::F_DAMNED
2520	and $desc .= " (damned)";
2521	$item->{flags} & Crossfire::Protocol::F_LOCKED
2522	and $desc .= " *";
2523
2524	my $self = $class->SUPER::new (	2756	my $self = $class->SUPER::new (
2525	can_hover => 1,	2757	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2526	can_events => 1,
2527	tooltip => (CFClient::UI::Label->escape ($desc)
2528	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2529	connect_button_down => sub {
2530	my ($self, $ev, $x, $y) = @_;
2531
2532	# todo: maybe put examine on 1? but should just be a tooltip :(
2533	if ($ev->{button} == 1) {
2534	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2535	} elsif ($ev->{button} == 2) {
2536	$::CONN->send ("apply $item->{tag}");
2537	} elsif ($ev->{button} == 3) {
2538	my @menu_items = (
2539	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2540	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2543	[
2544	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2545	sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2546	],
2547	);
2548
2549	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2550	}
2551
2552	1
2553	},
2554	%args
2555	);
2556
2557	$self->add (new CFClient::UI::Face
2558	can_events => 0,
2559	face => $item->{face},
2560	anim => $item->{anim},
2561	animspeed => $item->{animspeed},
2562	);
2563
2564	$self->add (new CFClient::UI::Label
2565	can_events => 0,
2566	text => $desc,
2567	);
2568
2569	$self
2570	}
2571
2572	#############################################################################
2573
2574	package CFClient::UI::Inventory;
2575
2576	our @ISA = CFClient::UI::ScrolledWindow::;
2577
2578	sub new {
2579	my $class = shift;
2580
2581	my $self = $class->SUPER::new (
2582	scrolled => (new CFClient::UI::VBox),
2583	@_,	2758	@_,
2584	);	2759	);
2585		2760
2586	$self	2761	$self
2587	}	2762	}
…		…
2597	or ($a->{name} cmp $b->{name})	2772	or ($a->{name} cmp $b->{name})
2598	} @$items;	2773	} @$items;
2599		2774
2600	$self->{real_items} = \@items;	2775	$self->{real_items} = \@items;
2601		2776
		2777	my $row = 0;
2602	for my $item (@items) {	2778	for my $item (@items) {
2603	my $desc = $item->{nrof} < 2	2779	CFClient::Item::update_widgets $item;
2604	? $item->{name}
2605	: "$item->{nrof} $item->{name_pl}";
2606		2780
2607	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2781	$self->{scrolled}->add (0, $row, $item->{face_widget});
2608	}	2782	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2783	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2609		2784
2610	$self->{scrolled}->add (@items);	2785	$row++;
2611		2786	}
2612	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2613	}
2614
2615	sub size_request {
2616	my ($self) = @_;
2617	($self->{req_w}, $self->{req_h});
2618	}	2787	}
2619		2788
2620	#############################################################################	2789	#############################################################################
2621		2790
2622	package CFClient::UI::Menu;	2791	package CFClient::UI::Menu;
…		…
2657		2826
2658	# popup given the event (must be a mouse button down event currently)	2827	# popup given the event (must be a mouse button down event currently)
2659	sub popup {	2828	sub popup {
2660	my ($self, $ev) = @_;	2829	my ($self, $ev) = @_;
2661		2830
2662	$self->emit ("popdown");	2831	$self->_emit ("popdown");
2663		2832
2664	# maybe save $GRAB? must be careful about events...	2833	# maybe save $GRAB? must be careful about events...
2665	$GRAB = $self;	2834	$GRAB = $self;
2666	$self->{button} = $ev->{button};	2835	$self->{button} = $ev->{button};
2667		2836
…		…
2682		2851
2683	if ($ev->{button} == $self->{button}) {	2852	if ($ev->{button} == $self->{button}) {
2684	undef $GRAB;	2853	undef $GRAB;
2685	$self->hide;	2854	$self->hide;
2686		2855
2687	$self->emit ("popdown");	2856	$self->_emit ("popdown");
2688	$self->{hover}[1]->() if $self->{hover};	2857	$self->{hover}[1]->() if $self->{hover};
2689	}	2858	}
2690	}	2859	}
2691		2860
2692	#############################################################################	2861	#############################################################################
2693		2862
2694	package CFClient::UI::Statusbox;	2863	package CFClient::UI::Statusbox;
2695		2864
2696	our @ISA = CFClient::UI::VBox::;	2865	our @ISA = CFClient::UI::VBox::;
		2866
		2867	sub new {
		2868	my $class = shift;
		2869
		2870	$class->SUPER::new (
		2871	fontsize => 0.8,
		2872	@_,
		2873	)
		2874	}
2697		2875
2698	sub reorder {	2876	sub reorder {
2699	my ($self) = @_;	2877	my ($self) = @_;
2700	my $NOW = time;	2878	my $NOW = time;
2701		2879
…		…
2721	: $item->{text};	2899	: $item->{text};
2722		2900
2723	for ($short) {	2901	for ($short) {
2724	s/^\s+//;	2902	s/^\s+//;
2725	s/\s+/ /g;	2903	s/\s+/ /g;
2726	my $len = int 40 / $item->{fontsize};
2727	substr $_, $len, length, "…" if $len < length;
2728	}	2904	}
2729		2905
2730	new CFClient::UI::Label	2906	new CFClient::UI::Label
2731	markup => $short,	2907	markup => $short,
2732	tooltip => $item->{tooltip},	2908	tooltip => $item->{tooltip},
2733	tooltip_font => $::FONT_PROP,	2909	tooltip_font => $::FONT_PROP,
2734	tooltip_width => 0.67,	2910	tooltip_width => 0.67,
2735	fontsize => $item->{fontsize},	2911	fontsize => $item->{fontsize} || $self->{fontsize},
		2912	max_w => $::WIDTH * 0.44,
2736	fg => $item->{fg},	2913	fg => $item->{fg},
2737	can_events => 1,	2914	can_events => 1,
2738	can_hover => 1	2915	can_hover => 1
2739	};	2916	};
2740	}	2917	}
…		…
2746	sub add {	2923	sub add {
2747	my ($self, $text, %arg) = @_;	2924	my ($self, $text, %arg) = @_;
2748		2925
2749	$text =~ s/^\s+//;	2926	$text =~ s/^\s+//;
2750	$text =~ s/\s+$//;	2927	$text =~ s/\s+$//;
		2928
		2929	return unless $text;
2751		2930
2752	my $timeout = time + ((delete $arg{timeout}) || 60);	2931	my $timeout = time + ((delete $arg{timeout}) || 60);
2753		2932
2754	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2933	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2755		2934
…		…
2767	$self->{item}{$group} = {	2946	$self->{item}{$group} = {
2768	id => ++$self->{id},	2947	id => ++$self->{id},
2769	text => $text,	2948	text => $text,
2770	timeout => $timeout,	2949	timeout => $timeout,
2771	tooltip => $text,	2950	tooltip => $text,
2772	fontsize => 0.8,
2773	fg => [0.8, 0.8, 0.8, 0.8],	2951	fg => [0.8, 0.8, 0.8, 0.8],
2774	pri => 0,	2952	pri => 0,
2775	count => 1,	2953	count => 1,
2776	%arg,	2954	%arg,
2777	};	2955	};
2778	}	2956	}
2779		2957
2780	$self->reorder;	2958	$self->reorder;
2781	}	2959	}
2782		2960
		2961	sub reconfigure {
		2962	my ($self) = @_;
		2963
		2964	delete $_->{label}
		2965	for values %{ $self->{item} || {} };
		2966
		2967	$self->reorder;
		2968	$self->SUPER::reconfigure;
		2969	}
		2970
2783	#############################################################################	2971	#############################################################################
2784		2972
2785	package CFClient::UI::Root;	2973	package CFClient::UI::Root;
2786		2974
2787	our @ISA = CFClient::UI::Container::;	2975	our @ISA = CFClient::UI::Container::;
…		…
2790		2978
2791	sub new {	2979	sub new {
2792	my $class = shift;	2980	my $class = shift;
2793		2981
2794	$class->SUPER::new (	2982	$class->SUPER::new (
		2983	visible => 1,
2795	@_,	2984	@_,
2796	)	2985	)
2797	}	2986	}
2798		2987
2799	sub configure {	2988	sub configure {
…		…
2817	}	3006	}
2818		3007
2819	sub size_allocate {	3008	sub size_allocate {
2820	my ($self, $w, $h) = @_;	3009	my ($self, $w, $h) = @_;
2821		3010
2822	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2823	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2824
2825	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2826	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2827
2828	for my $child ($self->children) {	3011	for my $child ($self->children) {
2829	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3012	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2830		3013
2831	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3014	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2832	if exists $child->{req_x};	3015	if exists $child->{req_x};
2833		3016
2834	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3017	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2835	if exists $child->{req_y};	3018	if exists $child->{req_y};
2836		3019
		3020	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
		3021
2837	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3022	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2838	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3023	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2839		3024
2840	$child->configure ($X, $Y, $W, $H);	3025	$child->configure ($X, $Y, $W, $H);
2841	}	3026	}
…		…
2862		3047
2863	sub add {	3048	sub add {
2864	my ($self, @children) = @_;	3049	my ($self, @children) = @_;
2865		3050
2866	for my $child (@children) {	3051	for my $child (@children) {
2867	$child->{toplevel} = 1;	3052	$child->{is_toplevel} = 1;
2868		3053
2869	# integerise window positions	3054	# integerise window positions
2870	$child->{x} = int $child->{x};	3055	$child->{x} = int $child->{x};
2871	$child->{y} = int $child->{y};	3056	$child->{y} = int $child->{y};
2872	}	3057	}
2873		3058
2874	$self->SUPER::add (@children);	3059	$self->SUPER::add (@children);
		3060
		3061	for (my @widgets = @children; my $w = pop @widgets; ) {
		3062	push @widgets, $w->children;
		3063	$w->set_visible;
		3064	}
		3065
		3066	}
		3067
		3068	sub remove {
		3069	my ($self, @children) = @_;
		3070
		3071	$self->SUPER::remove (@children);
		3072
		3073	while (@children) {
		3074	my $w = pop @children;
		3075	push @children, $w->children;
		3076	$w->set_invisible;
		3077	}
2875	}	3078	}
2876		3079
2877	sub on_refresh {	3080	sub on_refresh {
2878	my ($self, $id, $cb) = @_;	3081	my ($self, $id, $cb) = @_;
2879		3082
…		…
2893	$_->()	3096	$_->()
2894	for values %{delete $self->{refresh_hook}};	3097	for values %{delete $self->{refresh_hook}};
2895	}	3098	}
2896		3099
2897	if ($self->{check_size}) {	3100	if ($self->{check_size}) {
2898	my @queue = ([], []);	3101	my @queue;
2899		3102
2900	for (;;) {	3103	while () {
2901	if ($self->{check_size}) {	3104	if ($self->{check_size}) {
2902	# heuristic: check containers last	3105	#TODO use array-of-depth approach
2903	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3106
		3107	@queue = sort { $a->{visible} <=> $b->{visible} }
2904	for values %{delete $self->{check_size}}	3108	@queue, values %{delete $self->{check_size}};
2905	}	3109	}
2906		3110
2907	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3111	my $widget = pop @queue || last;
2908		3112
		3113	defined $widget->{visible} or last; # do not resize invisible widgets
		3114
2909	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3115	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2910	? @$widget{qw(user_w user_h)}	3116	? @$widget{qw(def_w def_h)}
2911	: $widget->size_request;	3117	: $widget->size_request;
2912		3118
2913	if (delete $widget->{force_alloc}	3119	if (delete $widget->{force_alloc}
2914	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3120	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2915	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3121	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
…		…
2923	if $widget->{parent};	3129	if $widget->{parent};
2924	}	3130	}
2925	}	3131	}
2926	}	3132	}
2927		3133
2928	while ($self->{size_alloc}) {	3134	while (my $size_alloc = delete $self->{size_alloc}) {
2929	for (values %{delete $self->{size_alloc}}) {	3135	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
2930	my ($widget, $w, $h) = @$_;	3136	values %$size_alloc;
		3137
		3138	while () {
		3139	my ($widget, $w, $h) = @{ pop @queue or last };
2931		3140
2932	$w = 0 if $w < 0;	3141	$w = 0 if $w < 0;
2933	$h = 0 if $h < 0;	3142	$h = 0 if $h < 0;
2934		3143
2935	$widget->{w} = $w;	3144	$widget->{w} = $w;
2936	$widget->{h} = $h;	3145	$widget->{h} = $h;
2937	$widget->size_allocate ($w, $h);
2938	$widget->emit (size_allocate => $w, $h);	3146	$widget->emit (size_allocate => $w, $h);
2939	}	3147	}
2940	}	3148	}
2941		3149
2942	while ($self->{post_alloc_hook}) {	3150	while ($self->{post_alloc_hook}) {
…		…
2948	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3156	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2949	glClear GL_COLOR_BUFFER_BIT;	3157	glClear GL_COLOR_BUFFER_BIT;
2950		3158
2951	glMatrixMode GL_PROJECTION;	3159	glMatrixMode GL_PROJECTION;
2952	glLoadIdentity;	3160	glLoadIdentity;
2953	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3161	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2954	glMatrixMode GL_MODELVIEW;	3162	glMatrixMode GL_MODELVIEW;
2955	glLoadIdentity;	3163	glLoadIdentity;
2956		3164
2957	$self->_draw;	3165	$self->_draw;
2958	}	3166	}
…		…
2960	#############################################################################	3168	#############################################################################
2961		3169
2962	package CFClient::UI;	3170	package CFClient::UI;
2963		3171
2964	$ROOT = new CFClient::UI::Root;	3172	$ROOT = new CFClient::UI::Root;
2965	$TOOLTIP = new CFClient::UI::Tooltip;	3173	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2966		3174
2967	1	3175	1
2968		3176

Diff Legend

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