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.297 by root, Wed Jun 7 06:28:30 2006 UTC vs.
Revision 1.429 by root, Tue Aug 21 00:59:34 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
		117	# mousewheel
		118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		120
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	121	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	122	$ev->{dy} = $shift ? 0 : $delta;
		123
		124	$GRAB->emit (mouse_wheel => $ev);
		125	} else {
		126	$GRAB->emit (button_down => $ev)
		127	}
		128	}
101	}	129	}
102		130
103	sub feed_sdl_button_up_event {	131	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	132	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		133
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	134	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		135
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	136	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		137
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	138	$GRAB->emit (button_up => $ev)
112	if $GRAB;	139	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		140
114	if (!$BUTTON_STATE) {	141	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	142	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	143	$grab->update if $grab;
117	$GRAB->update if $GRAB;	144	$GRAB->update if $GRAB;
118		145
		146	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	147	$TOOLTIP_WATCHER->cb->();
120	}	148	}
121	}	149	}
122		150
123	sub feed_sdl_motion_event {	151	sub feed_sdl_motion_event {
124	my ($ev) = @_;	152	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	153	my ($x, $y) = ($ev->{x}, $ev->{y});
126		154
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	155	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		156
129	if ($widget != $HOVER) {	157	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		158
132	$hover->update if $hover && $hover->{can_hover};	159	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	160	if $HOVER;
140	}	161	}
141		162
142	# convert position array to integers	163	# convert position array to integers
143	sub harmonize {	164	sub harmonize {
…		…
193	reconfigure_widgets;	214	reconfigure_widgets;
194	}	215	}
195		216
196	#############################################################################	217	#############################################################################
197		218
		219	package CFPlus::UI::Event;
		220
		221	sub xy {
		222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		223	}
		224
		225	#############################################################################
		226
198	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
199		228
200	use strict;	229	use strict;
201		230
202	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
203		232
204	sub new {	233	sub new {
205	my $class = shift;	234	my $class = shift;
206		235
207	my $self = bless {	236	my $self = bless {
…		…
212	h => undef,	241	h => undef,
213	can_events => 1,	242	can_events => 1,
214	@_	243	@_
215	}, $class;	244	}, $class;
216		245
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		247
219	for (keys %$self) {	248	for (keys %$self) {
220	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
222	}	251	}
223	}	252	}
224		253
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		259
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		262
234	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
239		268
240	sub destroy {	269	sub destroy {
241	my ($self) = @_;	270	my ($self) = @_;
242		271
243	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
244	%$self = ();	274	%$self = ();
245	}	275	}
246		276
		277	sub TO_JSON {
		278	{ __w_ => $_[0]{s_id} }
		279	}
		280
247	sub show {	281	sub show {
248	my ($self) = @_;	282	my ($self) = @_;
249		283
250	return if $self->{parent};	284	return if $self->{parent};
251		285
252	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
253	}	287	}
254		288
255	sub set_visible {	289	sub set_visible {
256	my ($self) = @_;	290	my ($self) = @_;
257		291
…		…
272		306
273	return unless $self->{visible};	307	return unless $self->{visible};
274		308
275	$_->set_invisible for $self->children;	309	$_->set_invisible for $self->children;
276		310
		311	delete $self->{visible};
277	delete $self->{root};	312	delete $self->{root};
278	delete $self->{visible};
279		313
280	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
282		316
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
285		319
286	$self->focus_out;	320	$self->emit ("focus_out");
287
288	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
289	}	322	}
290		323
291	sub set_visibility {	324	sub set_visibility {
292	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
293		326
294	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
295		328
296	$visible ? $self->hide	329	$visible ? $self->show
297	: $self->show;	330	: $self->hide;
298	}	331	}
299		332
300	sub toggle_visibility {	333	sub toggle_visibility {
301	my ($self) = @_;	334	my ($self) = @_;
302		335
…		…
336	sub size_request {	369	sub size_request {
337	require Carp;	370	require Carp;
338	Carp::confess "size_request is abstract";	371	Carp::confess "size_request is abstract";
339	}	372	}
340		373
		374	sub baseline_shift {
		375	0
		376	}
		377
341	sub configure {	378	sub configure {
342	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
343		380
344	if ($self->{aspect}) {	381	if ($self->{aspect}) {
345	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
346		383
347	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349		386
350	# use alignment to adjust x, y	387	# use alignment to adjust x, y
351		388
352	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
353	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
367		404
368	$self->{root}{size_alloc}{$self+0} = $self;	405	$self->{root}{size_alloc}{$self+0} = $self;
369	}	406	}
370	}	407	}
371		408
372	sub size_allocate {
373	# nothing to be done
374	}
375
376	sub children {	409	sub children {
377	# nop	410	# nop
378	}	411	}
379		412
380	sub visible_children {	413	sub visible_children {
…		…
398		431
399	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
400		433
401	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
402		435
403	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
405	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
406	}	439	}
407	}	440	}
408		441
409	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
410	sub coord2local {	443	sub coord2local {
411	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
412		445
		446	Carp::confess unless $self->{parent};#d#
		447
413	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414	}	449	}
415		450
416	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
417	sub coord2global {	452	sub coord2global {
418	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
419		454
		455	Carp::confess unless $self->{parent};#d#
		456
420	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421	}	458	}
422		459
423	sub focus_in {	460	sub invoke_focus_in {
424	my ($self) = @_;	461	my ($self) = @_;
425		462
426	return if $FOCUS == $self;	463	return if $FOCUS == $self;
427	return unless $self->{can_focus};	464	return unless $self->{can_focus};
428		465
429	my $focus = $FOCUS; $FOCUS = $self;	466	$FOCUS = $self;
430		467
431	$self->_emit (focus_in => $focus);	468	$self->update;
432		469
433	$focus->update if $focus;	470	0
434	$FOCUS->update;
435	}	471	}
436		472
437	sub focus_out {	473	sub invoke_focus_out {
438	my ($self) = @_;	474	my ($self) = @_;
439		475
440	return unless $FOCUS == $self;	476	return unless $FOCUS == $self;
441		477
442	my $focus = $FOCUS; undef $FOCUS;	478	undef $FOCUS;
443		479
444	$self->_emit (focus_out => $focus);	480	$self->update;
445		481
446	$focus->update if $focus; #?
447
448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	482	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449	unless $FOCUS;	483	unless $FOCUS;
450	}
451		484
		485	0
		486	}
		487
		488	sub grab_focus {
		489	my ($self) = @_;
		490
		491	$FOCUS->emit ("focus_out") if $FOCUS;
		492	$self->emit ("focus_in");
		493	}
		494
452	sub mouse_motion { 0 }	495	sub invoke_mouse_motion { 0 }
453	sub button_up { 0 }	496	sub invoke_button_up { 0 }
454	sub key_down { 0 }	497	sub invoke_key_down { 0 }
455	sub key_up { 0 }	498	sub invoke_key_up { 0 }
		499	sub invoke_mouse_wheel { 0 }
456		500
457	sub button_down {	501	sub invoke_button_down {
458	my ($self, $ev, $x, $y) = @_;	502	my ($self, $ev, $x, $y) = @_;
459		503
460	$self->focus_in;	504	$self->grab_focus;
461		505
462	0	506	0
463	}	507	}
464		508
		509	sub connect {
		510	my ($self, $signal, $cb) = @_;
		511
		512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
		524	}
		525
		526	my %has_coords = (
		527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
		532
		533	sub emit {
		534	my ($self, $signal, @args) = @_;
		535
		536	# I do not really like this solution, but I do not like duplication
		537	# and needlessly verbose code, either.
		538	my @append
		539	= $has_coords{$signal}
		540	? $args[0]->xy ($self)
		541	: ();
		542
		543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		544
		545	for my $cb (
		546	@{$self->{signal_cb}{$signal} || []}, # before
		547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
		553	$self->{parent} && $self->{parent}->emit ($signal, @args)
		554	}
		555
465	sub find_widget {	556	#sub find_widget {
466	my ($self, $x, $y) = @_;	557	# in .xs
467
468	return () unless $self->{can_events};
469
470	return $self
471	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474	()
475	}
476		558
477	sub set_parent {	559	sub set_parent {
478	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
479		561
480	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
481	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
482	}
483
484	sub connect {
485	my ($self, $signal, $cb) = @_;
486
487	push @{ $self->{signal_cb}{$signal} }, $cb;
488	}
489
490	sub _emit {
491	my ($self, $signal, @args) = @_;
492
493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494	}
495
496	sub emit {
497	my ($self, $signal, @args) = @_;
498
499	$self->_emit ($signal, @args)
500	|| $self->$signal (@args);
501	}
502
503	sub visibility_change {
504	#my ($self, $visible) = @_;
505	}	564	}
506		565
507	sub realloc {	566	sub realloc {
508	my ($self) = @_;	567	my ($self) = @_;
509		568
…		…
534		593
535	# using global variables seems a bit hacky, but passing through all drawing	594	# using global variables seems a bit hacky, but passing through all drawing
536	# functions seems pointless.	595	# functions seems pointless.
537	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
538		597
539	sub draw {	598	#sub draw {
540	my ($self) = @_;	599	#CFPlus.xs
541
542	return unless $self->{h} && $self->{w};
543
544	# update screen rectangle
545	local $draw_x = $draw_x + $self->{x};
546	local $draw_y = $draw_y + $self->{y};
547	local $draw_w = $draw_x + $self->{w};
548	local $draw_h = $draw_y + $self->{h};
549
550	# skip widgets that are entirely outside the drawing area
551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553
554	glPushMatrix;
555	glTranslate $self->{x}, $self->{y}, 0;
556
557	if ($self == $HOVER && $self->{can_hover}) {
558	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
559	glEnable GL_BLEND;
560	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
561	glBegin GL_QUADS;
562	glVertex 0 , 0;
563	glVertex $self->{w}, 0;
564	glVertex $self->{w}, $self->{h};
565	glVertex 0 , $self->{h};
566	glEnd;
567	glDisable GL_BLEND;
568	}
569
570	if ($ENV{CFPLUS_DEBUG} & 1) {
571	glPushMatrix;
572	glColor 1, 1, 0, 1;
573	glTranslate 0.375, 0.375;
574	glBegin GL_LINE_LOOP;
575	glVertex 0 , 0;
576	glVertex $self->{w} - 1, 0;
577	glVertex $self->{w} - 1, $self->{h} - 1;
578	glVertex 0 , $self->{h} - 1;
579	glEnd;
580	glPopMatrix;
581	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582	}
583
584	$self->_draw;
585	glPopMatrix;
586	}
587		600
588	sub _draw {	601	sub _draw {
589	my ($self) = @_;	602	my ($self) = @_;
590		603
591	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
592	}	605	}
593		606
594	sub DESTROY {	607	sub DESTROY {
595	my ($self) = @_;	608	my ($self) = @_;
596		609
		610	return if CFPlus::in_destruct;
		611
		612	eval { $self->destroy };
		613	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		614
597	delete $WIDGET{$self+0};	615	delete $WIDGET{$self+0};
598	#$self->deactivate;
599	}	616	}
600		617
601	#############################################################################	618	#############################################################################
602		619
603	package CFClient::UI::DrawBG;	620	package CFPlus::UI::DrawBG;
604		621
605	our @ISA = CFClient::UI::Base::;	622	our @ISA = CFPlus::UI::Base::;
606		623
607	use strict;	624	use strict;
608	use CFClient::OpenGL;	625	use CFPlus::OpenGL;
609		626
610	sub new {	627	sub new {
611	my $class = shift;	628	my $class = shift;
612		629
613	# range [value, low, high, page]	630	# range [value, low, high, page]
…		…
644	}	661	}
645	}	662	}
646		663
647	#############################################################################	664	#############################################################################
648		665
649	package CFClient::UI::Empty;	666	package CFPlus::UI::Empty;
650		667
651	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFPlus::UI::Base::;
652		669
653	sub new {	670	sub new {
654	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
655	$class->SUPER::new (can_events => 0, %arg);	672	$class->SUPER::new (can_events => 0, %arg);
656	}	673	}
…		…
663		680
664	sub draw { }	681	sub draw { }
665		682
666	#############################################################################	683	#############################################################################
667		684
668	package CFClient::UI::Container;	685	package CFPlus::UI::Container;
669		686
670	our @ISA = CFClient::UI::Base::;	687	our @ISA = CFPlus::UI::Base::;
671		688
672	sub new {	689	sub new {
673	my ($class, %arg) = @_;	690	my ($class, %arg) = @_;
674		691
675	my $children = delete $arg{children};	692	my $children = delete $arg{children};
…		…
679	can_events => 0,	696	can_events => 0,
680	%arg,	697	%arg,
681	);	698	);
682		699
683	$self->add (@$children)	700	$self->add (@$children)
684	if $children;	701	if $children && @$children;
685		702
686	$self	703	$self
		704	}
		705
		706	sub realloc {
		707	my ($self) = @_;
		708
		709	$self->{force_realloc} = 1;
		710	$self->{force_size_alloc} = 1;
		711	$self->SUPER::realloc;
687	}	712	}
688		713
689	sub add {	714	sub add {
690	my ($self, @widgets) = @_;	715	my ($self, @widgets) = @_;
691		716
692	$_->set_parent ($self)	717	$_->set_parent ($self)
693	for @widgets;	718	for @widgets;
694		719
		720	# TODO: only do this in widgets that need it, e.g. root, fixed
695	use sort 'stable';	721	use sort 'stable';
696		722
697	$self->{children} = [	723	$self->{children} = [
698	sort { $a->{z} <=> $b->{z} }	724	sort { $a->{z} <=> $b->{z} }
699	@{$self->{children}}, @widgets	725	@{$self->{children}}, @widgets
700	];	726	];
701		727
702	$self->realloc;	728	$self->realloc;
		729
		730	$self->emit (c_add => \@widgets);
		731
		732	map $_+0, @widgets
703	}	733	}
704		734
705	sub children {	735	sub children {
706	@{ $_[0]{children} }	736	@{ $_[0]{children} }
707	}	737	}
708		738
709	sub remove {	739	sub remove {
710	my ($self, $child) = @_;	740	my ($self, @widgets) = @_;
711		741
		742	$self->emit (c_remove => \@widgets);
		743
		744	for my $child (@widgets) {
712	delete $child->{parent};	745	delete $child->{parent};
713	$child->hide;	746	$child->hide;
714
715	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	747	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		748	}
716		749
717	$self->realloc;	750	$self->realloc;
718	}	751	}
719		752
720	sub clear {	753	sub clear {
721	my ($self) = @_;	754	my ($self) = @_;
722		755
723	my $children = delete $self->{children};	756	my $children = $self->{children};
724	$self->{children} = [];	757	$self->{children} = [];
725		758
726	for (@$children) {	759	for (@$children) {
727	delete $_->{parent};	760	delete $_->{parent};
728	$_->hide;	761	$_->hide;
…		…
748	}	781	}
749		782
750	sub _draw {	783	sub _draw {
751	my ($self) = @_;	784	my ($self) = @_;
752		785
753	$_->draw for @{$self->{children}};	786	$_->draw for $self->visible_children;
754	}	787	}
755		788
756	#############################################################################	789	#############################################################################
757		790
758	package CFClient::UI::Bin;	791	package CFPlus::UI::Bin;
759		792
760	our @ISA = CFClient::UI::Container::;	793	our @ISA = CFPlus::UI::Container::;
761		794
762	sub new {	795	sub new {
763	my ($class, %arg) = @_;	796	my ($class, %arg) = @_;
764		797
765	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	798	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
766		799
767	$class->SUPER::new (children => [$child], %arg)	800	$class->SUPER::new (children => [$child], %arg)
768	}	801	}
769		802
770	sub add {	803	sub add {
771	my ($self, $child) = @_;	804	my ($self, $child) = @_;
772		805
773	$self->{children} = [];	806	$self->clear;
774
775	$self->SUPER::add ($child);	807	$self->SUPER::add ($child);
776	}	808	}
777		809
778	sub remove {	810	sub remove {
779	my ($self, $widget) = @_;	811	my ($self, $widget) = @_;
780		812
781	$self->SUPER::remove ($widget);	813	$self->SUPER::remove ($widget);
782		814
783	$self->{children} = [new CFClient::UI::Empty]	815	$self->{children} = [new CFPlus::UI::Empty]
784	unless @{$self->{children}};	816	unless @{$self->{children}};
785	}	817	}
786		818
787	sub child { $_[0]->{children}[0] }	819	sub child { $_[0]->{children}[0] }
788		820
789	sub size_request {	821	sub size_request {
790	$_[0]{children}[0]->size_request	822	$_[0]{children}[0]->size_request
791	}	823	}
792		824
793	sub size_allocate {	825	sub invoke_size_allocate {
794	my ($self, $w, $h) = @_;	826	my ($self, $w, $h) = @_;
795		827
796	$self->{children}[0]->configure (0, 0, $w, $h);	828	$self->{children}[0]->configure (0, 0, $w, $h);
		829
		830	1
797	}	831	}
798		832
799	#############################################################################	833	#############################################################################
800		834
801	# back-buffered drawing area	835	# back-buffered drawing area
802		836
803	package CFClient::UI::Window;	837	package CFPlus::UI::Window;
804		838
805	our @ISA = CFClient::UI::Bin::;	839	our @ISA = CFPlus::UI::Bin::;
806		840
807	use CFClient::OpenGL;	841	use CFPlus::OpenGL;
808		842
809	sub new {	843	sub new {
810	my ($class, %arg) = @_;	844	my ($class, %arg) = @_;
811		845
812	my $self = $class->SUPER::new (%arg);	846	my $self = $class->SUPER::new (%arg);
…		…
817		851
818	$ROOT->on_post_alloc ($self => sub { $self->render_child });	852	$ROOT->on_post_alloc ($self => sub { $self->render_child });
819	$self->SUPER::update;	853	$self->SUPER::update;
820	}	854	}
821		855
822	sub size_allocate {	856	sub invoke_size_allocate {
823	my ($self, $w, $h) = @_;	857	my ($self, $w, $h) = @_;
824		858
825	$self->SUPER::size_allocate ($w, $h);
826	$self->update;	859	$self->update;
		860
		861	$self->SUPER::invoke_size_allocate ($w, $h)
827	}	862	}
828		863
829	sub _render {	864	sub _render {
830	my ($self) = @_;	865	my ($self) = @_;
831		866
…		…
833	}	868	}
834		869
835	sub render_child {	870	sub render_child {
836	my ($self) = @_;	871	my ($self) = @_;
837		872
838	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	873	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
839	glClearColor 0, 0, 0, 0;	874	glClearColor 0, 0, 0, 0;
840	glClear GL_COLOR_BUFFER_BIT;	875	glClear GL_COLOR_BUFFER_BIT;
841		876
842	{	877	{
843	package CFClient::UI::Base;	878	package CFPlus::UI::Base;
844		879
845	($draw_x, $draw_y, $draw_w, $draw_h) =	880	local ($draw_x, $draw_y, $draw_w, $draw_h) =
846	(0, 0, $self->{w}, $self->{h});	881	(0, 0, $self->{w}, $self->{h});
		882
		883	$self->_render;
847	}	884	}
848
849	$self->_render;
850	};	885	};
851	}	886	}
852		887
853	sub _draw {	888	sub _draw {
854	my ($self) = @_;	889	my ($self) = @_;
855
856	my ($w, $h) = @$self{qw(w h)};
857		890
858	my $tex = $self->{texture}	891	my $tex = $self->{texture}
859	or return;	892	or return;
860		893
861	glEnable GL_TEXTURE_2D;	894	glEnable GL_TEXTURE_2D;
862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	895	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863	glColor 0, 0, 0, 1;	896	glColor 0, 0, 0, 1;
864		897
865	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	898	$tex->draw_quad_alpha_premultiplied (0, 0);
866		899
867	glDisable GL_TEXTURE_2D;	900	glDisable GL_TEXTURE_2D;
868	}	901	}
869		902
870	#############################################################################	903	#############################################################################
871		904
872	package CFClient::UI::ViewPort;	905	package CFPlus::UI::ViewPort;
873		906
		907	use List::Util qw(min max);
		908
874	our @ISA = CFClient::UI::Window::;	909	our @ISA = CFPlus::UI::Window::;
875		910
876	sub new {	911	sub new {
877	my $class = shift;	912	my $class = shift;
878		913
879	$class->SUPER::new (	914	$class->SUPER::new (
…		…
886	sub size_request {	921	sub size_request {
887	my ($self) = @_;	922	my ($self) = @_;
888		923
889	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	924	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
890		925
891	$w = 10 if $self->{scroll_x};	926	$w = 1 if $self->{scroll_x};
892	$h = 10 if $self->{scroll_y};	927	$h = 1 if $self->{scroll_y};
893		928
894	($w, $h)	929	($w, $h)
895	}	930	}
896		931
897	sub size_allocate {	932	sub invoke_size_allocate {
898	my ($self, $w, $h) = @_;	933	my ($self, $w, $h) = @_;
899		934
900	my $child = $self->child;	935	my $child = $self->child;
901		936
902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	937	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	938	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904		939
905	$self->child->configure (0, 0, $w, $h);	940	$self->child->configure (0, 0, $w, $h);
906	$self->update;	941	$self->update;
		942
		943	1
907	}	944	}
908		945
909	sub set_offset {	946	sub set_offset {
910	my ($self, $x, $y) = @_;	947	my ($self, $x, $y) = @_;
911		948
		949	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		950	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		951
		952	if ($x != $self->{view_x} or $y != $self->{view_y}) {
912	$self->{view_x} = int $x;	953	$self->{view_x} = $x;
913	$self->{view_y} = int $y;	954	$self->{view_y} = $y;
914		955
		956	$self->emit (changed => $x, $y);
915	$self->update;	957	$self->update;
		958	}
		959	}
		960
		961	sub set_center {
		962	my ($self, $x, $y) = @_;
		963
		964	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		965	}
		966
		967	sub make_visible {
		968	my ($self, $x, $y, $border) = @_;
		969
		970	if ( $x < $self->{view_x} + $self->{w} * $border
		971	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		972	|| $y < $self->{view_y} + $self->{h} * $border
		973	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		974	) {
		975	$self->set_center ($x, $y);
		976	}
916	}	977	}
917		978
918	# hmm, this does not work for topleft of $self... but we should not ask for that	979	# hmm, this does not work for topleft of $self... but we should not ask for that
919	sub coord2local {	980	sub coord2local {
920	my ($self, $x, $y) = @_;	981	my ($self, $x, $y) = @_;
…		…
935	my ($self, $x, $y) = @_;	996	my ($self, $x, $y) = @_;
936		997
937	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	998	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	999	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
939	) {	1000	) {
940	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1001	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941	} else {	1002	} else {
942	$self->CFClient::UI::Base::find_widget ($x, $y)	1003	$self->CFPlus::UI::Base::find_widget ($x, $y)
943	}	1004	}
944	}	1005	}
945		1006
946	sub _render {	1007	sub _render {
947	my ($self) = @_;	1008	my ($self) = @_;
948		1009
949	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1010	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
950	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1011	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951		1012
952	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1013	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953		1014
954	$self->SUPER::_render;	1015	$self->SUPER::_render;
955	}	1016	}
956		1017
957	#############################################################################	1018	#############################################################################
958		1019
959	package CFClient::UI::ScrolledWindow;	1020	package CFPlus::UI::ScrolledWindow;
960		1021
961	our @ISA = CFClient::UI::HBox::;	1022	our @ISA = CFPlus::UI::Table::;
962		1023
963	sub new {	1024	sub new {
964	my ($class, %arg) = @_;	1025	my ($class, %arg) = @_;
965		1026
966	my $child = delete $arg{child};	1027	my $child = delete $arg{child};
967		1028
968	my $self;	1029	my $self;
969		1030
970	my $slider = new CFClient::UI::Slider	1031	my $hslider = new CFPlus::UI::Slider
		1032	c_col => 0,
		1033	c_row => 1,
		1034	vertical => 0,
		1035	range => [0, 0, 1, 0.01], # HACK fix
		1036	on_changed => sub {
		1037	$self->{hpos} = $_[1];
		1038	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1039	},
		1040	;
		1041
		1042	my $vslider = new CFPlus::UI::Slider
		1043	c_col => 1,
		1044	c_row => 0,
971	vertical => 1,	1045	vertical => 1,
972	range => [0, 0, 1, 0.01], # HACK fix	1046	range => [0, 0, 1, 0.01], # HACK fix
973	on_changed => sub {	1047	on_changed => sub {
974	$self->{vp}->set_offset (0, $_[1]);	1048	$self->{vpos} = $_[1];
		1049	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
975	},	1050	},
976	;	1051	;
977		1052
978	$self = $class->SUPER::new (	1053	$self = $class->SUPER::new (
979	vp => (new CFClient::UI::ViewPort expand => 1),	1054	scroll_x => 0,
		1055	scroll_y => 1,
		1056	can_events => 1,
980	slider => $slider,	1057	hslider => $hslider,
		1058	vslider => $vslider,
		1059	col_expand => [1, 0],
		1060	row_expand => [1, 0],
981	%arg,	1061	%arg,
982	);	1062	);
983		1063
		1064	$self->{vp} = new CFPlus::UI::ViewPort
		1065	c_col => 0,
		1066	c_row => 0,
		1067	expand => 1,
		1068	scroll_x => $self->{scroll_x},
		1069	scroll_y => $self->{scroll_y},
		1070	on_changed => sub {
		1071	my ($vp, $x, $y) = @_;
		1072
		1073	$vp->{parent}{hslider}->set_value ($x);
		1074	$vp->{parent}{vslider}->set_value ($y);
		1075
		1076	0
		1077	},
		1078	on_size_allocate => sub {
		1079	my ($vp, $w, $h) = @_;
		1080	$vp->{parent}->update_slider;
		1081	0
		1082	},
		1083	;
		1084
984	$self->SUPER::add ($self->{vp}, $self->{slider});	1085	$self->SUPER::add ($self->{vp});
		1086
985	$self->add ($child) if $child;	1087	$self->add ($child) if $child;
986		1088
987	$self	1089	$self
988	}	1090	}
989		1091
…		…
991	my ($self, $widget) = @_;	1093	my ($self, $widget) = @_;
992		1094
993	$self->{vp}->add ($self->{child} = $widget);	1095	$self->{vp}->add ($self->{child} = $widget);
994	}	1096	}
995		1097
		1098	sub set_offset { shift->{vp}->set_offset (@_) }
		1099	sub set_center { shift->{vp}->set_center (@_) }
		1100	sub make_visible { shift->{vp}->make_visible (@_) }
		1101
996	sub update {	1102	sub update_slider {
		1103	my ($self) = @_;
		1104
		1105	my $child = ($self->{vp} or return)->child;
		1106
		1107	if ($self->{scroll_x}) {
		1108	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1109	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1110
		1111	my $visible = $w1 > $w2;
		1112	if ($visible != $self->{hslider_visible}) {
		1113	$self->{hslider_visible} = $visible;
		1114	$visible ? $self->SUPER::add ($self->{hslider})
		1115	: $self->SUPER::remove ($self->{hslider});
		1116	}
		1117	}
		1118
		1119	if ($self->{scroll_y}) {
		1120	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1121	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1122
		1123	my $visible = $h1 > $h2;
		1124	if ($visible != $self->{vslider_visible}) {
		1125	$self->{vslider_visible} = $visible;
		1126	$visible ? $self->SUPER::add ($self->{vslider})
		1127	: $self->SUPER::remove ($self->{vslider});
		1128	}
		1129	}
		1130	}
		1131
		1132	sub start_dragging {
997	my ($self) = @_;	1133	my ($self, $ev) = @_;
998		1134
999	$self->SUPER::update;	1135	$self->grab_focus;
1000		1136
1001	# todo: overwrite size_allocate of child	1137	my $ox = $self->{vp}{view_x};
1002	my $child = $self->{vp}->child;	1138	my $oy = $self->{vp}{view_y};
1003	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1139
1004	}	1140	$self->{motion} = sub {
		1141	my ($ev, $x, $y) = @_;
1005		1142
		1143	$ox -= $ev->{xrel};
		1144	$oy -= $ev->{yrel};
		1145
		1146	$self->{vp}->set_offset ($ox, $oy);
		1147	};
		1148	}
		1149
		1150	sub invoke_mouse_wheel {
		1151	my ($self, $ev) = @_;
		1152
		1153	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1154	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1155
		1156	1
		1157	}
		1158
		1159	sub invoke_button_down {
		1160	my ($self, $ev, $x, $y) = @_;
		1161
		1162	if ($ev->{button} == 2) {
		1163	$self->start_dragging ($ev);
		1164	return 1;
		1165	}
		1166
		1167	0
		1168	}
		1169
		1170	sub invoke_button_up {
		1171	my ($self, $ev, $x, $y) = @_;
		1172
		1173	if (delete $self->{motion}) {
		1174	return 1;
		1175	}
		1176
		1177	0
		1178	}
		1179
		1180	sub invoke_mouse_motion {
		1181	my ($self, $ev, $x, $y) = @_;
		1182
		1183	if ($self->{motion}) {
		1184	$self->{motion}->($ev, $x, $y);
		1185	return 1;
		1186	}
		1187
		1188	0
		1189	}
		1190
1006	sub size_allocate {	1191	sub invoke_size_allocate {
1007	my ($self, $w, $h) = @_;	1192	my ($self, $w, $h) = @_;
1008		1193
		1194	$self->update_slider;
1009	$self->SUPER::size_allocate ($w, $h);	1195	$self->SUPER::invoke_size_allocate ($w, $h)
1010
1011	my $child = $self->{vp}->child;
1012	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013	}	1196	}
1014
1015	#TODO# update range on size_allocate depending on child
1016	# update viewport offset on scroll
1017		1197
1018	#############################################################################	1198	#############################################################################
1019		1199
1020	package CFClient::UI::Frame;	1200	package CFPlus::UI::Frame;
1021		1201
1022	our @ISA = CFClient::UI::Bin::;	1202	our @ISA = CFPlus::UI::Bin::;
1023		1203
1024	use CFClient::OpenGL;	1204	use CFPlus::OpenGL;
1025		1205
1026	sub new {	1206	sub new {
1027	my $class = shift;	1207	my $class = shift;
1028		1208
1029	$class->SUPER::new (	1209	$class->SUPER::new (
…		…
1055	$self->SUPER::_draw;	1235	$self->SUPER::_draw;
1056	}	1236	}
1057		1237
1058	#############################################################################	1238	#############################################################################
1059		1239
1060	package CFClient::UI::FancyFrame;	1240	package CFPlus::UI::FancyFrame;
1061		1241
1062	our @ISA = CFClient::UI::Bin::;	1242	our @ISA = CFPlus::UI::Bin::;
1063		1243
1064	use CFClient::OpenGL;	1244	use CFPlus::OpenGL;
1065
1066	my $bg =
1067	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068	mipmap => 1, wrap => 1;
1069
1070	my @border =
1071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073		1245
1074	sub new {	1246	sub new {
1075	my ($class, %arg) = @_;	1247	my ($class, %arg) = @_;
1076		1248
1077	my $title = delete $arg{title};	1249	if ((exists $arg{label}) && !ref $arg{label}) {
		1250	$arg{label} = new CFPlus::UI::Label
		1251	align => 1,
		1252	valign => 0,
		1253	text => $arg{label},
		1254	fontsize => ($arg{border} || 0.8) * 0.75;
		1255	}
		1256
		1257	my $self = $class->SUPER::new (
		1258	# label => "",
		1259	fg => [0.6, 0.3, 0.1],
		1260	border => 0.8,
		1261	style => 'single',
		1262	%arg,
		1263	);
		1264
		1265	$self
		1266	}
		1267
		1268	sub add {
		1269	my ($self, @widgets) = @_;
		1270
		1271	$self->SUPER::add (@widgets);
		1272	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1273	}
		1274
		1275	sub border {
		1276	int $_[0]{border} * $::FONTSIZE
		1277	}
		1278
		1279	sub size_request {
		1280	my ($self) = @_;
		1281
		1282	($self->{label_w}, undef) = $self->{label}->size_request
		1283	if $self->{label};
		1284
		1285	my ($w, $h) = $self->SUPER::size_request;
		1286
		1287	(
		1288	$w + $self->border * 2,
		1289	$h + $self->border * 2,
		1290	)
		1291	}
		1292
		1293	sub invoke_size_allocate {
		1294	my ($self, $w, $h) = @_;
		1295
		1296	my $border = $self->border;
		1297
		1298	$w -= List::Util::max 0, $border * 2;
		1299	$h -= List::Util::max 0, $border * 2;
		1300
		1301	if (my $label = $self->{label}) {
		1302	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1303	$label->{h} = List::Util::min $h, $border;
		1304	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1305	}
		1306
		1307	$self->child->configure ($border, $border, $w, $h);
		1308
		1309	1
		1310	}
		1311
		1312	sub _draw {
		1313	my ($self) = @_;
		1314
		1315	my $child = $self->{children}[0];
		1316
		1317	my $border = $self->border;
		1318	my ($w, $h) = ($self->{w}, $self->{h});
		1319
		1320	$child->draw;
		1321
		1322	glColor @{$self->{fg}};
		1323	glBegin GL_LINE_STRIP;
		1324	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1325	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1326	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1327	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1328	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1330	glEnd;
		1331
		1332	if ($self->{label}) {
		1333	glTranslate $border * 2, 0;
		1334	$self->{label}->_draw;
		1335	}
		1336	}
		1337
		1338	#############################################################################
		1339
		1340	package CFPlus::UI::Toplevel;
		1341
		1342	our @ISA = CFPlus::UI::Bin::;
		1343
		1344	use CFPlus::OpenGL;
		1345
		1346	my $bg =
		1347	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1348	mipmap => 1, wrap => 1;
		1349
		1350	my @border =
		1351	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1352	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1353
		1354	my @icon =
		1355	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1356	qw(x1_move.png x1_resize.png);
		1357
		1358	sub new {
		1359	my ($class, %arg) = @_;
1078		1360
1079	my $self = $class->SUPER::new (	1361	my $self = $class->SUPER::new (
1080	bg => [1, 1, 1, 1],	1362	bg => [1, 1, 1, 1],
1081	border_bg => [1, 1, 1, 1],	1363	border_bg => [1, 1, 1, 1],
1082	border => 0.6,	1364	border => 0.6,
1083	can_events => 1,	1365	can_events => 1,
1084	min_w => 16,	1366	min_w => 64,
1085	min_h => 16,	1367	min_h => 32,
1086	%arg,	1368	%arg,
1087	);	1369	);
1088		1370
1089	$self->{title} = new CFClient::UI::Label	1371	$self->{title_widget} = new CFPlus::UI::Label
1090	align => 0,	1372	align => 0,
1091	valign => 1,	1373	valign => 1,
1092	text => $title,	1374	text => $self->{title},
1093	fontsize => $self->{border}	1375	fontsize => $self->{border},
1094	if defined $title;	1376	if exists $self->{title};
		1377
		1378	if ($self->{has_close_button}) {
		1379	$self->{close_button} =
		1380	new CFPlus::UI::ImageButton
		1381	path => 'x1_close.png',
		1382	on_activate => sub { $self->emit ("delete") };
		1383
		1384	$self->CFPlus::UI::Container::add ($self->{close_button});
		1385	}
1095		1386
1096	$self	1387	$self
1097	}	1388	}
1098		1389
1099	sub add {	1390	sub add {
1100	my ($self, @widgets) = @_;	1391	my ($self, @widgets) = @_;
1101		1392
1102	$self->SUPER::add (@widgets);	1393	$self->SUPER::add (@widgets);
		1394	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1395	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104	}	1396	}
1105		1397
1106	sub border {	1398	sub border {
1107	int $_[0]{border} * $::FONTSIZE	1399	int $_[0]{border} * $::FONTSIZE
1108	}	1400	}
1109		1401
1110	sub size_request {	1402	sub size_request {
1111	my ($self) = @_;	1403	my ($self) = @_;
1112		1404
1113	$self->{title}->size_request	1405	$self->{title_widget}->size_request
1114	if $self->{title};	1406	if $self->{title_widget};
		1407
		1408	$self->{close_button}->size_request
		1409	if $self->{close_button};
1115		1410
1116	my ($w, $h) = $self->SUPER::size_request;	1411	my ($w, $h) = $self->SUPER::size_request;
1117		1412
1118	(	1413	(
1119	$w + $self->border * 2,	1414	$w + $self->border * 2,
1120	$h + $self->border * 2,	1415	$h + $self->border * 2,
1121	)	1416	)
1122	}	1417	}
1123		1418
1124	sub size_allocate {	1419	sub invoke_size_allocate {
1125	my ($self, $w, $h) = @_;	1420	my ($self, $w, $h) = @_;
1126		1421
1127	if ($self->{title}) {	1422	if ($self->{title_widget}) {
1128	$self->{title}{w} = $w;	1423	$self->{title_widget}{w} = $w;
1129	$self->{title}{h} = $h;	1424	$self->{title_widget}{h} = $h;
1130	$self->{title}->size_allocate ($w, $h);	1425	$self->{title_widget}->invoke_size_allocate ($w, $h);
1131	}	1426	}
1132		1427
1133	my $border = $self->border;	1428	my $border = $self->border;
1134		1429
1135	$h -= List::Util::max 0, $border * 2;	1430	$h -= List::Util::max 0, $border * 2;
1136	$w -= List::Util::max 0, $border * 2;	1431	$w -= List::Util::max 0, $border * 2;
		1432
		1433	$self->child->configure ($border, $border, $w, $h);
		1434
		1435	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1436	if $self->{close_button};
		1437
		1438	1
		1439	}
		1440
		1441	sub invoke_delete {
		1442	my ($self) = @_;
		1443
		1444	$self->hide;
1137		1445
1138	$self->child->configure ($border, $border, $w, $h);	1446	1
1139	}	1447	}
1140		1448
1141	sub button_down {	1449	sub invoke_button_down {
1142	my ($self, $ev, $x, $y) = @_;	1450	my ($self, $ev, $x, $y) = @_;
1143		1451
1144	my ($w, $h) = @$self{qw(w h)};	1452	my ($w, $h) = @$self{qw(w h)};
1145	my $border = $self->border;	1453	my $border = $self->border;
1146		1454
…		…
1177		1485
1178	($x, $y) = ($ev->{x}, $ev->{y});	1486	($x, $y) = ($ev->{x}, $ev->{y});
1179		1487
1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1488	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181	# HACK: the next line is required to enforce placement	1489	# HACK: the next line is required to enforce placement
1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1490	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183	};	1491	};
1184	} else {	1492	} else {
1185	return 0;	1493	return 0;
1186	}	1494	}
1187		1495
1188	1	1496	1
1189	}	1497	}
1190		1498
1191	sub button_up {	1499	sub invoke_button_up {
1192	my ($self, $ev, $x, $y) = @_;	1500	my ($self, $ev, $x, $y) = @_;
1193		1501
1194	!!delete $self->{motion}	1502	! ! delete $self->{motion}
1195	}	1503	}
1196		1504
1197	sub mouse_motion {	1505	sub invoke_mouse_motion {
1198	my ($self, $ev, $x, $y) = @_;	1506	my ($self, $ev, $x, $y) = @_;
1199		1507
1200	$self->{motion}->($ev, $x, $y) if $self->{motion};	1508	$self->{motion}->($ev, $x, $y) if $self->{motion};
1201		1509
1202	!!$self->{motion}	1510	! ! $self->{motion}
		1511	}
		1512
		1513	sub invoke_visibility_change {
		1514	my ($self, $visible) = @_;
		1515
		1516	delete $self->{motion} unless $visible;
		1517
		1518	0
1203	}	1519	}
1204		1520
1205	sub _draw {	1521	sub _draw {
1206	my ($self) = @_;	1522	my ($self) = @_;
1207		1523
…		…
1214	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1215		1531
1216	my $border = $self->border;	1532	my $border = $self->border;
1217		1533
1218	glColor @{ $self->{border_bg} };	1534	glColor @{ $self->{border_bg} };
1219	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1535	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1220	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1536	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1221	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1537	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1222	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1538	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1539
		1540	# move
		1541	my $w2 = ($w - $border) * .5;
		1542	my $h2 = ($h - $border) * .5;
		1543	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1544	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1545	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1546
		1547	# resize
		1548	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1549	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1550	unless $self->{has_close_button};
		1551	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1223		1553
1224	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1554	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1225	glColor @{ $self->{bg} };	1555	glColor @{ $self->{bg} };
1226		1556
1227	# TODO: repeat texture not scale	1557	# TODO: repeat texture not scale
…		…
1233		1563
1234	glDisable GL_TEXTURE_2D;	1564	glDisable GL_TEXTURE_2D;
1235		1565
1236	$child->draw;	1566	$child->draw;
1237		1567
1238	if ($self->{title}) {	1568	if ($self->{title_widget}) {
1239	glTranslate 0, $border - $self->{h};	1569	glTranslate 0, $border - $self->{h};
1240	$self->{title}->_draw;	1570	$self->{title_widget}->_draw;
		1571
		1572	glTranslate 0, - ($border - $self->{h});
1241	}	1573	}
		1574
		1575	$self->{close_button}->draw
		1576	if $self->{close_button};
1242	}	1577	}
1243		1578
1244	#############################################################################	1579	#############################################################################
1245		1580
1246	package CFClient::UI::Table;	1581	package CFPlus::UI::Table;
1247		1582
1248	our @ISA = CFClient::UI::Base::;	1583	our @ISA = CFPlus::UI::Container::;
1249		1584
1250	use List::Util qw(max sum);	1585	use List::Util qw(max sum);
1251		1586
1252	use CFClient::OpenGL;	1587	use CFPlus::OpenGL;
1253		1588
1254	sub new {	1589	sub new {
1255	my $class = shift;	1590	my $class = shift;
1256		1591
1257	$class->SUPER::new (	1592	$class->SUPER::new (
1258	col_expand => [],	1593	col_expand => [],
		1594	row_expand => [],
1259	@_,	1595	@_,
1260	)	1596	)
1261	}	1597	}
1262		1598
1263	sub children {
1264	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265	}
1266
1267	sub add {	1599	sub add {
1268	my ($self, $x, $y, $child) = @_;
1269
1270	$child->set_parent ($self);
1271	$self->{children}[$y][$x] = $child;
1272
1273	$self->realloc;
1274	}
1275
1276	# TODO: move to container class maybe? send children a signal on removal?
1277	sub clear {
1278	my ($self) = @_;	1600	my ($self, @widgets) = @_;
		1601
		1602	for my $child (@widgets) {
		1603	$child->{c_rowspan} ||= 1;
		1604	$child->{c_colspan} ||= 1;
		1605	}
		1606
		1607	$self->SUPER::add (@widgets);
		1608	}
		1609
		1610	sub add_at {
		1611	my $self = shift;
		1612
		1613	my @widgets;
		1614
		1615	while (@_) {
		1616	my ($col, $row, $child) = splice @_, 0, 3, ();
		1617
		1618	$child->{c_row} = $row;
		1619	$child->{c_col} = $col;
		1620
		1621	push @widgets, $child;
		1622	}
		1623
		1624	$self->add (@widgets);
		1625	}
		1626
		1627	sub get_wh {
		1628	my ($self) = @_;
		1629
		1630	my (@w, @h);
1279		1631
1280	my @children = $self->children;	1632	my @children = $self->children;
1281	delete $self->{children};	1633
		1634	# first pass, columns
		1635	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1636	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1637
		1638	my $sw = sum @w[$c .. $c + $cs - 1];
		1639
		1640	if ($w > $sw) {
		1641	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1642	}
1282		1643	}
1283	for (@children) {
1284	delete $_->{parent};
1285	$_->hide;
1286	}
1287		1644
1288	$self->realloc;	1645	# second pass, rows
1289	}	1646	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1290
1291	sub get_wh {
1292	my ($self) = @_;
1293
1294	my (@w, @h);
1295
1296	for my $y (0 .. $#{$self->{children}}) {
1297	my $row = $self->{children}[$y]
1298	or next;
1299
1300	for my $x (0 .. $#$row) {
1301	my $widget = $row->[$x]
1302	or next;
1303	my ($w, $h) = @$widget{qw(req_w req_h)};	1647	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1304		1648
1305	$w[$x] = max $w[$x], $w;	1649	my $sh = sum @h[$r .. $r + $rs - 1];
1306	$h[$y] = max $h[$y], $h;	1650
		1651	if ($h > $sh) {
		1652	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1307	}	1653	}
1308	}	1654	}
1309		1655
1310	(\@w, \@h)	1656	(\@w, \@h)
1311	}	1657	}
…		…
1319	(sum @$ws),	1665	(sum @$ws),
1320	(sum @$hs),	1666	(sum @$hs),
1321	)	1667	)
1322	}	1668	}
1323		1669
1324	sub size_allocate {	1670	sub invoke_size_allocate {
1325	my ($self, $w, $h) = @_;	1671	my ($self, $w, $h) = @_;
1326		1672
1327	my ($ws, $hs) = $self->get_wh;	1673	my ($ws, $hs) = $self->get_wh;
1328		1674
1329	my $req_w = (sum @$ws) || 1;	1675	my $req_w = (sum @$ws) || 1;
1330	my $req_h = (sum @$hs) || 1;	1676	my $req_h = (sum @$hs) || 1;
1331		1677
1332	# TODO: nicer code && do row_expand	1678	# now linearly scale the rows/columns to the allocated size
1333	my @col_expand = @{$self->{col_expand}};	1679	my @col_expand = @{$self->{col_expand}};
1334	@col_expand = (1) x @$ws unless @col_expand;	1680	@col_expand = (1) x @$ws unless @col_expand;
1335	my $col_expand = (sum @col_expand) || 1;	1681	my $col_expand = (sum @col_expand) || 1;
1336		1682
1337	# linearly scale sizes
1338	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1683	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340		1684
1341	CFClient::UI::harmonize $ws;	1685	CFPlus::UI::harmonize $ws;
		1686
		1687	my @row_expand = @{$self->{row_expand}};
		1688	@row_expand = (1) x @$ws unless @row_expand;
		1689	my $row_expand = (sum @row_expand) || 1;
		1690
		1691	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1692
1342	CFClient::UI::harmonize $hs;	1693	CFPlus::UI::harmonize $hs;
1343		1694
1344	my $y;	1695	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1696	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1345		1697
1346	for my $r (0 .. $#{$self->{children}}) {	1698	for my $widget ($self->children) {
1347	my $row = $self->{children}[$r]	1699	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1348	or next;
1349		1700
1350	my $x = 0;	1701	$widget->configure (
1351	my $row_h = $hs->[$r];	1702	$x[$c], $y[$r],
		1703	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1352		1704	);
1353	for my $c (0 .. $#$row) {	1705	}
1354	my $col_w = $ws->[$c];
1355		1706
1356	if (my $widget = $row->[$c]) {	1707	1
1357	$widget->configure ($x, $y, $col_w, $row_h);	1708	}
1358	}
1359		1709
1360	$x += $col_w;	1710	#############################################################################
		1711
		1712	package CFPlus::UI::Fixed;
		1713
		1714	use List::Util qw(min max);
		1715
		1716	our @ISA = CFPlus::UI::Container::;
		1717
		1718	sub _scale($$$) {
		1719	my ($rel, $val, $max) = @_;
		1720
		1721	$rel ? $val * $max : $val
		1722	}
		1723
		1724	sub size_request {
		1725	my ($self) = @_;
		1726
		1727	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1728
		1729	# determine overall size by querying abs widgets
		1730	for my $child ($self->visible_children) {
		1731	unless ($child->{c_rel}) {
		1732	my $x = $child->{c_x};
		1733	my $y = $child->{c_y};
		1734
		1735	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1736	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1361	}	1737	}
1362
1363	$y += $row_h;
1364	}	1738	}
1365		1739
1366	}	1740	my $W = $x2 - $x1;
		1741	my $H = $y2 - $y1;
1367		1742
1368	sub find_widget {	1743	# now layout remaining widgets
		1744	for my $child ($self->visible_children) {
		1745	if ($child->{c_rel}) {
		1746	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1747	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1748
		1749	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1750	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1751	}
		1752	}
		1753
		1754	my $W = $x2 - $x1;
		1755	my $H = $y2 - $y1;
		1756
		1757	($W, $H)
		1758	}
		1759
		1760	sub invoke_size_allocate {
1369	my ($self, $x, $y) = @_;	1761	my ($self, $W, $H) = @_;
1370		1762
1371	$x -= $self->{x};	1763	for my $child ($self->visible_children) {
1372	$y -= $self->{y};	1764	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1765	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1373		1766
1374	my $res;	1767	$x += $child->{c_halign} * $child->{req_w};
		1768	$y += $child->{c_valign} * $child->{req_h};
1375		1769
1376	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {	1770	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1377	$res = $_->find_widget ($x, $y)	1771	}
1378	and return $res;	1772
1379	}	1773	1
1380
1381	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1382	}
1383
1384	sub _draw {
1385	my ($self) = @_;
1386
1387	for (grep $_, @{$self->{children}}) {
1388	$_->draw for grep $_, @$_;
1389	}
1390	}	1774	}
1391		1775
1392	#############################################################################	1776	#############################################################################
1393		1777
1394	package CFClient::UI::Box;	1778	package CFPlus::UI::Box;
1395		1779
1396	our @ISA = CFClient::UI::Container::;	1780	our @ISA = CFPlus::UI::Container::;
1397		1781
1398	sub size_request {	1782	sub size_request {
1399	my ($self) = @_;	1783	my ($self) = @_;
		1784
		1785	my @children = $self->visible_children;
1400		1786
1401	$self->{vertical}	1787	$self->{vertical}
1402	? (	1788	? (
1403	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1789	(List::Util::max map $_->{req_w}, @children),
1404	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1790	(List::Util::sum map $_->{req_h}, @children),
1405	)	1791	)
1406	: (	1792	: (
1407	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_w}, @children),
1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1794	(List::Util::max map $_->{req_h}, @children),
1409	)	1795	)
1410	}	1796	}
1411		1797
1412	sub size_allocate {	1798	sub invoke_size_allocate {
1413	my ($self, $w, $h) = @_;	1799	my ($self, $w, $h) = @_;
1414		1800
1415	my $space = $self->{vertical} ? $h : $w;	1801	my $space = $self->{vertical} ? $h : $w;
1416	my $children = $self->{children};	1802	my @children = $self->visible_children;
1417		1803
1418	my @req;	1804	my @req;
1419		1805
1420	if ($self->{homogeneous}) {	1806	if ($self->{homogeneous}) {
1421	@req = ($space / (@$children || 1)) x @$children;	1807	@req = ($space / (@children || 1)) x @children;
1422	} else {	1808	} else {
1423	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1809	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424	my $req = List::Util::sum @req;	1810	my $req = List::Util::sum @req;
1425		1811
1426	if ($req > $space) {	1812	if ($req > $space) {
1427	# ah well, not enough space	1813	# ah well, not enough space
1428	$_ *= $space / $req for @req;	1814	$_ *= $space / $req for @req;
1429	} else {	1815	} else {
1430	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1816	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431		1817
1432	$space = ($space - $req) / $expand; # remaining space to give away	1818	$space = ($space - $req) / $expand; # remaining space to give away
1433		1819
1434	$req[$_] += $space * $children->[$_]{expand}	1820	$req[$_] += $space * $children[$_]{expand}
1435	for 0 .. $#$children;	1821	for 0 .. $#children;
1436	}	1822	}
1437	}	1823	}
1438		1824
1439	CFClient::UI::harmonize \@req;	1825	CFPlus::UI::harmonize \@req;
1440		1826
1441	my $pos = 0;	1827	my $pos = 0;
1442	for (0 .. $#$children) {	1828	for (0 .. $#children) {
1443	my $alloc = $req[$_];	1829	my $alloc = $req[$_];
1444	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1830	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445		1831
1446	$pos += $alloc;	1832	$pos += $alloc;
1447	}	1833	}
1448		1834
1449	1	1835	1
1450	}	1836	}
1451		1837
1452	#############################################################################	1838	#############################################################################
1453		1839
1454	package CFClient::UI::HBox;	1840	package CFPlus::UI::HBox;
1455		1841
1456	our @ISA = CFClient::UI::Box::;	1842	our @ISA = CFPlus::UI::Box::;
1457		1843
1458	sub new {	1844	sub new {
1459	my $class = shift;	1845	my $class = shift;
1460		1846
1461	$class->SUPER::new (	1847	$class->SUPER::new (
…		…
1464	)	1850	)
1465	}	1851	}
1466		1852
1467	#############################################################################	1853	#############################################################################
1468		1854
1469	package CFClient::UI::VBox;	1855	package CFPlus::UI::VBox;
1470		1856
1471	our @ISA = CFClient::UI::Box::;	1857	our @ISA = CFPlus::UI::Box::;
1472		1858
1473	sub new {	1859	sub new {
1474	my $class = shift;	1860	my $class = shift;
1475		1861
1476	$class->SUPER::new (	1862	$class->SUPER::new (
…		…
1479	)	1865	)
1480	}	1866	}
1481		1867
1482	#############################################################################	1868	#############################################################################
1483		1869
1484	package CFClient::UI::Label;	1870	package CFPlus::UI::Label;
1485		1871
1486	our @ISA = CFClient::UI::DrawBG::;	1872	our @ISA = CFPlus::UI::DrawBG::;
1487		1873
1488	use CFClient::OpenGL;	1874	use CFPlus::OpenGL;
1489		1875
1490	sub new {	1876	sub new {
1491	my ($class, %arg) = @_;	1877	my ($class, %arg) = @_;
1492		1878
1493	my $self = $class->SUPER::new (	1879	my $self = $class->SUPER::new (
…		…
1496	#active_bg => none	1882	#active_bg => none
1497	#font => default_font	1883	#font => default_font
1498	#text => initial text	1884	#text => initial text
1499	#markup => initial narkup	1885	#markup => initial narkup
1500	#max_w => maximum pixel width	1886	#max_w => maximum pixel width
		1887	#style => 0, # render flags
1501	ellipsise => 3, # end	1888	ellipsise => 3, # end
1502	layout => (new CFClient::Layout),	1889	layout => (new CFPlus::Layout),
1503	fontsize => 1,	1890	fontsize => 1,
1504	align => -1,	1891	align => -1,
1505	valign => -1,	1892	valign => -1,
1506	padding_x => 2,	1893	padding_x => 2,
1507	padding_y => 2,	1894	padding_y => 2,
1508	can_events => 0,	1895	can_events => 0,
1509	%arg	1896	%arg
1510	);	1897	);
1511		1898
1512	if (exists $self->{template}) {	1899	if (exists $self->{template}) {
1513	my $layout = new CFClient::Layout;	1900	my $layout = new CFPlus::Layout;
1514	$layout->set_text (delete $self->{template});	1901	$layout->set_text (delete $self->{template});
1515	$self->{template} = $layout;	1902	$self->{template} = $layout;
1516	}	1903	}
1517		1904
1518	if (exists $self->{markup}) {	1905	if (exists $self->{markup}) {
…		…
1522	}	1909	}
1523		1910
1524	$self	1911	$self
1525	}	1912	}
1526		1913
1527	sub escape($) {
1528	local $_ = $_[0];
1529
1530	s/&/&amp;/g;
1531	s/>/&gt;/g;
1532	s/</&lt;/g;
1533
1534	$_
1535	}
1536
1537	sub update {	1914	sub update {
1538	my ($self) = @_;	1915	my ($self) = @_;
1539		1916
1540	delete $self->{texture};	1917	delete $self->{texture};
1541	$self->SUPER::update;	1918	$self->SUPER::update;
…		…
1546		1923
1547	delete $self->{ox};	1924	delete $self->{ox};
1548	$self->SUPER::realloc;	1925	$self->SUPER::realloc;
1549	}	1926	}
1550		1927
		1928	sub clear {
		1929	my ($self) = @_;
		1930
		1931	$self->set_text ("");
		1932	}
		1933
1551	sub set_text {	1934	sub set_text {
1552	my ($self, $text) = @_;	1935	my ($self, $text) = @_;
1553		1936
1554	return if $self->{text} eq "T$text";	1937	return if $self->{text} eq "T$text";
1555	$self->{text} = "T$text";	1938	$self->{text} = "T$text";
1556		1939
1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558	$self->{layout}->set_text ($text);	1940	$self->{layout}->set_text ($text);
1559		1941
1560	delete $self->{size_req};	1942	delete $self->{size_req};
1561	$self->realloc;	1943	$self->realloc;
1562	$self->update;	1944	$self->update;
…		…
1568	return if $self->{text} eq "M$markup";	1950	return if $self->{text} eq "M$markup";
1569	$self->{text} = "M$markup";	1951	$self->{text} = "M$markup";
1570		1952
1571	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1953	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572		1954
1573	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574	$self->{layout}->set_markup ($markup);	1955	$self->{layout}->set_markup ($markup);
1575		1956
1576	delete $self->{size_req};	1957	delete $self->{size_req};
1577	$self->realloc;	1958	$self->realloc;
1578	$self->update;	1959	$self->update;
…		…
1590		1971
1591	my ($w, $h) = $self->{layout}->size;	1972	my ($w, $h) = $self->{layout}->size;
1592		1973
1593	if (exists $self->{template}) {	1974	if (exists $self->{template}) {
1594	$self->{template}->set_font ($self->{font}) if $self->{font};	1975	$self->{template}->set_font ($self->{font}) if $self->{font};
		1976	$self->{template}->set_width ($self->{max_w} || -1);
1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1977	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596		1978
1597	my ($w2, $h2) = $self->{template}->size;	1979	my ($w2, $h2) = $self->{template}->size;
1598		1980
1599	$w = List::Util::max $w, $w2;	1981	$w = List::Util::max $w, $w2;
…		…
1604	};	1986	};
1605		1987
1606	@{ $self->{size_req} }	1988	@{ $self->{size_req} }
1607	}	1989	}
1608		1990
		1991	sub baseline_shift {
		1992	$_[0]{layout}->descent
		1993	}
		1994
1609	sub size_allocate {	1995	sub invoke_size_allocate {
1610	my ($self, $w, $h) = @_;	1996	my ($self, $w, $h) = @_;
1611		1997
1612	delete $self->{ox};	1998	delete $self->{ox};
1613		1999
1614	delete $self->{texture}	2000	delete $self->{texture}
1615	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	2001	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		2002
		2003	1
1616	}	2004	}
1617		2005
1618	sub set_fontsize {	2006	sub set_fontsize {
1619	my ($self, $fontsize) = @_;	2007	my ($self, $fontsize) = @_;
1620		2008
1621	$self->{fontsize} = $fontsize;	2009	$self->{fontsize} = $fontsize;
		2010	delete $self->{size_req};
1622	delete $self->{texture};	2011	delete $self->{texture};
1623		2012
1624	$self->realloc;	2013	$self->realloc;
1625	}	2014	}
1626		2015
1627	sub reconfigure {	2016	sub reconfigure {
1628	my ($self) = @_;	2017	my ($self) = @_;
1629		2018
1630	delete $self->{size_req};	2019	delete $self->{size_req};
		2020	delete $self->{texture};
1631		2021
1632	$self->SUPER::reconfigure;	2022	$self->SUPER::reconfigure;
1633	}	2023	}
1634		2024
1635	sub _draw {	2025	sub _draw {
1636	my ($self) = @_;	2026	my ($self) = @_;
1637		2027
1638	$self->SUPER::_draw; # draw background, if applicable	2028	$self->SUPER::_draw; # draw background, if applicable
1639		2029
1640	my $tex = $self->{texture} ||= do {	2030	my $size = $self->{texture} ||= do {
1641	$self->{layout}->set_foreground (@{$self->{fg}});	2031	$self->{layout}->set_foreground (@{$self->{fg}});
1642	$self->{layout}->set_font ($self->{font}) if $self->{font};	2032	$self->{layout}->set_font ($self->{font}) if $self->{font};
1643	$self->{layout}->set_width ($self->{w});	2033	$self->{layout}->set_width ($self->{w});
1644	$self->{layout}->set_ellipsise ($self->{ellipsise});	2034	$self->{layout}->set_ellipsise ($self->{ellipsise});
1645	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2035	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2036	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647		2037
1648	new_from_layout CFClient::Texture $self->{layout}	2038	[$self->{layout}->size]
1649	};	2039	};
1650		2040
1651	unless (exists $self->{ox}) {	2041	unless (exists $self->{ox}) {
1652	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2042	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2043	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654	: ($self->{w} - $tex->{w}) * 0.5);	2044	: ($self->{w} - $size->[0]) * 0.5);
1655		2045
1656	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2046	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2047	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658	: ($self->{h} - $tex->{h}) * 0.5);	2048	: ($self->{h} - $size->[1]) * 0.5);
		2049
		2050	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1659	};	2051	};
1660		2052
1661	glEnable GL_TEXTURE_2D;	2053	# unless ($self->{list}) {
1662		2054	# $self->{list} = CFPlus::OpenGL::glGenList;
1663	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2055	# CFPlus::OpenGL::glNewList $self->{list};
1664	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2056	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1665		2057	# CFPlus::OpenGL::glEndList;
1666	if ($tex->{format} == GL_ALPHA) {
1667	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1668	glColor @{$self->{fg}};
1669	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1670	} else {
1671	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1673	}	2058	# }
		2059	#
		2060	# CFPlus::OpenGL::glCallList $self->{list};
1674		2061
1675	glDisable GL_TEXTURE_2D;	2062	$self->{layout}->draw;
1676	}	2063	}
		2064
		2065	#sub destroy {
		2066	# my ($self) = @_;
		2067	#
		2068	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2069	#
		2070	# $self->SUPER::destroy;
		2071	#}
1677		2072
1678	#############################################################################	2073	#############################################################################
1679		2074
1680	package CFClient::UI::EntryBase;	2075	package CFPlus::UI::EntryBase;
1681		2076
1682	our @ISA = CFClient::UI::Label::;	2077	our @ISA = CFPlus::UI::Label::;
1683		2078
1684	use CFClient::OpenGL;	2079	use CFPlus::OpenGL;
1685		2080
1686	sub new {	2081	sub new {
1687	my $class = shift;	2082	my $class = shift;
1688		2083
1689	$class->SUPER::new (	2084	$class->SUPER::new (
1690	fg => [1, 1, 1],	2085	fg => [1, 1, 1],
1691	bg => [0, 0, 0, 0.2],	2086	bg => [0, 0, 0, 0.2],
		2087	outline => [0.6, 0.3, 0.1],
1692	active_bg => [1, 1, 1, 0.5],	2088	active_bg => [0, 0, 1, .2],
1693	active_fg => [0, 0, 0],	2089	active_fg => [1, 1, 1],
		2090	active_outline => [1, 1, 0],
1694	can_hover => 1,	2091	can_hover => 1,
1695	can_focus => 1,	2092	can_focus => 1,
1696	valign => 0,	2093	valign => 0,
1697	can_events => 1,	2094	can_events => 1,
		2095	ellipsise => 0,
1698	#text => ...	2096	#text => ...
1699	#hidden => "*",	2097	#hidden => "*",
1700	@_	2098	@_
1701	)	2099	)
1702	}	2100	}
…		…
1713		2111
1714	$text =~ s/./*/g if $self->{hidden};	2112	$text =~ s/./*/g if $self->{hidden};
1715	$self->{layout}->set_text ("$text ");	2113	$self->{layout}->set_text ("$text ");
1716	delete $self->{size_req};	2114	delete $self->{size_req};
1717		2115
1718	$self->_emit (changed => $self->{text});	2116	$self->emit (changed => $self->{text});
1719		2117
1720	$self->realloc;	2118	$self->realloc;
1721	$self->update;	2119	$self->update;
1722	}	2120	}
1723		2121
…		…
1738	my ($w, $h) = $self->SUPER::size_request;	2136	my ($w, $h) = $self->SUPER::size_request;
1739		2137
1740	($w + 1, $h) # add 1 for cursor	2138	($w + 1, $h) # add 1 for cursor
1741	}	2139	}
1742		2140
1743	sub key_down {	2141	sub invoke_key_down {
1744	my ($self, $ev) = @_;	2142	my ($self, $ev) = @_;
1745		2143
1746	my $mod = $ev->{mod};	2144	my $mod = $ev->{mod};
1747	my $sym = $ev->{sym};	2145	my $sym = $ev->{sym};
1748	my $uni = $ev->{unicode};	2146	my $uni = $ev->{unicode};
1749		2147
1750	my $text = $self->get_text;	2148	my $text = $self->get_text;
		2149
		2150	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1751		2151
1752	if ($uni == 8) {	2152	if ($uni == 8) {
1753	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2153	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1754	} elsif ($uni == 127) {	2154	} elsif ($uni == 127) {
1755	substr $text, $self->{cursor}, 1, "";	2155	substr $text, $self->{cursor}, 1, "";
1756	} elsif ($sym == CFClient::SDLK_LEFT) {	2156	} elsif ($sym == CFPlus::SDLK_LEFT) {
1757	--$self->{cursor} if $self->{cursor};	2157	--$self->{cursor} if $self->{cursor};
1758	} elsif ($sym == CFClient::SDLK_RIGHT) {	2158	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1759	++$self->{cursor} if $self->{cursor} < length $self->{text};	2159	++$self->{cursor} if $self->{cursor} < length $self->{text};
1760	} elsif ($sym == CFClient::SDLK_HOME) {	2160	} elsif ($sym == CFPlus::SDLK_HOME) {
		2161	# what a hack
		2162	$self->{cursor} =
		2163	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2164	? length $1
		2165	: 0;
		2166	} elsif ($sym == CFPlus::SDLK_END) {
		2167	# uh, again
		2168	$self->{cursor} =
		2169	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2170	? $self->{cursor} + length $1
		2171	: length $self->{text};
		2172	} elsif ($uni == 21) { # ctrl-u
		2173	$text = "";
1761	$self->{cursor} = 0;	2174	$self->{cursor} = 0;
1762	} elsif ($sym == CFClient::SDLK_END) {
1763	$self->{cursor} = length $text;
1764	} elsif ($uni == 27) {	2175	} elsif ($uni == 27) {
1765	$self->_emit ('escape');	2176	$self->emit ('escape');
1766	} elsif ($uni) {	2177	} elsif ($uni == 0x0d) {
		2178	substr $text, $self->{cursor}++, 0, "\012";
		2179	} elsif ($uni >= 0x20) {
1767	substr $text, $self->{cursor}++, 0, chr $uni;	2180	substr $text, $self->{cursor}++, 0, chr $uni;
1768	} else {	2181	} else {
1769	return 0;	2182	return 0;
1770	}	2183	}
1771		2184
1772	$self->_set_text ($text);	2185	$self->_set_text ($text);
1773		2186
1774	$self->realloc;	2187	$self->realloc;
		2188	$self->update;
1775		2189
1776	1	2190	1
1777	}	2191	}
1778		2192
1779	sub focus_in {	2193	sub invoke_focus_in {
1780	my ($self) = @_;	2194	my ($self) = @_;
1781		2195
1782	$self->{last_activity} = $::NOW;	2196	$self->{last_activity} = $::NOW;
1783		2197
1784	$self->SUPER::focus_in;	2198	$self->SUPER::invoke_focus_in
1785	}	2199	}
1786		2200
1787	sub button_down {	2201	sub invoke_button_down {
1788	my ($self, $ev, $x, $y) = @_;	2202	my ($self, $ev, $x, $y) = @_;
1789		2203
1790	$self->SUPER::button_down ($ev, $x, $y);	2204	$self->SUPER::invoke_button_down ($ev, $x, $y);
1791		2205
1792	my $idx = $self->{layout}->xy_to_index ($x, $y);	2206	my $idx = $self->{layout}->xy_to_index ($x, $y);
1793		2207
1794	# byte-index to char-index	2208	# byte-index to char-index
1795	my $text = $self->{text};	2209	my $text = $self->{text};
1796	utf8::encode $text;	2210	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1797	$self->{cursor} = length substr $text, 0, $idx;	2211	$self->{cursor} = length $text;
1798		2212
1799	$self->_set_text ($self->{text});	2213	$self->_set_text ($self->{text});
1800	$self->update;	2214	$self->update;
1801		2215
1802	1	2216	1
1803	}	2217	}
1804		2218
1805	sub mouse_motion {	2219	sub invoke_mouse_motion {
1806	my ($self, $ev, $x, $y) = @_;	2220	my ($self, $ev, $x, $y) = @_;
1807	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2221	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808		2222
1809	0	2223	1
1810	}	2224	}
1811		2225
1812	sub _draw {	2226	sub _draw {
1813	my ($self) = @_;	2227	my ($self) = @_;
1814		2228
…		…
1838		2252
1839	unless (exists $self->{cur_h}) {	2253	unless (exists $self->{cur_h}) {
1840	my $text = substr $self->{text}, 0, $self->{cursor};	2254	my $text = substr $self->{text}, 0, $self->{cursor};
1841	utf8::encode $text;	2255	utf8::encode $text;
1842		2256
1843	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2257	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1844	}	2258	}
1845		2259
1846	glColor @{$self->{fg}};	2260	glColor_premultiply @{$self->{active_fg}};
1847	glBegin GL_LINES;	2261	glBegin GL_LINES;
1848	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2262	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1849	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2263	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1850	glEnd;	2264	glEnd;
1851	}
1852	}
1853		2265
		2266	glLineWidth 3;
		2267	glColor @{$self->{active_outline}};
		2268	glBegin GL_LINE_LOOP;
		2269	glVertex 0, 0;
		2270	glVertex $self->{w} - 1, 0;
		2271	glVertex $self->{w} - 1, $self->{h} - 1;
		2272	glVertex 0, $self->{h} - 1;
		2273	glEnd;
		2274	glLineWidth 1;
		2275
		2276	} else {
		2277	glColor @{$self->{outline}};
		2278	glTranslate .375, .375;
		2279	glBegin GL_LINE_STRIP;
		2280	glVertex 0, $self->{h} * .5;
		2281	glVertex 0, $self->{h} - 3;
		2282	glVertex $self->{w} - 1, $self->{h} - 3;
		2283	glVertex $self->{w} - 1, $self->{h} * .5;
		2284	glEnd;
		2285	}
		2286	}
		2287
		2288	#############################################################################
		2289
1854	package CFClient::UI::Entry;	2290	package CFPlus::UI::Entry;
1855		2291
1856	our @ISA = CFClient::UI::EntryBase::;	2292	our @ISA = CFPlus::UI::EntryBase::;
1857		2293
1858	use CFClient::OpenGL;	2294	use CFPlus::OpenGL;
1859		2295
1860	sub key_down {	2296	sub invoke_key_down {
1861	my ($self, $ev) = @_;	2297	my ($self, $ev) = @_;
1862		2298
1863	my $sym = $ev->{sym};	2299	my $sym = $ev->{sym};
1864		2300
1865	if ($sym == 13) {	2301	if ($ev->{uni} == 0x0d || $sym == 13) {
1866	unshift @{$self->{history}},	2302	unshift @{$self->{history}},
1867	my $txt = $self->get_text;	2303	my $txt = $self->get_text;
		2304
1868	$self->{history_pointer} = -1;	2305	$self->{history_pointer} = -1;
1869	$self->{history_saveback} = '';	2306	$self->{history_saveback} = '';
1870	$self->_emit (activate => $txt);	2307	$self->emit (activate => $txt);
1871	$self->update;	2308	$self->update;
1872		2309
1873	} elsif ($sym == CFClient::SDLK_UP) {	2310	} elsif ($sym == CFPlus::SDLK_UP) {
1874	if ($self->{history_pointer} < 0) {	2311	if ($self->{history_pointer} < 0) {
1875	$self->{history_saveback} = $self->get_text;	2312	$self->{history_saveback} = $self->get_text;
1876	}	2313	}
1877	if (@{$self->{history} || []} > 0) {	2314	if (@{$self->{history} || []} > 0) {
1878	$self->{history_pointer}++;	2315	$self->{history_pointer}++;
…		…
1880	$self->{history_pointer} = @{$self->{history} || []} - 1;	2317	$self->{history_pointer} = @{$self->{history} || []} - 1;
1881	}	2318	}
1882	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2319	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1883	}	2320	}
1884		2321
1885	} elsif ($sym == CFClient::SDLK_DOWN) {	2322	} elsif ($sym == CFPlus::SDLK_DOWN) {
1886	$self->{history_pointer}--;	2323	$self->{history_pointer}--;
1887	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2324	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1888		2325
1889	if ($self->{history_pointer} >= 0) {	2326	if ($self->{history_pointer} >= 0) {
1890	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2327	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1891	} else {	2328	} else {
1892	$self->set_text ($self->{history_saveback});	2329	$self->set_text ($self->{history_saveback});
1893	}	2330	}
1894		2331
1895	} else {	2332	} else {
1896	return $self->SUPER::key_down ($ev)	2333	return $self->SUPER::invoke_key_down ($ev)
1897	}	2334	}
1898		2335
1899	1	2336	1
1900	}	2337	}
1901		2338
1902	#############################################################################	2339	#############################################################################
1903		2340
		2341	package CFPlus::UI::TextEdit;
		2342
		2343	our @ISA = CFPlus::UI::EntryBase::;
		2344
		2345	use CFPlus::OpenGL;
		2346
		2347	sub move_cursor_ver {
		2348	my ($self, $dy) = @_;
		2349
		2350	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2351
		2352	$y += $dy;
		2353
		2354	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2355	$self->{cursor} = $index;
		2356	delete $self->{cur_h};
		2357	$self->update;
		2358	return;
		2359	}
		2360	}
		2361
		2362	sub invoke_key_down {
		2363	my ($self, $ev) = @_;
		2364
		2365	my $sym = $ev->{sym};
		2366
		2367	if ($sym == CFPlus::SDLK_UP) {
		2368	$self->move_cursor_ver (-1);
		2369	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2370	$self->move_cursor_ver (+1);
		2371	} else {
		2372	return $self->SUPER::invoke_key_down ($ev)
		2373	}
		2374
		2375	1
		2376	}
		2377
		2378	#############################################################################
		2379
1904	package CFClient::UI::Button;	2380	package CFPlus::UI::ButtonBin;
1905		2381
1906	our @ISA = CFClient::UI::Label::;	2382	our @ISA = CFPlus::UI::Bin::;
1907		2383
1908	use CFClient::OpenGL;	2384	use CFPlus::OpenGL;
1909		2385
1910	my @tex =	2386	my @tex =
1911	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2387	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1912	qw(b1_button_active.png);	2388	qw(b1_button_inactive.png b1_button_active.png);
1913		2389
1914	sub new {	2390	sub new {
1915	my $class = shift;	2391	my $class = shift;
1916		2392
1917	$class->SUPER::new (	2393	$class->SUPER::new (
1918	padding_x => 4,
1919	padding_y => 4,
1920	fg => [1, 1, 1],
1921	active_fg => [0, 0, 1],
1922	can_hover => 1,	2394	can_hover => 1,
1923	align => 0,	2395	align => 0,
1924	valign => 0,	2396	valign => 0,
1925	can_events => 1,	2397	can_events => 1,
1926	@_	2398	@_
1927	)	2399	)
1928	}	2400	}
1929		2401
1930	sub activate { }
1931
1932	sub button_up {	2402	sub invoke_button_up {
1933	my ($self, $ev, $x, $y) = @_;	2403	my ($self, $ev, $x, $y) = @_;
1934		2404
1935	$self->emit ("activate")	2405	$self->emit ("activate")
1936	if $x >= 0 && $x < $self->{w}	2406	if $x >= 0 && $x < $self->{w}
1937	&& $y >= 0 && $y < $self->{h};	2407	&& $y >= 0 && $y < $self->{h};
…		…
1940	}	2410	}
1941		2411
1942	sub _draw {	2412	sub _draw {
1943	my ($self) = @_;	2413	my ($self) = @_;
1944		2414
1945	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1946
1947	glEnable GL_TEXTURE_2D;	2415	glEnable GL_TEXTURE_2D;
1948	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2416	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1949	glColor 0, 0, 0, 1;	2417	glColor 0, 0, 0, 1;
1950		2418
		2419	my $tex = $tex[$GRAB == $self];
1951	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2420	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1952		2421
1953	glDisable GL_TEXTURE_2D;	2422	glDisable GL_TEXTURE_2D;
1954		2423
1955	$self->SUPER::_draw;	2424	$self->SUPER::_draw;
1956	}	2425	}
1957		2426
1958	#############################################################################	2427	#############################################################################
1959		2428
1960	package CFClient::UI::CheckBox;	2429	package CFPlus::UI::Button;
1961		2430
1962	our @ISA = CFClient::UI::DrawBG::;	2431	our @ISA = CFPlus::UI::Label::;
		2432
		2433	use CFPlus::OpenGL;
1963		2434
1964	my @tex =	2435	my @tex =
1965	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2436	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2437	qw(b1_button_inactive.png b1_button_active.png);
		2438
		2439	sub new {
		2440	my $class = shift;
		2441
		2442	$class->SUPER::new (
		2443	padding_x => 4,
		2444	padding_y => 4,
		2445	fg => [1.0, 1.0, 1.0],
		2446	active_fg => [0.8, 0.8, 0.8],
		2447	can_hover => 1,
		2448	align => 0,
		2449	valign => 0,
		2450	can_events => 1,
		2451	@_
		2452	)
		2453	}
		2454
		2455	sub invoke_button_up {
		2456	my ($self, $ev, $x, $y) = @_;
		2457
		2458	$self->emit ("activate")
		2459	if $x >= 0 && $x < $self->{w}
		2460	&& $y >= 0 && $y < $self->{h};
		2461
		2462	1
		2463	}
		2464
		2465	sub _draw {
		2466	my ($self) = @_;
		2467
		2468	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2469
		2470	glEnable GL_TEXTURE_2D;
		2471	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2472	glColor 0, 0, 0, 1;
		2473
		2474	my $tex = $tex[$GRAB == $self];
		2475	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2476
		2477	glDisable GL_TEXTURE_2D;
		2478
		2479	$self->SUPER::_draw;
		2480	}
		2481
		2482	#############################################################################
		2483
		2484	package CFPlus::UI::CheckBox;
		2485
		2486	our @ISA = CFPlus::UI::DrawBG::;
		2487
		2488	my @tex =
		2489	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1966	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2490	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1967		2491
1968	use CFClient::OpenGL;	2492	use CFPlus::OpenGL;
1969		2493
1970	sub new {	2494	sub new {
1971	my $class = shift;	2495	my $class = shift;
1972		2496
1973	$class->SUPER::new (	2497	$class->SUPER::new (
…		…
1987	my ($self) = @_;	2511	my ($self) = @_;
1988		2512
1989	(6) x 2	2513	(6) x 2
1990	}	2514	}
1991		2515
		2516	sub toggle {
		2517	my ($self) = @_;
		2518
		2519	$self->{state} = !$self->{state};
		2520	$self->emit (changed => $self->{state});
		2521	$self->update;
		2522	}
		2523
1992	sub button_down {	2524	sub invoke_button_down {
1993	my ($self, $ev, $x, $y) = @_;	2525	my ($self, $ev, $x, $y) = @_;
1994		2526
1995	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2527	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1996	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2528	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1997	$self->{state} = !$self->{state};	2529	$self->toggle;
1998	$self->_emit (changed => $self->{state});
1999	} else {	2530	} else {
2000	return 0	2531	return 0
2001	}	2532	}
2002		2533
2003	1	2534	1
…		…
2023	glDisable GL_TEXTURE_2D;	2554	glDisable GL_TEXTURE_2D;
2024	}	2555	}
2025		2556
2026	#############################################################################	2557	#############################################################################
2027		2558
2028	package CFClient::UI::Image;	2559	package CFPlus::UI::Image;
2029		2560
2030	our @ISA = CFClient::UI::Base::;	2561	our @ISA = CFPlus::UI::Base::;
2031		2562
2032	use CFClient::OpenGL;	2563	use CFPlus::OpenGL;
2033	use Carp qw/confess/;
2034		2564
2035	our %loaded_images;	2565	our %texture_cache;
2036		2566
2037	sub new {	2567	sub new {
2038	my $class = shift;	2568	my $class = shift;
2039		2569
2040	my $self = $class->SUPER::new (can_events => 0, @_);	2570	my $self = $class->SUPER::new (
		2571	can_events => 0,
		2572	scale => 1,
		2573	@_,
		2574	);
2041		2575
2042	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2576	$self->{path} || $self->{tex}
		2577	or Carp::croak "'path' or 'tex' attributes required";
2043		2578
2044	$loaded_images{$self->{image}} ||=	2579	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2045	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2580	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2046		2581
2047	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2582	CFPlus::weaken $texture_cache{$self->{path}};
2048		2583
2049	Scalar::Util::weaken $loaded_images{$self->{image}};	2584	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2050
2051	$self->{aspect} = $tex->{w} / $tex->{h};
2052		2585
2053	$self	2586	$self
2054	}	2587	}
2055		2588
		2589	sub STORABLE_freeze {
		2590	my ($self, $cloning) = @_;
		2591
		2592	$self->{path}
		2593	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2594
		2595	$self->{path}
		2596	}
		2597
		2598	sub STORABLE_attach {
		2599	my ($self, $cloning, $path) = @_;
		2600
		2601	$self->new (path => $path)
		2602	}
		2603
2056	sub size_request {	2604	sub size_request {
2057	my ($self) = @_;	2605	my ($self) = @_;
2058		2606
2059	($self->{tex}->{w}, $self->{tex}->{h})	2607	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2060	}	2608	}
2061		2609
2062	sub _draw {	2610	sub _draw {
2063	my ($self) = @_;	2611	my ($self) = @_;
2064		2612
…		…
2081	glDisable GL_TEXTURE_2D;	2629	glDisable GL_TEXTURE_2D;
2082	}	2630	}
2083		2631
2084	#############################################################################	2632	#############################################################################
2085		2633
		2634	package CFPlus::UI::ImageButton;
		2635
		2636	our @ISA = CFPlus::UI::Image::;
		2637
		2638	use CFPlus::OpenGL;
		2639
		2640	my %textures;
		2641
		2642	sub new {
		2643	my $class = shift;
		2644
		2645	my $self = $class->SUPER::new (
		2646	padding_x => 4,
		2647	padding_y => 4,
		2648	fg => [1, 1, 1],
		2649	active_fg => [0, 0, 1],
		2650	can_hover => 1,
		2651	align => 0,
		2652	valign => 0,
		2653	can_events => 1,
		2654	@_
		2655	);
		2656	}
		2657
		2658	sub invoke_button_down {
		2659	my ($self, $ev, $x, $y) = @_;
		2660
		2661	1
		2662	}
		2663
		2664	sub invoke_button_up {
		2665	my ($self, $ev, $x, $y) = @_;
		2666
		2667	$self->emit ("activate")
		2668	if $x >= 0 && $x < $self->{w}
		2669	&& $y >= 0 && $y < $self->{h};
		2670
		2671	1
		2672	}
		2673
		2674	#############################################################################
		2675
2086	package CFClient::UI::VGauge;	2676	package CFPlus::UI::VGauge;
2087		2677
2088	our @ISA = CFClient::UI::Base::;	2678	our @ISA = CFPlus::UI::Base::;
2089		2679
2090	use List::Util qw(min max);	2680	use List::Util qw(min max);
2091		2681
2092	use CFClient::OpenGL;	2682	use CFPlus::OpenGL;
2093		2683
2094	my %tex = (	2684	my %tex = (
2095	food => [	2685	food => [
2096	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2686	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2687	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2098	],	2688	],
2099	grace => [	2689	grace => [
2100	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2690	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2101	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2691	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2102	],	2692	],
2103	hp => [	2693	hp => [
2104	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2694	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2105	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2695	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2106	],	2696	],
2107	mana => [	2697	mana => [
2108	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2698	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2109	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2699	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2110	],	2700	],
2111	);	2701	);
2112		2702
2113	# eg. VGauge->new (gauge => 'food'), default gauge: food	2703	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2173	my $ycut1 = max 0, min 1, $ycut;	2763	my $ycut1 = max 0, min 1, $ycut;
2174	my $ycut2 = max 0, min 1, $ycut - 1;	2764	my $ycut2 = max 0, min 1, $ycut - 1;
2175		2765
2176	my $h1 = $self->{h} * (1 - $ycut1);	2766	my $h1 = $self->{h} * (1 - $ycut1);
2177	my $h2 = $self->{h} * (1 - $ycut2);	2767	my $h2 = $self->{h} * (1 - $ycut2);
		2768	my $h3 = $self->{h};
		2769
		2770	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2178		2771
2179	glEnable GL_BLEND;	2772	glEnable GL_BLEND;
2180	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2773	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2774	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2182	glEnable GL_TEXTURE_2D;	2775	glEnable GL_TEXTURE_2D;
…		…
2201		2794
2202	if ($t3) {	2795	if ($t3) {
2203	glBindTexture GL_TEXTURE_2D, $t3->{name};	2796	glBindTexture GL_TEXTURE_2D, $t3->{name};
2204	glBegin GL_QUADS;	2797	glBegin GL_QUADS;
2205	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2798	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2206	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2799	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2207	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2800	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2208	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2801	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2209	glEnd;	2802	glEnd;
2210	}	2803	}
2211		2804
2212	glDisable GL_BLEND;	2805	glDisable GL_BLEND;
2213	glDisable GL_TEXTURE_2D;	2806	glDisable GL_TEXTURE_2D;
2214	}	2807	}
2215		2808
2216	#############################################################################	2809	#############################################################################
2217		2810
2218	package CFClient::UI::Gauge;	2811	package CFPlus::UI::Gauge;
2219		2812
2220	our @ISA = CFClient::UI::VBox::;	2813	our @ISA = CFPlus::UI::VBox::;
2221		2814
2222	sub new {	2815	sub new {
2223	my ($class, %arg) = @_;	2816	my ($class, %arg) = @_;
2224		2817
2225	my $self = $class->SUPER::new (	2818	my $self = $class->SUPER::new (
…		…
2227	can_hover => 1,	2820	can_hover => 1,
2228	can_events => 1,	2821	can_events => 1,
2229	%arg,	2822	%arg,
2230	);	2823	);
2231		2824
2232	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2825	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2233	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2826	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2234	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2827	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2235		2828
2236	$self	2829	$self
2237	}	2830	}
2238		2831
2239	sub set_fontsize {	2832	sub set_fontsize {
…		…
2260	$self->{value}->set_text ($val);	2853	$self->{value}->set_text ($val);
2261	}	2854	}
2262		2855
2263	#############################################################################	2856	#############################################################################
2264		2857
2265	package CFClient::UI::Slider;	2858	package CFPlus::UI::Slider;
2266		2859
2267	use strict;	2860	use strict;
2268		2861
2269	use CFClient::OpenGL;	2862	use CFPlus::OpenGL;
2270		2863
2271	our @ISA = CFClient::UI::DrawBG::;	2864	our @ISA = CFPlus::UI::DrawBG::;
2272		2865
2273	my @tex =	2866	my @tex =
2274	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2867	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2275	qw(s1_slider.png s1_slider_bg.png);	2868	qw(s1_slider.png s1_slider_bg.png);
2276		2869
2277	sub new {	2870	sub new {
2278	my $class = shift;	2871	my $class = shift;
2279		2872
…		…
2300	$self->update;	2893	$self->update;
2301		2894
2302	$self	2895	$self
2303	}	2896	}
2304		2897
2305	sub changed { }
2306
2307	sub set_range {	2898	sub set_range {
2308	my ($self, $range) = @_;	2899	my ($self, $range) = @_;
2309		2900
2310	($range, $self->{range}) = ($self->{range}, $range);	2901	($range, $self->{range}) = ($self->{range}, $range);
2311		2902
…		…
2331	if $unit;	2922	if $unit;
2332		2923
2333	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2924	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2334		2925
2335	if ($value != $old_value) {	2926	if ($value != $old_value) {
2336	$self->_emit (changed => $value);	2927	$self->emit (changed => $value);
2337	$self->update;	2928	$self->update;
2338	}	2929	}
2339	}	2930	}
2340		2931
2341	sub size_request {	2932	sub size_request {
2342	my ($self) = @_;	2933	my ($self) = @_;
2343		2934
2344	($self->{req_w}, $self->{req_h})	2935	($self->{req_w}, $self->{req_h})
2345	}	2936	}
2346		2937
2347	sub button_down {	2938	sub invoke_button_down {
2348	my ($self, $ev, $x, $y) = @_;	2939	my ($self, $ev, $x, $y) = @_;
2349		2940
2350	$self->SUPER::button_down ($ev, $x, $y);	2941	$self->SUPER::invoke_button_down ($ev, $x, $y);
2351		2942
2352	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2943	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2353		2944
2354	$self->mouse_motion ($ev, $x, $y)	2945	$self->invoke_mouse_motion ($ev, $x, $y);
2355	}
2356		2946
		2947	1
		2948	}
		2949
2357	sub mouse_motion {	2950	sub invoke_mouse_motion {
2358	my ($self, $ev, $x, $y) = @_;	2951	my ($self, $ev, $x, $y) = @_;
2359		2952
2360	if ($GRAB == $self) {	2953	if ($GRAB == $self) {
2361	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2954	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2362		2955
…		…
2366		2959
2367	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2960	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2368	} else {	2961	} else {
2369	return 0;	2962	return 0;
2370	}	2963	}
		2964
		2965	1
		2966	}
		2967
		2968	sub invoke_mouse_wheel {
		2969	my ($self, $ev) = @_;
		2970
		2971	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2972
		2973	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2974
		2975	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2371		2976
2372	1	2977	1
2373	}	2978	}
2374		2979
2375	sub update {	2980	sub update {
…		…
2426	glDisable GL_TEXTURE_2D;	3031	glDisable GL_TEXTURE_2D;
2427	}	3032	}
2428		3033
2429	#############################################################################	3034	#############################################################################
2430		3035
2431	package CFClient::UI::ValSlider;	3036	package CFPlus::UI::ValSlider;
2432		3037
2433	our @ISA = CFClient::UI::HBox::;	3038	our @ISA = CFPlus::UI::HBox::;
2434		3039
2435	sub new {	3040	sub new {
2436	my ($class, %arg) = @_;	3041	my ($class, %arg) = @_;
2437		3042
2438	my $range = delete $arg{range};	3043	my $range = delete $arg{range};
2439		3044
2440	my $self = $class->SUPER::new (	3045	my $self = $class->SUPER::new (
2441	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3046	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2442	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3047	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2443	to_value => sub { shift },	3048	to_value => sub { shift },
2444	from_value => sub { shift },	3049	from_value => sub { shift },
2445	%arg,	3050	%arg,
2446	);	3051	);
2447		3052
…		…
2467	sub set_range { shift->{slider}->set_range (@_) }	3072	sub set_range { shift->{slider}->set_range (@_) }
2468	sub set_value { shift->{slider}->set_value (@_) }	3073	sub set_value { shift->{slider}->set_value (@_) }
2469		3074
2470	#############################################################################	3075	#############################################################################
2471		3076
2472	package CFClient::UI::TextScroller;	3077	package CFPlus::UI::TextScroller;
2473		3078
2474	our @ISA = CFClient::UI::HBox::;	3079	our @ISA = CFPlus::UI::HBox::;
2475		3080
2476	use CFClient::OpenGL;	3081	use CFPlus::OpenGL;
2477		3082
2478	sub new {	3083	sub new {
2479	my $class = shift;	3084	my $class = shift;
2480		3085
2481	my $self = $class->SUPER::new (	3086	my $self = $class->SUPER::new (
2482	fontsize => 1,	3087	fontsize => 1,
2483	can_events => 0,	3088	can_events => 1,
2484	indent => 0,	3089	indent => 0,
2485	#font => default_font	3090	#font => default_font
2486	@_,	3091	@_,
2487		3092
2488	layout => (new CFClient::Layout 1),	3093	layout => (new CFPlus::Layout),
2489	par => [],	3094	par => [],
		3095	max_par => 0,
2490	height => 0,	3096	height => 0,
2491	children => [	3097	children => [
2492	(new CFClient::UI::Empty expand => 1),	3098	(new CFPlus::UI::Empty expand => 1),
2493	(new CFClient::UI::Slider vertical => 1),	3099	(new CFPlus::UI::Slider vertical => 1),
2494	],	3100	],
2495	);	3101	);
2496		3102
2497	$self->{children}[1]->connect (changed => sub { $self->update });	3103	$self->{children}[1]->connect (changed => sub { $self->update });
2498		3104
…		…
2504		3110
2505	$self->{fontsize} = $fontsize;	3111	$self->{fontsize} = $fontsize;
2506	$self->reflow;	3112	$self->reflow;
2507	}	3113	}
2508		3114
		3115	sub size_request {
		3116	my ($self) = @_;
		3117
		3118	my ($empty, $slider) = $self->visible_children;
		3119
		3120	local $self->{children} = [$empty, $slider];
		3121	$self->SUPER::size_request
		3122	}
		3123
2509	sub size_allocate {	3124	sub invoke_size_allocate {
2510	my ($self, $w, $h) = @_;	3125	my ($self, $w, $h) = @_;
2511		3126
2512	$self->SUPER::size_allocate ($w, $h);	3127	my ($empty, $slider, @other) = @{ $self->{children} };
		3128	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2513		3129
2514	$self->{layout}->set_font ($self->{font}) if $self->{font};	3130	$self->{layout}->set_font ($self->{font}) if $self->{font};
2515	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3131	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2516	$self->{layout}->set_width ($self->{children}[0]{w});	3132	$self->{layout}->set_width ($empty->{w});
2517	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3133	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2518		3134
2519	$self->reflow;	3135	$self->reflow;
2520	}
2521		3136
2522	sub text_size {	3137	local $self->{children} = [$empty, $slider];
		3138	$self->SUPER::invoke_size_allocate ($w, $h)
		3139	}
		3140
		3141	sub invoke_mouse_wheel {
2523	my ($self, $text, $indent) = @_;	3142	my ($self, $ev) = @_;
		3143
		3144	return 0 unless $ev->{dy}; # only vertical movements
		3145
		3146	$self->{children}[1]->emit (mouse_wheel => $ev);
		3147
		3148	1
		3149	}
		3150
		3151	sub get_layout {
		3152	my ($self, $para) = @_;
2524		3153
2525	my $layout = $self->{layout};	3154	my $layout = $self->{layout};
2526		3155
		3156	$layout->set_font ($self->{font}) if $self->{font};
		3157	$layout->set_foreground (@{$para->{fg}});
2527	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3158	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2528	$layout->set_width ($self->{children}[0]{w} - $indent);	3159	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2529	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3160	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2530	$layout->set_markup ($text);	3161	$layout->set_markup ($para->{markup});
		3162
		3163	$layout->set_shapes (
		3164	map
		3165	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3166	@{$para->{widget}}
2531		3167	);
		3168
2532	$layout->size	3169	$layout
2533	}	3170	}
2534		3171
2535	sub reflow {	3172	sub reflow {
2536	my ($self) = @_;	3173	my ($self) = @_;
2537		3174
…		…
2544		3181
2545	# todo: base offset on lines or so, not on pixels	3182	# todo: base offset on lines or so, not on pixels
2546	$self->{children}[1]->set_value ($offset);	3183	$self->{children}[1]->set_value ($offset);
2547	}	3184	}
2548		3185
		3186	sub current_paragraph {
		3187	my ($self) = @_;
		3188
		3189	$self->{top_paragraph} - 1
		3190	}
		3191
		3192	sub scroll_to {
		3193	my ($self, $para) = @_;
		3194
		3195	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3196
		3197	$self->{scroll_to} = $para;
		3198	$self->update;
		3199	}
		3200
2549	sub clear {	3201	sub clear {
2550	my ($self) = @_;	3202	my ($self) = @_;
		3203
		3204	my (undef, undef, @other) = @{ $self->{children} };
		3205	$self->remove ($_) for @other;
2551		3206
2552	$self->{par} = [];	3207	$self->{par} = [];
2553	$self->{height} = 0;	3208	$self->{height} = 0;
2554	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3209	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2555	}	3210	}
2556		3211
2557	sub add_paragraph {	3212	sub add_paragraph {
2558	my ($self, $color, $text, $indent) = @_;	3213	my $self = shift;
2559		3214
2560	for my $line (split /\n/, $text) {	3215	for my $para (@_) {
2561	my ($w, $h) = $self->text_size ($line);	3216	$para = {
		3217	fg => [1, 1, 1, 1],
		3218	indent => 0,
		3219	markup => "",
		3220	widget => [],
		3221	ref $para ? %$para : (markup => $para),
		3222	w => 1e10,
		3223	wrapped => 1,
		3224	};
		3225
		3226	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3227	push @{$self->{par}}, $para;
		3228	}
		3229
		3230	if (my $max = $self->{max_par}) {
		3231	shift @{$self->{par}} while @{$self->{par}} > $max;
		3232	}
		3233
		3234	$self->{need_reflow}++;
		3235	$self->update;
		3236	}
		3237
		3238	sub scroll_to_bottom {
		3239	my ($self) = @_;
		3240
		3241	$self->{scroll_to} = $#{$self->{par}};
		3242	$self->update;
		3243	}
		3244
		3245	sub force_uptodate {
		3246	my ($self) = @_;
		3247
		3248	if (delete $self->{need_reflow}) {
		3249	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3250
		3251	my $height = 0;
		3252
		3253	for my $para (@{$self->{par}}) {
		3254	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3255	my $layout = $self->get_layout ($para);
		3256	my ($w, $h) = $layout->size;
		3257
		3258	$para->{w} = $w + $para->{indent};
		3259	$para->{h} = $h;
		3260	$para->{wrapped} = $layout->has_wrapped;
		3261	}
		3262
		3263	$para->{y} = $height;
		3264	$height += $para->{h};
		3265	}
		3266
2562	$self->{height} += $h;	3267	$self->{height} = $height;
2563	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3268	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2564	}
2565		3269
2566	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3270	delete $self->{texture};
		3271	}
		3272
		3273	if (my $paridx = delete $self->{scroll_to}) {
		3274	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3275	}
2567	}	3276	}
2568		3277
2569	sub update {	3278	sub update {
2570	my ($self) = @_;	3279	my ($self) = @_;
2571		3280
…		…
2574	return unless $self->{h} > 0;	3283	return unless $self->{h} > 0;
2575		3284
2576	delete $self->{texture};	3285	delete $self->{texture};
2577		3286
2578	$ROOT->on_post_alloc ($self => sub {	3287	$ROOT->on_post_alloc ($self => sub {
		3288	$self->force_uptodate;
		3289
2579	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3290	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2580		3291
2581	if (delete $self->{need_reflow}) {
2582	my $height = 0;
2583
2584	my $layout = $self->{layout};
2585
2586	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2587
2588	for (@{$self->{par}}) {
2589	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2590	$layout->set_width ($W - $_->[3]);
2591	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592	$layout->set_markup ($_->[4]);
2593	my ($w, $h) = $layout->size;
2594	$_->[0] = $w + $_->[3];
2595	$_->[1] = $h;
2596	}
2597
2598	$height += $_->[1];
2599	}
2600
2601	$self->{height} = $height;
2602
2603	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2604
2605	delete $self->{texture};
2606	}
2607
2608	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3292	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2609	glClearColor 0, 0, 0, 0;	3293	glClearColor 0, 0, 0, 0;
2610	glClear GL_COLOR_BUFFER_BIT;	3294	glClear GL_COLOR_BUFFER_BIT;
2611		3295
		3296	package CFPlus::UI::Base;
		3297	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3298	(0, 0, $self->{w}, $self->{h});
		3299
		3300	my $top = int $self->{children}[1]{range}[0];
		3301
		3302	my $paridx = 0;
		3303	my $top_paragraph;
2612	my $top = int $self->{children}[1]{range}[0];	3304	my $top = int $self->{children}[1]{range}[0];
2613		3305
2614	my $y0 = $top;	3306	my $y0 = $top;
2615	my $y1 = $top + $H;	3307	my $y1 = $top + $H;
2616		3308
2617	my $y = 0;
2618
2619	my $layout = $self->{layout};
2620
2621	$layout->set_font ($self->{font}) if $self->{font};
2622
2623	glEnable GL_BLEND;
2624	#TODO# not correct in windows where rgba is forced off
2625	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2626
2627	for my $par (@{$self->{par}}) {	3309	for my $para (@{$self->{par}}) {
2628	my $h = $par->[1];	3310	my $h = $para->{h};
		3311	my $y = $para->{y};
2629		3312
2630	if ($y0 < $y + $h && $y < $y1) {	3313	if ($y0 < $y + $h && $y < $y1) {
2631	$layout->set_foreground (@{ $par->[2] });	3314	my $layout = $self->get_layout ($para);
2632	$layout->set_width ($W - $par->[3]);
2633	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2634	$layout->set_markup ($par->[4]);
2635		3315
2636	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3316	$layout->render ($para->{indent}, $y - $y0);
		3317	$layout->draw;
2637		3318
2638	glRasterPos $par->[3], $y - $y0;	3319	if (my @w = @{ $para->{widget} }) {
2639	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3320	my @s = $layout->get_shapes;
		3321
		3322	for (@w) {
		3323	my ($dx, $dy) = splice @s, 0, 2, ();
		3324
		3325	$_->{x} = $dx + $para->{indent};
		3326	$_->{y} = $dy + $y - $y0;
		3327
		3328	$_->draw;
		3329	}
		3330	}
2640	}	3331	}
2641		3332
2642	$y += $h;	3333	$paridx++;
		3334	$top_paragraph ||= $paridx if $y >= $top;
2643	}	3335	}
2644		3336
2645	glDisable GL_BLEND;	3337	$self->{top_paragraph} = $top_paragraph;
2646	};	3338	};
2647	});	3339	});
		3340	}
		3341
		3342	sub reconfigure {
		3343	my ($self) = @_;
		3344
		3345	$self->SUPER::reconfigure;
		3346
		3347	$_->{w} = 1e10 for @{ $self->{par} };
		3348	$self->reflow;
2648	}	3349	}
2649		3350
2650	sub _draw {	3351	sub _draw {
2651	my ($self) = @_;	3352	my ($self) = @_;
2652		3353
…		…
2655	glColor 0, 0, 0, 1;	3356	glColor 0, 0, 0, 1;
2656	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3357	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2657	glDisable GL_TEXTURE_2D;	3358	glDisable GL_TEXTURE_2D;
2658		3359
2659	$self->{children}[1]->draw;	3360	$self->{children}[1]->draw;
2660
2661	}	3361	}
2662		3362
2663	#############################################################################	3363	#############################################################################
2664		3364
2665	package CFClient::UI::Animator;	3365	package CFPlus::UI::Animator;
2666		3366
2667	use CFClient::OpenGL;	3367	use CFPlus::OpenGL;
2668		3368
2669	our @ISA = CFClient::UI::Bin::;	3369	our @ISA = CFPlus::UI::Bin::;
2670		3370
2671	sub moveto {	3371	sub moveto {
2672	my ($self, $x, $y) = @_;	3372	my ($self, $x, $y) = @_;
2673		3373
2674	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3374	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2702	glPopMatrix;	3402	glPopMatrix;
2703	}	3403	}
2704		3404
2705	#############################################################################	3405	#############################################################################
2706		3406
2707	package CFClient::UI::Flopper;	3407	package CFPlus::UI::Flopper;
2708		3408
2709	our @ISA = CFClient::UI::Button::;	3409	our @ISA = CFPlus::UI::Button::;
2710		3410
2711	sub new {	3411	sub new {
2712	my $class = shift;	3412	my $class = shift;
2713		3413
2714	my $self = $class->SUPER::new (	3414	my $self = $class->SUPER::new (
…		…
2726	$self->{other}->toggle_visibility;	3426	$self->{other}->toggle_visibility;
2727	}	3427	}
2728		3428
2729	#############################################################################	3429	#############################################################################
2730		3430
2731	package CFClient::UI::Tooltip;	3431	package CFPlus::UI::Tooltip;
2732		3432
2733	our @ISA = CFClient::UI::Bin::;	3433	our @ISA = CFPlus::UI::Bin::;
2734		3434
2735	use CFClient::OpenGL;	3435	use CFPlus::OpenGL;
2736		3436
2737	sub new {	3437	sub new {
2738	my $class = shift;	3438	my $class = shift;
2739		3439
2740	$class->SUPER::new (	3440	$class->SUPER::new (
…		…
2743	)	3443	)
2744	}	3444	}
2745		3445
2746	sub set_tooltip_from {	3446	sub set_tooltip_from {
2747	my ($self, $widget) = @_;	3447	my ($self, $widget) = @_;
		3448
		3449	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3450	if $widget->{tooltip} =~ /^#(.*)$/;
2748		3451
2749	my $tooltip = $widget->{tooltip};	3452	my $tooltip = $widget->{tooltip};
2750		3453
2751	if ($ENV{CFPLUS_DEBUG} & 2) {	3454	if ($ENV{CFPLUS_DEBUG} & 2) {
2752	$tooltip .= "\n\n" . (ref $widget) . "\n"	3455	$tooltip .= "\n\n" . (ref $widget) . "\n"
2753	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3456	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2754	. "req $widget->{req_w} $widget->{req_h}\n"	3457	. "req $widget->{req_w} $widget->{req_h}\n"
2755	. "visible $widget->{visible}";	3458	. "visible $widget->{visible}";
2756	}	3459	}
2757		3460
		3461	$tooltip =~ s/^\n+//;
		3462	$tooltip =~ s/\n+$//;
		3463
2758	$self->add (new CFClient::UI::Label	3464	$self->add (new CFPlus::UI::Label
2759	markup => $tooltip,	3465	markup => $tooltip,
2760	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3466	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2761	fontsize => 0.8,	3467	fontsize => 0.8,
2762	fg => [0, 0, 0, 1],	3468	style => 1, # FLAG_INVERSE
2763	ellipsise => 0,	3469	ellipsise => 0,
2764	font => ($widget->{tooltip_font} || $::FONT_PROP),	3470	font => ($widget->{tooltip_font} || $::FONT_PROP),
2765	);	3471	);
2766	}	3472	}
2767		3473
…		…
2771	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3477	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2772		3478
2773	($w + 4, $h + 4)	3479	($w + 4, $h + 4)
2774	}	3480	}
2775		3481
2776	sub size_allocate {	3482	sub invoke_size_allocate {
2777	my ($self, $w, $h) = @_;	3483	my ($self, $w, $h) = @_;
2778		3484
2779	$self->SUPER::size_allocate ($w - 4, $h - 4);	3485	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2780	}	3486	}
2781		3487
2782	sub visibility_change {	3488	sub invoke_visibility_change {
2783	my ($self, $visible) = @_;	3489	my ($self, $visible) = @_;
2784		3490
2785	return unless $visible;	3491	return unless $visible;
2786		3492
2787	$self->{root}->on_post_alloc ("move_$self" => sub {	3493	$self->{root}->on_post_alloc ("move_$self" => sub {
2788	my $widget = $self->{owner}	3494	my $widget = $self->{owner}
2789	or return;	3495	or return;
2790		3496
		3497	if ($widget->{visible}) {
2791	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3498	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2792		3499
2793	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3500	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2794	if $x + $self->{w} > $self->{root}{w};	3501	if $x + $self->{w} > $self->{root}{w};
2795		3502
2796	$self->move_abs ($x, $y);	3503	$self->move_abs ($x, $y);
		3504	} else {
		3505	$self->hide;
		3506	}
2797	});	3507	});
2798	}	3508	}
2799		3509
2800	sub _draw {	3510	sub _draw {
2801	my ($self) = @_;	3511	my ($self) = @_;
…		…
2803	glTranslate 0.375, 0.375;	3513	glTranslate 0.375, 0.375;
2804		3514
2805	my ($w, $h) = @$self{qw(w h)};	3515	my ($w, $h) = @$self{qw(w h)};
2806		3516
2807	glColor 1, 0.8, 0.4;	3517	glColor 1, 0.8, 0.4;
2808	glBegin GL_QUADS;	3518	glRect 0, 0, $w, $h;
2809	glVertex 0 , 0;
2810	glVertex 0 , $h;
2811	glVertex $w, $h;
2812	glVertex $w, 0;
2813	glEnd;
2814		3519
2815	glColor 0, 0, 0;	3520	glColor 0, 0, 0;
2816	glBegin GL_LINE_LOOP;	3521	glBegin GL_LINE_LOOP;
2817	glVertex 0 , 0;	3522	glVertex 0 , 0;
2818	glVertex 0 , $h;	3523	glVertex 0 , $h;
…		…
2825	$self->SUPER::_draw;	3530	$self->SUPER::_draw;
2826	}	3531	}
2827		3532
2828	#############################################################################	3533	#############################################################################
2829		3534
2830	package CFClient::UI::Face;	3535	package CFPlus::UI::Face;
2831		3536
2832	our @ISA = CFClient::UI::Base::;	3537	our @ISA = CFPlus::UI::DrawBG::;
2833		3538
2834	use CFClient::OpenGL;	3539	use CFPlus::OpenGL;
2835		3540
2836	sub new {	3541	sub new {
2837	my $class = shift;	3542	my $class = shift;
2838		3543
2839	my $self = $class->SUPER::new (	3544	my $self = $class->SUPER::new (
		3545	size_w => 32,
		3546	size_h => 8,
2840	aspect => 1,	3547	aspect => 1,
2841	can_events => 0,	3548	can_events => 0,
2842	@_,	3549	@_,
2843	);	3550	);
2844		3551
2845	if ($self->{anim} && $self->{animspeed}) {	3552	if ($self->{anim} && $self->{animspeed}) {
2846	Scalar::Util::weaken (my $widget = $self);	3553	CFPlus::weaken (my $widget = $self);
2847		3554
		3555	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3556	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2848	$self->{timer} = Event->timer (	3557	$self->{timer} = Event->timer (
2849	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2850	hard => 1,	3558	parked => 1,
2851	interval => $self->{animspeed},
2852	cb => sub {	3559	cb => sub {
		3560	return unless $::CONN;
		3561
		3562	my $w = $widget
		3563	or return;
		3564
2853	++$widget->{frame};	3565	++$w->{frame};
		3566	$w->update_face;
		3567
		3568	# somehow, $widget can go away
2854	$widget->update;	3569	$w->update;
		3570	$w->update_timer;
2855	},	3571	},
2856	);	3572	);
		3573
		3574	$self->update_face;
		3575	$self->update_timer;
2857	}	3576	}
2858		3577
2859	$self	3578	$self
2860	}	3579	}
2861		3580
		3581	sub update_timer {
		3582	my ($self) = @_;
		3583
		3584	return unless $self->{timer};
		3585
		3586	if ($self->{visible}) {
		3587	$self->{timer}->at (
		3588	$self->{anim_start}
		3589	+ $self->{animspeed}
		3590	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3591	);
		3592	$self->{timer}->start;
		3593	} else {
		3594	$self->{timer}->stop;
		3595	}
		3596	}
		3597
		3598	sub update_face {
		3599	my ($self) = @_;
		3600
		3601	if ($::CONN) {
		3602	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3603	if ($anim && @$anim) {
		3604	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3605	delete $self->{face_change_cb};
		3606
		3607	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3608	unless ($tex->{name} || $tex->{loading}) {
		3609	$tex->upload (sub { $self->reconfigure });
		3610	}
		3611	}
		3612	}
		3613	}
		3614	}
		3615	}
		3616
2862	sub size_request {	3617	sub size_request {
2863	(32, 8)	3618	my ($self) = @_;
		3619
		3620	if ($::CONN) {
		3621	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3622	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3623	if ($tex->{name}) {
		3624	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3625	} elsif (!$tex->{loading}) {
		3626	$tex->upload (sub { $self->reconfigure });
		3627	}
		3628	}
		3629
		3630	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3631	}
		3632	}
		3633
		3634	($self->{size_w} || 8, $self->{size_h} || 8)
2864	}	3635	}
2865		3636
2866	sub update {	3637	sub update {
2867	my ($self) = @_;	3638	my ($self) = @_;
2868		3639
2869	return unless $self->{visible};	3640	return unless $self->{visible};
2870		3641
2871	$self->SUPER::update;	3642	$self->SUPER::update;
2872	}	3643	}
2873		3644
		3645	sub invoke_visibility_change {
		3646	my ($self) = @_;
		3647
		3648	$self->update_timer;
		3649
		3650	0
		3651	}
		3652
2874	sub _draw {	3653	sub _draw {
2875	my ($self) = @_;	3654	my ($self) = @_;
2876		3655
2877	return unless $::CONN;	3656	$self->SUPER::_draw;
2878		3657
2879	my $face;	3658	if (my $tex = $self->{tex}) {
2880
2881	if ($self->{frame}) {
2882	my $anim = $::CONN->{anim}[$self->{anim}];
2883
2884	$face = $anim->[ $self->{frame} % @$anim ]
2885	if $anim && @$anim;
2886	}
2887
2888	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2889
2890	if ($tex) {
2891	glEnable GL_TEXTURE_2D;	3659	glEnable GL_TEXTURE_2D;
2892	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3660	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2893	glColor 0, 0, 0, 1;	3661	glColor 0, 0, 0, 1;
2894	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3662	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2895	glDisable GL_TEXTURE_2D;	3663	glDisable GL_TEXTURE_2D;
2896	}	3664	}
2897	}	3665	}
2898		3666
2899	sub DESTROY {	3667	sub destroy {
2900	my ($self) = @_;	3668	my ($self) = @_;
2901		3669
2902	$self->{timer}->cancel	3670	(delete $self->{timer})->cancel
2903	if $self->{timer};	3671	if $self->{timer};
2904		3672
2905	$self->SUPER::DESTROY;	3673	$self->SUPER::destroy;
2906	}	3674	}
2907		3675
2908	#############################################################################	3676	#############################################################################
2909		3677
2910	package CFClient::UI::Buttonbar;	3678	package CFPlus::UI::Buttonbar;
2911		3679
2912	our @ISA = CFClient::UI::HBox::;	3680	our @ISA = CFPlus::UI::HBox::;
2913		3681
2914	# TODO: should actualyl wrap buttons and other goodies.	3682	# TODO: should actually wrap buttons and other goodies.
2915		3683
2916	#############################################################################	3684	#############################################################################
2917		3685
2918	package CFClient::UI::Menu;	3686	package CFPlus::UI::Menu;
2919		3687
2920	our @ISA = CFClient::UI::FancyFrame::;	3688	our @ISA = CFPlus::UI::Toplevel::;
2921		3689
2922	use CFClient::OpenGL;	3690	use CFPlus::OpenGL;
2923		3691
2924	sub new {	3692	sub new {
2925	my $class = shift;	3693	my $class = shift;
2926		3694
2927	my $self = $class->SUPER::new (	3695	my $self = $class->SUPER::new (
2928	items => [],	3696	items => [],
2929	z => 100,	3697	z => 100,
2930	@_,	3698	@_,
2931	);	3699	);
2932		3700
2933	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3701	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2934		3702
2935	for my $item (@{ $self->{items} }) {	3703	for my $item (@{ $self->{items} }) {
2936	my ($widget, $cb, $tooltip) = @$item;	3704	my ($widget, $cb, $tooltip) = @$item;
2937		3705
2938	# handle various types of items, only text for now	3706	# handle various types of items, only text for now
2939	if (!ref $widget) {	3707	if (!ref $widget) {
		3708	if ($widget =~ /\t/) {
		3709	my ($left, $right) = split /\t/, $widget, 2;
		3710
2940	$widget = new CFClient::UI::Label	3711	$widget = new CFPlus::UI::HBox
2941	can_hover => 1,	3712	can_hover => 1,
2942	can_events => 1,	3713	can_events => 1,
2943	text => $widget,
2944	tooltip => $tooltip	3714	tooltip => $tooltip,
		3715	children => [
		3716	(new CFPlus::UI::Label markup => $left, expand => 1),
		3717	(new CFPlus::UI::Label markup => $right, align => +1),
		3718	],
		3719	;
		3720
		3721	} else {
		3722	$widget = new CFPlus::UI::Label
		3723	can_hover => 1,
		3724	can_events => 1,
		3725	markup => $widget,
		3726	tooltip => $tooltip;
		3727	}
2945	}	3728	}
2946		3729
2947	$self->{item}{$widget} = $item;	3730	$self->{item}{$widget} = $item;
2948		3731
2949	$self->{vbox}->add ($widget);	3732	$self->{vbox}->add ($widget);
…		…
2954		3737
2955	# popup given the event (must be a mouse button down event currently)	3738	# popup given the event (must be a mouse button down event currently)
2956	sub popup {	3739	sub popup {
2957	my ($self, $ev) = @_;	3740	my ($self, $ev) = @_;
2958		3741
2959	$self->_emit ("popdown");	3742	$self->emit ("popdown");
2960		3743
2961	# maybe save $GRAB? must be careful about events...	3744	# maybe save $GRAB? must be careful about events...
2962	$GRAB = $self;	3745	$GRAB = $self;
2963	$self->{button} = $ev->{button};	3746	$self->{button} = $ev->{button};
2964		3747
2965	$self->show;	3748	$self->show;
2966	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3749	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2967	}	3750	}
2968		3751
2969	sub mouse_motion {	3752	sub invoke_mouse_motion {
2970	my ($self, $ev, $x, $y) = @_;	3753	my ($self, $ev, $x, $y) = @_;
2971		3754
2972	# TODO: should use vbox->find_widget or so	3755	# TODO: should use vbox->find_widget or so
2973	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3756	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2974	$self->{hover} = $self->{item}{$HOVER};	3757	$self->{hover} = $self->{item}{$HOVER};
2975		3758
2976	0	3759	0
2977	}	3760	}
2978		3761
2979	sub button_up {	3762	sub invoke_button_up {
2980	my ($self, $ev, $x, $y) = @_;	3763	my ($self, $ev, $x, $y) = @_;
2981		3764
2982	if ($ev->{button} == $self->{button}) {	3765	if ($ev->{button} == $self->{button}) {
2983	undef $GRAB;	3766	undef $GRAB;
2984	$self->hide;	3767	$self->hide;
2985		3768
2986	$self->_emit ("popdown");	3769	$self->emit ("popdown");
2987	$self->{hover}[1]->() if $self->{hover};	3770	$self->{hover}[1]->() if $self->{hover};
2988	} else {	3771	} else {
2989	return 0	3772	return 0
2990	}	3773	}
2991		3774
2992	1	3775	1
2993	}	3776	}
2994		3777
2995	#############################################################################	3778	#############################################################################
2996		3779
2997	package CFClient::UI::Multiplexer;	3780	package CFPlus::UI::Multiplexer;
2998		3781
2999	our @ISA = CFClient::UI::Container::;	3782	our @ISA = CFPlus::UI::Container::;
3000		3783
3001	sub new {	3784	sub new {
3002	my $class = shift;	3785	my $class = shift;
3003		3786
3004	my $self = $class->SUPER::new (	3787	my $self = $class->SUPER::new (
…		…
3018		3801
3019	$self->{current} = $self->{children}[0]	3802	$self->{current} = $self->{children}[0]
3020	if @{ $self->{children} };	3803	if @{ $self->{children} };
3021	}	3804	}
3022		3805
		3806	sub get_current_page {
		3807	my ($self) = @_;
		3808
		3809	$self->{current}
		3810	}
		3811
3023	sub set_current_page {	3812	sub set_current_page {
3024	my ($self, $page_or_widget) = @_;	3813	my ($self, $page_or_widget) = @_;
3025		3814
3026	my $widget = ref $page_or_widget	3815	my $widget = ref $page_or_widget
3027	? $page_or_widget	3816	? $page_or_widget
3028	: $self->{children}[$page_or_widget];	3817	: $self->{children}[$page_or_widget];
3029		3818
3030	$self->{current} = $widget;	3819	$self->{current} = $widget;
3031	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3820	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3032		3821
3033	$self->_emit (page_changed => $self->{current});	3822	$self->emit (page_changed => $self->{current});
3034		3823
3035	$self->realloc;	3824	$self->realloc;
3036	}	3825	}
3037		3826
3038	sub visible_children {	3827	sub visible_children {
…		…
3043	my ($self) = @_;	3832	my ($self) = @_;
3044		3833
3045	$self->{current}->size_request	3834	$self->{current}->size_request
3046	}	3835	}
3047		3836
3048	sub size_allocate {	3837	sub invoke_size_allocate {
3049	my ($self, $w, $h) = @_;	3838	my ($self, $w, $h) = @_;
3050		3839
3051	$self->{current}->configure (0, 0, $w, $h);	3840	$self->{current}->configure (0, 0, $w, $h);
		3841
		3842	1
3052	}	3843	}
3053		3844
3054	sub _draw {	3845	sub _draw {
3055	my ($self) = @_;	3846	my ($self) = @_;
3056		3847
3057	$self->{current}->draw;	3848	$self->{current}->draw;
3058	}	3849	}
3059		3850
3060	#############################################################################	3851	#############################################################################
3061		3852
3062	package CFClient::UI::Notebook;	3853	package CFPlus::UI::Notebook;
3063		3854
3064	our @ISA = CFClient::UI::VBox::;	3855	our @ISA = CFPlus::UI::VBox::;
3065		3856
3066	sub new {	3857	sub new {
3067	my $class = shift;	3858	my $class = shift;
3068		3859
3069	my $self = $class->SUPER::new (	3860	my $self = $class->SUPER::new (
3070	buttonbar => (new CFClient::UI::Buttonbar),	3861	buttonbar => (new CFPlus::UI::Buttonbar),
3071	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3862	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3072	# filter => # will be put between multiplexer and $self	3863	# filter => # will be put between multiplexer and $self
3073	@_,	3864	@_,
3074	);	3865	);
3075		3866
3076	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3867	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3077	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3868	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3078		3869
		3870	{
		3871	Scalar::Util::weaken (my $wself = $self);
		3872
		3873	$self->{multiplexer}->connect (c_add => sub {
		3874	my ($mplex, $widgets) = @_;
		3875
		3876	for my $child (@$widgets) {
		3877	Scalar::Util::weaken $child;
		3878	$child->{c_tab_} ||= do {
		3879	my $tab =
		3880	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3881	? $child->{c_tab}
		3882	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3883
		3884	$tab->connect (activate => sub {
		3885	$wself->set_current_page ($child);
		3886	});
		3887
		3888	$tab
		3889	};
		3890
		3891	$self->{buttonbar}->add ($child->{c_tab_});
		3892	}
		3893	});
		3894
		3895	$self->{multiplexer}->connect (c_remove => sub {
		3896	my ($mplex, $widgets) = @_;
		3897
		3898	for my $child (@$widgets) {
		3899	$wself->{buttonbar}->remove ($child->{c_tab_});
		3900	}
		3901	});
		3902	}
		3903
3079	$self	3904	$self
3080	}	3905	}
3081		3906
3082	sub add {	3907	sub add {
		3908	my ($self, @widgets) = @_;
		3909
		3910	$self->{multiplexer}->add (@widgets)
		3911	}
		3912
		3913	sub remove {
		3914	my ($self, @widgets) = @_;
		3915
		3916	$self->{multiplexer}->remove (@widgets)
		3917	}
		3918
		3919	sub pages {
		3920	my ($self) = @_;
		3921	$self->{multiplexer}->children
		3922	}
		3923
		3924	sub add_tab {
3083	my ($self, $title, $widget, $tooltip) = @_;	3925	my ($self, $title, $widget, $tooltip) = @_;
3084		3926
3085	Scalar::Util::weaken $self;	3927	$title = [$title, $tooltip] unless ref $title;
		3928	$widget->{c_tab} = $title;
3086		3929
3087	$self->{buttonbar}->add (new CFClient::UI::Button
3088	markup => $title,
3089	tooltip => $tooltip,
3090	on_activate => sub { $self->set_current_page ($widget) },
3091	);
3092
3093	$self->{multiplexer}->add ($widget);	3930	$self->add ($widget);
		3931	}
		3932
		3933	sub get_current_page {
		3934	my ($self) = @_;
		3935
		3936	$self->{multiplexer}->get_current_page
3094	}	3937	}
3095		3938
3096	sub set_current_page {	3939	sub set_current_page {
3097	my ($self, $page) = @_;	3940	my ($self, $page) = @_;
3098		3941
3099	$self->{multiplexer}->set_current_page ($page);	3942	$self->{multiplexer}->set_current_page ($page);
3100	$self->_emit (page_changed => $self->{multiplexer}{current});	3943	$self->emit (page_changed => $self->{multiplexer}{current});
3101	}	3944	}
3102		3945
3103	#############################################################################	3946	#############################################################################
3104		3947
3105	package CFClient::UI::Combobox;	3948	package CFPlus::UI::Selector;
3106		3949
3107	use utf8;	3950	use utf8;
3108		3951
3109	our @ISA = CFClient::UI::Button::;	3952	our @ISA = CFPlus::UI::Button::;
3110		3953
3111	sub new {	3954	sub new {
3112	my $class = shift;	3955	my $class = shift;
3113		3956
3114	my $self = $class->SUPER::new (	3957	my $self = $class->SUPER::new (
…		…
3120	$self->_set_value ($self->{value});	3963	$self->_set_value ($self->{value});
3121		3964
3122	$self	3965	$self
3123	}	3966	}
3124		3967
3125	sub button_down {	3968	sub invoke_button_down {
3126	my ($self, $ev) = @_;	3969	my ($self, $ev) = @_;
3127		3970
3128	my @menu_items;	3971	my @menu_items;
3129		3972
3130	for (@{ $self->{options} }) {	3973	for (@{ $self->{options} }) {
3131	my ($value, $title, $tooltip) = @$_;	3974	my ($value, $title, $tooltip) = @$_;
3132		3975
3133	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3976	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3134	}	3977	}
3135		3978
3136	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3979	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3137	}	3980	}
3138		3981
3139	sub _set_value {	3982	sub _set_value {
3140	my ($self, $value) = @_;	3983	my ($self, $value) = @_;
3141		3984
…		…
3151	my ($self, $value) = @_;	3994	my ($self, $value) = @_;
3152		3995
3153	return unless $self->{value} ne $value;	3996	return unless $self->{value} ne $value;
3154		3997
3155	$self->_set_value ($value);	3998	$self->_set_value ($value);
3156	$self->_emit (changed => $value);	3999	$self->emit (changed => $value);
3157	}	4000	}
3158		4001
3159	#############################################################################	4002	#############################################################################
3160		4003
3161	package CFClient::UI::Statusbox;	4004	package CFPlus::UI::Statusbox;
3162		4005
3163	our @ISA = CFClient::UI::VBox::;	4006	our @ISA = CFPlus::UI::VBox::;
3164		4007
3165	sub new {	4008	sub new {
3166	my $class = shift;	4009	my $class = shift;
3167		4010
3168	my $self = $class->SUPER::new (	4011	my $self = $class->SUPER::new (
3169	fontsize => 0.8,	4012	fontsize => 0.8,
3170	@_,	4013	@_,
3171	);	4014	);
3172		4015
3173	Scalar::Util::weaken (my $this = $self);	4016	CFPlus::weaken (my $this = $self);
3174		4017
3175	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4018	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3176		4019
3177	$self	4020	$self
3178	}	4021	}
…		…
3180	sub reorder {	4023	sub reorder {
3181	my ($self) = @_;	4024	my ($self) = @_;
3182	my $NOW = Time::HiRes::time;	4025	my $NOW = Time::HiRes::time;
3183		4026
3184	# freeze display when hovering over any label	4027	# freeze display when hovering over any label
3185	return if $CFClient::UI::TOOLTIP->{owner}	4028	return if $CFPlus::UI::TOOLTIP->{owner}
3186	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4029	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3187	values %{ $self->{item} };	4030	values %{ $self->{item} };
3188		4031
3189	while (my ($k, $v) = each %{ $self->{item} }) {	4032	while (my ($k, $v) = each %{ $self->{item} }) {
3190	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4033	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3191	}	4034	}
…		…
3212	for ($short) {	4055	for ($short) {
3213	s/^\s+//;	4056	s/^\s+//;
3214	s/\s+/ /g;	4057	s/\s+/ /g;
3215	}	4058	}
3216		4059
3217	new CFClient::UI::Label	4060	new CFPlus::UI::Label
3218	markup => $short,	4061	markup => $short,
3219	tooltip => $item->{tooltip},	4062	tooltip => $item->{tooltip},
3220	tooltip_font => $::FONT_PROP,	4063	tooltip_font => $::FONT_PROP,
3221	tooltip_width => 0.67,	4064	tooltip_width => 0.67,
3222	fontsize => $item->{fontsize} || $self->{fontsize},	4065	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3260	$item->{count}++;	4103	$item->{count}++;
3261	} else {	4104	} else {
3262	$item->{count} = 1;	4105	$item->{count} = 1;
3263	$item->{text} = $item->{tooltip} = $text;	4106	$item->{text} = $item->{tooltip} = $text;
3264	}	4107	}
3265	$item->{id} = ++$self->{id};	4108	$item->{id} += 0.2;#d#
3266	$item->{timeout} = $timeout;	4109	$item->{timeout} = $timeout;
3267	delete $item->{label};	4110	delete $item->{label};
3268	} else {	4111	} else {
3269	$self->{item}{$group} = {	4112	$self->{item}{$group} = {
3270	id => ++$self->{id},	4113	id => ++$self->{id},
…		…
3276	count => 1,	4119	count => 1,
3277	%arg,	4120	%arg,
3278	};	4121	};
3279	}	4122	}
3280		4123
		4124	$ROOT->on_refresh (reorder => sub {
3281	$self->reorder;	4125	$self->reorder;
		4126	});
3282	}	4127	}
3283		4128
3284	sub reconfigure {	4129	sub reconfigure {
3285	my ($self) = @_;	4130	my ($self) = @_;
3286		4131
…		…
3289		4134
3290	$self->reorder;	4135	$self->reorder;
3291	$self->SUPER::reconfigure;	4136	$self->SUPER::reconfigure;
3292	}	4137	}
3293		4138
3294	sub DESTROY {	4139	sub destroy {
3295	my ($self) = @_;	4140	my ($self) = @_;
3296		4141
3297	$self->{timer}->cancel;	4142	$self->{timer}->cancel;
3298		4143
3299	$self->SUPER::DESTROY;	4144	$self->SUPER::destroy;
3300	}	4145	}
3301		4146
3302	#############################################################################	4147	#############################################################################
3303		4148
3304	package CFClient::UI::Inventory;
3305
3306	our @ISA = CFClient::UI::ScrolledWindow::;
3307
3308	sub new {
3309	my $class = shift;
3310
3311	my $self = $class->SUPER::new (
3312	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3313	@_,
3314	);
3315
3316	$self
3317	}
3318
3319	sub set_items {
3320	my ($self, $items) = @_;
3321
3322	$self->{child}->clear;
3323	return unless $items;
3324
3325	my @items = sort {
3326	($a->{type} <=> $b->{type})
3327	or ($a->{name} cmp $b->{name})
3328	} @$items;
3329
3330	$self->{real_items} = \@items;
3331
3332	my $row = 0;
3333	for my $item (@items) {
3334	CFClient::Item::update_widgets $item;
3335
3336	$self->{child}->add (0, $row, $item->{face_widget});
3337	$self->{child}->add (1, $row, $item->{desc_widget});
3338	$self->{child}->add (2, $row, $item->{weight_widget});
3339
3340	$row++;
3341	}
3342	}
3343
3344	#############################################################################
3345
3346	package CFClient::UI::BindEditor;
3347
3348	our @ISA = CFClient::UI::FancyFrame::;
3349
3350	sub new {
3351	my $class = shift;
3352
3353	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3354
3355	$self->add (my $vb = new CFClient::UI::VBox);
3356
3357
3358	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3359	text => "start recording",
3360	tooltip => "Start/Stops recording of actions."
3361	."All subsequent actions after the recording started will be captured."
3362	."The actions are displayed after the record was stopped."
3363	."To bind the action you have to click on the 'Bind' button",
3364	on_activate => sub {
3365	unless ($self->{recording}) {
3366	$self->start;
3367	} else {
3368	$self->stop;
3369	}
3370	});
3371
3372	$vb->add (new CFClient::UI::Label text => "Actions:");
3373	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3374
3375	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3376	$vb->add (my $hb = new CFClient::UI::HBox);
3377	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3378	$hb->add (new CFClient::UI::Button
3379	text => "bind",
3380	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3381	on_activate => sub {
3382	$self->ask_for_bind;
3383	});
3384
3385	$vb->add (my $hb = new CFClient::UI::HBox);
3386	$hb->add (new CFClient::UI::Button
3387	text => "ok",
3388	expand => 1,
3389	tooltip => "This closes the binding editor and saves the binding",
3390	on_activate => sub {
3391	$self->hide;
3392	$self->commit;
3393	});
3394
3395	$hb->add (new CFClient::UI::Button
3396	text => "cancel",
3397	expand => 1,
3398	tooltip => "This closes the binding editor without saving",
3399	on_activate => sub {
3400	$self->hide;
3401	$self->{binding_cancel}->()
3402	if $self->{binding_cancel};
3403	});
3404
3405	$self->update_binding_widgets;
3406
3407	$self
3408	}
3409
3410	sub commit {
3411	my ($self) = @_;
3412	my ($mod, $sym, $cmds) = $self->get_binding;
3413	if ($sym != 0 && @$cmds > 0) {
3414	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3415	."'. Don't forget 'Save Config'!");
3416	$self->{binding_change}->($mod, $sym, $cmds)
3417	if $self->{binding_change};
3418	} else {
3419	$::STATUSBOX->add ("No action bound, no key or action specified!");
3420	$self->{binding_cancel}->()
3421	if $self->{binding_cancel};
3422	}
3423	}
3424
3425	sub start {
3426	my ($self) = @_;
3427
3428	$self->{rec_btn}->set_text ("stop recording");
3429	$self->{recording} = 1;
3430	$self->clear_command_list;
3431	$::CONN->start_record if $::CONN;
3432	}
3433
3434	sub stop {
3435	my ($self) = @_;
3436
3437	$self->{rec_btn}->set_text ("start recording");
3438	$self->{recording} = 0;
3439
3440	my $rec;
3441	$rec = $::CONN->stop_record if $::CONN;
3442	return unless ref $rec eq 'ARRAY';
3443	$self->set_command_list ($rec);
3444	}
3445
3446
3447	sub ask_for_bind_and_commit {
3448	my ($self) = @_;
3449	$self->ask_for_bind (1);
3450	}
3451
3452	sub ask_for_bind {
3453	my ($self, $commit) = @_;
3454
3455	CFClient::Binder::open_binding_dialog (sub {
3456	my ($mod, $sym) = @_;
3457	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3458	$self->update_binding_widgets;
3459	$self->commit if $commit;
3460	});
3461	}
3462
3463	# $mod and $sym are the modifiers and key symbol
3464	# $cmds is a array ref of strings (the commands)
3465	# $cb is the callback that is executed on OK
3466	# $ccb is the callback that is executed on CANCEL and
3467	# when the binding was unsuccessful on OK
3468	sub set_binding {
3469	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3470
3471	$self->clear_command_list;
3472	$self->{recording} = 0;
3473	$self->{rec_btn}->set_text ("start recording");
3474
3475	$self->{binding} = [$mod, $sym];
3476	$self->{commands} = $cmds;
3477
3478	$self->{binding_change} = $cb;
3479	$self->{binding_cancel} = $ccb;
3480
3481	$self->update_binding_widgets;
3482	}
3483
3484	# this is a shortcut method that asks for a binding
3485	# and then just binds it.
3486	sub do_quick_binding {
3487	my ($self, $cmds) = @_;
3488	$self->set_binding (undef, undef, $cmds, sub {
3489	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3490	});
3491	$self->ask_for_bind (1);
3492	}
3493
3494	sub update_binding_widgets {
3495	my ($self) = @_;
3496	my ($mod, $sym, $cmds) = $self->get_binding;
3497	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3498	$self->set_command_list ($cmds);
3499	}
3500
3501	sub get_binding {
3502	my ($self) = @_;
3503	return (
3504	$self->{binding}->[0],
3505	$self->{binding}->[1],
3506	[ grep { defined $_ } @{$self->{commands}} ]
3507	);
3508	}
3509
3510	sub clear_command_list {
3511	my ($self) = @_;
3512	$self->{cmdbox}->clear ();
3513	}
3514
3515	sub set_command_list {
3516	my ($self, $cmds) = @_;
3517
3518	$self->{cmdbox}->clear ();
3519	$self->{commands} = $cmds;
3520
3521	my $idx = 0;
3522
3523	for (@$cmds) {
3524	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3525
3526	my $i = $idx;
3527	$hb->add (new CFClient::UI::Label text => $_);
3528	$hb->add (new CFClient::UI::Button
3529	text => "delete",
3530	tooltip => "Deletes the action from the record",
3531	on_activate => sub {
3532	$self->{cmdbox}->remove ($hb);
3533	$cmds->[$i] = undef;
3534	});
3535
3536
3537	$idx++
3538	}
3539	}
3540
3541	#############################################################################
3542
3543	package CFClient::UI::SpellList;
3544
3545	our @ISA = CFClient::UI::Table::;
3546
3547	sub new {
3548	my $class = shift;
3549
3550	my $self = $class->SUPER::new (
3551	binding => [],
3552	commands => [],
3553	@_,
3554	)
3555	}
3556
3557	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3559	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3561	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3562	"<b>Damage</b>. The amount of damage the spell deals when it hits.");
3563
3564	sub rebuild_spell_list {
3565	my ($self) = @_;
3566
3567	$CFClient::UI::ROOT->on_refresh ($self => sub {
3568	$self->clear;
3569
3570	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3571	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3572	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3573	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3574
3575	my $row = 0;
3576
3577	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3578	my $spell = $self->{spell}{$_};
3579
3580	$row++;
3581
3582	$self->add (0, $row, new CFClient::UI::Face
3583	face => $spell->{face},
3584	can_hover => 1,
3585	can_events => 1,
3586	tooltip => $spell->{message},
3587	);
3588
3589	$self->add (1, $row, new CFClient::UI::Label
3590	expand => 1,
3591	text => $spell->{name},
3592	can_hover => 1,
3593	can_events => 1,
3594	tooltip => $spell->{message},
3595	);
3596
3597	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600
3601	# TODO: should be done via popup
3602	$self->add (5, $row, new CFClient::UI::Button
3603	text => "bind",
3604	tooltip => "bind spell readying (cast command) to key",
3605	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3606	);
3607	}
3608	});
3609	}
3610
3611	sub add_spell {
3612	my ($self, $spell) = @_;
3613
3614	$self->{spell}->{$spell->{name}} = $spell;
3615	$self->rebuild_spell_list;
3616	}
3617
3618	sub remove_spell {
3619	my ($self, $spell) = @_;
3620
3621	delete $self->{spell}->{$spell->{name}};
3622	$self->rebuild_spell_list;
3623	}
3624
3625	#############################################################################
3626
3627	package CFClient::UI::Root;	4149	package CFPlus::UI::Root;
3628		4150
3629	our @ISA = CFClient::UI::Container::;	4151	our @ISA = CFPlus::UI::Container::;
3630		4152
3631	use List::Util qw(min max);	4153	use List::Util qw(min max);
3632		4154
3633	use CFClient::OpenGL;	4155	use CFPlus::OpenGL;
3634		4156
3635	sub new {	4157	sub new {
3636	my $class = shift;	4158	my $class = shift;
3637		4159
3638	my $self = $class->SUPER::new (	4160	my $self = $class->SUPER::new (
3639	visible => 1,	4161	visible => 1,
3640	@_,	4162	@_,
3641	);	4163	);
3642		4164
3643	Scalar::Util::weaken ($self->{root} = $self);	4165	CFPlus::weaken ($self->{root} = $self);
3644		4166
3645	$self	4167	$self
3646	}	4168	}
3647		4169
3648	sub size_request {	4170	sub size_request {
…		…
3663	$coord = $max - $size if $coord > $max - $size;	4185	$coord = $max - $size if $coord > $max - $size;
3664		4186
3665	int $coord + 0.5	4187	int $coord + 0.5
3666	}	4188	}
3667		4189
3668	sub size_allocate {	4190	sub invoke_size_allocate {
3669	my ($self, $w, $h) = @_;	4191	my ($self, $w, $h) = @_;
3670		4192
3671	for my $child ($self->children) {	4193	for my $child ($self->children) {
3672	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4194	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3673		4195
…		…
3677	$X = _to_pixel $X, $W, $self->{w};	4199	$X = _to_pixel $X, $W, $self->{w};
3678	$Y = _to_pixel $Y, $H, $self->{h};	4200	$Y = _to_pixel $Y, $H, $self->{h};
3679		4201
3680	$child->configure ($X, $Y, $W, $H);	4202	$child->configure ($X, $Y, $W, $H);
3681	}	4203	}
		4204
		4205	1
3682	}	4206	}
3683		4207
3684	sub coord2local {	4208	sub coord2local {
3685	my ($self, $x, $y) = @_;	4209	my ($self, $x, $y) = @_;
3686		4210
…		…
3694	}	4218	}
3695		4219
3696	sub update {	4220	sub update {
3697	my ($self) = @_;	4221	my ($self) = @_;
3698		4222
3699	$::WANT_REFRESH++;	4223	$::WANT_REFRESH->start;
3700	}	4224	}
3701		4225
3702	sub add {	4226	sub add {
3703	my ($self, @children) = @_;	4227	my ($self, @children) = @_;
3704		4228
…		…
3741	while ($self->{refresh_hook}) {	4265	while ($self->{refresh_hook}) {
3742	$_->()	4266	$_->()
3743	for values %{delete $self->{refresh_hook}};	4267	for values %{delete $self->{refresh_hook}};
3744	}	4268	}
3745		4269
3746	if ($self->{realloc}) {	4270	while ($self->{realloc}) {
3747	my %queue;	4271	my %queue;
3748	my @queue;	4272	my @queue;
3749	my $widget;	4273	my $widget;
3750		4274
3751	outer:	4275	outer:
…		…
3798	}	4322	}
3799	}	4323	}
3800		4324
3801	delete $self->{realloc}{$widget+0};	4325	delete $self->{realloc}{$widget+0};
3802	}	4326	}
3803	}
3804		4327
3805	while (my $size_alloc = delete $self->{size_alloc}) {	4328	while (my $size_alloc = delete $self->{size_alloc}) {
3806	my @queue = sort { $b->{visible} <=> $a->{visible} }	4329	my @queue = sort { $a->{visible} <=> $b->{visible} }
3807	values %$size_alloc;	4330	values %$size_alloc;
3808		4331
3809	while () {	4332	while () {
3810	my $widget = pop @queue || last;	4333	my $widget = pop @queue || last;
3811		4334
3812	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4335	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3813		4336
3814	$w = 0 if $w < 0;	4337	$w = max $widget->{min_w}, $w;
3815	$h = 0 if $h < 0;	4338	$h = max $widget->{min_h}, $h;
3816		4339
		4340	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4341	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4342
		4343	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4344	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4345
3817	$w = int $w + 0.5;	4346	$w = int $w + 0.5;
3818	$h = int $h + 0.5;	4347	$h = int $h + 0.5;
3819		4348
3820	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4349	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3821	$widget->{old_w} = $widget->{w};	4350	$widget->{old_w} = $widget->{w};
3822	$widget->{old_h} = $widget->{h};	4351	$widget->{old_h} = $widget->{h};
3823		4352
3824	$widget->{w} = $w;	4353	$widget->{w} = $w;
3825	$widget->{h} = $h;	4354	$widget->{h} = $h;
3826		4355
3827	$widget->emit (size_allocate => $w, $h);	4356	$widget->emit (size_allocate => $w, $h);
		4357	}
3828	}	4358	}
3829	}	4359	}
3830	}	4360	}
3831		4361
3832	while ($self->{post_alloc_hook}) {	4362	while ($self->{post_alloc_hook}) {
3833	$_->()	4363	$_->()
3834	for values %{delete $self->{post_alloc_hook}};	4364	for values %{delete $self->{post_alloc_hook}};
3835	}	4365	}
3836
3837		4366
3838	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4367	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3839	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4368	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3840	glClear GL_COLOR_BUFFER_BIT;	4369	glClear GL_COLOR_BUFFER_BIT;
3841		4370
…		…
3844	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4373	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3845	glMatrixMode GL_MODELVIEW;	4374	glMatrixMode GL_MODELVIEW;
3846	glLoadIdentity;	4375	glLoadIdentity;
3847		4376
3848	{	4377	{
3849	package CFClient::UI::Base;	4378	package CFPlus::UI::Base;
3850		4379
3851	($draw_x, $draw_y, $draw_w, $draw_h) =	4380	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3852	(0, 0, $self->{w}, $self->{h});	4381	(0, 0, $self->{w}, $self->{h});
3853	}
3854		4382
3855	$self->_draw;	4383	$self->_draw;
		4384	}
3856	}	4385	}
3857		4386
3858	#############################################################################	4387	#############################################################################
3859		4388
3860	package CFClient::UI;	4389	package CFPlus::UI;
3861		4390
3862	$ROOT = new CFClient::UI::Root;	4391	$ROOT = new CFPlus::UI::Root;
3863	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4392	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3864		4393
3865	1	4394	1
3866		4395

Diff Legend

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