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

Diff Legend

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