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.307 by root, Sun Jun 18 19:13:20 2006 UTC vs.
Revision 1.433 by root, Wed Aug 22 21:27:13 2007 UTC

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

Diff Legend

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