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

Diff Legend

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