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

Diff Legend

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