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

Diff Legend

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