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

Diff Legend

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