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

Diff Legend

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