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.275 by root, Sat Jun 3 22:50:48 2006 UTC vs.
Revision 1.425 by root, Fri Aug 10 04:02:13 2007 UTC

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

Diff Legend

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