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

Diff Legend

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