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

Diff Legend

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