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

Diff Legend

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