ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.307 by root, Sun Jun 18 19:13:20 2006 UTC vs.
Revision 1.447 by root, Sat Dec 22 06:50:45 2007 UTC

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

Diff Legend

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