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

Diff Legend

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