ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

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

Diff Legend

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