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.206 by root, Mon May 15 17:45:29 2006 UTC vs.
Revision 1.247 by root, Sun May 28 01:16:04 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
…		…
195	%$self = ();	240	%$self = ();
196	}	241	}
197		242
198	sub show {	243	sub show {
199	my ($self) = @_;	244	my ($self) = @_;
200
201	return if $self->{parent};	245	return if $self->{parent};
202		246
203	$CFClient::UI::ROOT->add ($self);	247	$CFClient::UI::ROOT->add ($self);
204	}	248	}
205		249
206	sub hide {	250	sub center {
207	my ($self) = @_;	251	my ($self) = @_;
		252
		253	$CFClient::UI::ROOT->on_post_alloc (
		254	"center_$self" => sub {
		255	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		256	},
		257	);
		258
		259	$self->update;
		260	}
		261
		262	sub set_visible {
		263	my ($self) = @_;
		264
		265	return if $self->{visible};
		266
		267	$self->{root} = $self->{parent}{root};
		268	$self->{visible} = $self->{parent}{visible} + 1;
		269
		270	$self->emit (visibility_change => 1)
		271	}
		272
		273	sub set_invisible {
		274	my ($self) = @_;
		275
		276	return unless $self->{visible};
		277
		278	# broken show/hide model
		279
		280	delete $self->{root};
		281	delete $self->{visible};
208		282
209	undef $GRAB if $GRAB == $self;	283	undef $GRAB if $GRAB == $self;
210	undef $HOVER if $HOVER == $self;	284	undef $HOVER if $HOVER == $self;
		285
		286	CFClient::UI::check_tooltip
		287	if $CFClient::UI::TOOLTIP->{owner} == $self;
		288
		289	$self->focus_out;
		290
		291	$self->emit (visibility_change => 0);
		292	}
		293
		294	sub hide {
		295	my ($self) = @_;
		296
		297	$self->set_invisible;
211		298
212	$self->{parent}->remove ($self)	299	$self->{parent}->remove ($self)
213	if $self->{parent};	300	if $self->{parent};
214	}	301	}
215		302
…		…
224	}	311	}
225		312
226	sub set_size {	313	sub set_size {
227	my ($self, $w, $h) = @_;	314	my ($self, $w, $h) = @_;
228		315
229	$self->{user_w} = $w;	316	$self->{def_w} = $w;
230	$self->{user_h} = $h;	317	$self->{def_h} = $h;
231		318
232	$self->check_size;	319	$self->check_size;
233	}	320	}
234		321
235	sub size_request {	322	sub size_request {
…		…
282		369
283	delete $self->{max_w}; $self->{max_w} = $w if $w;	370	delete $self->{max_w}; $self->{max_w} = $w if $w;
284	delete $self->{max_h}; $self->{max_h} = $h if $h;	371	delete $self->{max_h}; $self->{max_h} = $h if $h;
285	}	372	}
286		373
		374	sub set_tooltip {
		375	my ($self, $tooltip) = @_;
		376
		377	$tooltip =~ s/^\s+//;
		378	$tooltip =~ s/\s+$//;
		379
		380	return if $self->{tooltip} eq $tooltip;
		381
		382	$self->{tooltip} = $tooltip;
		383
		384	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		385	delete $CFClient::UI::TOOLTIP->{owner};
		386	CFClient::UI::check_tooltip;
		387	}
		388	}
		389
287	# translate global coordinates to local coordinate system	390	# translate global coordinates to local coordinate system
288	sub coord2local {	391	sub coord2local {
289	my ($self, $x, $y) = @_;	392	my ($self, $x, $y) = @_;
290		393
291	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	394	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
…		…
304	return if $FOCUS == $self;	407	return if $FOCUS == $self;
305	return unless $self->{can_focus};	408	return unless $self->{can_focus};
306		409
307	my $focus = $FOCUS; $FOCUS = $self;	410	my $focus = $FOCUS; $FOCUS = $self;
308		411
309	$self->emit (focus_in => $focus);	412	$self->_emit (focus_in => $focus);
310		413
311	$focus->update if $focus;	414	$focus->update if $focus;
312	$FOCUS->update;	415	$FOCUS->update;
313	}	416	}
314		417
…		…
317		420
318	return unless $FOCUS == $self;	421	return unless $FOCUS == $self;
319		422
320	my $focus = $FOCUS; undef $FOCUS;	423	my $focus = $FOCUS; undef $FOCUS;
321		424
322	$self->emit (focus_out => $focus);	425	$self->_emit (focus_out => $focus);
323		426
324	$focus->update if $focus; #?	427	$focus->update if $focus; #?
		428
		429	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		430	unless $FOCUS;
325	}	431	}
326		432
327	sub mouse_motion { }	433	sub mouse_motion { }
328	sub button_up { }	434	sub button_up { }
329	sub key_down { }	435	sub key_down { }
330	sub key_up { }	436	sub key_up { }
331		437
332	sub button_down {	438	sub button_down {
333	my ($self, $ev, $x, $y) = @_;	439	my ($self, $ev, $x, $y) = @_;
334		440
335	$self->focus_in;	441	$self->focus_in;
…		…
369	if ($ENV{PCLIENT_DEBUG}) {	475	if ($ENV{PCLIENT_DEBUG}) {
370	glPushMatrix;	476	glPushMatrix;
371	glColor 1, 1, 0, 1;	477	glColor 1, 1, 0, 1;
372	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	478	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373	glBegin GL_LINE_LOOP;	479	glBegin GL_LINE_LOOP;
374	glVertex 0 , 0;	480	glVertex 0 , 0;
375	glVertex $self->{w}, 0;	481	glVertex $self->{w} - 1, 0;
376	glVertex $self->{w}, $self->{h};	482	glVertex $self->{w} - 1, $self->{h} - 1;
377	glVertex 0 , $self->{h};	483	glVertex 0 , $self->{h} - 1;
378	glEnd;	484	glEnd;
379	glPopMatrix;	485	glPopMatrix;
380	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	486	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
381	}	487	}
382	}	488	}
…		…
402	sub set_parent {	508	sub set_parent {
403	my ($self, $parent) = @_;	509	my ($self, $parent) = @_;
404		510
405	Scalar::Util::weaken ($self->{parent} = $parent);	511	Scalar::Util::weaken ($self->{parent} = $parent);
406		512
407	# TODO: req_w _does_change after ->reconfigure	513	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
		514
408	$self->check_size	515	$self->check_size;
409	unless exists $self->{req_w};
410	}	516	}
411		517
412	sub check_size {	518	sub check_size {
413	my ($self, $forced) = @_;	519	my ($self, $forced) = @_;
414		520
…		…
427	my ($self, $signal, $cb) = @_;	533	my ($self, $signal, $cb) = @_;
428		534
429	push @{ $self->{signal_cb}{$signal} }, $cb;	535	push @{ $self->{signal_cb}{$signal} }, $cb;
430	}	536	}
431		537
		538	sub _emit {
		539	my ($self, $signal, @args) = @_;
		540
		541	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		542	}
		543
432	sub emit {	544	sub emit {
433	my ($self, $signal, @args) = @_;	545	my ($self, $signal, @args) = @_;
434		546
435	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	547	$self->_emit ($signal, @args)
		548	|| $self->$signal (@args);
		549	}
		550
		551	sub visibility_change {
		552	#my ($self, $visible) = @_;
436	}	553	}
437		554
438	sub DESTROY {	555	sub DESTROY {
439	my ($self) = @_;	556	my ($self) = @_;
440		557
…		…
455	my $class = shift;	572	my $class = shift;
456		573
457	# range [value, low, high, page]	574	# range [value, low, high, page]
458		575
459	$class->SUPER::new (	576	$class->SUPER::new (
460	bg => [0, 0, 0, 0.2],	577	#bg => [0, 0, 0, 0.2],
461	active_bg => [1, 1, 1, 0.5],	578	#active_bg => [1, 1, 1, 0.5],
462	@_	579	@_
463	)	580	)
464	}	581	}
465		582
466	sub _draw {	583	sub _draw {
467	my ($self) = @_;	584	my ($self) = @_;
468		585
		586	my $color = $FOCUS == $self && $self->{active_bg}
		587	? $self->{active_bg}
		588	: $self->{bg};
		589
		590	if ($color && (@$color < 4 || $color->[3])) {
469	my ($w, $h) = @$self{qw(w h)};	591	my ($w, $h) = @$self{qw(w h)};
470		592
471	glEnable GL_BLEND;	593	glEnable GL_BLEND;
472	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	594	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	595	glColor @$color;
474		596
475	glBegin GL_QUADS;	597	glBegin GL_QUADS;
476	glVertex 0 , 0;	598	glVertex 0 , 0;
477	glVertex 0 , $h;	599	glVertex 0 , $h;
478	glVertex $w, $h;	600	glVertex $w, $h;
479	glVertex $w, 0;	601	glVertex $w, 0;
480	glEnd;	602	glEnd;
481		603
482	glDisable GL_BLEND;	604	glDisable GL_BLEND;
		605	}
483	}	606	}
484		607
485	#############################################################################	608	#############################################################################
486		609
487	package CFClient::UI::Empty;	610	package CFClient::UI::Empty;
…		…
547	delete $child->{parent};	670	delete $child->{parent};
548	$child->hide;	671	$child->hide;
549		672
550	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	673	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551		674
552	$self->check_size;	675	$self->check_size (1);
553	$self->update;	676	$self->update;
554	}	677	}
555		678
556	sub clear {	679	sub clear {
557	my ($self) = @_;	680	my ($self) = @_;
…		…
671	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	794	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672	glClearColor 0, 0, 0, 0;	795	glClearColor 0, 0, 0, 0;
673	glClear GL_COLOR_BUFFER_BIT;	796	glClear GL_COLOR_BUFFER_BIT;
674		797
675	$self->_render;	798	$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	};	799	};
684	}	800	}
685		801
686	sub _draw {	802	sub _draw {
687	my ($self) = @_;	803	my ($self) = @_;
…		…
691	my $tex = $self->{texture}	807	my $tex = $self->{texture}
692	or return;	808	or return;
693		809
694	glEnable GL_TEXTURE_2D;	810	glEnable GL_TEXTURE_2D;
695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	811	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696	glColor 0, 0, 0, 1;	812	glColor 1, 1, 1, 1;
697		813
698	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	814	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699		815
700	glDisable GL_TEXTURE_2D;	816	glDisable GL_TEXTURE_2D;
701	}	817	}
…		…
704		820
705	package CFClient::UI::ViewPort;	821	package CFClient::UI::ViewPort;
706		822
707	our @ISA = CFClient::UI::Window::;	823	our @ISA = CFClient::UI::Window::;
708		824
		825	sub new {
		826	my $class = shift;
		827
		828	$class->SUPER::new (
		829	scroll_x => 0,
		830	scroll_y => 1,
		831	@_,
		832	)
		833	}
		834
709	sub size_request {	835	sub size_request {
710	my ($self) = @_;	836	my ($self) = @_;
711		837
712	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	838	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		839
715	@$self{qw(child_w child_h)}	840	$w = 10 if $self->{scroll_x};
		841	$h = 10 if $self->{scroll_y};
		842
		843	($w, $h)
716	}	844	}
717		845
718	sub size_allocate {	846	sub size_allocate {
719	my ($self, $w, $h) = @_;	847	my ($self, $w, $h) = @_;
720		848
		849	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		850	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		851
		852	$self->child->configure (0, 0, $w, $h);
721	$self->update;	853	$self->update;
722	}	854	}
723		855
724	sub set_offset {	856	sub set_offset {
725	my ($self, $x, $y) = @_;	857	my ($self, $x, $y) = @_;
…		…
776	my $class = shift;	908	my $class = shift;
777		909
778	my $self;	910	my $self;
779		911
780	my $slider = new CFClient::UI::Slider	912	my $slider = new CFClient::UI::Slider
781	vertical => 1,	913	vertical => 1,
782	range => [0, 0, 1, 0.01], # HACK fix	914	range => [0, 0, 1, 0.01], # HACK fix
783	connect_changed => sub {	915	on_changed => sub {
784	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	916	$self->{vp}->set_offset (0, $_[1]);
785	},	917	},
786	;	918	;
787		919
788	$self = $class->SUPER::new (	920	$self = $class->SUPER::new (
789	vp => (new CFClient::UI::ViewPort),	921	vp => (new CFClient::UI::ViewPort expand => 1),
790	slider => $slider,	922	slider => $slider,
791	@_,	923	@_,
792	);	924	);
793		925
794	$self->{vp}->add ($self->{scrolled});	926	$self->{vp}->add ($self->{scrolled});
795	$self->add ($self->{vp});	927	$self->add ($self->{vp});
796	$self->add ($self->{slider});	928	$self->add ($self->{slider});
797		929
798	$self	930	$self
		931	}
		932
		933	sub update {
		934	my ($self) = @_;
		935
		936	$self->SUPER::update;
		937
		938	# todo: overwrite size_allocate of child
		939	my $child = $self->{vp}->child;
		940	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		941	}
		942
		943	sub size_allocate {
		944	my ($self, $w, $h) = @_;
		945
		946	$self->SUPER::size_allocate ($w, $h);
		947
		948	my $child = $self->{vp}->child;
		949	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
799	}	950	}
800		951
801	#TODO# update range on size_allocate depending on child	952	#TODO# update range on size_allocate depending on child
802	# update viewport offset on scroll	953	# update viewport offset on scroll
803		954
…		…
854	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1005	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
855		1006
856	sub new {	1007	sub new {
857	my $class = shift;	1008	my $class = shift;
858		1009
859	# TODO: user_x, user_y, overwrite moveto?
860
861	my $self = $class->SUPER::new (	1010	my $self = $class->SUPER::new (
862	bg => [1, 1, 1, 1],	1011	bg => [1, 1, 1, 1],
863	border_bg => [1, 1, 1, 1],	1012	border_bg => [1, 1, 1, 1],
864	border => 0.6,	1013	border => 0.6,
865	toplevel => 1,	1014	is_toplevel => 1,
866	can_events => 1,	1015	can_events => 1,
867	@_	1016	@_
868	);	1017	);
869		1018
870	$self->{title} &&= new CFClient::UI::Label	1019	$self->{title} &&= new CFClient::UI::Label
871	align => 0,	1020	align => 0,
…		…
895	my ($self, $w, $h) = @_;	1044	my ($self, $w, $h) = @_;
896		1045
897	$h -= List::Util::max 0, $self->border * 2;	1046	$h -= List::Util::max 0, $self->border * 2;
898	$w -= List::Util::max 0, $self->border * 2;	1047	$w -= List::Util::max 0, $self->border * 2;
899		1048
900	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1049	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
901	if $self->{title};	1050	if $self->{title};
902		1051
903	$self->child->configure ($self->border, $self->border, $w, $h);	1052	$self->child->configure ($self->border, $self->border, $w, $h);
904	}	1053	}
905		1054
…		…
924	my ($ev, $x, $y) = @_;	1073	my ($ev, $x, $y) = @_;
925		1074
926	my $dx = $ev->{x} - $ox;	1075	my $dx = $ev->{x} - $ox;
927	my $dy = $ev->{y} - $oy;	1076	my $dy = $ev->{y} - $oy;
928		1077
		1078	$self->{user_x} = $wx + $dx * $mx;
		1079	$self->{user_y} = $wy + $dy * $my;
929	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1080	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
930	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1081	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
931	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1082	$self->move ($self->{user_x}, $self->{user_y});
932	$self->check_size;	1083	$self->check_size;
933	};	1084	};
934		1085
935	} elsif ($lr ^ $td) {	1086	} elsif ($lr ^ $td) {
936	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1087	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
939	$self->{motion} = sub {	1090	$self->{motion} = sub {
940	my ($ev, $x, $y) = @_;	1091	my ($ev, $x, $y) = @_;
941		1092
942	($x, $y) = ($ev->{x}, $ev->{y});	1093	($x, $y) = ($ev->{x}, $ev->{y});
943		1094
944	$self->move ($bx + $x - $ox, $by + $y - $oy);	1095	$self->{user_x} = $bx + $x - $ox;
		1096	$self->{user_y} = $by + $y - $oy;
		1097
		1098	$self->move ($self->{user_x}, $self->{user_y});
945	$self->update;	1099	$self->update;
946	};	1100	};
947	}	1101	}
948	}	1102	}
949		1103
…		…
1011	sub new {	1165	sub new {
1012	my $class = shift;	1166	my $class = shift;
1013		1167
1014	$class->SUPER::new (	1168	$class->SUPER::new (
1015	col_expand => [],	1169	col_expand => [],
1016	@_	1170	@_,
1017	)	1171	)
		1172	}
		1173
		1174	sub children {
		1175	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018	}	1176	}
1019		1177
1020	sub add {	1178	sub add {
1021	my ($self, $x, $y, $child) = @_;	1179	my ($self, $x, $y, $child) = @_;
1022		1180
1023	$child->set_parent ($self);	1181	$child->set_parent ($self);
1024	$self->{children}[$y][$x] = $child;	1182	$self->{children}[$y][$x] = $child;
1025		1183
1026	$child->check_size;	1184	$self->check_size (1);
1027	}	1185	}
1028		1186
1029	sub children {
1030	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031	}
1032
1033	# TODO: move to container class maybe? send childs a signal on removal?	1187	# TODO: move to container class maybe? send children a signal on removal?
1034	sub clear {	1188	sub clear {
1035	my ($self) = @_;	1189	my ($self) = @_;
1036		1190
1037	my @children = $self->children;	1191	my @children = $self->children;
1038	delete $self->{children};	1192	delete $self->{children};
…		…
1040	for (@children) {	1194	for (@children) {
1041	delete $_->{parent};	1195	delete $_->{parent};
1042	$_->hide;	1196	$_->hide;
1043	}	1197	}
1044		1198
		1199	$self->check_size (1);
1045	$self->update;	1200	$self->update;
1046	}	1201	}
1047		1202
1048	sub get_wh {	1203	sub get_wh {
1049	my ($self) = @_;	1204	my ($self) = @_;
…		…
1081	sub size_allocate {	1236	sub size_allocate {
1082	my ($self, $w, $h) = @_;	1237	my ($self, $w, $h) = @_;
1083		1238
1084	my ($ws, $hs) = $self->get_wh;	1239	my ($ws, $hs) = $self->get_wh;
1085		1240
1086	my $req_w = sum @$ws;	1241	my $req_w = (sum @$ws) || 1;
1087	my $req_h = sum @$hs;	1242	my $req_h = (sum @$hs) || 1;
1088		1243
1089	# TODO: nicer code && do row_expand	1244	# TODO: nicer code && do row_expand
1090	my @col_expand = @{$self->{col_expand}};	1245	my @col_expand = @{$self->{col_expand}};
1091	@col_expand = (1) x @$ws unless @col_expand;	1246	@col_expand = (1) x @$ws unless @col_expand;
1092	my $col_expand = (sum @col_expand) || 1;	1247	my $col_expand = (sum @col_expand) || 1;
…		…
1146	}	1301	}
1147	}	1302	}
1148		1303
1149	#############################################################################	1304	#############################################################################
1150		1305
1151	package CFClient::UI::HBox;	1306	package CFClient::UI::Box;
1152
1153	# TODO: wrap into common Box base class
1154		1307
1155	our @ISA = CFClient::UI::Container::;	1308	our @ISA = CFClient::UI::Container::;
1156		1309
1157	sub size_request {	1310	sub size_request {
1158	my ($self) = @_;	1311	my ($self) = @_;
1159		1312
1160	my @alloc = map [$_->size_request], @{$self->{children}};	1313	$self->{vertical}
1161		1314	? (
1162	(	1315	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1163	(List::Util::sum map $_->[0], @alloc),	1316	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1164	(List::Util::max map $_->[1], @alloc),	1317	)
1165	)	1318	: (
		1319	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1320	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1321	)
1166	}	1322	}
1167		1323
1168	sub size_allocate {	1324	sub size_allocate {
1169	my ($self, $w, $h) = @_;	1325	my ($self, $w, $h) = @_;
1170		1326
1171	($h, $w) = ($w, $h);	1327	my $space = $self->{vertical} ? $h : $w;
1172
1173	my $children = $self->{children};	1328	my $children = $self->{children};
1174		1329
1175	my @h = map $_->{req_w}, @$children;	1330	my @req;
1176		1331
1177	my $req_h = List::Util::sum @h;	1332	if ($self->{homogeneous}) {
1178		1333	@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 {	1334	} else {
		1335	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1336	my $req = List::Util::sum @req;
		1337
		1338	if ($req > $space) {
		1339	# ah well, not enough space
		1340	$_ *= $space / $req for @req;
		1341	} else {
1183	my $exp = List::Util::sum map $_->{expand}, @$children;	1342	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1184	$exp ||= 1;
1185		1343
		1344	$space = ($space - $req) / $expand; # remaining space to give away
		1345
		1346	$req[$_] += $space * $children->[$_]{expand}
1186	for (0 .. $#$children) {	1347	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	}	1348	}
1193	}	1349	}
1194		1350
1195	CFClient::UI::harmonize \@h;	1351	CFClient::UI::harmonize \@req;
1196		1352
1197	my $y = 0;	1353	my $pos = 0;
1198	for (0 .. $#$children) {	1354	for (0 .. $#$children) {
1199	my $child = $children->[$_];
1200	my $h = $h[$_];	1355	my $alloc = $req[$_];
1201	$child->configure ($y, 0, $h, $w);	1356	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1202		1357
1203	$y += $h;	1358	$pos += $alloc;
1204	}	1359	}
1205		1360
1206	1	1361	1
1207	}	1362	}
1208		1363
1209	#############################################################################	1364	#############################################################################
1210		1365
		1366	package CFClient::UI::HBox;
		1367
		1368	our @ISA = CFClient::UI::Box::;
		1369
		1370	sub new {
		1371	my $class = shift;
		1372
		1373	$class->SUPER::new (
		1374	vertical => 0,
		1375	@_,
		1376	)
		1377	}
		1378
		1379	#############################################################################
		1380
1211	package CFClient::UI::VBox;	1381	package CFClient::UI::VBox;
1212		1382
1213	# TODO: wrap into common Box base class
1214
1215	our @ISA = CFClient::UI::Container::;	1383	our @ISA = CFClient::UI::Box::;
1216		1384
1217	sub size_request {	1385	sub new {
1218	my ($self) = @_;	1386	my $class = shift;
1219		1387
1220	my @alloc = map [$_->size_request], @{$self->{children}};	1388	$class->SUPER::new (
1221		1389	vertical => 1,
1222	(	1390	@_,
1223	(List::Util::max map $_->[0], @alloc),
1224	(List::Util::sum map $_->[1], @alloc),
1225	)	1391	)
1226	}	1392	}
1227		1393
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	#############################################################################	1394	#############################################################################
1268		1395
1269	package CFClient::UI::Label;	1396	package CFClient::UI::Label;
1270		1397
1271	our @ISA = CFClient::UI::Base::;	1398	our @ISA = CFClient::UI::DrawBG::;
1272		1399
1273	use CFClient::OpenGL;	1400	use CFClient::OpenGL;
1274		1401
1275	sub new {	1402	sub new {
1276	my ($class, %arg) = @_;	1403	my ($class, %arg) = @_;
1277		1404
1278	my $self = $class->SUPER::new (	1405	my $self = $class->SUPER::new (
1279	fg => [1, 1, 1],	1406	fg => [1, 1, 1],
		1407	#bg => none
		1408	#active_bg => none
1280	#font => default_font	1409	#font => default_font
1281	#text => initial text	1410	#text => initial text
1282	#markup => initial narkup	1411	#markup => initial narkup
		1412	#max_w => maximum pixel width
		1413	ellipsise => 3, # end
1283	layout => (new CFClient::Layout),	1414	layout => (new CFClient::Layout),
1284	fontsize => 1,	1415	fontsize => 1,
1285	align => -1,	1416	align => -1,
1286	valign => -1,	1417	valign => -1,
1287	padding => 2,	1418	padding => 2,
…		…
1302	}	1433	}
1303		1434
1304	$self	1435	$self
1305	}	1436	}
1306		1437
1307	sub escape {	1438	sub escape($) {
1308	local $_ = $_[1];	1439	local $_ = $_[0];
1309		1440
1310	s/&/&amp;/g;	1441	s/&/&amp;/g;
1311	s/>/&gt;/g;	1442	s/>/&gt;/g;
1312	s/</&lt;/g;	1443	s/</&lt;/g;
1313		1444
1314	$_[1]	1445	$_
1315	}	1446	}
1316		1447
1317	sub update {	1448	sub update {
1318	my ($self) = @_;	1449	my ($self) = @_;
1319		1450
…		…
1352	sub size_request {	1483	sub size_request {
1353	my ($self) = @_;	1484	my ($self) = @_;
1354		1485
1355	$self->{layout}->set_font ($self->{font}) if $self->{font};	1486	$self->{layout}->set_font ($self->{font}) if $self->{font};
1356	$self->{layout}->set_width ($self->{max_w} || -1);	1487	$self->{layout}->set_width ($self->{max_w} || -1);
		1488	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1489	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1490	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358		1491
1359	my ($w, $h) = $self->{layout}->size;	1492	my ($w, $h) = $self->{layout}->size;
1360		1493
1361	if (exists $self->{template}) {	1494	if (exists $self->{template}) {
…		…
1391	}	1524	}
1392		1525
1393	sub _draw {	1526	sub _draw {
1394	my ($self) = @_;	1527	my ($self) = @_;
1395		1528
		1529	$self->SUPER::_draw; # draw background, if applicable
		1530
1396	my $tex = $self->{texture} ||= do {	1531	my $tex = $self->{texture} ||= do {
1397	$self->{layout}->set_foreground (@{$self->{fg}});	1532	$self->{layout}->set_foreground (@{$self->{fg}});
1398	$self->{layout}->set_font ($self->{font}) if $self->{font};	1533	$self->{layout}->set_font ($self->{font}) if $self->{font};
1399	$self->{layout}->set_width ($self->{w});	1534	$self->{layout}->set_width ($self->{w});
		1535	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1536	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1537	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401		1538
1402	my $tex = new_from_layout CFClient::Texture $self->{layout};	1539	my $tex = new_from_layout CFClient::Texture $self->{layout};
1403		1540
1404	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1541	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1542	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406	: ($self->{w} - $tex->{w}) * 0.5;	1543	: ($self->{w} - $tex->{w}) * 0.5);
1407		1544
1408	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1545	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1409	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1546	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410	: ($self->{h} - $tex->{h}) * 0.5;	1547	: ($self->{h} - $tex->{h}) * 0.5);
1411		1548
1412	$tex	1549	$tex
1413	};	1550	};
1414		1551
1415	glEnable GL_TEXTURE_2D;	1552	glEnable GL_TEXTURE_2D;
…		…
1443	active_fg => [0, 0, 0],	1580	active_fg => [0, 0, 0],
1444	can_hover => 1,	1581	can_hover => 1,
1445	can_focus => 1,	1582	can_focus => 1,
1446	valign => 0,	1583	valign => 0,
1447	can_events => 1,	1584	can_events => 1,
		1585	#text => ...
1448	@_	1586	@_
1449	)	1587	)
1450	}	1588	}
1451		1589
1452	sub _set_text {	1590	sub _set_text {
…		…
1462	$self->{text} = $text;	1600	$self->{text} = $text;
1463		1601
1464	$text =~ s/./*/g if $self->{hidden};	1602	$text =~ s/./*/g if $self->{hidden};
1465	$self->{layout}->set_text ("$text ");	1603	$self->{layout}->set_text ("$text ");
1466		1604
1467	$self->emit (changed => $self->{text});	1605	$self->_emit (changed => $self->{text});
1468	}	1606	}
1469		1607
1470	sub set_text {	1608	sub set_text {
1471	my ($self, $text) = @_;	1609	my ($self, $text) = @_;
1472		1610
1473	$self->{cursor} = length $text;	1611	$self->{cursor} = length $text;
1474	$self->_set_text ($text);	1612	$self->_set_text ($text);
		1613	$self->update;
1475	$self->check_size;	1614	$self->check_size;
1476	$self->update;
1477	}	1615	}
1478		1616
1479	sub get_text {	1617	sub get_text {
1480	$_[0]{text}	1618	$_[0]{text}
1481	}	1619	}
…		…
1484	my ($self) = @_;	1622	my ($self) = @_;
1485		1623
1486	my ($w, $h) = $self->SUPER::size_request;	1624	my ($w, $h) = $self->SUPER::size_request;
1487		1625
1488	($w + 1, $h) # add 1 for cursor	1626	($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	}	1627	}
1496		1628
1497	sub key_down {	1629	sub key_down {
1498	my ($self, $ev) = @_;	1630	my ($self, $ev) = @_;
1499		1631
…		…
1514	} elsif ($sym == CFClient::SDLK_HOME) {	1646	} elsif ($sym == CFClient::SDLK_HOME) {
1515	$self->{cursor} = 0;	1647	$self->{cursor} = 0;
1516	} elsif ($sym == CFClient::SDLK_END) {	1648	} elsif ($sym == CFClient::SDLK_END) {
1517	$self->{cursor} = length $text;	1649	$self->{cursor} = length $text;
1518	} elsif ($uni == 27) {	1650	} elsif ($uni == 27) {
1519	$self->emit ('escape');	1651	$self->_emit ('escape');
1520	} elsif ($uni) {	1652	} elsif ($uni) {
1521	substr $text, $self->{cursor}++, 0, chr $uni;	1653	substr $text, $self->{cursor}++, 0, chr $uni;
1522	}	1654	}
1523		1655
1524	$self->_set_text ($text);	1656	$self->_set_text ($text);
1525	$self->update;	1657	$self->update;
		1658	$self->check_size;
1526	}	1659	}
1527		1660
1528	sub focus_in {	1661	sub focus_in {
1529	my ($self) = @_;	1662	my ($self) = @_;
1530		1663
…		…
1610	if ($sym == 13) {	1743	if ($sym == 13) {
1611	unshift @{$self->{history}},	1744	unshift @{$self->{history}},
1612	my $txt = $self->get_text;	1745	my $txt = $self->get_text;
1613	$self->{history_pointer} = -1;	1746	$self->{history_pointer} = -1;
1614	$self->{history_saveback} = '';	1747	$self->{history_saveback} = '';
1615	$self->emit (activate => $txt);	1748	$self->_emit (activate => $txt);
1616	$self->update;	1749	$self->update;
1617		1750
1618	} elsif ($sym == CFClient::SDLK_UP) {	1751	} elsif ($sym == CFClient::SDLK_UP) {
1619	if ($self->{history_pointer} < 0) {	1752	if ($self->{history_pointer} < 0) {
1620	$self->{history_saveback} = $self->get_text;	1753	$self->{history_saveback} = $self->get_text;
…		…
1659	my $class = shift;	1792	my $class = shift;
1660		1793
1661	$class->SUPER::new (	1794	$class->SUPER::new (
1662	padding => 4,	1795	padding => 4,
1663	fg => [1, 1, 1],	1796	fg => [1, 1, 1],
1664	bg => [1, 1, 1, 0.2],
1665	active_fg => [0, 0, 1],	1797	active_fg => [0, 0, 1],
1666	can_hover => 1,	1798	can_hover => 1,
1667	align => 0,	1799	align => 0,
1668	valign => 0,	1800	valign => 0,
1669	can_events => 1,	1801	can_events => 1,
1670	@_	1802	@_
1671	)	1803	)
1672	}	1804	}
1673		1805
		1806	sub activate { }
		1807
1674	sub button_up {	1808	sub button_up {
1675	my ($self, $ev, $x, $y) = @_;	1809	my ($self, $ev, $x, $y) = @_;
1676		1810
		1811	$self->emit ("activate")
1677	if ($x >= 0 && $x < $self->{w}	1812	if $x >= 0 && $x < $self->{w}
1678	&& $y >= 0 && $y < $self->{h}) {	1813	&& $y >= 0 && $y < $self->{h};
1679	$self->emit ("activate");
1680	}
1681	}	1814	}
1682		1815
1683	sub _draw {	1816	sub _draw {
1684	my ($self) = @_;	1817	my ($self) = @_;
1685		1818
…		…
1717		1850
1718	$class->SUPER::new (	1851	$class->SUPER::new (
1719	padding => 2,	1852	padding => 2,
1720	fg => [1, 1, 1],	1853	fg => [1, 1, 1],
1721	active_fg => [1, 1, 0],	1854	active_fg => [1, 1, 0],
		1855	bg => [0, 0, 0, 0.2],
		1856	active_bg => [1, 1, 1, 0.5],
1722	state => 0,	1857	state => 0,
1723	can_hover => 1,	1858	can_hover => 1,
1724	@_	1859	@_
1725	)	1860	)
1726	}	1861	}
…		…
1735	my ($self, $ev, $x, $y) = @_;	1870	my ($self, $ev, $x, $y) = @_;
1736		1871
1737	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1872	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1738	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1873	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1739	$self->{state} = !$self->{state};	1874	$self->{state} = !$self->{state};
1740	$self->emit (changed => $self->{state});	1875	$self->_emit (changed => $self->{state});
1741	}	1876	}
1742	}	1877	}
1743		1878
1744	sub _draw {	1879	sub _draw {
1745	my ($self) = @_;	1880	my ($self) = @_;
…		…
2018	# TODO: req_w/h are wrong with vertical	2153	# TODO: req_w/h are wrong with vertical
2019	# TODO: calculations are off	2154	# TODO: calculations are off
2020	my $self = $class->SUPER::new (	2155	my $self = $class->SUPER::new (
2021	fg => [1, 1, 1],	2156	fg => [1, 1, 1],
2022	active_fg => [0, 0, 0],	2157	active_fg => [0, 0, 0],
		2158	bg => [0, 0, 0, 0.2],
		2159	active_bg => [1, 1, 1, 0.5],
2023	range => [0, 0, 100, 10],	2160	range => [0, 0, 100, 10, 0],
2024	req_w => $::WIDTH / 80,	2161	req_w => $::WIDTH / 80,
2025	req_h => $::WIDTH / 80,	2162	req_h => $::WIDTH / 80,
2026	vertical => 0,	2163	vertical => 0,
2027	can_hover => 1,	2164	can_hover => 1,
2028	inner_pad => .05,	2165	inner_pad => 0.02,
2029	@_	2166	@_
2030	);	2167	);
2031		2168
2032	$self->set_value ($self->{range}[0]);	2169	$self->set_value ($self->{range}[0]);
2033	$self->update;	2170	$self->update;
2034		2171
2035	$self	2172	$self
2036	}	2173	}
2037		2174
		2175	sub set_range {
		2176	my ($self, $range) = @_;
		2177
		2178	($range, $self->{range}) = ($self->{range}, $range);
		2179
		2180	$self->update
		2181	if "@$range" ne "@{$self->{range}}";
		2182	}
		2183
2038	sub set_value {	2184	sub set_value {
2039	my ($self, $value) = @_;	2185	my ($self, $value) = @_;
2040		2186
2041	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2187	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2042		2188
2043	$hi = $lo + 1 if $hi <= $lo;	2189	$hi = $lo + 1 if $hi <= $lo;
2044		2190
		2191	$page = $hi - $lo if $page > $hi - $lo;
		2192
2045	$value = $lo if $value < $lo;	2193	$value = $lo if $value < $lo;
2046	$value = $hi if $value > $hi;	2194	$value = $hi - $page if $value > $hi - $page;
2047		2195
2048	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2196	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2049	if $unit;	2197	if $unit;
2050		2198
2051	$page = $hi - $lo if $page > $hi - $lo;
2052
2053	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2199	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2054		2200
2055	if ($value != $old_value) {	2201	if ($value != $old_value) {
2056	$self->emit (changed => $value);	2202	$self->_emit (changed => $value);
2057	$self->update;	2203	$self->update;
2058	}	2204	}
2059	}	2205	}
2060		2206
2061	sub size_request {	2207	sub size_request {
…		…
2069		2215
2070	sub button_down {	2216	sub button_down {
2071	my ($self, $ev, $x, $y) = @_;	2217	my ($self, $ev, $x, $y) = @_;
2072		2218
2073	$self->SUPER::button_down ($ev, $x, $y);	2219	$self->SUPER::button_down ($ev, $x, $y);
		2220
		2221	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2222
2074	$self->mouse_motion ($ev, $x, $y);	2223	$self->mouse_motion ($ev, $x, $y);
2075	}	2224	}
2076		2225
2077	sub mouse_motion {	2226	sub mouse_motion {
2078	my ($self, $ev, $x, $y) = @_;	2227	my ($self, $ev, $x, $y) = @_;
…		…
2080	if ($GRAB == $self) {	2229	if ($GRAB == $self) {
2081	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2230	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2082		2231
2083	my (undef, $lo, $hi, $page) = @{$self->{range}};	2232	my (undef, $lo, $hi, $page) = @{$self->{range}};
2084		2233
2085	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2234	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2086		2235
2087	$self->set_value ($x * ($hi - $lo) + $lo);	2236	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2088	}	2237	}
2089	}	2238	}
2090		2239
2091	sub update {	2240	sub update {
2092	my ($self) = @_;	2241	my ($self) = @_;
2093		2242
2094	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2243	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2095	$self->set_value ($self->{range}[0]);	2244	$self->set_value ($self->{range}[0]);
2096		2245
2097	my ($value, $lo, $hi, $page) = @{$self->{range}};	2246	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2247	my $range = ($hi - $page - $lo) || 1e-100;
2098		2248
2099	my $inner_w = 1 - 2 * $self->{inner_pad};	2249	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2100		2250
2101	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2251	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2252	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2102		2253
2103	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2254	$value = ($value - $lo) / $range;
2104	$value = $self->{scale} * ($value - $lo);	2255	$value = $value * $self->{scale} + $self->{offset};
2105		2256
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;	2257	$self->{knob_x} = $value - $knob_w * 0.5;
2112	$self->{knob_w} = $page;	2258	$self->{knob_w} = $knob_w;
2113	});	2259	});
2114		2260
2115	$self->SUPER::update;	2261	$self->SUPER::update;
2116	}	2262	}
2117		2263
…		…
2123	glScale $self->{w}, $self->{h};	2269	glScale $self->{w}, $self->{h};
2124		2270
2125	if ($self->{vertical}) {	2271	if ($self->{vertical}) {
2126	# draw a vertical slider like a rotated horizontal slider	2272	# draw a vertical slider like a rotated horizontal slider
2127		2273
		2274	glTranslate 1, 0, 0;
2128	glRotate 90, 0, 0, 1;	2275	glRotate 90, 0, 0, 1;
2129	glTranslate 0, 1, 0;
2130	}	2276	}
2131		2277
2132	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2278	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2133	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2279	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2134		2280
…		…
2141	# draw handle	2287	# draw handle
2142	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2288	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2143		2289
2144	glDisable GL_TEXTURE_2D;	2290	glDisable GL_TEXTURE_2D;
2145	}	2291	}
		2292
		2293	#############################################################################
		2294
		2295	package CFClient::UI::ValSlider;
		2296
		2297	our @ISA = CFClient::UI::HBox::;
		2298
		2299	sub new {
		2300	my ($class, %arg) = @_;
		2301
		2302	my $range = delete $arg{range};
		2303
		2304	my $self = $class->SUPER::new (
		2305	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2306	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2307	to_value => sub { shift },
		2308	from_value => sub { shift },
		2309	%arg,
		2310	);
		2311
		2312	$self->{slider}->connect (changed => sub {
		2313	my ($self, $value) = @_;
		2314	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2315	$self->{parent}->emit (changed => $value);
		2316	});
		2317
		2318	# $self->{entry}->connect (changed => sub {
		2319	# my ($self, $value) = @_;
		2320	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2321	# $self->{parent}->emit (changed => $value);
		2322	# });
		2323
		2324	$self->add ($self->{slider}, $self->{entry});
		2325
		2326	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2327
		2328	$self
		2329	}
		2330
		2331	sub set_range { shift->{slider}->set_range (@_) }
		2332	sub set_value { shift->{slider}->set_value (@_) }
2146		2333
2147	#############################################################################	2334	#############################################################################
2148		2335
2149	package CFClient::UI::TextView;	2336	package CFClient::UI::TextView;
2150		2337
…		…
2180		2367
2181	$self->{fontsize} = $fontsize;	2368	$self->{fontsize} = $fontsize;
2182	$self->reflow;	2369	$self->reflow;
2183	}	2370	}
2184		2371
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 {	2372	sub size_allocate {
2205	my ($self, $w, $h) = @_;	2373	my ($self, $w, $h) = @_;
2206		2374
2207	$self->SUPER::size_allocate ($w, $h);	2375	$self->SUPER::size_allocate ($w, $h);
2208		2376
…		…
2211	$self->{layout}->set_width ($self->{children}[0]{w});	2379	$self->{layout}->set_width ($self->{children}[0]{w});
2212		2380
2213	$self->reflow;	2381	$self->reflow;
2214	}	2382	}
2215		2383
		2384	sub text_size {
		2385	my ($self, $text, $indent) = @_;
		2386
		2387	my $layout = $self->{layout};
		2388
		2389	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2390	$layout->set_width ($self->{children}[0]{w} - $indent);
		2391	$layout->set_markup ($text);
		2392
		2393	$layout->size
		2394	}
		2395
		2396	sub reflow {
		2397	my ($self) = @_;
		2398
		2399	$self->{need_reflow}++;
		2400	$self->update;
		2401	}
		2402
		2403	sub set_offset {
		2404	my ($self, $offset) = @_;
		2405
		2406	# todo: base offset on lines or so, not on pixels
		2407	$self->{children}[1]->set_value ($offset);
		2408	}
		2409
		2410	sub clear {
		2411	my ($self) = @_;
		2412
		2413	$self->{par} = [];
		2414	$self->{height} = 0;
		2415	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2416	}
		2417
2216	sub add_paragraph {	2418	sub add_paragraph {
2217	my ($self, $color, $text) = @_;	2419	my ($self, $color, $text, $indent) = @_;
2218		2420
2219	#TODO: intelligently "reformat" paragraph	2421	for my $line (split /\n/, $text) {
2220		2422	my ($w, $h) = $self->text_size ($line);
2221	my $height = $self->text_height ($text);
2222
2223	$self->{height} += $height;	2423	$self->{height} += $h;
		2424	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2425	}
2224		2426
2225	push @{$self->{par}}, [$height, $color, $text];
2226
2227	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2427	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2228	$self->{children}[1]->update;
2229	}	2428	}
2230		2429
2231	sub update {	2430	sub update {
2232	my ($self) = @_;	2431	my ($self) = @_;
2233		2432
…		…
2236	return unless $self->{h} > 0;	2435	return unless $self->{h} > 0;
2237		2436
2238	delete $self->{texture};	2437	delete $self->{texture};
2239		2438
2240	$ROOT->on_post_alloc ($self, sub {	2439	$ROOT->on_post_alloc ($self, sub {
		2440	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2441
2241	if (delete $self->{need_reflow}) {	2442	if (delete $self->{need_reflow}) {
2242	my $height = 0;	2443	my $height = 0;
2243		2444
2244	$height += $_->[0] = $self->text_height ($_->[2])	2445	my $layout = $self->{layout};
		2446
		2447	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2448
2245	for @{$self->{par}};	2449	for (@{$self->{par}}) {
		2450	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2451	$layout->set_width ($W - $_->[3]);
		2452	$layout->set_markup ($_->[4]);
		2453	my ($w, $h) = $layout->size;
		2454	$_->[0] = $w + $_->[3];
		2455	$_->[1] = $h;
		2456	}
		2457
		2458	$height += $_->[1];
		2459	}
2246		2460
2247	$self->{height} = $height;	2461	$self->{height} = $height;
2248		2462
2249	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2463	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2250		2464
2251	delete $self->{texture};	2465	delete $self->{texture};
2252	}	2466	}
2253		2467
2254	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2468	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2255	glClearColor 0, 0, 0, 0;	2469	glClearColor 0.5, 0.5, 0.5, 0;
2256	glClear GL_COLOR_BUFFER_BIT;	2470	glClear GL_COLOR_BUFFER_BIT;
2257		2471
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];	2472	my $top = int $self->{children}[1]{range}[0];
2262		2473
2263	my $y0 = $top;	2474	my $y0 = $top;
2264	my $y1 = $top + $self->{h};	2475	my $y1 = $top + $H;
2265		2476
2266	my $y = 0;	2477	my $y = 0;
2267		2478
2268	my $layout = $self->{layout};	2479	my $layout = $self->{layout};
2269		2480
2270	$layout->set_font ($self->{font}) if $self->{font};	2481	$layout->set_font ($self->{font}) if $self->{font};
2271		2482
		2483	glEnable GL_BLEND;
		2484	#TODO# not correct in windows where rgba is forced off
		2485	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2486
2272	for my $par (@{$self->{par}}) {	2487	for my $par (@{$self->{par}}) {
2273	my $h = $par->[0];	2488	my $h = $par->[1];
2274		2489
2275	if ($y0 < $y + $h && $y < $y1) {	2490	if ($y0 < $y + $h && $y < $y1) {
2276	$layout->set_foreground (@{ $par->[1] });	2491	$layout->set_foreground (@{ $par->[2] });
		2492	$layout->set_width ($W - $par->[3]);
2277	$layout->set_markup ($par->[2]);	2493	$layout->set_markup ($par->[4]);
2278		2494
2279	my ($W, $H) = $layout->size;	2495	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2496
		2497	glRasterPos $par->[3], $y - $y0;
		2498	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2281	}	2499	}
2282		2500
2283	$y += $h;	2501	$y += $h;
2284	}	2502	}
2285		2503
2286	glDisable GL_TEXTURE_2D;	2504	glDisable GL_BLEND;
2287	};	2505	};
2288	});	2506	});
2289	}	2507	}
2290		2508
2291	sub _draw {	2509	sub _draw {
2292	my ($self) = @_;	2510	my ($self) = @_;
2293		2511
2294	glEnable GL_TEXTURE_2D;	2512	glEnable GL_TEXTURE_2D;
2295	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2513	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296	glColor 1, 1, 1, 1;	2514	glColor 1, 1, 1, 1;
2297	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2515	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2298	glDisable GL_TEXTURE_2D;	2516	glDisable GL_TEXTURE_2D;
2299		2517
2300	$self->{children}[1]->draw;	2518	$self->{children}[1]->draw;
2301		2519
2302	}	2520	}
…		…
2351		2569
2352	sub new {	2570	sub new {
2353	my $class = shift;	2571	my $class = shift;
2354		2572
2355	my $self = $class->SUPER::new (	2573	my $self = $class->SUPER::new (
2356	state => 0,	2574	state => 0,
2357	connect_activate => \&toggle_flopper,	2575	on_activate => \&toggle_flopper,
2358	@_	2576	@_
2359	);	2577	);
2360		2578
2361	if ($self->{state}) {
2362	$self->{state} = 0;
2363	$self->toggle_flopper;
2364	}
2365
2366	$self	2579	$self
2367	}	2580	}
2368		2581
2369	sub toggle_flopper {	2582	sub toggle_flopper {
2370	my ($self) = @_;	2583	my ($self) = @_;
2371		2584
2372	# TODO: use animation	2585	$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	}	2586	}
2384		2587
2385	#############################################################################	2588	#############################################################################
2386		2589
2387	package CFClient::UI::Tooltip;	2590	package CFClient::UI::Tooltip;
…		…
2401		2604
2402	sub set_tooltip_from {	2605	sub set_tooltip_from {
2403	my ($self, $widget) = @_;	2606	my ($self, $widget) = @_;
2404		2607
2405	$self->add (new CFClient::UI::Label	2608	$self->add (new CFClient::UI::Label
2406	markup => $widget->{tooltip},	2609	markup => $widget->{tooltip},
2407	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2610	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408	fontsize => 0.8,	2611	fontsize => 0.8,
2409	fg => [0, 0, 0, 1],	2612	fg => [0, 0, 0, 1],
		2613	ellipsise => 0,
2410	font => ($widget->{tooltip_font} || $::FONT_PROP),	2614	font => ($widget->{tooltip_font} || $::FONT_PROP),
2411	);	2615	);
2412	}	2616	}
2413		2617
2414	sub size_request {	2618	sub size_request {
2415	my ($self) = @_;	2619	my ($self) = @_;
…		…
2461	use CFClient::OpenGL;	2665	use CFClient::OpenGL;
2462		2666
2463	sub new {	2667	sub new {
2464	my $class = shift;	2668	my $class = shift;
2465		2669
2466	$class->SUPER::new (	2670	my $self = $class->SUPER::new (
2467	aspect => 1,	2671	aspect => 1,
		2672	can_events => 0,
2468	@_,	2673	@_,
2469	)	2674	);
		2675
		2676	if ($self->{anim} && $self->{animspeed}) {
		2677	Scalar::Util::weaken (my $widget = $self);
		2678
		2679	$self->{timer} = Event->timer (
		2680	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2681	hard => 1,
		2682	interval => $self->{animspeed},
		2683	cb => sub {
		2684	++$widget->{frame};
		2685	$widget->update;
		2686	},
		2687	);
		2688	}
		2689
		2690	$self
2470	}	2691	}
2471		2692
2472	sub size_request {	2693	sub size_request {
2473	(32, 8)	2694	(32, 8)
2474	}	2695	}
2475		2696
		2697	sub update {
		2698	my ($self) = @_;
		2699
		2700	return unless $self->{visible};
		2701
		2702	$self->SUPER::update;
		2703	}
		2704
2476	sub _draw {	2705	sub _draw {
2477	my ($self) = @_;	2706	my ($self) = @_;
2478		2707
2479	return unless $::CONN;#d# manage and cache textures differently	2708	return unless $::CONN;
		2709
		2710	my $face;
		2711
		2712	if ($self->{frame}) {
		2713	my $anim = $::CONN->{anim}[$self->{anim}];
		2714
		2715	$face = $anim->[ $self->{frame} % @$anim ]
		2716	if $anim && @$anim;
		2717	}
		2718
2480	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2719	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2481		2720
2482	# TODO animation
2483	if ($tex) {	2721	if ($tex) {
2484	glEnable GL_TEXTURE_2D;	2722	glEnable GL_TEXTURE_2D;
2485	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2723	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2486	glColor 1, 1, 1, 1;	2724	glColor 1, 1, 1, 1;
2487	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2725	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2488	glDisable GL_TEXTURE_2D;	2726	glDisable GL_TEXTURE_2D;
2489	}	2727	}
2490	}	2728	}
2491		2729
2492	#############################################################################	2730	sub DESTROY {
		2731	my ($self) = @_;
2493		2732
		2733	$self->{timer}->cancel
		2734	if $self->{timer};
		2735
		2736	$self->SUPER::DESTROY;
		2737	}
		2738
		2739	#############################################################################
		2740
2494	package CFClient::UI::InventoryItem;	2741	package CFClient::UI::Inventory;
2495		2742
2496	our @ISA = CFClient::UI::HBox::;	2743	our @ISA = CFClient::UI::ScrolledWindow::;
2497		2744
2498	sub new {	2745	sub new {
2499	my $class = shift;	2746	my $class = shift;
2500		2747
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
2510	my $self = $class->SUPER::new (	2748	my $self = $class->SUPER::new (
2511	can_hover => 1,	2749	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2512	can_events => 1,
2513	tooltip => (CFClient::UI::Label->escape ($desc)
2514	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2515	connect_button_down => sub {
2516	my ($self, $ev, $x, $y) = @_;
2517
2518	# todo: maybe put examine on 1? but should just be a tooltip :(
2519	if ($ev->{button} == 1) {
2520	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2521	} elsif ($ev->{button} == 2) {
2522	$::CONN->send ("apply $item->{tag}");
2523	} elsif ($ev->{button} == 3) {
2524	CFClient::UI::Menu->new (
2525	items => [
2526	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2527	[
2528	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2529	sub { $::CONN->send ("lock $item->{tag}") },
2530	],
2531	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2532	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2533	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2534	],
2535	)->popup ($ev);
2536	}
2537
2538	1
2539	},
2540	%args
2541	);
2542
2543	$self->add (new CFClient::UI::Face
2544	can_events => 0,
2545	face => $item->{face},
2546	anim => $item->{anim},
2547	animspeed => $item->{animspeed},
2548	);
2549
2550	$self->add (new CFClient::UI::Label
2551	can_events => 0,
2552	text => $desc,
2553	);
2554
2555	$self
2556	}
2557
2558	#############################################################################
2559
2560	package CFClient::UI::Inventory;
2561
2562	our @ISA = CFClient::UI::ScrolledWindow::;
2563
2564	sub new {
2565	my $class = shift;
2566
2567	my $self = $class->SUPER::new (
2568	scrolled => (new CFClient::UI::VBox),
2569	@_,	2750	@_,
2570	);	2751	);
2571		2752
2572	$self	2753	$self
2573	}	2754	}
…		…
2583	or ($a->{name} cmp $b->{name})	2764	or ($a->{name} cmp $b->{name})
2584	} @$items;	2765	} @$items;
2585		2766
2586	$self->{real_items} = \@items;	2767	$self->{real_items} = \@items;
2587		2768
		2769	my $row = 0;
2588	for my $item (@items) {	2770	for my $item (@items) {
2589	my $desc = $item->{nrof} < 2	2771	CFClient::Item::update_widgets $item;
2590	? $item->{name}
2591	: "$item->{nrof} $item->{name_pl}";
2592		2772
2593	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2773	$self->{scrolled}->add (0, $row, $item->{face_widget});
2594	}	2774	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2775	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2595		2776
2596	$self->{scrolled}->add (@items);	2777	$row++;
2597		2778	}
2598	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599	}
2600
2601	sub size_request {
2602	my ($self) = @_;
2603	($self->{req_w}, $self->{req_h});
2604	}	2779	}
2605		2780
2606	#############################################################################	2781	#############################################################################
2607		2782
2608	package CFClient::UI::Menu;	2783	package CFClient::UI::Menu;
…		…
2643		2818
2644	# popup given the event (must be a mouse button down event currently)	2819	# popup given the event (must be a mouse button down event currently)
2645	sub popup {	2820	sub popup {
2646	my ($self, $ev) = @_;	2821	my ($self, $ev) = @_;
2647		2822
2648	$self->emit ("popdown");	2823	$self->_emit ("popdown");
2649		2824
2650	# maybe save $GRAB? must be careful about events...	2825	# maybe save $GRAB? must be careful about events...
2651	$GRAB = $self;	2826	$GRAB = $self;
2652	$self->{button} = $ev->{button};	2827	$self->{button} = $ev->{button};
2653		2828
…		…
2668		2843
2669	if ($ev->{button} == $self->{button}) {	2844	if ($ev->{button} == $self->{button}) {
2670	undef $GRAB;	2845	undef $GRAB;
2671	$self->hide;	2846	$self->hide;
2672		2847
2673	$self->emit ("popdown");	2848	$self->_emit ("popdown");
2674	$self->{hover}[1]->() if $self->{hover};	2849	$self->{hover}[1]->() if $self->{hover};
2675	}	2850	}
2676	}	2851	}
2677		2852
2678	#############################################################################	2853	#############################################################################
2679		2854
2680	package CFClient::UI::Statusbox;	2855	package CFClient::UI::Statusbox;
2681		2856
2682	our @ISA = CFClient::UI::VBox::;	2857	our @ISA = CFClient::UI::VBox::;
		2858
		2859	sub new {
		2860	my $class = shift;
		2861
		2862	$class->SUPER::new (
		2863	fontsize => 0.8,
		2864	@_,
		2865	)
		2866	}
2683		2867
2684	sub reorder {	2868	sub reorder {
2685	my ($self) = @_;	2869	my ($self) = @_;
2686	my $NOW = time;	2870	my $NOW = time;
2687		2871
…		…
2707	: $item->{text};	2891	: $item->{text};
2708		2892
2709	for ($short) {	2893	for ($short) {
2710	s/^\s+//;	2894	s/^\s+//;
2711	s/\s+/ /g;	2895	s/\s+/ /g;
2712	my $len = int 40 / $item->{fontsize};
2713	substr $_, $len, length, "…" if $len < length;
2714	}	2896	}
2715		2897
2716	new CFClient::UI::Label	2898	new CFClient::UI::Label
2717	markup => $short,	2899	markup => $short,
2718	tooltip => $item->{tooltip},	2900	tooltip => $item->{tooltip},
2719	tooltip_font => $::FONT_PROP,	2901	tooltip_font => $::FONT_PROP,
2720	tooltip_width => 0.67,	2902	tooltip_width => 0.67,
2721	fontsize => $item->{fontsize},	2903	fontsize => $item->{fontsize} || $self->{fontsize},
		2904	max_w => $::WIDTH * 0.44,
2722	fg => $item->{fg},	2905	fg => $item->{fg},
2723	can_events => 1,	2906	can_events => 1,
2724	can_hover => 1	2907	can_hover => 1
2725	};	2908	};
2726	}	2909	}
…		…
2732	sub add {	2915	sub add {
2733	my ($self, $text, %arg) = @_;	2916	my ($self, $text, %arg) = @_;
2734		2917
2735	$text =~ s/^\s+//;	2918	$text =~ s/^\s+//;
2736	$text =~ s/\s+$//;	2919	$text =~ s/\s+$//;
		2920
		2921	return unless $text;
2737		2922
2738	my $timeout = time + ((delete $arg{timeout}) || 60);	2923	my $timeout = time + ((delete $arg{timeout}) || 60);
2739		2924
2740	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2925	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2741		2926
…		…
2753	$self->{item}{$group} = {	2938	$self->{item}{$group} = {
2754	id => ++$self->{id},	2939	id => ++$self->{id},
2755	text => $text,	2940	text => $text,
2756	timeout => $timeout,	2941	timeout => $timeout,
2757	tooltip => $text,	2942	tooltip => $text,
2758	fontsize => 0.8,
2759	fg => [0.8, 0.8, 0.8, 0.8],	2943	fg => [0.8, 0.8, 0.8, 0.8],
2760	pri => 0,	2944	pri => 0,
2761	count => 1,	2945	count => 1,
2762	%arg,	2946	%arg,
2763	};	2947	};
2764	}	2948	}
2765		2949
2766	$self->reorder;	2950	$self->reorder;
2767	}	2951	}
2768		2952
		2953	sub reconfigure {
		2954	my ($self) = @_;
		2955
		2956	delete $_->{label}
		2957	for values %{ $self->{item} || {} };
		2958
		2959	$self->reorder;
		2960	$self->SUPER::reconfigure;
		2961	}
		2962
2769	#############################################################################	2963	#############################################################################
2770		2964
2771	package CFClient::UI::Root;	2965	package CFClient::UI::Root;
2772		2966
2773	our @ISA = CFClient::UI::Container::;	2967	our @ISA = CFClient::UI::Container::;
…		…
2776		2970
2777	sub new {	2971	sub new {
2778	my $class = shift;	2972	my $class = shift;
2779		2973
2780	$class->SUPER::new (	2974	$class->SUPER::new (
		2975	visible => 1,
2781	@_,	2976	@_,
2782	)	2977	)
2783	}	2978	}
2784		2979
2785	sub configure {	2980	sub configure {
…		…
2803	}	2998	}
2804		2999
2805	sub size_allocate {	3000	sub size_allocate {
2806	my ($self, $w, $h) = @_;	3001	my ($self, $w, $h) = @_;
2807		3002
2808	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2809	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2810
2811	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2812	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2813
2814	for my $child ($self->children) {	3003	for my $child ($self->children) {
2815	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3004	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2816		3005
2817	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3006	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2818	if exists $child->{req_x};	3007	if exists $child->{req_x};
2819		3008
2820	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3009	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2821	if exists $child->{req_y};	3010	if exists $child->{req_y};
2822		3011
		3012	delete @$child{qw(req_x req_y)};
		3013
2823	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3014	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2824	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3015	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2825		3016
2826	$child->configure ($X, $Y, $W, $H);	3017	$child->configure ($X, $Y, $W, $H);
2827	}	3018	}
…		…
2848		3039
2849	sub add {	3040	sub add {
2850	my ($self, @children) = @_;	3041	my ($self, @children) = @_;
2851		3042
2852	for my $child (@children) {	3043	for my $child (@children) {
2853	$child->{toplevel} = 1;	3044	$child->{is_toplevel} = 1;
2854		3045
2855	# integerise window positions	3046	# integerise window positions
2856	$child->{x} = int $child->{x};	3047	$child->{x} = int $child->{x};
2857	$child->{y} = int $child->{y};	3048	$child->{y} = int $child->{y};
2858	}	3049	}
2859		3050
2860	$self->SUPER::add (@children);	3051	$self->SUPER::add (@children);
		3052
		3053	for (my @widgets = @children; my $w = pop @widgets; ) {
		3054	push @widgets, $w->children;
		3055	$w->set_visible;
		3056	}
		3057
		3058	}
		3059
		3060	sub remove {
		3061	my ($self, @children) = @_;
		3062
		3063	$self->SUPER::remove (@children);
		3064
		3065	while (@children) {
		3066	my $w = pop @children;
		3067	push @children, $w->children;
		3068	$w->set_invisible;
		3069	}
2861	}	3070	}
2862		3071
2863	sub on_refresh {	3072	sub on_refresh {
2864	my ($self, $id, $cb) = @_;	3073	my ($self, $id, $cb) = @_;
2865		3074
…		…
2879	$_->()	3088	$_->()
2880	for values %{delete $self->{refresh_hook}};	3089	for values %{delete $self->{refresh_hook}};
2881	}	3090	}
2882		3091
2883	if ($self->{check_size}) {	3092	if ($self->{check_size}) {
2884	my @queue = ([], []);	3093	my @queue;
2885		3094
2886	for (;;) {	3095	for (;;) {
2887	if ($self->{check_size}) {	3096	if ($self->{check_size}) {
2888	# heuristic: check containers last	3097	#TODO use array-of-depth approach
2889	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3098
		3099	@queue = sort { $a->{visible} <=> $b->{visible} }
2890	for values %{delete $self->{check_size}}	3100	@queue, values %{delete $self->{check_size}};
2891	}	3101	}
2892		3102
2893	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3103	my $widget = pop @queue || last;
2894		3104
		3105	defined $widget->{visible} or last; # do not resize invisible widgets
		3106
2895	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3107	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2896	? @$widget{qw(user_w user_h)}	3108	? @$widget{qw(def_w def_h)}
2897	: $widget->size_request;	3109	: $widget->size_request;
2898		3110
2899	if (delete $widget->{force_alloc}	3111	if (delete $widget->{force_alloc}
2900	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3112	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2901	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3113	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
…		…
2918	$w = 0 if $w < 0;	3130	$w = 0 if $w < 0;
2919	$h = 0 if $h < 0;	3131	$h = 0 if $h < 0;
2920		3132
2921	$widget->{w} = $w;	3133	$widget->{w} = $w;
2922	$widget->{h} = $h;	3134	$widget->{h} = $h;
2923	$widget->size_allocate ($w, $h);
2924	$widget->emit (size_allocate => $w, $h);	3135	$widget->emit (size_allocate => $w, $h);
2925	}	3136	}
2926	}	3137	}
2927		3138
2928	while ($self->{post_alloc_hook}) {	3139	while ($self->{post_alloc_hook}) {
…		…
2934	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3145	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2935	glClear GL_COLOR_BUFFER_BIT;	3146	glClear GL_COLOR_BUFFER_BIT;
2936		3147
2937	glMatrixMode GL_PROJECTION;	3148	glMatrixMode GL_PROJECTION;
2938	glLoadIdentity;	3149	glLoadIdentity;
2939	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3150	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2940	glMatrixMode GL_MODELVIEW;	3151	glMatrixMode GL_MODELVIEW;
2941	glLoadIdentity;	3152	glLoadIdentity;
2942		3153
2943	$self->_draw;	3154	$self->_draw;
2944	}	3155	}
…		…
2946	#############################################################################	3157	#############################################################################
2947		3158
2948	package CFClient::UI;	3159	package CFClient::UI;
2949		3160
2950	$ROOT = new CFClient::UI::Root;	3161	$ROOT = new CFClient::UI::Root;
2951	$TOOLTIP = new CFClient::UI::Tooltip;	3162	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2952		3163
2953	1	3164	1
2954		3165

Diff Legend

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