ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.265 by root, Thu Jun 1 02:59:46 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 2007 UTC

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

Diff Legend

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