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

Diff Legend

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