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.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.420 by root, Wed Jul 25 15:50:17 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
…		…
278	delete $self->{root};	312	delete $self->{root};
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
597	delete $WIDGET{$self+0};	610	return if CFPlus::in_destruct;
598		611
599	eval { $self->destroy };	612	eval { $self->destroy };
600	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	613	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		614
		615	delete $WIDGET{$self+0};
601	}	616	}
602		617
603	#############################################################################	618	#############################################################################
604		619
605	package CFClient::UI::DrawBG;	620	package CFPlus::UI::DrawBG;
606		621
607	our @ISA = CFClient::UI::Base::;	622	our @ISA = CFPlus::UI::Base::;
608		623
609	use strict;	624	use strict;
610	use CFClient::OpenGL;	625	use CFPlus::OpenGL;
611		626
612	sub new {	627	sub new {
613	my $class = shift;	628	my $class = shift;
614		629
615	# range [value, low, high, page]	630	# range [value, low, high, page]
…		…
646	}	661	}
647	}	662	}
648		663
649	#############################################################################	664	#############################################################################
650		665
651	package CFClient::UI::Empty;	666	package CFPlus::UI::Empty;
652		667
653	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFPlus::UI::Base::;
654		669
655	sub new {	670	sub new {
656	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
657	$class->SUPER::new (can_events => 0, %arg);	672	$class->SUPER::new (can_events => 0, %arg);
658	}	673	}
…		…
665		680
666	sub draw { }	681	sub draw { }
667		682
668	#############################################################################	683	#############################################################################
669		684
670	package CFClient::UI::Container;	685	package CFPlus::UI::Container;
671		686
672	our @ISA = CFClient::UI::Base::;	687	our @ISA = CFPlus::UI::Base::;
673		688
674	sub new {	689	sub new {
675	my ($class, %arg) = @_;	690	my ($class, %arg) = @_;
676		691
677	my $children = delete $arg{children};	692	my $children = delete $arg{children};
…		…
681	can_events => 0,	696	can_events => 0,
682	%arg,	697	%arg,
683	);	698	);
684		699
685	$self->add (@$children)	700	$self->add (@$children)
686	if $children;	701	if $children && @$children;
687		702
688	$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;
689	}	712	}
690		713
691	sub add {	714	sub add {
692	my ($self, @widgets) = @_;	715	my ($self, @widgets) = @_;
693		716
694	$_->set_parent ($self)	717	$_->set_parent ($self)
695	for @widgets;	718	for @widgets;
696		719
		720	# TODO: only do this in widgets that need it, e.g. root, fixed
697	use sort 'stable';	721	use sort 'stable';
698		722
699	$self->{children} = [	723	$self->{children} = [
700	sort { $a->{z} <=> $b->{z} }	724	sort { $a->{z} <=> $b->{z} }
701	@{$self->{children}}, @widgets	725	@{$self->{children}}, @widgets
702	];	726	];
703		727
704	$self->realloc;	728	$self->realloc;
		729
		730	$self->emit (c_add => \@widgets);
		731
		732	map $_+0, @widgets
705	}	733	}
706		734
707	sub children {	735	sub children {
708	@{ $_[0]{children} }	736	@{ $_[0]{children} }
709	}	737	}
710		738
711	sub remove {	739	sub remove {
712	my ($self, $child) = @_;	740	my ($self, @widgets) = @_;
713		741
		742	$self->emit (c_remove => \@widgets);
		743
		744	for my $child (@widgets) {
714	delete $child->{parent};	745	delete $child->{parent};
715	$child->hide;	746	$child->hide;
716
717	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	747	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		748	}
718		749
719	$self->realloc;	750	$self->realloc;
720	}	751	}
721		752
722	sub clear {	753	sub clear {
723	my ($self) = @_;	754	my ($self) = @_;
724		755
725	my $children = delete $self->{children};	756	my $children = $self->{children};
726	$self->{children} = [];	757	$self->{children} = [];
727		758
728	for (@$children) {	759	for (@$children) {
729	delete $_->{parent};	760	delete $_->{parent};
730	$_->hide;	761	$_->hide;
…		…
750	}	781	}
751		782
752	sub _draw {	783	sub _draw {
753	my ($self) = @_;	784	my ($self) = @_;
754		785
755	$_->draw for @{$self->{children}};	786	$_->draw for $self->visible_children;
756	}	787	}
757		788
758	#############################################################################	789	#############################################################################
759		790
760	package CFClient::UI::Bin;	791	package CFPlus::UI::Bin;
761		792
762	our @ISA = CFClient::UI::Container::;	793	our @ISA = CFPlus::UI::Container::;
763		794
764	sub new {	795	sub new {
765	my ($class, %arg) = @_;	796	my ($class, %arg) = @_;
766		797
767	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	798	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768		799
769	$class->SUPER::new (children => [$child], %arg)	800	$class->SUPER::new (children => [$child], %arg)
770	}	801	}
771		802
772	sub add {	803	sub add {
773	my ($self, $child) = @_;	804	my ($self, $child) = @_;
774		805
775	$self->SUPER::remove ($_) for @{ $self->{children} };	806	$self->clear;
776	$self->SUPER::add ($child);	807	$self->SUPER::add ($child);
777	}	808	}
778		809
779	sub remove {	810	sub remove {
780	my ($self, $widget) = @_;	811	my ($self, $widget) = @_;
781		812
782	$self->SUPER::remove ($widget);	813	$self->SUPER::remove ($widget);
783		814
784	$self->{children} = [new CFClient::UI::Empty]	815	$self->{children} = [new CFPlus::UI::Empty]
785	unless @{$self->{children}};	816	unless @{$self->{children}};
786	}	817	}
787		818
788	sub child { $_[0]->{children}[0] }	819	sub child { $_[0]->{children}[0] }
789		820
790	sub size_request {	821	sub size_request {
791	$_[0]{children}[0]->size_request	822	$_[0]{children}[0]->size_request
792	}	823	}
793		824
794	sub size_allocate {	825	sub invoke_size_allocate {
795	my ($self, $w, $h) = @_;	826	my ($self, $w, $h) = @_;
796		827
797	$self->{children}[0]->configure (0, 0, $w, $h);	828	$self->{children}[0]->configure (0, 0, $w, $h);
		829
		830	1
798	}	831	}
799		832
800	#############################################################################	833	#############################################################################
801		834
802	# back-buffered drawing area	835	# back-buffered drawing area
803		836
804	package CFClient::UI::Window;	837	package CFPlus::UI::Window;
805		838
806	our @ISA = CFClient::UI::Bin::;	839	our @ISA = CFPlus::UI::Bin::;
807		840
808	use CFClient::OpenGL;	841	use CFPlus::OpenGL;
809		842
810	sub new {	843	sub new {
811	my ($class, %arg) = @_;	844	my ($class, %arg) = @_;
812		845
813	my $self = $class->SUPER::new (%arg);	846	my $self = $class->SUPER::new (%arg);
…		…
818		851
819	$ROOT->on_post_alloc ($self => sub { $self->render_child });	852	$ROOT->on_post_alloc ($self => sub { $self->render_child });
820	$self->SUPER::update;	853	$self->SUPER::update;
821	}	854	}
822		855
823	sub size_allocate {	856	sub invoke_size_allocate {
824	my ($self, $w, $h) = @_;	857	my ($self, $w, $h) = @_;
825		858
826	$self->SUPER::size_allocate ($w, $h);
827	$self->update;	859	$self->update;
		860
		861	$self->SUPER::invoke_size_allocate ($w, $h)
828	}	862	}
829		863
830	sub _render {	864	sub _render {
831	my ($self) = @_;	865	my ($self) = @_;
832		866
…		…
834	}	868	}
835		869
836	sub render_child {	870	sub render_child {
837	my ($self) = @_;	871	my ($self) = @_;
838		872
839	$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 {
840	glClearColor 0, 0, 0, 0;	874	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	875	glClear GL_COLOR_BUFFER_BIT;
842		876
843	{	877	{
844	package CFClient::UI::Base;	878	package CFPlus::UI::Base;
845		879
846	($draw_x, $draw_y, $draw_w, $draw_h) =	880	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	881	(0, 0, $self->{w}, $self->{h});
		882
		883	$self->_render;
848	}	884	}
849
850	$self->_render;
851	};	885	};
852	}	886	}
853		887
854	sub _draw {	888	sub _draw {
855	my ($self) = @_;	889	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		890
859	my $tex = $self->{texture}	891	my $tex = $self->{texture}
860	or return;	892	or return;
861		893
862	glEnable GL_TEXTURE_2D;	894	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	895	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	896	glColor 0, 0, 0, 1;
865		897
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	898	$tex->draw_quad_alpha_premultiplied (0, 0);
867		899
868	glDisable GL_TEXTURE_2D;	900	glDisable GL_TEXTURE_2D;
869	}	901	}
870		902
871	#############################################################################	903	#############################################################################
872		904
873	package CFClient::UI::ViewPort;	905	package CFPlus::UI::ViewPort;
874		906
		907	use List::Util qw(min max);
		908
875	our @ISA = CFClient::UI::Window::;	909	our @ISA = CFPlus::UI::Window::;
876		910
877	sub new {	911	sub new {
878	my $class = shift;	912	my $class = shift;
879		913
880	$class->SUPER::new (	914	$class->SUPER::new (
…		…
887	sub size_request {	921	sub size_request {
888	my ($self) = @_;	922	my ($self) = @_;
889		923
890	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	924	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
891		925
892	$w = 10 if $self->{scroll_x};	926	$w = 1 if $self->{scroll_x};
893	$h = 10 if $self->{scroll_y};	927	$h = 1 if $self->{scroll_y};
894		928
895	($w, $h)	929	($w, $h)
896	}	930	}
897		931
898	sub size_allocate {	932	sub invoke_size_allocate {
899	my ($self, $w, $h) = @_;	933	my ($self, $w, $h) = @_;
900		934
901	my $child = $self->child;	935	my $child = $self->child;
902		936
903	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	937	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	938	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905		939
906	$self->child->configure (0, 0, $w, $h);	940	$self->child->configure (0, 0, $w, $h);
907	$self->update;	941	$self->update;
		942
		943	1
908	}	944	}
909		945
910	sub set_offset {	946	sub set_offset {
911	my ($self, $x, $y) = @_;	947	my ($self, $x, $y) = @_;
912		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}) {
913	$self->{view_x} = int $x;	953	$self->{view_x} = $x;
914	$self->{view_y} = int $y;	954	$self->{view_y} = $y;
915		955
		956	$self->emit (changed => $x, $y);
916	$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	}
917	}	977	}
918		978
919	# 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
920	sub coord2local {	980	sub coord2local {
921	my ($self, $x, $y) = @_;	981	my ($self, $x, $y) = @_;
…		…
936	my ($self, $x, $y) = @_;	996	my ($self, $x, $y) = @_;
937		997
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	998	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	999	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1000	) {
941	$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})
942	} else {	1002	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1003	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1004	}
945	}	1005	}
946		1006
947	sub _render {	1007	sub _render {
948	my ($self) = @_;	1008	my ($self) = @_;
949		1009
950	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};
951	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};
952		1012
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1013	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1014
955	$self->SUPER::_render;	1015	$self->SUPER::_render;
956	}	1016	}
957		1017
958	#############################################################################	1018	#############################################################################
959		1019
960	package CFClient::UI::ScrolledWindow;	1020	package CFPlus::UI::ScrolledWindow;
961		1021
962	our @ISA = CFClient::UI::HBox::;	1022	our @ISA = CFPlus::UI::Table::;
963		1023
964	sub new {	1024	sub new {
965	my ($class, %arg) = @_;	1025	my ($class, %arg) = @_;
966		1026
967	my $child = delete $arg{child};	1027	my $child = delete $arg{child};
968		1028
969	my $self;	1029	my $self;
970		1030
971	my $slider = new CFClient::UI::Slider	1031	my $hslider = new CFPlus::UI::Slider
		1032	col => 0,
		1033	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	col => 1,
		1044	row => 0,
972	vertical => 1,	1045	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1046	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1047	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1048	$self->{vpos} = $_[1];
		1049	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1050	},
977	;	1051	;
978		1052
979	$self = $class->SUPER::new (	1053	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1054	scroll_x => 0,
		1055	scroll_y => 1,
		1056	can_events => 1,
981	slider => $slider,	1057	hslider => $hslider,
		1058	vslider => $vslider,
		1059	col_expand => [1, 0],
		1060	row_expand => [1, 0],
982	%arg,	1061	%arg,
983	);	1062	);
984		1063
		1064	$self->{vp} = new CFPlus::UI::ViewPort
		1065	col => 0,
		1066	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
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1085	$self->SUPER::add ($self->{vp});
		1086
986	$self->add ($child) if $child;	1087	$self->add ($child) if $child;
987		1088
988	$self	1089	$self
989	}	1090	}
990		1091
…		…
992	my ($self, $widget) = @_;	1093	my ($self, $widget) = @_;
993		1094
994	$self->{vp}->add ($self->{child} = $widget);	1095	$self->{vp}->add ($self->{child} = $widget);
995	}	1096	}
996		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
997	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 {
998	my ($self) = @_;	1133	my ($self, $ev) = @_;
999		1134
1000	$self->SUPER::update;	1135	$self->grab_focus;
1001		1136
1002	# todo: overwrite size_allocate of child	1137	my $ox = $self->{vp}{view_x};
1003	my $child = $self->{vp}->child;	1138	my $oy = $self->{vp}{view_y};
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1139
1005	}	1140	$self->{motion} = sub {
		1141	my ($ev, $x, $y) = @_;
1006		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
1007	sub size_allocate {	1191	sub invoke_size_allocate {
1008	my ($self, $w, $h) = @_;	1192	my ($self, $w, $h) = @_;
1009		1193
		1194	$self->update_slider;
1010	$self->SUPER::size_allocate ($w, $h);	1195	$self->SUPER::invoke_size_allocate ($w, $h)
1011
1012	my $child = $self->{vp}->child;
1013	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014	}	1196	}
1015
1016	#TODO# update range on size_allocate depending on child
1017	# update viewport offset on scroll
1018		1197
1019	#############################################################################	1198	#############################################################################
1020		1199
1021	package CFClient::UI::Frame;	1200	package CFPlus::UI::Frame;
1022		1201
1023	our @ISA = CFClient::UI::Bin::;	1202	our @ISA = CFPlus::UI::Bin::;
1024		1203
1025	use CFClient::OpenGL;	1204	use CFPlus::OpenGL;
1026		1205
1027	sub new {	1206	sub new {
1028	my $class = shift;	1207	my $class = shift;
1029		1208
1030	$class->SUPER::new (	1209	$class->SUPER::new (
…		…
1056	$self->SUPER::_draw;	1235	$self->SUPER::_draw;
1057	}	1236	}
1058		1237
1059	#############################################################################	1238	#############################################################################
1060		1239
1061	package CFClient::UI::FancyFrame;	1240	package CFPlus::UI::FancyFrame;
1062		1241
1063	our @ISA = CFClient::UI::Bin::;	1242	our @ISA = CFPlus::UI::Bin::;
1064		1243
1065	use CFClient::OpenGL;	1244	use CFPlus::OpenGL;
		1245
		1246	sub new {
		1247	my ($class, %arg) = @_;
		1248
		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;
1066		1345
1067	my $bg =	1346	my $bg =
1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1347	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069	mipmap => 1, wrap => 1;	1348	mipmap => 1, wrap => 1;
1070		1349
1071	my @border =	1350	my @border =
1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1351	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	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);
1074		1357
1075	sub new {	1358	sub new {
1076	my ($class, %arg) = @_;	1359	my ($class, %arg) = @_;
1077		1360
1078	my $self = $class->SUPER::new (	1361	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1362	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1363	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1364	border => 0.6,
1082	can_events => 1,	1365	can_events => 1,
1083	min_w => 16,	1366	min_w => 64,
1084	min_h => 16,	1367	min_h => 32,
1085	%arg,	1368	%arg,
1086	);	1369	);
1087		1370
1088	$self->{title_widget} = new CFClient::UI::Label	1371	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1372	align => 0,
1090	valign => 1,	1373	valign => 1,
1091	text => $self->{title},	1374	text => $self->{title},
1092	fontsize => $self->{border},	1375	fontsize => $self->{border},
1093	if exists $self->{title};	1376	if exists $self->{title};
1094		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	}
		1386
1095	$self	1387	$self
1096	}	1388	}
1097		1389
1098	sub add {	1390	sub add {
1099	my ($self, @widgets) = @_;	1391	my ($self, @widgets) = @_;
1100		1392
1101	$self->SUPER::add (@widgets);	1393	$self->SUPER::add (@widgets);
		1394	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1395	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103	}	1396	}
1104		1397
1105	sub border {	1398	sub border {
1106	int $_[0]{border} * $::FONTSIZE	1399	int $_[0]{border} * $::FONTSIZE
1107	}	1400	}
…		…
1109	sub size_request {	1402	sub size_request {
1110	my ($self) = @_;	1403	my ($self) = @_;
1111		1404
1112	$self->{title_widget}->size_request	1405	$self->{title_widget}->size_request
1113	if $self->{title_widget};	1406	if $self->{title_widget};
		1407
		1408	$self->{close_button}->size_request
		1409	if $self->{close_button};
1114		1410
1115	my ($w, $h) = $self->SUPER::size_request;	1411	my ($w, $h) = $self->SUPER::size_request;
1116		1412
1117	(	1413	(
1118	$w + $self->border * 2,	1414	$w + $self->border * 2,
1119	$h + $self->border * 2,	1415	$h + $self->border * 2,
1120	)	1416	)
1121	}	1417	}
1122		1418
1123	sub size_allocate {	1419	sub invoke_size_allocate {
1124	my ($self, $w, $h) = @_;	1420	my ($self, $w, $h) = @_;
1125		1421
1126	if ($self->{title_widget}) {	1422	if ($self->{title_widget}) {
1127	$self->{title_widget}{w} = $w;	1423	$self->{title_widget}{w} = $w;
1128	$self->{title_widget}{h} = $h;	1424	$self->{title_widget}{h} = $h;
1129	$self->{title_widget}->size_allocate ($w, $h);	1425	$self->{title_widget}->invoke_size_allocate ($w, $h);
1130	}	1426	}
1131		1427
1132	my $border = $self->border;	1428	my $border = $self->border;
1133		1429
1134	$h -= List::Util::max 0, $border * 2;	1430	$h -= List::Util::max 0, $border * 2;
1135	$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;
1136		1445
1137	$self->child->configure ($border, $border, $w, $h);	1446	1
1138	}	1447	}
1139		1448
1140	sub button_down {	1449	sub invoke_button_down {
1141	my ($self, $ev, $x, $y) = @_;	1450	my ($self, $ev, $x, $y) = @_;
1142		1451
1143	my ($w, $h) = @$self{qw(w h)};	1452	my ($w, $h) = @$self{qw(w h)};
1144	my $border = $self->border;	1453	my $border = $self->border;
1145		1454
…		…
1176		1485
1177	($x, $y) = ($ev->{x}, $ev->{y});	1486	($x, $y) = ($ev->{x}, $ev->{y});
1178		1487
1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1488	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180	# HACK: the next line is required to enforce placement	1489	# HACK: the next line is required to enforce placement
1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1490	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182	};	1491	};
1183	} else {	1492	} else {
1184	return 0;	1493	return 0;
1185	}	1494	}
1186		1495
1187	1	1496	1
1188	}	1497	}
1189		1498
1190	sub button_up {	1499	sub invoke_button_up {
1191	my ($self, $ev, $x, $y) = @_;	1500	my ($self, $ev, $x, $y) = @_;
1192		1501
1193	!!delete $self->{motion}	1502	! ! delete $self->{motion}
1194	}	1503	}
1195		1504
1196	sub mouse_motion {	1505	sub invoke_mouse_motion {
1197	my ($self, $ev, $x, $y) = @_;	1506	my ($self, $ev, $x, $y) = @_;
1198		1507
1199	$self->{motion}->($ev, $x, $y) if $self->{motion};	1508	$self->{motion}->($ev, $x, $y) if $self->{motion};
1200		1509
1201	!!$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
1202	}	1519	}
1203		1520
1204	sub _draw {	1521	sub _draw {
1205	my ($self) = @_;	1522	my ($self) = @_;
1206		1523
…		…
1213	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1214		1531
1215	my $border = $self->border;	1532	my $border = $self->border;
1216		1533
1217	glColor @{ $self->{border_bg} };	1534	glColor @{ $self->{border_bg} };
1218	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1535	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1219	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1536	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1220	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1537	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1221	$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);
1222		1553
1223	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1554	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1224	glColor @{ $self->{bg} };	1555	glColor @{ $self->{bg} };
1225		1556
1226	# TODO: repeat texture not scale	1557	# TODO: repeat texture not scale
…		…
1235	$child->draw;	1566	$child->draw;
1236		1567
1237	if ($self->{title_widget}) {	1568	if ($self->{title_widget}) {
1238	glTranslate 0, $border - $self->{h};	1569	glTranslate 0, $border - $self->{h};
1239	$self->{title_widget}->_draw;	1570	$self->{title_widget}->_draw;
		1571
		1572	glTranslate 0, - ($border - $self->{h});
1240	}	1573	}
		1574
		1575	$self->{close_button}->draw
		1576	if $self->{close_button};
1241	}	1577	}
1242		1578
1243	#############################################################################	1579	#############################################################################
1244		1580
1245	package CFClient::UI::Table;	1581	package CFPlus::UI::Table;
1246		1582
1247	our @ISA = CFClient::UI::Base::;	1583	our @ISA = CFPlus::UI::Container::;
1248		1584
1249	use List::Util qw(max sum);	1585	use List::Util qw(max sum);
1250		1586
1251	use CFClient::OpenGL;	1587	use CFPlus::OpenGL;
1252		1588
1253	sub new {	1589	sub new {
1254	my $class = shift;	1590	my $class = shift;
1255		1591
1256	$class->SUPER::new (	1592	$class->SUPER::new (
1257	col_expand => [],	1593	col_expand => [],
		1594	row_expand => [],
1258	@_,	1595	@_,
1259	)	1596	)
1260	}	1597	}
1261		1598
1262	sub children {
1263	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264	}
1265
1266	sub add {	1599	sub add {
1267	my ($self, $x, $y, $child) = @_;	1600	my ($self, @widgets) = @_;
1268		1601
1269	$child->set_parent ($self);	1602	for my $child (@widgets) {
1270	$self->{children}[$y][$x] = $child;	1603	$child->{rowspan} ||= 1;
		1604	$child->{colspan} ||= 1;
		1605	}
1271		1606
1272	$self->realloc;	1607	$self->SUPER::add (@widgets);
1273	}	1608	}
1274		1609
1275	sub remove {	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->{row} = $row;
		1619	$child->{col} = $col;
		1620
		1621	push @widgets, $child;
		1622	}
		1623
		1624	$self->add (@widgets);
		1625	}
		1626
		1627	sub get_wh {
1276	my ($self, $child) = @_;	1628	my ($self) = @_;
1277		1629
1278	# TODO: not yet implemented	1630	my (@w, @h);
1279	}
1280
1281	# TODO: move to container class maybe? send children a signal on removal?
1282	sub clear {
1283	my ($self) = @_;
1284		1631
1285	my @children = $self->children;	1632	my @children = $self->children;
1286	delete $self->{children};	1633
		1634	# first pass, columns
		1635	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1636	my ($c, $w, $cs) = @$widget{qw(col req_w 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	}
1287		1643	}
1288	for (@children) {
1289	delete $_->{parent};
1290	$_->hide;
1291	}
1292		1644
1293	$self->realloc;	1645	# second pass, rows
1294	}	1646	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1295
1296	sub get_wh {
1297	my ($self) = @_;
1298
1299	my (@w, @h);
1300
1301	for my $y (0 .. $#{$self->{children}}) {
1302	my $row = $self->{children}[$y]
1303	or next;
1304
1305	for my $x (0 .. $#$row) {
1306	my $widget = $row->[$x]
1307	or next;
1308	my ($w, $h) = @$widget{qw(req_w req_h)};	1647	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1309		1648
1310	$w[$x] = max $w[$x], $w;	1649	my $sh = sum @h[$r .. $r + $rs - 1];
1311	$h[$y] = max $h[$y], $h;	1650
		1651	if ($h > $sh) {
		1652	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1312	}	1653	}
1313	}	1654	}
1314		1655
1315	(\@w, \@h)	1656	(\@w, \@h)
1316	}	1657	}
…		…
1324	(sum @$ws),	1665	(sum @$ws),
1325	(sum @$hs),	1666	(sum @$hs),
1326	)	1667	)
1327	}	1668	}
1328		1669
1329	sub size_allocate {	1670	sub invoke_size_allocate {
1330	my ($self, $w, $h) = @_;	1671	my ($self, $w, $h) = @_;
1331		1672
1332	my ($ws, $hs) = $self->get_wh;	1673	my ($ws, $hs) = $self->get_wh;
1333		1674
1334	my $req_w = (sum @$ws) || 1;	1675	my $req_w = (sum @$ws) || 1;
1335	my $req_h = (sum @$hs) || 1;	1676	my $req_h = (sum @$hs) || 1;
1336		1677
1337	# TODO: nicer code && do row_expand	1678	# now linearly scale the rows/columns to the allocated size
1338	my @col_expand = @{$self->{col_expand}};	1679	my @col_expand = @{$self->{col_expand}};
1339	@col_expand = (1) x @$ws unless @col_expand;	1680	@col_expand = (1) x @$ws unless @col_expand;
1340	my $col_expand = (sum @col_expand) || 1;	1681	my $col_expand = (sum @col_expand) || 1;
1341		1682
1342	# linearly scale sizes
1343	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1683	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345		1684
1346	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
1347	CFClient::UI::harmonize $hs;	1693	CFPlus::UI::harmonize $hs;
1348		1694
1349	my $y;	1695	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1696	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1350		1697
1351	for my $r (0 .. $#{$self->{children}}) {	1698	for my $widget ($self->children) {
1352	my $row = $self->{children}[$r]	1699	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1353	or next;
1354		1700
1355	my $x = 0;	1701	$widget->configure (
1356	my $row_h = $hs->[$r];	1702	$x[$c], $y[$r],
		1703	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1357		1704	);
1358	for my $c (0 .. $#$row) {	1705	}
1359	my $col_w = $ws->[$c];
1360		1706
1361	if (my $widget = $row->[$c]) {	1707	1
1362	$widget->configure ($x, $y, $col_w, $row_h);	1708	}
1363	}
1364		1709
1365	$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};
1366	}	1737	}
1367
1368	$y += $row_h;
1369	}	1738	}
1370		1739
1371	}	1740	my $W = $x2 - $x1;
		1741	my $H = $y2 - $y1;
1372		1742
1373	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 {
1374	my ($self, $x, $y) = @_;	1761	my ($self, $W, $H) = @_;
1375		1762
1376	$x -= $self->{x};	1763	for my $child ($self->visible_children) {
1377	$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;
1378		1766
1379	my $res;	1767	$x += $child->{c_halign} * $child->{req_w};
		1768	$y += $child->{c_valign} * $child->{req_h};
1380		1769
1381	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {	1770	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1382	$res = $_->find_widget ($x, $y)	1771	}
1383	and return $res;	1772
1384	}	1773	1
1385
1386	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1387	}
1388
1389	sub _draw {
1390	my ($self) = @_;
1391
1392	for (grep $_, @{$self->{children}}) {
1393	$_->draw for grep $_, @$_;
1394	}
1395	}	1774	}
1396		1775
1397	#############################################################################	1776	#############################################################################
1398		1777
1399	package CFClient::UI::Box;	1778	package CFPlus::UI::Box;
1400		1779
1401	our @ISA = CFClient::UI::Container::;	1780	our @ISA = CFPlus::UI::Container::;
1402		1781
1403	sub size_request {	1782	sub size_request {
1404	my ($self) = @_;	1783	my ($self) = @_;
		1784
		1785	my @children = $self->visible_children;
1405		1786
1406	$self->{vertical}	1787	$self->{vertical}
1407	? (	1788	? (
1408	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1789	(List::Util::max map $_->{req_w}, @children),
1409	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1790	(List::Util::sum map $_->{req_h}, @children),
1410	)	1791	)
1411	: (	1792	: (
1412	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_w}, @children),
1413	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1794	(List::Util::max map $_->{req_h}, @children),
1414	)	1795	)
1415	}	1796	}
1416		1797
1417	sub size_allocate {	1798	sub invoke_size_allocate {
1418	my ($self, $w, $h) = @_;	1799	my ($self, $w, $h) = @_;
1419		1800
1420	my $space = $self->{vertical} ? $h : $w;	1801	my $space = $self->{vertical} ? $h : $w;
1421	my $children = $self->{children};	1802	my @children = $self->visible_children;
1422		1803
1423	my @req;	1804	my @req;
1424		1805
1425	if ($self->{homogeneous}) {	1806	if ($self->{homogeneous}) {
1426	@req = ($space / (@$children || 1)) x @$children;	1807	@req = ($space / (@children || 1)) x @children;
1427	} else {	1808	} else {
1428	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1809	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429	my $req = List::Util::sum @req;	1810	my $req = List::Util::sum @req;
1430		1811
1431	if ($req > $space) {	1812	if ($req > $space) {
1432	# ah well, not enough space	1813	# ah well, not enough space
1433	$_ *= $space / $req for @req;	1814	$_ *= $space / $req for @req;
1434	} else {	1815	} else {
1435	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1816	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436		1817
1437	$space = ($space - $req) / $expand; # remaining space to give away	1818	$space = ($space - $req) / $expand; # remaining space to give away
1438		1819
1439	$req[$_] += $space * $children->[$_]{expand}	1820	$req[$_] += $space * $children[$_]{expand}
1440	for 0 .. $#$children;	1821	for 0 .. $#children;
1441	}	1822	}
1442	}	1823	}
1443		1824
1444	CFClient::UI::harmonize \@req;	1825	CFPlus::UI::harmonize \@req;
1445		1826
1446	my $pos = 0;	1827	my $pos = 0;
1447	for (0 .. $#$children) {	1828	for (0 .. $#children) {
1448	my $alloc = $req[$_];	1829	my $alloc = $req[$_];
1449	$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));
1450		1831
1451	$pos += $alloc;	1832	$pos += $alloc;
1452	}	1833	}
1453		1834
1454	1	1835	1
1455	}	1836	}
1456		1837
1457	#############################################################################	1838	#############################################################################
1458		1839
1459	package CFClient::UI::HBox;	1840	package CFPlus::UI::HBox;
1460		1841
1461	our @ISA = CFClient::UI::Box::;	1842	our @ISA = CFPlus::UI::Box::;
1462		1843
1463	sub new {	1844	sub new {
1464	my $class = shift;	1845	my $class = shift;
1465		1846
1466	$class->SUPER::new (	1847	$class->SUPER::new (
…		…
1469	)	1850	)
1470	}	1851	}
1471		1852
1472	#############################################################################	1853	#############################################################################
1473		1854
1474	package CFClient::UI::VBox;	1855	package CFPlus::UI::VBox;
1475		1856
1476	our @ISA = CFClient::UI::Box::;	1857	our @ISA = CFPlus::UI::Box::;
1477		1858
1478	sub new {	1859	sub new {
1479	my $class = shift;	1860	my $class = shift;
1480		1861
1481	$class->SUPER::new (	1862	$class->SUPER::new (
…		…
1484	)	1865	)
1485	}	1866	}
1486		1867
1487	#############################################################################	1868	#############################################################################
1488		1869
1489	package CFClient::UI::Label;	1870	package CFPlus::UI::Label;
1490		1871
1491	our @ISA = CFClient::UI::DrawBG::;	1872	our @ISA = CFPlus::UI::DrawBG::;
1492		1873
1493	use CFClient::OpenGL;	1874	use CFPlus::OpenGL;
1494		1875
1495	sub new {	1876	sub new {
1496	my ($class, %arg) = @_;	1877	my ($class, %arg) = @_;
1497		1878
1498	my $self = $class->SUPER::new (	1879	my $self = $class->SUPER::new (
…		…
1501	#active_bg => none	1882	#active_bg => none
1502	#font => default_font	1883	#font => default_font
1503	#text => initial text	1884	#text => initial text
1504	#markup => initial narkup	1885	#markup => initial narkup
1505	#max_w => maximum pixel width	1886	#max_w => maximum pixel width
		1887	#style => 0, # render flags
1506	ellipsise => 3, # end	1888	ellipsise => 3, # end
1507	layout => (new CFClient::Layout),	1889	layout => (new CFPlus::Layout),
1508	fontsize => 1,	1890	fontsize => 1,
1509	align => -1,	1891	align => -1,
1510	valign => -1,	1892	valign => -1,
1511	padding_x => 2,	1893	padding_x => 2,
1512	padding_y => 2,	1894	padding_y => 2,
1513	can_events => 0,	1895	can_events => 0,
1514	%arg	1896	%arg
1515	);	1897	);
1516		1898
1517	if (exists $self->{template}) {	1899	if (exists $self->{template}) {
1518	my $layout = new CFClient::Layout;	1900	my $layout = new CFPlus::Layout;
1519	$layout->set_text (delete $self->{template});	1901	$layout->set_text (delete $self->{template});
1520	$self->{template} = $layout;	1902	$self->{template} = $layout;
1521	}	1903	}
1522		1904
1523	if (exists $self->{markup}) {	1905	if (exists $self->{markup}) {
…		…
1527	}	1909	}
1528		1910
1529	$self	1911	$self
1530	}	1912	}
1531		1913
1532	sub escape($) {
1533	local $_ = $_[0];
1534
1535	s/&/&amp;/g;
1536	s/>/&gt;/g;
1537	s/</&lt;/g;
1538
1539	$_
1540	}
1541
1542	sub update {	1914	sub update {
1543	my ($self) = @_;	1915	my ($self) = @_;
1544		1916
1545	delete $self->{texture};	1917	delete $self->{texture};
1546	$self->SUPER::update;	1918	$self->SUPER::update;
…		…
1557	my ($self, $text) = @_;	1929	my ($self, $text) = @_;
1558		1930
1559	return if $self->{text} eq "T$text";	1931	return if $self->{text} eq "T$text";
1560	$self->{text} = "T$text";	1932	$self->{text} = "T$text";
1561		1933
1562	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563	$self->{layout}->set_text ($text);	1934	$self->{layout}->set_text ($text);
1564		1935
1565	delete $self->{size_req};	1936	delete $self->{size_req};
1566	$self->realloc;	1937	$self->realloc;
1567	$self->update;	1938	$self->update;
…		…
1573	return if $self->{text} eq "M$markup";	1944	return if $self->{text} eq "M$markup";
1574	$self->{text} = "M$markup";	1945	$self->{text} = "M$markup";
1575		1946
1576	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1947	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577		1948
1578	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579	$self->{layout}->set_markup ($markup);	1949	$self->{layout}->set_markup ($markup);
1580		1950
1581	delete $self->{size_req};	1951	delete $self->{size_req};
1582	$self->realloc;	1952	$self->realloc;
1583	$self->update;	1953	$self->update;
…		…
1595		1965
1596	my ($w, $h) = $self->{layout}->size;	1966	my ($w, $h) = $self->{layout}->size;
1597		1967
1598	if (exists $self->{template}) {	1968	if (exists $self->{template}) {
1599	$self->{template}->set_font ($self->{font}) if $self->{font};	1969	$self->{template}->set_font ($self->{font}) if $self->{font};
		1970	$self->{template}->set_width ($self->{max_w} || -1);
1600	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1971	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601		1972
1602	my ($w2, $h2) = $self->{template}->size;	1973	my ($w2, $h2) = $self->{template}->size;
1603		1974
1604	$w = List::Util::max $w, $w2;	1975	$w = List::Util::max $w, $w2;
…		…
1609	};	1980	};
1610		1981
1611	@{ $self->{size_req} }	1982	@{ $self->{size_req} }
1612	}	1983	}
1613		1984
		1985	sub baseline_shift {
		1986	$_[0]{layout}->descent
		1987	}
		1988
1614	sub size_allocate {	1989	sub invoke_size_allocate {
1615	my ($self, $w, $h) = @_;	1990	my ($self, $w, $h) = @_;
1616		1991
1617	delete $self->{ox};	1992	delete $self->{ox};
1618		1993
1619	delete $self->{texture}	1994	delete $self->{texture}
1620	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1995	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1996
		1997	1
1621	}	1998	}
1622		1999
1623	sub set_fontsize {	2000	sub set_fontsize {
1624	my ($self, $fontsize) = @_;	2001	my ($self, $fontsize) = @_;
1625		2002
1626	$self->{fontsize} = $fontsize;	2003	$self->{fontsize} = $fontsize;
		2004	delete $self->{size_req};
1627	delete $self->{texture};	2005	delete $self->{texture};
1628		2006
1629	$self->realloc;	2007	$self->realloc;
1630	}	2008	}
1631		2009
1632	sub reconfigure {	2010	sub reconfigure {
1633	my ($self) = @_;	2011	my ($self) = @_;
1634		2012
1635	delete $self->{size_req};	2013	delete $self->{size_req};
		2014	delete $self->{texture};
1636		2015
1637	$self->SUPER::reconfigure;	2016	$self->SUPER::reconfigure;
1638	}	2017	}
1639		2018
1640	sub _draw {	2019	sub _draw {
1641	my ($self) = @_;	2020	my ($self) = @_;
1642		2021
1643	$self->SUPER::_draw; # draw background, if applicable	2022	$self->SUPER::_draw; # draw background, if applicable
1644		2023
1645	my $tex = $self->{texture} ||= do {	2024	my $size = $self->{texture} ||= do {
1646	$self->{layout}->set_foreground (@{$self->{fg}});	2025	$self->{layout}->set_foreground (@{$self->{fg}});
1647	$self->{layout}->set_font ($self->{font}) if $self->{font};	2026	$self->{layout}->set_font ($self->{font}) if $self->{font};
1648	$self->{layout}->set_width ($self->{w});	2027	$self->{layout}->set_width ($self->{w});
1649	$self->{layout}->set_ellipsise ($self->{ellipsise});	2028	$self->{layout}->set_ellipsise ($self->{ellipsise});
1650	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2029	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2030	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652		2031
1653	new_from_layout CFClient::Texture $self->{layout}	2032	[$self->{layout}->size]
1654	};	2033	};
1655		2034
1656	unless (exists $self->{ox}) {	2035	unless (exists $self->{ox}) {
1657	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2036	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2037	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659	: ($self->{w} - $tex->{w}) * 0.5);	2038	: ($self->{w} - $size->[0]) * 0.5);
1660		2039
1661	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2040	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2041	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663	: ($self->{h} - $tex->{h}) * 0.5);	2042	: ($self->{h} - $size->[1]) * 0.5);
1664	};	2043	};
1665		2044
1666	glEnable GL_TEXTURE_2D;	2045	# unless ($self->{list}) {
1667		2046	# $self->{list} = CFPlus::OpenGL::glGenList;
1668	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2047	# CFPlus::OpenGL::glNewList $self->{list};
1669	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2048	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1670		2049	# CFPlus::OpenGL::glEndList;
1671	if ($tex->{format} == GL_ALPHA) {
1672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673	glColor @{$self->{fg}};
1674	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675	} else {
1676	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678	}	2050	# }
		2051	#
		2052	# CFPlus::OpenGL::glCallList $self->{list};
1679		2053
1680	glDisable GL_TEXTURE_2D;	2054	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1681	}	2055	}
		2056
		2057	#sub destroy {
		2058	# my ($self) = @_;
		2059	#
		2060	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2061	#
		2062	# $self->SUPER::destroy;
		2063	#}
1682		2064
1683	#############################################################################	2065	#############################################################################
1684		2066
1685	package CFClient::UI::EntryBase;	2067	package CFPlus::UI::EntryBase;
1686		2068
1687	our @ISA = CFClient::UI::Label::;	2069	our @ISA = CFPlus::UI::Label::;
1688		2070
1689	use CFClient::OpenGL;	2071	use CFPlus::OpenGL;
1690		2072
1691	sub new {	2073	sub new {
1692	my $class = shift;	2074	my $class = shift;
1693		2075
1694	$class->SUPER::new (	2076	$class->SUPER::new (
1695	fg => [1, 1, 1],	2077	fg => [1, 1, 1],
1696	bg => [0, 0, 0, 0.2],	2078	bg => [0, 0, 0, 0.2],
		2079	outline => [0.6, 0.3, 0.1],
1697	active_bg => [1, 1, 1, 0.5],	2080	active_bg => [0, 0, 1, .2],
1698	active_fg => [0, 0, 0],	2081	active_fg => [1, 1, 1],
		2082	active_outline => [1, 1, 0],
1699	can_hover => 1,	2083	can_hover => 1,
1700	can_focus => 1,	2084	can_focus => 1,
1701	valign => 0,	2085	valign => 0,
1702	can_events => 1,	2086	can_events => 1,
		2087	ellipsise => 0,
1703	#text => ...	2088	#text => ...
1704	#hidden => "*",	2089	#hidden => "*",
1705	@_	2090	@_
1706	)	2091	)
1707	}	2092	}
…		…
1718		2103
1719	$text =~ s/./*/g if $self->{hidden};	2104	$text =~ s/./*/g if $self->{hidden};
1720	$self->{layout}->set_text ("$text ");	2105	$self->{layout}->set_text ("$text ");
1721	delete $self->{size_req};	2106	delete $self->{size_req};
1722		2107
1723	$self->_emit (changed => $self->{text});	2108	$self->emit (changed => $self->{text});
1724		2109
1725	$self->realloc;	2110	$self->realloc;
1726	$self->update;	2111	$self->update;
1727	}	2112	}
1728		2113
…		…
1743	my ($w, $h) = $self->SUPER::size_request;	2128	my ($w, $h) = $self->SUPER::size_request;
1744		2129
1745	($w + 1, $h) # add 1 for cursor	2130	($w + 1, $h) # add 1 for cursor
1746	}	2131	}
1747		2132
1748	sub key_down {	2133	sub invoke_key_down {
1749	my ($self, $ev) = @_;	2134	my ($self, $ev) = @_;
1750		2135
1751	my $mod = $ev->{mod};	2136	my $mod = $ev->{mod};
1752	my $sym = $ev->{sym};	2137	my $sym = $ev->{sym};
1753	my $uni = $ev->{unicode};	2138	my $uni = $ev->{unicode};
1754		2139
1755	my $text = $self->get_text;	2140	my $text = $self->get_text;
		2141
		2142	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1756		2143
1757	if ($uni == 8) {	2144	if ($uni == 8) {
1758	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2145	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759	} elsif ($uni == 127) {	2146	} elsif ($uni == 127) {
1760	substr $text, $self->{cursor}, 1, "";	2147	substr $text, $self->{cursor}, 1, "";
1761	} elsif ($sym == CFClient::SDLK_LEFT) {	2148	} elsif ($sym == CFPlus::SDLK_LEFT) {
1762	--$self->{cursor} if $self->{cursor};	2149	--$self->{cursor} if $self->{cursor};
1763	} elsif ($sym == CFClient::SDLK_RIGHT) {	2150	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1764	++$self->{cursor} if $self->{cursor} < length $self->{text};	2151	++$self->{cursor} if $self->{cursor} < length $self->{text};
1765	} elsif ($sym == CFClient::SDLK_HOME) {	2152	} elsif ($sym == CFPlus::SDLK_HOME) {
		2153	# what a hack
		2154	$self->{cursor} =
		2155	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2156	? length $1
		2157	: 0;
		2158	} elsif ($sym == CFPlus::SDLK_END) {
		2159	# uh, again
		2160	$self->{cursor} =
		2161	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2162	? $self->{cursor} + length $1
		2163	: length $self->{text};
		2164	} elsif ($uni == 21) { # ctrl-u
		2165	$text = "";
1766	$self->{cursor} = 0;	2166	$self->{cursor} = 0;
1767	} elsif ($sym == CFClient::SDLK_END) {
1768	$self->{cursor} = length $text;
1769	} elsif ($uni == 27) {	2167	} elsif ($uni == 27) {
1770	$self->_emit ('escape');	2168	$self->emit ('escape');
1771	} elsif ($uni) {	2169	} elsif ($uni == 0x0d) {
		2170	substr $text, $self->{cursor}++, 0, "\012";
		2171	} elsif ($uni >= 0x20) {
1772	substr $text, $self->{cursor}++, 0, chr $uni;	2172	substr $text, $self->{cursor}++, 0, chr $uni;
1773	} else {	2173	} else {
1774	return 0;	2174	return 0;
1775	}	2175	}
1776		2176
1777	$self->_set_text ($text);	2177	$self->_set_text ($text);
1778		2178
1779	$self->realloc;	2179	$self->realloc;
		2180	$self->update;
1780		2181
1781	1	2182	1
1782	}	2183	}
1783		2184
1784	sub focus_in {	2185	sub invoke_focus_in {
1785	my ($self) = @_;	2186	my ($self) = @_;
1786		2187
1787	$self->{last_activity} = $::NOW;	2188	$self->{last_activity} = $::NOW;
1788		2189
1789	$self->SUPER::focus_in;	2190	$self->SUPER::invoke_focus_in
1790	}	2191	}
1791		2192
1792	sub button_down {	2193	sub invoke_button_down {
1793	my ($self, $ev, $x, $y) = @_;	2194	my ($self, $ev, $x, $y) = @_;
1794		2195
1795	$self->SUPER::button_down ($ev, $x, $y);	2196	$self->SUPER::invoke_button_down ($ev, $x, $y);
1796		2197
1797	my $idx = $self->{layout}->xy_to_index ($x, $y);	2198	my $idx = $self->{layout}->xy_to_index ($x, $y);
1798		2199
1799	# byte-index to char-index	2200	# byte-index to char-index
1800	my $text = $self->{text};	2201	my $text = $self->{text};
1801	utf8::encode $text;	2202	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802	$self->{cursor} = length substr $text, 0, $idx;	2203	$self->{cursor} = length $text;
1803		2204
1804	$self->_set_text ($self->{text});	2205	$self->_set_text ($self->{text});
1805	$self->update;	2206	$self->update;
1806		2207
1807	1	2208	1
1808	}	2209	}
1809		2210
1810	sub mouse_motion {	2211	sub invoke_mouse_motion {
1811	my ($self, $ev, $x, $y) = @_;	2212	my ($self, $ev, $x, $y) = @_;
1812	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2213	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813		2214
1814	0	2215	1
1815	}	2216	}
1816		2217
1817	sub _draw {	2218	sub _draw {
1818	my ($self) = @_;	2219	my ($self) = @_;
1819		2220
…		…
1843		2244
1844	unless (exists $self->{cur_h}) {	2245	unless (exists $self->{cur_h}) {
1845	my $text = substr $self->{text}, 0, $self->{cursor};	2246	my $text = substr $self->{text}, 0, $self->{cursor};
1846	utf8::encode $text;	2247	utf8::encode $text;
1847		2248
1848	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2249	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1849	}	2250	}
1850		2251
1851	glColor @{$self->{fg}};	2252	glColor_premultiply @{$self->{active_fg}};
1852	glBegin GL_LINES;	2253	glBegin GL_LINES;
1853	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2254	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1854	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2255	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1855	glEnd;	2256	glEnd;
1856	}
1857	}
1858		2257
		2258	glLineWidth 3;
		2259	glColor @{$self->{active_outline}};
		2260	glBegin GL_LINE_LOOP;
		2261	glVertex 0, 0;
		2262	glVertex $self->{w} - 1, 0;
		2263	glVertex $self->{w} - 1, $self->{h} - 1;
		2264	glVertex 0, $self->{h} - 1;
		2265	glEnd;
		2266	glLineWidth 1;
		2267
		2268	} else {
		2269	glColor @{$self->{outline}};
		2270	glTranslate .375, .375;
		2271	glBegin GL_LINE_STRIP;
		2272	glVertex 0, $self->{h} * .5;
		2273	glVertex 0, $self->{h} - 3;
		2274	glVertex $self->{w} - 1, $self->{h} - 3;
		2275	glVertex $self->{w} - 1, $self->{h} * .5;
		2276	glEnd;
		2277	}
		2278	}
		2279
		2280	#############################################################################
		2281
1859	package CFClient::UI::Entry;	2282	package CFPlus::UI::Entry;
1860		2283
1861	our @ISA = CFClient::UI::EntryBase::;	2284	our @ISA = CFPlus::UI::EntryBase::;
1862		2285
1863	use CFClient::OpenGL;	2286	use CFPlus::OpenGL;
1864		2287
1865	sub key_down {	2288	sub invoke_key_down {
1866	my ($self, $ev) = @_;	2289	my ($self, $ev) = @_;
1867		2290
1868	my $sym = $ev->{sym};	2291	my $sym = $ev->{sym};
1869		2292
1870	if ($sym == 13) {	2293	if ($ev->{uni} == 0x0d || $sym == 13) {
1871	unshift @{$self->{history}},	2294	unshift @{$self->{history}},
1872	my $txt = $self->get_text;	2295	my $txt = $self->get_text;
		2296
1873	$self->{history_pointer} = -1;	2297	$self->{history_pointer} = -1;
1874	$self->{history_saveback} = '';	2298	$self->{history_saveback} = '';
1875	$self->_emit (activate => $txt);	2299	$self->emit (activate => $txt);
1876	$self->update;	2300	$self->update;
1877		2301
1878	} elsif ($sym == CFClient::SDLK_UP) {	2302	} elsif ($sym == CFPlus::SDLK_UP) {
1879	if ($self->{history_pointer} < 0) {	2303	if ($self->{history_pointer} < 0) {
1880	$self->{history_saveback} = $self->get_text;	2304	$self->{history_saveback} = $self->get_text;
1881	}	2305	}
1882	if (@{$self->{history} || []} > 0) {	2306	if (@{$self->{history} || []} > 0) {
1883	$self->{history_pointer}++;	2307	$self->{history_pointer}++;
…		…
1885	$self->{history_pointer} = @{$self->{history} || []} - 1;	2309	$self->{history_pointer} = @{$self->{history} || []} - 1;
1886	}	2310	}
1887	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2311	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1888	}	2312	}
1889		2313
1890	} elsif ($sym == CFClient::SDLK_DOWN) {	2314	} elsif ($sym == CFPlus::SDLK_DOWN) {
1891	$self->{history_pointer}--;	2315	$self->{history_pointer}--;
1892	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2316	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893		2317
1894	if ($self->{history_pointer} >= 0) {	2318	if ($self->{history_pointer} >= 0) {
1895	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2319	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1896	} else {	2320	} else {
1897	$self->set_text ($self->{history_saveback});	2321	$self->set_text ($self->{history_saveback});
1898	}	2322	}
1899		2323
1900	} else {	2324	} else {
1901	return $self->SUPER::key_down ($ev)	2325	return $self->SUPER::invoke_key_down ($ev)
1902	}	2326	}
1903		2327
1904	1	2328	1
1905	}	2329	}
1906		2330
1907	#############################################################################	2331	#############################################################################
1908		2332
		2333	package CFPlus::UI::TextEdit;
		2334
		2335	our @ISA = CFPlus::UI::EntryBase::;
		2336
		2337	use CFPlus::OpenGL;
		2338
		2339	sub move_cursor_ver {
		2340	my ($self, $dy) = @_;
		2341
		2342	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2343
		2344	$y += $dy;
		2345
		2346	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2347	$self->{cursor} = $index;
		2348	delete $self->{cur_h};
		2349	$self->update;
		2350	return;
		2351	}
		2352	}
		2353
		2354	sub invoke_key_down {
		2355	my ($self, $ev) = @_;
		2356
		2357	my $sym = $ev->{sym};
		2358
		2359	if ($sym == CFPlus::SDLK_UP) {
		2360	$self->move_cursor_ver (-1);
		2361	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2362	$self->move_cursor_ver (+1);
		2363	} else {
		2364	return $self->SUPER::invoke_key_down ($ev)
		2365	}
		2366
		2367	1
		2368	}
		2369
		2370	#############################################################################
		2371
1909	package CFClient::UI::Button;	2372	package CFPlus::UI::ButtonBin;
1910		2373
1911	our @ISA = CFClient::UI::Label::;	2374	our @ISA = CFPlus::UI::Bin::;
1912		2375
1913	use CFClient::OpenGL;	2376	use CFPlus::OpenGL;
1914		2377
1915	my @tex =	2378	my @tex =
1916	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2379	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917	qw(b1_button_active.png);	2380	qw(b1_button_inactive.png b1_button_active.png);
1918		2381
1919	sub new {	2382	sub new {
1920	my $class = shift;	2383	my $class = shift;
1921		2384
1922	$class->SUPER::new (	2385	$class->SUPER::new (
1923	padding_x => 4,
1924	padding_y => 4,
1925	fg => [1, 1, 1],
1926	active_fg => [0, 0, 1],
1927	can_hover => 1,	2386	can_hover => 1,
1928	align => 0,	2387	align => 0,
1929	valign => 0,	2388	valign => 0,
1930	can_events => 1,	2389	can_events => 1,
1931	@_	2390	@_
1932	)	2391	)
1933	}	2392	}
1934		2393
1935	sub activate { }
1936
1937	sub button_up {	2394	sub invoke_button_up {
1938	my ($self, $ev, $x, $y) = @_;	2395	my ($self, $ev, $x, $y) = @_;
1939		2396
1940	$self->emit ("activate")	2397	$self->emit ("activate")
1941	if $x >= 0 && $x < $self->{w}	2398	if $x >= 0 && $x < $self->{w}
1942	&& $y >= 0 && $y < $self->{h};	2399	&& $y >= 0 && $y < $self->{h};
…		…
1945	}	2402	}
1946		2403
1947	sub _draw {	2404	sub _draw {
1948	my ($self) = @_;	2405	my ($self) = @_;
1949		2406
1950	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1951
1952	glEnable GL_TEXTURE_2D;	2407	glEnable GL_TEXTURE_2D;
1953	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2408	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1954	glColor 0, 0, 0, 1;	2409	glColor 0, 0, 0, 1;
1955		2410
		2411	my $tex = $tex[$GRAB == $self];
1956	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2412	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1957		2413
1958	glDisable GL_TEXTURE_2D;	2414	glDisable GL_TEXTURE_2D;
1959		2415
1960	$self->SUPER::_draw;	2416	$self->SUPER::_draw;
1961	}	2417	}
1962		2418
1963	#############################################################################	2419	#############################################################################
1964		2420
1965	package CFClient::UI::CheckBox;	2421	package CFPlus::UI::Button;
1966		2422
1967	our @ISA = CFClient::UI::DrawBG::;	2423	our @ISA = CFPlus::UI::Label::;
		2424
		2425	use CFPlus::OpenGL;
1968		2426
1969	my @tex =	2427	my @tex =
1970	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2428	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2429	qw(b1_button_inactive.png b1_button_active.png);
		2430
		2431	sub new {
		2432	my $class = shift;
		2433
		2434	$class->SUPER::new (
		2435	padding_x => 4,
		2436	padding_y => 4,
		2437	fg => [1.0, 1.0, 1.0],
		2438	active_fg => [0.8, 0.8, 0.8],
		2439	can_hover => 1,
		2440	align => 0,
		2441	valign => 0,
		2442	can_events => 1,
		2443	@_
		2444	)
		2445	}
		2446
		2447	sub invoke_button_up {
		2448	my ($self, $ev, $x, $y) = @_;
		2449
		2450	$self->emit ("activate")
		2451	if $x >= 0 && $x < $self->{w}
		2452	&& $y >= 0 && $y < $self->{h};
		2453
		2454	1
		2455	}
		2456
		2457	sub _draw {
		2458	my ($self) = @_;
		2459
		2460	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2461
		2462	glEnable GL_TEXTURE_2D;
		2463	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2464	glColor 0, 0, 0, 1;
		2465
		2466	my $tex = $tex[$GRAB == $self];
		2467	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2468
		2469	glDisable GL_TEXTURE_2D;
		2470
		2471	$self->SUPER::_draw;
		2472	}
		2473
		2474	#############################################################################
		2475
		2476	package CFPlus::UI::CheckBox;
		2477
		2478	our @ISA = CFPlus::UI::DrawBG::;
		2479
		2480	my @tex =
		2481	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2482	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972		2483
1973	use CFClient::OpenGL;	2484	use CFPlus::OpenGL;
1974		2485
1975	sub new {	2486	sub new {
1976	my $class = shift;	2487	my $class = shift;
1977		2488
1978	$class->SUPER::new (	2489	$class->SUPER::new (
…		…
1992	my ($self) = @_;	2503	my ($self) = @_;
1993		2504
1994	(6) x 2	2505	(6) x 2
1995	}	2506	}
1996		2507
		2508	sub toggle {
		2509	my ($self) = @_;
		2510
		2511	$self->{state} = !$self->{state};
		2512	$self->emit (changed => $self->{state});
		2513	$self->update;
		2514	}
		2515
1997	sub button_down {	2516	sub invoke_button_down {
1998	my ($self, $ev, $x, $y) = @_;	2517	my ($self, $ev, $x, $y) = @_;
1999		2518
2000	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2519	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2520	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002	$self->{state} = !$self->{state};	2521	$self->toggle;
2003	$self->_emit (changed => $self->{state});
2004	} else {	2522	} else {
2005	return 0	2523	return 0
2006	}	2524	}
2007		2525
2008	1	2526	1
…		…
2028	glDisable GL_TEXTURE_2D;	2546	glDisable GL_TEXTURE_2D;
2029	}	2547	}
2030		2548
2031	#############################################################################	2549	#############################################################################
2032		2550
2033	package CFClient::UI::Image;	2551	package CFPlus::UI::Image;
2034		2552
2035	our @ISA = CFClient::UI::Base::;	2553	our @ISA = CFPlus::UI::Base::;
2036		2554
2037	use CFClient::OpenGL;	2555	use CFPlus::OpenGL;
2038	use Carp qw/confess/;
2039		2556
2040	our %loaded_images;	2557	our %texture_cache;
2041		2558
2042	sub new {	2559	sub new {
2043	my $class = shift;	2560	my $class = shift;
2044		2561
2045	my $self = $class->SUPER::new (can_events => 0, @_);	2562	my $self = $class->SUPER::new (
		2563	can_events => 0,
		2564	scale => 1,
		2565	@_,
		2566	);
2046		2567
2047	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2568	$self->{path} || $self->{tex}
		2569	or Carp::croak "'path' or 'tex' attributes required";
2048		2570
2049	$loaded_images{$self->{image}} ||=	2571	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2050	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2572	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051		2573
2052	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2574	CFPlus::weaken $texture_cache{$self->{path}};
2053		2575
2054	Scalar::Util::weaken $loaded_images{$self->{image}};	2576	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056	$self->{aspect} = $tex->{w} / $tex->{h};
2057		2577
2058	$self	2578	$self
2059	}	2579	}
2060		2580
		2581	sub STORABLE_freeze {
		2582	my ($self, $cloning) = @_;
		2583
		2584	$self->{path}
		2585	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2586
		2587	$self->{path}
		2588	}
		2589
		2590	sub STORABLE_attach {
		2591	my ($self, $cloning, $path) = @_;
		2592
		2593	$self->new (path => $path)
		2594	}
		2595
2061	sub size_request {	2596	sub size_request {
2062	my ($self) = @_;	2597	my ($self) = @_;
2063		2598
2064	($self->{tex}->{w}, $self->{tex}->{h})	2599	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2065	}	2600	}
2066		2601
2067	sub _draw {	2602	sub _draw {
2068	my ($self) = @_;	2603	my ($self) = @_;
2069		2604
…		…
2086	glDisable GL_TEXTURE_2D;	2621	glDisable GL_TEXTURE_2D;
2087	}	2622	}
2088		2623
2089	#############################################################################	2624	#############################################################################
2090		2625
		2626	package CFPlus::UI::ImageButton;
		2627
		2628	our @ISA = CFPlus::UI::Image::;
		2629
		2630	use CFPlus::OpenGL;
		2631
		2632	my %textures;
		2633
		2634	sub new {
		2635	my $class = shift;
		2636
		2637	my $self = $class->SUPER::new (
		2638	padding_x => 4,
		2639	padding_y => 4,
		2640	fg => [1, 1, 1],
		2641	active_fg => [0, 0, 1],
		2642	can_hover => 1,
		2643	align => 0,
		2644	valign => 0,
		2645	can_events => 1,
		2646	@_
		2647	);
		2648	}
		2649
		2650	sub invoke_button_up {
		2651	my ($self, $ev, $x, $y) = @_;
		2652
		2653	$self->emit ("activate")
		2654	if $x >= 0 && $x < $self->{w}
		2655	&& $y >= 0 && $y < $self->{h};
		2656
		2657	1
		2658	}
		2659
		2660	#############################################################################
		2661
2091	package CFClient::UI::VGauge;	2662	package CFPlus::UI::VGauge;
2092		2663
2093	our @ISA = CFClient::UI::Base::;	2664	our @ISA = CFPlus::UI::Base::;
2094		2665
2095	use List::Util qw(min max);	2666	use List::Util qw(min max);
2096		2667
2097	use CFClient::OpenGL;	2668	use CFPlus::OpenGL;
2098		2669
2099	my %tex = (	2670	my %tex = (
2100	food => [	2671	food => [
2101	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2672	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2673	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103	],	2674	],
2104	grace => [	2675	grace => [
2105	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2676	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2677	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2107	],	2678	],
2108	hp => [	2679	hp => [
2109	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2680	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2681	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111	],	2682	],
2112	mana => [	2683	mana => [
2113	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2684	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2114	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2685	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2115	],	2686	],
2116	);	2687	);
2117		2688
2118	# eg. VGauge->new (gauge => 'food'), default gauge: food	2689	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2178	my $ycut1 = max 0, min 1, $ycut;	2749	my $ycut1 = max 0, min 1, $ycut;
2179	my $ycut2 = max 0, min 1, $ycut - 1;	2750	my $ycut2 = max 0, min 1, $ycut - 1;
2180		2751
2181	my $h1 = $self->{h} * (1 - $ycut1);	2752	my $h1 = $self->{h} * (1 - $ycut1);
2182	my $h2 = $self->{h} * (1 - $ycut2);	2753	my $h2 = $self->{h} * (1 - $ycut2);
		2754	my $h3 = $self->{h};
		2755
		2756	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2183		2757
2184	glEnable GL_BLEND;	2758	glEnable GL_BLEND;
2185	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2759	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2760	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187	glEnable GL_TEXTURE_2D;	2761	glEnable GL_TEXTURE_2D;
…		…
2206		2780
2207	if ($t3) {	2781	if ($t3) {
2208	glBindTexture GL_TEXTURE_2D, $t3->{name};	2782	glBindTexture GL_TEXTURE_2D, $t3->{name};
2209	glBegin GL_QUADS;	2783	glBegin GL_QUADS;
2210	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2784	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2785	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2786	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2787	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214	glEnd;	2788	glEnd;
2215	}	2789	}
2216		2790
2217	glDisable GL_BLEND;	2791	glDisable GL_BLEND;
2218	glDisable GL_TEXTURE_2D;	2792	glDisable GL_TEXTURE_2D;
2219	}	2793	}
2220		2794
2221	#############################################################################	2795	#############################################################################
2222		2796
2223	package CFClient::UI::Gauge;	2797	package CFPlus::UI::Gauge;
2224		2798
2225	our @ISA = CFClient::UI::VBox::;	2799	our @ISA = CFPlus::UI::VBox::;
2226		2800
2227	sub new {	2801	sub new {
2228	my ($class, %arg) = @_;	2802	my ($class, %arg) = @_;
2229		2803
2230	my $self = $class->SUPER::new (	2804	my $self = $class->SUPER::new (
…		…
2232	can_hover => 1,	2806	can_hover => 1,
2233	can_events => 1,	2807	can_events => 1,
2234	%arg,	2808	%arg,
2235	);	2809	);
2236		2810
2237	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2811	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2238	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2812	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2239	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2813	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2240		2814
2241	$self	2815	$self
2242	}	2816	}
2243		2817
2244	sub set_fontsize {	2818	sub set_fontsize {
…		…
2265	$self->{value}->set_text ($val);	2839	$self->{value}->set_text ($val);
2266	}	2840	}
2267		2841
2268	#############################################################################	2842	#############################################################################
2269		2843
2270	package CFClient::UI::Slider;	2844	package CFPlus::UI::Slider;
2271		2845
2272	use strict;	2846	use strict;
2273		2847
2274	use CFClient::OpenGL;	2848	use CFPlus::OpenGL;
2275		2849
2276	our @ISA = CFClient::UI::DrawBG::;	2850	our @ISA = CFPlus::UI::DrawBG::;
2277		2851
2278	my @tex =	2852	my @tex =
2279	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2853	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280	qw(s1_slider.png s1_slider_bg.png);	2854	qw(s1_slider.png s1_slider_bg.png);
2281		2855
2282	sub new {	2856	sub new {
2283	my $class = shift;	2857	my $class = shift;
2284		2858
…		…
2305	$self->update;	2879	$self->update;
2306		2880
2307	$self	2881	$self
2308	}	2882	}
2309		2883
2310	sub changed { }
2311
2312	sub set_range {	2884	sub set_range {
2313	my ($self, $range) = @_;	2885	my ($self, $range) = @_;
2314		2886
2315	($range, $self->{range}) = ($self->{range}, $range);	2887	($range, $self->{range}) = ($self->{range}, $range);
2316		2888
…		…
2336	if $unit;	2908	if $unit;
2337		2909
2338	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2910	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339		2911
2340	if ($value != $old_value) {	2912	if ($value != $old_value) {
2341	$self->_emit (changed => $value);	2913	$self->emit (changed => $value);
2342	$self->update;	2914	$self->update;
2343	}	2915	}
2344	}	2916	}
2345		2917
2346	sub size_request {	2918	sub size_request {
2347	my ($self) = @_;	2919	my ($self) = @_;
2348		2920
2349	($self->{req_w}, $self->{req_h})	2921	($self->{req_w}, $self->{req_h})
2350	}	2922	}
2351		2923
2352	sub button_down {	2924	sub invoke_button_down {
2353	my ($self, $ev, $x, $y) = @_;	2925	my ($self, $ev, $x, $y) = @_;
2354		2926
2355	$self->SUPER::button_down ($ev, $x, $y);	2927	$self->SUPER::invoke_button_down ($ev, $x, $y);
2356		2928
2357	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2929	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358		2930
2359	$self->mouse_motion ($ev, $x, $y)	2931	$self->invoke_mouse_motion ($ev, $x, $y);
2360	}
2361		2932
		2933	1
		2934	}
		2935
2362	sub mouse_motion {	2936	sub invoke_mouse_motion {
2363	my ($self, $ev, $x, $y) = @_;	2937	my ($self, $ev, $x, $y) = @_;
2364		2938
2365	if ($GRAB == $self) {	2939	if ($GRAB == $self) {
2366	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2940	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367		2941
…		…
2371		2945
2372	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2946	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2373	} else {	2947	} else {
2374	return 0;	2948	return 0;
2375	}	2949	}
		2950
		2951	1
		2952	}
		2953
		2954	sub invoke_mouse_wheel {
		2955	my ($self, $ev) = @_;
		2956
		2957	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2958
		2959	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2960
		2961	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2376		2962
2377	1	2963	1
2378	}	2964	}
2379		2965
2380	sub update {	2966	sub update {
…		…
2431	glDisable GL_TEXTURE_2D;	3017	glDisable GL_TEXTURE_2D;
2432	}	3018	}
2433		3019
2434	#############################################################################	3020	#############################################################################
2435		3021
2436	package CFClient::UI::ValSlider;	3022	package CFPlus::UI::ValSlider;
2437		3023
2438	our @ISA = CFClient::UI::HBox::;	3024	our @ISA = CFPlus::UI::HBox::;
2439		3025
2440	sub new {	3026	sub new {
2441	my ($class, %arg) = @_;	3027	my ($class, %arg) = @_;
2442		3028
2443	my $range = delete $arg{range};	3029	my $range = delete $arg{range};
2444		3030
2445	my $self = $class->SUPER::new (	3031	my $self = $class->SUPER::new (
2446	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3032	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3033	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448	to_value => sub { shift },	3034	to_value => sub { shift },
2449	from_value => sub { shift },	3035	from_value => sub { shift },
2450	%arg,	3036	%arg,
2451	);	3037	);
2452		3038
…		…
2472	sub set_range { shift->{slider}->set_range (@_) }	3058	sub set_range { shift->{slider}->set_range (@_) }
2473	sub set_value { shift->{slider}->set_value (@_) }	3059	sub set_value { shift->{slider}->set_value (@_) }
2474		3060
2475	#############################################################################	3061	#############################################################################
2476		3062
2477	package CFClient::UI::TextScroller;	3063	package CFPlus::UI::TextScroller;
2478		3064
2479	our @ISA = CFClient::UI::HBox::;	3065	our @ISA = CFPlus::UI::HBox::;
2480		3066
2481	use CFClient::OpenGL;	3067	use CFPlus::OpenGL;
2482		3068
2483	sub new {	3069	sub new {
2484	my $class = shift;	3070	my $class = shift;
2485		3071
2486	my $self = $class->SUPER::new (	3072	my $self = $class->SUPER::new (
2487	fontsize => 1,	3073	fontsize => 1,
2488	can_events => 0,	3074	can_events => 1,
2489	indent => 0,	3075	indent => 0,
2490	#font => default_font	3076	#font => default_font
2491	@_,	3077	@_,
2492		3078
2493	layout => (new CFClient::Layout 1),	3079	layout => (new CFPlus::Layout),
2494	par => [],	3080	par => [],
		3081	max_par => 0,
2495	height => 0,	3082	height => 0,
2496	children => [	3083	children => [
2497	(new CFClient::UI::Empty expand => 1),	3084	(new CFPlus::UI::Empty expand => 1),
2498	(new CFClient::UI::Slider vertical => 1),	3085	(new CFPlus::UI::Slider vertical => 1),
2499	],	3086	],
2500	);	3087	);
2501		3088
2502	$self->{children}[1]->connect (changed => sub { $self->update });	3089	$self->{children}[1]->connect (changed => sub { $self->update });
2503		3090
…		…
2509		3096
2510	$self->{fontsize} = $fontsize;	3097	$self->{fontsize} = $fontsize;
2511	$self->reflow;	3098	$self->reflow;
2512	}	3099	}
2513		3100
		3101	sub size_request {
		3102	my ($self) = @_;
		3103
		3104	my ($empty, $slider) = $self->visible_children;
		3105
		3106	local $self->{children} = [$empty, $slider];
		3107	$self->SUPER::size_request
		3108	}
		3109
2514	sub size_allocate {	3110	sub invoke_size_allocate {
2515	my ($self, $w, $h) = @_;	3111	my ($self, $w, $h) = @_;
2516		3112
2517	$self->SUPER::size_allocate ($w, $h);	3113	my ($empty, $slider, @other) = @{ $self->{children} };
		3114	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518		3115
2519	$self->{layout}->set_font ($self->{font}) if $self->{font};	3116	$self->{layout}->set_font ($self->{font}) if $self->{font};
2520	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3117	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521	$self->{layout}->set_width ($self->{children}[0]{w});	3118	$self->{layout}->set_width ($empty->{w});
2522	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3119	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523		3120
2524	$self->reflow;	3121	$self->reflow;
2525	}
2526		3122
2527	sub text_size {	3123	local $self->{children} = [$empty, $slider];
		3124	$self->SUPER::invoke_size_allocate ($w, $h)
		3125	}
		3126
		3127	sub invoke_mouse_wheel {
2528	my ($self, $text, $indent) = @_;	3128	my ($self, $ev) = @_;
		3129
		3130	return 0 unless $ev->{dy}; # only vertical movements
		3131
		3132	$self->{children}[1]->emit (mouse_wheel => $ev);
		3133
		3134	1
		3135	}
		3136
		3137	sub get_layout {
		3138	my ($self, $para) = @_;
2529		3139
2530	my $layout = $self->{layout};	3140	my $layout = $self->{layout};
2531		3141
		3142	$layout->set_font ($self->{font}) if $self->{font};
		3143	$layout->set_foreground (@{$para->{fg}});
2532	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3144	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533	$layout->set_width ($self->{children}[0]{w} - $indent);	3145	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3146	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535	$layout->set_markup ($text);	3147	$layout->set_markup ($para->{markup});
		3148
		3149	$layout->set_shapes (
		3150	map
		3151	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3152	@{$para->{widget}}
2536		3153	);
		3154
2537	$layout->size	3155	$layout
2538	}	3156	}
2539		3157
2540	sub reflow {	3158	sub reflow {
2541	my ($self) = @_;	3159	my ($self) = @_;
2542		3160
…		…
2549		3167
2550	# todo: base offset on lines or so, not on pixels	3168	# todo: base offset on lines or so, not on pixels
2551	$self->{children}[1]->set_value ($offset);	3169	$self->{children}[1]->set_value ($offset);
2552	}	3170	}
2553		3171
		3172	sub current_paragraph {
		3173	my ($self) = @_;
		3174
		3175	$self->{top_paragraph} - 1
		3176	}
		3177
		3178	sub scroll_to {
		3179	my ($self, $para) = @_;
		3180
		3181	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3182
		3183	$self->{scroll_to} = $para;
		3184	$self->update;
		3185	}
		3186
2554	sub clear {	3187	sub clear {
2555	my ($self) = @_;	3188	my ($self) = @_;
		3189
		3190	my (undef, undef, @other) = @{ $self->{children} };
		3191	$self->remove ($_) for @other;
2556		3192
2557	$self->{par} = [];	3193	$self->{par} = [];
2558	$self->{height} = 0;	3194	$self->{height} = 0;
2559	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3195	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560	}	3196	}
2561		3197
2562	sub add_paragraph {	3198	sub add_paragraph {
2563	my ($self, $color, $text, $indent) = @_;	3199	my $self = shift;
2564		3200
2565	for my $line (split /\n/, $text) {	3201	for my $para (@_) {
2566	my ($w, $h) = $self->text_size ($line);	3202	$para = {
		3203	fg => [1, 1, 1, 1],
		3204	indent => 0,
		3205	markup => "",
		3206	widget => [],
		3207	ref $para ? %$para : (markup => $para),
		3208	w => 1e10,
		3209	wrapped => 1,
		3210	};
		3211
		3212	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3213	push @{$self->{par}}, $para;
		3214	}
		3215
		3216	if (my $max = $self->{max_par}) {
		3217	shift @{$self->{par}} while @{$self->{par}} > $max;
		3218	}
		3219
		3220	$self->{need_reflow}++;
		3221	$self->update;
		3222	}
		3223
		3224	sub scroll_to_bottom {
		3225	my ($self) = @_;
		3226
		3227	$self->{scroll_to} = $#{$self->{par}};
		3228	$self->update;
		3229	}
		3230
		3231	sub force_uptodate {
		3232	my ($self) = @_;
		3233
		3234	if (delete $self->{need_reflow}) {
		3235	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3236
		3237	my $height = 0;
		3238
		3239	for my $para (@{$self->{par}}) {
		3240	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3241	my $layout = $self->get_layout ($para);
		3242	my ($w, $h) = $layout->size;
		3243
		3244	$para->{w} = $w + $para->{indent};
		3245	$para->{h} = $h;
		3246	$para->{wrapped} = $layout->has_wrapped;
		3247	}
		3248
		3249	$para->{y} = $height;
		3250	$height += $para->{h};
		3251	}
		3252
2567	$self->{height} += $h;	3253	$self->{height} = $height;
2568	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3254	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2569	}
2570		3255
2571	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3256	delete $self->{texture};
		3257	}
		3258
		3259	if (my $paridx = delete $self->{scroll_to}) {
		3260	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3261	}
2572	}	3262	}
2573		3263
2574	sub update {	3264	sub update {
2575	my ($self) = @_;	3265	my ($self) = @_;
2576		3266
…		…
2579	return unless $self->{h} > 0;	3269	return unless $self->{h} > 0;
2580		3270
2581	delete $self->{texture};	3271	delete $self->{texture};
2582		3272
2583	$ROOT->on_post_alloc ($self => sub {	3273	$ROOT->on_post_alloc ($self => sub {
		3274	$self->force_uptodate;
		3275
2584	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3276	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585		3277
2586	if (delete $self->{need_reflow}) {
2587	my $height = 0;
2588
2589	my $layout = $self->{layout};
2590
2591	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593	for (@{$self->{par}}) {
2594	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2595	$layout->set_width ($W - $_->[3]);
2596	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597	$layout->set_markup ($_->[4]);
2598	my ($w, $h) = $layout->size;
2599	$_->[0] = $w + $_->[3];
2600	$_->[1] = $h;
2601	}
2602
2603	$height += $_->[1];
2604	}
2605
2606	$self->{height} = $height;
2607
2608	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2609
2610	delete $self->{texture};
2611	}
2612
2613	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3278	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614	glClearColor 0, 0, 0, 0;	3279	glClearColor 0, 0, 0, 0;
2615	glClear GL_COLOR_BUFFER_BIT;	3280	glClear GL_COLOR_BUFFER_BIT;
2616		3281
		3282	package CFPlus::UI::Base;
		3283	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3284	(0, 0, $self->{w}, $self->{h});
		3285
		3286	my $top = int $self->{children}[1]{range}[0];
		3287
		3288	my $paridx = 0;
		3289	my $top_paragraph;
2617	my $top = int $self->{children}[1]{range}[0];	3290	my $top = int $self->{children}[1]{range}[0];
2618		3291
2619	my $y0 = $top;	3292	my $y0 = $top;
2620	my $y1 = $top + $H;	3293	my $y1 = $top + $H;
2621		3294
2622	my $y = 0;
2623
2624	my $layout = $self->{layout};
2625
2626	$layout->set_font ($self->{font}) if $self->{font};
2627
2628	glEnable GL_BLEND;
2629	#TODO# not correct in windows where rgba is forced off
2630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632	for my $par (@{$self->{par}}) {	3295	for my $para (@{$self->{par}}) {
2633	my $h = $par->[1];	3296	my $h = $para->{h};
		3297	my $y = $para->{y};
2634		3298
2635	if ($y0 < $y + $h && $y < $y1) {	3299	if ($y0 < $y + $h && $y < $y1) {
2636	$layout->set_foreground (@{ $par->[2] });	3300	my $layout = $self->get_layout ($para);
2637	$layout->set_width ($W - $par->[3]);
2638	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639	$layout->set_markup ($par->[4]);
2640		3301
2641	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3302	$layout->render ($para->{indent}, $y - $y0);
2642		3303
2643	glRasterPos $par->[3], $y - $y0;	3304	if (my @w = @{ $para->{widget} }) {
2644	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3305	my @s = $layout->get_shapes;
		3306
		3307	for (@w) {
		3308	my ($dx, $dy) = splice @s, 0, 2, ();
		3309
		3310	$_->{x} = $dx + $para->{indent};
		3311	$_->{y} = $dy + $y - $y0;
		3312
		3313	$_->draw;
		3314	}
		3315	}
2645	}	3316	}
2646		3317
2647	$y += $h;	3318	$paridx++;
		3319	$top_paragraph ||= $paridx if $y >= $top;
2648	}	3320	}
2649		3321
2650	glDisable GL_BLEND;	3322	$self->{top_paragraph} = $top_paragraph;
2651	};	3323	};
2652	});	3324	});
		3325	}
		3326
		3327	sub reconfigure {
		3328	my ($self) = @_;
		3329
		3330	$self->SUPER::reconfigure;
		3331
		3332	$_->{w} = 1e10 for @{ $self->{par} };
		3333	$self->reflow;
2653	}	3334	}
2654		3335
2655	sub _draw {	3336	sub _draw {
2656	my ($self) = @_;	3337	my ($self) = @_;
2657		3338
…		…
2660	glColor 0, 0, 0, 1;	3341	glColor 0, 0, 0, 1;
2661	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3342	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662	glDisable GL_TEXTURE_2D;	3343	glDisable GL_TEXTURE_2D;
2663		3344
2664	$self->{children}[1]->draw;	3345	$self->{children}[1]->draw;
2665
2666	}	3346	}
2667		3347
2668	#############################################################################	3348	#############################################################################
2669		3349
2670	package CFClient::UI::Animator;	3350	package CFPlus::UI::Animator;
2671		3351
2672	use CFClient::OpenGL;	3352	use CFPlus::OpenGL;
2673		3353
2674	our @ISA = CFClient::UI::Bin::;	3354	our @ISA = CFPlus::UI::Bin::;
2675		3355
2676	sub moveto {	3356	sub moveto {
2677	my ($self, $x, $y) = @_;	3357	my ($self, $x, $y) = @_;
2678		3358
2679	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3359	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2707	glPopMatrix;	3387	glPopMatrix;
2708	}	3388	}
2709		3389
2710	#############################################################################	3390	#############################################################################
2711		3391
2712	package CFClient::UI::Flopper;	3392	package CFPlus::UI::Flopper;
2713		3393
2714	our @ISA = CFClient::UI::Button::;	3394	our @ISA = CFPlus::UI::Button::;
2715		3395
2716	sub new {	3396	sub new {
2717	my $class = shift;	3397	my $class = shift;
2718		3398
2719	my $self = $class->SUPER::new (	3399	my $self = $class->SUPER::new (
…		…
2731	$self->{other}->toggle_visibility;	3411	$self->{other}->toggle_visibility;
2732	}	3412	}
2733		3413
2734	#############################################################################	3414	#############################################################################
2735		3415
2736	package CFClient::UI::Tooltip;	3416	package CFPlus::UI::Tooltip;
2737		3417
2738	our @ISA = CFClient::UI::Bin::;	3418	our @ISA = CFPlus::UI::Bin::;
2739		3419
2740	use CFClient::OpenGL;	3420	use CFPlus::OpenGL;
2741		3421
2742	sub new {	3422	sub new {
2743	my $class = shift;	3423	my $class = shift;
2744		3424
2745	$class->SUPER::new (	3425	$class->SUPER::new (
…		…
2748	)	3428	)
2749	}	3429	}
2750		3430
2751	sub set_tooltip_from {	3431	sub set_tooltip_from {
2752	my ($self, $widget) = @_;	3432	my ($self, $widget) = @_;
		3433
		3434	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3435	if $widget->{tooltip} =~ /^#(.*)$/;
2753		3436
2754	my $tooltip = $widget->{tooltip};	3437	my $tooltip = $widget->{tooltip};
2755		3438
2756	if ($ENV{CFPLUS_DEBUG} & 2) {	3439	if ($ENV{CFPLUS_DEBUG} & 2) {
2757	$tooltip .= "\n\n" . (ref $widget) . "\n"	3440	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2761	}	3444	}
2762		3445
2763	$tooltip =~ s/^\n+//;	3446	$tooltip =~ s/^\n+//;
2764	$tooltip =~ s/\n+$//;	3447	$tooltip =~ s/\n+$//;
2765		3448
2766	$self->add (new CFClient::UI::Label	3449	$self->add (new CFPlus::UI::Label
2767	markup => $tooltip,	3450	markup => $tooltip,
2768	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3451	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769	fontsize => 0.8,	3452	fontsize => 0.8,
2770	fg => [0, 0, 0, 1],	3453	style => 1, # FLAG_INVERSE
2771	ellipsise => 0,	3454	ellipsise => 0,
2772	font => ($widget->{tooltip_font} || $::FONT_PROP),	3455	font => ($widget->{tooltip_font} || $::FONT_PROP),
2773	);	3456	);
2774	}	3457	}
2775		3458
…		…
2779	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3462	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780		3463
2781	($w + 4, $h + 4)	3464	($w + 4, $h + 4)
2782	}	3465	}
2783		3466
2784	sub size_allocate {	3467	sub invoke_size_allocate {
2785	my ($self, $w, $h) = @_;	3468	my ($self, $w, $h) = @_;
2786		3469
2787	$self->SUPER::size_allocate ($w - 4, $h - 4);	3470	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788	}	3471	}
2789		3472
2790	sub visibility_change {	3473	sub invoke_visibility_change {
2791	my ($self, $visible) = @_;	3474	my ($self, $visible) = @_;
2792		3475
2793	return unless $visible;	3476	return unless $visible;
2794		3477
2795	$self->{root}->on_post_alloc ("move_$self" => sub {	3478	$self->{root}->on_post_alloc ("move_$self" => sub {
2796	my $widget = $self->{owner}	3479	my $widget = $self->{owner}
2797	or return;	3480	or return;
2798		3481
		3482	if ($widget->{visible}) {
2799	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3483	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800		3484
2801	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3485	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802	if $x + $self->{w} > $self->{root}{w};	3486	if $x + $self->{w} > $self->{root}{w};
2803		3487
2804	$self->move_abs ($x, $y);	3488	$self->move_abs ($x, $y);
		3489	} else {
		3490	$self->hide;
		3491	}
2805	});	3492	});
2806	}	3493	}
2807		3494
2808	sub _draw {	3495	sub _draw {
2809	my ($self) = @_;	3496	my ($self) = @_;
…		…
2811	glTranslate 0.375, 0.375;	3498	glTranslate 0.375, 0.375;
2812		3499
2813	my ($w, $h) = @$self{qw(w h)};	3500	my ($w, $h) = @$self{qw(w h)};
2814		3501
2815	glColor 1, 0.8, 0.4;	3502	glColor 1, 0.8, 0.4;
2816	glBegin GL_QUADS;	3503	glRect 0, 0, $w, $h;
2817	glVertex 0 , 0;
2818	glVertex 0 , $h;
2819	glVertex $w, $h;
2820	glVertex $w, 0;
2821	glEnd;
2822		3504
2823	glColor 0, 0, 0;	3505	glColor 0, 0, 0;
2824	glBegin GL_LINE_LOOP;	3506	glBegin GL_LINE_LOOP;
2825	glVertex 0 , 0;	3507	glVertex 0 , 0;
2826	glVertex 0 , $h;	3508	glVertex 0 , $h;
…		…
2833	$self->SUPER::_draw;	3515	$self->SUPER::_draw;
2834	}	3516	}
2835		3517
2836	#############################################################################	3518	#############################################################################
2837		3519
2838	package CFClient::UI::Face;	3520	package CFPlus::UI::Face;
2839		3521
2840	our @ISA = CFClient::UI::Base::;	3522	our @ISA = CFPlus::UI::DrawBG::;
2841		3523
2842	use CFClient::OpenGL;	3524	use CFPlus::OpenGL;
2843		3525
2844	sub new {	3526	sub new {
2845	my $class = shift;	3527	my $class = shift;
2846		3528
2847	my $self = $class->SUPER::new (	3529	my $self = $class->SUPER::new (
		3530	size_w => 32,
		3531	size_h => 8,
2848	aspect => 1,	3532	aspect => 1,
2849	can_events => 0,	3533	can_events => 0,
2850	@_,	3534	@_,
2851	);	3535	);
2852		3536
2853	if ($self->{anim} && $self->{animspeed}) {	3537	if ($self->{anim} && $self->{animspeed}) {
2854	Scalar::Util::weaken (my $widget = $self);	3538	CFPlus::weaken (my $widget = $self);
2855		3539
		3540	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3541	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2856	$self->{timer} = Event->timer (	3542	$self->{timer} = Event->timer (
2857	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2858	hard => 1,	3543	parked => 1,
2859	interval => $self->{animspeed},
2860	cb => sub {	3544	cb => sub {
		3545	return unless $::CONN && $widget;
		3546
2861	++$widget->{frame};	3547	++$widget->{frame};
		3548	$widget->update_face;
2862	$widget->update;	3549	$widget->update;
		3550
		3551	$widget->update_timer;
2863	},	3552	},
2864	);	3553	);
		3554
		3555	$self->update_face;
		3556	$self->update_timer;
2865	}	3557	}
2866		3558
2867	$self	3559	$self
2868	}	3560	}
2869		3561
		3562	sub update_timer {
		3563	my ($self) = @_;
		3564
		3565	return unless $self->{timer};
		3566
		3567	if ($self->{visible}) {
		3568	$self->{timer}->at (
		3569	$self->{anim_start}
		3570	+ $self->{animspeed}
		3571	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3572	);
		3573	$self->{timer}->start;
		3574	} else {
		3575	$self->{timer}->stop;
		3576	}
		3577	}
		3578
		3579	sub update_face {
		3580	my ($self) = @_;
		3581
		3582	return unless $::CONN;
		3583
		3584	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3585	if ($anim && @$anim) {
		3586	delete $self->{wait_face};
		3587	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3588	$self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
		3589	}
		3590	}
		3591	}
		3592
2870	sub size_request {	3593	sub size_request {
2871	(32, 8)	3594	my ($self) = @_;
		3595
		3596	if ($::CONN) {
		3597	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3598	if (my $tex = $::CONN->{texture}[$faceid]) {
		3599	$self->{tex} = $tex;
		3600	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3601	} else {
		3602	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3603	$self->realloc;
		3604	});
		3605	}
		3606	}
		3607	}
		3608
		3609	($self->{size_w} || 8, $self->{size_h} || 8)
2872	}	3610	}
2873		3611
2874	sub update {	3612	sub update {
2875	my ($self) = @_;	3613	my ($self) = @_;
2876		3614
2877	return unless $self->{visible};	3615	return unless $self->{visible};
2878		3616
2879	$self->SUPER::update;	3617	$self->SUPER::update;
2880	}	3618	}
2881		3619
		3620	sub invoke_visibility_change {
		3621	my ($self) = @_;
		3622
		3623	$self->update_timer;
		3624
		3625	0
		3626	}
		3627
2882	sub _draw {	3628	sub _draw {
2883	my ($self) = @_;	3629	my ($self) = @_;
2884		3630
2885	return unless $::CONN;	3631	$self->SUPER::_draw;
2886		3632
2887	my $face;	3633	if (my $tex = $self->{tex}) {
2888
2889	if ($self->{frame}) {
2890	my $anim = $::CONN->{anim}[$self->{anim}];
2891
2892	$face = $anim->[ $self->{frame} % @$anim ]
2893	if $anim && @$anim;
2894	}
2895
2896	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2897
2898	if ($tex) {
2899	glEnable GL_TEXTURE_2D;	3634	glEnable GL_TEXTURE_2D;
2900	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3635	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2901	glColor 0, 0, 0, 1;	3636	glColor 0, 0, 0, 1;
2902	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3637	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2903	glDisable GL_TEXTURE_2D;	3638	glDisable GL_TEXTURE_2D;
…		…
2905	}	3640	}
2906		3641
2907	sub destroy {	3642	sub destroy {
2908	my ($self) = @_;	3643	my ($self) = @_;
2909		3644
2910	$self->{timer}->cancel	3645	(delete $self->{timer})->cancel
2911	if $self->{timer};	3646	if $self->{timer};
2912		3647
2913	$self->SUPER::destroy;	3648	$self->SUPER::destroy;
2914	}	3649	}
2915		3650
2916	#############################################################################	3651	#############################################################################
2917		3652
2918	package CFClient::UI::Buttonbar;	3653	package CFPlus::UI::Buttonbar;
2919		3654
2920	our @ISA = CFClient::UI::HBox::;	3655	our @ISA = CFPlus::UI::HBox::;
2921		3656
2922	# TODO: should actualyl wrap buttons and other goodies.	3657	# TODO: should actually wrap buttons and other goodies.
2923		3658
2924	#############################################################################	3659	#############################################################################
2925		3660
2926	package CFClient::UI::Menu;	3661	package CFPlus::UI::Menu;
2927		3662
2928	our @ISA = CFClient::UI::FancyFrame::;	3663	our @ISA = CFPlus::UI::Toplevel::;
2929		3664
2930	use CFClient::OpenGL;	3665	use CFPlus::OpenGL;
2931		3666
2932	sub new {	3667	sub new {
2933	my $class = shift;	3668	my $class = shift;
2934		3669
2935	my $self = $class->SUPER::new (	3670	my $self = $class->SUPER::new (
2936	items => [],	3671	items => [],
2937	z => 100,	3672	z => 100,
2938	@_,	3673	@_,
2939	);	3674	);
2940		3675
2941	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3676	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942		3677
2943	for my $item (@{ $self->{items} }) {	3678	for my $item (@{ $self->{items} }) {
2944	my ($widget, $cb, $tooltip) = @$item;	3679	my ($widget, $cb, $tooltip) = @$item;
2945		3680
2946	# handle various types of items, only text for now	3681	# handle various types of items, only text for now
2947	if (!ref $widget) {	3682	if (!ref $widget) {
		3683	if ($widget =~ /\t/) {
		3684	my ($left, $right) = split /\t/, $widget, 2;
		3685
2948	$widget = new CFClient::UI::Label	3686	$widget = new CFPlus::UI::HBox
2949	can_hover => 1,	3687	can_hover => 1,
2950	can_events => 1,	3688	can_events => 1,
		3689	tooltip => $tooltip,
		3690	children => [
		3691	(new CFPlus::UI::Label markup => $left, expand => 1),
		3692	(new CFPlus::UI::Label markup => $right, align => +1),
		3693	],
		3694	;
		3695
		3696	} else {
		3697	$widget = new CFPlus::UI::Label
		3698	can_hover => 1,
		3699	can_events => 1,
2951	markup => $widget,	3700	markup => $widget,
2952	tooltip => $tooltip	3701	tooltip => $tooltip;
		3702	}
2953	}	3703	}
2954		3704
2955	$self->{item}{$widget} = $item;	3705	$self->{item}{$widget} = $item;
2956		3706
2957	$self->{vbox}->add ($widget);	3707	$self->{vbox}->add ($widget);
…		…
2962		3712
2963	# popup given the event (must be a mouse button down event currently)	3713	# popup given the event (must be a mouse button down event currently)
2964	sub popup {	3714	sub popup {
2965	my ($self, $ev) = @_;	3715	my ($self, $ev) = @_;
2966		3716
2967	$self->_emit ("popdown");	3717	$self->emit ("popdown");
2968		3718
2969	# maybe save $GRAB? must be careful about events...	3719	# maybe save $GRAB? must be careful about events...
2970	$GRAB = $self;	3720	$GRAB = $self;
2971	$self->{button} = $ev->{button};	3721	$self->{button} = $ev->{button};
2972		3722
2973	$self->show;	3723	$self->show;
2974	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3724	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975	}	3725	}
2976		3726
2977	sub mouse_motion {	3727	sub invoke_mouse_motion {
2978	my ($self, $ev, $x, $y) = @_;	3728	my ($self, $ev, $x, $y) = @_;
2979		3729
2980	# TODO: should use vbox->find_widget or so	3730	# TODO: should use vbox->find_widget or so
2981	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3731	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982	$self->{hover} = $self->{item}{$HOVER};	3732	$self->{hover} = $self->{item}{$HOVER};
2983		3733
2984	0	3734	0
2985	}	3735	}
2986		3736
2987	sub button_up {	3737	sub invoke_button_up {
2988	my ($self, $ev, $x, $y) = @_;	3738	my ($self, $ev, $x, $y) = @_;
2989		3739
2990	if ($ev->{button} == $self->{button}) {	3740	if ($ev->{button} == $self->{button}) {
2991	undef $GRAB;	3741	undef $GRAB;
2992	$self->hide;	3742	$self->hide;
2993		3743
2994	$self->_emit ("popdown");	3744	$self->emit ("popdown");
2995	$self->{hover}[1]->() if $self->{hover};	3745	$self->{hover}[1]->() if $self->{hover};
2996	} else {	3746	} else {
2997	return 0	3747	return 0
2998	}	3748	}
2999		3749
3000	1	3750	1
3001	}	3751	}
3002		3752
3003	#############################################################################	3753	#############################################################################
3004		3754
3005	package CFClient::UI::Multiplexer;	3755	package CFPlus::UI::Multiplexer;
3006		3756
3007	our @ISA = CFClient::UI::Container::;	3757	our @ISA = CFPlus::UI::Container::;
3008		3758
3009	sub new {	3759	sub new {
3010	my $class = shift;	3760	my $class = shift;
3011		3761
3012	my $self = $class->SUPER::new (	3762	my $self = $class->SUPER::new (
…		…
3026		3776
3027	$self->{current} = $self->{children}[0]	3777	$self->{current} = $self->{children}[0]
3028	if @{ $self->{children} };	3778	if @{ $self->{children} };
3029	}	3779	}
3030		3780
		3781	sub get_current_page {
		3782	my ($self) = @_;
		3783
		3784	$self->{current}
		3785	}
		3786
3031	sub set_current_page {	3787	sub set_current_page {
3032	my ($self, $page_or_widget) = @_;	3788	my ($self, $page_or_widget) = @_;
3033		3789
3034	my $widget = ref $page_or_widget	3790	my $widget = ref $page_or_widget
3035	? $page_or_widget	3791	? $page_or_widget
3036	: $self->{children}[$page_or_widget];	3792	: $self->{children}[$page_or_widget];
3037		3793
3038	$self->{current} = $widget;	3794	$self->{current} = $widget;
3039	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3795	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040		3796
3041	$self->_emit (page_changed => $self->{current});	3797	$self->emit (page_changed => $self->{current});
3042		3798
3043	$self->realloc;	3799	$self->realloc;
3044	}	3800	}
3045		3801
3046	sub visible_children {	3802	sub visible_children {
…		…
3051	my ($self) = @_;	3807	my ($self) = @_;
3052		3808
3053	$self->{current}->size_request	3809	$self->{current}->size_request
3054	}	3810	}
3055		3811
3056	sub size_allocate {	3812	sub invoke_size_allocate {
3057	my ($self, $w, $h) = @_;	3813	my ($self, $w, $h) = @_;
3058		3814
3059	$self->{current}->configure (0, 0, $w, $h);	3815	$self->{current}->configure (0, 0, $w, $h);
		3816
		3817	1
3060	}	3818	}
3061		3819
3062	sub _draw {	3820	sub _draw {
3063	my ($self) = @_;	3821	my ($self) = @_;
3064		3822
3065	$self->{current}->draw;	3823	$self->{current}->draw;
3066	}	3824	}
3067		3825
3068	#############################################################################	3826	#############################################################################
3069		3827
3070	package CFClient::UI::Notebook;	3828	package CFPlus::UI::Notebook;
3071		3829
3072	our @ISA = CFClient::UI::VBox::;	3830	our @ISA = CFPlus::UI::VBox::;
3073		3831
3074	sub new {	3832	sub new {
3075	my $class = shift;	3833	my $class = shift;
3076		3834
3077	my $self = $class->SUPER::new (	3835	my $self = $class->SUPER::new (
3078	buttonbar => (new CFClient::UI::Buttonbar),	3836	buttonbar => (new CFPlus::UI::Buttonbar),
3079	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3837	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080	# filter => # will be put between multiplexer and $self	3838	# filter => # will be put between multiplexer and $self
3081	@_,	3839	@_,
3082	);	3840	);
3083		3841
3084	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3842	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3085	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3843	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3086		3844
		3845	{
		3846	Scalar::Util::weaken (my $wself = $self);
		3847
		3848	$self->{multiplexer}->connect (c_add => sub {
		3849	my ($mplex, $widgets) = @_;
		3850
		3851	for my $child (@$widgets) {
		3852	Scalar::Util::weaken $child;
		3853	$child->{c_tab_} ||= do {
		3854	my $tab =
		3855	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3856	? $child->{c_tab}
		3857	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3858
		3859	$tab->connect (activate => sub {
		3860	$wself->set_current_page ($child);
		3861	});
		3862
		3863	$tab
		3864	};
		3865
		3866	$self->{buttonbar}->add ($child->{c_tab_});
		3867	}
		3868	});
		3869
		3870	$self->{multiplexer}->connect (c_remove => sub {
		3871	my ($mplex, $widgets) = @_;
		3872
		3873	for my $child (@$widgets) {
		3874	$wself->{buttonbar}->remove ($child->{c_tab_});
		3875	}
		3876	});
		3877	}
		3878
3087	$self	3879	$self
3088	}	3880	}
3089		3881
3090	sub add {	3882	sub add {
		3883	my ($self, @widgets) = @_;
		3884
		3885	$self->{multiplexer}->add (@widgets)
		3886	}
		3887
		3888	sub remove {
		3889	my ($self, @widgets) = @_;
		3890
		3891	$self->{multiplexer}->remove (@widgets)
		3892	}
		3893
		3894	sub pages {
		3895	my ($self) = @_;
		3896	$self->{multiplexer}->children
		3897	}
		3898
		3899	sub add_tab {
3091	my ($self, $title, $widget, $tooltip) = @_;	3900	my ($self, $title, $widget, $tooltip) = @_;
3092		3901
3093	Scalar::Util::weaken $self;	3902	$title = [$title, $tooltip] unless ref $title;
		3903	$widget->{c_tab} = $title;
3094		3904
3095	$self->{buttonbar}->add (new CFClient::UI::Button
3096	markup => $title,
3097	tooltip => $tooltip,
3098	on_activate => sub { $self->set_current_page ($widget) },
3099	);
3100
3101	$self->{multiplexer}->add ($widget);	3905	$self->add ($widget);
		3906	}
		3907
		3908	sub get_current_page {
		3909	my ($self) = @_;
		3910
		3911	$self->{multiplexer}->get_current_page
3102	}	3912	}
3103		3913
3104	sub set_current_page {	3914	sub set_current_page {
3105	my ($self, $page) = @_;	3915	my ($self, $page) = @_;
3106		3916
3107	$self->{multiplexer}->set_current_page ($page);	3917	$self->{multiplexer}->set_current_page ($page);
3108	$self->_emit (page_changed => $self->{multiplexer}{current});	3918	$self->emit (page_changed => $self->{multiplexer}{current});
3109	}	3919	}
3110		3920
3111	#############################################################################	3921	#############################################################################
3112		3922
3113	package CFClient::UI::Combobox;	3923	package CFPlus::UI::Selector;
3114		3924
3115	use utf8;	3925	use utf8;
3116		3926
3117	our @ISA = CFClient::UI::Button::;	3927	our @ISA = CFPlus::UI::Button::;
3118		3928
3119	sub new {	3929	sub new {
3120	my $class = shift;	3930	my $class = shift;
3121		3931
3122	my $self = $class->SUPER::new (	3932	my $self = $class->SUPER::new (
…		…
3128	$self->_set_value ($self->{value});	3938	$self->_set_value ($self->{value});
3129		3939
3130	$self	3940	$self
3131	}	3941	}
3132		3942
3133	sub button_down {	3943	sub invoke_button_down {
3134	my ($self, $ev) = @_;	3944	my ($self, $ev) = @_;
3135		3945
3136	my @menu_items;	3946	my @menu_items;
3137		3947
3138	for (@{ $self->{options} }) {	3948	for (@{ $self->{options} }) {
3139	my ($value, $title, $tooltip) = @$_;	3949	my ($value, $title, $tooltip) = @$_;
3140		3950
3141	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3951	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142	}	3952	}
3143		3953
3144	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3954	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145	}	3955	}
3146		3956
3147	sub _set_value {	3957	sub _set_value {
3148	my ($self, $value) = @_;	3958	my ($self, $value) = @_;
3149		3959
…		…
3159	my ($self, $value) = @_;	3969	my ($self, $value) = @_;
3160		3970
3161	return unless $self->{value} ne $value;	3971	return unless $self->{value} ne $value;
3162		3972
3163	$self->_set_value ($value);	3973	$self->_set_value ($value);
3164	$self->_emit (changed => $value);	3974	$self->emit (changed => $value);
3165	}	3975	}
3166		3976
3167	#############################################################################	3977	#############################################################################
3168		3978
3169	package CFClient::UI::Statusbox;	3979	package CFPlus::UI::Statusbox;
3170		3980
3171	our @ISA = CFClient::UI::VBox::;	3981	our @ISA = CFPlus::UI::VBox::;
3172		3982
3173	sub new {	3983	sub new {
3174	my $class = shift;	3984	my $class = shift;
3175		3985
3176	my $self = $class->SUPER::new (	3986	my $self = $class->SUPER::new (
3177	fontsize => 0.8,	3987	fontsize => 0.8,
3178	@_,	3988	@_,
3179	);	3989	);
3180		3990
3181	Scalar::Util::weaken (my $this = $self);	3991	CFPlus::weaken (my $this = $self);
3182		3992
3183	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3993	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184		3994
3185	$self	3995	$self
3186	}	3996	}
…		…
3188	sub reorder {	3998	sub reorder {
3189	my ($self) = @_;	3999	my ($self) = @_;
3190	my $NOW = Time::HiRes::time;	4000	my $NOW = Time::HiRes::time;
3191		4001
3192	# freeze display when hovering over any label	4002	# freeze display when hovering over any label
3193	return if $CFClient::UI::TOOLTIP->{owner}	4003	return if $CFPlus::UI::TOOLTIP->{owner}
3194	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4004	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195	values %{ $self->{item} };	4005	values %{ $self->{item} };
3196		4006
3197	while (my ($k, $v) = each %{ $self->{item} }) {	4007	while (my ($k, $v) = each %{ $self->{item} }) {
3198	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4008	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199	}	4009	}
…		…
3220	for ($short) {	4030	for ($short) {
3221	s/^\s+//;	4031	s/^\s+//;
3222	s/\s+/ /g;	4032	s/\s+/ /g;
3223	}	4033	}
3224		4034
3225	new CFClient::UI::Label	4035	new CFPlus::UI::Label
3226	markup => $short,	4036	markup => $short,
3227	tooltip => $item->{tooltip},	4037	tooltip => $item->{tooltip},
3228	tooltip_font => $::FONT_PROP,	4038	tooltip_font => $::FONT_PROP,
3229	tooltip_width => 0.67,	4039	tooltip_width => 0.67,
3230	fontsize => $item->{fontsize} || $self->{fontsize},	4040	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3284	count => 1,	4094	count => 1,
3285	%arg,	4095	%arg,
3286	};	4096	};
3287	}	4097	}
3288		4098
		4099	$ROOT->on_refresh (reorder => sub {
3289	$self->reorder;	4100	$self->reorder;
		4101	});
3290	}	4102	}
3291		4103
3292	sub reconfigure {	4104	sub reconfigure {
3293	my ($self) = @_;	4105	my ($self) = @_;
3294		4106
…		…
3307	$self->SUPER::destroy;	4119	$self->SUPER::destroy;
3308	}	4120	}
3309		4121
3310	#############################################################################	4122	#############################################################################
3311		4123
3312	package CFClient::UI::Inventory;
3313
3314	our @ISA = CFClient::UI::ScrolledWindow::;
3315
3316	sub new {
3317	my $class = shift;
3318
3319	my $self = $class->SUPER::new (
3320	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321	@_,
3322	);
3323
3324	$self
3325	}
3326
3327	sub set_items {
3328	my ($self, $items) = @_;
3329
3330	$self->{child}->clear;
3331	return unless $items;
3332
3333	my @items = sort {
3334	($a->{type} <=> $b->{type})
3335	or ($a->{name} cmp $b->{name})
3336	} @$items;
3337
3338	$self->{real_items} = \@items;
3339
3340	my $row = 0;
3341	for my $item (@items) {
3342	CFClient::Item::update_widgets $item;
3343
3344	$self->{child}->add (0, $row, $item->{face_widget});
3345	$self->{child}->add (1, $row, $item->{desc_widget});
3346	$self->{child}->add (2, $row, $item->{weight_widget});
3347
3348	$row++;
3349	}
3350	}
3351
3352	#############################################################################
3353
3354	package CFClient::UI::BindEditor;
3355
3356	our @ISA = CFClient::UI::FancyFrame::;
3357
3358	sub new {
3359	my $class = shift;
3360
3361	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363	$self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367	text => "start recording",
3368	tooltip => "Start/Stops recording of actions."
3369	."All subsequent actions after the recording started will be captured."
3370	."The actions are displayed after the record was stopped."
3371	."To bind the action you have to click on the 'Bind' button",
3372	on_activate => sub {
3373	unless ($self->{recording}) {
3374	$self->start;
3375	} else {
3376	$self->stop;
3377	}
3378	});
3379
3380	$vb->add (new CFClient::UI::Label text => "Actions:");
3381	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3384	$vb->add (my $hb = new CFClient::UI::HBox);
3385	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386	$hb->add (new CFClient::UI::Button
3387	text => "bind",
3388	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389	on_activate => sub {
3390	$self->ask_for_bind;
3391	});
3392
3393	$vb->add (my $hb = new CFClient::UI::HBox);
3394	$hb->add (new CFClient::UI::Button
3395	text => "ok",
3396	expand => 1,
3397	tooltip => "This closes the binding editor and saves the binding",
3398	on_activate => sub {
3399	$self->hide;
3400	$self->commit;
3401	});
3402
3403	$hb->add (new CFClient::UI::Button
3404	text => "cancel",
3405	expand => 1,
3406	tooltip => "This closes the binding editor without saving",
3407	on_activate => sub {
3408	$self->hide;
3409	$self->{binding_cancel}->()
3410	if $self->{binding_cancel};
3411	});
3412
3413	$self->update_binding_widgets;
3414
3415	$self
3416	}
3417
3418	sub commit {
3419	my ($self) = @_;
3420	my ($mod, $sym, $cmds) = $self->get_binding;
3421	if ($sym != 0 && @$cmds > 0) {
3422	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423	."'. Don't forget 'Save Config'!");
3424	$self->{binding_change}->($mod, $sym, $cmds)
3425	if $self->{binding_change};
3426	} else {
3427	$::STATUSBOX->add ("No action bound, no key or action specified!");
3428	$self->{binding_cancel}->()
3429	if $self->{binding_cancel};
3430	}
3431	}
3432
3433	sub start {
3434	my ($self) = @_;
3435
3436	$self->{rec_btn}->set_text ("stop recording");
3437	$self->{recording} = 1;
3438	$self->clear_command_list;
3439	$::CONN->start_record if $::CONN;
3440	}
3441
3442	sub stop {
3443	my ($self) = @_;
3444
3445	$self->{rec_btn}->set_text ("start recording");
3446	$self->{recording} = 0;
3447
3448	my $rec;
3449	$rec = $::CONN->stop_record if $::CONN;
3450	return unless ref $rec eq 'ARRAY';
3451	$self->set_command_list ($rec);
3452	}
3453
3454
3455	sub ask_for_bind_and_commit {
3456	my ($self) = @_;
3457	$self->ask_for_bind (1);
3458	}
3459
3460	sub ask_for_bind {
3461	my ($self, $commit) = @_;
3462
3463	CFClient::Binder::open_binding_dialog (sub {
3464	my ($mod, $sym) = @_;
3465	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466	$self->update_binding_widgets;
3467	$self->commit if $commit;
3468	});
3469	}
3470
3471	# $mod and $sym are the modifiers and key symbol
3472	# $cmds is a array ref of strings (the commands)
3473	# $cb is the callback that is executed on OK
3474	# $ccb is the callback that is executed on CANCEL and
3475	# when the binding was unsuccessful on OK
3476	sub set_binding {
3477	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479	$self->clear_command_list;
3480	$self->{recording} = 0;
3481	$self->{rec_btn}->set_text ("start recording");
3482
3483	$self->{binding} = [$mod, $sym];
3484	$self->{commands} = $cmds;
3485
3486	$self->{binding_change} = $cb;
3487	$self->{binding_cancel} = $ccb;
3488
3489	$self->update_binding_widgets;
3490	}
3491
3492	# this is a shortcut method that asks for a binding
3493	# and then just binds it.
3494	sub do_quick_binding {
3495	my ($self, $cmds) = @_;
3496	$self->set_binding (undef, undef, $cmds, sub {
3497	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498	});
3499	$self->ask_for_bind (1);
3500	}
3501
3502	sub update_binding_widgets {
3503	my ($self) = @_;
3504	my ($mod, $sym, $cmds) = $self->get_binding;
3505	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506	$self->set_command_list ($cmds);
3507	}
3508
3509	sub get_binding {
3510	my ($self) = @_;
3511	return (
3512	$self->{binding}->[0],
3513	$self->{binding}->[1],
3514	[ grep { defined $_ } @{$self->{commands}} ]
3515	);
3516	}
3517
3518	sub clear_command_list {
3519	my ($self) = @_;
3520	$self->{cmdbox}->clear ();
3521	}
3522
3523	sub set_command_list {
3524	my ($self, $cmds) = @_;
3525
3526	$self->{cmdbox}->clear ();
3527	$self->{commands} = $cmds;
3528
3529	my $idx = 0;
3530
3531	for (@$cmds) {
3532	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534	my $i = $idx;
3535	$hb->add (new CFClient::UI::Label text => $_);
3536	$hb->add (new CFClient::UI::Button
3537	text => "delete",
3538	tooltip => "Deletes the action from the record",
3539	on_activate => sub {
3540	$self->{cmdbox}->remove ($hb);
3541	$cmds->[$i] = undef;
3542	});
3543
3544
3545	$idx++
3546	}
3547	}
3548
3549	#############################################################################
3550
3551	package CFClient::UI::SpellList;
3552
3553	our @ISA = CFClient::UI::Table::;
3554
3555	sub new {
3556	my $class = shift;
3557
3558	my $self = $class->SUPER::new (
3559	binding => [],
3560	commands => [],
3561	@_,
3562	)
3563	}
3564
3565	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578	sub rebuild_spell_list {
3579	my ($self) = @_;
3580
3581	$CFClient::UI::ROOT->on_refresh ($self => sub {
3582	$self->clear;
3583
3584	return unless $::CONN;
3585
3586	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592	my $row = 0;
3593
3594	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595	my $spell = $self->{spell}{$_};
3596
3597	$row++;
3598
3599	my $spell_cb = sub {
3600	my ($widget, $ev) = @_;
3601
3602	if ($ev->{button} == 1) {
3603	$::CONN->user_send ("cast $spell->{name}");
3604	} elsif ($ev->{button} == 2) {
3605	$::CONN->user_send ("invoke $spell->{name}");
3606	} elsif ($ev->{button} == 3) {
3607	(new CFClient::UI::Menu
3608	items => [
3609	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611	],
3612	)->popup ($ev);
3613	} else {
3614	return 0;
3615	}
3616
3617	1
3618	};
3619
3620	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622	#TODO: add path info to tooltip
3623	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625	$self->add (0, $row, new CFClient::UI::Face
3626	face => $spell->{face},
3627	can_hover => 1,
3628	can_events => 1,
3629	tooltip => $tooltip,
3630	on_button_down => $spell_cb,
3631	);
3632
3633	$self->add (1, $row, new CFClient::UI::Label
3634	expand => 1,
3635	text => $spell->{name},
3636	can_hover => 1,
3637	can_events => 1,
3638	tooltip => $tooltip,
3639	on_button_down => $spell_cb,
3640	);
3641
3642	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646	}
3647	});
3648	}
3649
3650	sub add_spell {
3651	my ($self, $spell) = @_;
3652
3653	$self->{spell}->{$spell->{name}} = $spell;
3654	$self->rebuild_spell_list;
3655	}
3656
3657	sub remove_spell {
3658	my ($self, $spell) = @_;
3659
3660	delete $self->{spell}->{$spell->{name}};
3661	$self->rebuild_spell_list;
3662	}
3663
3664	sub clear_spells {
3665	my ($self) = @_;
3666
3667	$self->{spell} = {};
3668	$self->rebuild_spell_list;
3669	}
3670
3671	#############################################################################
3672
3673	package CFClient::UI::Root;	4124	package CFPlus::UI::Root;
3674		4125
3675	our @ISA = CFClient::UI::Container::;	4126	our @ISA = CFPlus::UI::Container::;
3676		4127
3677	use List::Util qw(min max);	4128	use List::Util qw(min max);
3678		4129
3679	use CFClient::OpenGL;	4130	use CFPlus::OpenGL;
3680		4131
3681	sub new {	4132	sub new {
3682	my $class = shift;	4133	my $class = shift;
3683		4134
3684	my $self = $class->SUPER::new (	4135	my $self = $class->SUPER::new (
3685	visible => 1,	4136	visible => 1,
3686	@_,	4137	@_,
3687	);	4138	);
3688		4139
3689	Scalar::Util::weaken ($self->{root} = $self);	4140	CFPlus::weaken ($self->{root} = $self);
3690		4141
3691	$self	4142	$self
3692	}	4143	}
3693		4144
3694	sub size_request {	4145	sub size_request {
…		…
3709	$coord = $max - $size if $coord > $max - $size;	4160	$coord = $max - $size if $coord > $max - $size;
3710		4161
3711	int $coord + 0.5	4162	int $coord + 0.5
3712	}	4163	}
3713		4164
3714	sub size_allocate {	4165	sub invoke_size_allocate {
3715	my ($self, $w, $h) = @_;	4166	my ($self, $w, $h) = @_;
3716		4167
3717	for my $child ($self->children) {	4168	for my $child ($self->children) {
3718	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4169	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719		4170
…		…
3723	$X = _to_pixel $X, $W, $self->{w};	4174	$X = _to_pixel $X, $W, $self->{w};
3724	$Y = _to_pixel $Y, $H, $self->{h};	4175	$Y = _to_pixel $Y, $H, $self->{h};
3725		4176
3726	$child->configure ($X, $Y, $W, $H);	4177	$child->configure ($X, $Y, $W, $H);
3727	}	4178	}
		4179
		4180	1
3728	}	4181	}
3729		4182
3730	sub coord2local {	4183	sub coord2local {
3731	my ($self, $x, $y) = @_;	4184	my ($self, $x, $y) = @_;
3732		4185
…		…
3787	while ($self->{refresh_hook}) {	4240	while ($self->{refresh_hook}) {
3788	$_->()	4241	$_->()
3789	for values %{delete $self->{refresh_hook}};	4242	for values %{delete $self->{refresh_hook}};
3790	}	4243	}
3791		4244
3792	if ($self->{realloc}) {	4245	while ($self->{realloc}) {
3793	my %queue;	4246	my %queue;
3794	my @queue;	4247	my @queue;
3795	my $widget;	4248	my $widget;
3796		4249
3797	outer:	4250	outer:
…		…
3844	}	4297	}
3845	}	4298	}
3846		4299
3847	delete $self->{realloc}{$widget+0};	4300	delete $self->{realloc}{$widget+0};
3848	}	4301	}
3849	}
3850		4302
3851	while (my $size_alloc = delete $self->{size_alloc}) {	4303	while (my $size_alloc = delete $self->{size_alloc}) {
3852	my @queue = sort { $b->{visible} <=> $a->{visible} }	4304	my @queue = sort { $a->{visible} <=> $b->{visible} }
3853	values %$size_alloc;	4305	values %$size_alloc;
3854		4306
3855	while () {	4307	while () {
3856	my $widget = pop @queue || last;	4308	my $widget = pop @queue || last;
3857		4309
3858	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4310	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859		4311
3860	$w = 0 if $w < 0;	4312	$w = max $widget->{min_w}, $w;
3861	$h = 0 if $h < 0;	4313	$h = max $widget->{min_h}, $h;
3862		4314
		4315	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4316	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4317
		4318	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4319	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4320
3863	$w = int $w + 0.5;	4321	$w = int $w + 0.5;
3864	$h = int $h + 0.5;	4322	$h = int $h + 0.5;
3865		4323
3866	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4324	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867	$widget->{old_w} = $widget->{w};	4325	$widget->{old_w} = $widget->{w};
3868	$widget->{old_h} = $widget->{h};	4326	$widget->{old_h} = $widget->{h};
3869		4327
3870	$widget->{w} = $w;	4328	$widget->{w} = $w;
3871	$widget->{h} = $h;	4329	$widget->{h} = $h;
3872		4330
3873	$widget->emit (size_allocate => $w, $h);	4331	$widget->emit (size_allocate => $w, $h);
		4332	}
3874	}	4333	}
3875	}	4334	}
3876	}	4335	}
3877		4336
3878	while ($self->{post_alloc_hook}) {	4337	while ($self->{post_alloc_hook}) {
3879	$_->()	4338	$_->()
3880	for values %{delete $self->{post_alloc_hook}};	4339	for values %{delete $self->{post_alloc_hook}};
3881	}	4340	}
3882
3883		4341
3884	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4342	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3885	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4343	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3886	glClear GL_COLOR_BUFFER_BIT;	4344	glClear GL_COLOR_BUFFER_BIT;
3887		4345
…		…
3890	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4348	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891	glMatrixMode GL_MODELVIEW;	4349	glMatrixMode GL_MODELVIEW;
3892	glLoadIdentity;	4350	glLoadIdentity;
3893		4351
3894	{	4352	{
3895	package CFClient::UI::Base;	4353	package CFPlus::UI::Base;
3896		4354
3897	($draw_x, $draw_y, $draw_w, $draw_h) =	4355	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3898	(0, 0, $self->{w}, $self->{h});	4356	(0, 0, $self->{w}, $self->{h});
3899	}
3900		4357
3901	$self->_draw;	4358	$self->_draw;
		4359	}
3902	}	4360	}
3903		4361
3904	#############################################################################	4362	#############################################################################
3905		4363
3906	package CFClient::UI;	4364	package CFPlus::UI;
3907		4365
3908	$ROOT = new CFClient::UI::Root;	4366	$ROOT = new CFPlus::UI::Root;
3909	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4367	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910		4368
3911	1	4369	1
3912		4370

Diff Legend

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