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.269 by root, Fri Jun 2 06:22:55 2006 UTC vs.
Revision 1.418 by elmex, Tue Jul 24 18:39:39 2007 UTC

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

Diff Legend

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