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.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}) {
…		…
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
		224	}
		225
		226	sub toggle_visibility {
		227	my ($self) = @_;
		228
		229	if ($self->{visible}) {
		230	$self->hide;
		231	} else {
		232	$self->show;
		233	}
189	}	234	}
190		235
191	sub destroy {	236	sub destroy {
192	my ($self) = @_;	237	my ($self) = @_;
193		238
…		…
201	return if $self->{parent};	246	return if $self->{parent};
202		247
203	$CFClient::UI::ROOT->add ($self);	248	$CFClient::UI::ROOT->add ($self);
204	}	249	}
205		250
206	sub hide {	251	sub center {
207	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};
208		283
209	undef $GRAB if $GRAB == $self;	284	undef $GRAB if $GRAB == $self;
210	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;
211		299
212	$self->{parent}->remove ($self)	300	$self->{parent}->remove ($self)
213	if $self->{parent};	301	if $self->{parent};
214	}	302	}
215		303
…		…
224	}	312	}
225		313
226	sub set_size {	314	sub set_size {
227	my ($self, $w, $h) = @_;	315	my ($self, $w, $h) = @_;
228		316
229	$self->{user_w} = $w;	317	$self->{def_w} = $w;
230	$self->{user_h} = $h;	318	$self->{def_h} = $h;
231		319
232	$self->check_size;	320	$self->check_size;
233	}	321	}
234		322
235	sub size_request {	323	sub size_request {
…		…
282		370
283	delete $self->{max_w}; $self->{max_w} = $w if $w;	371	delete $self->{max_w}; $self->{max_w} = $w if $w;
284	delete $self->{max_h}; $self->{max_h} = $h if $h;	372	delete $self->{max_h}; $self->{max_h} = $h if $h;
285	}	373	}
286		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
287	# translate global coordinates to local coordinate system	391	# translate global coordinates to local coordinate system
288	sub coord2local {	392	sub coord2local {
289	my ($self, $x, $y) = @_;	393	my ($self, $x, $y) = @_;
290		394
291	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	395	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
…		…
304	return if $FOCUS == $self;	408	return if $FOCUS == $self;
305	return unless $self->{can_focus};	409	return unless $self->{can_focus};
306		410
307	my $focus = $FOCUS; $FOCUS = $self;	411	my $focus = $FOCUS; $FOCUS = $self;
308		412
309	$self->emit (focus_in => $focus);	413	$self->_emit (focus_in => $focus);
310		414
311	$focus->update if $focus;	415	$focus->update if $focus;
312	$FOCUS->update;	416	$FOCUS->update;
313	}	417	}
314		418
…		…
317		421
318	return unless $FOCUS == $self;	422	return unless $FOCUS == $self;
319		423
320	my $focus = $FOCUS; undef $FOCUS;	424	my $focus = $FOCUS; undef $FOCUS;
321		425
322	$self->emit (focus_out => $focus);	426	$self->_emit (focus_out => $focus);
323		427
324	$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;
325	}	432	}
326		433
327	sub mouse_motion { }	434	sub mouse_motion { }
328	sub button_up { }	435	sub button_up { }
329	sub key_down { }	436	sub key_down { }
330	sub key_up { }	437	sub key_up { }
331		438
332	sub button_down {	439	sub button_down {
333	my ($self, $ev, $x, $y) = @_;	440	my ($self, $ev, $x, $y) = @_;
334		441
335	$self->focus_in;	442	$self->focus_in;
…		…
369	if ($ENV{PCLIENT_DEBUG}) {	476	if ($ENV{PCLIENT_DEBUG}) {
370	glPushMatrix;	477	glPushMatrix;
371	glColor 1, 1, 0, 1;	478	glColor 1, 1, 0, 1;
372	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373	glBegin GL_LINE_LOOP;	480	glBegin GL_LINE_LOOP;
374	glVertex 0 , 0;	481	glVertex 0 , 0;
375	glVertex $self->{w}, 0;	482	glVertex $self->{w} - 1, 0;
376	glVertex $self->{w}, $self->{h};	483	glVertex $self->{w} - 1, $self->{h} - 1;
377	glVertex 0 , $self->{h};	484	glVertex 0 , $self->{h} - 1;
378	glEnd;	485	glEnd;
379	glPopMatrix;	486	glPopMatrix;
380	#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;
381	}	488	}
382	}	489	}
…		…
402	sub set_parent {	509	sub set_parent {
403	my ($self, $parent) = @_;	510	my ($self, $parent) = @_;
404		511
405	Scalar::Util::weaken ($self->{parent} = $parent);	512	Scalar::Util::weaken ($self->{parent} = $parent);
406		513
407	# TODO: req_w _does_change after ->reconfigure	514	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
		515
408	$self->check_size	516	$self->check_size;
409	unless exists $self->{req_w};
410	}	517	}
411		518
412	sub check_size {	519	sub check_size {
413	my ($self, $forced) = @_;	520	my ($self, $forced) = @_;
414		521
…		…
427	my ($self, $signal, $cb) = @_;	534	my ($self, $signal, $cb) = @_;
428		535
429	push @{ $self->{signal_cb}{$signal} }, $cb;	536	push @{ $self->{signal_cb}{$signal} }, $cb;
430	}	537	}
431		538
		539	sub _emit {
		540	my ($self, $signal, @args) = @_;
		541
		542	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		543	}
		544
432	sub emit {	545	sub emit {
433	my ($self, $signal, @args) = @_;	546	my ($self, $signal, @args) = @_;
434		547
435	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) = @_;
436	}	554	}
437		555
438	sub DESTROY {	556	sub DESTROY {
439	my ($self) = @_;	557	my ($self) = @_;
440		558
…		…
455	my $class = shift;	573	my $class = shift;
456		574
457	# range [value, low, high, page]	575	# range [value, low, high, page]
458		576
459	$class->SUPER::new (	577	$class->SUPER::new (
460	bg => [0, 0, 0, 0.2],	578	#bg => [0, 0, 0, 0.2],
461	active_bg => [1, 1, 1, 0.5],	579	#active_bg => [1, 1, 1, 0.5],
462	@_	580	@_
463	)	581	)
464	}	582	}
465		583
466	sub _draw {	584	sub _draw {
467	my ($self) = @_;	585	my ($self) = @_;
468		586
		587	my $color = $FOCUS == $self && $self->{active_bg}
		588	? $self->{active_bg}
		589	: $self->{bg};
		590
		591	if ($color && (@$color < 4 || $color->[3])) {
469	my ($w, $h) = @$self{qw(w h)};	592	my ($w, $h) = @$self{qw(w h)};
470		593
471	glEnable GL_BLEND;	594	glEnable GL_BLEND;
472	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	595	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	596	glColor @$color;
474		597
475	glBegin GL_QUADS;	598	glBegin GL_QUADS;
476	glVertex 0 , 0;	599	glVertex 0 , 0;
477	glVertex 0 , $h;	600	glVertex 0 , $h;
478	glVertex $w, $h;	601	glVertex $w, $h;
479	glVertex $w, 0;	602	glVertex $w, 0;
480	glEnd;	603	glEnd;
481		604
482	glDisable GL_BLEND;	605	glDisable GL_BLEND;
		606	}
483	}	607	}
484		608
485	#############################################################################	609	#############################################################################
486		610
487	package CFClient::UI::Empty;	611	package CFClient::UI::Empty;
…		…
547	delete $child->{parent};	671	delete $child->{parent};
548	$child->hide;	672	$child->hide;
549		673
550	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	674	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551		675
552	$self->check_size;	676	$self->check_size (1);
553	$self->update;	677	$self->update;
554	}	678	}
555		679
556	sub clear {	680	sub clear {
557	my ($self) = @_;	681	my ($self) = @_;
…		…
671	$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 {
672	glClearColor 0, 0, 0, 0;	796	glClearColor 0, 0, 0, 0;
673	glClear GL_COLOR_BUFFER_BIT;	797	glClear GL_COLOR_BUFFER_BIT;
674		798
675	$self->_render;	799	$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	};	800	};
684	}	801	}
685		802
686	sub _draw {	803	sub _draw {
687	my ($self) = @_;	804	my ($self) = @_;
…		…
691	my $tex = $self->{texture}	808	my $tex = $self->{texture}
692	or return;	809	or return;
693		810
694	glEnable GL_TEXTURE_2D;	811	glEnable GL_TEXTURE_2D;
695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	812	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696	glColor 0, 0, 0, 1;	813	glColor 1, 1, 1, 1;
697		814
698	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	815	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699		816
700	glDisable GL_TEXTURE_2D;	817	glDisable GL_TEXTURE_2D;
701	}	818	}
…		…
704		821
705	package CFClient::UI::ViewPort;	822	package CFClient::UI::ViewPort;
706		823
707	our @ISA = CFClient::UI::Window::;	824	our @ISA = CFClient::UI::Window::;
708		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
709	sub size_request {	836	sub size_request {
710	my ($self) = @_;	837	my ($self) = @_;
711		838
712	@$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)};
713	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
714		840
715	@$self{qw(child_w child_h)}	841	$w = 10 if $self->{scroll_x};
		842	$h = 10 if $self->{scroll_y};
		843
		844	($w, $h)
716	}	845	}
717		846
718	sub size_allocate {	847	sub size_allocate {
719	my ($self, $w, $h) = @_;	848	my ($self, $w, $h) = @_;
720		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);
721	$self->update;	854	$self->update;
722	}	855	}
723		856
724	sub set_offset {	857	sub set_offset {
725	my ($self, $x, $y) = @_;	858	my ($self, $x, $y) = @_;
…		…
776	my $class = shift;	909	my $class = shift;
777		910
778	my $self;	911	my $self;
779		912
780	my $slider = new CFClient::UI::Slider	913	my $slider = new CFClient::UI::Slider
781	vertical => 1,	914	vertical => 1,
782	range => [0, 0, 1, 0.01], # HACK fix	915	range => [0, 0, 1, 0.01], # HACK fix
783	connect_changed => sub {	916	on_changed => sub {
784	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	917	$self->{vp}->set_offset (0, $_[1]);
785	},	918	},
786	;	919	;
787		920
788	$self = $class->SUPER::new (	921	$self = $class->SUPER::new (
789	vp => (new CFClient::UI::ViewPort),	922	vp => (new CFClient::UI::ViewPort expand => 1),
790	slider => $slider,	923	slider => $slider,
791	@_,	924	@_,
792	);	925	);
793		926
794	$self->{vp}->add ($self->{scrolled});	927	$self->{vp}->add ($self->{scrolled});
795	$self->add ($self->{vp});	928	$self->add ($self->{vp});
796	$self->add ($self->{slider});	929	$self->add ($self->{slider});
797		930
798	$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]);
799	}	951	}
800		952
801	#TODO# update range on size_allocate depending on child	953	#TODO# update range on size_allocate depending on child
802	# update viewport offset on scroll	954	# update viewport offset on scroll
803		955
…		…
854	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);
855		1007
856	sub new {	1008	sub new {
857	my $class = shift;	1009	my $class = shift;
858		1010
859	# TODO: user_x, user_y, overwrite moveto?
860
861	my $self = $class->SUPER::new (	1011	my $self = $class->SUPER::new (
862	bg => [1, 1, 1, 1],	1012	bg => [1, 1, 1, 1],
863	border_bg => [1, 1, 1, 1],	1013	border_bg => [1, 1, 1, 1],
864	border => 0.6,	1014	border => 0.6,
865	toplevel => 1,	1015	is_toplevel => 1,
866	can_events => 1,	1016	can_events => 1,
867	@_	1017	@_
868	);	1018	);
869		1019
870	$self->{title} &&= new CFClient::UI::Label	1020	$self->{title} &&= new CFClient::UI::Label
871	align => 0,	1021	align => 0,
…		…
895	my ($self, $w, $h) = @_;	1045	my ($self, $w, $h) = @_;
896		1046
897	$h -= List::Util::max 0, $self->border * 2;	1047	$h -= List::Util::max 0, $self->border * 2;
898	$w -= List::Util::max 0, $self->border * 2;	1048	$w -= List::Util::max 0, $self->border * 2;
899		1049
900	$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)
901	if $self->{title};	1051	if $self->{title};
902		1052
903	$self->child->configure ($self->border, $self->border, $w, $h);	1053	$self->child->configure ($self->border, $self->border, $w, $h);
904	}	1054	}
905		1055
…		…
924	my ($ev, $x, $y) = @_;	1074	my ($ev, $x, $y) = @_;
925		1075
926	my $dx = $ev->{x} - $ox;	1076	my $dx = $ev->{x} - $ox;
927	my $dy = $ev->{y} - $oy;	1077	my $dy = $ev->{y} - $oy;
928		1078
		1079	$self->{user_x} = $wx + $dx * $mx;
		1080	$self->{user_y} = $wy + $dy * $my;
929	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1081	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
930	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1082	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
931	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1083	$self->move ($self->{user_x}, $self->{user_y});
932	$self->check_size;	1084	$self->check_size;
933	};	1085	};
934		1086
935	} elsif ($lr ^ $td) {	1087	} elsif ($lr ^ $td) {
936	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
939	$self->{motion} = sub {	1091	$self->{motion} = sub {
940	my ($ev, $x, $y) = @_;	1092	my ($ev, $x, $y) = @_;
941		1093
942	($x, $y) = ($ev->{x}, $ev->{y});	1094	($x, $y) = ($ev->{x}, $ev->{y});
943		1095
944	$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});
945	$self->update;	1100	$self->update;
946	};	1101	};
947	}	1102	}
948	}	1103	}
949		1104
…		…
1011	sub new {	1166	sub new {
1012	my $class = shift;	1167	my $class = shift;
1013		1168
1014	$class->SUPER::new (	1169	$class->SUPER::new (
1015	col_expand => [],	1170	col_expand => [],
1016	@_	1171	@_,
1017	)	1172	)
		1173	}
		1174
		1175	sub children {
		1176	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018	}	1177	}
1019		1178
1020	sub add {	1179	sub add {
1021	my ($self, $x, $y, $child) = @_;	1180	my ($self, $x, $y, $child) = @_;
1022		1181
1023	$child->set_parent ($self);	1182	$child->set_parent ($self);
1024	$self->{children}[$y][$x] = $child;	1183	$self->{children}[$y][$x] = $child;
1025		1184
1026	$child->check_size;	1185	$self->check_size (1);
1027	}	1186	}
1028		1187
1029	sub children {
1030	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031	}
1032
1033	# 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?
1034	sub clear {	1189	sub clear {
1035	my ($self) = @_;	1190	my ($self) = @_;
1036		1191
1037	my @children = $self->children;	1192	my @children = $self->children;
1038	delete $self->{children};	1193	delete $self->{children};
…		…
1040	for (@children) {	1195	for (@children) {
1041	delete $_->{parent};	1196	delete $_->{parent};
1042	$_->hide;	1197	$_->hide;
1043	}	1198	}
1044		1199
		1200	$self->check_size (1);
1045	$self->update;	1201	$self->update;
1046	}	1202	}
1047		1203
1048	sub get_wh {	1204	sub get_wh {
1049	my ($self) = @_;	1205	my ($self) = @_;
…		…
1081	sub size_allocate {	1237	sub size_allocate {
1082	my ($self, $w, $h) = @_;	1238	my ($self, $w, $h) = @_;
1083		1239
1084	my ($ws, $hs) = $self->get_wh;	1240	my ($ws, $hs) = $self->get_wh;
1085		1241
1086	my $req_w = sum @$ws;	1242	my $req_w = (sum @$ws) || 1;
1087	my $req_h = sum @$hs;	1243	my $req_h = (sum @$hs) || 1;
1088		1244
1089	# TODO: nicer code && do row_expand	1245	# TODO: nicer code && do row_expand
1090	my @col_expand = @{$self->{col_expand}};	1246	my @col_expand = @{$self->{col_expand}};
1091	@col_expand = (1) x @$ws unless @col_expand;	1247	@col_expand = (1) x @$ws unless @col_expand;
1092	my $col_expand = (sum @col_expand) || 1;	1248	my $col_expand = (sum @col_expand) || 1;
…		…
1146	}	1302	}
1147	}	1303	}
1148		1304
1149	#############################################################################	1305	#############################################################################
1150		1306
1151	package CFClient::UI::HBox;	1307	package CFClient::UI::Box;
1152
1153	# TODO: wrap into common Box base class
1154		1308
1155	our @ISA = CFClient::UI::Container::;	1309	our @ISA = CFClient::UI::Container::;
1156		1310
1157	sub size_request {	1311	sub size_request {
1158	my ($self) = @_;	1312	my ($self) = @_;
1159		1313
1160	my @alloc = map [$_->size_request], @{$self->{children}};	1314	$self->{vertical}
1161		1315	? (
1162	(	1316	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1163	(List::Util::sum map $_->[0], @alloc),	1317	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1164	(List::Util::max map $_->[1], @alloc),	1318	)
1165	)	1319	: (
		1320	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1321	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1322	)
1166	}	1323	}
1167		1324
1168	sub size_allocate {	1325	sub size_allocate {
1169	my ($self, $w, $h) = @_;	1326	my ($self, $w, $h) = @_;
1170		1327
1171	($h, $w) = ($w, $h);	1328	my $space = $self->{vertical} ? $h : $w;
1172
1173	my $children = $self->{children};	1329	my $children = $self->{children};
1174		1330
1175	my @h = map $_->{req_w}, @$children;	1331	my @req;
1176		1332
1177	my $req_h = List::Util::sum @h;	1333	if ($self->{homogeneous}) {
1178		1334	@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 {	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 {
1183	my $exp = List::Util::sum map $_->{expand}, @$children;	1343	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1184	$exp ||= 1;
1185		1344
		1345	$space = ($space - $req) / $expand; # remaining space to give away
		1346
		1347	$req[$_] += $space * $children->[$_]{expand}
1186	for (0 .. $#$children) {	1348	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	}	1349	}
1193	}	1350	}
1194		1351
1195	CFClient::UI::harmonize \@h;	1352	CFClient::UI::harmonize \@req;
1196		1353
1197	my $y = 0;	1354	my $pos = 0;
1198	for (0 .. $#$children) {	1355	for (0 .. $#$children) {
1199	my $child = $children->[$_];
1200	my $h = $h[$_];	1356	my $alloc = $req[$_];
1201	$child->configure ($y, 0, $h, $w);	1357	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1202		1358
1203	$y += $h;	1359	$pos += $alloc;
1204	}	1360	}
1205		1361
1206	1	1362	1
1207	}	1363	}
1208		1364
1209	#############################################################################	1365	#############################################################################
1210		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
1211	package CFClient::UI::VBox;	1382	package CFClient::UI::VBox;
1212		1383
1213	# TODO: wrap into common Box base class
1214
1215	our @ISA = CFClient::UI::Container::;	1384	our @ISA = CFClient::UI::Box::;
1216		1385
1217	sub size_request {	1386	sub new {
1218	my ($self) = @_;	1387	my $class = shift;
1219		1388
1220	my @alloc = map [$_->size_request], @{$self->{children}};	1389	$class->SUPER::new (
1221		1390	vertical => 1,
1222	(	1391	@_,
1223	(List::Util::max map $_->[0], @alloc),
1224	(List::Util::sum map $_->[1], @alloc),
1225	)	1392	)
1226	}	1393	}
1227		1394
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	#############################################################################	1395	#############################################################################
1268		1396
1269	package CFClient::UI::Label;	1397	package CFClient::UI::Label;
1270		1398
1271	our @ISA = CFClient::UI::Base::;	1399	our @ISA = CFClient::UI::DrawBG::;
1272		1400
1273	use CFClient::OpenGL;	1401	use CFClient::OpenGL;
1274		1402
1275	sub new {	1403	sub new {
1276	my ($class, %arg) = @_;	1404	my ($class, %arg) = @_;
1277		1405
1278	my $self = $class->SUPER::new (	1406	my $self = $class->SUPER::new (
1279	fg => [1, 1, 1],	1407	fg => [1, 1, 1],
		1408	#bg => none
		1409	#active_bg => none
1280	#font => default_font	1410	#font => default_font
1281	#text => initial text	1411	#text => initial text
1282	#markup => initial narkup	1412	#markup => initial narkup
		1413	#max_w => maximum pixel width
		1414	ellipsise => 3, # end
1283	layout => (new CFClient::Layout),	1415	layout => (new CFClient::Layout),
1284	fontsize => 1,	1416	fontsize => 1,
1285	align => -1,	1417	align => -1,
1286	valign => -1,	1418	valign => -1,
1287	padding => 2,	1419	padding => 2,
…		…
1302	}	1434	}
1303		1435
1304	$self	1436	$self
1305	}	1437	}
1306		1438
1307	sub escape {	1439	sub escape($) {
1308	local $_ = $_[1];	1440	local $_ = $_[0];
1309		1441
1310	s/&/&amp;/g;	1442	s/&/&amp;/g;
1311	s/>/&gt;/g;	1443	s/>/&gt;/g;
1312	s/</&lt;/g;	1444	s/</&lt;/g;
1313		1445
1314	$_[1]	1446	$_
1315	}	1447	}
1316		1448
1317	sub update {	1449	sub update {
1318	my ($self) = @_;	1450	my ($self) = @_;
1319		1451
…		…
1352	sub size_request {	1484	sub size_request {
1353	my ($self) = @_;	1485	my ($self) = @_;
1354		1486
1355	$self->{layout}->set_font ($self->{font}) if $self->{font};	1487	$self->{layout}->set_font ($self->{font}) if $self->{font};
1356	$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});
1357	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1491	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358		1492
1359	my ($w, $h) = $self->{layout}->size;	1493	my ($w, $h) = $self->{layout}->size;
1360		1494
1361	if (exists $self->{template}) {	1495	if (exists $self->{template}) {
…		…
1391	}	1525	}
1392		1526
1393	sub _draw {	1527	sub _draw {
1394	my ($self) = @_;	1528	my ($self) = @_;
1395		1529
		1530	$self->SUPER::_draw; # draw background, if applicable
		1531
1396	my $tex = $self->{texture} ||= do {	1532	my $tex = $self->{texture} ||= do {
1397	$self->{layout}->set_foreground (@{$self->{fg}});	1533	$self->{layout}->set_foreground (@{$self->{fg}});
1398	$self->{layout}->set_font ($self->{font}) if $self->{font};	1534	$self->{layout}->set_font ($self->{font}) if $self->{font};
1399	$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});
1400	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1538	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401		1539
1402	my $tex = new_from_layout CFClient::Texture $self->{layout};	1540	my $tex = new_from_layout CFClient::Texture $self->{layout};
1403		1541
1404	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1542	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1543	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406	: ($self->{w} - $tex->{w}) * 0.5;	1544	: ($self->{w} - $tex->{w}) * 0.5);
1407		1545
1408	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1546	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1409	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1547	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410	: ($self->{h} - $tex->{h}) * 0.5;	1548	: ($self->{h} - $tex->{h}) * 0.5);
1411		1549
1412	$tex	1550	$tex
1413	};	1551	};
1414		1552
1415	glEnable GL_TEXTURE_2D;	1553	glEnable GL_TEXTURE_2D;
…		…
1443	active_fg => [0, 0, 0],	1581	active_fg => [0, 0, 0],
1444	can_hover => 1,	1582	can_hover => 1,
1445	can_focus => 1,	1583	can_focus => 1,
1446	valign => 0,	1584	valign => 0,
1447	can_events => 1,	1585	can_events => 1,
		1586	#text => ...
1448	@_	1587	@_
1449	)	1588	)
1450	}	1589	}
1451		1590
1452	sub _set_text {	1591	sub _set_text {
…		…
1462	$self->{text} = $text;	1601	$self->{text} = $text;
1463		1602
1464	$text =~ s/./*/g if $self->{hidden};	1603	$text =~ s/./*/g if $self->{hidden};
1465	$self->{layout}->set_text ("$text ");	1604	$self->{layout}->set_text ("$text ");
1466		1605
1467	$self->emit (changed => $self->{text});	1606	$self->_emit (changed => $self->{text});
1468	}	1607	}
1469		1608
1470	sub set_text {	1609	sub set_text {
1471	my ($self, $text) = @_;	1610	my ($self, $text) = @_;
1472		1611
1473	$self->{cursor} = length $text;	1612	$self->{cursor} = length $text;
1474	$self->_set_text ($text);	1613	$self->_set_text ($text);
		1614	$self->update;
1475	$self->check_size;	1615	$self->check_size;
1476	$self->update;
1477	}	1616	}
1478		1617
1479	sub get_text {	1618	sub get_text {
1480	$_[0]{text}	1619	$_[0]{text}
1481	}	1620	}
…		…
1484	my ($self) = @_;	1623	my ($self) = @_;
1485		1624
1486	my ($w, $h) = $self->SUPER::size_request;	1625	my ($w, $h) = $self->SUPER::size_request;
1487		1626
1488	($w + 1, $h) # add 1 for cursor	1627	($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	}	1628	}
1496		1629
1497	sub key_down {	1630	sub key_down {
1498	my ($self, $ev) = @_;	1631	my ($self, $ev) = @_;
1499		1632
…		…
1514	} elsif ($sym == CFClient::SDLK_HOME) {	1647	} elsif ($sym == CFClient::SDLK_HOME) {
1515	$self->{cursor} = 0;	1648	$self->{cursor} = 0;
1516	} elsif ($sym == CFClient::SDLK_END) {	1649	} elsif ($sym == CFClient::SDLK_END) {
1517	$self->{cursor} = length $text;	1650	$self->{cursor} = length $text;
1518	} elsif ($uni == 27) {	1651	} elsif ($uni == 27) {
1519	$self->emit ('escape');	1652	$self->_emit ('escape');
1520	} elsif ($uni) {	1653	} elsif ($uni) {
1521	substr $text, $self->{cursor}++, 0, chr $uni;	1654	substr $text, $self->{cursor}++, 0, chr $uni;
1522	}	1655	}
1523		1656
1524	$self->_set_text ($text);	1657	$self->_set_text ($text);
1525	$self->update;	1658	$self->update;
		1659	$self->check_size;
1526	}	1660	}
1527		1661
1528	sub focus_in {	1662	sub focus_in {
1529	my ($self) = @_;	1663	my ($self) = @_;
1530		1664
…		…
1610	if ($sym == 13) {	1744	if ($sym == 13) {
1611	unshift @{$self->{history}},	1745	unshift @{$self->{history}},
1612	my $txt = $self->get_text;	1746	my $txt = $self->get_text;
1613	$self->{history_pointer} = -1;	1747	$self->{history_pointer} = -1;
1614	$self->{history_saveback} = '';	1748	$self->{history_saveback} = '';
1615	$self->emit (activate => $txt);	1749	$self->_emit (activate => $txt);
1616	$self->update;	1750	$self->update;
1617		1751
1618	} elsif ($sym == CFClient::SDLK_UP) {	1752	} elsif ($sym == CFClient::SDLK_UP) {
1619	if ($self->{history_pointer} < 0) {	1753	if ($self->{history_pointer} < 0) {
1620	$self->{history_saveback} = $self->get_text;	1754	$self->{history_saveback} = $self->get_text;
…		…
1659	my $class = shift;	1793	my $class = shift;
1660		1794
1661	$class->SUPER::new (	1795	$class->SUPER::new (
1662	padding => 4,	1796	padding => 4,
1663	fg => [1, 1, 1],	1797	fg => [1, 1, 1],
1664	bg => [1, 1, 1, 0.2],
1665	active_fg => [0, 0, 1],	1798	active_fg => [0, 0, 1],
1666	can_hover => 1,	1799	can_hover => 1,
1667	align => 0,	1800	align => 0,
1668	valign => 0,	1801	valign => 0,
1669	can_events => 1,	1802	can_events => 1,
1670	@_	1803	@_
1671	)	1804	)
1672	}	1805	}
1673		1806
		1807	sub activate { }
		1808
1674	sub button_up {	1809	sub button_up {
1675	my ($self, $ev, $x, $y) = @_;	1810	my ($self, $ev, $x, $y) = @_;
1676		1811
		1812	$self->emit ("activate")
1677	if ($x >= 0 && $x < $self->{w}	1813	if $x >= 0 && $x < $self->{w}
1678	&& $y >= 0 && $y < $self->{h}) {	1814	&& $y >= 0 && $y < $self->{h};
1679	$self->emit ("activate");
1680	}
1681	}	1815	}
1682		1816
1683	sub _draw {	1817	sub _draw {
1684	my ($self) = @_;	1818	my ($self) = @_;
1685		1819
…		…
1717		1851
1718	$class->SUPER::new (	1852	$class->SUPER::new (
1719	padding => 2,	1853	padding => 2,
1720	fg => [1, 1, 1],	1854	fg => [1, 1, 1],
1721	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],
1722	state => 0,	1858	state => 0,
1723	can_hover => 1,	1859	can_hover => 1,
1724	@_	1860	@_
1725	)	1861	)
1726	}	1862	}
…		…
1735	my ($self, $ev, $x, $y) = @_;	1871	my ($self, $ev, $x, $y) = @_;
1736		1872
1737	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1873	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1738	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1874	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1739	$self->{state} = !$self->{state};	1875	$self->{state} = !$self->{state};
1740	$self->emit (changed => $self->{state});	1876	$self->_emit (changed => $self->{state});
1741	}	1877	}
1742	}	1878	}
1743		1879
1744	sub _draw {	1880	sub _draw {
1745	my ($self) = @_;	1881	my ($self) = @_;
…		…
2018	# TODO: req_w/h are wrong with vertical	2154	# TODO: req_w/h are wrong with vertical
2019	# TODO: calculations are off	2155	# TODO: calculations are off
2020	my $self = $class->SUPER::new (	2156	my $self = $class->SUPER::new (
2021	fg => [1, 1, 1],	2157	fg => [1, 1, 1],
2022	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],
2023	range => [0, 0, 100, 10],	2161	range => [0, 0, 100, 10, 0],
2024	req_w => $::WIDTH / 80,	2162	req_w => $::WIDTH / 80,
2025	req_h => $::WIDTH / 80,	2163	req_h => $::WIDTH / 80,
2026	vertical => 0,	2164	vertical => 0,
2027	can_hover => 1,	2165	can_hover => 1,
2028	inner_pad => .05,	2166	inner_pad => 0.02,
2029	@_	2167	@_
2030	);	2168	);
2031		2169
2032	$self->set_value ($self->{range}[0]);	2170	$self->set_value ($self->{range}[0]);
2033	$self->update;	2171	$self->update;
2034		2172
2035	$self	2173	$self
2036	}	2174	}
2037		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
2038	sub set_value {	2185	sub set_value {
2039	my ($self, $value) = @_;	2186	my ($self, $value) = @_;
2040		2187
2041	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2188	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2042		2189
2043	$hi = $lo + 1 if $hi <= $lo;	2190	$hi = $lo + 1 if $hi <= $lo;
2044		2191
		2192	$page = $hi - $lo if $page > $hi - $lo;
		2193
2045	$value = $lo if $value < $lo;	2194	$value = $lo if $value < $lo;
2046	$value = $hi if $value > $hi;	2195	$value = $hi - $page if $value > $hi - $page;
2047		2196
2048	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2197	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2049	if $unit;	2198	if $unit;
2050		2199
2051	$page = $hi - $lo if $page > $hi - $lo;
2052
2053	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2200	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2054		2201
2055	if ($value != $old_value) {	2202	if ($value != $old_value) {
2056	$self->emit (changed => $value);	2203	$self->_emit (changed => $value);
2057	$self->update;	2204	$self->update;
2058	}	2205	}
2059	}	2206	}
2060		2207
2061	sub size_request {	2208	sub size_request {
…		…
2069		2216
2070	sub button_down {	2217	sub button_down {
2071	my ($self, $ev, $x, $y) = @_;	2218	my ($self, $ev, $x, $y) = @_;
2072		2219
2073	$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
2074	$self->mouse_motion ($ev, $x, $y);	2224	$self->mouse_motion ($ev, $x, $y);
2075	}	2225	}
2076		2226
2077	sub mouse_motion {	2227	sub mouse_motion {
2078	my ($self, $ev, $x, $y) = @_;	2228	my ($self, $ev, $x, $y) = @_;
…		…
2080	if ($GRAB == $self) {	2230	if ($GRAB == $self) {
2081	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2231	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2082		2232
2083	my (undef, $lo, $hi, $page) = @{$self->{range}};	2233	my (undef, $lo, $hi, $page) = @{$self->{range}};
2084		2234
2085	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2235	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2086		2236
2087	$self->set_value ($x * ($hi - $lo) + $lo);	2237	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2088	}	2238	}
2089	}	2239	}
2090		2240
2091	sub update {	2241	sub update {
2092	my ($self) = @_;	2242	my ($self) = @_;
2093		2243
2094	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2244	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2095	$self->set_value ($self->{range}[0]);	2245	$self->set_value ($self->{range}[0]);
2096		2246
2097	my ($value, $lo, $hi, $page) = @{$self->{range}};	2247	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2248	my $range = ($hi - $page - $lo) || 1e-100;
2098		2249
2099	my $inner_w = 1 - 2 * $self->{inner_pad};	2250	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2100		2251
2101	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2252	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2253	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2102		2254
2103	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2255	$value = ($value - $lo) / $range;
2104	$value = $self->{scale} * ($value - $lo);	2256	$value = $value * $self->{scale} + $self->{offset};
2105		2257
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;	2258	$self->{knob_x} = $value - $knob_w * 0.5;
2112	$self->{knob_w} = $page;	2259	$self->{knob_w} = $knob_w;
2113	});	2260	});
2114		2261
2115	$self->SUPER::update;	2262	$self->SUPER::update;
2116	}	2263	}
2117		2264
…		…
2123	glScale $self->{w}, $self->{h};	2270	glScale $self->{w}, $self->{h};
2124		2271
2125	if ($self->{vertical}) {	2272	if ($self->{vertical}) {
2126	# draw a vertical slider like a rotated horizontal slider	2273	# draw a vertical slider like a rotated horizontal slider
2127		2274
		2275	glTranslate 1, 0, 0;
2128	glRotate 90, 0, 0, 1;	2276	glRotate 90, 0, 0, 1;
2129	glTranslate 0, 1, 0;
2130	}	2277	}
2131		2278
2132	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2279	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2133	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2280	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2134		2281
…		…
2141	# draw handle	2288	# draw handle
2142	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2289	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2143		2290
2144	glDisable GL_TEXTURE_2D;	2291	glDisable GL_TEXTURE_2D;
2145	}	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 (@_) }
2146		2334
2147	#############################################################################	2335	#############################################################################
2148		2336
2149	package CFClient::UI::TextView;	2337	package CFClient::UI::TextView;
2150		2338
…		…
2180		2368
2181	$self->{fontsize} = $fontsize;	2369	$self->{fontsize} = $fontsize;
2182	$self->reflow;	2370	$self->reflow;
2183	}	2371	}
2184		2372
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 {	2373	sub size_allocate {
2205	my ($self, $w, $h) = @_;	2374	my ($self, $w, $h) = @_;
2206		2375
2207	$self->SUPER::size_allocate ($w, $h);	2376	$self->SUPER::size_allocate ($w, $h);
2208		2377
…		…
2211	$self->{layout}->set_width ($self->{children}[0]{w});	2380	$self->{layout}->set_width ($self->{children}[0]{w});
2212		2381
2213	$self->reflow;	2382	$self->reflow;
2214	}	2383	}
2215		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
2216	sub add_paragraph {	2419	sub add_paragraph {
2217	my ($self, $color, $text) = @_;	2420	my ($self, $color, $text, $indent) = @_;
2218		2421
2219	#TODO: intelligently "reformat" paragraph	2422	for my $line (split /\n/, $text) {
2220		2423	my ($w, $h) = $self->text_size ($line);
2221	my $height = $self->text_height ($text);
2222
2223	$self->{height} += $height;	2424	$self->{height} += $h;
		2425	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2426	}
2224		2427
2225	push @{$self->{par}}, [$height, $color, $text];
2226
2227	$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]);
2228	$self->{children}[1]->update;
2229	}	2429	}
2230		2430
2231	sub update {	2431	sub update {
2232	my ($self) = @_;	2432	my ($self) = @_;
2233		2433
…		…
2236	return unless $self->{h} > 0;	2436	return unless $self->{h} > 0;
2237		2437
2238	delete $self->{texture};	2438	delete $self->{texture};
2239		2439
2240	$ROOT->on_post_alloc ($self, sub {	2440	$ROOT->on_post_alloc ($self, sub {
		2441	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2442
2241	if (delete $self->{need_reflow}) {	2443	if (delete $self->{need_reflow}) {
2242	my $height = 0;	2444	my $height = 0;
2243		2445
2244	$height += $_->[0] = $self->text_height ($_->[2])	2446	my $layout = $self->{layout};
		2447
		2448	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2449
2245	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	}
2246		2461
2247	$self->{height} = $height;	2462	$self->{height} = $height;
2248		2463
2249	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2464	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2250		2465
2251	delete $self->{texture};	2466	delete $self->{texture};
2252	}	2467	}
2253		2468
2254	$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 {
2255	glClearColor 0, 0, 0, 0;	2470	glClearColor 0.5, 0.5, 0.5, 0;
2256	glClear GL_COLOR_BUFFER_BIT;	2471	glClear GL_COLOR_BUFFER_BIT;
2257		2472
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];	2473	my $top = int $self->{children}[1]{range}[0];
2262		2474
2263	my $y0 = $top;	2475	my $y0 = $top;
2264	my $y1 = $top + $self->{h};	2476	my $y1 = $top + $H;
2265		2477
2266	my $y = 0;	2478	my $y = 0;
2267		2479
2268	my $layout = $self->{layout};	2480	my $layout = $self->{layout};
2269		2481
2270	$layout->set_font ($self->{font}) if $self->{font};	2482	$layout->set_font ($self->{font}) if $self->{font};
2271		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
2272	for my $par (@{$self->{par}}) {	2488	for my $par (@{$self->{par}}) {
2273	my $h = $par->[0];	2489	my $h = $par->[1];
2274		2490
2275	if ($y0 < $y + $h && $y < $y1) {	2491	if ($y0 < $y + $h && $y < $y1) {
2276	$layout->set_foreground (@{ $par->[1] });	2492	$layout->set_foreground (@{ $par->[2] });
		2493	$layout->set_width ($W - $par->[3]);
2277	$layout->set_markup ($par->[2]);	2494	$layout->set_markup ($par->[4]);
2278		2495
2279	my ($W, $H) = $layout->size;	2496	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280	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;
2281	}	2500	}
2282		2501
2283	$y += $h;	2502	$y += $h;
2284	}	2503	}
2285		2504
2286	glDisable GL_TEXTURE_2D;	2505	glDisable GL_BLEND;
2287	};	2506	};
2288	});	2507	});
2289	}	2508	}
2290		2509
2291	sub _draw {	2510	sub _draw {
2292	my ($self) = @_;	2511	my ($self) = @_;
2293		2512
2294	glEnable GL_TEXTURE_2D;	2513	glEnable GL_TEXTURE_2D;
2295	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2514	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296	glColor 1, 1, 1, 1;	2515	glColor 1, 1, 1, 1;
2297	$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});
2298	glDisable GL_TEXTURE_2D;	2517	glDisable GL_TEXTURE_2D;
2299		2518
2300	$self->{children}[1]->draw;	2519	$self->{children}[1]->draw;
2301		2520
2302	}	2521	}
…		…
2351		2570
2352	sub new {	2571	sub new {
2353	my $class = shift;	2572	my $class = shift;
2354		2573
2355	my $self = $class->SUPER::new (	2574	my $self = $class->SUPER::new (
2356	state => 0,	2575	state => 0,
2357	connect_activate => \&toggle_flopper,	2576	on_activate => \&toggle_flopper,
2358	@_	2577	@_
2359	);	2578	);
2360		2579
2361	if ($self->{state}) {
2362	$self->{state} = 0;
2363	$self->toggle_flopper;
2364	}
2365
2366	$self	2580	$self
2367	}	2581	}
2368		2582
2369	sub toggle_flopper {	2583	sub toggle_flopper {
2370	my ($self) = @_;	2584	my ($self) = @_;
2371		2585
2372	# TODO: use animation	2586	$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	}	2587	}
2384		2588
2385	#############################################################################	2589	#############################################################################
2386		2590
2387	package CFClient::UI::Tooltip;	2591	package CFClient::UI::Tooltip;
…		…
2401		2605
2402	sub set_tooltip_from {	2606	sub set_tooltip_from {
2403	my ($self, $widget) = @_;	2607	my ($self, $widget) = @_;
2404		2608
2405	$self->add (new CFClient::UI::Label	2609	$self->add (new CFClient::UI::Label
2406	markup => $widget->{tooltip},	2610	markup => $widget->{tooltip},
2407	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2611	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408	fontsize => 0.8,	2612	fontsize => 0.8,
2409	fg => [0, 0, 0, 1],	2613	fg => [0, 0, 0, 1],
		2614	ellipsise => 0,
2410	font => ($widget->{tooltip_font} || $::FONT_PROP),	2615	font => ($widget->{tooltip_font} || $::FONT_PROP),
2411	);	2616	);
2412	}	2617	}
2413		2618
2414	sub size_request {	2619	sub size_request {
2415	my ($self) = @_;	2620	my ($self) = @_;
…		…
2461	use CFClient::OpenGL;	2666	use CFClient::OpenGL;
2462		2667
2463	sub new {	2668	sub new {
2464	my $class = shift;	2669	my $class = shift;
2465		2670
2466	$class->SUPER::new (	2671	my $self = $class->SUPER::new (
2467	aspect => 1,	2672	aspect => 1,
		2673	can_events => 0,
2468	@_,	2674	@_,
2469	)	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
2470	}	2692	}
2471		2693
2472	sub size_request {	2694	sub size_request {
2473	(32, 8)	2695	(32, 8)
2474	}	2696	}
2475		2697
		2698	sub update {
		2699	my ($self) = @_;
		2700
		2701	return unless $self->{visible};
		2702
		2703	$self->SUPER::update;
		2704	}
		2705
2476	sub _draw {	2706	sub _draw {
2477	my ($self) = @_;	2707	my ($self) = @_;
2478		2708
2479	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
2480	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2720	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2481		2721
2482	# TODO animation
2483	if ($tex) {	2722	if ($tex) {
2484	glEnable GL_TEXTURE_2D;	2723	glEnable GL_TEXTURE_2D;
2485	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2724	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2486	glColor 1, 1, 1, 1;	2725	glColor 1, 1, 1, 1;
2487	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2726	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2488	glDisable GL_TEXTURE_2D;	2727	glDisable GL_TEXTURE_2D;
2489	}	2728	}
2490	}	2729	}
2491		2730
2492	#############################################################################	2731	sub DESTROY {
		2732	my ($self) = @_;
2493		2733
		2734	$self->{timer}->cancel
		2735	if $self->{timer};
		2736
		2737	$self->SUPER::DESTROY;
		2738	}
		2739
		2740	#############################################################################
		2741
2494	package CFClient::UI::InventoryItem;	2742	package CFClient::UI::Inventory;
2495		2743
2496	our @ISA = CFClient::UI::HBox::;	2744	our @ISA = CFClient::UI::ScrolledWindow::;
2497		2745
2498	sub new {	2746	sub new {
2499	my $class = shift;	2747	my $class = shift;
2500		2748
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 (	2749	my $self = $class->SUPER::new (
2525	can_hover => 1,	2750	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	@_,	2751	@_,
2584	);	2752	);
2585		2753
2586	$self	2754	$self
2587	}	2755	}
…		…
2597	or ($a->{name} cmp $b->{name})	2765	or ($a->{name} cmp $b->{name})
2598	} @$items;	2766	} @$items;
2599		2767
2600	$self->{real_items} = \@items;	2768	$self->{real_items} = \@items;
2601		2769
		2770	my $row = 0;
2602	for my $item (@items) {	2771	for my $item (@items) {
2603	my $desc = $item->{nrof} < 2	2772	CFClient::Item::update_widgets $item;
2604	? $item->{name}
2605	: "$item->{nrof} $item->{name_pl}";
2606		2773
2607	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2774	$self->{scrolled}->add (0, $row, $item->{face_widget});
2608	}	2775	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2776	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2609		2777
2610	$self->{scrolled}->add (@items);	2778	$row++;
2611		2779	}
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	}	2780	}
2619		2781
2620	#############################################################################	2782	#############################################################################
2621		2783
2622	package CFClient::UI::Menu;	2784	package CFClient::UI::Menu;
…		…
2657		2819
2658	# 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)
2659	sub popup {	2821	sub popup {
2660	my ($self, $ev) = @_;	2822	my ($self, $ev) = @_;
2661		2823
2662	$self->emit ("popdown");	2824	$self->_emit ("popdown");
2663		2825
2664	# maybe save $GRAB? must be careful about events...	2826	# maybe save $GRAB? must be careful about events...
2665	$GRAB = $self;	2827	$GRAB = $self;
2666	$self->{button} = $ev->{button};	2828	$self->{button} = $ev->{button};
2667		2829
…		…
2682		2844
2683	if ($ev->{button} == $self->{button}) {	2845	if ($ev->{button} == $self->{button}) {
2684	undef $GRAB;	2846	undef $GRAB;
2685	$self->hide;	2847	$self->hide;
2686		2848
2687	$self->emit ("popdown");	2849	$self->_emit ("popdown");
2688	$self->{hover}[1]->() if $self->{hover};	2850	$self->{hover}[1]->() if $self->{hover};
2689	}	2851	}
2690	}	2852	}
2691		2853
2692	#############################################################################	2854	#############################################################################
2693		2855
2694	package CFClient::UI::Statusbox;	2856	package CFClient::UI::Statusbox;
2695		2857
2696	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	}
2697		2868
2698	sub reorder {	2869	sub reorder {
2699	my ($self) = @_;	2870	my ($self) = @_;
2700	my $NOW = time;	2871	my $NOW = time;
2701		2872
…		…
2721	: $item->{text};	2892	: $item->{text};
2722		2893
2723	for ($short) {	2894	for ($short) {
2724	s/^\s+//;	2895	s/^\s+//;
2725	s/\s+/ /g;	2896	s/\s+/ /g;
2726	my $len = int 40 / $item->{fontsize};
2727	substr $_, $len, length, "…" if $len < length;
2728	}	2897	}
2729		2898
2730	new CFClient::UI::Label	2899	new CFClient::UI::Label
2731	markup => $short,	2900	markup => $short,
2732	tooltip => $item->{tooltip},	2901	tooltip => $item->{tooltip},
2733	tooltip_font => $::FONT_PROP,	2902	tooltip_font => $::FONT_PROP,
2734	tooltip_width => 0.67,	2903	tooltip_width => 0.67,
2735	fontsize => $item->{fontsize},	2904	fontsize => $item->{fontsize} || $self->{fontsize},
		2905	max_w => $::WIDTH * 0.44,
2736	fg => $item->{fg},	2906	fg => $item->{fg},
2737	can_events => 1,	2907	can_events => 1,
2738	can_hover => 1	2908	can_hover => 1
2739	};	2909	};
2740	}	2910	}
…		…
2746	sub add {	2916	sub add {
2747	my ($self, $text, %arg) = @_;	2917	my ($self, $text, %arg) = @_;
2748		2918
2749	$text =~ s/^\s+//;	2919	$text =~ s/^\s+//;
2750	$text =~ s/\s+$//;	2920	$text =~ s/\s+$//;
		2921
		2922	return unless $text;
2751		2923
2752	my $timeout = time + ((delete $arg{timeout}) || 60);	2924	my $timeout = time + ((delete $arg{timeout}) || 60);
2753		2925
2754	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2926	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2755		2927
…		…
2767	$self->{item}{$group} = {	2939	$self->{item}{$group} = {
2768	id => ++$self->{id},	2940	id => ++$self->{id},
2769	text => $text,	2941	text => $text,
2770	timeout => $timeout,	2942	timeout => $timeout,
2771	tooltip => $text,	2943	tooltip => $text,
2772	fontsize => 0.8,
2773	fg => [0.8, 0.8, 0.8, 0.8],	2944	fg => [0.8, 0.8, 0.8, 0.8],
2774	pri => 0,	2945	pri => 0,
2775	count => 1,	2946	count => 1,
2776	%arg,	2947	%arg,
2777	};	2948	};
2778	}	2949	}
2779		2950
2780	$self->reorder;	2951	$self->reorder;
2781	}	2952	}
2782		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
2783	#############################################################################	2964	#############################################################################
2784		2965
2785	package CFClient::UI::Root;	2966	package CFClient::UI::Root;
2786		2967
2787	our @ISA = CFClient::UI::Container::;	2968	our @ISA = CFClient::UI::Container::;
…		…
2790		2971
2791	sub new {	2972	sub new {
2792	my $class = shift;	2973	my $class = shift;
2793		2974
2794	$class->SUPER::new (	2975	$class->SUPER::new (
		2976	visible => 1,
2795	@_,	2977	@_,
2796	)	2978	)
2797	}	2979	}
2798		2980
2799	sub configure {	2981	sub configure {
…		…
2817	}	2999	}
2818		3000
2819	sub size_allocate {	3001	sub size_allocate {
2820	my ($self, $w, $h) = @_;	3002	my ($self, $w, $h) = @_;
2821		3003
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) {	3004	for my $child ($self->children) {
2829	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)};
2830		3006
2831	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3007	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2832	if exists $child->{req_x};	3008	if exists $child->{req_x};
2833		3009
2834	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3010	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2835	if exists $child->{req_y};	3011	if exists $child->{req_y};
2836		3012
		3013	delete @$child{qw(req_x req_y)};
		3014
2837	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3015	$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;	3016	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2839		3017
2840	$child->configure ($X, $Y, $W, $H);	3018	$child->configure ($X, $Y, $W, $H);
2841	}	3019	}
…		…
2862		3040
2863	sub add {	3041	sub add {
2864	my ($self, @children) = @_;	3042	my ($self, @children) = @_;
2865		3043
2866	for my $child (@children) {	3044	for my $child (@children) {
2867	$child->{toplevel} = 1;	3045	$child->{is_toplevel} = 1;
2868		3046
2869	# integerise window positions	3047	# integerise window positions
2870	$child->{x} = int $child->{x};	3048	$child->{x} = int $child->{x};
2871	$child->{y} = int $child->{y};	3049	$child->{y} = int $child->{y};
2872	}	3050	}
2873		3051
2874	$self->SUPER::add (@children);	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	}
2875	}	3071	}
2876		3072
2877	sub on_refresh {	3073	sub on_refresh {
2878	my ($self, $id, $cb) = @_;	3074	my ($self, $id, $cb) = @_;
2879		3075
…		…
2893	$_->()	3089	$_->()
2894	for values %{delete $self->{refresh_hook}};	3090	for values %{delete $self->{refresh_hook}};
2895	}	3091	}
2896		3092
2897	if ($self->{check_size}) {	3093	if ($self->{check_size}) {
2898	my @queue = ([], []);	3094	my @queue;
2899		3095
2900	for (;;) {	3096	for (;;) {
2901	if ($self->{check_size}) {	3097	if ($self->{check_size}) {
2902	# heuristic: check containers last	3098	#TODO use array-of-depth approach
2903	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3099
		3100	@queue = sort { $a->{visible} <=> $b->{visible} }
2904	for values %{delete $self->{check_size}}	3101	@queue, values %{delete $self->{check_size}};
2905	}	3102	}
2906		3103
2907	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3104	my $widget = pop @queue || last;
2908		3105
		3106	defined $widget->{visible} or last; # do not resize invisible widgets
		3107
2909	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3108	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2910	? @$widget{qw(user_w user_h)}	3109	? @$widget{qw(def_w def_h)}
2911	: $widget->size_request;	3110	: $widget->size_request;
2912		3111
2913	if (delete $widget->{force_alloc}	3112	if (delete $widget->{force_alloc}
2914	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3113	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2915	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#
…		…
2924	}	3123	}
2925	}	3124	}
2926	}	3125	}
2927		3126
2928	while ($self->{size_alloc}) {	3127	while ($self->{size_alloc}) {
		3128	for (
		3129	sort { $a->[0]{visible} <=> $b->[0]{visible} }
2929	for (values %{delete $self->{size_alloc}}) {	3130	values %{delete $self->{size_alloc}}
		3131	) {
2930	my ($widget, $w, $h) = @$_;	3132	my ($widget, $w, $h) = @$_;
2931		3133
2932	$w = 0 if $w < 0;	3134	$w = 0 if $w < 0;
2933	$h = 0 if $h < 0;	3135	$h = 0 if $h < 0;
2934		3136
2935	$widget->{w} = $w;	3137	$widget->{w} = $w;
2936	$widget->{h} = $h;	3138	$widget->{h} = $h;
2937	$widget->size_allocate ($w, $h);
2938	$widget->emit (size_allocate => $w, $h);	3139	$widget->emit (size_allocate => $w, $h);
2939	}	3140	}
2940	}	3141	}
2941		3142
2942	while ($self->{post_alloc_hook}) {	3143	while ($self->{post_alloc_hook}) {
…		…
2948	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3149	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2949	glClear GL_COLOR_BUFFER_BIT;	3150	glClear GL_COLOR_BUFFER_BIT;
2950		3151
2951	glMatrixMode GL_PROJECTION;	3152	glMatrixMode GL_PROJECTION;
2952	glLoadIdentity;	3153	glLoadIdentity;
2953	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3154	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2954	glMatrixMode GL_MODELVIEW;	3155	glMatrixMode GL_MODELVIEW;
2955	glLoadIdentity;	3156	glLoadIdentity;
2956		3157
2957	$self->_draw;	3158	$self->_draw;
2958	}	3159	}
…		…
2960	#############################################################################	3161	#############################################################################
2961		3162
2962	package CFClient::UI;	3163	package CFClient::UI;
2963		3164
2964	$ROOT = new CFClient::UI::Root;	3165	$ROOT = new CFClient::UI::Root;
2965	$TOOLTIP = new CFClient::UI::Tooltip;	3166	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2966		3167
2967	1	3168	1
2968		3169

Diff Legend

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