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.291 by root, Tue Jun 6 02:55:50 2006 UTC vs.
Revision 1.432 by root, Tue Aug 21 23:42:02 2007 UTC

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

Diff Legend

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