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.312 by root, Fri Jun 23 23:54:30 2006 UTC vs.
Revision 1.404 by root, Sat Jul 21 22:54:52 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->emit ("focus_out"); 320 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
288} 322}
… …
290sub set_visibility { 324sub set_visibility {
291 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
292 326
293 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
294 328
295 $visible ? $self->hide 329 $visible ? $self->show
296 : $self->show; 330 : $self->hide;
297} 331}
298 332
299sub toggle_visibility { 333sub toggle_visibility {
300 my ($self) = @_; 334 my ($self) = @_;
301 335
… …
345 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
346 380
347 if ($self->{aspect}) { 381 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
349 383
350 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 386
353 # use alignment to adjust x, y 387 # use alignment to adjust x, y
354 388
355 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
397 431
398 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
399 433
400 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
401 435
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 439 }
406} 440}
407 441
408# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
409sub coord2local { 443sub coord2local {
410 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
411 445
446 Carp::confess unless $self->{parent};#d#
447
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 449}
414 450
415# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
416sub coord2global { 452sub coord2global {
417 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
418 454
455 Carp::confess unless $self->{parent};#d#
456
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 458}
421 459
422sub invoke_focus_in { 460sub invoke_focus_in {
423 my ($self) = @_; 461 my ($self) = @_;
424 462
425 return if $FOCUS == $self; 463 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
427 465
428 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
429 467
430 $focus->update if $focus; 468 $self->update;
431 $FOCUS->update;
432 469
433 0 470 0
434} 471}
435 472
436sub invoke_focus_out { 473sub invoke_focus_out {
437 my ($self) = @_; 474 my ($self) = @_;
438 475
439 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
440 477
441 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
442 479
443 $focus->update if $focus; #? 480 $self->update;
444 481
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 483 unless $FOCUS;
447 484
448 0 485 0
449} 486}
450 487
451sub grab_focus { 488sub grab_focus {
452 my ($self) = @_; 489 my ($self) = @_;
453 490
491 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 492 $self->emit ("focus_in");
455} 493}
456 494
457sub invoke_mouse_motion { 1 } 495sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 496sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 497sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
461 500
462sub invoke_button_down { 501sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
464 503
465 $self->grab_focus; 504 $self->grab_focus;
466 505
467 1 506 0
468} 507}
469 508
470sub connect { 509sub connect {
471 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
472 511
473 push @{ $self->{signal_cb}{$signal} }, $cb; 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 }
474} 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);
475 532
476sub emit { 533sub emit {
477 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
478 535
479 #d##TODO# stop propagating at first true, do not use sum 536 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 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
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 554}
484 555
485sub find_widget { 556#sub find_widget {
486 my ($self, $x, $y) = @_; 557# in .xs
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496 558
497sub set_parent { 559sub set_parent {
498 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
499 561
500 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
502} 564}
503 565
504sub realloc { 566sub realloc {
505 my ($self) = @_; 567 my ($self) = @_;
… …
531 593
532# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless. 595# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535 597
536sub draw { 598#sub draw {
537 my ($self) = @_; 599#CFPlus.xs
538
539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
548
549 glPushMatrix;
550 glTranslate $self->{x}, $self->{y}, 0;
551
552 if ($self == $HOVER && $self->{can_hover}) {
553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
554 glEnable GL_BLEND;
555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
556 glBegin GL_QUADS;
557 glVertex 0 , 0;
558 glVertex $self->{w}, 0;
559 glVertex $self->{w}, $self->{h};
560 glVertex 0 , $self->{h};
561 glEnd;
562 glDisable GL_BLEND;
563 }
564
565 if ($ENV{CFPLUS_DEBUG} & 1) {
566 glPushMatrix;
567 glColor 1, 1, 0, 1;
568 glTranslate 0.375, 0.375;
569 glBegin GL_LINE_LOOP;
570 glVertex 0 , 0;
571 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1;
574 glEnd;
575 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 }
578
579 $self->_draw;
580 glPopMatrix;
581}
582 600
583sub _draw { 601sub _draw {
584 my ($self) = @_; 602 my ($self) = @_;
585 603
586 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
587} 605}
588 606
589sub DESTROY { 607sub DESTROY {
590 my ($self) = @_; 608 my ($self) = @_;
591 609
592 delete $WIDGET{$self+0}; 610 return if CFPlus::in_destruct;
593 611
594 eval { $self->destroy }; 612 eval { $self->destroy };
595 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};
596} 616}
597 617
598############################################################################# 618#############################################################################
599 619
600package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
601 621
602our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
603 623
604use strict; 624use strict;
605use CFClient::OpenGL; 625use CFPlus::OpenGL;
606 626
607sub new { 627sub new {
608 my $class = shift; 628 my $class = shift;
609 629
610 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
641 } 661 }
642} 662}
643 663
644############################################################################# 664#############################################################################
645 665
646package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
647 667
648our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
649 669
650sub new { 670sub new {
651 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
653} 673}
… …
660 680
661sub draw { } 681sub draw { }
662 682
663############################################################################# 683#############################################################################
664 684
665package CFClient::UI::Container; 685package CFPlus::UI::Container;
666 686
667our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
668 688
669sub new { 689sub new {
670 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
671 691
672 my $children = delete $arg{children}; 692 my $children = delete $arg{children};
… …
676 can_events => 0, 696 can_events => 0,
677 %arg, 697 %arg,
678 ); 698 );
679 699
680 $self->add (@$children) 700 $self->add (@$children)
681 if $children; 701 if $children && @$children;
682 702
683 $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;
684} 712}
685 713
686sub add { 714sub add {
687 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
688 716
689 $_->set_parent ($self) 717 $_->set_parent ($self)
690 for @widgets; 718 for @widgets;
691 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
692 use sort 'stable'; 721 use sort 'stable';
693 722
694 $self->{children} = [ 723 $self->{children} = [
695 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
696 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
697 ]; 726 ];
698 727
699 $self->realloc; 728 $self->realloc;
729
730 map $_+0, @widgets
700} 731}
701 732
702sub children { 733sub children {
703 @{ $_[0]{children} } 734 @{ $_[0]{children} }
704} 735}
… …
715} 746}
716 747
717sub clear { 748sub clear {
718 my ($self) = @_; 749 my ($self) = @_;
719 750
720 my $children = delete $self->{children}; 751 my $children = $self->{children};
721 $self->{children} = []; 752 $self->{children} = [];
722 753
723 for (@$children) { 754 for (@$children) {
724 delete $_->{parent}; 755 delete $_->{parent};
725 $_->hide; 756 $_->hide;
… …
750 $_->draw for @{$self->{children}}; 781 $_->draw for @{$self->{children}};
751} 782}
752 783
753############################################################################# 784#############################################################################
754 785
755package CFClient::UI::Bin; 786package CFPlus::UI::Bin;
756 787
757our @ISA = CFClient::UI::Container::; 788our @ISA = CFPlus::UI::Container::;
758 789
759sub new { 790sub new {
760 my ($class, %arg) = @_; 791 my ($class, %arg) = @_;
761 792
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 794
764 $class->SUPER::new (children => [$child], %arg) 795 $class->SUPER::new (children => [$child], %arg)
765} 796}
766 797
767sub add { 798sub add {
… …
774sub remove { 805sub remove {
775 my ($self, $widget) = @_; 806 my ($self, $widget) = @_;
776 807
777 $self->SUPER::remove ($widget); 808 $self->SUPER::remove ($widget);
778 809
779 $self->{children} = [new CFClient::UI::Empty] 810 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 811 unless @{$self->{children}};
781} 812}
782 813
783sub child { $_[0]->{children}[0] } 814sub child { $_[0]->{children}[0] }
784 815
… …
796 827
797############################################################################# 828#############################################################################
798 829
799# back-buffered drawing area 830# back-buffered drawing area
800 831
801package CFClient::UI::Window; 832package CFPlus::UI::Window;
802 833
803our @ISA = CFClient::UI::Bin::; 834our @ISA = CFPlus::UI::Bin::;
804 835
805use CFClient::OpenGL; 836use CFPlus::OpenGL;
806 837
807sub new { 838sub new {
808 my ($class, %arg) = @_; 839 my ($class, %arg) = @_;
809 840
810 my $self = $class->SUPER::new (%arg); 841 my $self = $class->SUPER::new (%arg);
… …
832} 863}
833 864
834sub render_child { 865sub render_child {
835 my ($self) = @_; 866 my ($self) = @_;
836 867
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 868 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 869 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 870 glClear GL_COLOR_BUFFER_BIT;
840 871
841 { 872 {
842 package CFClient::UI::Base; 873 package CFPlus::UI::Base;
843 874
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 875 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 876 (0, 0, $self->{w}, $self->{h});
877
878 $self->_render;
846 } 879 }
847
848 $self->_render;
849 }; 880 };
850} 881}
851 882
852sub _draw { 883sub _draw {
853 my ($self) = @_; 884 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 885
857 my $tex = $self->{texture} 886 my $tex = $self->{texture}
858 or return; 887 or return;
859 888
860 glEnable GL_TEXTURE_2D; 889 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 891 glColor 0, 0, 0, 1;
863 892
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 893 $tex->draw_quad_alpha_premultiplied (0, 0);
865 894
866 glDisable GL_TEXTURE_2D; 895 glDisable GL_TEXTURE_2D;
867} 896}
868 897
869############################################################################# 898#############################################################################
870 899
871package CFClient::UI::ViewPort; 900package CFPlus::UI::ViewPort;
872 901
902use List::Util qw(min max);
903
873our @ISA = CFClient::UI::Window::; 904our @ISA = CFPlus::UI::Window::;
874 905
875sub new { 906sub new {
876 my $class = shift; 907 my $class = shift;
877 908
878 $class->SUPER::new ( 909 $class->SUPER::new (
… …
885sub size_request { 916sub size_request {
886 my ($self) = @_; 917 my ($self) = @_;
887 918
888 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889 920
890 $w = 10 if $self->{scroll_x}; 921 $w = 1 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y}; 922 $h = 1 if $self->{scroll_y};
892 923
893 ($w, $h) 924 ($w, $h)
894} 925}
895 926
896sub invoke_size_allocate { 927sub invoke_size_allocate {
… …
908} 939}
909 940
910sub set_offset { 941sub set_offset {
911 my ($self, $x, $y) = @_; 942 my ($self, $x, $y) = @_;
912 943
944 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
945 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
946
947 if ($x != $self->{view_x} or $y != $self->{view_y}) {
913 $self->{view_x} = int $x; 948 $self->{view_x} = $x;
914 $self->{view_y} = int $y; 949 $self->{view_y} = $y;
915 950
951 $self->emit (changed => $x, $y);
916 $self->update; 952 $self->update;
953 }
917} 954}
918 955
919# hmm, this does not work for topleft of $self... but we should not ask for that 956# hmm, this does not work for topleft of $self... but we should not ask for that
920sub coord2local { 957sub coord2local {
921 my ($self, $x, $y) = @_; 958 my ($self, $x, $y) = @_;
… …
936 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
937 974
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 976 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 977 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 979 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 980 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 981 }
945} 982}
946 983
947sub _render { 984sub _render {
948 my ($self) = @_; 985 my ($self) = @_;
949 986
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 987 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}; 988 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 989
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 991
955 $self->SUPER::_render; 992 $self->SUPER::_render;
956} 993}
957 994
958############################################################################# 995#############################################################################
959 996
960package CFClient::UI::ScrolledWindow; 997package CFPlus::UI::ScrolledWindow;
961 998
962our @ISA = CFClient::UI::HBox::; 999our @ISA = CFPlus::UI::Table::;
963 1000
964sub new { 1001sub new {
965 my ($class, %arg) = @_; 1002 my ($class, %arg) = @_;
966 1003
967 my $child = delete $arg{child}; 1004 my $child = delete $arg{child};
968 1005
969 my $self; 1006 my $self;
970 1007
971 my $slider = new CFClient::UI::Slider 1008 my $hslider = new CFPlus::UI::Slider
1009 col => 0,
1010 row => 1,
1011 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub {
1014 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 },
1017 ;
1018
1019 my $vslider = new CFPlus::UI::Slider
1020 col => 1,
1021 row => 0,
972 vertical => 1, 1022 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1024 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1025 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1027 },
977 ; 1028 ;
978 1029
979 $self = $class->SUPER::new ( 1030 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1031 scroll_x => 0,
1032 scroll_y => 1,
1033 can_events => 1,
981 slider => $slider, 1034 hslider => $hslider,
1035 vslider => $vslider,
1036 col_expand => [1, 0],
1037 row_expand => [1, 0],
982 %arg, 1038 %arg,
983 ); 1039 );
984 1040
1041 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0,
1043 row => 0,
1044 expand => 1,
1045 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y},
1047 on_changed => sub {
1048 my ($vp, $x, $y) = @_;
1049
1050 $vp->{parent}{hslider}->set_value ($x);
1051 $vp->{parent}{vslider}->set_value ($y);
1052
1053 0
1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1058 0
1059 },
1060 ;
1061
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1062 $self->SUPER::add ($self->{vp});
1063
986 $self->add ($child) if $child; 1064 $self->add ($child) if $child;
987 1065
988 $self 1066 $self
989} 1067}
990 1068
… …
992 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
993 1071
994 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
995} 1073}
996 1074
997sub update { 1075sub update_slider {
1076 my ($self) = @_;
1077
1078 my $child = ($self->{vp} or return)->child;
1079
1080 if ($self->{scroll_x}) {
1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1083
1084 my $visible = $w1 > $w2;
1085 if ($visible != $self->{hslider_visible}) {
1086 $self->{hslider_visible} = $visible;
1087 $visible ? $self->SUPER::add ($self->{hslider})
1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1090 }
1091
1092 if ($self->{scroll_y}) {
1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1095
1096 my $visible = $h1 > $h2;
1097 if ($visible != $self->{vslider_visible}) {
1098 $self->{vslider_visible} = $visible;
1099 $visible ? $self->SUPER::add ($self->{vslider})
1100 : $self->SUPER::remove ($self->{vslider});
1101 }
1102 }
1103}
1104
1105sub start_dragging {
998 my ($self) = @_; 1106 my ($self, $ev) = @_;
999 1107
1000 $self->SUPER::update; 1108 $self->grab_focus;
1001 1109
1002 # todo: overwrite size_allocate of child 1110 my $ox = $self->{vp}{view_x};
1003 my $child = $self->{vp}->child; 1111 my $oy = $self->{vp}{view_y};
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1112
1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
1115
1116 $ox -= $ev->{xrel};
1117 $oy -= $ev->{yrel};
1118
1119 $self->{vp}->set_offset ($ox, $oy);
1120 };
1121}
1122
1123sub invoke_mouse_wheel {
1124 my ($self, $ev) = @_;
1125
1126 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1127 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1128
1129 1
1130}
1131
1132sub invoke_button_down {
1133 my ($self, $ev, $x, $y) = @_;
1134
1135 if ($ev->{button} == 2) {
1136 $self->start_dragging ($ev);
1137 return 1;
1138 }
1139
1140 0
1141}
1142
1143sub invoke_button_up {
1144 my ($self, $ev, $x, $y) = @_;
1145
1146 if (delete $self->{motion}) {
1147 return 1;
1148 }
1149
1150 0
1151}
1152
1153sub invoke_mouse_motion {
1154 my ($self, $ev, $x, $y) = @_;
1155
1156 if ($self->{motion}) {
1157 $self->{motion}->($ev, $x, $y);
1158 return 1;
1159 }
1160
1161 0
1005} 1162}
1006 1163
1007sub invoke_size_allocate { 1164sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1165 my ($self, $w, $h) = @_;
1009 1166
1010 my $child = $self->{vp}->child; 1167 $self->update_slider;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h) 1168 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1169}
1015 1170
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018
1019############################################################################# 1171#############################################################################
1020 1172
1021package CFClient::UI::Frame; 1173package CFPlus::UI::Frame;
1022 1174
1023our @ISA = CFClient::UI::Bin::; 1175our @ISA = CFPlus::UI::Bin::;
1024 1176
1025use CFClient::OpenGL; 1177use CFPlus::OpenGL;
1026 1178
1027sub new { 1179sub new {
1028 my $class = shift; 1180 my $class = shift;
1029 1181
1030 $class->SUPER::new ( 1182 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1208 $self->SUPER::_draw;
1057} 1209}
1058 1210
1059############################################################################# 1211#############################################################################
1060 1212
1061package CFClient::UI::FancyFrame; 1213package CFPlus::UI::FancyFrame;
1062 1214
1063our @ISA = CFClient::UI::Bin::; 1215our @ISA = CFPlus::UI::Bin::;
1064 1216
1065use CFClient::OpenGL; 1217use CFPlus::OpenGL;
1218
1219sub new {
1220 my ($class, %arg) = @_;
1221
1222 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label
1224 align => 1,
1225 valign => 0,
1226 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75;
1228 }
1229
1230 my $self = $class->SUPER::new (
1231 # label => "",
1232 fg => [0.6, 0.3, 0.1],
1233 border => 0.8,
1234 style => 'single',
1235 %arg,
1236 );
1237
1238 $self
1239}
1240
1241sub add {
1242 my ($self, @widgets) = @_;
1243
1244 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1246}
1247
1248sub border {
1249 int $_[0]{border} * $::FONTSIZE
1250}
1251
1252sub size_request {
1253 my ($self) = @_;
1254
1255 ($self->{label_w}, undef) = $self->{label}->size_request
1256 if $self->{label};
1257
1258 my ($w, $h) = $self->SUPER::size_request;
1259
1260 (
1261 $w + $self->border * 2,
1262 $h + $self->border * 2,
1263 )
1264}
1265
1266sub invoke_size_allocate {
1267 my ($self, $w, $h) = @_;
1268
1269 my $border = $self->border;
1270
1271 $w -= List::Util::max 0, $border * 2;
1272 $h -= List::Util::max 0, $border * 2;
1273
1274 if (my $label = $self->{label}) {
1275 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1276 $label->{h} = List::Util::min $h, $border;
1277 $label->invoke_size_allocate ($label->{w}, $label->{h});
1278 }
1279
1280 $self->child->configure ($border, $border, $w, $h);
1281
1282 1
1283}
1284
1285sub _draw {
1286 my ($self) = @_;
1287
1288 my $child = $self->{children}[0];
1289
1290 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h});
1292
1293 $child->draw;
1294
1295 glColor @{$self->{fg}};
1296 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1301 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1302 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1303 glEnd;
1304
1305 if ($self->{label}) {
1306 glTranslate $border * 2, 0;
1307 $self->{label}->_draw;
1308 }
1309}
1310
1311#############################################################################
1312
1313package CFPlus::UI::Toplevel;
1314
1315our @ISA = CFPlus::UI::Bin::;
1316
1317use CFPlus::OpenGL;
1066 1318
1067my $bg = 1319my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1321 mipmap => 1, wrap => 1;
1070 1322
1071my @border = 1323my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1324 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); 1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326
1327my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png);
1074 1330
1075sub new { 1331sub new {
1076 my ($class, %arg) = @_; 1332 my ($class, %arg) = @_;
1077 1333
1078 my $self = $class->SUPER::new ( 1334 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1335 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1336 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1337 border => 0.6,
1082 can_events => 1, 1338 can_events => 1,
1083 min_w => 16, 1339 min_w => 64,
1084 min_h => 16, 1340 min_h => 32,
1085 %arg, 1341 %arg,
1086 ); 1342 );
1087 1343
1088 $self->{title_widget} = new CFClient::UI::Label 1344 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1345 align => 0,
1090 valign => 1, 1346 valign => 1,
1091 text => $self->{title}, 1347 text => $self->{title},
1092 fontsize => $self->{border}, 1348 fontsize => $self->{border},
1093 if exists $self->{title}; 1349 if exists $self->{title};
1094 1350
1095 if ($self->{has_close_button}) { 1351 if ($self->{has_close_button}) {
1096 $self->{close_button} = 1352 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1353 new CFPlus::UI::ImageButton
1098 path => 'x1_close.png', 1354 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1355 on_activate => sub { $self->emit ("delete") };
1100 1356
1101 $self->CFClient::UI::Container::add ($self->{close_button}); 1357 $self->CFPlus::UI::Container::add ($self->{close_button});
1102 } 1358 }
1103 1359
1104 $self 1360 $self
1105} 1361}
1106 1362
1107sub add { 1363sub add {
1108 my ($self, @widgets) = @_; 1364 my ($self, @widgets) = @_;
1109 1365
1110 $self->SUPER::add (@widgets); 1366 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1367 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1368 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1369}
1114 1370
1115sub border { 1371sub border {
1116 int $_[0]{border} * $::FONTSIZE 1372 int $_[0]{border} * $::FONTSIZE
1117} 1373}
… …
1150 $self->child->configure ($border, $border, $w, $h); 1406 $self->child->configure ($border, $border, $w, $h);
1151 1407
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1408 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button}; 1409 if $self->{close_button};
1154 1410
1411 1
1412}
1413
1414sub invoke_delete {
1415 my ($self) = @_;
1416
1417 $self->hide;
1418
1155 1 1419 1
1156} 1420}
1157 1421
1158sub invoke_button_down { 1422sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1423 my ($self, $ev, $x, $y) = @_;
… …
1217 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1481 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218 1482
1219 ! ! $self->{motion} 1483 ! ! $self->{motion}
1220} 1484}
1221 1485
1486sub invoke_visibility_change {
1487 my ($self, $visible) = @_;
1488
1489 delete $self->{motion} unless $visible;
1490
1491 0
1492}
1493
1222sub _draw { 1494sub _draw {
1223 my ($self) = @_; 1495 my ($self) = @_;
1224 1496
1225 my $child = $self->{children}[0]; 1497 my $child = $self->{children}[0];
1226 1498
… …
1231 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1232 1504
1233 my $border = $self->border; 1505 my $border = $self->border;
1234 1506
1235 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
1236 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1237 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1238 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1239 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512
1513 # move
1514 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519
1520 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1240 1526
1241 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1242 glColor @{ $self->{bg} }; 1528 glColor @{ $self->{bg} };
1243 1529
1244 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
… …
1263 if $self->{close_button}; 1549 if $self->{close_button};
1264} 1550}
1265 1551
1266############################################################################# 1552#############################################################################
1267 1553
1268package CFClient::UI::Table; 1554package CFPlus::UI::Table;
1269 1555
1270our @ISA = CFClient::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1271 1557
1272use List::Util qw(max sum); 1558use List::Util qw(max sum);
1273 1559
1274use CFClient::OpenGL; 1560use CFPlus::OpenGL;
1275 1561
1276sub new { 1562sub new {
1277 my $class = shift; 1563 my $class = shift;
1278 1564
1279 $class->SUPER::new ( 1565 $class->SUPER::new (
1280 col_expand => [], 1566 col_expand => [],
1567 row_expand => [],
1281 @_, 1568 @_,
1282 ) 1569 )
1283} 1570}
1284 1571
1285sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287}
1288
1289sub add { 1572sub add {
1290 my ($self, $x, $y, $child) = @_; 1573 my ($self, @widgets) = @_;
1291 1574
1292 $child->set_parent ($self); 1575 for my $child (@widgets) {
1293 $self->{children}[$y][$x] = $child; 1576 $child->{rowspan} ||= 1;
1577 $child->{colspan} ||= 1;
1578 }
1294 1579
1295 $self->realloc; 1580 $self->SUPER::add (@widgets);
1296} 1581}
1297 1582
1298sub remove { 1583sub add_at {
1584 my $self = shift;
1585
1586 my @widgets;
1587
1588 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1590
1591 $child->{row} = $row;
1592 $child->{col} = $col;
1593
1594 push @widgets, $child;
1595 }
1596
1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1299 my ($self, $child) = @_; 1601 my ($self) = @_;
1300 1602
1301 # TODO: not yet implemented 1603 my (@w, @h);
1302}
1303
1304# TODO: move to container class maybe? send children a signal on removal?
1305sub clear {
1306 my ($self) = @_;
1307 1604
1308 my @children = $self->children; 1605 my @children = $self->children;
1309 delete $self->{children}; 1606
1607 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1610
1611 my $sw = sum @w[$c .. $c + $cs - 1];
1612
1613 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 }
1310 1616 }
1311 for (@children) {
1312 delete $_->{parent};
1313 $_->hide;
1314 }
1315 1617
1316 $self->realloc; 1618 # second pass, rows
1317} 1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1318
1319sub get_wh {
1320 my ($self) = @_;
1321
1322 my (@w, @h);
1323
1324 for my $y (0 .. $#{$self->{children}}) {
1325 my $row = $self->{children}[$y]
1326 or next;
1327
1328 for my $x (0 .. $#$row) {
1329 my $widget = $row->[$x]
1330 or next;
1331 my ($w, $h) = @$widget{qw(req_w req_h)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1332 1621
1333 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1334 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1335 } 1626 }
1336 } 1627 }
1337 1628
1338 (\@w, \@h) 1629 (\@w, \@h)
1339} 1630}
… …
1355 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1356 1647
1357 my $req_w = (sum @$ws) || 1; 1648 my $req_w = (sum @$ws) || 1;
1358 my $req_h = (sum @$hs) || 1; 1649 my $req_h = (sum @$hs) || 1;
1359 1650
1360 # TODO: nicer code && do row_expand 1651 # now linearly scale the rows/columns to the allocated size
1361 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1362 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1363 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1364 1655
1365 # linearly scale sizes
1366 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368 1657
1369 CFClient::UI::harmonize $ws; 1658 CFPlus::UI::harmonize $ws;
1659
1660 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1;
1663
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665
1370 CFClient::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1371 1667
1372 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1373 1670
1374 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1375 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1376 or next;
1377 1673
1378 my $x = 0; 1674 $widget->configure (
1379 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1380 1677 );
1381 for my $c (0 .. $#$row) { 1678 }
1382 my $col_w = $ws->[$c];
1383 1679
1384 if (my $widget = $row->[$c]) { 1680 1
1385 $widget->configure ($x, $y, $col_w, $row_h); 1681}
1386 }
1387 1682
1388 $x += $col_w; 1683#############################################################################
1684
1685package CFPlus::UI::Fixed;
1686
1687use List::Util qw(min max);
1688
1689our @ISA = CFPlus::UI::Container::;
1690
1691sub add_fixed {
1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695 $self->SUPER::add ($child);
1696}
1697
1698sub _scale($$$) {
1699 my ($mode, $val, $max) = @_;
1700
1701 $mode eq "abs" ? $val
1702 : $mode eq "rel" ? $val * $max
1703 : 0
1704}
1705
1706sub size_request {
1707 my ($self) = @_;
1708
1709 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710
1711 # determine overall size by querying abs widgets
1712 for my $child ($self->visible_children) {
1713 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1714
1715 if ($pos eq "abs") {
1716 $w = _scale $size, $w, $child->{req_w};
1717 $h = _scale $size, $h, $child->{req_h};
1718
1719 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1720 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1389 } 1721 }
1722 }
1390 1723
1391 $y += $row_h; 1724 my $W = $x2 - $x1;
1725 my $H = $y2 - $y1;
1726
1727 # now layout remaining widgets
1728 for my $child ($self->visible_children) {
1729 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1730
1731 if ($pos ne "abs") {
1732 $x = _scale $pos, $x, $W;
1733 $y = _scale $pos, $x, $H;
1734 $w = _scale $size, $w, $child->{req_w};
1735 $h = _scale $size, $h, $child->{req_h};
1736
1737 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1738 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1739 }
1740 }
1741
1742 my $W = $x2 - $x1;
1743 my $H = $y2 - $y1;
1744
1745 ($W, $H)
1746}
1747
1748sub invoke_size_allocate {
1749 my ($self, $W, $H) = @_;
1750
1751 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1753
1754 $x = _scale $pos, $x, $W;
1755 $y = _scale $pos, $x, $H;
1756 $w = _scale $size, $w, $W;
1757 $h = _scale $size, $h, $H;
1758
1759 $child->configure ($x, $y, $w, $h);
1392 } 1760 }
1393 1761
1394 1 1762 1
1395} 1763}
1396 1764
1397sub find_widget {
1398 my ($self, $x, $y) = @_;
1399
1400 $x -= $self->{x};
1401 $y -= $self->{y};
1402
1403 my $res;
1404
1405 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1406 $res = $_->find_widget ($x, $y)
1407 and return $res;
1408 }
1409
1410 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1411}
1412
1413sub _draw {
1414 my ($self) = @_;
1415
1416 for (grep $_, @{$self->{children}}) {
1417 $_->draw for grep $_, @$_;
1418 }
1419}
1420
1421############################################################################# 1765#############################################################################
1422 1766
1423package CFClient::UI::Box; 1767package CFPlus::UI::Box;
1424 1768
1425our @ISA = CFClient::UI::Container::; 1769our @ISA = CFPlus::UI::Container::;
1426 1770
1427sub size_request { 1771sub size_request {
1428 my ($self) = @_; 1772 my ($self) = @_;
1429 1773
1430 $self->{vertical} 1774 $self->{vertical}
… …
1463 $req[$_] += $space * $children[$_]{expand} 1807 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#children; 1808 for 0 .. $#children;
1465 } 1809 }
1466 } 1810 }
1467 1811
1468 CFClient::UI::harmonize \@req; 1812 CFPlus::UI::harmonize \@req;
1469 1813
1470 my $pos = 0; 1814 my $pos = 0;
1471 for (0 .. $#children) { 1815 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1816 my $alloc = $req[$_];
1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1817 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1478 1 1822 1
1479} 1823}
1480 1824
1481############################################################################# 1825#############################################################################
1482 1826
1483package CFClient::UI::HBox; 1827package CFPlus::UI::HBox;
1484 1828
1485our @ISA = CFClient::UI::Box::; 1829our @ISA = CFPlus::UI::Box::;
1486 1830
1487sub new { 1831sub new {
1488 my $class = shift; 1832 my $class = shift;
1489 1833
1490 $class->SUPER::new ( 1834 $class->SUPER::new (
… …
1493 ) 1837 )
1494} 1838}
1495 1839
1496############################################################################# 1840#############################################################################
1497 1841
1498package CFClient::UI::VBox; 1842package CFPlus::UI::VBox;
1499 1843
1500our @ISA = CFClient::UI::Box::; 1844our @ISA = CFPlus::UI::Box::;
1501 1845
1502sub new { 1846sub new {
1503 my $class = shift; 1847 my $class = shift;
1504 1848
1505 $class->SUPER::new ( 1849 $class->SUPER::new (
… …
1508 ) 1852 )
1509} 1853}
1510 1854
1511############################################################################# 1855#############################################################################
1512 1856
1513package CFClient::UI::Label; 1857package CFPlus::UI::Label;
1514 1858
1515our @ISA = CFClient::UI::DrawBG::; 1859our @ISA = CFPlus::UI::DrawBG::;
1516 1860
1517use CFClient::OpenGL; 1861use CFPlus::OpenGL;
1518 1862
1519sub new { 1863sub new {
1520 my ($class, %arg) = @_; 1864 my ($class, %arg) = @_;
1521 1865
1522 my $self = $class->SUPER::new ( 1866 my $self = $class->SUPER::new (
… …
1525 #active_bg => none 1869 #active_bg => none
1526 #font => default_font 1870 #font => default_font
1527 #text => initial text 1871 #text => initial text
1528 #markup => initial narkup 1872 #markup => initial narkup
1529 #max_w => maximum pixel width 1873 #max_w => maximum pixel width
1874 #style => 0, # render flags
1530 ellipsise => 3, # end 1875 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1876 layout => (new CFPlus::Layout),
1532 fontsize => 1, 1877 fontsize => 1,
1533 align => -1, 1878 align => -1,
1534 valign => -1, 1879 valign => -1,
1535 padding_x => 2, 1880 padding_x => 2,
1536 padding_y => 2, 1881 padding_y => 2,
1537 can_events => 0, 1882 can_events => 0,
1538 %arg 1883 %arg
1539 ); 1884 );
1540 1885
1541 if (exists $self->{template}) { 1886 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1887 my $layout = new CFPlus::Layout;
1543 $layout->set_text (delete $self->{template}); 1888 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1889 $self->{template} = $layout;
1545 } 1890 }
1546 1891
1547 if (exists $self->{markup}) { 1892 if (exists $self->{markup}) {
… …
1551 } 1896 }
1552 1897
1553 $self 1898 $self
1554} 1899}
1555 1900
1556sub escape($) {
1557 local $_ = $_[0];
1558
1559 s/&/&amp;/g;
1560 s/>/&gt;/g;
1561 s/</&lt;/g;
1562
1563 $_
1564}
1565
1566sub update { 1901sub update {
1567 my ($self) = @_; 1902 my ($self) = @_;
1568 1903
1569 delete $self->{texture}; 1904 delete $self->{texture};
1570 $self->SUPER::update; 1905 $self->SUPER::update;
… …
1581 my ($self, $text) = @_; 1916 my ($self, $text) = @_;
1582 1917
1583 return if $self->{text} eq "T$text"; 1918 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1919 $self->{text} = "T$text";
1585 1920
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1921 $self->{layout}->set_text ($text);
1588 1922
1589 delete $self->{size_req}; 1923 delete $self->{size_req};
1590 $self->realloc; 1924 $self->realloc;
1591 $self->update; 1925 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1931 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1932 $self->{text} = "M$markup";
1599 1933
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1934 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1935
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1936 $self->{layout}->set_markup ($markup);
1604 1937
1605 delete $self->{size_req}; 1938 delete $self->{size_req};
1606 $self->realloc; 1939 $self->realloc;
1607 $self->update; 1940 $self->update;
… …
1619 1952
1620 my ($w, $h) = $self->{layout}->size; 1953 my ($w, $h) = $self->{layout}->size;
1621 1954
1622 if (exists $self->{template}) { 1955 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 1956 $self->{template}->set_font ($self->{font}) if $self->{font};
1957 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1958 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1959
1626 my ($w2, $h2) = $self->{template}->size; 1960 my ($w2, $h2) = $self->{template}->size;
1627 1961
1628 $w = List::Util::max $w, $w2; 1962 $w = List::Util::max $w, $w2;
… …
1652 1986
1653sub set_fontsize { 1987sub set_fontsize {
1654 my ($self, $fontsize) = @_; 1988 my ($self, $fontsize) = @_;
1655 1989
1656 $self->{fontsize} = $fontsize; 1990 $self->{fontsize} = $fontsize;
1991 delete $self->{size_req};
1657 delete $self->{texture}; 1992 delete $self->{texture};
1658 1993
1659 $self->realloc; 1994 $self->realloc;
1660} 1995}
1661 1996
1662sub reconfigure { 1997sub reconfigure {
1663 my ($self) = @_; 1998 my ($self) = @_;
1664 1999
1665 delete $self->{size_req}; 2000 delete $self->{size_req};
2001 delete $self->{texture};
1666 2002
1667 $self->SUPER::reconfigure; 2003 $self->SUPER::reconfigure;
1668} 2004}
1669 2005
1670sub _draw { 2006sub _draw {
1671 my ($self) = @_; 2007 my ($self) = @_;
1672 2008
1673 $self->SUPER::_draw; # draw background, if applicable 2009 $self->SUPER::_draw; # draw background, if applicable
1674 2010
1675 my $tex = $self->{texture} ||= do { 2011 my $size = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}}); 2012 $self->{layout}->set_foreground (@{$self->{fg}});
1677 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2013 $self->{layout}->set_font ($self->{font}) if $self->{font};
1678 $self->{layout}->set_width ($self->{w}); 2014 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2015 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2016 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2017 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682 2018
1683 new_from_layout CFClient::Texture $self->{layout} 2019 [$self->{layout}->size]
1684 }; 2020 };
1685 2021
1686 unless (exists $self->{ox}) { 2022 unless (exists $self->{ox}) {
1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2023 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2024 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689 : ($self->{w} - $tex->{w}) * 0.5); 2025 : ($self->{w} - $size->[0]) * 0.5);
1690 2026
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
1694 }; 2030 };
1695 2031
1696 glEnable GL_TEXTURE_2D;
1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2032 my $w = List::Util::min $self->{w} + 4, $size->[0];
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2033 my $h = List::Util::min $self->{h} + 2, $size->[1];
1700 2034
1701 if ($tex->{format} == GL_ALPHA) { 2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1703 glColor @{$self->{fg}};
1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1708 }
1709
1710 glDisable GL_TEXTURE_2D;
1711} 2036}
1712 2037
1713############################################################################# 2038#############################################################################
1714 2039
1715package CFClient::UI::EntryBase; 2040package CFPlus::UI::EntryBase;
1716 2041
1717our @ISA = CFClient::UI::Label::; 2042our @ISA = CFPlus::UI::Label::;
1718 2043
1719use CFClient::OpenGL; 2044use CFPlus::OpenGL;
1720 2045
1721sub new { 2046sub new {
1722 my $class = shift; 2047 my $class = shift;
1723 2048
1724 $class->SUPER::new ( 2049 $class->SUPER::new (
… …
1728 active_fg => [0, 0, 0], 2053 active_fg => [0, 0, 0],
1729 can_hover => 1, 2054 can_hover => 1,
1730 can_focus => 1, 2055 can_focus => 1,
1731 valign => 0, 2056 valign => 0,
1732 can_events => 1, 2057 can_events => 1,
2058 ellipsise => 0,
1733 #text => ... 2059 #text => ...
1734 #hidden => "*", 2060 #hidden => "*",
1735 @_ 2061 @_
1736 ) 2062 )
1737} 2063}
… …
1782 my $sym = $ev->{sym}; 2108 my $sym = $ev->{sym};
1783 my $uni = $ev->{unicode}; 2109 my $uni = $ev->{unicode};
1784 2110
1785 my $text = $self->get_text; 2111 my $text = $self->get_text;
1786 2112
2113 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2114
1787 if ($uni == 8) { 2115 if ($uni == 8) {
1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2116 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789 } elsif ($uni == 127) { 2117 } elsif ($uni == 127) {
1790 substr $text, $self->{cursor}, 1, ""; 2118 substr $text, $self->{cursor}, 1, "";
1791 } elsif ($sym == CFClient::SDLK_LEFT) { 2119 } elsif ($sym == CFPlus::SDLK_LEFT) {
1792 --$self->{cursor} if $self->{cursor}; 2120 --$self->{cursor} if $self->{cursor};
1793 } elsif ($sym == CFClient::SDLK_RIGHT) { 2121 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1794 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2122 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1795 } elsif ($sym == CFClient::SDLK_HOME) { 2123 } elsif ($sym == CFPlus::SDLK_HOME) {
2124 # what a hack
2125 $self->{cursor} =
2126 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2127 ? length $1
2128 : 0;
2129 } elsif ($sym == CFPlus::SDLK_END) {
2130 # uh, again
2131 $self->{cursor} =
2132 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2133 ? $self->{cursor} + length $1
2134 : length $self->{text};
2135 } elsif ($uni == 21) { # ctrl-u
2136 $text = "";
1796 $self->{cursor} = 0; 2137 $self->{cursor} = 0;
1797 } elsif ($sym == CFClient::SDLK_END) {
1798 $self->{cursor} = length $text;
1799 } elsif ($uni == 27) { 2138 } elsif ($uni == 27) {
1800 $self->emit ('escape'); 2139 $self->emit ('escape');
1801 } elsif ($uni) { 2140 } elsif ($uni == 0x0d) {
2141 substr $text, $self->{cursor}++, 0, "\012";
2142 } elsif ($uni >= 0x20) {
1802 substr $text, $self->{cursor}++, 0, chr $uni; 2143 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else { 2144 } else {
1804 return 0; 2145 return 0;
1805 } 2146 }
1806 2147
1807 $self->_set_text ($text); 2148 $self->_set_text ($text);
1808 2149
1809 $self->realloc; 2150 $self->realloc;
2151 $self->update;
1810 2152
1811 1 2153 1
1812} 2154}
1813 2155
1814sub invoke_focus_in { 2156sub invoke_focus_in {
… …
1826 2168
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 2169 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 2170
1829 # byte-index to char-index 2171 # byte-index to char-index
1830 my $text = $self->{text}; 2172 my $text = $self->{text};
1831 utf8::encode $text; 2173 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 2174 $self->{cursor} = length $text;
1833 2175
1834 $self->_set_text ($self->{text}); 2176 $self->_set_text ($self->{text});
1835 $self->update; 2177 $self->update;
1836 2178
1837 1 2179 1
… …
1876 utf8::encode $text; 2218 utf8::encode $text;
1877 2219
1878 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2220 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879 } 2221 }
1880 2222
1881 glColor @{$self->{fg}};
1882 glBegin GL_LINES; 2223 glBegin GL_LINES;
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2224 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1884 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2225 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885 glEnd; 2226 glEnd;
1886 } 2227 }
1887} 2228}
1888 2229
2230#############################################################################
2231
1889package CFClient::UI::Entry; 2232package CFPlus::UI::Entry;
1890 2233
1891our @ISA = CFClient::UI::EntryBase::; 2234our @ISA = CFPlus::UI::EntryBase::;
1892 2235
1893use CFClient::OpenGL; 2236use CFPlus::OpenGL;
1894 2237
1895sub invoke_key_down { 2238sub invoke_key_down {
1896 my ($self, $ev) = @_; 2239 my ($self, $ev) = @_;
1897 2240
1898 my $sym = $ev->{sym}; 2241 my $sym = $ev->{sym};
1899 2242
1900 if ($sym == 13) { 2243 if ($ev->{uni} == 0x0d || $sym == 13) {
1901 unshift @{$self->{history}}, 2244 unshift @{$self->{history}},
1902 my $txt = $self->get_text; 2245 my $txt = $self->get_text;
1903 2246
1904 $self->{history_pointer} = -1; 2247 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = ''; 2248 $self->{history_saveback} = '';
1906 $self->emit (activate => $txt); 2249 $self->emit (activate => $txt);
1907 $self->update; 2250 $self->update;
1908 2251
1909 } elsif ($sym == CFClient::SDLK_UP) { 2252 } elsif ($sym == CFPlus::SDLK_UP) {
1910 if ($self->{history_pointer} < 0) { 2253 if ($self->{history_pointer} < 0) {
1911 $self->{history_saveback} = $self->get_text; 2254 $self->{history_saveback} = $self->get_text;
1912 } 2255 }
1913 if (@{$self->{history} || []} > 0) { 2256 if (@{$self->{history} || []} > 0) {
1914 $self->{history_pointer}++; 2257 $self->{history_pointer}++;
… …
1916 $self->{history_pointer} = @{$self->{history} || []} - 1; 2259 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 } 2260 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2261 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1919 } 2262 }
1920 2263
1921 } elsif ($sym == CFClient::SDLK_DOWN) { 2264 } elsif ($sym == CFPlus::SDLK_DOWN) {
1922 $self->{history_pointer}--; 2265 $self->{history_pointer}--;
1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2266 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924 2267
1925 if ($self->{history_pointer} >= 0) { 2268 if ($self->{history_pointer} >= 0) {
1926 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2269 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1935 1 2278 1
1936} 2279}
1937 2280
1938############################################################################# 2281#############################################################################
1939 2282
2283package CFPlus::UI::TextEdit;
2284
2285our @ISA = CFPlus::UI::EntryBase::;
2286
2287use CFPlus::OpenGL;
2288
2289sub move_cursor_ver {
2290 my ($self, $dy) = @_;
2291
2292 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2293
2294 $y += $dy;
2295
2296 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2297 $self->{cursor} = $index;
2298 delete $self->{cur_h};
2299 $self->update;
2300 return;
2301 }
2302}
2303
2304sub invoke_key_down {
2305 my ($self, $ev) = @_;
2306
2307 my $sym = $ev->{sym};
2308
2309 if ($sym == CFPlus::SDLK_UP) {
2310 $self->move_cursor_ver (-1);
2311 } elsif ($sym == CFPlus::SDLK_DOWN) {
2312 $self->move_cursor_ver (+1);
2313 } else {
2314 return $self->SUPER::invoke_key_down ($ev)
2315 }
2316
2317 1
2318}
2319
2320#############################################################################
2321
1940package CFClient::UI::Button; 2322package CFPlus::UI::Button;
1941 2323
1942our @ISA = CFClient::UI::Label::; 2324our @ISA = CFPlus::UI::Label::;
1943 2325
1944use CFClient::OpenGL; 2326use CFPlus::OpenGL;
1945 2327
1946my @tex = 2328my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2329 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(b1_button_active.png); 2330 qw(b1_button_inactive.png b1_button_active.png);
1949 2331
1950sub new { 2332sub new {
1951 my $class = shift; 2333 my $class = shift;
1952 2334
1953 $class->SUPER::new ( 2335 $class->SUPER::new (
1954 padding_x => 4, 2336 padding_x => 4,
1955 padding_y => 4, 2337 padding_y => 4,
1956 fg => [1, 1, 1], 2338 fg => [1.0, 1.0, 1.0],
1957 active_fg => [0, 0, 1], 2339 active_fg => [0.8, 0.8, 0.8],
1958 can_hover => 1, 2340 can_hover => 1,
1959 align => 0, 2341 align => 0,
1960 valign => 0, 2342 valign => 0,
1961 can_events => 1, 2343 can_events => 1,
1962 @_ 2344 @_
… …
1980 2362
1981 glEnable GL_TEXTURE_2D; 2363 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2364 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 glColor 0, 0, 0, 1; 2365 glColor 0, 0, 0, 1;
1984 2366
2367 my $tex = $tex[$GRAB == $self];
1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2368 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1986 2369
1987 glDisable GL_TEXTURE_2D; 2370 glDisable GL_TEXTURE_2D;
1988 2371
1989 $self->SUPER::_draw; 2372 $self->SUPER::_draw;
1990} 2373}
1991 2374
1992############################################################################# 2375#############################################################################
1993 2376
2377package CFPlus::UI::CheckBox;
2378
2379our @ISA = CFPlus::UI::DrawBG::;
2380
2381my @tex =
2382 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2383 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2384
2385use CFPlus::OpenGL;
2386
2387sub new {
2388 my $class = shift;
2389
2390 $class->SUPER::new (
2391 padding_x => 2,
2392 padding_y => 2,
2393 fg => [1, 1, 1],
2394 active_fg => [1, 1, 0],
2395 bg => [0, 0, 0, 0.2],
2396 active_bg => [1, 1, 1, 0.5],
2397 state => 0,
2398 can_hover => 1,
2399 @_
2400 )
2401}
2402
2403sub size_request {
2404 my ($self) = @_;
2405
2406 (6) x 2
2407}
2408
2409sub toggle {
2410 my ($self) = @_;
2411
2412 $self->{state} = !$self->{state};
2413 $self->emit (changed => $self->{state});
2414 $self->update;
2415}
2416
2417sub invoke_button_down {
2418 my ($self, $ev, $x, $y) = @_;
2419
2420 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2421 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2422 $self->toggle;
2423 } else {
2424 return 0
2425 }
2426
2427 1
2428}
2429
2430sub _draw {
2431 my ($self) = @_;
2432
2433 $self->SUPER::_draw;
2434
2435 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2436
2437 my ($w, $h) = @$self{qw(w h)};
2438
2439 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2440
2441 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2442
2443 my $tex = $self->{state} ? $tex[1] : $tex[0];
2444
2445 glEnable GL_TEXTURE_2D;
2446 $tex->draw_quad_alpha (0, 0, $s, $s);
2447 glDisable GL_TEXTURE_2D;
2448}
2449
2450#############################################################################
2451
2452package CFPlus::UI::Image;
2453
2454our @ISA = CFPlus::UI::Base::;
2455
2456use CFPlus::OpenGL;
2457
2458our %texture_cache;
2459
2460sub new {
2461 my $class = shift;
2462
2463 my $self = $class->SUPER::new (
2464 can_events => 0,
2465 @_,
2466 );
2467
2468 $self->{path} || $self->{tex}
2469 or Carp::croak "'path' or 'tex' attributes required";
2470
2471 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2472 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2473
2474 CFPlus::weaken $texture_cache{$self->{path}};
2475
2476 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2477
2478 $self
2479}
2480
2481sub STORABLE_freeze {
2482 my ($self, $cloning) = @_;
2483
2484 $self->{path}
2485 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2486
2487 $self->{path}
2488}
2489
2490sub STORABLE_attach {
2491 my ($self, $cloning, $path) = @_;
2492
2493 $self->new (path => $path)
2494}
2495
2496sub size_request {
2497 my ($self) = @_;
2498
2499 ($self->{tex}{w}, $self->{tex}{h})
2500}
2501
2502sub _draw {
2503 my ($self) = @_;
2504
2505 my $tex = $self->{tex};
2506
2507 my ($w, $h) = ($self->{w}, $self->{h});
2508
2509 if ($self->{rot90}) {
2510 glRotate 90, 0, 0, 1;
2511 glTranslate 0, -$self->{w}, 0;
2512
2513 ($w, $h) = ($h, $w);
2514 }
2515
2516 glEnable GL_TEXTURE_2D;
2517 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2518
2519 $tex->draw_quad (0, 0, $w, $h);
2520
2521 glDisable GL_TEXTURE_2D;
2522}
2523
2524#############################################################################
2525
1994package CFClient::UI::ImageButton; 2526package CFPlus::UI::ImageButton;
1995 2527
1996our @ISA = CFClient::UI::Image::; 2528our @ISA = CFPlus::UI::Image::;
1997 2529
1998use CFClient::OpenGL; 2530use CFPlus::OpenGL;
1999 2531
2000my %textures; 2532my %textures;
2001 2533
2002sub new { 2534sub new {
2003 my $class = shift; 2535 my $class = shift;
… …
2025 1 2557 1
2026} 2558}
2027 2559
2028############################################################################# 2560#############################################################################
2029 2561
2030package CFClient::UI::CheckBox;
2031
2032our @ISA = CFClient::UI::DrawBG::;
2033
2034my @tex =
2035 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2036 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037
2038use CFClient::OpenGL;
2039
2040sub new {
2041 my $class = shift;
2042
2043 $class->SUPER::new (
2044 padding_x => 2,
2045 padding_y => 2,
2046 fg => [1, 1, 1],
2047 active_fg => [1, 1, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
2050 state => 0,
2051 can_hover => 1,
2052 @_
2053 )
2054}
2055
2056sub size_request {
2057 my ($self) = @_;
2058
2059 (6) x 2
2060}
2061
2062sub invoke_button_down {
2063 my ($self, $ev, $x, $y) = @_;
2064
2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
2073 1
2074}
2075
2076sub _draw {
2077 my ($self) = @_;
2078
2079 $self->SUPER::_draw;
2080
2081 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2082
2083 my ($w, $h) = @$self{qw(w h)};
2084
2085 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2086
2087 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2088
2089 my $tex = $self->{state} ? $tex[1] : $tex[0];
2090
2091 glEnable GL_TEXTURE_2D;
2092 $tex->draw_quad_alpha (0, 0, $s, $s);
2093 glDisable GL_TEXTURE_2D;
2094}
2095
2096#############################################################################
2097
2098package CFClient::UI::Image; 2562package CFPlus::UI::VGauge;
2099 2563
2100our @ISA = CFClient::UI::Base::; 2564our @ISA = CFPlus::UI::Base::;
2101
2102use CFClient::OpenGL;
2103
2104our %texture_cache;
2105
2106sub new {
2107 my $class = shift;
2108
2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
2113
2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
2116
2117 $self->{tex} = $texture_cache{$self->{path}} ||=
2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2119
2120 Scalar::Util::weaken $texture_cache{$self->{path}};
2121
2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2123
2124 $self
2125}
2126
2127sub size_request {
2128 my ($self) = @_;
2129
2130 ($self->{tex}{w}, $self->{tex}{h})
2131}
2132
2133sub _draw {
2134 my ($self) = @_;
2135
2136 my $tex = $self->{tex};
2137
2138 my ($w, $h) = ($self->{w}, $self->{h});
2139
2140 if ($self->{rot90}) {
2141 glRotate 90, 0, 0, 1;
2142 glTranslate 0, -$self->{w}, 0;
2143
2144 ($w, $h) = ($h, $w);
2145 }
2146
2147 glEnable GL_TEXTURE_2D;
2148 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2149
2150 $tex->draw_quad_alpha (0, 0, $w, $h);
2151
2152 glDisable GL_TEXTURE_2D;
2153}
2154
2155#############################################################################
2156
2157package CFClient::UI::VGauge;
2158
2159our @ISA = CFClient::UI::Base::;
2160 2565
2161use List::Util qw(min max); 2566use List::Util qw(min max);
2162 2567
2163use CFClient::OpenGL; 2568use CFPlus::OpenGL;
2164 2569
2165my %tex = ( 2570my %tex = (
2166 food => [ 2571 food => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2572 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2573 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169 ], 2574 ],
2170 grace => [ 2575 grace => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2576 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2577 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173 ], 2578 ],
2174 hp => [ 2579 hp => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2580 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2581 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177 ], 2582 ],
2178 mana => [ 2583 mana => [
2179 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2584 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2180 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2585 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181 ], 2586 ],
2182); 2587);
2183 2588
2184# eg. VGauge->new (gauge => 'food'), default gauge: food 2589# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2244 my $ycut1 = max 0, min 1, $ycut; 2649 my $ycut1 = max 0, min 1, $ycut;
2245 my $ycut2 = max 0, min 1, $ycut - 1; 2650 my $ycut2 = max 0, min 1, $ycut - 1;
2246 2651
2247 my $h1 = $self->{h} * (1 - $ycut1); 2652 my $h1 = $self->{h} * (1 - $ycut1);
2248 my $h2 = $self->{h} * (1 - $ycut2); 2653 my $h2 = $self->{h} * (1 - $ycut2);
2654 my $h3 = $self->{h};
2655
2656 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249 2657
2250 glEnable GL_BLEND; 2658 glEnable GL_BLEND;
2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2659 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2660 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glEnable GL_TEXTURE_2D; 2661 glEnable GL_TEXTURE_2D;
… …
2272 2680
2273 if ($t3) { 2681 if ($t3) {
2274 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2682 glBindTexture GL_TEXTURE_2D, $t3->{name};
2275 glBegin GL_QUADS; 2683 glBegin GL_QUADS;
2276 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2684 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2685 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2686 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2687 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280 glEnd; 2688 glEnd;
2281 } 2689 }
2282 2690
2283 glDisable GL_BLEND; 2691 glDisable GL_BLEND;
2284 glDisable GL_TEXTURE_2D; 2692 glDisable GL_TEXTURE_2D;
2285} 2693}
2286 2694
2287############################################################################# 2695#############################################################################
2288 2696
2289package CFClient::UI::Gauge; 2697package CFPlus::UI::Gauge;
2290 2698
2291our @ISA = CFClient::UI::VBox::; 2699our @ISA = CFPlus::UI::VBox::;
2292 2700
2293sub new { 2701sub new {
2294 my ($class, %arg) = @_; 2702 my ($class, %arg) = @_;
2295 2703
2296 my $self = $class->SUPER::new ( 2704 my $self = $class->SUPER::new (
… …
2298 can_hover => 1, 2706 can_hover => 1,
2299 can_events => 1, 2707 can_events => 1,
2300 %arg, 2708 %arg,
2301 ); 2709 );
2302 2710
2303 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2711 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2304 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2712 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2305 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2713 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306 2714
2307 $self 2715 $self
2308} 2716}
2309 2717
2310sub set_fontsize { 2718sub set_fontsize {
… …
2331 $self->{value}->set_text ($val); 2739 $self->{value}->set_text ($val);
2332} 2740}
2333 2741
2334############################################################################# 2742#############################################################################
2335 2743
2336package CFClient::UI::Slider; 2744package CFPlus::UI::Slider;
2337 2745
2338use strict; 2746use strict;
2339 2747
2340use CFClient::OpenGL; 2748use CFPlus::OpenGL;
2341 2749
2342our @ISA = CFClient::UI::DrawBG::; 2750our @ISA = CFPlus::UI::DrawBG::;
2343 2751
2344my @tex = 2752my @tex =
2345 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2753 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346 qw(s1_slider.png s1_slider_bg.png); 2754 qw(s1_slider.png s1_slider_bg.png);
2347 2755
2348sub new { 2756sub new {
2349 my $class = shift; 2757 my $class = shift;
2350 2758
… …
2439 } 2847 }
2440 2848
2441 1 2849 1
2442} 2850}
2443 2851
2852sub invoke_mouse_wheel {
2853 my ($self, $ev) = @_;
2854
2855 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2856
2857 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2858
2859 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2860
2861 ! ! $delta
2862}
2863
2444sub update { 2864sub update {
2445 my ($self) = @_; 2865 my ($self) = @_;
2446 2866
2447 delete $self->{knob_w}; 2867 delete $self->{knob_w};
2448 $self->SUPER::update; 2868 $self->SUPER::update;
… …
2495 glDisable GL_TEXTURE_2D; 2915 glDisable GL_TEXTURE_2D;
2496} 2916}
2497 2917
2498############################################################################# 2918#############################################################################
2499 2919
2500package CFClient::UI::ValSlider; 2920package CFPlus::UI::ValSlider;
2501 2921
2502our @ISA = CFClient::UI::HBox::; 2922our @ISA = CFPlus::UI::HBox::;
2503 2923
2504sub new { 2924sub new {
2505 my ($class, %arg) = @_; 2925 my ($class, %arg) = @_;
2506 2926
2507 my $range = delete $arg{range}; 2927 my $range = delete $arg{range};
2508 2928
2509 my $self = $class->SUPER::new ( 2929 my $self = $class->SUPER::new (
2510 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2930 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2931 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512 to_value => sub { shift }, 2932 to_value => sub { shift },
2513 from_value => sub { shift }, 2933 from_value => sub { shift },
2514 %arg, 2934 %arg,
2515 ); 2935 );
2516 2936
… …
2536sub set_range { shift->{slider}->set_range (@_) } 2956sub set_range { shift->{slider}->set_range (@_) }
2537sub set_value { shift->{slider}->set_value (@_) } 2957sub set_value { shift->{slider}->set_value (@_) }
2538 2958
2539############################################################################# 2959#############################################################################
2540 2960
2541package CFClient::UI::TextScroller; 2961package CFPlus::UI::TextScroller;
2542 2962
2543our @ISA = CFClient::UI::HBox::; 2963our @ISA = CFPlus::UI::HBox::;
2544 2964
2545use CFClient::OpenGL; 2965use CFPlus::OpenGL;
2546 2966
2547sub new { 2967sub new {
2548 my $class = shift; 2968 my $class = shift;
2549 2969
2550 my $self = $class->SUPER::new ( 2970 my $self = $class->SUPER::new (
2551 fontsize => 1, 2971 fontsize => 1,
2552 can_events => 0, 2972 can_events => 1,
2553 indent => 0, 2973 indent => 0,
2554 #font => default_font 2974 #font => default_font
2555 @_, 2975 @_,
2556 2976
2557 layout => (new CFClient::Layout 1), 2977 layout => (new CFPlus::Layout),
2558 par => [], 2978 par => [],
2979 max_par => 0,
2559 height => 0, 2980 height => 0,
2560 children => [ 2981 children => [
2561 (new CFClient::UI::Empty expand => 1), 2982 (new CFPlus::UI::Empty expand => 1),
2562 (new CFClient::UI::Slider vertical => 1), 2983 (new CFPlus::UI::Slider vertical => 1),
2563 ], 2984 ],
2564 ); 2985 );
2565 2986
2566 $self->{children}[1]->connect (changed => sub { $self->update }); 2987 $self->{children}[1]->connect (changed => sub { $self->update });
2567 2988
… …
2597 3018
2598 $self->reflow; 3019 $self->reflow;
2599 3020
2600 local $self->{children} = [$empty, $slider]; 3021 local $self->{children} = [$empty, $slider];
2601 $self->SUPER::invoke_size_allocate ($w, $h) 3022 $self->SUPER::invoke_size_allocate ($w, $h)
3023}
3024
3025sub invoke_mouse_wheel {
3026 my ($self, $ev) = @_;
3027
3028 return 0 unless $ev->{dy}; # only vertical movements
3029
3030 $self->{children}[1]->emit (mouse_wheel => $ev);
3031
3032 1
2602} 3033}
2603 3034
2604sub get_layout { 3035sub get_layout {
2605 my ($self, $para) = @_; 3036 my ($self, $para) = @_;
2606 3037
… …
2634 3065
2635 # todo: base offset on lines or so, not on pixels 3066 # todo: base offset on lines or so, not on pixels
2636 $self->{children}[1]->set_value ($offset); 3067 $self->{children}[1]->set_value ($offset);
2637} 3068}
2638 3069
3070sub current_paragraph {
3071 my ($self) = @_;
3072
3073 $self->{top_paragraph} - 1
3074}
3075
3076sub scroll_to {
3077 my ($self, $para) = @_;
3078
3079 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3080
3081 $self->{scroll_to} = $para;
3082 $self->update;
3083}
3084
2639sub clear { 3085sub clear {
2640 my ($self) = @_; 3086 my ($self) = @_;
2641 3087
2642 my (undef, undef, @other) = @{ $self->{children} }; 3088 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other; 3089 $self->remove ($_) for @other;
… …
2646 $self->{height} = 0; 3092 $self->{height} = 0;
2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3093 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648} 3094}
2649 3095
2650sub add_paragraph { 3096sub add_paragraph {
2651 my ($self, $color, $para, $indent) = @_; 3097 my $self = shift;
2652 3098
2653 my ($text, @w) = ref $para ? @$para : $para; 3099 for my $para (@_) {
2654
2655 $para = { 3100 $para = {
3101 fg => [1, 1, 1, 1],
3102 indent => 0,
3103 markup => "",
3104 widget => [],
3105 ref $para ? %$para : (markup => $para),
2656 w => 1e10, 3106 w => 1e10,
2657 wrapped => 1, 3107 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2662 }; 3108 };
2663 3109
2664 $self->add (@w) if @w; 3110 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665 push @{$self->{par}}, $para; 3111 push @{$self->{par}}, $para;
3112 }
3113
3114 if (my $max = $self->{max_par}) {
3115 shift @{$self->{par}} while @{$self->{par}} > $max;
3116 }
2666 3117
2667 $self->{need_reflow}++; 3118 $self->{need_reflow}++;
2668 $self->update; 3119 $self->update;
2669} 3120}
2670 3121
2671sub scroll_to_bottom { 3122sub scroll_to_bottom {
2672 my ($self) = @_; 3123 my ($self) = @_;
2673 3124
2674 $self->{scroll_to_bottom} = 1; 3125 $self->{scroll_to} = $#{$self->{par}};
2675 $self->update; 3126 $self->update;
2676} 3127}
2677 3128
3129sub force_uptodate {
3130 my ($self) = @_;
3131
3132 if (delete $self->{need_reflow}) {
3133 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3134
3135 my $height = 0;
3136
3137 for my $para (@{$self->{par}}) {
3138 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3139 my $layout = $self->get_layout ($para);
3140 my ($w, $h) = $layout->size;
3141
3142 $para->{w} = $w + $para->{indent};
3143 $para->{h} = $h;
3144 $para->{wrapped} = $layout->has_wrapped;
3145 }
3146
3147 $para->{y} = $height;
3148 $height += $para->{h};
3149 }
3150
3151 $self->{height} = $height;
3152 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3153
3154 delete $self->{texture};
3155 }
3156
3157 if (my $paridx = delete $self->{scroll_to}) {
3158 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3159 }
3160}
3161
2678sub update { 3162sub update {
2679 my ($self) = @_; 3163 my ($self) = @_;
2680 3164
2681 $self->SUPER::update; 3165 $self->SUPER::update;
2682 3166
2683 return unless $self->{h} > 0; 3167 return unless $self->{h} > 0;
2684 3168
2685 delete $self->{texture}; 3169 delete $self->{texture};
2686 3170
2687 $ROOT->on_post_alloc ($self => sub { 3171 $ROOT->on_post_alloc ($self => sub {
3172 $self->force_uptodate;
3173
2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3174 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689 3175
2690 if (delete $self->{need_reflow}) {
2691 my $height = 0;
2692
2693 for my $para (@{$self->{par}}) {
2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2695 my $layout = $self->get_layout ($para);
2696 my ($w, $h) = $layout->size;
2697
2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2701 }
2702
2703 $height += $para->{h};
2704 }
2705
2706 $self->{height} = $height;
2707
2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2709
2710 delete $self->{texture};
2711 }
2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3176 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718 glClearColor 0, 0, 0, 0; 3177 glClearColor 0, 0, 0, 0;
2719 glClear GL_COLOR_BUFFER_BIT; 3178 glClear GL_COLOR_BUFFER_BIT;
2720 3179
3180 package CFPlus::UI::Base;
3181 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3182 (0, 0, $self->{w}, $self->{h});
3183
3184 my $top = int $self->{children}[1]{range}[0];
3185
3186 my $paridx = 0;
3187 my $top_paragraph;
2721 my $top = int $self->{children}[1]{range}[0]; 3188 my $top = int $self->{children}[1]{range}[0];
2722 3189
2723 my $y0 = $top; 3190 my $y0 = $top;
2724 my $y1 = $top + $H; 3191 my $y1 = $top + $H;
2725 3192
2726 my $y = 0;
2727
2728 glEnable GL_BLEND;
2729 #TODO# not correct in windows where rgba is forced off
2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2731
2732 for my $para (@{$self->{par}}) { 3193 for my $para (@{$self->{par}}) {
2733 my $h = $para->{h}; 3194 my $h = $para->{h};
3195 my $y = $para->{y};
2734 3196
2735 if ($y0 < $y + $h && $y < $y1) { 3197 if ($y0 < $y + $h && $y < $y1) {
2736
2737 my $layout = $self->get_layout ($para); 3198 my $layout = $self->get_layout ($para);
2738 3199
2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0; 3200 $layout->render ($para->{indent}, $y - $y0);
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743 3201
2744 if (my @w = @{ $para->{widget} }) { 3202 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes; 3203 my @s = $layout->get_shapes;
2746 3204
2747 for (@w) { 3205 for (@w) {
… …
2753 $_->draw; 3211 $_->draw;
2754 } 3212 }
2755 } 3213 }
2756 } 3214 }
2757 3215
2758 $y += $h; 3216 $paridx++;
3217 $top_paragraph ||= $paridx if $y >= $top;
2759 } 3218 }
2760 3219
2761 glDisable GL_BLEND; 3220 $self->{top_paragraph} = $top_paragraph;
2762 }; 3221 };
2763 }); 3222 });
2764} 3223}
2765 3224
2766sub reconfigure { 3225sub reconfigure {
… …
2784 $self->{children}[1]->draw; 3243 $self->{children}[1]->draw;
2785} 3244}
2786 3245
2787############################################################################# 3246#############################################################################
2788 3247
2789package CFClient::UI::Animator; 3248package CFPlus::UI::Animator;
2790 3249
2791use CFClient::OpenGL; 3250use CFPlus::OpenGL;
2792 3251
2793our @ISA = CFClient::UI::Bin::; 3252our @ISA = CFPlus::UI::Bin::;
2794 3253
2795sub moveto { 3254sub moveto {
2796 my ($self, $x, $y) = @_; 3255 my ($self, $x, $y) = @_;
2797 3256
2798 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3257 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2826 glPopMatrix; 3285 glPopMatrix;
2827} 3286}
2828 3287
2829############################################################################# 3288#############################################################################
2830 3289
2831package CFClient::UI::Flopper; 3290package CFPlus::UI::Flopper;
2832 3291
2833our @ISA = CFClient::UI::Button::; 3292our @ISA = CFPlus::UI::Button::;
2834 3293
2835sub new { 3294sub new {
2836 my $class = shift; 3295 my $class = shift;
2837 3296
2838 my $self = $class->SUPER::new ( 3297 my $self = $class->SUPER::new (
… …
2850 $self->{other}->toggle_visibility; 3309 $self->{other}->toggle_visibility;
2851} 3310}
2852 3311
2853############################################################################# 3312#############################################################################
2854 3313
2855package CFClient::UI::Tooltip; 3314package CFPlus::UI::Tooltip;
2856 3315
2857our @ISA = CFClient::UI::Bin::; 3316our @ISA = CFPlus::UI::Bin::;
2858 3317
2859use CFClient::OpenGL; 3318use CFPlus::OpenGL;
2860 3319
2861sub new { 3320sub new {
2862 my $class = shift; 3321 my $class = shift;
2863 3322
2864 $class->SUPER::new ( 3323 $class->SUPER::new (
… …
2867 ) 3326 )
2868} 3327}
2869 3328
2870sub set_tooltip_from { 3329sub set_tooltip_from {
2871 my ($self, $widget) = @_; 3330 my ($self, $widget) = @_;
3331
3332 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3333 if $widget->{tooltip} =~ /^#(.*)$/;
2872 3334
2873 my $tooltip = $widget->{tooltip}; 3335 my $tooltip = $widget->{tooltip};
2874 3336
2875 if ($ENV{CFPLUS_DEBUG} & 2) { 3337 if ($ENV{CFPLUS_DEBUG} & 2) {
2876 $tooltip .= "\n\n" . (ref $widget) . "\n" 3338 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2880 } 3342 }
2881 3343
2882 $tooltip =~ s/^\n+//; 3344 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//; 3345 $tooltip =~ s/\n+$//;
2884 3346
2885 $self->add (new CFClient::UI::Label 3347 $self->add (new CFPlus::UI::Label
2886 markup => $tooltip, 3348 markup => $tooltip,
2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3349 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888 fontsize => 0.8, 3350 fontsize => 0.8,
2889 fg => [0, 0, 0, 1], 3351 style => 1, # FLAG_INVERSE
2890 ellipsise => 0, 3352 ellipsise => 0,
2891 font => ($widget->{tooltip_font} || $::FONT_PROP), 3353 font => ($widget->{tooltip_font} || $::FONT_PROP),
2892 ); 3354 );
2893} 3355}
2894 3356
… …
2913 3375
2914 $self->{root}->on_post_alloc ("move_$self" => sub { 3376 $self->{root}->on_post_alloc ("move_$self" => sub {
2915 my $widget = $self->{owner} 3377 my $widget = $self->{owner}
2916 or return; 3378 or return;
2917 3379
3380 if ($widget->{visible}) {
2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3381 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919 3382
2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3383 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921 if $x + $self->{w} > $self->{root}{w}; 3384 if $x + $self->{w} > $self->{root}{w};
2922 3385
2923 $self->move_abs ($x, $y); 3386 $self->move_abs ($x, $y);
3387 } else {
3388 $self->hide;
3389 }
2924 }); 3390 });
2925} 3391}
2926 3392
2927sub _draw { 3393sub _draw {
2928 my ($self) = @_; 3394 my ($self) = @_;
… …
2952 $self->SUPER::_draw; 3418 $self->SUPER::_draw;
2953} 3419}
2954 3420
2955############################################################################# 3421#############################################################################
2956 3422
2957package CFClient::UI::Face; 3423package CFPlus::UI::Face;
2958 3424
2959our @ISA = CFClient::UI::Base::; 3425our @ISA = CFPlus::UI::DrawBG::;
2960 3426
2961use CFClient::OpenGL; 3427use CFPlus::OpenGL;
2962 3428
2963sub new { 3429sub new {
2964 my $class = shift; 3430 my $class = shift;
2965 3431
2966 my $self = $class->SUPER::new ( 3432 my $self = $class->SUPER::new (
3433 size_w => 32,
3434 size_h => 8,
2967 aspect => 1, 3435 aspect => 1,
2968 can_events => 0, 3436 can_events => 0,
2969 @_, 3437 @_,
2970 ); 3438 );
2971 3439
2972 if ($self->{anim} && $self->{animspeed}) { 3440 if ($self->{anim} && $self->{animspeed}) {
2973 Scalar::Util::weaken (my $widget = $self); 3441 CFPlus::weaken (my $widget = $self);
2974 3442
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2975 $self->{timer} = Event->timer ( 3445 $self->{timer} = Event->timer (
2976 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2977 hard => 1, 3446 parked => 1,
2978 interval => $self->{animspeed},
2979 cb => sub { 3447 cb => sub {
3448 return unless $::CONN && $widget;
3449
2980 ++$widget->{frame}; 3450 ++$widget->{frame};
3451 $widget->update_face;
2981 $widget->update; 3452 $widget->update;
3453
3454 $widget->update_timer;
2982 }, 3455 },
2983 ); 3456 );
3457
3458 $self->update_face;
3459 $self->update_timer;
2984 } 3460 }
2985 3461
2986 $self 3462 $self
2987} 3463}
2988 3464
3465sub update_timer {
3466 my ($self) = @_;
3467
3468 return unless $self->{timer};
3469
3470 if ($self->{visible}) {
3471 $self->{timer}->at (
3472 $self->{anim_start}
3473 + $self->{animspeed}
3474 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3475 );
3476 $self->{timer}->start;
3477 } else {
3478 $self->{timer}->stop;
3479 }
3480}
3481
3482sub update_face {
3483 my ($self) = @_;
3484
3485 return unless $::CONN;
3486
3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3488 if ($anim && @$anim) {
3489 delete $self->{wait_face};
3490 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3492 }
3493 }
3494}
3495
2989sub size_request { 3496sub size_request {
2990 (32, 8) 3497 my ($self) = @_;
3498
3499 if ($::CONN) {
3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3501 if (my $tex = $::CONN->{texture}[$faceid]) {
3502 $self->{tex} = $tex;
3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3504 } else {
3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3506 $self->realloc;
3507 });
3508 }
3509 }
3510 }
3511
3512 ($self->{size_w} || 8, $self->{size_h} || 8)
2991} 3513}
2992 3514
2993sub update { 3515sub update {
2994 my ($self) = @_; 3516 my ($self) = @_;
2995 3517
2996 return unless $self->{visible}; 3518 return unless $self->{visible};
2997 3519
2998 $self->SUPER::update; 3520 $self->SUPER::update;
2999} 3521}
3000 3522
3523sub invoke_visibility_change {
3524 my ($self) = @_;
3525
3526 $self->update_timer;
3527
3528 0
3529}
3530
3001sub _draw { 3531sub _draw {
3002 my ($self) = @_; 3532 my ($self) = @_;
3003 3533
3004 return unless $::CONN; 3534 $self->SUPER::_draw;
3005 3535
3006 my $face; 3536 if (my $tex = $self->{tex}) {
3007
3008 if ($self->{frame}) {
3009 my $anim = $::CONN->{anim}[$self->{anim}];
3010
3011 $face = $anim->[ $self->{frame} % @$anim ]
3012 if $anim && @$anim;
3013 }
3014
3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3016
3017 if ($tex) {
3018 glEnable GL_TEXTURE_2D; 3537 glEnable GL_TEXTURE_2D;
3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3020 glColor 0, 0, 0, 1; 3539 glColor 0, 0, 0, 1;
3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3022 glDisable GL_TEXTURE_2D; 3541 glDisable GL_TEXTURE_2D;
… …
3024} 3543}
3025 3544
3026sub destroy { 3545sub destroy {
3027 my ($self) = @_; 3546 my ($self) = @_;
3028 3547
3029 $self->{timer}->cancel 3548 (delete $self->{timer})->cancel
3030 if $self->{timer}; 3549 if $self->{timer};
3031 3550
3032 $self->SUPER::destroy; 3551 $self->SUPER::destroy;
3033} 3552}
3034 3553
3035############################################################################# 3554#############################################################################
3036 3555
3037package CFClient::UI::Buttonbar; 3556package CFPlus::UI::Buttonbar;
3038 3557
3039our @ISA = CFClient::UI::HBox::; 3558our @ISA = CFPlus::UI::HBox::;
3040 3559
3041# TODO: should actualyl wrap buttons and other goodies. 3560# TODO: should actually wrap buttons and other goodies.
3042 3561
3043############################################################################# 3562#############################################################################
3044 3563
3045package CFClient::UI::Menu; 3564package CFPlus::UI::Menu;
3046 3565
3047our @ISA = CFClient::UI::FancyFrame::; 3566our @ISA = CFPlus::UI::Toplevel::;
3048 3567
3049use CFClient::OpenGL; 3568use CFPlus::OpenGL;
3050 3569
3051sub new { 3570sub new {
3052 my $class = shift; 3571 my $class = shift;
3053 3572
3054 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
3055 items => [], 3574 items => [],
3056 z => 100, 3575 z => 100,
3057 @_, 3576 @_,
3058 ); 3577 );
3059 3578
3060 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3579 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061 3580
3062 for my $item (@{ $self->{items} }) { 3581 for my $item (@{ $self->{items} }) {
3063 my ($widget, $cb, $tooltip) = @$item; 3582 my ($widget, $cb, $tooltip) = @$item;
3064 3583
3065 # handle various types of items, only text for now 3584 # handle various types of items, only text for now
3066 if (!ref $widget) { 3585 if (!ref $widget) {
3586 if ($widget =~ /\t/) {
3587 my ($left, $right) = split /\t/, $widget, 2;
3588
3067 $widget = new CFClient::UI::Label 3589 $widget = new CFPlus::UI::HBox
3068 can_hover => 1, 3590 can_hover => 1,
3069 can_events => 1, 3591 can_events => 1,
3592 tooltip => $tooltip,
3593 children => [
3594 (new CFPlus::UI::Label markup => $left, expand => 1),
3595 (new CFPlus::UI::Label markup => $right, align => +1),
3596 ],
3597 ;
3598
3599 } else {
3600 $widget = new CFPlus::UI::Label
3601 can_hover => 1,
3602 can_events => 1,
3070 markup => $widget, 3603 markup => $widget,
3071 tooltip => $tooltip 3604 tooltip => $tooltip;
3605 }
3072 } 3606 }
3073 3607
3074 $self->{item}{$widget} = $item; 3608 $self->{item}{$widget} = $item;
3075 3609
3076 $self->{vbox}->add ($widget); 3610 $self->{vbox}->add ($widget);
… …
3119 1 3653 1
3120} 3654}
3121 3655
3122############################################################################# 3656#############################################################################
3123 3657
3124package CFClient::UI::Multiplexer; 3658package CFPlus::UI::Multiplexer;
3125 3659
3126our @ISA = CFClient::UI::Container::; 3660our @ISA = CFPlus::UI::Container::;
3127 3661
3128sub new { 3662sub new {
3129 my $class = shift; 3663 my $class = shift;
3130 3664
3131 my $self = $class->SUPER::new ( 3665 my $self = $class->SUPER::new (
… …
3145 3679
3146 $self->{current} = $self->{children}[0] 3680 $self->{current} = $self->{children}[0]
3147 if @{ $self->{children} }; 3681 if @{ $self->{children} };
3148} 3682}
3149 3683
3684sub get_current_page {
3685 my ($self) = @_;
3686
3687 $self->{current}
3688}
3689
3150sub set_current_page { 3690sub set_current_page {
3151 my ($self, $page_or_widget) = @_; 3691 my ($self, $page_or_widget) = @_;
3152 3692
3153 my $widget = ref $page_or_widget 3693 my $widget = ref $page_or_widget
3154 ? $page_or_widget 3694 ? $page_or_widget
… …
3186 $self->{current}->draw; 3726 $self->{current}->draw;
3187} 3727}
3188 3728
3189############################################################################# 3729#############################################################################
3190 3730
3191package CFClient::UI::Notebook; 3731package CFPlus::UI::Notebook;
3192 3732
3193our @ISA = CFClient::UI::VBox::; 3733our @ISA = CFPlus::UI::VBox::;
3194 3734
3195sub new { 3735sub new {
3196 my $class = shift; 3736 my $class = shift;
3197 3737
3198 my $self = $class->SUPER::new ( 3738 my $self = $class->SUPER::new (
3199 buttonbar => (new CFClient::UI::Buttonbar), 3739 buttonbar => (new CFPlus::UI::Buttonbar),
3200 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3740 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3201 # filter => # will be put between multiplexer and $self 3741 # filter => # will be put between multiplexer and $self
3202 @_, 3742 @_,
3203 ); 3743 );
3204 3744
3205 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3745 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3209} 3749}
3210 3750
3211sub add { 3751sub add {
3212 my ($self, $title, $widget, $tooltip) = @_; 3752 my ($self, $title, $widget, $tooltip) = @_;
3213 3753
3214 Scalar::Util::weaken $self; 3754 CFPlus::weaken $self;
3215 3755
3216 $self->{buttonbar}->add (new CFClient::UI::Button 3756 $self->{buttonbar}->add (new CFPlus::UI::Button
3217 markup => $title, 3757 markup => $title,
3218 tooltip => $tooltip, 3758 tooltip => $tooltip,
3219 on_activate => sub { $self->set_current_page ($widget) }, 3759 on_activate => sub { $self->set_current_page ($widget) },
3220 ); 3760 );
3221 3761
3222 $self->{multiplexer}->add ($widget); 3762 $self->{multiplexer}->add ($widget);
3223} 3763}
3224 3764
3765sub get_current_page {
3766 my ($self) = @_;
3767
3768 $self->{multiplexer}->get_current_page
3769}
3770
3225sub set_current_page { 3771sub set_current_page {
3226 my ($self, $page) = @_; 3772 my ($self, $page) = @_;
3227 3773
3228 $self->{multiplexer}->set_current_page ($page); 3774 $self->{multiplexer}->set_current_page ($page);
3229 $self->emit (page_changed => $self->{multiplexer}{current}); 3775 $self->emit (page_changed => $self->{multiplexer}{current});
3230} 3776}
3231 3777
3232############################################################################# 3778#############################################################################
3233 3779
3234package CFClient::UI::Combobox; 3780package CFPlus::UI::Selector;
3235 3781
3236use utf8; 3782use utf8;
3237 3783
3238our @ISA = CFClient::UI::Button::; 3784our @ISA = CFPlus::UI::Button::;
3239 3785
3240sub new { 3786sub new {
3241 my $class = shift; 3787 my $class = shift;
3242 3788
3243 my $self = $class->SUPER::new ( 3789 my $self = $class->SUPER::new (
… …
3260 my ($value, $title, $tooltip) = @$_; 3806 my ($value, $title, $tooltip) = @$_;
3261 3807
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3808 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 } 3809 }
3264 3810
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3811 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266} 3812}
3267 3813
3268sub _set_value { 3814sub _set_value {
3269 my ($self, $value) = @_; 3815 my ($self, $value) = @_;
3270 3816
… …
3285 $self->emit (changed => $value); 3831 $self->emit (changed => $value);
3286} 3832}
3287 3833
3288############################################################################# 3834#############################################################################
3289 3835
3290package CFClient::UI::Statusbox; 3836package CFPlus::UI::Statusbox;
3291 3837
3292our @ISA = CFClient::UI::VBox::; 3838our @ISA = CFPlus::UI::VBox::;
3293 3839
3294sub new { 3840sub new {
3295 my $class = shift; 3841 my $class = shift;
3296 3842
3297 my $self = $class->SUPER::new ( 3843 my $self = $class->SUPER::new (
3298 fontsize => 0.8, 3844 fontsize => 0.8,
3299 @_, 3845 @_,
3300 ); 3846 );
3301 3847
3302 Scalar::Util::weaken (my $this = $self); 3848 CFPlus::weaken (my $this = $self);
3303 3849
3304 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3850 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305 3851
3306 $self 3852 $self
3307} 3853}
… …
3309sub reorder { 3855sub reorder {
3310 my ($self) = @_; 3856 my ($self) = @_;
3311 my $NOW = Time::HiRes::time; 3857 my $NOW = Time::HiRes::time;
3312 3858
3313 # freeze display when hovering over any label 3859 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner} 3860 return if $CFPlus::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3861 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} }; 3862 values %{ $self->{item} };
3317 3863
3318 while (my ($k, $v) = each %{ $self->{item} }) { 3864 while (my ($k, $v) = each %{ $self->{item} }) {
3319 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3865 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3320 } 3866 }
… …
3341 for ($short) { 3887 for ($short) {
3342 s/^\s+//; 3888 s/^\s+//;
3343 s/\s+/ /g; 3889 s/\s+/ /g;
3344 } 3890 }
3345 3891
3346 new CFClient::UI::Label 3892 new CFPlus::UI::Label
3347 markup => $short, 3893 markup => $short,
3348 tooltip => $item->{tooltip}, 3894 tooltip => $item->{tooltip},
3349 tooltip_font => $::FONT_PROP, 3895 tooltip_font => $::FONT_PROP,
3350 tooltip_width => 0.67, 3896 tooltip_width => 0.67,
3351 fontsize => $item->{fontsize} || $self->{fontsize}, 3897 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3405 count => 1, 3951 count => 1,
3406 %arg, 3952 %arg,
3407 }; 3953 };
3408 } 3954 }
3409 3955
3956 $ROOT->on_refresh (reorder => sub {
3410 $self->reorder; 3957 $self->reorder;
3958 });
3411} 3959}
3412 3960
3413sub reconfigure { 3961sub reconfigure {
3414 my ($self) = @_; 3962 my ($self) = @_;
3415 3963
… …
3428 $self->SUPER::destroy; 3976 $self->SUPER::destroy;
3429} 3977}
3430 3978
3431############################################################################# 3979#############################################################################
3432 3980
3433package CFClient::UI::Inventory;
3434
3435our @ISA = CFClient::UI::ScrolledWindow::;
3436
3437sub new {
3438 my $class = shift;
3439
3440 my $self = $class->SUPER::new (
3441 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3442 @_,
3443 );
3444
3445 $self
3446}
3447
3448sub set_items {
3449 my ($self, $items) = @_;
3450
3451 $self->{child}->clear;
3452 return unless $items;
3453
3454 my @items = sort {
3455 ($a->{type} <=> $b->{type})
3456 or ($a->{name} cmp $b->{name})
3457 } @$items;
3458
3459 $self->{real_items} = \@items;
3460
3461 my $row = 0;
3462 for my $item (@items) {
3463 CFClient::Item::update_widgets $item;
3464
3465 $self->{child}->add (0, $row, $item->{face_widget});
3466 $self->{child}->add (1, $row, $item->{desc_widget});
3467 $self->{child}->add (2, $row, $item->{weight_widget});
3468
3469 $row++;
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::BindEditor;
3476
3477our @ISA = CFClient::UI::FancyFrame::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3483
3484 $self->add (my $vb = new CFClient::UI::VBox);
3485
3486
3487 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3488 text => "start recording",
3489 tooltip => "Start/Stops recording of actions."
3490 ."All subsequent actions after the recording started will be captured."
3491 ."The actions are displayed after the record was stopped."
3492 ."To bind the action you have to click on the 'Bind' button",
3493 on_activate => sub {
3494 unless ($self->{recording}) {
3495 $self->start;
3496 } else {
3497 $self->stop;
3498 }
3499 });
3500
3501 $vb->add (new CFClient::UI::Label text => "Actions:");
3502 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3503
3504 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3505 $vb->add (my $hb = new CFClient::UI::HBox);
3506 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3507 $hb->add (new CFClient::UI::Button
3508 text => "bind",
3509 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3510 on_activate => sub {
3511 $self->ask_for_bind;
3512 });
3513
3514 $vb->add (my $hb = new CFClient::UI::HBox);
3515 $hb->add (new CFClient::UI::Button
3516 text => "ok",
3517 expand => 1,
3518 tooltip => "This closes the binding editor and saves the binding",
3519 on_activate => sub {
3520 $self->hide;
3521 $self->commit;
3522 });
3523
3524 $hb->add (new CFClient::UI::Button
3525 text => "cancel",
3526 expand => 1,
3527 tooltip => "This closes the binding editor without saving",
3528 on_activate => sub {
3529 $self->hide;
3530 $self->{binding_cancel}->()
3531 if $self->{binding_cancel};
3532 });
3533
3534 $self->update_binding_widgets;
3535
3536 $self
3537}
3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3551sub commit {
3552 my ($self) = @_;
3553 my ($mod, $sym, $cmds) = $self->get_binding;
3554 if ($sym != 0 && @$cmds > 0) {
3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3556 ."'. Don't forget 'Save Config'!");
3557 $self->{binding_change}->($mod, $sym, $cmds)
3558 if $self->{binding_change};
3559 } else {
3560 $::STATUSBOX->add ("No action bound, no key or action specified!");
3561 $self->{binding_cancel}->()
3562 if $self->{binding_cancel};
3563 }
3564}
3565
3566sub start {
3567 my ($self) = @_;
3568
3569 $self->{rec_btn}->set_text ("stop recording");
3570 $self->{recording} = 1;
3571 $self->clear_command_list;
3572 $::CONN->start_record if $::CONN;
3573}
3574
3575sub stop {
3576 my ($self) = @_;
3577
3578 $self->{rec_btn}->set_text ("start recording");
3579 $self->{recording} = 0;
3580
3581 my $rec;
3582 $rec = $::CONN->stop_record if $::CONN;
3583 return unless ref $rec eq 'ARRAY';
3584 $self->set_command_list ($rec);
3585}
3586
3587
3588sub ask_for_bind_and_commit {
3589 my ($self) = @_;
3590 $self->ask_for_bind (1);
3591}
3592
3593sub ask_for_bind {
3594 my ($self, $commit, $end_cb) = @_;
3595
3596 CFClient::Binder::open_binding_dialog (sub {
3597 my ($mod, $sym) = @_;
3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3599 $self->update_binding_widgets;
3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3602 });
3603}
3604
3605# $mod and $sym are the modifiers and key symbol
3606# $cmds is a array ref of strings (the commands)
3607# $cb is the callback that is executed on OK
3608# $ccb is the callback that is executed on CANCEL and
3609# when the binding was unsuccessful on OK
3610sub set_binding {
3611 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3612
3613 $self->clear_command_list;
3614 $self->{recording} = 0;
3615 $self->{rec_btn}->set_text ("start recording");
3616
3617 $self->{binding} = [$mod, $sym];
3618 $self->{commands} = $cmds;
3619
3620 $self->{binding_change} = $cb;
3621 $self->{binding_cancel} = $ccb;
3622
3623 $self->update_binding_widgets;
3624}
3625
3626# this is a shortcut method that asks for a binding
3627# and then just binds it.
3628sub do_quick_binding {
3629 my ($self, $cmds, $end_cb) = @_;
3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3631 $self->ask_for_bind (1, $end_cb);
3632}
3633
3634sub update_binding_widgets {
3635 my ($self) = @_;
3636 my ($mod, $sym, $cmds) = $self->get_binding;
3637 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3638 $self->set_command_list ($cmds);
3639}
3640
3641sub get_binding {
3642 my ($self) = @_;
3643 return (
3644 $self->{binding}->[0],
3645 $self->{binding}->[1],
3646 [ grep { defined $_ } @{$self->{commands}} ]
3647 );
3648}
3649
3650sub clear_command_list {
3651 my ($self) = @_;
3652 $self->{cmdbox}->clear ();
3653}
3654
3655sub set_command_list {
3656 my ($self, $cmds) = @_;
3657
3658 $self->{cmdbox}->clear ();
3659 $self->{commands} = $cmds;
3660
3661 my $idx = 0;
3662
3663 for (@$cmds) {
3664 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3665
3666 my $i = $idx;
3667 $hb->add (new CFClient::UI::Label text => $_);
3668 $hb->add (new CFClient::UI::Button
3669 text => "delete",
3670 tooltip => "Deletes the action from the record",
3671 on_activate => sub {
3672 $self->{cmdbox}->remove ($hb);
3673 $cmds->[$i] = undef;
3674 });
3675
3676
3677 $idx++
3678 }
3679}
3680
3681#############################################################################
3682
3683package CFClient::UI::SpellList;
3684
3685our @ISA = CFClient::UI::Table::;
3686
3687sub new {
3688 my $class = shift;
3689
3690 my $self = $class->SUPER::new (
3691 binding => [],
3692 commands => [],
3693 @_,
3694 )
3695}
3696
3697my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3698
3699my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3701my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3709
3710sub rebuild_spell_list {
3711 my ($self) = @_;
3712
3713 $CFClient::UI::ROOT->on_refresh ($self => sub {
3714 $self->clear;
3715
3716 return unless $::CONN;
3717
3718 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724 my $row = 0;
3725
3726 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727 my $spell = $self->{spell}{$_};
3728
3729 $row++;
3730
3731 my $spell_cb = sub {
3732 my ($widget, $ev) = @_;
3733
3734 if ($ev->{button} == 1) {
3735 $::CONN->user_send ("cast $spell->{name}");
3736 } elsif ($ev->{button} == 2) {
3737 $::CONN->user_send ("invoke $spell->{name}");
3738 } elsif ($ev->{button} == 3) {
3739 (new CFClient::UI::Menu
3740 items => [
3741 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743 ],
3744 )->popup ($ev);
3745 } else {
3746 return 0;
3747 }
3748
3749 1
3750 };
3751
3752 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754 #TODO: add path info to tooltip
3755 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757 $self->add (0, $row, new CFClient::UI::Face
3758 face => $spell->{face},
3759 can_hover => 1,
3760 can_events => 1,
3761 tooltip => $tooltip,
3762 on_button_down => $spell_cb,
3763 );
3764
3765 $self->add (1, $row, new CFClient::UI::Label
3766 expand => 1,
3767 text => $spell->{name},
3768 can_hover => 1,
3769 can_events => 1,
3770 tooltip => $tooltip,
3771 on_button_down => $spell_cb,
3772 );
3773
3774 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778 }
3779 });
3780}
3781
3782sub add_spell {
3783 my ($self, $spell) = @_;
3784
3785 $self->{spell}->{$spell->{name}} = $spell;
3786 $self->rebuild_spell_list;
3787}
3788
3789sub remove_spell {
3790 my ($self, $spell) = @_;
3791
3792 delete $self->{spell}->{$spell->{name}};
3793 $self->rebuild_spell_list;
3794}
3795
3796sub clear_spells {
3797 my ($self) = @_;
3798
3799 $self->{spell} = {};
3800 $self->rebuild_spell_list;
3801}
3802
3803#############################################################################
3804
3805package CFClient::UI::Root; 3981package CFPlus::UI::Root;
3806 3982
3807our @ISA = CFClient::UI::Container::; 3983our @ISA = CFPlus::UI::Container::;
3808 3984
3809use List::Util qw(min max); 3985use List::Util qw(min max);
3810 3986
3811use CFClient::OpenGL; 3987use CFPlus::OpenGL;
3812 3988
3813sub new { 3989sub new {
3814 my $class = shift; 3990 my $class = shift;
3815 3991
3816 my $self = $class->SUPER::new ( 3992 my $self = $class->SUPER::new (
3817 visible => 1, 3993 visible => 1,
3818 @_, 3994 @_,
3819 ); 3995 );
3820 3996
3821 Scalar::Util::weaken ($self->{root} = $self); 3997 CFPlus::weaken ($self->{root} = $self);
3822 3998
3823 $self 3999 $self
3824} 4000}
3825 4001
3826sub size_request { 4002sub size_request {
… …
3921 while ($self->{refresh_hook}) { 4097 while ($self->{refresh_hook}) {
3922 $_->() 4098 $_->()
3923 for values %{delete $self->{refresh_hook}}; 4099 for values %{delete $self->{refresh_hook}};
3924 } 4100 }
3925 4101
3926 if ($self->{realloc}) { 4102 while ($self->{realloc}) {
3927 my %queue; 4103 my %queue;
3928 my @queue; 4104 my @queue;
3929 my $widget; 4105 my $widget;
3930 4106
3931 outer: 4107 outer:
… …
3978 } 4154 }
3979 } 4155 }
3980 4156
3981 delete $self->{realloc}{$widget+0}; 4157 delete $self->{realloc}{$widget+0};
3982 } 4158 }
3983 }
3984 4159
3985 while (my $size_alloc = delete $self->{size_alloc}) { 4160 while (my $size_alloc = delete $self->{size_alloc}) {
3986 my @queue = sort { $b->{visible} <=> $a->{visible} } 4161 my @queue = sort { $a->{visible} <=> $b->{visible} }
3987 values %$size_alloc; 4162 values %$size_alloc;
3988 4163
3989 while () { 4164 while () {
3990 my $widget = pop @queue || last; 4165 my $widget = pop @queue || last;
3991 4166
3992 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4167 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3993 4168
3994 $w = 0 if $w < 0; 4169 $w = max $widget->{min_w}, $w;
3995 $h = 0 if $h < 0; 4170 $h = max $widget->{min_h}, $h;
3996 4171
4172# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4173# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4174
4175 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4176 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4177
3997 $w = int $w + 0.5; 4178 $w = int $w + 0.5;
3998 $h = int $h + 0.5; 4179 $h = int $h + 0.5;
3999 4180
4000 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4181 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001 $widget->{old_w} = $widget->{w}; 4182 $widget->{old_w} = $widget->{w};
4002 $widget->{old_h} = $widget->{h}; 4183 $widget->{old_h} = $widget->{h};
4003 4184
4004 $widget->{w} = $w; 4185 $widget->{w} = $w;
4005 $widget->{h} = $h; 4186 $widget->{h} = $h;
4006 4187
4007 $widget->emit (size_allocate => $w, $h); 4188 $widget->emit (size_allocate => $w, $h);
4189 }
4008 } 4190 }
4009 } 4191 }
4010 } 4192 }
4011 4193
4012 while ($self->{post_alloc_hook}) { 4194 while ($self->{post_alloc_hook}) {
4013 $_->() 4195 $_->()
4014 for values %{delete $self->{post_alloc_hook}}; 4196 for values %{delete $self->{post_alloc_hook}};
4015 } 4197 }
4016
4017 4198
4018 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4199 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4019 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4200 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4020 glClear GL_COLOR_BUFFER_BIT; 4201 glClear GL_COLOR_BUFFER_BIT;
4021 4202
… …
4024 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4205 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4025 glMatrixMode GL_MODELVIEW; 4206 glMatrixMode GL_MODELVIEW;
4026 glLoadIdentity; 4207 glLoadIdentity;
4027 4208
4028 { 4209 {
4029 package CFClient::UI::Base; 4210 package CFPlus::UI::Base;
4030 4211
4031 ($draw_x, $draw_y, $draw_w, $draw_h) = 4212 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4032 (0, 0, $self->{w}, $self->{h}); 4213 (0, 0, $self->{w}, $self->{h});
4033 }
4034 4214
4035 $self->_draw; 4215 $self->_draw;
4216 }
4036} 4217}
4037 4218
4038############################################################################# 4219#############################################################################
4039 4220
4040package CFClient::UI; 4221package CFPlus::UI;
4041 4222
4042$ROOT = new CFClient::UI::Root; 4223$ROOT = new CFPlus::UI::Root;
4043$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4224$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4044 4225
40451 42261
4046 4227

Diff Legend

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