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

Diff Legend

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