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

Diff Legend

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