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

Diff Legend

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