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

Diff Legend

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