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.287 by root, Mon Jun 5 05:31:13 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

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

Diff Legend

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