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.277 by root, Sun Jun 4 00:21:52 2006 UTC vs.
Revision 1.418 by elmex, Tue Jul 24 18:39:39 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 col => 0,
1033 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 col => 1,
1044 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 col => 0,
1066 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
… …
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);
1179 # HACK: the next line is required to enforce placement 1489 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1490 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1181 }; 1491 };
1182 } else { 1492 } else {
1183 return 0; 1493 return 0;
1184 } 1494 }
1185 1495
1186 1 1496 1
1187} 1497}
1188 1498
1189sub button_up { 1499sub invoke_button_up {
1190 my ($self, $ev, $x, $y) = @_; 1500 my ($self, $ev, $x, $y) = @_;
1191 1501
1192 !!delete $self->{motion} 1502 ! ! delete $self->{motion}
1193} 1503}
1194 1504
1195sub mouse_motion { 1505sub invoke_mouse_motion {
1196 my ($self, $ev, $x, $y) = @_; 1506 my ($self, $ev, $x, $y) = @_;
1197 1507
1198 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1508 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199 1509
1200 !!$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
1201} 1519}
1202 1520
1203sub _draw { 1521sub _draw {
1204 my ($self) = @_; 1522 my ($self) = @_;
1205 1523
… …
1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1213 1531
1214 my $border = $self->border; 1532 my $border = $self->border;
1215 1533
1216 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1217 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1218 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1219 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1220 $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);
1221 1553
1222 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1223 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1224 1556
1225 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1231 1563
1232 glDisable GL_TEXTURE_2D; 1564 glDisable GL_TEXTURE_2D;
1233 1565
1234 $child->draw; 1566 $child->draw;
1235 1567
1236 if ($self->{title}) { 1568 if ($self->{title_widget}) {
1237 glTranslate 0, $border - $self->{h}; 1569 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw; 1570 $self->{title_widget}->_draw;
1571
1572 glTranslate 0, - ($border - $self->{h});
1239 } 1573 }
1574
1575 $self->{close_button}->draw
1576 if $self->{close_button};
1240} 1577}
1241 1578
1242############################################################################# 1579#############################################################################
1243 1580
1244package CFClient::UI::Table; 1581package CFPlus::UI::Table;
1245 1582
1246our @ISA = CFClient::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1247 1584
1248use List::Util qw(max sum); 1585use List::Util qw(max sum);
1249 1586
1250use CFClient::OpenGL; 1587use CFPlus::OpenGL;
1251 1588
1252sub new { 1589sub new {
1253 my $class = shift; 1590 my $class = shift;
1254 1591
1255 $class->SUPER::new ( 1592 $class->SUPER::new (
1256 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1257 @_, 1595 @_,
1258 ) 1596 )
1259} 1597}
1260 1598
1261sub children {
1262 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1263}
1264
1265sub add { 1599sub add {
1266 my ($self, $x, $y, $child) = @_;
1267
1268 $child->set_parent ($self);
1269 $self->{children}[$y][$x] = $child;
1270
1271 $self->realloc;
1272}
1273
1274# TODO: move to container class maybe? send children a signal on removal?
1275sub clear {
1276 my ($self) = @_; 1600 my ($self, @widgets) = @_;
1601
1602 for my $child (@widgets) {
1603 $child->{rowspan} ||= 1;
1604 $child->{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->{row} = $row;
1619 $child->{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);
1277 1631
1278 my @children = $self->children; 1632 my @children = $self->children;
1279 delete $self->{children}; 1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(col req_w 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 }
1280 1643 }
1281 for (@children) {
1282 delete $_->{parent};
1283 $_->hide;
1284 }
1285 1644
1286 $self->realloc; 1645 # second pass, rows
1287} 1646 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1288
1289sub get_wh {
1290 my ($self) = @_;
1291
1292 my (@w, @h);
1293
1294 for my $y (0 .. $#{$self->{children}}) {
1295 my $row = $self->{children}[$y]
1296 or next;
1297
1298 for my $x (0 .. $#$row) {
1299 my $widget = $row->[$x]
1300 or next;
1301 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1302 1648
1303 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1304 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1305 } 1653 }
1306 } 1654 }
1307 1655
1308 (\@w, \@h) 1656 (\@w, \@h)
1309} 1657}
… …
1317 (sum @$ws), 1665 (sum @$ws),
1318 (sum @$hs), 1666 (sum @$hs),
1319 ) 1667 )
1320} 1668}
1321 1669
1322sub size_allocate { 1670sub invoke_size_allocate {
1323 my ($self, $w, $h) = @_; 1671 my ($self, $w, $h) = @_;
1324 1672
1325 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1326 1674
1327 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1328 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1329 1677
1330 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1331 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1332 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1333 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1334 1682
1335 # linearly scale sizes
1336 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1337 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1338 1684
1339 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
1340 CFClient::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1341 1694
1342 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1343 1697
1344 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1345 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1346 or next;
1347 1700
1348 my $x = 0; 1701 $widget->configure (
1349 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1350 1704 );
1351 for my $c (0 .. $#$row) { 1705 }
1352 my $col_w = $ws->[$c];
1353 1706
1354 if (my $widget = $row->[$c]) { 1707 1
1355 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1356 }
1357 1709
1358 $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};
1359 } 1737 }
1360
1361 $y += $row_h;
1362 } 1738 }
1363 1739
1364} 1740 my $W = $x2 - $x1;
1741 my $H = $y2 - $y1;
1365 1742
1366sub 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 {
1367 my ($self, $x, $y) = @_; 1761 my ($self, $W, $H) = @_;
1368 1762
1369 $x -= $self->{x}; 1763 for my $child ($self->visible_children) {
1370 $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;
1371 1766
1372 my $res; 1767 $x += $child->{c_halign} * $child->{req_w};
1768 $y += $child->{c_valign} * $child->{req_h};
1373 1769
1374 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1375 $res = $_->find_widget ($x, $y) 1771 }
1376 and return $res; 1772
1377 } 1773 1
1378
1379 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1380}
1381
1382sub _draw {
1383 my ($self) = @_;
1384
1385 for (grep $_, @{$self->{children}}) {
1386 $_->draw for grep $_, @$_;
1387 }
1388} 1774}
1389 1775
1390############################################################################# 1776#############################################################################
1391 1777
1392package CFClient::UI::Box; 1778package CFPlus::UI::Box;
1393 1779
1394our @ISA = CFClient::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1395 1781
1396sub size_request { 1782sub size_request {
1397 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1398 1786
1399 $self->{vertical} 1787 $self->{vertical}
1400 ? ( 1788 ? (
1401 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1402 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1403 ) 1791 )
1404 : ( 1792 : (
1405 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1406 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1407 ) 1795 )
1408} 1796}
1409 1797
1410sub size_allocate { 1798sub invoke_size_allocate {
1411 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
1412 1800
1413 my $space = $self->{vertical} ? $h : $w; 1801 my $space = $self->{vertical} ? $h : $w;
1414 my $children = $self->{children}; 1802 my @children = $self->visible_children;
1415 1803
1416 my @req; 1804 my @req;
1417 1805
1418 if ($self->{homogeneous}) { 1806 if ($self->{homogeneous}) {
1419 @req = ($space / (@$children || 1)) x @$children; 1807 @req = ($space / (@children || 1)) x @children;
1420 } else { 1808 } else {
1421 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1809 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1422 my $req = List::Util::sum @req; 1810 my $req = List::Util::sum @req;
1423 1811
1424 if ($req > $space) { 1812 if ($req > $space) {
1425 # ah well, not enough space 1813 # ah well, not enough space
1426 $_ *= $space / $req for @req; 1814 $_ *= $space / $req for @req;
1427 } else { 1815 } else {
1428 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1816 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1429 1817
1430 $space = ($space - $req) / $expand; # remaining space to give away 1818 $space = ($space - $req) / $expand; # remaining space to give away
1431 1819
1432 $req[$_] += $space * $children->[$_]{expand} 1820 $req[$_] += $space * $children[$_]{expand}
1433 for 0 .. $#$children; 1821 for 0 .. $#children;
1434 } 1822 }
1435 } 1823 }
1436 1824
1437 CFClient::UI::harmonize \@req; 1825 CFPlus::UI::harmonize \@req;
1438 1826
1439 my $pos = 0; 1827 my $pos = 0;
1440 for (0 .. $#$children) { 1828 for (0 .. $#children) {
1441 my $alloc = $req[$_]; 1829 my $alloc = $req[$_];
1442 $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));
1443 1831
1444 $pos += $alloc; 1832 $pos += $alloc;
1445 } 1833 }
1446 1834
1447 1 1835 1
1448} 1836}
1449 1837
1450############################################################################# 1838#############################################################################
1451 1839
1452package CFClient::UI::HBox; 1840package CFPlus::UI::HBox;
1453 1841
1454our @ISA = CFClient::UI::Box::; 1842our @ISA = CFPlus::UI::Box::;
1455 1843
1456sub new { 1844sub new {
1457 my $class = shift; 1845 my $class = shift;
1458 1846
1459 $class->SUPER::new ( 1847 $class->SUPER::new (
… …
1462 ) 1850 )
1463} 1851}
1464 1852
1465############################################################################# 1853#############################################################################
1466 1854
1467package CFClient::UI::VBox; 1855package CFPlus::UI::VBox;
1468 1856
1469our @ISA = CFClient::UI::Box::; 1857our @ISA = CFPlus::UI::Box::;
1470 1858
1471sub new { 1859sub new {
1472 my $class = shift; 1860 my $class = shift;
1473 1861
1474 $class->SUPER::new ( 1862 $class->SUPER::new (
… …
1477 ) 1865 )
1478} 1866}
1479 1867
1480############################################################################# 1868#############################################################################
1481 1869
1482package CFClient::UI::Label; 1870package CFPlus::UI::Label;
1483 1871
1484our @ISA = CFClient::UI::DrawBG::; 1872our @ISA = CFPlus::UI::DrawBG::;
1485 1873
1486use CFClient::OpenGL; 1874use CFPlus::OpenGL;
1487 1875
1488sub new { 1876sub new {
1489 my ($class, %arg) = @_; 1877 my ($class, %arg) = @_;
1490 1878
1491 my $self = $class->SUPER::new ( 1879 my $self = $class->SUPER::new (
… …
1494 #active_bg => none 1882 #active_bg => none
1495 #font => default_font 1883 #font => default_font
1496 #text => initial text 1884 #text => initial text
1497 #markup => initial narkup 1885 #markup => initial narkup
1498 #max_w => maximum pixel width 1886 #max_w => maximum pixel width
1887 #style => 0, # render flags
1499 ellipsise => 3, # end 1888 ellipsise => 3, # end
1500 layout => (new CFClient::Layout), 1889 layout => (new CFPlus::Layout),
1501 fontsize => 1, 1890 fontsize => 1,
1502 align => -1, 1891 align => -1,
1503 valign => -1, 1892 valign => -1,
1504 padding_x => 2, 1893 padding_x => 2,
1505 padding_y => 2, 1894 padding_y => 2,
1506 can_events => 0, 1895 can_events => 0,
1507 %arg 1896 %arg
1508 ); 1897 );
1509 1898
1510 if (exists $self->{template}) { 1899 if (exists $self->{template}) {
1511 my $layout = new CFClient::Layout; 1900 my $layout = new CFPlus::Layout;
1512 $layout->set_text (delete $self->{template}); 1901 $layout->set_text (delete $self->{template});
1513 $self->{template} = $layout; 1902 $self->{template} = $layout;
1514 } 1903 }
1515 1904
1516 if (exists $self->{markup}) { 1905 if (exists $self->{markup}) {
… …
1520 } 1909 }
1521 1910
1522 $self 1911 $self
1523} 1912}
1524 1913
1525sub escape($) {
1526 local $_ = $_[0];
1527
1528 s/&/&amp;/g;
1529 s/>/&gt;/g;
1530 s/</&lt;/g;
1531
1532 $_
1533}
1534
1535sub update { 1914sub update {
1536 my ($self) = @_; 1915 my ($self) = @_;
1537 1916
1538 delete $self->{texture}; 1917 delete $self->{texture};
1539 $self->SUPER::update; 1918 $self->SUPER::update;
1540} 1919}
1541 1920
1921sub realloc {
1922 my ($self) = @_;
1923
1924 delete $self->{ox};
1925 $self->SUPER::realloc;
1926}
1927
1542sub set_text { 1928sub set_text {
1543 my ($self, $text) = @_; 1929 my ($self, $text) = @_;
1544 1930
1545 return if $self->{text} eq "T$text"; 1931 return if $self->{text} eq "T$text";
1546 $self->{text} = "T$text"; 1932 $self->{text} = "T$text";
1547 1933
1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1549 $self->{layout}->set_text ($text); 1934 $self->{layout}->set_text ($text);
1550 1935
1936 delete $self->{size_req};
1551 $self->realloc; 1937 $self->realloc;
1552 $self->update; 1938 $self->update;
1553} 1939}
1554 1940
1555sub set_markup { 1941sub set_markup {
… …
1558 return if $self->{text} eq "M$markup"; 1944 return if $self->{text} eq "M$markup";
1559 $self->{text} = "M$markup"; 1945 $self->{text} = "M$markup";
1560 1946
1561 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1947 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1562 1948
1563 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1564 $self->{layout}->set_markup ($markup); 1949 $self->{layout}->set_markup ($markup);
1565 1950
1951 delete $self->{size_req};
1566 $self->realloc; 1952 $self->realloc;
1567 $self->update; 1953 $self->update;
1568} 1954}
1569 1955
1570sub size_request { 1956sub size_request {
1571 my ($self) = @_; 1957 my ($self) = @_;
1572 1958
1959 $self->{size_req} ||= do {
1573 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1960 $self->{layout}->set_font ($self->{font}) if $self->{font};
1574 $self->{layout}->set_width ($self->{max_w} || -1); 1961 $self->{layout}->set_width ($self->{max_w} || -1);
1575 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1962 $self->{layout}->set_ellipsise ($self->{ellipsise});
1576 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1963 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1577 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1964 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1578 1965
1579 my ($w, $h) = $self->{layout}->size; 1966 my ($w, $h) = $self->{layout}->size;
1580 1967
1581 if (exists $self->{template}) { 1968 if (exists $self->{template}) {
1582 $self->{template}->set_font ($self->{font}) if $self->{font}; 1969 $self->{template}->set_font ($self->{font}) if $self->{font};
1970 $self->{template}->set_width ($self->{max_w} || -1);
1583 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1584 1972
1585 my ($w2, $h2) = $self->{template}->size; 1973 my ($w2, $h2) = $self->{template}->size;
1586 1974
1587 $w = List::Util::max $w, $w2; 1975 $w = List::Util::max $w, $w2;
1588 $h = List::Util::max $h, $h2; 1976 $h = List::Util::max $h, $h2;
1977 }
1978
1979 [$w, $h]
1589 } 1980 };
1590 1981
1591 ($w, $h) 1982 @{ $self->{size_req} }
1592} 1983}
1593 1984
1985sub baseline_shift {
1986 $_[0]{layout}->descent
1987}
1988
1594sub size_allocate { 1989sub invoke_size_allocate {
1595 my ($self, $w, $h) = @_; 1990 my ($self, $w, $h) = @_;
1596 1991
1597 delete $self->{ox}; 1992 delete $self->{ox};
1598 1993
1599 delete $self->{texture} 1994 delete $self->{texture}
1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1995 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1996
1997 1
1601} 1998}
1602 1999
1603sub set_fontsize { 2000sub set_fontsize {
1604 my ($self, $fontsize) = @_; 2001 my ($self, $fontsize) = @_;
1605 2002
1606 $self->{fontsize} = $fontsize; 2003 $self->{fontsize} = $fontsize;
2004 delete $self->{size_req};
1607 delete $self->{texture}; 2005 delete $self->{texture};
1608 2006
1609 $self->realloc; 2007 $self->realloc;
1610} 2008}
1611 2009
2010sub reconfigure {
2011 my ($self) = @_;
2012
2013 delete $self->{size_req};
2014 delete $self->{texture};
2015
2016 $self->SUPER::reconfigure;
2017}
2018
1612sub _draw { 2019sub _draw {
1613 my ($self) = @_; 2020 my ($self) = @_;
1614 2021
1615 $self->SUPER::_draw; # draw background, if applicable 2022 $self->SUPER::_draw; # draw background, if applicable
1616 2023
1617 my $tex = $self->{texture} ||= do { 2024 my $size = $self->{texture} ||= do {
1618 $self->{layout}->set_foreground (@{$self->{fg}}); 2025 $self->{layout}->set_foreground (@{$self->{fg}});
1619 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2026 $self->{layout}->set_font ($self->{font}) if $self->{font};
1620 $self->{layout}->set_width ($self->{w}); 2027 $self->{layout}->set_width ($self->{w});
1621 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2028 $self->{layout}->set_ellipsise ($self->{ellipsise});
1622 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2029 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2030 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1624 2031
1625 new_from_layout CFClient::Texture $self->{layout} 2032 [$self->{layout}->size]
1626 }; 2033 };
1627 2034
1628 unless (exists $self->{ox}) { 2035 unless (exists $self->{ox}) {
1629 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2036 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1630 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2037 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1631 : ($self->{w} - $tex->{w}) * 0.5); 2038 : ($self->{w} - $size->[0]) * 0.5);
1632 2039
1633 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1635 : ($self->{h} - $tex->{h}) * 0.5); 2042 : ($self->{h} - $size->[1]) * 0.5);
1636 }; 2043 };
1637 2044
1638 glEnable GL_TEXTURE_2D; 2045# unless ($self->{list}) {
1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2046# $self->{list} = CFPlus::OpenGL::glGenList;
1640 2047# CFPlus::OpenGL::glNewList $self->{list};
1641 if ($tex->{format} == GL_ALPHA) { 2048# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1642 glColor @{$self->{fg}}; 2049# CFPlus::OpenGL::glEndList;
1643 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1644 } else {
1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1646 } 2050# }
2051#
2052# CFPlus::OpenGL::glCallList $self->{list};
1647 2053
1648 glDisable GL_TEXTURE_2D; 2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1649} 2055}
2056
2057#sub destroy {
2058# my ($self) = @_;
2059#
2060# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2061#
2062# $self->SUPER::destroy;
2063#}
1650 2064
1651############################################################################# 2065#############################################################################
1652 2066
1653package CFClient::UI::EntryBase; 2067package CFPlus::UI::EntryBase;
1654 2068
1655our @ISA = CFClient::UI::Label::; 2069our @ISA = CFPlus::UI::Label::;
1656 2070
1657use CFClient::OpenGL; 2071use CFPlus::OpenGL;
1658 2072
1659sub new { 2073sub new {
1660 my $class = shift; 2074 my $class = shift;
1661 2075
1662 $class->SUPER::new ( 2076 $class->SUPER::new (
1663 fg => [1, 1, 1], 2077 fg => [1, 1, 1],
1664 bg => [0, 0, 0, 0.2], 2078 bg => [0, 0, 0, 0.2],
1665 active_bg => [1, 1, 1, 0.5], 2079 active_bg => [0, 0, 1, .2],
1666 active_fg => [0, 0, 0], 2080 active_fg => [1, 1, 1],
2081 active_outline => [1, 1, 0],
1667 can_hover => 1, 2082 can_hover => 1,
1668 can_focus => 1, 2083 can_focus => 1,
1669 valign => 0, 2084 valign => 0,
1670 can_events => 1, 2085 can_events => 1,
2086 ellipsise => 0,
1671 #text => ... 2087 #text => ...
2088 #hidden => "*",
1672 @_ 2089 @_
1673 ) 2090 )
1674} 2091}
1675 2092
1676sub _set_text { 2093sub _set_text {
… …
1683 $self->{last_activity} = $::NOW; 2100 $self->{last_activity} = $::NOW;
1684 $self->{text} = $text; 2101 $self->{text} = $text;
1685 2102
1686 $text =~ s/./*/g if $self->{hidden}; 2103 $text =~ s/./*/g if $self->{hidden};
1687 $self->{layout}->set_text ("$text "); 2104 $self->{layout}->set_text ("$text ");
2105 delete $self->{size_req};
1688 2106
1689 $self->_emit (changed => $self->{text}); 2107 $self->emit (changed => $self->{text});
2108
2109 $self->realloc;
1690 $self->update; 2110 $self->update;
1691} 2111}
1692 2112
1693sub set_text { 2113sub set_text {
1694 my ($self, $text) = @_; 2114 my ($self, $text) = @_;
1695 2115
1696 $self->{cursor} = length $text; 2116 $self->{cursor} = length $text;
1697 $self->_set_text ($text); 2117 $self->_set_text ($text);
1698
1699 $self->realloc;
1700} 2118}
1701 2119
1702sub get_text { 2120sub get_text {
1703 $_[0]{text} 2121 $_[0]{text}
1704} 2122}
… …
1709 my ($w, $h) = $self->SUPER::size_request; 2127 my ($w, $h) = $self->SUPER::size_request;
1710 2128
1711 ($w + 1, $h) # add 1 for cursor 2129 ($w + 1, $h) # add 1 for cursor
1712} 2130}
1713 2131
1714sub key_down { 2132sub invoke_key_down {
1715 my ($self, $ev) = @_; 2133 my ($self, $ev) = @_;
1716 2134
1717 my $mod = $ev->{mod}; 2135 my $mod = $ev->{mod};
1718 my $sym = $ev->{sym}; 2136 my $sym = $ev->{sym};
1719 my $uni = $ev->{unicode}; 2137 my $uni = $ev->{unicode};
1720 2138
1721 my $text = $self->get_text; 2139 my $text = $self->get_text;
2140
2141 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1722 2142
1723 if ($uni == 8) { 2143 if ($uni == 8) {
1724 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2144 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1725 } elsif ($uni == 127) { 2145 } elsif ($uni == 127) {
1726 substr $text, $self->{cursor}, 1, ""; 2146 substr $text, $self->{cursor}, 1, "";
1727 } elsif ($sym == CFClient::SDLK_LEFT) { 2147 } elsif ($sym == CFPlus::SDLK_LEFT) {
1728 --$self->{cursor} if $self->{cursor}; 2148 --$self->{cursor} if $self->{cursor};
1729 } elsif ($sym == CFClient::SDLK_RIGHT) { 2149 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1730 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2150 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1731 } elsif ($sym == CFClient::SDLK_HOME) { 2151 } elsif ($sym == CFPlus::SDLK_HOME) {
2152 # what a hack
2153 $self->{cursor} =
2154 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2155 ? length $1
2156 : 0;
2157 } elsif ($sym == CFPlus::SDLK_END) {
2158 # uh, again
2159 $self->{cursor} =
2160 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2161 ? $self->{cursor} + length $1
2162 : length $self->{text};
2163 } elsif ($uni == 21) { # ctrl-u
2164 $text = "";
1732 $self->{cursor} = 0; 2165 $self->{cursor} = 0;
1733 } elsif ($sym == CFClient::SDLK_END) {
1734 $self->{cursor} = length $text;
1735 } elsif ($uni == 27) { 2166 } elsif ($uni == 27) {
1736 $self->_emit ('escape'); 2167 $self->emit ('escape');
1737 } elsif ($uni) { 2168 } elsif ($uni == 0x0d) {
2169 substr $text, $self->{cursor}++, 0, "\012";
2170 } elsif ($uni >= 0x20) {
1738 substr $text, $self->{cursor}++, 0, chr $uni; 2171 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else { 2172 } else {
1740 return 0; 2173 return 0;
1741 } 2174 }
1742 2175
1743 $self->_set_text ($text); 2176 $self->_set_text ($text);
1744 2177
1745 $self->realloc; 2178 $self->realloc;
2179 $self->update;
1746 2180
1747 1 2181 1
1748} 2182}
1749 2183
1750sub focus_in { 2184sub invoke_focus_in {
1751 my ($self) = @_; 2185 my ($self) = @_;
1752 2186
1753 $self->{last_activity} = $::NOW; 2187 $self->{last_activity} = $::NOW;
1754 2188
1755 $self->SUPER::focus_in; 2189 $self->SUPER::invoke_focus_in
1756} 2190}
1757 2191
1758sub button_down { 2192sub invoke_button_down {
1759 my ($self, $ev, $x, $y) = @_; 2193 my ($self, $ev, $x, $y) = @_;
1760 2194
1761 $self->SUPER::button_down ($ev, $x, $y); 2195 $self->SUPER::invoke_button_down ($ev, $x, $y);
1762 2196
1763 my $idx = $self->{layout}->xy_to_index ($x, $y); 2197 my $idx = $self->{layout}->xy_to_index ($x, $y);
1764 2198
1765 # byte-index to char-index 2199 # byte-index to char-index
1766 my $text = $self->{text}; 2200 my $text = $self->{text};
1767 utf8::encode $text; 2201 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1768 $self->{cursor} = length substr $text, 0, $idx; 2202 $self->{cursor} = length $text;
1769 2203
1770 $self->_set_text ($self->{text}); 2204 $self->_set_text ($self->{text});
1771 $self->update; 2205 $self->update;
1772 2206
1773 1 2207 1
1774} 2208}
1775 2209
1776sub mouse_motion { 2210sub invoke_mouse_motion {
1777 my ($self, $ev, $x, $y) = @_; 2211 my ($self, $ev, $x, $y) = @_;
1778# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2212# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1779 2213
1780 0 2214 1
1781} 2215}
1782 2216
1783sub _draw { 2217sub _draw {
1784 my ($self) = @_; 2218 my ($self) = @_;
1785 2219
1786 local $self->{fg} = $self->{fg}; 2220 local $self->{fg} = $self->{fg};
1787 2221
1788 if ($FOCUS == $self) { 2222 if ($FOCUS == $self) {
1789 glColor @{$self->{active_bg}}; 2223 glColor_premultiply @{$self->{active_bg}};
1790 $self->{fg} = $self->{active_fg}; 2224 $self->{fg} = $self->{active_fg};
1791 } else { 2225 } else {
1792 glColor @{$self->{bg}}; 2226 glColor_premultiply @{$self->{bg}};
1793 } 2227 }
1794 2228
1795 glEnable GL_BLEND; 2229 glEnable GL_BLEND;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2230 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1797 glBegin GL_QUADS; 2231 glBegin GL_QUADS;
1798 glVertex 0 , 0; 2232 glVertex 0 , 0;
1799 glVertex 0 , $self->{h}; 2233 glVertex 0 , $self->{h};
1800 glVertex $self->{w}, $self->{h}; 2234 glVertex $self->{w}, $self->{h};
1801 glVertex $self->{w}, 0; 2235 glVertex $self->{w}, 0;
… …
1809 2243
1810 unless (exists $self->{cur_h}) { 2244 unless (exists $self->{cur_h}) {
1811 my $text = substr $self->{text}, 0, $self->{cursor}; 2245 my $text = substr $self->{text}, 0, $self->{cursor};
1812 utf8::encode $text; 2246 utf8::encode $text;
1813 2247
1814 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2248 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1815 } 2249 }
1816 2250
1817 glColor @{$self->{fg}}; 2251 glColor_premultiply @{$self->{active_fg}};
1818 glBegin GL_LINES; 2252 glBegin GL_LINES;
1819 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2253 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1820 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2254 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1821 glEnd; 2255 glEnd;
1822 }
1823}
1824 2256
2257 glLineWidth 3;
2258 glColor @{$self->{active_outline}};
2259 glTranslate -.375, -.375;
2260 glBegin GL_LINE_LOOP;
2261 glVertex 0, 0;
2262 glVertex $self->{w}, 0;
2263 glVertex $self->{w}, $self->{h};
2264 glVertex 0, $self->{h};
2265 glEnd;
2266 glLineWidth 1;
2267 }
2268}
2269
2270#############################################################################
2271
1825package CFClient::UI::Entry; 2272package CFPlus::UI::Entry;
1826 2273
1827our @ISA = CFClient::UI::EntryBase::; 2274our @ISA = CFPlus::UI::EntryBase::;
1828 2275
1829use CFClient::OpenGL; 2276use CFPlus::OpenGL;
1830 2277
1831sub key_down { 2278sub invoke_key_down {
1832 my ($self, $ev) = @_; 2279 my ($self, $ev) = @_;
1833 2280
1834 my $sym = $ev->{sym}; 2281 my $sym = $ev->{sym};
1835 2282
1836 if ($sym == 13) { 2283 if ($ev->{uni} == 0x0d || $sym == 13) {
1837 unshift @{$self->{history}}, 2284 unshift @{$self->{history}},
1838 my $txt = $self->get_text; 2285 my $txt = $self->get_text;
2286
1839 $self->{history_pointer} = -1; 2287 $self->{history_pointer} = -1;
1840 $self->{history_saveback} = ''; 2288 $self->{history_saveback} = '';
1841 $self->_emit (activate => $txt); 2289 $self->emit (activate => $txt);
1842 $self->update; 2290 $self->update;
1843 2291
1844 } elsif ($sym == CFClient::SDLK_UP) { 2292 } elsif ($sym == CFPlus::SDLK_UP) {
1845 if ($self->{history_pointer} < 0) { 2293 if ($self->{history_pointer} < 0) {
1846 $self->{history_saveback} = $self->get_text; 2294 $self->{history_saveback} = $self->get_text;
1847 } 2295 }
1848 if (@{$self->{history} || []} > 0) { 2296 if (@{$self->{history} || []} > 0) {
1849 $self->{history_pointer}++; 2297 $self->{history_pointer}++;
… …
1851 $self->{history_pointer} = @{$self->{history} || []} - 1; 2299 $self->{history_pointer} = @{$self->{history} || []} - 1;
1852 } 2300 }
1853 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2301 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1854 } 2302 }
1855 2303
1856 } elsif ($sym == CFClient::SDLK_DOWN) { 2304 } elsif ($sym == CFPlus::SDLK_DOWN) {
1857 $self->{history_pointer}--; 2305 $self->{history_pointer}--;
1858 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2306 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1859 2307
1860 if ($self->{history_pointer} >= 0) { 2308 if ($self->{history_pointer} >= 0) {
1861 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2309 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1862 } else { 2310 } else {
1863 $self->set_text ($self->{history_saveback}); 2311 $self->set_text ($self->{history_saveback});
1864 } 2312 }
1865 2313
1866 } else { 2314 } else {
1867 return $self->SUPER::key_down ($ev) 2315 return $self->SUPER::invoke_key_down ($ev)
1868 } 2316 }
1869 2317
1870 1 2318 1
1871} 2319}
1872 2320
1873############################################################################# 2321#############################################################################
1874 2322
2323package CFPlus::UI::TextEdit;
2324
2325our @ISA = CFPlus::UI::EntryBase::;
2326
2327use CFPlus::OpenGL;
2328
2329sub move_cursor_ver {
2330 my ($self, $dy) = @_;
2331
2332 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2333
2334 $y += $dy;
2335
2336 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2337 $self->{cursor} = $index;
2338 delete $self->{cur_h};
2339 $self->update;
2340 return;
2341 }
2342}
2343
2344sub invoke_key_down {
2345 my ($self, $ev) = @_;
2346
2347 my $sym = $ev->{sym};
2348
2349 if ($sym == CFPlus::SDLK_UP) {
2350 $self->move_cursor_ver (-1);
2351 } elsif ($sym == CFPlus::SDLK_DOWN) {
2352 $self->move_cursor_ver (+1);
2353 } else {
2354 return $self->SUPER::invoke_key_down ($ev)
2355 }
2356
2357 1
2358}
2359
2360#############################################################################
2361
1875package CFClient::UI::Button; 2362package CFPlus::UI::ButtonBin;
1876 2363
1877our @ISA = CFClient::UI::Label::; 2364our @ISA = CFPlus::UI::Bin::;
1878 2365
1879use CFClient::OpenGL; 2366use CFPlus::OpenGL;
1880 2367
1881my @tex = 2368my @tex =
1882 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2369 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1883 qw(b1_button_active.png); 2370 qw(b1_button_inactive.png b1_button_active.png);
1884 2371
1885sub new { 2372sub new {
1886 my $class = shift; 2373 my $class = shift;
1887 2374
1888 $class->SUPER::new ( 2375 $class->SUPER::new (
1889 padding_x => 4,
1890 padding_y => 4,
1891 fg => [1, 1, 1],
1892 active_fg => [0, 0, 1],
1893 can_hover => 1, 2376 can_hover => 1,
1894 align => 0, 2377 align => 0,
1895 valign => 0, 2378 valign => 0,
1896 can_events => 1, 2379 can_events => 1,
1897 @_ 2380 @_
1898 ) 2381 )
1899} 2382}
1900 2383
1901sub activate { }
1902
1903sub button_up { 2384sub invoke_button_up {
1904 my ($self, $ev, $x, $y) = @_; 2385 my ($self, $ev, $x, $y) = @_;
1905 2386
1906 $self->emit ("activate") 2387 $self->emit ("activate")
1907 if $x >= 0 && $x < $self->{w} 2388 if $x >= 0 && $x < $self->{w}
1908 && $y >= 0 && $y < $self->{h}; 2389 && $y >= 0 && $y < $self->{h};
… …
1911} 2392}
1912 2393
1913sub _draw { 2394sub _draw {
1914 my ($self) = @_; 2395 my ($self) = @_;
1915 2396
1916 local $self->{fg} = $self->{fg};
1917
1918 if ($GRAB == $self) {
1919 $self->{fg} = $self->{active_fg};
1920 }
1921
1922 glEnable GL_TEXTURE_2D; 2397 glEnable GL_TEXTURE_2D;
1923 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2398 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1924 glColor 0, 0, 0, 1; 2399 glColor 0, 0, 0, 1;
1925 2400
2401 my $tex = $tex[$GRAB == $self];
1926 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2402 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1927 2403
1928 glDisable GL_TEXTURE_2D; 2404 glDisable GL_TEXTURE_2D;
1929 2405
1930 $self->SUPER::_draw; 2406 $self->SUPER::_draw;
1931} 2407}
1932 2408
1933############################################################################# 2409#############################################################################
1934 2410
1935package CFClient::UI::CheckBox; 2411package CFPlus::UI::Button;
1936 2412
1937our @ISA = CFClient::UI::DrawBG::; 2413our @ISA = CFPlus::UI::Label::;
2414
2415use CFPlus::OpenGL;
1938 2416
1939my @tex = 2417my @tex =
1940 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2418 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2419 qw(b1_button_inactive.png b1_button_active.png);
2420
2421sub new {
2422 my $class = shift;
2423
2424 $class->SUPER::new (
2425 padding_x => 4,
2426 padding_y => 4,
2427 fg => [1.0, 1.0, 1.0],
2428 active_fg => [0.8, 0.8, 0.8],
2429 can_hover => 1,
2430 align => 0,
2431 valign => 0,
2432 can_events => 1,
2433 @_
2434 )
2435}
2436
2437sub invoke_button_up {
2438 my ($self, $ev, $x, $y) = @_;
2439
2440 $self->emit ("activate")
2441 if $x >= 0 && $x < $self->{w}
2442 && $y >= 0 && $y < $self->{h};
2443
2444 1
2445}
2446
2447sub _draw {
2448 my ($self) = @_;
2449
2450 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2451
2452 glEnable GL_TEXTURE_2D;
2453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2454 glColor 0, 0, 0, 1;
2455
2456 my $tex = $tex[$GRAB == $self];
2457 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2458
2459 glDisable GL_TEXTURE_2D;
2460
2461 $self->SUPER::_draw;
2462}
2463
2464#############################################################################
2465
2466package CFPlus::UI::CheckBox;
2467
2468our @ISA = CFPlus::UI::DrawBG::;
2469
2470my @tex =
2471 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2472 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1942 2473
1943use CFClient::OpenGL; 2474use CFPlus::OpenGL;
1944 2475
1945sub new { 2476sub new {
1946 my $class = shift; 2477 my $class = shift;
1947 2478
1948 $class->SUPER::new ( 2479 $class->SUPER::new (
… …
1962 my ($self) = @_; 2493 my ($self) = @_;
1963 2494
1964 (6) x 2 2495 (6) x 2
1965} 2496}
1966 2497
2498sub toggle {
2499 my ($self) = @_;
2500
2501 $self->{state} = !$self->{state};
2502 $self->emit (changed => $self->{state});
2503 $self->update;
2504}
2505
1967sub button_down { 2506sub invoke_button_down {
1968 my ($self, $ev, $x, $y) = @_; 2507 my ($self, $ev, $x, $y) = @_;
1969 2508
1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2509 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2510 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1972 $self->{state} = !$self->{state}; 2511 $self->toggle;
1973 $self->_emit (changed => $self->{state});
1974 } else { 2512 } else {
1975 return 0 2513 return 0
1976 } 2514 }
1977 2515
1978 1 2516 1
… …
1998 glDisable GL_TEXTURE_2D; 2536 glDisable GL_TEXTURE_2D;
1999} 2537}
2000 2538
2001############################################################################# 2539#############################################################################
2002 2540
2003package CFClient::UI::Image; 2541package CFPlus::UI::Image;
2004 2542
2005our @ISA = CFClient::UI::Base::; 2543our @ISA = CFPlus::UI::Base::;
2006 2544
2007use CFClient::OpenGL; 2545use CFPlus::OpenGL;
2008use Carp qw/confess/;
2009 2546
2010our %loaded_images; 2547our %texture_cache;
2011 2548
2012sub new { 2549sub new {
2013 my $class = shift; 2550 my $class = shift;
2014 2551
2015 my $self = $class->SUPER::new (can_events => 0, @_); 2552 my $self = $class->SUPER::new (
2553 can_events => 0,
2554 scale => 1,
2555 @_,
2556 );
2016 2557
2017 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2558 $self->{path} || $self->{tex}
2559 or Carp::croak "'path' or 'tex' attributes required";
2018 2560
2019 $loaded_images{$self->{image}} ||= 2561 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2020 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2562 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2021 2563
2022 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2564 CFPlus::weaken $texture_cache{$self->{path}};
2023 2565
2024 Scalar::Util::weaken $loaded_images{$self->{image}}; 2566 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2025
2026 $self->{aspect} = $tex->{w} / $tex->{h};
2027 2567
2028 $self 2568 $self
2029} 2569}
2030 2570
2571sub STORABLE_freeze {
2572 my ($self, $cloning) = @_;
2573
2574 $self->{path}
2575 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2576
2577 $self->{path}
2578}
2579
2580sub STORABLE_attach {
2581 my ($self, $cloning, $path) = @_;
2582
2583 $self->new (path => $path)
2584}
2585
2031sub size_request { 2586sub size_request {
2032 my ($self) = @_; 2587 my ($self) = @_;
2033 2588
2034 ($self->{tex}->{w}, $self->{tex}->{h}) 2589 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2035} 2590}
2036 2591
2037sub _draw { 2592sub _draw {
2038 my ($self) = @_; 2593 my ($self) = @_;
2039 2594
… …
2056 glDisable GL_TEXTURE_2D; 2611 glDisable GL_TEXTURE_2D;
2057} 2612}
2058 2613
2059############################################################################# 2614#############################################################################
2060 2615
2616package CFPlus::UI::ImageButton;
2617
2618our @ISA = CFPlus::UI::Image::;
2619
2620use CFPlus::OpenGL;
2621
2622my %textures;
2623
2624sub new {
2625 my $class = shift;
2626
2627 my $self = $class->SUPER::new (
2628 padding_x => 4,
2629 padding_y => 4,
2630 fg => [1, 1, 1],
2631 active_fg => [0, 0, 1],
2632 can_hover => 1,
2633 align => 0,
2634 valign => 0,
2635 can_events => 1,
2636 @_
2637 );
2638}
2639
2640sub invoke_button_up {
2641 my ($self, $ev, $x, $y) = @_;
2642
2643 $self->emit ("activate")
2644 if $x >= 0 && $x < $self->{w}
2645 && $y >= 0 && $y < $self->{h};
2646
2647 1
2648}
2649
2650#############################################################################
2651
2061package CFClient::UI::VGauge; 2652package CFPlus::UI::VGauge;
2062 2653
2063our @ISA = CFClient::UI::Base::; 2654our @ISA = CFPlus::UI::Base::;
2064 2655
2065use List::Util qw(min max); 2656use List::Util qw(min max);
2066 2657
2067use CFClient::OpenGL; 2658use CFPlus::OpenGL;
2068 2659
2069my %tex = ( 2660my %tex = (
2070 food => [ 2661 food => [
2071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2662 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2663 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2073 ], 2664 ],
2074 grace => [ 2665 grace => [
2075 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2666 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2076 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2667 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2077 ], 2668 ],
2078 hp => [ 2669 hp => [
2079 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2670 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2080 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2671 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2081 ], 2672 ],
2082 mana => [ 2673 mana => [
2083 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2674 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2084 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2675 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2085 ], 2676 ],
2086); 2677);
2087 2678
2088# eg. VGauge->new (gauge => 'food'), default gauge: food 2679# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2148 my $ycut1 = max 0, min 1, $ycut; 2739 my $ycut1 = max 0, min 1, $ycut;
2149 my $ycut2 = max 0, min 1, $ycut - 1; 2740 my $ycut2 = max 0, min 1, $ycut - 1;
2150 2741
2151 my $h1 = $self->{h} * (1 - $ycut1); 2742 my $h1 = $self->{h} * (1 - $ycut1);
2152 my $h2 = $self->{h} * (1 - $ycut2); 2743 my $h2 = $self->{h} * (1 - $ycut2);
2744 my $h3 = $self->{h};
2745
2746 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2153 2747
2154 glEnable GL_BLEND; 2748 glEnable GL_BLEND;
2155 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2749 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2750 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2156 glEnable GL_TEXTURE_2D; 2751 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158 2753
2159 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2754 glBindTexture GL_TEXTURE_2D, $t1->{name};
2160 glBegin GL_QUADS; 2755 glBegin GL_QUADS;
… …
2175 2770
2176 if ($t3) { 2771 if ($t3) {
2177 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2772 glBindTexture GL_TEXTURE_2D, $t3->{name};
2178 glBegin GL_QUADS; 2773 glBegin GL_QUADS;
2179 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2774 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2180 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2775 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2181 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2776 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2182 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2777 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2183 glEnd; 2778 glEnd;
2184 } 2779 }
2185 2780
2186 glDisable GL_BLEND; 2781 glDisable GL_BLEND;
2187 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2188} 2783}
2189 2784
2190############################################################################# 2785#############################################################################
2191 2786
2192package CFClient::UI::Gauge; 2787package CFPlus::UI::Gauge;
2193 2788
2194our @ISA = CFClient::UI::VBox::; 2789our @ISA = CFPlus::UI::VBox::;
2195 2790
2196sub new { 2791sub new {
2197 my ($class, %arg) = @_; 2792 my ($class, %arg) = @_;
2198 2793
2199 my $self = $class->SUPER::new ( 2794 my $self = $class->SUPER::new (
… …
2201 can_hover => 1, 2796 can_hover => 1,
2202 can_events => 1, 2797 can_events => 1,
2203 %arg, 2798 %arg,
2204 ); 2799 );
2205 2800
2206 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2801 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2207 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2802 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2208 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2803 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2209 2804
2210 $self 2805 $self
2211} 2806}
2212 2807
2213sub set_fontsize { 2808sub set_fontsize {
… …
2234 $self->{value}->set_text ($val); 2829 $self->{value}->set_text ($val);
2235} 2830}
2236 2831
2237############################################################################# 2832#############################################################################
2238 2833
2239package CFClient::UI::Slider; 2834package CFPlus::UI::Slider;
2240 2835
2241use strict; 2836use strict;
2242 2837
2243use CFClient::OpenGL; 2838use CFPlus::OpenGL;
2244 2839
2245our @ISA = CFClient::UI::DrawBG::; 2840our @ISA = CFPlus::UI::DrawBG::;
2246 2841
2247my @tex = 2842my @tex =
2248 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2843 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2249 qw(s1_slider.png s1_slider_bg.png); 2844 qw(s1_slider.png s1_slider_bg.png);
2250 2845
2251sub new { 2846sub new {
2252 my $class = shift; 2847 my $class = shift;
2253 2848
… …
2274 $self->update; 2869 $self->update;
2275 2870
2276 $self 2871 $self
2277} 2872}
2278 2873
2279sub changed { }
2280
2281sub set_range { 2874sub set_range {
2282 my ($self, $range) = @_; 2875 my ($self, $range) = @_;
2283 2876
2284 ($range, $self->{range}) = ($self->{range}, $range); 2877 ($range, $self->{range}) = ($self->{range}, $range);
2285 2878
2286 $self->update
2287 if "@$range" ne "@{$self->{range}}"; 2879 if ("@$range" ne "@{$self->{range}}") {
2880 $self->update;
2881 $self->set_value ($self->{range}[0]);
2882 }
2288} 2883}
2289 2884
2290sub set_value { 2885sub set_value {
2291 my ($self, $value) = @_; 2886 my ($self, $value) = @_;
2292 2887
… …
2303 if $unit; 2898 if $unit;
2304 2899
2305 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2900 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2306 2901
2307 if ($value != $old_value) { 2902 if ($value != $old_value) {
2308 $self->_emit (changed => $value); 2903 $self->emit (changed => $value);
2309 $self->update; 2904 $self->update;
2310 } 2905 }
2311} 2906}
2312 2907
2313sub size_request { 2908sub size_request {
2314 my ($self) = @_; 2909 my ($self) = @_;
2315 2910
2316 ($self->{req_w}, $self->{req_h}) 2911 ($self->{req_w}, $self->{req_h})
2317} 2912}
2318 2913
2319sub button_down { 2914sub invoke_button_down {
2320 my ($self, $ev, $x, $y) = @_; 2915 my ($self, $ev, $x, $y) = @_;
2321 2916
2322 $self->SUPER::button_down ($ev, $x, $y); 2917 $self->SUPER::invoke_button_down ($ev, $x, $y);
2323 2918
2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2919 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2325 2920
2326 $self->mouse_motion ($ev, $x, $y) 2921 $self->invoke_mouse_motion ($ev, $x, $y);
2327}
2328 2922
2923 1
2924}
2925
2329sub mouse_motion { 2926sub invoke_mouse_motion {
2330 my ($self, $ev, $x, $y) = @_; 2927 my ($self, $ev, $x, $y) = @_;
2331 2928
2332 if ($GRAB == $self) { 2929 if ($GRAB == $self) {
2333 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2930 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2334 2931
… …
2338 2935
2339 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2936 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2340 } else { 2937 } else {
2341 return 0; 2938 return 0;
2342 } 2939 }
2940
2941 1
2942}
2943
2944sub invoke_mouse_wheel {
2945 my ($self, $ev) = @_;
2946
2947 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2948
2949 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2950
2951 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2343 2952
2344 1 2953 1
2345} 2954}
2346 2955
2347sub update { 2956sub update {
… …
2398 glDisable GL_TEXTURE_2D; 3007 glDisable GL_TEXTURE_2D;
2399} 3008}
2400 3009
2401############################################################################# 3010#############################################################################
2402 3011
2403package CFClient::UI::ValSlider; 3012package CFPlus::UI::ValSlider;
2404 3013
2405our @ISA = CFClient::UI::HBox::; 3014our @ISA = CFPlus::UI::HBox::;
2406 3015
2407sub new { 3016sub new {
2408 my ($class, %arg) = @_; 3017 my ($class, %arg) = @_;
2409 3018
2410 my $range = delete $arg{range}; 3019 my $range = delete $arg{range};
2411 3020
2412 my $self = $class->SUPER::new ( 3021 my $self = $class->SUPER::new (
2413 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3022 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2414 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3023 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2415 to_value => sub { shift }, 3024 to_value => sub { shift },
2416 from_value => sub { shift }, 3025 from_value => sub { shift },
2417 %arg, 3026 %arg,
2418 ); 3027 );
2419 3028
… …
2439sub set_range { shift->{slider}->set_range (@_) } 3048sub set_range { shift->{slider}->set_range (@_) }
2440sub set_value { shift->{slider}->set_value (@_) } 3049sub set_value { shift->{slider}->set_value (@_) }
2441 3050
2442############################################################################# 3051#############################################################################
2443 3052
2444package CFClient::UI::TextView; 3053package CFPlus::UI::TextScroller;
2445 3054
2446our @ISA = CFClient::UI::HBox::; 3055our @ISA = CFPlus::UI::HBox::;
2447 3056
2448use CFClient::OpenGL; 3057use CFPlus::OpenGL;
2449 3058
2450sub new { 3059sub new {
2451 my $class = shift; 3060 my $class = shift;
2452 3061
2453 my $self = $class->SUPER::new ( 3062 my $self = $class->SUPER::new (
2454 fontsize => 1, 3063 fontsize => 1,
2455 can_events => 0, 3064 can_events => 1,
3065 indent => 0,
2456 #font => default_font 3066 #font => default_font
2457 @_, 3067 @_,
2458 3068
2459 layout => (new CFClient::Layout 1), 3069 layout => (new CFPlus::Layout),
2460 par => [], 3070 par => [],
3071 max_par => 0,
2461 height => 0, 3072 height => 0,
2462 children => [ 3073 children => [
2463 (new CFClient::UI::Empty expand => 1), 3074 (new CFPlus::UI::Empty expand => 1),
2464 (new CFClient::UI::Slider vertical => 1), 3075 (new CFPlus::UI::Slider vertical => 1),
2465 ], 3076 ],
2466 ); 3077 );
2467 3078
2468 $self->{children}[1]->connect (changed => sub { $self->update }); 3079 $self->{children}[1]->connect (changed => sub { $self->update });
2469 3080
… …
2475 3086
2476 $self->{fontsize} = $fontsize; 3087 $self->{fontsize} = $fontsize;
2477 $self->reflow; 3088 $self->reflow;
2478} 3089}
2479 3090
3091sub size_request {
3092 my ($self) = @_;
3093
3094 my ($empty, $slider) = $self->visible_children;
3095
3096 local $self->{children} = [$empty, $slider];
3097 $self->SUPER::size_request
3098}
3099
2480sub size_allocate { 3100sub invoke_size_allocate {
2481 my ($self, $w, $h) = @_; 3101 my ($self, $w, $h) = @_;
2482 3102
2483 $self->SUPER::size_allocate ($w, $h); 3103 my ($empty, $slider, @other) = @{ $self->{children} };
3104 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2484 3105
2485 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3106 $self->{layout}->set_font ($self->{font}) if $self->{font};
2486 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3107 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $self->{layout}->set_width ($self->{children}[0]{w}); 3108 $self->{layout}->set_width ($empty->{w});
3109 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 3110
2489 $self->reflow; 3111 $self->reflow;
2490}
2491 3112
2492sub text_size { 3113 local $self->{children} = [$empty, $slider];
3114 $self->SUPER::invoke_size_allocate ($w, $h)
3115}
3116
3117sub invoke_mouse_wheel {
2493 my ($self, $text, $indent) = @_; 3118 my ($self, $ev) = @_;
3119
3120 return 0 unless $ev->{dy}; # only vertical movements
3121
3122 $self->{children}[1]->emit (mouse_wheel => $ev);
3123
3124 1
3125}
3126
3127sub get_layout {
3128 my ($self, $para) = @_;
2494 3129
2495 my $layout = $self->{layout}; 3130 my $layout = $self->{layout};
2496 3131
3132 $layout->set_font ($self->{font}) if $self->{font};
3133 $layout->set_foreground (@{$para->{fg}});
2497 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3134 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $layout->set_width ($self->{children}[0]{w} - $indent); 3135 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3136 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2499 $layout->set_markup ($text); 3137 $layout->set_markup ($para->{markup});
3138
3139 $layout->set_shapes (
3140 map
3141 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3142 @{$para->{widget}}
2500 3143 );
3144
2501 $layout->size 3145 $layout
2502} 3146}
2503 3147
2504sub reflow { 3148sub reflow {
2505 my ($self) = @_; 3149 my ($self) = @_;
2506 3150
… …
2513 3157
2514 # todo: base offset on lines or so, not on pixels 3158 # todo: base offset on lines or so, not on pixels
2515 $self->{children}[1]->set_value ($offset); 3159 $self->{children}[1]->set_value ($offset);
2516} 3160}
2517 3161
3162sub current_paragraph {
3163 my ($self) = @_;
3164
3165 $self->{top_paragraph} - 1
3166}
3167
3168sub scroll_to {
3169 my ($self, $para) = @_;
3170
3171 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3172
3173 $self->{scroll_to} = $para;
3174 $self->update;
3175}
3176
2518sub clear { 3177sub clear {
2519 my ($self) = @_; 3178 my ($self) = @_;
3179
3180 my (undef, undef, @other) = @{ $self->{children} };
3181 $self->remove ($_) for @other;
2520 3182
2521 $self->{par} = []; 3183 $self->{par} = [];
2522 $self->{height} = 0; 3184 $self->{height} = 0;
2523 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3185 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2524} 3186}
2525 3187
2526sub add_paragraph { 3188sub add_paragraph {
2527 my ($self, $color, $text, $indent) = @_; 3189 my $self = shift;
2528 3190
2529 for my $line (split /\n/, $text) { 3191 for my $para (@_) {
2530 my ($w, $h) = $self->text_size ($line); 3192 $para = {
3193 fg => [1, 1, 1, 1],
3194 indent => 0,
3195 markup => "",
3196 widget => [],
3197 ref $para ? %$para : (markup => $para),
3198 w => 1e10,
3199 wrapped => 1,
3200 };
3201
3202 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3203 push @{$self->{par}}, $para;
3204 }
3205
3206 if (my $max = $self->{max_par}) {
3207 shift @{$self->{par}} while @{$self->{par}} > $max;
3208 }
3209
3210 $self->{need_reflow}++;
3211 $self->update;
3212}
3213
3214sub scroll_to_bottom {
3215 my ($self) = @_;
3216
3217 $self->{scroll_to} = $#{$self->{par}};
3218 $self->update;
3219}
3220
3221sub force_uptodate {
3222 my ($self) = @_;
3223
3224 if (delete $self->{need_reflow}) {
3225 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3226
3227 my $height = 0;
3228
3229 for my $para (@{$self->{par}}) {
3230 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3231 my $layout = $self->get_layout ($para);
3232 my ($w, $h) = $layout->size;
3233
3234 $para->{w} = $w + $para->{indent};
3235 $para->{h} = $h;
3236 $para->{wrapped} = $layout->has_wrapped;
3237 }
3238
3239 $para->{y} = $height;
3240 $height += $para->{h};
3241 }
3242
2531 $self->{height} += $h; 3243 $self->{height} = $height;
2532 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3244 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2533 }
2534 3245
2535 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3246 delete $self->{texture};
3247 }
3248
3249 if (my $paridx = delete $self->{scroll_to}) {
3250 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3251 }
2536} 3252}
2537 3253
2538sub update { 3254sub update {
2539 my ($self) = @_; 3255 my ($self) = @_;
2540 3256
… …
2542 3258
2543 return unless $self->{h} > 0; 3259 return unless $self->{h} > 0;
2544 3260
2545 delete $self->{texture}; 3261 delete $self->{texture};
2546 3262
2547 $ROOT->on_post_alloc ($self, sub { 3263 $ROOT->on_post_alloc ($self => sub {
3264 $self->force_uptodate;
3265
2548 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3266 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2549 3267
2550 if (delete $self->{need_reflow}) {
2551 my $height = 0;
2552
2553 my $layout = $self->{layout};
2554
2555 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2556
2557 for (@{$self->{par}}) {
2558 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2559 $layout->set_width ($W - $_->[3]);
2560 $layout->set_markup ($_->[4]);
2561 my ($w, $h) = $layout->size;
2562 $_->[0] = $w + $_->[3];
2563 $_->[1] = $h;
2564 }
2565
2566 $height += $_->[1];
2567 }
2568
2569 $self->{height} = $height;
2570
2571 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2572
2573 delete $self->{texture};
2574 }
2575
2576 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3268 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2577 glClearColor 0.5, 0.5, 0.5, 0; 3269 glClearColor 0, 0, 0, 0;
2578 glClear GL_COLOR_BUFFER_BIT; 3270 glClear GL_COLOR_BUFFER_BIT;
2579 3271
3272 package CFPlus::UI::Base;
3273 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3274 (0, 0, $self->{w}, $self->{h});
3275
3276 my $top = int $self->{children}[1]{range}[0];
3277
3278 my $paridx = 0;
3279 my $top_paragraph;
2580 my $top = int $self->{children}[1]{range}[0]; 3280 my $top = int $self->{children}[1]{range}[0];
2581 3281
2582 my $y0 = $top; 3282 my $y0 = $top;
2583 my $y1 = $top + $H; 3283 my $y1 = $top + $H;
2584 3284
2585 my $y = 0;
2586
2587 my $layout = $self->{layout};
2588
2589 $layout->set_font ($self->{font}) if $self->{font};
2590
2591 glEnable GL_BLEND;
2592 #TODO# not correct in windows where rgba is forced off
2593 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2594
2595 for my $par (@{$self->{par}}) { 3285 for my $para (@{$self->{par}}) {
2596 my $h = $par->[1]; 3286 my $h = $para->{h};
3287 my $y = $para->{y};
2597 3288
2598 if ($y0 < $y + $h && $y < $y1) { 3289 if ($y0 < $y + $h && $y < $y1) {
2599 $layout->set_foreground (@{ $par->[2] }); 3290 my $layout = $self->get_layout ($para);
2600 $layout->set_width ($W - $par->[3]);
2601 $layout->set_markup ($par->[4]);
2602 3291
2603 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3292 $layout->render ($para->{indent}, $y - $y0);
2604 3293
2605 glRasterPos $par->[3], $y - $y0; 3294 if (my @w = @{ $para->{widget} }) {
2606 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3295 my @s = $layout->get_shapes;
3296
3297 for (@w) {
3298 my ($dx, $dy) = splice @s, 0, 2, ();
3299
3300 $_->{x} = $dx + $para->{indent};
3301 $_->{y} = $dy + $y - $y0;
3302
3303 $_->draw;
3304 }
3305 }
2607 } 3306 }
2608 3307
2609 $y += $h; 3308 $paridx++;
3309 $top_paragraph ||= $paridx if $y >= $top;
2610 } 3310 }
2611 3311
2612 glDisable GL_BLEND; 3312 $self->{top_paragraph} = $top_paragraph;
2613 }; 3313 };
2614 }); 3314 });
2615} 3315}
2616 3316
3317sub reconfigure {
3318 my ($self) = @_;
3319
3320 $self->SUPER::reconfigure;
3321
3322 $_->{w} = 1e10 for @{ $self->{par} };
3323 $self->reflow;
3324}
3325
2617sub _draw { 3326sub _draw {
2618 my ($self) = @_; 3327 my ($self) = @_;
2619 3328
2620 glEnable GL_TEXTURE_2D; 3329 glEnable GL_TEXTURE_2D;
2621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3330 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2622 glColor 1, 1, 1, 1; 3331 glColor 0, 0, 0, 1;
2623 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3332 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2624 glDisable GL_TEXTURE_2D; 3333 glDisable GL_TEXTURE_2D;
2625 3334
2626 $self->{children}[1]->draw; 3335 $self->{children}[1]->draw;
2627
2628} 3336}
2629 3337
2630############################################################################# 3338#############################################################################
2631 3339
2632package CFClient::UI::Animator; 3340package CFPlus::UI::Animator;
2633 3341
2634use CFClient::OpenGL; 3342use CFPlus::OpenGL;
2635 3343
2636our @ISA = CFClient::UI::Bin::; 3344our @ISA = CFPlus::UI::Bin::;
2637 3345
2638sub moveto { 3346sub moveto {
2639 my ($self, $x, $y) = @_; 3347 my ($self, $x, $y) = @_;
2640 3348
2641 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3349 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2669 glPopMatrix; 3377 glPopMatrix;
2670} 3378}
2671 3379
2672############################################################################# 3380#############################################################################
2673 3381
2674package CFClient::UI::Flopper; 3382package CFPlus::UI::Flopper;
2675 3383
2676our @ISA = CFClient::UI::Button::; 3384our @ISA = CFPlus::UI::Button::;
2677 3385
2678sub new { 3386sub new {
2679 my $class = shift; 3387 my $class = shift;
2680 3388
2681 my $self = $class->SUPER::new ( 3389 my $self = $class->SUPER::new (
… …
2693 $self->{other}->toggle_visibility; 3401 $self->{other}->toggle_visibility;
2694} 3402}
2695 3403
2696############################################################################# 3404#############################################################################
2697 3405
2698package CFClient::UI::Tooltip; 3406package CFPlus::UI::Tooltip;
2699 3407
2700our @ISA = CFClient::UI::Bin::; 3408our @ISA = CFPlus::UI::Bin::;
2701 3409
2702use CFClient::OpenGL; 3410use CFPlus::OpenGL;
2703 3411
2704sub new { 3412sub new {
2705 my $class = shift; 3413 my $class = shift;
2706 3414
2707 $class->SUPER::new ( 3415 $class->SUPER::new (
… …
2710 ) 3418 )
2711} 3419}
2712 3420
2713sub set_tooltip_from { 3421sub set_tooltip_from {
2714 my ($self, $widget) = @_; 3422 my ($self, $widget) = @_;
3423
3424 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3425 if $widget->{tooltip} =~ /^#(.*)$/;
2715 3426
2716 my $tooltip = $widget->{tooltip}; 3427 my $tooltip = $widget->{tooltip};
2717 3428
2718 if ($ENV{CFPLUS_DEBUG} & 2) { 3429 if ($ENV{CFPLUS_DEBUG} & 2) {
2719 $tooltip .= "\n\n" . (ref $widget) . "\n" 3430 $tooltip .= "\n\n" . (ref $widget) . "\n"
2720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3431 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2721 . "req $widget->{req_w} $widget->{req_h}\n" 3432 . "req $widget->{req_w} $widget->{req_h}\n"
2722 . "visible $widget->{visible}"; 3433 . "visible $widget->{visible}";
2723 } 3434 }
2724 3435
3436 $tooltip =~ s/^\n+//;
3437 $tooltip =~ s/\n+$//;
3438
2725 $self->add (new CFClient::UI::Label 3439 $self->add (new CFPlus::UI::Label
2726 markup => $tooltip, 3440 markup => $tooltip,
2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2728 fontsize => 0.8, 3442 fontsize => 0.8,
2729 fg => [0, 0, 0, 1], 3443 style => 1, # FLAG_INVERSE
2730 ellipsise => 0, 3444 ellipsise => 0,
2731 font => ($widget->{tooltip_font} || $::FONT_PROP), 3445 font => ($widget->{tooltip_font} || $::FONT_PROP),
2732 ); 3446 );
2733} 3447}
2734 3448
… …
2738 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3452 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2739 3453
2740 ($w + 4, $h + 4) 3454 ($w + 4, $h + 4)
2741} 3455}
2742 3456
2743sub size_allocate { 3457sub invoke_size_allocate {
2744 my ($self, $w, $h) = @_; 3458 my ($self, $w, $h) = @_;
2745 3459
2746 $self->SUPER::size_allocate ($w - 4, $h - 4); 3460 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2747} 3461}
2748 3462
2749sub visibility_change { 3463sub invoke_visibility_change {
2750 my ($self, $visible) = @_; 3464 my ($self, $visible) = @_;
2751 3465
2752 return unless $visible; 3466 return unless $visible;
2753 3467
2754 $self->{root}->on_post_alloc ("move_$self" => sub { 3468 $self->{root}->on_post_alloc ("move_$self" => sub {
2755 my $widget = $self->{owner} 3469 my $widget = $self->{owner}
2756 or return; 3470 or return;
2757 3471
3472 if ($widget->{visible}) {
2758 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3473 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2759 3474
2760 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3475 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2761 if $x + $self->{w} > $::WIDTH; 3476 if $x + $self->{w} > $self->{root}{w};
2762 3477
2763 $self->move_abs ($x, $y); 3478 $self->move_abs ($x, $y);
3479 } else {
3480 $self->hide;
3481 }
2764 }); 3482 });
2765} 3483}
2766 3484
2767sub _draw { 3485sub _draw {
2768 my ($self) = @_; 3486 my ($self) = @_;
… …
2792 $self->SUPER::_draw; 3510 $self->SUPER::_draw;
2793} 3511}
2794 3512
2795############################################################################# 3513#############################################################################
2796 3514
2797package CFClient::UI::Face; 3515package CFPlus::UI::Face;
2798 3516
2799our @ISA = CFClient::UI::Base::; 3517our @ISA = CFPlus::UI::DrawBG::;
2800 3518
2801use CFClient::OpenGL; 3519use CFPlus::OpenGL;
2802 3520
2803sub new { 3521sub new {
2804 my $class = shift; 3522 my $class = shift;
2805 3523
2806 my $self = $class->SUPER::new ( 3524 my $self = $class->SUPER::new (
3525 size_w => 32,
3526 size_h => 8,
2807 aspect => 1, 3527 aspect => 1,
2808 can_events => 0, 3528 can_events => 0,
2809 @_, 3529 @_,
2810 ); 3530 );
2811 3531
2812 if ($self->{anim} && $self->{animspeed}) { 3532 if ($self->{anim} && $self->{animspeed}) {
2813 Scalar::Util::weaken (my $widget = $self); 3533 CFPlus::weaken (my $widget = $self);
2814 3534
3535 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3536 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2815 $self->{timer} = Event->timer ( 3537 $self->{timer} = Event->timer (
2816 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2817 hard => 1, 3538 parked => 1,
2818 interval => $self->{animspeed},
2819 cb => sub { 3539 cb => sub {
3540 return unless $::CONN && $widget;
3541
2820 ++$widget->{frame}; 3542 ++$widget->{frame};
3543 $widget->update_face;
2821 $widget->update; 3544 $widget->update;
3545
3546 $widget->update_timer;
2822 }, 3547 },
2823 ); 3548 );
3549
3550 $self->update_face;
3551 $self->update_timer;
2824 } 3552 }
2825 3553
2826 $self 3554 $self
2827} 3555}
2828 3556
3557sub update_timer {
3558 my ($self) = @_;
3559
3560 return unless $self->{timer};
3561
3562 if ($self->{visible}) {
3563 $self->{timer}->at (
3564 $self->{anim_start}
3565 + $self->{animspeed}
3566 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3567 );
3568 $self->{timer}->start;
3569 } else {
3570 $self->{timer}->stop;
3571 }
3572}
3573
3574sub update_face {
3575 my ($self) = @_;
3576
3577 return unless $::CONN;
3578
3579 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3580 if ($anim && @$anim) {
3581 delete $self->{wait_face};
3582 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3583 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3584 }
3585 }
3586}
3587
2829sub size_request { 3588sub size_request {
2830 (32, 8) 3589 my ($self) = @_;
3590
3591 if ($::CONN) {
3592 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3593 if (my $tex = $::CONN->{texture}[$faceid]) {
3594 $self->{tex} = $tex;
3595 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3596 } else {
3597 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3598 $self->realloc;
3599 });
3600 }
3601 }
3602 }
3603
3604 ($self->{size_w} || 8, $self->{size_h} || 8)
2831} 3605}
2832 3606
2833sub update { 3607sub update {
2834 my ($self) = @_; 3608 my ($self) = @_;
2835 3609
2836 return unless $self->{visible}; 3610 return unless $self->{visible};
2837 3611
2838 $self->SUPER::update; 3612 $self->SUPER::update;
2839} 3613}
2840 3614
3615sub invoke_visibility_change {
3616 my ($self) = @_;
3617
3618 $self->update_timer;
3619
3620 0
3621}
3622
2841sub _draw { 3623sub _draw {
2842 my ($self) = @_; 3624 my ($self) = @_;
2843 3625
2844 return unless $::CONN; 3626 $self->SUPER::_draw;
2845 3627
2846 my $face; 3628 if (my $tex = $self->{tex}) {
2847
2848 if ($self->{frame}) {
2849 my $anim = $::CONN->{anim}[$self->{anim}];
2850
2851 $face = $anim->[ $self->{frame} % @$anim ]
2852 if $anim && @$anim;
2853 }
2854
2855 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2856
2857 if ($tex) {
2858 glEnable GL_TEXTURE_2D; 3629 glEnable GL_TEXTURE_2D;
2859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2860 glColor 1, 1, 1, 1; 3631 glColor 0, 0, 0, 1;
2861 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3632 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2862 glDisable GL_TEXTURE_2D; 3633 glDisable GL_TEXTURE_2D;
2863 } 3634 }
2864} 3635}
2865 3636
2866sub DESTROY { 3637sub destroy {
2867 my ($self) = @_; 3638 my ($self) = @_;
2868 3639
2869 $self->{timer}->cancel 3640 (delete $self->{timer})->cancel
2870 if $self->{timer}; 3641 if $self->{timer};
2871 3642
2872 $self->SUPER::DESTROY; 3643 $self->SUPER::destroy;
2873} 3644}
2874 3645
2875############################################################################# 3646#############################################################################
2876 3647
2877package CFClient::UI::Buttonbar; 3648package CFPlus::UI::Buttonbar;
2878 3649
2879our @ISA = CFClient::UI::HBox::; 3650our @ISA = CFPlus::UI::HBox::;
2880 3651
2881# TODO: should actualyl wrap buttons and other goodies. 3652# TODO: should actually wrap buttons and other goodies.
2882 3653
2883############################################################################# 3654#############################################################################
2884 3655
2885package CFClient::UI::Menu; 3656package CFPlus::UI::Menu;
2886 3657
2887our @ISA = CFClient::UI::FancyFrame::; 3658our @ISA = CFPlus::UI::Toplevel::;
2888 3659
2889use CFClient::OpenGL; 3660use CFPlus::OpenGL;
2890 3661
2891sub new { 3662sub new {
2892 my $class = shift; 3663 my $class = shift;
2893 3664
2894 my $self = $class->SUPER::new ( 3665 my $self = $class->SUPER::new (
2895 items => [], 3666 items => [],
2896 z => 100, 3667 z => 100,
2897 @_, 3668 @_,
2898 ); 3669 );
2899 3670
2900 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3671 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2901 3672
2902 for my $item (@{ $self->{items} }) { 3673 for my $item (@{ $self->{items} }) {
2903 my ($widget, $cb) = @$item; 3674 my ($widget, $cb, $tooltip) = @$item;
2904 3675
2905 # handle various types of items, only text for now 3676 # handle various types of items, only text for now
2906 if (!ref $widget) { 3677 if (!ref $widget) {
3678 if ($widget =~ /\t/) {
3679 my ($left, $right) = split /\t/, $widget, 2;
3680
2907 $widget = new CFClient::UI::Label 3681 $widget = new CFPlus::UI::HBox
2908 can_hover => 1, 3682 can_hover => 1,
2909 can_events => 1, 3683 can_events => 1,
3684 tooltip => $tooltip,
3685 children => [
3686 (new CFPlus::UI::Label markup => $left, expand => 1),
3687 (new CFPlus::UI::Label markup => $right, align => +1),
3688 ],
3689 ;
3690
3691 } else {
3692 $widget = new CFPlus::UI::Label
3693 can_hover => 1,
3694 can_events => 1,
2910 text => $widget; 3695 markup => $widget,
3696 tooltip => $tooltip;
3697 }
2911 } 3698 }
2912 3699
2913 $self->{item}{$widget} = $item; 3700 $self->{item}{$widget} = $item;
2914 3701
2915 $self->{vbox}->add ($widget); 3702 $self->{vbox}->add ($widget);
… …
2920 3707
2921# popup given the event (must be a mouse button down event currently) 3708# popup given the event (must be a mouse button down event currently)
2922sub popup { 3709sub popup {
2923 my ($self, $ev) = @_; 3710 my ($self, $ev) = @_;
2924 3711
2925 $self->_emit ("popdown"); 3712 $self->emit ("popdown");
2926 3713
2927 # maybe save $GRAB? must be careful about events... 3714 # maybe save $GRAB? must be careful about events...
2928 $GRAB = $self; 3715 $GRAB = $self;
2929 $self->{button} = $ev->{button}; 3716 $self->{button} = $ev->{button};
2930 3717
2931 $self->show; 3718 $self->show;
2932 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3719 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2933} 3720}
2934 3721
2935sub mouse_motion { 3722sub invoke_mouse_motion {
2936 my ($self, $ev, $x, $y) = @_; 3723 my ($self, $ev, $x, $y) = @_;
2937 3724
2938 # TODO: should use vbox->find_widget or so 3725 # TODO: should use vbox->find_widget or so
2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3726 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2940 $self->{hover} = $self->{item}{$HOVER}; 3727 $self->{hover} = $self->{item}{$HOVER};
2941 3728
2942 0 3729 0
2943} 3730}
2944 3731
2945sub button_up { 3732sub invoke_button_up {
2946 my ($self, $ev, $x, $y) = @_; 3733 my ($self, $ev, $x, $y) = @_;
2947 3734
2948 if ($ev->{button} == $self->{button}) { 3735 if ($ev->{button} == $self->{button}) {
2949 undef $GRAB; 3736 undef $GRAB;
2950 $self->hide; 3737 $self->hide;
2951 3738
2952 $self->_emit ("popdown"); 3739 $self->emit ("popdown");
2953 $self->{hover}[1]->() if $self->{hover}; 3740 $self->{hover}[1]->() if $self->{hover};
2954 } else { 3741 } else {
2955 return 0 3742 return 0
2956 } 3743 }
2957 3744
2958 1 3745 1
2959} 3746}
2960 3747
2961############################################################################# 3748#############################################################################
2962 3749
2963package CFClient::UI::Multiplexer; 3750package CFPlus::UI::Multiplexer;
2964 3751
2965our @ISA = CFClient::UI::Container::; 3752our @ISA = CFPlus::UI::Container::;
2966 3753
2967sub new { 3754sub new {
2968 my $class = shift; 3755 my $class = shift;
2969 3756
2970 my $self = $class->SUPER::new ( 3757 my $self = $class->SUPER::new (
… …
2984 3771
2985 $self->{current} = $self->{children}[0] 3772 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} }; 3773 if @{ $self->{children} };
2987} 3774}
2988 3775
3776sub get_current_page {
3777 my ($self) = @_;
3778
3779 $self->{current}
3780}
3781
2989sub set_current_page { 3782sub set_current_page {
2990 my ($self, $page_or_widget) = @_; 3783 my ($self, $page_or_widget) = @_;
2991 3784
2992 my $widget = ref $page_or_widget 3785 my $widget = ref $page_or_widget
2993 ? $page_or_widget 3786 ? $page_or_widget
2994 : $self->{children}[$page_or_widget]; 3787 : $self->{children}[$page_or_widget];
2995 3788
2996 $self->{current} = $widget; 3789 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3790 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998 3791
2999 $self->_emit (page_changed => $self->{current}); 3792 $self->emit (page_changed => $self->{current});
3000 3793
3001 $self->realloc; 3794 $self->realloc;
3002} 3795}
3003 3796
3004sub visible_children { 3797sub visible_children {
… …
3009 my ($self) = @_; 3802 my ($self) = @_;
3010 3803
3011 $self->{current}->size_request 3804 $self->{current}->size_request
3012} 3805}
3013 3806
3014sub size_allocate { 3807sub invoke_size_allocate {
3015 my ($self, $w, $h) = @_; 3808 my ($self, $w, $h) = @_;
3016 3809
3017 $self->{current}->configure (0, 0, $w, $h); 3810 $self->{current}->configure (0, 0, $w, $h);
3811
3812 1
3018} 3813}
3019 3814
3020sub _draw { 3815sub _draw {
3021 my ($self) = @_; 3816 my ($self) = @_;
3022 3817
3023 $self->{current}->draw; 3818 $self->{current}->draw;
3024} 3819}
3025 3820
3026############################################################################# 3821#############################################################################
3027 3822
3028package CFClient::UI::Notebook; 3823package CFPlus::UI::Notebook;
3029 3824
3030our @ISA = CFClient::UI::VBox::; 3825our @ISA = CFPlus::UI::VBox::;
3031 3826
3032sub new { 3827sub new {
3033 my $class = shift; 3828 my $class = shift;
3034 3829
3035 my $self = $class->SUPER::new ( 3830 my $self = $class->SUPER::new (
3036 buttonbar => (new CFClient::UI::Buttonbar), 3831 buttonbar => (new CFPlus::UI::Buttonbar),
3037 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3832 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3038 # filter => # will be put between multiplexer and $self 3833 # filter => # will be put between multiplexer and $self
3039 @_, 3834 @_,
3040 ); 3835 );
3041 3836
3042 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3837 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3043 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3838 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3044 3839
3840 {
3841 Scalar::Util::weaken (my $wself = $self);
3842
3843 $self->{multiplexer}->connect (c_add => sub {
3844 my ($mplex, $widgets) = @_;
3845
3846 for my $child (@$widgets) {
3847 Scalar::Util::weaken $child;
3848 $child->{c_tab_} ||= do {
3849 my $tab =
3850 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3851 ? $child->{c_tab}
3852 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3853
3854 $tab->connect (activate => sub {
3855 $wself->set_current_page ($child);
3856 });
3857
3858 $tab
3859 };
3860
3861 $self->{buttonbar}->add ($child->{c_tab_});
3862 }
3863 });
3864
3865 $self->{multiplexer}->connect (c_remove => sub {
3866 my ($mplex, $widgets) = @_;
3867
3868 for my $child (@$widgets) {
3869 $wself->{buttonbar}->remove ($child->{c_tab_});
3870 }
3871 });
3872 }
3873
3045 $self 3874 $self
3046} 3875}
3047 3876
3048sub add { 3877sub add {
3878 my ($self, @widgets) = @_;
3879
3880 $self->{multiplexer}->add (@widgets)
3881}
3882
3883sub remove {
3884 my ($self, @widgets) = @_;
3885
3886 $self->{multiplexer}->remove (@widgets)
3887}
3888
3889sub pages {
3890 my ($self) = @_;
3891 $self->{multiplexer}->children
3892}
3893
3894sub add_tab {
3049 my ($self, $title, $widget, $tooltip) = @_; 3895 my ($self, $title, $widget, $tooltip) = @_;
3050 3896
3051 Scalar::Util::weaken $self; 3897 $title = [$title, $tooltip] unless ref $title;
3898 $widget->{c_tab} = $title;
3052 3899
3053 $self->{buttonbar}->add (new CFClient::UI::Button
3054 markup => $title,
3055 tooltip => $tooltip,
3056 on_activate => sub { $self->set_current_page ($widget) },
3057 );
3058
3059 $self->{multiplexer}->add ($widget); 3900 $self->add ($widget);
3901}
3902
3903sub get_current_page {
3904 my ($self) = @_;
3905
3906 $self->{multiplexer}->get_current_page
3060} 3907}
3061 3908
3062sub set_current_page { 3909sub set_current_page {
3063 my ($self, $page) = @_; 3910 my ($self, $page) = @_;
3064 3911
3065 $self->{multiplexer}->set_current_page ($page); 3912 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current}); 3913 $self->emit (page_changed => $self->{multiplexer}{current});
3067} 3914}
3068 3915
3069############################################################################# 3916#############################################################################
3070 3917
3071package CFClient::UI::Statusbox; 3918package CFPlus::UI::Selector;
3072 3919
3920use utf8;
3921
3073our @ISA = CFClient::UI::VBox::; 3922our @ISA = CFPlus::UI::Button::;
3074 3923
3075sub new { 3924sub new {
3076 my $class = shift; 3925 my $class = shift;
3077 3926
3078 $class->SUPER::new ( 3927 my $self = $class->SUPER::new (
3928 options => [], # [value, title, longdesc], ...
3929 value => undef,
3930 @_,
3931 );
3932
3933 $self->_set_value ($self->{value});
3934
3935 $self
3936}
3937
3938sub invoke_button_down {
3939 my ($self, $ev) = @_;
3940
3941 my @menu_items;
3942
3943 for (@{ $self->{options} }) {
3944 my ($value, $title, $tooltip) = @$_;
3945
3946 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3947 }
3948
3949 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3950}
3951
3952sub _set_value {
3953 my ($self, $value) = @_;
3954
3955 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3956 or return;
3957
3958 $self->{value} = $item->[0];
3959 $self->set_markup ("$item->[1] ⇓");
3960 $self->set_tooltip ($item->[2]);
3961}
3962
3963sub set_value {
3964 my ($self, $value) = @_;
3965
3966 return unless $self->{value} ne $value;
3967
3968 $self->_set_value ($value);
3969 $self->emit (changed => $value);
3970}
3971
3972#############################################################################
3973
3974package CFPlus::UI::Statusbox;
3975
3976our @ISA = CFPlus::UI::VBox::;
3977
3978sub new {
3979 my $class = shift;
3980
3981 my $self = $class->SUPER::new (
3079 fontsize => 0.8, 3982 fontsize => 0.8,
3080 @_, 3983 @_,
3081 ) 3984 );
3985
3986 CFPlus::weaken (my $this = $self);
3987
3988 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3989
3990 $self
3082} 3991}
3083 3992
3084sub reorder { 3993sub reorder {
3085 my ($self) = @_; 3994 my ($self) = @_;
3086 my $NOW = time; 3995 my $NOW = Time::HiRes::time;
3996
3997 # freeze display when hovering over any label
3998 return if $CFPlus::UI::TOOLTIP->{owner}
3999 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
4000 values %{ $self->{item} };
3087 4001
3088 while (my ($k, $v) = each %{ $self->{item} }) { 4002 while (my ($k, $v) = each %{ $self->{item} }) {
3089 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4003 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3090 } 4004 }
3091 4005
… …
3094 my @items = sort { 4008 my @items = sort {
3095 $a->{pri} <=> $b->{pri} 4009 $a->{pri} <=> $b->{pri}
3096 or $b->{id} <=> $a->{id} 4010 or $b->{id} <=> $a->{id}
3097 } values %{ $self->{item} }; 4011 } values %{ $self->{item} };
3098 4012
4013 $self->{timer}->interval (1);
4014
3099 my $count = 10 + 1; 4015 my $count = 10 + 1;
3100 for my $item (@items) { 4016 for my $item (@items) {
3101 last unless --$count; 4017 last unless --$count;
3102 4018
3103 push @widgets, $item->{label} ||= do { 4019 my $label = $item->{label} ||= do {
3104 # TODO: doesn't handle markup well (read as: at all) 4020 # TODO: doesn't handle markup well (read as: at all)
3105 my $short = $item->{count} > 1 4021 my $short = $item->{count} > 1
3106 ? "<b>$item->{count} ×</b> $item->{text}" 4022 ? "<b>$item->{count} ×</b> $item->{text}"
3107 : $item->{text}; 4023 : $item->{text};
3108 4024
3109 for ($short) { 4025 for ($short) {
3110 s/^\s+//; 4026 s/^\s+//;
3111 s/\s+/ /g; 4027 s/\s+/ /g;
3112 } 4028 }
3113 4029
3114 new CFClient::UI::Label 4030 new CFPlus::UI::Label
3115 markup => $short, 4031 markup => $short,
3116 tooltip => $item->{tooltip}, 4032 tooltip => $item->{tooltip},
3117 tooltip_font => $::FONT_PROP, 4033 tooltip_font => $::FONT_PROP,
3118 tooltip_width => 0.67, 4034 tooltip_width => 0.67,
3119 fontsize => $item->{fontsize} || $self->{fontsize}, 4035 fontsize => $item->{fontsize} || $self->{fontsize},
3120 max_w => $::WIDTH * 0.44, 4036 max_w => $::WIDTH * 0.44,
3121 fg => $item->{fg}, 4037 fg => [@{ $item->{fg} }],
3122 can_events => 1, 4038 can_events => 1,
3123 can_hover => 1 4039 can_hover => 1
3124 }; 4040 };
4041
4042 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4043 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4044 $label->update;
4045 $label->set_max_size (undef, $label->{req_h} * $diff)
4046 if $diff < 1;
4047 $self->{timer}->interval (1/30);
4048 } else {
4049 $label->{fg}[3] = $item->{fg}[3] || 1;
4050 }
4051
4052 push @widgets, $label;
3125 } 4053 }
3126 4054
3127 $self->clear; 4055 $self->clear;
3128 $self->SUPER::add (reverse @widgets); 4056 $self->SUPER::add (reverse @widgets);
3129} 4057}
… …
3134 $text =~ s/^\s+//; 4062 $text =~ s/^\s+//;
3135 $text =~ s/\s+$//; 4063 $text =~ s/\s+$//;
3136 4064
3137 return unless $text; 4065 return unless $text;
3138 4066
3139 my $timeout = time + ((delete $arg{timeout}) || 60); 4067 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3140 4068
3141 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4069 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3142 4070
3143 if (my $item = $self->{item}{$group}) { 4071 if (my $item = $self->{item}{$group}) {
3144 if ($item->{text} eq $text) { 4072 if ($item->{text} eq $text) {
3145 $item->{count}++; 4073 $item->{count}++;
3146 } else { 4074 } else {
3147 $item->{count} = 1; 4075 $item->{count} = 1;
3148 $item->{text} = $item->{tooltip} = $text; 4076 $item->{text} = $item->{tooltip} = $text;
3149 } 4077 }
3150 $item->{id} = ++$self->{id}; 4078 $item->{id} += 0.2;#d#
3151 $item->{timeout} = $timeout; 4079 $item->{timeout} = $timeout;
3152 delete $item->{label}; 4080 delete $item->{label};
3153 } else { 4081 } else {
3154 $self->{item}{$group} = { 4082 $self->{item}{$group} = {
3155 id => ++$self->{id}, 4083 id => ++$self->{id},
… …
3161 count => 1, 4089 count => 1,
3162 %arg, 4090 %arg,
3163 }; 4091 };
3164 } 4092 }
3165 4093
4094 $ROOT->on_refresh (reorder => sub {
3166 $self->reorder; 4095 $self->reorder;
4096 });
3167} 4097}
3168 4098
3169sub reconfigure { 4099sub reconfigure {
3170 my ($self) = @_; 4100 my ($self) = @_;
3171 4101
… …
3174 4104
3175 $self->reorder; 4105 $self->reorder;
3176 $self->SUPER::reconfigure; 4106 $self->SUPER::reconfigure;
3177} 4107}
3178 4108
4109sub destroy {
4110 my ($self) = @_;
4111
4112 $self->{timer}->cancel;
4113
4114 $self->SUPER::destroy;
4115}
4116
3179############################################################################# 4117#############################################################################
3180 4118
3181package CFClient::UI::Inventory;
3182
3183our @ISA = CFClient::UI::ScrolledWindow::;
3184
3185sub new {
3186 my $class = shift;
3187
3188 my $self = $class->SUPER::new (
3189 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3190 @_,
3191 );
3192
3193 $self
3194}
3195
3196sub set_items {
3197 my ($self, $items) = @_;
3198
3199 $self->{child}->clear;
3200 return unless $items;
3201
3202 my @items = sort {
3203 ($a->{type} <=> $b->{type})
3204 or ($a->{name} cmp $b->{name})
3205 } @$items;
3206
3207 $self->{real_items} = \@items;
3208
3209 my $row = 0;
3210 for my $item (@items) {
3211 CFClient::Item::update_widgets $item;
3212
3213 $self->{child}->add (0, $row, $item->{face_widget});
3214 $self->{child}->add (1, $row, $item->{desc_widget});
3215 $self->{child}->add (2, $row, $item->{weight_widget});
3216
3217 $row++;
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::BindEditor;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (my $vb = new CFClient::UI::VBox);
3233
3234
3235 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3236 text => "start recording",
3237 tooltip => "Start/Stops recording of actions."
3238 ."All subsequent actions after the recording started will be captured."
3239 ."The actions are displayed after the record was stopped."
3240 ."To bind the action you have to click on the 'Bind' button",
3241 on_activate => sub {
3242 unless ($self->{recording}) {
3243 $self->start;
3244 } else {
3245 $self->stop;
3246 }
3247 });
3248
3249 $vb->add (new CFClient::UI::Label text => "Actions:");
3250 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3251
3252 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3255 $hb->add (new CFClient::UI::Button
3256 text => "bind",
3257 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3258 on_activate => sub {
3259 $self->ask_for_bind;
3260 });
3261
3262 $vb->add (my $hb = new CFClient::UI::HBox);
3263 $hb->add (new CFClient::UI::Button
3264 text => "ok",
3265 expand => 1,
3266 tooltip => "This closes the binding editor and saves the binding",
3267 on_activate => sub {
3268 $self->hide;
3269 $self->commit;
3270 });
3271
3272 $hb->add (new CFClient::UI::Button
3273 text => "cancel",
3274 expand => 1,
3275 tooltip => "This closes the binding editor without saving",
3276 on_activate => sub {
3277 $self->hide;
3278 $self->{binding_cancel}->()
3279 if $self->{binding_cancel};
3280 });
3281
3282 $self->update_binding_widgets;
3283
3284 $self
3285}
3286
3287sub commit {
3288 my ($self) = @_;
3289 my ($mod, $sym, $cmds) = $self->get_binding;
3290 if ($sym != 0 && @$cmds > 0) {
3291 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3292 ."'. Don't forget 'Save Config'!");
3293 $self->{binding_change}->($mod, $sym, $cmds)
3294 if $self->{binding_change};
3295 } else {
3296 $::STATUSBOX->add ("No action bound, no key or action specified!");
3297 $self->{binding_cancel}->()
3298 if $self->{binding_cancel};
3299 }
3300}
3301
3302sub start {
3303 my ($self) = @_;
3304
3305 $self->{rec_btn}->set_text ("stop recording");
3306 $self->{recording} = 1;
3307 $self->clear_command_list;
3308 $::CONN->start_record if $::CONN;
3309}
3310
3311sub stop {
3312 my ($self) = @_;
3313
3314 $self->{rec_btn}->set_text ("start recording");
3315 $self->{recording} = 0;
3316
3317 my $rec;
3318 $rec = $::CONN->stop_record if $::CONN;
3319 return unless ref $rec eq 'ARRAY';
3320 $self->set_command_list ($rec);
3321}
3322
3323
3324sub ask_for_bind_and_commit {
3325 my ($self) = @_;
3326 $self->ask_for_bind (1);
3327}
3328
3329sub ask_for_bind {
3330 my ($self, $commit) = @_;
3331
3332 CFClient::Binder::open_binding_dialog (sub {
3333 my ($mod, $sym) = @_;
3334 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3335 $self->update_binding_widgets;
3336 $self->commit if $commit;
3337 });
3338}
3339
3340# $mod and $sym are the modifiers and key symbol
3341# $cmds is a array ref of strings (the commands)
3342# $cb is the callback that is executed on OK
3343# $ccb is the callback that is executed on CANCEL and
3344# when the binding was unsuccessful on OK
3345sub set_binding {
3346 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3347
3348 $self->clear_command_list;
3349 $self->{recording} = 0;
3350 $self->{rec_btn}->set_text ("start recording");
3351
3352 $self->{binding} = [$mod, $sym];
3353 $self->{commands} = $cmds;
3354
3355 $self->{binding_change} = $cb;
3356 $self->{binding_cancel} = $ccb;
3357
3358 $self->update_binding_widgets;
3359}
3360
3361# this is a shortcut method that asks for a binding
3362# and then just binds it.
3363sub do_quick_binding {
3364 my ($self, $cmds) = @_;
3365 $self->set_binding (undef, undef, $cmds, sub {
3366 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3367 });
3368 $self->ask_for_bind (1);
3369}
3370
3371sub update_binding_widgets {
3372 my ($self) = @_;
3373 my ($mod, $sym, $cmds) = $self->get_binding;
3374 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3375 $self->set_command_list ($cmds);
3376}
3377
3378sub get_binding {
3379 my ($self) = @_;
3380 return (
3381 $self->{binding}->[0],
3382 $self->{binding}->[1],
3383 [ grep { defined $_ } @{$self->{commands}} ]
3384 );
3385}
3386
3387sub clear_command_list {
3388 my ($self) = @_;
3389 $self->{cmdbox}->clear ();
3390}
3391
3392sub set_command_list {
3393 my ($self, $cmds) = @_;
3394
3395 $self->{cmdbox}->clear ();
3396 $self->{commands} = $cmds;
3397
3398 my $idx = 0;
3399
3400 for (@$cmds) {
3401 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3402
3403 my $i = $idx;
3404 $hb->add (new CFClient::UI::Label text => $_);
3405 $hb->add (new CFClient::UI::Button
3406 text => "delete",
3407 tooltip => "Deletes the action from the record",
3408 on_activate => sub {
3409 $self->{cmdbox}->remove ($hb);
3410 $cmds->[$i] = undef;
3411 });
3412
3413
3414 $idx++
3415 }
3416}
3417
3418#############################################################################
3419
3420package CFClient::UI::SpellList;
3421
3422our @ISA = CFClient::UI::Table::;
3423
3424sub new {
3425 my $class = shift;
3426
3427 my $self = $class->SUPER::new (
3428 binding => [],
3429 commands => [],
3430 @_,
3431 )
3432}
3433
3434# XXX: Do sorting? Argl...
3435sub add_spell {
3436 my ($self, $spell) = @_;
3437 $self->{spells}->{$spell->{name}} = $spell;
3438
3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3440 face => $spell->{face},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message});
3444
3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3446 text => $spell->{name},
3447 can_hover => 1,
3448 can_events => 1,
3449 tooltip => $spell->{message},
3450 expand => 1);
3451
3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3455 expand => 1);
3456
3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3458 text => "bind to key",
3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3460}
3461
3462sub rebuild_spell_list {
3463 my ($self) = @_;
3464 $self->{tbl_idx} = 0;
3465 $self->add_spell ($_) for values %{$self->{spells}};
3466}
3467
3468sub remove_spell {
3469 my ($self, $spell) = @_;
3470 delete $self->{spells}->{$spell->{name}};
3471 $self->rebuild_spell_list;
3472}
3473
3474#############################################################################
3475
3476package CFClient::UI::Root; 4119package CFPlus::UI::Root;
3477 4120
3478our @ISA = CFClient::UI::Container::; 4121our @ISA = CFPlus::UI::Container::;
3479 4122
4123use List::Util qw(min max);
4124
3480use CFClient::OpenGL; 4125use CFPlus::OpenGL;
3481 4126
3482sub new { 4127sub new {
3483 my $class = shift; 4128 my $class = shift;
3484 4129
3485 my $self = $class->SUPER::new ( 4130 my $self = $class->SUPER::new (
3486 visible => 1, 4131 visible => 1,
3487 @_, 4132 @_,
3488 ); 4133 );
3489 4134
3490 Scalar::Util::weaken ($self->{root} = $self); 4135 CFPlus::weaken ($self->{root} = $self);
3491 4136
3492 $self 4137 $self
3493} 4138}
3494 4139
3495sub size_request { 4140sub size_request {
… …
3510 $coord = $max - $size if $coord > $max - $size; 4155 $coord = $max - $size if $coord > $max - $size;
3511 4156
3512 int $coord + 0.5 4157 int $coord + 0.5
3513} 4158}
3514 4159
3515sub size_allocate { 4160sub invoke_size_allocate {
3516 my ($self, $w, $h) = @_; 4161 my ($self, $w, $h) = @_;
3517 4162
3518 for my $child ($self->children) { 4163 for my $child ($self->children) {
3519 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4164 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3520 4165
… …
3524 $X = _to_pixel $X, $W, $self->{w}; 4169 $X = _to_pixel $X, $W, $self->{w};
3525 $Y = _to_pixel $Y, $H, $self->{h}; 4170 $Y = _to_pixel $Y, $H, $self->{h};
3526 4171
3527 $child->configure ($X, $Y, $W, $H); 4172 $child->configure ($X, $Y, $W, $H);
3528 } 4173 }
4174
4175 1
3529} 4176}
3530 4177
3531sub coord2local { 4178sub coord2local {
3532 my ($self, $x, $y) = @_; 4179 my ($self, $x, $y) = @_;
3533 4180
… …
3588 while ($self->{refresh_hook}) { 4235 while ($self->{refresh_hook}) {
3589 $_->() 4236 $_->()
3590 for values %{delete $self->{refresh_hook}}; 4237 for values %{delete $self->{refresh_hook}};
3591 } 4238 }
3592 4239
3593 if ($self->{realloc}) { 4240 while ($self->{realloc}) {
3594 my %queue; 4241 my %queue;
3595 my @queue; 4242 my @queue;
3596 my $widget; 4243 my $widget;
3597 4244
3598 outer: 4245 outer:
… …
3618 4265
3619 delete $queue{$widget+0}; 4266 delete $queue{$widget+0};
3620 4267
3621 my ($w, $h) = $widget->size_request; 4268 my ($w, $h) = $widget->size_request;
3622 4269
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4270 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4271 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4272
4273 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4274 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3625 4275
3626 $w = $widget->{force_w} if exists $widget->{force_w}; 4276 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h}; 4277 $h = $widget->{force_h} if exists $widget->{force_h};
3628 4278
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4279 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3642 } 4292 }
3643 } 4293 }
3644 4294
3645 delete $self->{realloc}{$widget+0}; 4295 delete $self->{realloc}{$widget+0};
3646 } 4296 }
3647 }
3648 4297
3649 while (my $size_alloc = delete $self->{size_alloc}) { 4298 while (my $size_alloc = delete $self->{size_alloc}) {
3650 my @queue = sort { $b->{visible} <=> $a->{visible} } 4299 my @queue = sort { $a->{visible} <=> $b->{visible} }
3651 values %$size_alloc; 4300 values %$size_alloc;
3652 4301
3653 while () { 4302 while () {
3654 my $widget = pop @queue || last; 4303 my $widget = pop @queue || last;
3655 4304
3656 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4305 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3657 4306
3658 $w = 0 if $w < 0; 4307 $w = max $widget->{min_w}, $w;
3659 $h = 0 if $h < 0; 4308 $h = max $widget->{min_h}, $h;
3660 4309
4310# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4311# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4312
4313 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4314 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4315
3661 $w = int $w + 0.5; 4316 $w = int $w + 0.5;
3662 $h = int $h + 0.5; 4317 $h = int $h + 0.5;
3663 4318
3664 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4319 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3665 $widget->{old_w} = $widget->{w}; 4320 $widget->{old_w} = $widget->{w};
3666 $widget->{old_h} = $widget->{h}; 4321 $widget->{old_h} = $widget->{h};
3667 4322
3668 $widget->{w} = $w; 4323 $widget->{w} = $w;
3669 $widget->{h} = $h; 4324 $widget->{h} = $h;
3670 4325
3671 $widget->emit (size_allocate => $w, $h); 4326 $widget->emit (size_allocate => $w, $h);
4327 }
3672 } 4328 }
3673 } 4329 }
3674 } 4330 }
3675 4331
3676 while ($self->{post_alloc_hook}) { 4332 while ($self->{post_alloc_hook}) {
3677 $_->() 4333 $_->()
3678 for values %{delete $self->{post_alloc_hook}}; 4334 for values %{delete $self->{post_alloc_hook}};
3679 } 4335 }
3680
3681 4336
3682 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4337 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3683 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4338 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3684 glClear GL_COLOR_BUFFER_BIT; 4339 glClear GL_COLOR_BUFFER_BIT;
3685 4340
… …
3688 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4343 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3689 glMatrixMode GL_MODELVIEW; 4344 glMatrixMode GL_MODELVIEW;
3690 glLoadIdentity; 4345 glLoadIdentity;
3691 4346
3692 { 4347 {
3693 package CFClient::UI::Base; 4348 package CFPlus::UI::Base;
3694 4349
3695 ($draw_x, $draw_y, $draw_w, $draw_h) = 4350 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3696 (0, 0, $self->{w}, $self->{h}); 4351 (0, 0, $self->{w}, $self->{h});
3697 }
3698 4352
3699 $self->_draw; 4353 $self->_draw;
4354 }
3700} 4355}
3701 4356
3702############################################################################# 4357#############################################################################
3703 4358
3704package CFClient::UI; 4359package CFPlus::UI;
3705 4360
3706$ROOT = new CFClient::UI::Root; 4361$ROOT = new CFPlus::UI::Root;
3707$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4362$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3708 4363
37091 43641
3710 4365

Diff Legend

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