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.298 by root, Wed Jun 7 07:00:30 2006 UTC vs.
Revision 1.417 by root, Tue Jul 24 18:24:04 2007 UTC

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

Diff Legend

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