ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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