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.413 by root, Mon Jul 23 15:30:45 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
10use CFClient::Texture; 11use CFPlus::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
14our $LAYOUT; 15our $LAYOUT;
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show;
41 }
42
43 return;
44 }
45 }
46 }
47
48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner};
51});
20 52
21sub get_layout { 53sub get_layout {
22 my $layout; 54 my $layout;
23 55
24 for (grep { $_->{name} } values %WIDGET) { 56 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 71 my ($layout) = @_;
40 72
41 $LAYOUT = $layout; 73 $LAYOUT = $layout;
42} 74}
43 75
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 76# class methods for events
73sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 78 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 79 if $FOCUS;
76} 80}
… …
78sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 84 if $FOCUS;
81} 85}
82 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
83sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
84 my ($ev) = @_; 101 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
86 103
87 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
89 108
90 $GRAB = $widget; 109 $GRAB = $widget;
91 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
92 111
93 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
94 } 113 }
95 114
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
97 120
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 121 $ev->{dx} = $shift ? $delta : 0;
99 if $GRAB; 122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
128 }
100} 129}
101 130
102sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
103 my ($ev) = @_; 132 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 133
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 135
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 137
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 138 $GRAB->emit (button_up => $ev)
111 if $GRAB; 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 140
113 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 143 $grab->update if $grab;
116 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
117 145
118 check_tooltip; 146 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->();
119 } 148 }
120} 149}
121 150
122sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
123 my ($ev) = @_; 152 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
125 154
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 156
128 if ($widget != $HOVER) { 157 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 158
131 $hover->update if $hover && $hover->{can_hover}; 159 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 160 if $HOVER;
139} 161}
140 162
141# convert position array to integers 163# convert position array to integers
142sub harmonize { 164sub harmonize {
… …
192 reconfigure_widgets; 214 reconfigure_widgets;
193} 215}
194 216
195############################################################################# 217#############################################################################
196 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
197package CFClient::UI::Base; 227package CFPlus::UI::Base;
198 228
199use strict; 229use strict;
200 230
201use CFClient::OpenGL; 231use CFPlus::OpenGL;
202 232
203sub new { 233sub new {
204 my $class = shift; 234 my $class = shift;
205 235
206 my $self = bless { 236 my $self = bless {
… …
211 h => undef, 241 h => undef,
212 can_events => 1, 242 can_events => 1,
213 @_ 243 @_
214 }, $class; 244 }, $class;
215 245
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217 247
218 for (keys %$self) { 248 for (keys %$self) {
219 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
220 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
221 } 251 }
222 } 252 }
223 253
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
229 259
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232 262
233 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
238 268
239sub destroy { 269sub destroy {
240 my ($self) = @_; 270 my ($self) = @_;
241 271
242 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
243 %$self = (); 274 %$self = ();
244} 275}
245 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
246sub show { 281sub show {
247 my ($self) = @_; 282 my ($self) = @_;
248 283
249 return if $self->{parent}; 284 return if $self->{parent};
250 285
251 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
252} 287}
253 288
254sub set_visible { 289sub set_visible {
255 my ($self) = @_; 290 my ($self) = @_;
256 291
… …
271 306
272 return unless $self->{visible}; 307 return unless $self->{visible};
273 308
274 $_->set_invisible for $self->children; 309 $_->set_invisible for $self->children;
275 310
311 delete $self->{visible};
276 delete $self->{root}; 312 delete $self->{root};
277 delete $self->{visible};
278 313
279 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
281 316
282 CFClient::UI::check_tooltip 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
284 319
285 $self->focus_out; 320 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
288} 322}
289 323
290sub set_visibility { 324sub set_visibility {
291 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
292 326
293 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
294 328
295 $visible ? $self->hide 329 $visible ? $self->show
296 : $self->show; 330 : $self->hide;
297} 331}
298 332
299sub toggle_visibility { 333sub toggle_visibility {
300 my ($self) = @_; 334 my ($self) = @_;
301 335
… …
314} 348}
315 349
316sub move_abs { 350sub move_abs {
317 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
318 352
319 $self->{x} = List::Util::max 0, int $x; 353 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 354 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 355 $self->{z} = $z if defined $z;
322 356
323 $self->update; 357 $self->update;
324} 358}
325 359
… …
335sub size_request { 369sub size_request {
336 require Carp; 370 require Carp;
337 Carp::confess "size_request is abstract"; 371 Carp::confess "size_request is abstract";
338} 372}
339 373
374sub baseline_shift {
375 0
376}
377
340sub configure { 378sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
342 380
343 if ($self->{aspect}) { 381 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
345 383
346 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 386
349 # use alignment to adjust x, y 387 # use alignment to adjust x, y
350 388
351 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
366 404
367 $self->{root}{size_alloc}{$self+0} = $self; 405 $self->{root}{size_alloc}{$self+0} = $self;
368 } 406 }
369} 407}
370 408
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 409sub children {
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 }
903} 959}
904 960
905# hmm, this does not work for topleft of $self... but we should not ask for that 961# hmm, this does not work for topleft of $self... but we should not ask for that
906sub coord2local { 962sub coord2local {
907 my ($self, $x, $y) = @_; 963 my ($self, $x, $y) = @_;
… …
922 my ($self, $x, $y) = @_; 978 my ($self, $x, $y) = @_;
923 979
924 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 980 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
925 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 981 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
926 ) { 982 ) {
927 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 983 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
928 } else { 984 } else {
929 $self->CFClient::UI::Base::find_widget ($x, $y) 985 $self->CFPlus::UI::Base::find_widget ($x, $y)
930 } 986 }
931} 987}
932 988
933sub _render { 989sub _render {
934 my ($self) = @_; 990 my ($self) = @_;
935 991
936 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 992 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}; 993 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
938 994
939 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 995 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
940 996
941 $self->SUPER::_render; 997 $self->SUPER::_render;
942} 998}
943 999
944############################################################################# 1000#############################################################################
945 1001
946package CFClient::UI::ScrolledWindow; 1002package CFPlus::UI::ScrolledWindow;
947 1003
948our @ISA = CFClient::UI::HBox::; 1004our @ISA = CFPlus::UI::Table::;
949 1005
950sub new { 1006sub new {
951 my $class = shift; 1007 my ($class, %arg) = @_;
1008
1009 my $child = delete $arg{child};
952 1010
953 my $self; 1011 my $self;
954 1012
955 my $slider = new CFClient::UI::Slider 1013 my $hslider = new CFPlus::UI::Slider
1014 col => 0,
1015 row => 1,
1016 vertical => 0,
1017 range => [0, 0, 1, 0.01], # HACK fix
1018 on_changed => sub {
1019 $self->{hpos} = $_[1];
1020 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1021 },
1022 ;
1023
1024 my $vslider = new CFPlus::UI::Slider
1025 col => 1,
1026 row => 0,
956 vertical => 1, 1027 vertical => 1,
957 range => [0, 0, 1, 0.01], # HACK fix 1028 range => [0, 0, 1, 0.01], # HACK fix
958 on_changed => sub { 1029 on_changed => sub {
959 $self->{vp}->set_offset (0, $_[1]); 1030 $self->{vpos} = $_[1];
1031 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
960 }, 1032 },
961 ; 1033 ;
962 1034
963 $self = $class->SUPER::new ( 1035 $self = $class->SUPER::new (
964 vp => (new CFClient::UI::ViewPort expand => 1), 1036 scroll_x => 0,
1037 scroll_y => 1,
1038 can_events => 1,
965 slider => $slider, 1039 hslider => $hslider,
966 @_, 1040 vslider => $vslider,
1041 col_expand => [1, 0],
1042 row_expand => [1, 0],
1043 %arg,
967 ); 1044 );
968 1045
969 $self->{vp}->add ($self->{scrolled}); 1046 $self->{vp} = new CFPlus::UI::ViewPort
1047 col => 0,
1048 row => 0,
1049 expand => 1,
1050 scroll_x => $self->{scroll_x},
1051 scroll_y => $self->{scroll_y},
1052 on_changed => sub {
1053 my ($vp, $x, $y) = @_;
1054
1055 $vp->{parent}{hslider}->set_value ($x);
1056 $vp->{parent}{vslider}->set_value ($y);
1057
1058 0
1059 },
1060 on_size_allocate => sub {
1061 my ($vp, $w, $h) = @_;
1062 $vp->{parent}->update_slider;
1063 0
1064 },
1065 ;
1066
970 $self->add ($self->{vp}); 1067 $self->SUPER::add ($self->{vp});
971 $self->add ($self->{slider}); 1068
1069 $self->add ($child) if $child;
972 1070
973 $self 1071 $self
974} 1072}
975 1073
1074sub add {
1075 my ($self, $widget) = @_;
1076
1077 $self->{vp}->add ($self->{child} = $widget);
1078}
1079
976sub update { 1080sub update_slider {
1081 my ($self) = @_;
1082
1083 my $child = ($self->{vp} or return)->child;
1084
1085 if ($self->{scroll_x}) {
1086 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1087 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1088
1089 my $visible = $w1 > $w2;
1090 if ($visible != $self->{hslider_visible}) {
1091 $self->{hslider_visible} = $visible;
1092 $visible ? $self->SUPER::add ($self->{hslider})
1093 : $self->SUPER::remove ($self->{hslider});
1094 }
1095 }
1096
1097 if ($self->{scroll_y}) {
1098 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1099 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1100
1101 my $visible = $h1 > $h2;
1102 if ($visible != $self->{vslider_visible}) {
1103 $self->{vslider_visible} = $visible;
1104 $visible ? $self->SUPER::add ($self->{vslider})
1105 : $self->SUPER::remove ($self->{vslider});
1106 }
1107 }
1108}
1109
1110sub start_dragging {
977 my ($self) = @_; 1111 my ($self, $ev) = @_;
978 1112
979 $self->SUPER::update; 1113 $self->grab_focus;
980 1114
981 # todo: overwrite size_allocate of child 1115 my $ox = $self->{vp}{view_x};
982 my $child = $self->{vp}->child; 1116 my $oy = $self->{vp}{view_y};
983 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1117
984} 1118 $self->{motion} = sub {
1119 my ($ev, $x, $y) = @_;
985 1120
1121 $ox -= $ev->{xrel};
1122 $oy -= $ev->{yrel};
1123
1124 $self->{vp}->set_offset ($ox, $oy);
1125 };
1126}
1127
1128sub invoke_mouse_wheel {
1129 my ($self, $ev) = @_;
1130
1131 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1132 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1133
1134 1
1135}
1136
1137sub invoke_button_down {
1138 my ($self, $ev, $x, $y) = @_;
1139
1140 if ($ev->{button} == 2) {
1141 $self->start_dragging ($ev);
1142 return 1;
1143 }
1144
1145 0
1146}
1147
1148sub invoke_button_up {
1149 my ($self, $ev, $x, $y) = @_;
1150
1151 if (delete $self->{motion}) {
1152 return 1;
1153 }
1154
1155 0
1156}
1157
1158sub invoke_mouse_motion {
1159 my ($self, $ev, $x, $y) = @_;
1160
1161 if ($self->{motion}) {
1162 $self->{motion}->($ev, $x, $y);
1163 return 1;
1164 }
1165
1166 0
1167}
1168
986sub size_allocate { 1169sub invoke_size_allocate {
987 my ($self, $w, $h) = @_; 1170 my ($self, $w, $h) = @_;
988 1171
1172 $self->update_slider;
989 $self->SUPER::size_allocate ($w, $h); 1173 $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} 1174}
994
995#TODO# update range on size_allocate depending on child
996# update viewport offset on scroll
997 1175
998############################################################################# 1176#############################################################################
999 1177
1000package CFClient::UI::Frame; 1178package CFPlus::UI::Frame;
1001 1179
1002our @ISA = CFClient::UI::Bin::; 1180our @ISA = CFPlus::UI::Bin::;
1003 1181
1004use CFClient::OpenGL; 1182use CFPlus::OpenGL;
1005 1183
1006sub new { 1184sub new {
1007 my $class = shift; 1185 my $class = shift;
1008 1186
1009 $class->SUPER::new ( 1187 $class->SUPER::new (
… …
1017 1195
1018 if ($self->{bg}) { 1196 if ($self->{bg}) {
1019 my ($w, $h) = @$self{qw(w h)}; 1197 my ($w, $h) = @$self{qw(w h)};
1020 1198
1021 glEnable GL_BLEND; 1199 glEnable GL_BLEND;
1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1200 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1023 glColor @{ $self->{bg} }; 1201 glColor_premultiply @{ $self->{bg} };
1024 1202
1025 glBegin GL_QUADS; 1203 glBegin GL_QUADS;
1026 glVertex 0 , 0; 1204 glVertex 0 , 0;
1027 glVertex 0 , $h; 1205 glVertex 0 , $h;
1028 glVertex $w, $h; 1206 glVertex $w, $h;
… …
1035 $self->SUPER::_draw; 1213 $self->SUPER::_draw;
1036} 1214}
1037 1215
1038############################################################################# 1216#############################################################################
1039 1217
1040package CFClient::UI::FancyFrame; 1218package CFPlus::UI::FancyFrame;
1041 1219
1042our @ISA = CFClient::UI::Bin::; 1220our @ISA = CFPlus::UI::Bin::;
1043 1221
1044use CFClient::OpenGL; 1222use CFPlus::OpenGL;
1223
1224sub new {
1225 my ($class, %arg) = @_;
1226
1227 if ((exists $arg{label}) && !ref $arg{label}) {
1228 $arg{label} = new CFPlus::UI::Label
1229 align => 1,
1230 valign => 0,
1231 text => $arg{label},
1232 fontsize => ($arg{border} || 0.8) * 0.75;
1233 }
1234
1235 my $self = $class->SUPER::new (
1236 # label => "",
1237 fg => [0.6, 0.3, 0.1],
1238 border => 0.8,
1239 style => 'single',
1240 %arg,
1241 );
1242
1243 $self
1244}
1245
1246sub add {
1247 my ($self, @widgets) = @_;
1248
1249 $self->SUPER::add (@widgets);
1250 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1251}
1252
1253sub border {
1254 int $_[0]{border} * $::FONTSIZE
1255}
1256
1257sub size_request {
1258 my ($self) = @_;
1259
1260 ($self->{label_w}, undef) = $self->{label}->size_request
1261 if $self->{label};
1262
1263 my ($w, $h) = $self->SUPER::size_request;
1264
1265 (
1266 $w + $self->border * 2,
1267 $h + $self->border * 2,
1268 )
1269}
1270
1271sub invoke_size_allocate {
1272 my ($self, $w, $h) = @_;
1273
1274 my $border = $self->border;
1275
1276 $w -= List::Util::max 0, $border * 2;
1277 $h -= List::Util::max 0, $border * 2;
1278
1279 if (my $label = $self->{label}) {
1280 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1281 $label->{h} = List::Util::min $h, $border;
1282 $label->invoke_size_allocate ($label->{w}, $label->{h});
1283 }
1284
1285 $self->child->configure ($border, $border, $w, $h);
1286
1287 1
1288}
1289
1290sub _draw {
1291 my ($self) = @_;
1292
1293 my $child = $self->{children}[0];
1294
1295 my $border = $self->border;
1296 my ($w, $h) = ($self->{w}, $self->{h});
1297
1298 $child->draw;
1299
1300 glColor @{$self->{fg}};
1301 glBegin GL_LINE_STRIP;
1302 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1303 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1304 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1305 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1306 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1307 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1308 glEnd;
1309
1310 if ($self->{label}) {
1311 glTranslate $border * 2, 0;
1312 $self->{label}->_draw;
1313 }
1314}
1315
1316#############################################################################
1317
1318package CFPlus::UI::Toplevel;
1319
1320our @ISA = CFPlus::UI::Bin::;
1321
1322use CFPlus::OpenGL;
1045 1323
1046my $bg = 1324my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1325 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1; 1326 mipmap => 1, wrap => 1;
1049 1327
1050my @border = 1328my @border =
1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1329 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); 1330 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053 1331
1332my @icon =
1333 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1334 qw(x1_move.png x1_resize.png);
1335
1054sub new { 1336sub new {
1055 my $class = shift; 1337 my ($class, %arg) = @_;
1056 1338
1057 my $self = $class->SUPER::new ( 1339 my $self = $class->SUPER::new (
1058 bg => [1, 1, 1, 1], 1340 bg => [1, 1, 1, 1],
1059 border_bg => [1, 1, 1, 1], 1341 border_bg => [1, 1, 1, 1],
1060 border => 0.6, 1342 border => 0.6,
1061 can_events => 1, 1343 can_events => 1,
1062 min_w => 16, 1344 min_w => 64,
1063 min_h => 16, 1345 min_h => 32,
1064 @_ 1346 %arg,
1065 ); 1347 );
1066 1348
1067 $self->{title} &&= new CFClient::UI::Label 1349 $self->{title_widget} = new CFPlus::UI::Label
1068 align => 0, 1350 align => 0,
1069 valign => 1, 1351 valign => 1,
1070 text => $self->{title}, 1352 text => $self->{title},
1071 fontsize => $self->{border}; 1353 fontsize => $self->{border},
1354 if exists $self->{title};
1355
1356 if ($self->{has_close_button}) {
1357 $self->{close_button} =
1358 new CFPlus::UI::ImageButton
1359 path => 'x1_close.png',
1360 on_activate => sub { $self->emit ("delete") };
1361
1362 $self->CFPlus::UI::Container::add ($self->{close_button});
1363 }
1072 1364
1073 $self 1365 $self
1366}
1367
1368sub add {
1369 my ($self, @widgets) = @_;
1370
1371 $self->SUPER::add (@widgets);
1372 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1373 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1074} 1374}
1075 1375
1076sub border { 1376sub border {
1077 int $_[0]{border} * $::FONTSIZE 1377 int $_[0]{border} * $::FONTSIZE
1078} 1378}
1079 1379
1080sub size_request { 1380sub size_request {
1081 my ($self) = @_; 1381 my ($self) = @_;
1382
1383 $self->{title_widget}->size_request
1384 if $self->{title_widget};
1385
1386 $self->{close_button}->size_request
1387 if $self->{close_button};
1082 1388
1083 my ($w, $h) = $self->SUPER::size_request; 1389 my ($w, $h) = $self->SUPER::size_request;
1084 1390
1085 ( 1391 (
1086 $w + $self->border * 2, 1392 $w + $self->border * 2,
1087 $h + $self->border * 2, 1393 $h + $self->border * 2,
1088 ) 1394 )
1089} 1395}
1090 1396
1091sub size_allocate { 1397sub invoke_size_allocate {
1092 my ($self, $w, $h) = @_; 1398 my ($self, $w, $h) = @_;
1093 1399
1400 if ($self->{title_widget}) {
1401 $self->{title_widget}{w} = $w;
1402 $self->{title_widget}{h} = $h;
1403 $self->{title_widget}->invoke_size_allocate ($w, $h);
1404 }
1405
1406 my $border = $self->border;
1407
1094 $h -= List::Util::max 0, $self->border * 2; 1408 $h -= List::Util::max 0, $border * 2;
1095 $w -= List::Util::max 0, $self->border * 2; 1409 $w -= List::Util::max 0, $border * 2;
1096 1410
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); 1411 $self->child->configure ($border, $border, $w, $h);
1101}
1102 1412
1413 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1414 if $self->{close_button};
1415
1416 1
1417}
1418
1419sub invoke_delete {
1420 my ($self) = @_;
1421
1422 $self->hide;
1423
1424 1
1425}
1426
1103sub button_down { 1427sub invoke_button_down {
1104 my ($self, $ev, $x, $y) = @_; 1428 my ($self, $ev, $x, $y) = @_;
1105 1429
1106 my ($w, $h) = @$self{qw(w h)}; 1430 my ($w, $h) = @$self{qw(w h)};
1107 my $border = $self->border; 1431 my $border = $self->border;
1108 1432
… …
1124 my $dy = $ev->{y} - $oy; 1448 my $dy = $ev->{y} - $oy;
1125 1449
1126 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1450 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1127 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1451 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1128 1452
1453 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1129 $self->realloc; 1454 $self->realloc;
1130 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1131 }; 1455 };
1132 1456
1133 } elsif ($lr ^ $td) { 1457 } elsif ($lr ^ $td) {
1134 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1458 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1135 my ($bx, $by) = ($self->{x}, $self->{y}); 1459 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1138 my ($ev, $x, $y) = @_; 1462 my ($ev, $x, $y) = @_;
1139 1463
1140 ($x, $y) = ($ev->{x}, $ev->{y}); 1464 ($x, $y) = ($ev->{x}, $ev->{y});
1141 1465
1142 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1466 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1467 # HACK: the next line is required to enforce placement
1468 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1143 }; 1469 };
1470 } else {
1471 return 0;
1472 }
1473
1144 } 1474 1
1145} 1475}
1146 1476
1147sub button_up { 1477sub invoke_button_up {
1148 my ($self, $ev, $x, $y) = @_; 1478 my ($self, $ev, $x, $y) = @_;
1149 1479
1150 delete $self->{motion}; 1480 ! ! delete $self->{motion}
1151} 1481}
1152 1482
1153sub mouse_motion { 1483sub invoke_mouse_motion {
1154 my ($self, $ev, $x, $y) = @_; 1484 my ($self, $ev, $x, $y) = @_;
1155 1485
1156 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1486 $self->{motion}->($ev, $x, $y) if $self->{motion};
1487
1488 ! ! $self->{motion}
1489}
1490
1491sub invoke_visibility_change {
1492 my ($self, $visible) = @_;
1493
1494 delete $self->{motion} unless $visible;
1495
1496 0
1157} 1497}
1158 1498
1159sub _draw { 1499sub _draw {
1160 my ($self) = @_; 1500 my ($self) = @_;
1161 1501
1502 my $child = $self->{children}[0];
1503
1162 my ($w, $h ) = ($self->{w}, $self->{h}); 1504 my ($w, $h ) = ($self->{w}, $self->{h});
1163 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1505 my ($cw, $ch) = ($child->{w}, $child->{h});
1164 1506
1165 glEnable GL_TEXTURE_2D; 1507 glEnable GL_TEXTURE_2D;
1166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1508 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1167 1509
1168 my $border = $self->border; 1510 my $border = $self->border;
1169 1511
1170 glColor @{ $self->{border_bg} }; 1512 glColor @{ $self->{border_bg} };
1171 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1513 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1172 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1514 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1173 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1515 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1174 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1516 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1517
1518 # move
1519 my $w2 = ($w - $border) * .5;
1520 my $h2 = ($h - $border) * .5;
1521 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1522 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1523 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1524
1525 # resize
1526 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1527 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1528 unless $self->{has_close_button};
1529 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1530 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1175 1531
1176 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1532 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1177 glColor @{ $self->{bg} }; 1533 glColor @{ $self->{bg} };
1178 1534
1179 # TODO: repeat texture not scale 1535 # TODO: repeat texture not scale
… …
1183 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1539 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1184 } 1540 }
1185 1541
1186 glDisable GL_TEXTURE_2D; 1542 glDisable GL_TEXTURE_2D;
1187 1543
1188 $self->{title}->draw if $self->{title};
1189
1190 $self->child->draw; 1544 $child->draw;
1545
1546 if ($self->{title_widget}) {
1547 glTranslate 0, $border - $self->{h};
1548 $self->{title_widget}->_draw;
1549
1550 glTranslate 0, - ($border - $self->{h});
1551 }
1552
1553 $self->{close_button}->draw
1554 if $self->{close_button};
1191} 1555}
1192 1556
1193############################################################################# 1557#############################################################################
1194 1558
1195package CFClient::UI::Table; 1559package CFPlus::UI::Table;
1196 1560
1197our @ISA = CFClient::UI::Base::; 1561our @ISA = CFPlus::UI::Container::;
1198 1562
1199use List::Util qw(max sum); 1563use List::Util qw(max sum);
1200 1564
1201use CFClient::OpenGL; 1565use CFPlus::OpenGL;
1202 1566
1203sub new { 1567sub new {
1204 my $class = shift; 1568 my $class = shift;
1205 1569
1206 $class->SUPER::new ( 1570 $class->SUPER::new (
1207 col_expand => [], 1571 col_expand => [],
1572 row_expand => [],
1208 @_, 1573 @_,
1209 ) 1574 )
1210} 1575}
1211 1576
1212sub children {
1213 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1214}
1215
1216sub add { 1577sub 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) = @_; 1578 my ($self, @widgets) = @_;
1579
1580 for my $child (@widgets) {
1581 $child->{rowspan} ||= 1;
1582 $child->{colspan} ||= 1;
1583 }
1584
1585 $self->SUPER::add (@widgets);
1586}
1587
1588sub add_at {
1589 my $self = shift;
1590
1591 my @widgets;
1592
1593 while (@_) {
1594 my ($col, $row, $child) = splice @_, 0, 3, ();
1595
1596 $child->{row} = $row;
1597 $child->{col} = $col;
1598
1599 push @widgets, $child;
1600 }
1601
1602 $self->add (@widgets);
1603}
1604
1605sub get_wh {
1606 my ($self) = @_;
1607
1608 my (@w, @h);
1228 1609
1229 my @children = $self->children; 1610 my @children = $self->children;
1230 delete $self->{children}; 1611
1612 # first pass, columns
1613 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1614 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1615
1616 my $sw = sum @w[$c .. $c + $cs - 1];
1617
1618 if ($w > $sw) {
1619 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1620 }
1231 1621 }
1232 for (@children) {
1233 delete $_->{parent};
1234 $_->hide;
1235 }
1236 1622
1237 $self->realloc; 1623 # second pass, rows
1238} 1624 for my $widget (sort { $a->{rowspan} <=> $b->{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)}; 1625 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1253 1626
1254 $w[$x] = max $w[$x], $w; 1627 my $sh = sum @h[$r .. $r + $rs - 1];
1255 $h[$y] = max $h[$y], $h; 1628
1629 if ($h > $sh) {
1630 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1256 } 1631 }
1257 } 1632 }
1258 1633
1259 (\@w, \@h) 1634 (\@w, \@h)
1260} 1635}
… …
1268 (sum @$ws), 1643 (sum @$ws),
1269 (sum @$hs), 1644 (sum @$hs),
1270 ) 1645 )
1271} 1646}
1272 1647
1273sub size_allocate { 1648sub invoke_size_allocate {
1274 my ($self, $w, $h) = @_; 1649 my ($self, $w, $h) = @_;
1275 1650
1276 my ($ws, $hs) = $self->get_wh; 1651 my ($ws, $hs) = $self->get_wh;
1277 1652
1278 my $req_w = (sum @$ws) || 1; 1653 my $req_w = (sum @$ws) || 1;
1279 my $req_h = (sum @$hs) || 1; 1654 my $req_h = (sum @$hs) || 1;
1280 1655
1281 # TODO: nicer code && do row_expand 1656 # now linearly scale the rows/columns to the allocated size
1282 my @col_expand = @{$self->{col_expand}}; 1657 my @col_expand = @{$self->{col_expand}};
1283 @col_expand = (1) x @$ws unless @col_expand; 1658 @col_expand = (1) x @$ws unless @col_expand;
1284 my $col_expand = (sum @col_expand) || 1; 1659 my $col_expand = (sum @col_expand) || 1;
1285 1660
1286 # linearly scale sizes
1287 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1661 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1288 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1289 1662
1290 CFClient::UI::harmonize $ws; 1663 CFPlus::UI::harmonize $ws;
1664
1665 my @row_expand = @{$self->{row_expand}};
1666 @row_expand = (1) x @$ws unless @row_expand;
1667 my $row_expand = (sum @row_expand) || 1;
1668
1669 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1670
1291 CFClient::UI::harmonize $hs; 1671 CFPlus::UI::harmonize $hs;
1292 1672
1293 my $y; 1673 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1674 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1294 1675
1295 for my $r (0 .. $#{$self->{children}}) { 1676 for my $widget ($self->children) {
1296 my $row = $self->{children}[$r] 1677 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1297 or next;
1298 1678
1299 my $x = 0; 1679 $widget->configure (
1300 my $row_h = $hs->[$r]; 1680 $x[$c], $y[$r],
1681 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1301 1682 );
1302 for my $c (0 .. $#$row) { 1683 }
1303 my $col_w = $ws->[$c];
1304 1684
1305 if (my $widget = $row->[$c]) { 1685 1
1306 $widget->configure ($x, $y, $col_w, $row_h); 1686}
1307 }
1308 1687
1309 $x += $col_w; 1688#############################################################################
1689
1690package CFPlus::UI::Fixed;
1691
1692use List::Util qw(min max);
1693
1694our @ISA = CFPlus::UI::Container::;
1695
1696sub _scale($$$) {
1697 my ($rel, $val, $max) = @_;
1698
1699 $rel ? $val * $max : $val
1700}
1701
1702sub size_request {
1703 my ($self) = @_;
1704
1705 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1706
1707 # determine overall size by querying abs widgets
1708 for my $child ($self->visible_children) {
1709 unless ($child->{c_rel}) {
1710 my $x = $child->{c_x};
1711 my $y = $child->{c_y};
1712
1713 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1714 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1310 } 1715 }
1311
1312 $y += $row_h;
1313 } 1716 }
1314 1717
1315} 1718 my $W = $x2 - $x1;
1719 my $H = $y2 - $y1;
1316 1720
1317sub find_widget { 1721 # now layout remaining widgets
1722 for my $child ($self->visible_children) {
1723 if ($child->{c_rel}) {
1724 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1725 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1726
1727 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1728 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1729 }
1730 }
1731
1732 my $W = $x2 - $x1;
1733 my $H = $y2 - $y1;
1734
1735 ($W, $H)
1736}
1737
1738sub invoke_size_allocate {
1318 my ($self, $x, $y) = @_; 1739 my ($self, $W, $H) = @_;
1319 1740
1320 $x -= $self->{x}; 1741 for my $child ($self->visible_children) {
1321 $y -= $self->{y}; 1742 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1743 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1322 1744
1323 my $res; 1745 $x += $child->{c_halign} * $child->{req_w};
1746 $y += $child->{c_valign} * $child->{req_h};
1324 1747
1325 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1748 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1326 $res = $_->find_widget ($x, $y) 1749 }
1327 and return $res; 1750
1328 } 1751 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} 1752}
1340 1753
1341############################################################################# 1754#############################################################################
1342 1755
1343package CFClient::UI::Box; 1756package CFPlus::UI::Box;
1344 1757
1345our @ISA = CFClient::UI::Container::; 1758our @ISA = CFPlus::UI::Container::;
1346 1759
1347sub size_request { 1760sub size_request {
1348 my ($self) = @_; 1761 my ($self) = @_;
1762
1763 my @children = $self->visible_children;
1349 1764
1350 $self->{vertical} 1765 $self->{vertical}
1351 ? ( 1766 ? (
1352 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1767 (List::Util::max map $_->{req_w}, @children),
1353 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1768 (List::Util::sum map $_->{req_h}, @children),
1354 ) 1769 )
1355 : ( 1770 : (
1356 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1771 (List::Util::sum map $_->{req_w}, @children),
1357 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1772 (List::Util::max map $_->{req_h}, @children),
1358 ) 1773 )
1359} 1774}
1360 1775
1361sub size_allocate { 1776sub invoke_size_allocate {
1362 my ($self, $w, $h) = @_; 1777 my ($self, $w, $h) = @_;
1363 1778
1364 my $space = $self->{vertical} ? $h : $w; 1779 my $space = $self->{vertical} ? $h : $w;
1365 my $children = $self->{children}; 1780 my @children = $self->visible_children;
1366 1781
1367 my @req; 1782 my @req;
1368 1783
1369 if ($self->{homogeneous}) { 1784 if ($self->{homogeneous}) {
1370 @req = ($space / (@$children || 1)) x @$children; 1785 @req = ($space / (@children || 1)) x @children;
1371 } else { 1786 } else {
1372 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1787 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1373 my $req = List::Util::sum @req; 1788 my $req = List::Util::sum @req;
1374 1789
1375 if ($req > $space) { 1790 if ($req > $space) {
1376 # ah well, not enough space 1791 # ah well, not enough space
1377 $_ *= $space / $req for @req; 1792 $_ *= $space / $req for @req;
1378 } else { 1793 } else {
1379 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1794 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1380 1795
1381 $space = ($space - $req) / $expand; # remaining space to give away 1796 $space = ($space - $req) / $expand; # remaining space to give away
1382 1797
1383 $req[$_] += $space * $children->[$_]{expand} 1798 $req[$_] += $space * $children[$_]{expand}
1384 for 0 .. $#$children; 1799 for 0 .. $#children;
1385 } 1800 }
1386 } 1801 }
1387 1802
1388 CFClient::UI::harmonize \@req; 1803 CFPlus::UI::harmonize \@req;
1389 1804
1390 my $pos = 0; 1805 my $pos = 0;
1391 for (0 .. $#$children) { 1806 for (0 .. $#children) {
1392 my $alloc = $req[$_]; 1807 my $alloc = $req[$_];
1393 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1808 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1394 1809
1395 $pos += $alloc; 1810 $pos += $alloc;
1396 } 1811 }
1397 1812
1398 1 1813 1
1399} 1814}
1400 1815
1401############################################################################# 1816#############################################################################
1402 1817
1403package CFClient::UI::HBox; 1818package CFPlus::UI::HBox;
1404 1819
1405our @ISA = CFClient::UI::Box::; 1820our @ISA = CFPlus::UI::Box::;
1406 1821
1407sub new { 1822sub new {
1408 my $class = shift; 1823 my $class = shift;
1409 1824
1410 $class->SUPER::new ( 1825 $class->SUPER::new (
… …
1413 ) 1828 )
1414} 1829}
1415 1830
1416############################################################################# 1831#############################################################################
1417 1832
1418package CFClient::UI::VBox; 1833package CFPlus::UI::VBox;
1419 1834
1420our @ISA = CFClient::UI::Box::; 1835our @ISA = CFPlus::UI::Box::;
1421 1836
1422sub new { 1837sub new {
1423 my $class = shift; 1838 my $class = shift;
1424 1839
1425 $class->SUPER::new ( 1840 $class->SUPER::new (
… …
1428 ) 1843 )
1429} 1844}
1430 1845
1431############################################################################# 1846#############################################################################
1432 1847
1433package CFClient::UI::Label; 1848package CFPlus::UI::Label;
1434 1849
1435our @ISA = CFClient::UI::DrawBG::; 1850our @ISA = CFPlus::UI::DrawBG::;
1436 1851
1437use CFClient::OpenGL; 1852use CFPlus::OpenGL;
1438 1853
1439sub new { 1854sub new {
1440 my ($class, %arg) = @_; 1855 my ($class, %arg) = @_;
1441 1856
1442 my $self = $class->SUPER::new ( 1857 my $self = $class->SUPER::new (
… …
1445 #active_bg => none 1860 #active_bg => none
1446 #font => default_font 1861 #font => default_font
1447 #text => initial text 1862 #text => initial text
1448 #markup => initial narkup 1863 #markup => initial narkup
1449 #max_w => maximum pixel width 1864 #max_w => maximum pixel width
1865 #style => 0, # render flags
1450 ellipsise => 3, # end 1866 ellipsise => 3, # end
1451 layout => (new CFClient::Layout), 1867 layout => (new CFPlus::Layout),
1452 fontsize => 1, 1868 fontsize => 1,
1453 align => -1, 1869 align => -1,
1454 valign => -1, 1870 valign => -1,
1455 padding_x => 2, 1871 padding_x => 2,
1456 padding_y => 2, 1872 padding_y => 2,
1457 can_events => 0, 1873 can_events => 0,
1458 %arg 1874 %arg
1459 ); 1875 );
1460 1876
1461 if (exists $self->{template}) { 1877 if (exists $self->{template}) {
1462 my $layout = new CFClient::Layout; 1878 my $layout = new CFPlus::Layout;
1463 $layout->set_text (delete $self->{template}); 1879 $layout->set_text (delete $self->{template});
1464 $self->{template} = $layout; 1880 $self->{template} = $layout;
1465 } 1881 }
1466 1882
1467 if (exists $self->{markup}) { 1883 if (exists $self->{markup}) {
… …
1471 } 1887 }
1472 1888
1473 $self 1889 $self
1474} 1890}
1475 1891
1476sub escape($) {
1477 local $_ = $_[0];
1478
1479 s/&/&amp;/g;
1480 s/>/&gt;/g;
1481 s/</&lt;/g;
1482
1483 $_
1484}
1485
1486sub update { 1892sub update {
1487 my ($self) = @_; 1893 my ($self) = @_;
1488 1894
1489 delete $self->{texture}; 1895 delete $self->{texture};
1490 $self->SUPER::update; 1896 $self->SUPER::update;
1491} 1897}
1492 1898
1899sub realloc {
1900 my ($self) = @_;
1901
1902 delete $self->{ox};
1903 $self->SUPER::realloc;
1904}
1905
1493sub set_text { 1906sub set_text {
1494 my ($self, $text) = @_; 1907 my ($self, $text) = @_;
1495 1908
1496 return if $self->{text} eq "T$text"; 1909 return if $self->{text} eq "T$text";
1497 $self->{text} = "T$text"; 1910 $self->{text} = "T$text";
1498 1911
1499 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1500 $self->{layout}->set_text ($text); 1912 $self->{layout}->set_text ($text);
1501 1913
1914 delete $self->{size_req};
1502 $self->realloc; 1915 $self->realloc;
1503 $self->update; 1916 $self->update;
1504} 1917}
1505 1918
1506sub set_markup { 1919sub set_markup {
… …
1509 return if $self->{text} eq "M$markup"; 1922 return if $self->{text} eq "M$markup";
1510 $self->{text} = "M$markup"; 1923 $self->{text} = "M$markup";
1511 1924
1512 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1925 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1513 1926
1514 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1515 $self->{layout}->set_markup ($markup); 1927 $self->{layout}->set_markup ($markup);
1516 1928
1929 delete $self->{size_req};
1517 $self->realloc; 1930 $self->realloc;
1518 $self->update; 1931 $self->update;
1519} 1932}
1520 1933
1521sub size_request { 1934sub size_request {
1522 my ($self) = @_; 1935 my ($self) = @_;
1523 1936
1937 $self->{size_req} ||= do {
1524 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1938 $self->{layout}->set_font ($self->{font}) if $self->{font};
1525 $self->{layout}->set_width ($self->{max_w} || -1); 1939 $self->{layout}->set_width ($self->{max_w} || -1);
1526 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1940 $self->{layout}->set_ellipsise ($self->{ellipsise});
1527 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1941 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1942 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529 1943
1530 my ($w, $h) = $self->{layout}->size; 1944 my ($w, $h) = $self->{layout}->size;
1531 1945
1532 if (exists $self->{template}) { 1946 if (exists $self->{template}) {
1533 $self->{template}->set_font ($self->{font}) if $self->{font}; 1947 $self->{template}->set_font ($self->{font}) if $self->{font};
1948 $self->{template}->set_width ($self->{max_w} || -1);
1534 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1949 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1535 1950
1536 my ($w2, $h2) = $self->{template}->size; 1951 my ($w2, $h2) = $self->{template}->size;
1537 1952
1538 $w = List::Util::max $w, $w2; 1953 $w = List::Util::max $w, $w2;
1539 $h = List::Util::max $h, $h2; 1954 $h = List::Util::max $h, $h2;
1955 }
1956
1957 [$w, $h]
1540 } 1958 };
1541 1959
1542 ($w, $h) 1960 @{ $self->{size_req} }
1543} 1961}
1544 1962
1963sub baseline_shift {
1964 $_[0]{layout}->descent
1965}
1966
1545sub size_allocate { 1967sub invoke_size_allocate {
1546 my ($self, $w, $h) = @_; 1968 my ($self, $w, $h) = @_;
1969
1970 delete $self->{ox};
1547 1971
1548 delete $self->{texture} 1972 delete $self->{texture}
1549 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1973 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1974
1975 1
1550} 1976}
1551 1977
1552sub set_fontsize { 1978sub set_fontsize {
1553 my ($self, $fontsize) = @_; 1979 my ($self, $fontsize) = @_;
1554 1980
1555 $self->{fontsize} = $fontsize; 1981 $self->{fontsize} = $fontsize;
1982 delete $self->{size_req};
1556 delete $self->{texture}; 1983 delete $self->{texture};
1557 1984
1558 $self->realloc; 1985 $self->realloc;
1559} 1986}
1560 1987
1988sub reconfigure {
1989 my ($self) = @_;
1990
1991 delete $self->{size_req};
1992 delete $self->{texture};
1993
1994 $self->SUPER::reconfigure;
1995}
1996
1561sub _draw { 1997sub _draw {
1562 my ($self) = @_; 1998 my ($self) = @_;
1563 1999
1564 $self->SUPER::_draw; # draw background, if applicable 2000 $self->SUPER::_draw; # draw background, if applicable
1565 2001
1566 my $tex = $self->{texture} ||= do { 2002 my $size = $self->{texture} ||= do {
1567 $self->{layout}->set_foreground (@{$self->{fg}}); 2003 $self->{layout}->set_foreground (@{$self->{fg}});
1568 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2004 $self->{layout}->set_font ($self->{font}) if $self->{font};
1569 $self->{layout}->set_width ($self->{w}); 2005 $self->{layout}->set_width ($self->{w});
1570 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2006 $self->{layout}->set_ellipsise ($self->{ellipsise});
1571 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2007 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1572 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2008 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 2009
1574 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2010 [$self->{layout}->size]
2011 };
1575 2012
2013 unless (exists $self->{ox}) {
1576 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2014 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1577 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2015 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1578 : ($self->{w} - $tex->{w}) * 0.5); 2016 : ($self->{w} - $size->[0]) * 0.5);
1579 2017
1580 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2018 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1581 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2019 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1582 : ($self->{h} - $tex->{h}) * 0.5); 2020 : ($self->{h} - $size->[1]) * 0.5);
1583
1584 $tex
1585 }; 2021 };
1586 2022
1587 glEnable GL_TEXTURE_2D; 2023# unless ($self->{list}) {
1588 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2024# $self->{list} = CFPlus::OpenGL::glGenList;
1589 2025# CFPlus::OpenGL::glNewList $self->{list};
1590 if ($tex->{format} == GL_ALPHA) { 2026# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1591 glColor @{$self->{fg}}; 2027# 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 } 2028# }
2029#
2030# CFPlus::OpenGL::glCallList $self->{list};
1596 2031
1597 glDisable GL_TEXTURE_2D; 2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1598} 2033}
2034
2035#sub destroy {
2036# my ($self) = @_;
2037#
2038# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2039#
2040# $self->SUPER::destroy;
2041#}
1599 2042
1600############################################################################# 2043#############################################################################
1601 2044
1602package CFClient::UI::EntryBase; 2045package CFPlus::UI::EntryBase;
1603 2046
1604our @ISA = CFClient::UI::Label::; 2047our @ISA = CFPlus::UI::Label::;
1605 2048
1606use CFClient::OpenGL; 2049use CFPlus::OpenGL;
1607 2050
1608sub new { 2051sub new {
1609 my $class = shift; 2052 my $class = shift;
1610 2053
1611 $class->SUPER::new ( 2054 $class->SUPER::new (
… …
1615 active_fg => [0, 0, 0], 2058 active_fg => [0, 0, 0],
1616 can_hover => 1, 2059 can_hover => 1,
1617 can_focus => 1, 2060 can_focus => 1,
1618 valign => 0, 2061 valign => 0,
1619 can_events => 1, 2062 can_events => 1,
2063 ellipsise => 0,
1620 #text => ... 2064 #text => ...
2065 #hidden => "*",
1621 @_ 2066 @_
1622 ) 2067 )
1623} 2068}
1624 2069
1625sub _set_text { 2070sub _set_text {
… …
1627 2072
1628 delete $self->{cur_h}; 2073 delete $self->{cur_h};
1629 2074
1630 return if $self->{text} eq $text; 2075 return if $self->{text} eq $text;
1631 2076
1632 delete $self->{texture};
1633
1634 $self->{last_activity} = $::NOW; 2077 $self->{last_activity} = $::NOW;
1635 $self->{text} = $text; 2078 $self->{text} = $text;
1636 2079
1637 $text =~ s/./*/g if $self->{hidden}; 2080 $text =~ s/./*/g if $self->{hidden};
1638 $self->{layout}->set_text ("$text "); 2081 $self->{layout}->set_text ("$text ");
2082 delete $self->{size_req};
1639 2083
1640 $self->_emit (changed => $self->{text}); 2084 $self->emit (changed => $self->{text});
2085
2086 $self->realloc;
2087 $self->update;
1641} 2088}
1642 2089
1643sub set_text { 2090sub set_text {
1644 my ($self, $text) = @_; 2091 my ($self, $text) = @_;
1645 2092
1646 $self->{cursor} = length $text; 2093 $self->{cursor} = length $text;
1647 $self->_set_text ($text); 2094 $self->_set_text ($text);
1648
1649 $self->realloc;
1650} 2095}
1651 2096
1652sub get_text { 2097sub get_text {
1653 $_[0]{text} 2098 $_[0]{text}
1654} 2099}
… …
1659 my ($w, $h) = $self->SUPER::size_request; 2104 my ($w, $h) = $self->SUPER::size_request;
1660 2105
1661 ($w + 1, $h) # add 1 for cursor 2106 ($w + 1, $h) # add 1 for cursor
1662} 2107}
1663 2108
1664sub key_down { 2109sub invoke_key_down {
1665 my ($self, $ev) = @_; 2110 my ($self, $ev) = @_;
1666 2111
1667 my $mod = $ev->{mod}; 2112 my $mod = $ev->{mod};
1668 my $sym = $ev->{sym}; 2113 my $sym = $ev->{sym};
1669 my $uni = $ev->{unicode}; 2114 my $uni = $ev->{unicode};
1670 2115
1671 my $text = $self->get_text; 2116 my $text = $self->get_text;
2117
2118 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1672 2119
1673 if ($uni == 8) { 2120 if ($uni == 8) {
1674 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2121 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1675 } elsif ($uni == 127) { 2122 } elsif ($uni == 127) {
1676 substr $text, $self->{cursor}, 1, ""; 2123 substr $text, $self->{cursor}, 1, "";
1677 } elsif ($sym == CFClient::SDLK_LEFT) { 2124 } elsif ($sym == CFPlus::SDLK_LEFT) {
1678 --$self->{cursor} if $self->{cursor}; 2125 --$self->{cursor} if $self->{cursor};
1679 } elsif ($sym == CFClient::SDLK_RIGHT) { 2126 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1680 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2127 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1681 } elsif ($sym == CFClient::SDLK_HOME) { 2128 } elsif ($sym == CFPlus::SDLK_HOME) {
2129 # what a hack
2130 $self->{cursor} =
2131 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2132 ? length $1
2133 : 0;
2134 } elsif ($sym == CFPlus::SDLK_END) {
2135 # uh, again
2136 $self->{cursor} =
2137 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2138 ? $self->{cursor} + length $1
2139 : length $self->{text};
2140 } elsif ($uni == 21) { # ctrl-u
2141 $text = "";
1682 $self->{cursor} = 0; 2142 $self->{cursor} = 0;
1683 } elsif ($sym == CFClient::SDLK_END) {
1684 $self->{cursor} = length $text;
1685 } elsif ($uni == 27) { 2143 } elsif ($uni == 27) {
1686 $self->_emit ('escape'); 2144 $self->emit ('escape');
1687 } elsif ($uni) { 2145 } elsif ($uni == 0x0d) {
2146 substr $text, $self->{cursor}++, 0, "\012";
2147 } elsif ($uni >= 0x20) {
1688 substr $text, $self->{cursor}++, 0, chr $uni; 2148 substr $text, $self->{cursor}++, 0, chr $uni;
2149 } else {
2150 return 0;
1689 } 2151 }
1690 2152
1691 $self->_set_text ($text); 2153 $self->_set_text ($text);
1692 2154
1693 $self->realloc; 2155 $self->realloc;
1694} 2156 $self->update;
1695 2157
2158 1
2159}
2160
1696sub focus_in { 2161sub invoke_focus_in {
1697 my ($self) = @_; 2162 my ($self) = @_;
1698 2163
1699 $self->{last_activity} = $::NOW; 2164 $self->{last_activity} = $::NOW;
1700 2165
1701 $self->SUPER::focus_in; 2166 $self->SUPER::invoke_focus_in
1702} 2167}
1703 2168
1704sub button_down { 2169sub invoke_button_down {
1705 my ($self, $ev, $x, $y) = @_; 2170 my ($self, $ev, $x, $y) = @_;
1706 2171
1707 $self->SUPER::button_down ($ev, $x, $y); 2172 $self->SUPER::invoke_button_down ($ev, $x, $y);
1708 2173
1709 my $idx = $self->{layout}->xy_to_index ($x, $y); 2174 my $idx = $self->{layout}->xy_to_index ($x, $y);
1710 2175
1711 # byte-index to char-index 2176 # byte-index to char-index
1712 my $text = $self->{text}; 2177 my $text = $self->{text};
1713 utf8::encode $text; 2178 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1714 $self->{cursor} = length substr $text, 0, $idx; 2179 $self->{cursor} = length $text;
1715 2180
1716 $self->_set_text ($self->{text}); 2181 $self->_set_text ($self->{text});
1717 $self->update; 2182 $self->update;
2183
2184 1
1718} 2185}
1719 2186
1720sub mouse_motion { 2187sub invoke_mouse_motion {
1721 my ($self, $ev, $x, $y) = @_; 2188 my ($self, $ev, $x, $y) = @_;
1722# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2189# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2190
2191 1
1723} 2192}
1724 2193
1725sub _draw { 2194sub _draw {
1726 my ($self) = @_; 2195 my ($self) = @_;
1727 2196
1728 local $self->{fg} = $self->{fg}; 2197 local $self->{fg} = $self->{fg};
1729 2198
1730 if ($FOCUS == $self) { 2199 if ($FOCUS == $self) {
1731 glColor @{$self->{active_bg}}; 2200 glColor_premultiply @{$self->{active_bg}};
1732 $self->{fg} = $self->{active_fg}; 2201 $self->{fg} = $self->{active_fg};
1733 } else { 2202 } else {
1734 glColor @{$self->{bg}}; 2203 glColor_premultiply @{$self->{bg}};
1735 } 2204 }
1736 2205
1737 glEnable GL_BLEND; 2206 glEnable GL_BLEND;
1738 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2207 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1739 glBegin GL_QUADS; 2208 glBegin GL_QUADS;
1740 glVertex 0 , 0; 2209 glVertex 0 , 0;
1741 glVertex 0 , $self->{h}; 2210 glVertex 0 , $self->{h};
1742 glVertex $self->{w}, $self->{h}; 2211 glVertex $self->{w}, $self->{h};
1743 glVertex $self->{w}, 0; 2212 glVertex $self->{w}, 0;
… …
1754 utf8::encode $text; 2223 utf8::encode $text;
1755 2224
1756 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2225 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1757 } 2226 }
1758 2227
1759 glColor @{$self->{fg}};
1760 glBegin GL_LINES; 2228 glBegin GL_LINES;
1761 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2229 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}; 2230 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1763 glEnd; 2231 glEnd;
1764 } 2232 }
1765} 2233}
1766 2234
2235#############################################################################
2236
1767package CFClient::UI::Entry; 2237package CFPlus::UI::Entry;
1768 2238
1769our @ISA = CFClient::UI::EntryBase::; 2239our @ISA = CFPlus::UI::EntryBase::;
1770 2240
1771use CFClient::OpenGL; 2241use CFPlus::OpenGL;
1772 2242
1773sub key_down { 2243sub invoke_key_down {
1774 my ($self, $ev) = @_; 2244 my ($self, $ev) = @_;
1775 2245
1776 my $sym = $ev->{sym}; 2246 my $sym = $ev->{sym};
1777 2247
1778 if ($sym == 13) { 2248 if ($ev->{uni} == 0x0d || $sym == 13) {
1779 unshift @{$self->{history}}, 2249 unshift @{$self->{history}},
1780 my $txt = $self->get_text; 2250 my $txt = $self->get_text;
2251
1781 $self->{history_pointer} = -1; 2252 $self->{history_pointer} = -1;
1782 $self->{history_saveback} = ''; 2253 $self->{history_saveback} = '';
1783 $self->_emit (activate => $txt); 2254 $self->emit (activate => $txt);
1784 $self->update; 2255 $self->update;
1785 2256
1786 } elsif ($sym == CFClient::SDLK_UP) { 2257 } elsif ($sym == CFPlus::SDLK_UP) {
1787 if ($self->{history_pointer} < 0) { 2258 if ($self->{history_pointer} < 0) {
1788 $self->{history_saveback} = $self->get_text; 2259 $self->{history_saveback} = $self->get_text;
1789 } 2260 }
1790 if (@{$self->{history} || []} > 0) { 2261 if (@{$self->{history} || []} > 0) {
1791 $self->{history_pointer}++; 2262 $self->{history_pointer}++;
… …
1793 $self->{history_pointer} = @{$self->{history} || []} - 1; 2264 $self->{history_pointer} = @{$self->{history} || []} - 1;
1794 } 2265 }
1795 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2266 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1796 } 2267 }
1797 2268
1798 } elsif ($sym == CFClient::SDLK_DOWN) { 2269 } elsif ($sym == CFPlus::SDLK_DOWN) {
1799 $self->{history_pointer}--; 2270 $self->{history_pointer}--;
1800 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2271 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1801 2272
1802 if ($self->{history_pointer} >= 0) { 2273 if ($self->{history_pointer} >= 0) {
1803 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2274 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1804 } else { 2275 } else {
1805 $self->set_text ($self->{history_saveback}); 2276 $self->set_text ($self->{history_saveback});
1806 } 2277 }
1807 2278
1808 } else { 2279 } else {
1809 $self->SUPER::key_down ($ev); 2280 return $self->SUPER::invoke_key_down ($ev)
2281 }
2282
1810 } 2283 1
1811
1812} 2284}
1813 2285
1814############################################################################# 2286#############################################################################
1815 2287
2288package CFPlus::UI::TextEdit;
2289
2290our @ISA = CFPlus::UI::EntryBase::;
2291
2292use CFPlus::OpenGL;
2293
2294sub move_cursor_ver {
2295 my ($self, $dy) = @_;
2296
2297 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2298
2299 $y += $dy;
2300
2301 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2302 $self->{cursor} = $index;
2303 delete $self->{cur_h};
2304 $self->update;
2305 return;
2306 }
2307}
2308
2309sub invoke_key_down {
2310 my ($self, $ev) = @_;
2311
2312 my $sym = $ev->{sym};
2313
2314 if ($sym == CFPlus::SDLK_UP) {
2315 $self->move_cursor_ver (-1);
2316 } elsif ($sym == CFPlus::SDLK_DOWN) {
2317 $self->move_cursor_ver (+1);
2318 } else {
2319 return $self->SUPER::invoke_key_down ($ev)
2320 }
2321
2322 1
2323}
2324
2325#############################################################################
2326
1816package CFClient::UI::Button; 2327package CFPlus::UI::Button;
1817 2328
1818our @ISA = CFClient::UI::Label::; 2329our @ISA = CFPlus::UI::Label::;
1819 2330
1820use CFClient::OpenGL; 2331use CFPlus::OpenGL;
1821 2332
1822my @tex = 2333my @tex =
1823 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2334 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1824 qw(b1_button_active.png); 2335 qw(b1_button_inactive.png b1_button_active.png);
1825 2336
1826sub new { 2337sub new {
1827 my $class = shift; 2338 my $class = shift;
1828 2339
1829 $class->SUPER::new ( 2340 $class->SUPER::new (
1830 padding_x => 4, 2341 padding_x => 4,
1831 padding_y => 4, 2342 padding_y => 4,
1832 fg => [1, 1, 1], 2343 fg => [1.0, 1.0, 1.0],
1833 active_fg => [0, 0, 1], 2344 active_fg => [0.8, 0.8, 0.8],
1834 can_hover => 1, 2345 can_hover => 1,
1835 align => 0, 2346 align => 0,
1836 valign => 0, 2347 valign => 0,
1837 can_events => 1, 2348 can_events => 1,
1838 @_ 2349 @_
1839 ) 2350 )
1840} 2351}
1841 2352
1842sub activate { }
1843
1844sub button_up { 2353sub invoke_button_up {
1845 my ($self, $ev, $x, $y) = @_; 2354 my ($self, $ev, $x, $y) = @_;
1846 2355
1847 $self->emit ("activate") 2356 $self->emit ("activate")
1848 if $x >= 0 && $x < $self->{w} 2357 if $x >= 0 && $x < $self->{w}
1849 && $y >= 0 && $y < $self->{h}; 2358 && $y >= 0 && $y < $self->{h};
2359
2360 1
1850} 2361}
1851 2362
1852sub _draw { 2363sub _draw {
1853 my ($self) = @_; 2364 my ($self) = @_;
1854 2365
1855 local $self->{fg} = $self->{fg}; 2366 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1856
1857 if ($GRAB == $self) {
1858 $self->{fg} = $self->{active_fg};
1859 }
1860 2367
1861 glEnable GL_TEXTURE_2D; 2368 glEnable GL_TEXTURE_2D;
1862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2369 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1863 glColor 0, 0, 0, 1; 2370 glColor 0, 0, 0, 1;
1864 2371
2372 my $tex = $tex[$GRAB == $self];
1865 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2373 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1866 2374
1867 glDisable GL_TEXTURE_2D; 2375 glDisable GL_TEXTURE_2D;
1868 2376
1869 $self->SUPER::_draw; 2377 $self->SUPER::_draw;
1870} 2378}
1871 2379
1872############################################################################# 2380#############################################################################
1873 2381
1874package CFClient::UI::CheckBox; 2382package CFPlus::UI::CheckBox;
1875 2383
1876our @ISA = CFClient::UI::DrawBG::; 2384our @ISA = CFPlus::UI::DrawBG::;
1877 2385
1878my @tex = 2386my @tex =
1879 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2387 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1880 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2388 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1881 2389
1882use CFClient::OpenGL; 2390use CFPlus::OpenGL;
1883 2391
1884sub new { 2392sub new {
1885 my $class = shift; 2393 my $class = shift;
1886 2394
1887 $class->SUPER::new ( 2395 $class->SUPER::new (
… …
1901 my ($self) = @_; 2409 my ($self) = @_;
1902 2410
1903 (6) x 2 2411 (6) x 2
1904} 2412}
1905 2413
2414sub toggle {
2415 my ($self) = @_;
2416
2417 $self->{state} = !$self->{state};
2418 $self->emit (changed => $self->{state});
2419 $self->update;
2420}
2421
1906sub button_down { 2422sub invoke_button_down {
1907 my ($self, $ev, $x, $y) = @_; 2423 my ($self, $ev, $x, $y) = @_;
1908 2424
1909 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2425 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1910 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2426 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1911 $self->{state} = !$self->{state}; 2427 $self->toggle;
1912 $self->_emit (changed => $self->{state}); 2428 } else {
2429 return 0
2430 }
2431
1913 } 2432 1
1914} 2433}
1915 2434
1916sub _draw { 2435sub _draw {
1917 my ($self) = @_; 2436 my ($self) = @_;
1918 2437
… …
1933 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
1934} 2453}
1935 2454
1936############################################################################# 2455#############################################################################
1937 2456
1938package CFClient::UI::Image; 2457package CFPlus::UI::Image;
1939 2458
1940our @ISA = CFClient::UI::Base::; 2459our @ISA = CFPlus::UI::Base::;
1941 2460
1942use CFClient::OpenGL; 2461use CFPlus::OpenGL;
1943use Carp qw/confess/;
1944 2462
1945our %loaded_images; 2463our %texture_cache;
1946 2464
1947sub new { 2465sub new {
1948 my $class = shift; 2466 my $class = shift;
1949 2467
1950 my $self = $class->SUPER::new (can_events => 0, @_); 2468 my $self = $class->SUPER::new (
2469 can_events => 0,
2470 @_,
2471 );
1951 2472
1952 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2473 $self->{path} || $self->{tex}
2474 or Carp::croak "'path' or 'tex' attributes required";
1953 2475
1954 $loaded_images{$self->{image}} ||= 2476 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1955 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2477 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1956 2478
1957 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2479 CFPlus::weaken $texture_cache{$self->{path}};
1958 2480
1959 Scalar::Util::weaken $loaded_images{$self->{image}}; 2481 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1960
1961 $self->{aspect} = $tex->{w} / $tex->{h};
1962 2482
1963 $self 2483 $self
1964} 2484}
1965 2485
2486sub STORABLE_freeze {
2487 my ($self, $cloning) = @_;
2488
2489 $self->{path}
2490 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2491
2492 $self->{path}
2493}
2494
2495sub STORABLE_attach {
2496 my ($self, $cloning, $path) = @_;
2497
2498 $self->new (path => $path)
2499}
2500
1966sub size_request { 2501sub size_request {
1967 my ($self) = @_; 2502 my ($self) = @_;
1968 2503
1969 ($self->{tex}->{w}, $self->{tex}->{h}) 2504 ($self->{tex}{w}, $self->{tex}{h})
1970} 2505}
1971 2506
1972sub _draw { 2507sub _draw {
1973 my ($self) = @_; 2508 my ($self) = @_;
1974 2509
… …
1984 } 2519 }
1985 2520
1986 glEnable GL_TEXTURE_2D; 2521 glEnable GL_TEXTURE_2D;
1987 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2522 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1988 2523
1989 $tex->draw_quad_alpha (0, 0, $w, $h); 2524 $tex->draw_quad (0, 0, $w, $h);
1990 2525
1991 glDisable GL_TEXTURE_2D; 2526 glDisable GL_TEXTURE_2D;
1992} 2527}
1993 2528
1994############################################################################# 2529#############################################################################
1995 2530
2531package CFPlus::UI::ImageButton;
2532
2533our @ISA = CFPlus::UI::Image::;
2534
2535use CFPlus::OpenGL;
2536
2537my %textures;
2538
2539sub new {
2540 my $class = shift;
2541
2542 my $self = $class->SUPER::new (
2543 padding_x => 4,
2544 padding_y => 4,
2545 fg => [1, 1, 1],
2546 active_fg => [0, 0, 1],
2547 can_hover => 1,
2548 align => 0,
2549 valign => 0,
2550 can_events => 1,
2551 @_
2552 );
2553}
2554
2555sub invoke_button_up {
2556 my ($self, $ev, $x, $y) = @_;
2557
2558 $self->emit ("activate")
2559 if $x >= 0 && $x < $self->{w}
2560 && $y >= 0 && $y < $self->{h};
2561
2562 1
2563}
2564
2565#############################################################################
2566
1996package CFClient::UI::VGauge; 2567package CFPlus::UI::VGauge;
1997 2568
1998our @ISA = CFClient::UI::Base::; 2569our @ISA = CFPlus::UI::Base::;
1999 2570
2000use List::Util qw(min max); 2571use List::Util qw(min max);
2001 2572
2002use CFClient::OpenGL; 2573use CFPlus::OpenGL;
2003 2574
2004my %tex = ( 2575my %tex = (
2005 food => [ 2576 food => [
2006 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2577 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2007 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2578 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2008 ], 2579 ],
2009 grace => [ 2580 grace => [
2010 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2581 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/ 2582 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2012 ], 2583 ],
2013 hp => [ 2584 hp => [
2014 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2585 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2015 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2586 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2016 ], 2587 ],
2017 mana => [ 2588 mana => [
2018 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2589 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/ 2590 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2020 ], 2591 ],
2021); 2592);
2022 2593
2023# eg. VGauge->new (gauge => 'food'), default gauge: food 2594# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2083 my $ycut1 = max 0, min 1, $ycut; 2654 my $ycut1 = max 0, min 1, $ycut;
2084 my $ycut2 = max 0, min 1, $ycut - 1; 2655 my $ycut2 = max 0, min 1, $ycut - 1;
2085 2656
2086 my $h1 = $self->{h} * (1 - $ycut1); 2657 my $h1 = $self->{h} * (1 - $ycut1);
2087 my $h2 = $self->{h} * (1 - $ycut2); 2658 my $h2 = $self->{h} * (1 - $ycut2);
2659 my $h3 = $self->{h};
2660
2661 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2088 2662
2089 glEnable GL_BLEND; 2663 glEnable GL_BLEND;
2090 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2664 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2665 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2091 glEnable GL_TEXTURE_2D; 2666 glEnable GL_TEXTURE_2D;
2092 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2093 2668
2094 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2669 glBindTexture GL_TEXTURE_2D, $t1->{name};
2095 glBegin GL_QUADS; 2670 glBegin GL_QUADS;
… …
2110 2685
2111 if ($t3) { 2686 if ($t3) {
2112 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2687 glBindTexture GL_TEXTURE_2D, $t3->{name};
2113 glBegin GL_QUADS; 2688 glBegin GL_QUADS;
2114 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2689 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2115 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2690 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2116 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2691 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2117 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2692 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2118 glEnd; 2693 glEnd;
2119 } 2694 }
2120 2695
2121 glDisable GL_BLEND; 2696 glDisable GL_BLEND;
2122 glDisable GL_TEXTURE_2D; 2697 glDisable GL_TEXTURE_2D;
2123} 2698}
2124 2699
2125############################################################################# 2700#############################################################################
2126 2701
2127package CFClient::UI::Gauge; 2702package CFPlus::UI::Gauge;
2128 2703
2129our @ISA = CFClient::UI::VBox::; 2704our @ISA = CFPlus::UI::VBox::;
2130 2705
2131sub new { 2706sub new {
2132 my ($class, %arg) = @_; 2707 my ($class, %arg) = @_;
2133 2708
2134 my $self = $class->SUPER::new ( 2709 my $self = $class->SUPER::new (
… …
2136 can_hover => 1, 2711 can_hover => 1,
2137 can_events => 1, 2712 can_events => 1,
2138 %arg, 2713 %arg,
2139 ); 2714 );
2140 2715
2141 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2716 $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); 2717 $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"); 2718 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2144 2719
2145 $self 2720 $self
2146} 2721}
2147 2722
2148sub set_fontsize { 2723sub set_fontsize {
… …
2169 $self->{value}->set_text ($val); 2744 $self->{value}->set_text ($val);
2170} 2745}
2171 2746
2172############################################################################# 2747#############################################################################
2173 2748
2174package CFClient::UI::Slider; 2749package CFPlus::UI::Slider;
2175 2750
2176use strict; 2751use strict;
2177 2752
2178use CFClient::OpenGL; 2753use CFPlus::OpenGL;
2179 2754
2180our @ISA = CFClient::UI::DrawBG::; 2755our @ISA = CFPlus::UI::DrawBG::;
2181 2756
2182my @tex = 2757my @tex =
2183 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2758 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2184 qw(s1_slider.png s1_slider_bg.png); 2759 qw(s1_slider.png s1_slider_bg.png);
2185 2760
2186sub new { 2761sub new {
2187 my $class = shift; 2762 my $class = shift;
2188 2763
… …
2209 $self->update; 2784 $self->update;
2210 2785
2211 $self 2786 $self
2212} 2787}
2213 2788
2214sub changed { }
2215
2216sub set_range { 2789sub set_range {
2217 my ($self, $range) = @_; 2790 my ($self, $range) = @_;
2218 2791
2219 ($range, $self->{range}) = ($self->{range}, $range); 2792 ($range, $self->{range}) = ($self->{range}, $range);
2220 2793
2221 $self->update
2222 if "@$range" ne "@{$self->{range}}"; 2794 if ("@$range" ne "@{$self->{range}}") {
2795 $self->update;
2796 $self->set_value ($self->{range}[0]);
2797 }
2223} 2798}
2224 2799
2225sub set_value { 2800sub set_value {
2226 my ($self, $value) = @_; 2801 my ($self, $value) = @_;
2227 2802
… …
2238 if $unit; 2813 if $unit;
2239 2814
2240 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2815 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2241 2816
2242 if ($value != $old_value) { 2817 if ($value != $old_value) {
2243 $self->_emit (changed => $value); 2818 $self->emit (changed => $value);
2244 $self->update; 2819 $self->update;
2245 } 2820 }
2246} 2821}
2247 2822
2248sub size_request { 2823sub size_request {
2249 my ($self) = @_; 2824 my ($self) = @_;
2250 2825
2251 ($self->{req_w}, $self->{req_h}) 2826 ($self->{req_w}, $self->{req_h})
2252} 2827}
2253 2828
2254sub button_down { 2829sub invoke_button_down {
2255 my ($self, $ev, $x, $y) = @_; 2830 my ($self, $ev, $x, $y) = @_;
2256 2831
2257 $self->SUPER::button_down ($ev, $x, $y); 2832 $self->SUPER::invoke_button_down ($ev, $x, $y);
2258 2833
2259 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2834 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2260 2835
2261 $self->mouse_motion ($ev, $x, $y); 2836 $self->invoke_mouse_motion ($ev, $x, $y);
2262}
2263 2837
2838 1
2839}
2840
2264sub mouse_motion { 2841sub invoke_mouse_motion {
2265 my ($self, $ev, $x, $y) = @_; 2842 my ($self, $ev, $x, $y) = @_;
2266 2843
2267 if ($GRAB == $self) { 2844 if ($GRAB == $self) {
2268 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2845 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2269 2846
2270 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2847 my (undef, $lo, $hi, $page) = @{$self->{range}};
2271 2848
2272 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2849 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2273 2850
2274 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2851 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2852 } else {
2853 return 0;
2854 }
2855
2275 } 2856 1
2857}
2858
2859sub invoke_mouse_wheel {
2860 my ($self, $ev) = @_;
2861
2862 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2863
2864 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2865
2866 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2867
2868 1
2276} 2869}
2277 2870
2278sub update { 2871sub update {
2279 my ($self) = @_; 2872 my ($self) = @_;
2280 2873
2281 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2874 delete $self->{knob_w};
2875 $self->SUPER::update;
2876}
2877
2878sub _draw {
2879 my ($self) = @_;
2880
2881 unless ($self->{knob_w}) {
2282 $self->set_value ($self->{range}[0]); 2882 $self->set_value ($self->{range}[0]);
2283 2883
2284 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2884 my ($value, $lo, $hi, $page) = @{$self->{range}};
2285 my $range = ($hi - $page - $lo) || 1e-100; 2885 my $range = ($hi - $page - $lo) || 1e-100;
2286 2886
… …
2292 $value = ($value - $lo) / $range; 2892 $value = ($value - $lo) / $range;
2293 $value = $value * $self->{scale} + $self->{offset}; 2893 $value = $value * $self->{scale} + $self->{offset};
2294 2894
2295 $self->{knob_x} = $value - $knob_w * 0.5; 2895 $self->{knob_x} = $value - $knob_w * 0.5;
2296 $self->{knob_w} = $knob_w; 2896 $self->{knob_w} = $knob_w;
2297 }); 2897 }
2298
2299 $self->SUPER::update;
2300}
2301
2302sub _draw {
2303 my ($self) = @_;
2304 2898
2305 $self->SUPER::_draw (); 2899 $self->SUPER::_draw ();
2306 2900
2307 glScale $self->{w}, $self->{h}; 2901 glScale $self->{w}, $self->{h};
2308 2902
… …
2328 glDisable GL_TEXTURE_2D; 2922 glDisable GL_TEXTURE_2D;
2329} 2923}
2330 2924
2331############################################################################# 2925#############################################################################
2332 2926
2333package CFClient::UI::ValSlider; 2927package CFPlus::UI::ValSlider;
2334 2928
2335our @ISA = CFClient::UI::HBox::; 2929our @ISA = CFPlus::UI::HBox::;
2336 2930
2337sub new { 2931sub new {
2338 my ($class, %arg) = @_; 2932 my ($class, %arg) = @_;
2339 2933
2340 my $range = delete $arg{range}; 2934 my $range = delete $arg{range};
2341 2935
2342 my $self = $class->SUPER::new ( 2936 my $self = $class->SUPER::new (
2343 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2937 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2344 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2938 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2345 to_value => sub { shift }, 2939 to_value => sub { shift },
2346 from_value => sub { shift }, 2940 from_value => sub { shift },
2347 %arg, 2941 %arg,
2348 ); 2942 );
2349 2943
… …
2369sub set_range { shift->{slider}->set_range (@_) } 2963sub set_range { shift->{slider}->set_range (@_) }
2370sub set_value { shift->{slider}->set_value (@_) } 2964sub set_value { shift->{slider}->set_value (@_) }
2371 2965
2372############################################################################# 2966#############################################################################
2373 2967
2374package CFClient::UI::TextView; 2968package CFPlus::UI::TextScroller;
2375 2969
2376our @ISA = CFClient::UI::HBox::; 2970our @ISA = CFPlus::UI::HBox::;
2377 2971
2378use CFClient::OpenGL; 2972use CFPlus::OpenGL;
2379 2973
2380sub new { 2974sub new {
2381 my $class = shift; 2975 my $class = shift;
2382 2976
2383 my $self = $class->SUPER::new ( 2977 my $self = $class->SUPER::new (
2384 fontsize => 1, 2978 fontsize => 1,
2385 can_events => 0, 2979 can_events => 1,
2980 indent => 0,
2386 #font => default_font 2981 #font => default_font
2387 @_, 2982 @_,
2388 2983
2389 layout => (new CFClient::Layout 1), 2984 layout => (new CFPlus::Layout),
2390 par => [], 2985 par => [],
2986 max_par => 0,
2391 height => 0, 2987 height => 0,
2392 children => [ 2988 children => [
2393 (new CFClient::UI::Empty expand => 1), 2989 (new CFPlus::UI::Empty expand => 1),
2394 (new CFClient::UI::Slider vertical => 1), 2990 (new CFPlus::UI::Slider vertical => 1),
2395 ], 2991 ],
2396 ); 2992 );
2397 2993
2398 $self->{children}[1]->connect (changed => sub { $self->update }); 2994 $self->{children}[1]->connect (changed => sub { $self->update });
2399 2995
… …
2405 3001
2406 $self->{fontsize} = $fontsize; 3002 $self->{fontsize} = $fontsize;
2407 $self->reflow; 3003 $self->reflow;
2408} 3004}
2409 3005
3006sub size_request {
3007 my ($self) = @_;
3008
3009 my ($empty, $slider) = $self->visible_children;
3010
3011 local $self->{children} = [$empty, $slider];
3012 $self->SUPER::size_request
3013}
3014
2410sub size_allocate { 3015sub invoke_size_allocate {
2411 my ($self, $w, $h) = @_; 3016 my ($self, $w, $h) = @_;
2412 3017
2413 $self->SUPER::size_allocate ($w, $h); 3018 my ($empty, $slider, @other) = @{ $self->{children} };
3019 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2414 3020
2415 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3021 $self->{layout}->set_font ($self->{font}) if $self->{font};
2416 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3022 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2417 $self->{layout}->set_width ($self->{children}[0]{w}); 3023 $self->{layout}->set_width ($empty->{w});
3024 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2418 3025
2419 $self->reflow; 3026 $self->reflow;
2420}
2421 3027
2422sub text_size { 3028 local $self->{children} = [$empty, $slider];
3029 $self->SUPER::invoke_size_allocate ($w, $h)
3030}
3031
3032sub invoke_mouse_wheel {
2423 my ($self, $text, $indent) = @_; 3033 my ($self, $ev) = @_;
3034
3035 return 0 unless $ev->{dy}; # only vertical movements
3036
3037 $self->{children}[1]->emit (mouse_wheel => $ev);
3038
3039 1
3040}
3041
3042sub get_layout {
3043 my ($self, $para) = @_;
2424 3044
2425 my $layout = $self->{layout}; 3045 my $layout = $self->{layout};
2426 3046
3047 $layout->set_font ($self->{font}) if $self->{font};
3048 $layout->set_foreground (@{$para->{fg}});
2427 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3049 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2428 $layout->set_width ($self->{children}[0]{w} - $indent); 3050 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3051 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2429 $layout->set_markup ($text); 3052 $layout->set_markup ($para->{markup});
3053
3054 $layout->set_shapes (
3055 map
3056 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3057 @{$para->{widget}}
2430 3058 );
3059
2431 $layout->size 3060 $layout
2432} 3061}
2433 3062
2434sub reflow { 3063sub reflow {
2435 my ($self) = @_; 3064 my ($self) = @_;
2436 3065
… …
2443 3072
2444 # todo: base offset on lines or so, not on pixels 3073 # todo: base offset on lines or so, not on pixels
2445 $self->{children}[1]->set_value ($offset); 3074 $self->{children}[1]->set_value ($offset);
2446} 3075}
2447 3076
3077sub current_paragraph {
3078 my ($self) = @_;
3079
3080 $self->{top_paragraph} - 1
3081}
3082
3083sub scroll_to {
3084 my ($self, $para) = @_;
3085
3086 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3087
3088 $self->{scroll_to} = $para;
3089 $self->update;
3090}
3091
2448sub clear { 3092sub clear {
2449 my ($self) = @_; 3093 my ($self) = @_;
3094
3095 my (undef, undef, @other) = @{ $self->{children} };
3096 $self->remove ($_) for @other;
2450 3097
2451 $self->{par} = []; 3098 $self->{par} = [];
2452 $self->{height} = 0; 3099 $self->{height} = 0;
2453 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3100 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2454} 3101}
2455 3102
2456sub add_paragraph { 3103sub add_paragraph {
2457 my ($self, $color, $text, $indent) = @_; 3104 my $self = shift;
2458 3105
2459 for my $line (split /\n/, $text) { 3106 for my $para (@_) {
2460 my ($w, $h) = $self->text_size ($line); 3107 $para = {
3108 fg => [1, 1, 1, 1],
3109 indent => 0,
3110 markup => "",
3111 widget => [],
3112 ref $para ? %$para : (markup => $para),
3113 w => 1e10,
3114 wrapped => 1,
3115 };
3116
3117 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3118 push @{$self->{par}}, $para;
3119 }
3120
3121 if (my $max = $self->{max_par}) {
3122 shift @{$self->{par}} while @{$self->{par}} > $max;
3123 }
3124
3125 $self->{need_reflow}++;
3126 $self->update;
3127}
3128
3129sub scroll_to_bottom {
3130 my ($self) = @_;
3131
3132 $self->{scroll_to} = $#{$self->{par}};
3133 $self->update;
3134}
3135
3136sub force_uptodate {
3137 my ($self) = @_;
3138
3139 if (delete $self->{need_reflow}) {
3140 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3141
3142 my $height = 0;
3143
3144 for my $para (@{$self->{par}}) {
3145 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3146 my $layout = $self->get_layout ($para);
3147 my ($w, $h) = $layout->size;
3148
3149 $para->{w} = $w + $para->{indent};
3150 $para->{h} = $h;
3151 $para->{wrapped} = $layout->has_wrapped;
3152 }
3153
3154 $para->{y} = $height;
3155 $height += $para->{h};
3156 }
3157
2461 $self->{height} += $h; 3158 $self->{height} = $height;
2462 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3159 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2463 }
2464 3160
2465 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3161 delete $self->{texture};
3162 }
3163
3164 if (my $paridx = delete $self->{scroll_to}) {
3165 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3166 }
2466} 3167}
2467 3168
2468sub update { 3169sub update {
2469 my ($self) = @_; 3170 my ($self) = @_;
2470 3171
… …
2472 3173
2473 return unless $self->{h} > 0; 3174 return unless $self->{h} > 0;
2474 3175
2475 delete $self->{texture}; 3176 delete $self->{texture};
2476 3177
2477 $ROOT->on_post_alloc ($self, sub { 3178 $ROOT->on_post_alloc ($self => sub {
3179 $self->force_uptodate;
3180
2478 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3181 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2479 3182
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 { 3183 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2507 glClearColor 0.5, 0.5, 0.5, 0; 3184 glClearColor 0, 0, 0, 0;
2508 glClear GL_COLOR_BUFFER_BIT; 3185 glClear GL_COLOR_BUFFER_BIT;
2509 3186
3187 package CFPlus::UI::Base;
3188 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3189 (0, 0, $self->{w}, $self->{h});
3190
3191 my $top = int $self->{children}[1]{range}[0];
3192
3193 my $paridx = 0;
3194 my $top_paragraph;
2510 my $top = int $self->{children}[1]{range}[0]; 3195 my $top = int $self->{children}[1]{range}[0];
2511 3196
2512 my $y0 = $top; 3197 my $y0 = $top;
2513 my $y1 = $top + $H; 3198 my $y1 = $top + $H;
2514 3199
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}}) { 3200 for my $para (@{$self->{par}}) {
2526 my $h = $par->[1]; 3201 my $h = $para->{h};
3202 my $y = $para->{y};
2527 3203
2528 if ($y0 < $y + $h && $y < $y1) { 3204 if ($y0 < $y + $h && $y < $y1) {
2529 $layout->set_foreground (@{ $par->[2] }); 3205 my $layout = $self->get_layout ($para);
2530 $layout->set_width ($W - $par->[3]);
2531 $layout->set_markup ($par->[4]);
2532 3206
2533 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3207 $layout->render ($para->{indent}, $y - $y0);
2534 3208
2535 glRasterPos $par->[3], $y - $y0; 3209 if (my @w = @{ $para->{widget} }) {
2536 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3210 my @s = $layout->get_shapes;
3211
3212 for (@w) {
3213 my ($dx, $dy) = splice @s, 0, 2, ();
3214
3215 $_->{x} = $dx + $para->{indent};
3216 $_->{y} = $dy + $y - $y0;
3217
3218 $_->draw;
3219 }
3220 }
2537 } 3221 }
2538 3222
2539 $y += $h; 3223 $paridx++;
3224 $top_paragraph ||= $paridx if $y >= $top;
2540 } 3225 }
2541 3226
2542 glDisable GL_BLEND; 3227 $self->{top_paragraph} = $top_paragraph;
2543 }; 3228 };
2544 }); 3229 });
2545} 3230}
2546 3231
3232sub reconfigure {
3233 my ($self) = @_;
3234
3235 $self->SUPER::reconfigure;
3236
3237 $_->{w} = 1e10 for @{ $self->{par} };
3238 $self->reflow;
3239}
3240
2547sub _draw { 3241sub _draw {
2548 my ($self) = @_; 3242 my ($self) = @_;
2549 3243
2550 glEnable GL_TEXTURE_2D; 3244 glEnable GL_TEXTURE_2D;
2551 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3245 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2552 glColor 1, 1, 1, 1; 3246 glColor 0, 0, 0, 1;
2553 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3247 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2554 glDisable GL_TEXTURE_2D; 3248 glDisable GL_TEXTURE_2D;
2555 3249
2556 $self->{children}[1]->draw; 3250 $self->{children}[1]->draw;
2557
2558} 3251}
2559 3252
2560############################################################################# 3253#############################################################################
2561 3254
2562package CFClient::UI::Animator; 3255package CFPlus::UI::Animator;
2563 3256
2564use CFClient::OpenGL; 3257use CFPlus::OpenGL;
2565 3258
2566our @ISA = CFClient::UI::Bin::; 3259our @ISA = CFPlus::UI::Bin::;
2567 3260
2568sub moveto { 3261sub moveto {
2569 my ($self, $x, $y) = @_; 3262 my ($self, $x, $y) = @_;
2570 3263
2571 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3264 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2599 glPopMatrix; 3292 glPopMatrix;
2600} 3293}
2601 3294
2602############################################################################# 3295#############################################################################
2603 3296
2604package CFClient::UI::Flopper; 3297package CFPlus::UI::Flopper;
2605 3298
2606our @ISA = CFClient::UI::Button::; 3299our @ISA = CFPlus::UI::Button::;
2607 3300
2608sub new { 3301sub new {
2609 my $class = shift; 3302 my $class = shift;
2610 3303
2611 my $self = $class->SUPER::new ( 3304 my $self = $class->SUPER::new (
… …
2623 $self->{other}->toggle_visibility; 3316 $self->{other}->toggle_visibility;
2624} 3317}
2625 3318
2626############################################################################# 3319#############################################################################
2627 3320
2628package CFClient::UI::Tooltip; 3321package CFPlus::UI::Tooltip;
2629 3322
2630our @ISA = CFClient::UI::Bin::; 3323our @ISA = CFPlus::UI::Bin::;
2631 3324
2632use CFClient::OpenGL; 3325use CFPlus::OpenGL;
2633 3326
2634sub new { 3327sub new {
2635 my $class = shift; 3328 my $class = shift;
2636 3329
2637 $class->SUPER::new ( 3330 $class->SUPER::new (
… …
2640 ) 3333 )
2641} 3334}
2642 3335
2643sub set_tooltip_from { 3336sub set_tooltip_from {
2644 my ($self, $widget) = @_; 3337 my ($self, $widget) = @_;
3338
3339 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3340 if $widget->{tooltip} =~ /^#(.*)$/;
2645 3341
2646 my $tooltip = $widget->{tooltip}; 3342 my $tooltip = $widget->{tooltip};
2647 3343
2648 if ($ENV{CFPLUS_DEBUG} & 2) { 3344 if ($ENV{CFPLUS_DEBUG} & 2) {
2649 $tooltip .= "\n\n" . (ref $widget) . "\n" 3345 $tooltip .= "\n\n" . (ref $widget) . "\n"
2650 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3346 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2651 . "req $widget->{req_w} $widget->{req_h}\n" 3347 . "req $widget->{req_w} $widget->{req_h}\n"
2652 . "visible $widget->{visible}"; 3348 . "visible $widget->{visible}";
2653 } 3349 }
2654 3350
3351 $tooltip =~ s/^\n+//;
3352 $tooltip =~ s/\n+$//;
3353
2655 $self->add (new CFClient::UI::Label 3354 $self->add (new CFPlus::UI::Label
2656 markup => $tooltip, 3355 markup => $tooltip,
2657 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3356 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2658 fontsize => 0.8, 3357 fontsize => 0.8,
2659 fg => [0, 0, 0, 1], 3358 style => 1, # FLAG_INVERSE
2660 ellipsise => 0, 3359 ellipsise => 0,
2661 font => ($widget->{tooltip_font} || $::FONT_PROP), 3360 font => ($widget->{tooltip_font} || $::FONT_PROP),
2662 ); 3361 );
2663} 3362}
2664 3363
… …
2668 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3367 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2669 3368
2670 ($w + 4, $h + 4) 3369 ($w + 4, $h + 4)
2671} 3370}
2672 3371
2673sub size_allocate { 3372sub invoke_size_allocate {
2674 my ($self, $w, $h) = @_; 3373 my ($self, $w, $h) = @_;
2675 3374
2676 $self->SUPER::size_allocate ($w - 4, $h - 4); 3375 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2677} 3376}
2678 3377
2679sub visibility_change { 3378sub invoke_visibility_change {
2680 my ($self, $visible) = @_; 3379 my ($self, $visible) = @_;
2681 3380
2682 return unless $visible; 3381 return unless $visible;
2683 3382
2684 $self->{root}->on_post_alloc ("move_$self" => sub { 3383 $self->{root}->on_post_alloc ("move_$self" => sub {
2685 my $widget = $self->{owner} 3384 my $widget = $self->{owner}
2686 or return; 3385 or return;
2687 3386
3387 if ($widget->{visible}) {
2688 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3388 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2689 3389
2690 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3390 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2691 if $x + $self->{w} > $::WIDTH; 3391 if $x + $self->{w} > $self->{root}{w};
2692 3392
2693 $self->move_abs ($x, $y); 3393 $self->move_abs ($x, $y);
3394 } else {
3395 $self->hide;
3396 }
2694 }); 3397 });
2695} 3398}
2696 3399
2697sub _draw { 3400sub _draw {
2698 my ($self) = @_; 3401 my ($self) = @_;
… …
2722 $self->SUPER::_draw; 3425 $self->SUPER::_draw;
2723} 3426}
2724 3427
2725############################################################################# 3428#############################################################################
2726 3429
2727package CFClient::UI::Face; 3430package CFPlus::UI::Face;
2728 3431
2729our @ISA = CFClient::UI::Base::; 3432our @ISA = CFPlus::UI::DrawBG::;
2730 3433
2731use CFClient::OpenGL; 3434use CFPlus::OpenGL;
2732 3435
2733sub new { 3436sub new {
2734 my $class = shift; 3437 my $class = shift;
2735 3438
2736 my $self = $class->SUPER::new ( 3439 my $self = $class->SUPER::new (
3440 size_w => 32,
3441 size_h => 8,
2737 aspect => 1, 3442 aspect => 1,
2738 can_events => 0, 3443 can_events => 0,
2739 @_, 3444 @_,
2740 ); 3445 );
2741 3446
2742 if ($self->{anim} && $self->{animspeed}) { 3447 if ($self->{anim} && $self->{animspeed}) {
2743 Scalar::Util::weaken (my $widget = $self); 3448 CFPlus::weaken (my $widget = $self);
2744 3449
3450 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3451 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2745 $self->{timer} = Event->timer ( 3452 $self->{timer} = Event->timer (
2746 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2747 hard => 1, 3453 parked => 1,
2748 interval => $self->{animspeed},
2749 cb => sub { 3454 cb => sub {
3455 return unless $::CONN && $widget;
3456
2750 ++$widget->{frame}; 3457 ++$widget->{frame};
3458 $widget->update_face;
2751 $widget->update; 3459 $widget->update;
3460
3461 $widget->update_timer;
2752 }, 3462 },
2753 ); 3463 );
3464
3465 $self->update_face;
3466 $self->update_timer;
2754 } 3467 }
2755 3468
2756 $self 3469 $self
2757} 3470}
2758 3471
3472sub update_timer {
3473 my ($self) = @_;
3474
3475 return unless $self->{timer};
3476
3477 if ($self->{visible}) {
3478 $self->{timer}->at (
3479 $self->{anim_start}
3480 + $self->{animspeed}
3481 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3482 );
3483 $self->{timer}->start;
3484 } else {
3485 $self->{timer}->stop;
3486 }
3487}
3488
3489sub update_face {
3490 my ($self) = @_;
3491
3492 return unless $::CONN;
3493
3494 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3495 if ($anim && @$anim) {
3496 delete $self->{wait_face};
3497 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3498 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3499 }
3500 }
3501}
3502
2759sub size_request { 3503sub size_request {
2760 (32, 8) 3504 my ($self) = @_;
3505
3506 if ($::CONN) {
3507 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3508 if (my $tex = $::CONN->{texture}[$faceid]) {
3509 $self->{tex} = $tex;
3510 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3511 } else {
3512 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3513 $self->realloc;
3514 });
3515 }
3516 }
3517 }
3518
3519 ($self->{size_w} || 8, $self->{size_h} || 8)
2761} 3520}
2762 3521
2763sub update { 3522sub update {
2764 my ($self) = @_; 3523 my ($self) = @_;
2765 3524
2766 return unless $self->{visible}; 3525 return unless $self->{visible};
2767 3526
2768 $self->SUPER::update; 3527 $self->SUPER::update;
2769} 3528}
2770 3529
3530sub invoke_visibility_change {
3531 my ($self) = @_;
3532
3533 $self->update_timer;
3534
3535 0
3536}
3537
2771sub _draw { 3538sub _draw {
2772 my ($self) = @_; 3539 my ($self) = @_;
2773 3540
2774 return unless $::CONN; 3541 $self->SUPER::_draw;
2775 3542
2776 my $face; 3543 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; 3544 glEnable GL_TEXTURE_2D;
2789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3545 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2790 glColor 1, 1, 1, 1; 3546 glColor 0, 0, 0, 1;
2791 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3547 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2792 glDisable GL_TEXTURE_2D; 3548 glDisable GL_TEXTURE_2D;
2793 } 3549 }
2794} 3550}
2795 3551
2796sub DESTROY { 3552sub destroy {
2797 my ($self) = @_; 3553 my ($self) = @_;
2798 3554
2799 $self->{timer}->cancel 3555 (delete $self->{timer})->cancel
2800 if $self->{timer}; 3556 if $self->{timer};
2801 3557
2802 $self->SUPER::DESTROY; 3558 $self->SUPER::destroy;
2803} 3559}
2804 3560
2805############################################################################# 3561#############################################################################
2806 3562
3563package CFPlus::UI::Buttonbar;
3564
3565our @ISA = CFPlus::UI::HBox::;
3566
3567# TODO: should actually wrap buttons and other goodies.
3568
3569#############################################################################
3570
2807package CFClient::UI::Menu; 3571package CFPlus::UI::Menu;
2808 3572
2809our @ISA = CFClient::UI::FancyFrame::; 3573our @ISA = CFPlus::UI::Toplevel::;
2810 3574
2811use CFClient::OpenGL; 3575use CFPlus::OpenGL;
2812 3576
2813sub new { 3577sub new {
2814 my $class = shift; 3578 my $class = shift;
2815 3579
2816 my $self = $class->SUPER::new ( 3580 my $self = $class->SUPER::new (
2817 items => [], 3581 items => [],
2818 z => 100, 3582 z => 100,
2819 @_, 3583 @_,
2820 ); 3584 );
2821 3585
2822 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3586 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2823 3587
2824 for my $item (@{ $self->{items} }) { 3588 for my $item (@{ $self->{items} }) {
2825 my ($widget, $cb) = @$item; 3589 my ($widget, $cb, $tooltip) = @$item;
2826 3590
2827 # handle various types of items, only text for now 3591 # handle various types of items, only text for now
2828 if (!ref $widget) { 3592 if (!ref $widget) {
3593 if ($widget =~ /\t/) {
3594 my ($left, $right) = split /\t/, $widget, 2;
3595
2829 $widget = new CFClient::UI::Label 3596 $widget = new CFPlus::UI::HBox
2830 can_hover => 1, 3597 can_hover => 1,
2831 can_events => 1, 3598 can_events => 1,
3599 tooltip => $tooltip,
3600 children => [
3601 (new CFPlus::UI::Label markup => $left, expand => 1),
3602 (new CFPlus::UI::Label markup => $right, align => +1),
3603 ],
3604 ;
3605
3606 } else {
3607 $widget = new CFPlus::UI::Label
3608 can_hover => 1,
3609 can_events => 1,
2832 text => $widget; 3610 markup => $widget,
3611 tooltip => $tooltip;
3612 }
2833 } 3613 }
2834 3614
2835 $self->{item}{$widget} = $item; 3615 $self->{item}{$widget} = $item;
2836 3616
2837 $self->{vbox}->add ($widget); 3617 $self->{vbox}->add ($widget);
… …
2842 3622
2843# popup given the event (must be a mouse button down event currently) 3623# popup given the event (must be a mouse button down event currently)
2844sub popup { 3624sub popup {
2845 my ($self, $ev) = @_; 3625 my ($self, $ev) = @_;
2846 3626
2847 $self->_emit ("popdown"); 3627 $self->emit ("popdown");
2848 3628
2849 # maybe save $GRAB? must be careful about events... 3629 # maybe save $GRAB? must be careful about events...
2850 $GRAB = $self; 3630 $GRAB = $self;
2851 $self->{button} = $ev->{button}; 3631 $self->{button} = $ev->{button};
2852 3632
2853 $self->show; 3633 $self->show;
2854 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3634 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2855} 3635}
2856 3636
2857sub mouse_motion { 3637sub invoke_mouse_motion {
2858 my ($self, $ev, $x, $y) = @_; 3638 my ($self, $ev, $x, $y) = @_;
2859 3639
2860 # TODO: should use vbox->find_widget or so 3640 # TODO: should use vbox->find_widget or so
2861 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3641 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2862 $self->{hover} = $self->{item}{$HOVER}; 3642 $self->{hover} = $self->{item}{$HOVER};
2863}
2864 3643
3644 0
3645}
3646
2865sub button_up { 3647sub invoke_button_up {
2866 my ($self, $ev, $x, $y) = @_; 3648 my ($self, $ev, $x, $y) = @_;
2867 3649
2868 if ($ev->{button} == $self->{button}) { 3650 if ($ev->{button} == $self->{button}) {
2869 undef $GRAB; 3651 undef $GRAB;
2870 $self->hide; 3652 $self->hide;
2871 3653
2872 $self->_emit ("popdown"); 3654 $self->emit ("popdown");
2873 $self->{hover}[1]->() if $self->{hover}; 3655 $self->{hover}[1]->() if $self->{hover};
3656 } else {
3657 return 0
3658 }
3659
2874 } 3660 1
2875} 3661}
2876 3662
2877############################################################################# 3663#############################################################################
2878 3664
2879package CFClient::UI::Statusbox; 3665package CFPlus::UI::Multiplexer;
2880 3666
2881our @ISA = CFClient::UI::VBox::; 3667our @ISA = CFPlus::UI::Container::;
2882 3668
2883sub new { 3669sub new {
2884 my $class = shift; 3670 my $class = shift;
2885 3671
2886 $class->SUPER::new ( 3672 my $self = $class->SUPER::new (
3673 @_,
3674 );
3675
3676 $self->{current} = $self->{children}[0]
3677 if @{ $self->{children} };
3678
3679 $self
3680}
3681
3682sub add {
3683 my ($self, @widgets) = @_;
3684
3685 $self->SUPER::add (@widgets);
3686
3687 $self->{current} = $self->{children}[0]
3688 if @{ $self->{children} };
3689}
3690
3691sub get_current_page {
3692 my ($self) = @_;
3693
3694 $self->{current}
3695}
3696
3697sub set_current_page {
3698 my ($self, $page_or_widget) = @_;
3699
3700 my $widget = ref $page_or_widget
3701 ? $page_or_widget
3702 : $self->{children}[$page_or_widget];
3703
3704 $self->{current} = $widget;
3705 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3706
3707 $self->emit (page_changed => $self->{current});
3708
3709 $self->realloc;
3710}
3711
3712sub visible_children {
3713 $_[0]{current}
3714}
3715
3716sub size_request {
3717 my ($self) = @_;
3718
3719 $self->{current}->size_request
3720}
3721
3722sub invoke_size_allocate {
3723 my ($self, $w, $h) = @_;
3724
3725 $self->{current}->configure (0, 0, $w, $h);
3726
3727 1
3728}
3729
3730sub _draw {
3731 my ($self) = @_;
3732
3733 $self->{current}->draw;
3734}
3735
3736#############################################################################
3737
3738package CFPlus::UI::Notebook;
3739
3740our @ISA = CFPlus::UI::VBox::;
3741
3742sub new {
3743 my $class = shift;
3744
3745 my $self = $class->SUPER::new (
3746 buttonbar => (new CFPlus::UI::Buttonbar),
3747 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3748 # filter => # will be put between multiplexer and $self
3749 @_,
3750 );
3751
3752 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3753 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3754
3755 {
3756 Scalar::Util::weaken (my $wself = $self);
3757
3758 $self->{multiplexer}->connect (c_add => sub {
3759 my ($mplex, $widgets) = @_;
3760
3761 for my $child (@$widgets) {
3762 Scalar::Util::weaken $child;
3763 $child->{c_tab_} ||= do {
3764 my $tab =
3765 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3766 ? $child->{c_tab}
3767 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3768
3769 $tab->connect (activate => sub {
3770 $wself->set_current_page ($child);
3771 });
3772
3773 $tab
3774 };
3775
3776 $self->{buttonbar}->add ($child->{c_tab_});
3777 }
3778 });
3779
3780 $self->{multiplexer}->connect (c_remove => sub {
3781 my ($mplex, $widgets) = @_;
3782
3783 for my $child (@$widgets) {
3784 $wself->{buttonbar}->remove ($child->{c_tab_});
3785 }
3786 });
3787 }
3788
3789 $self
3790}
3791
3792sub add {
3793 my ($self, @widgets) = @_;
3794
3795 $self->{multiplexer}->add (@widgets)
3796}
3797
3798sub remove {
3799 my ($self, @widgets) = @_;
3800
3801 $self->{multiplexer}->remove (@widgets)
3802}
3803
3804sub add_tab {
3805 my ($self, $title, $widget, $tooltip) = @_;
3806
3807 $title = [$title, $tooltip] unless ref $title;
3808 $widget->{c_tab} = $title;
3809
3810 $self->add ($widget);
3811}
3812
3813sub get_current_page {
3814 my ($self) = @_;
3815
3816 $self->{multiplexer}->get_current_page
3817}
3818
3819sub set_current_page {
3820 my ($self, $page) = @_;
3821
3822 $self->{multiplexer}->set_current_page ($page);
3823 $self->emit (page_changed => $self->{multiplexer}{current});
3824}
3825
3826#############################################################################
3827
3828package CFPlus::UI::Selector;
3829
3830use utf8;
3831
3832our @ISA = CFPlus::UI::Button::;
3833
3834sub new {
3835 my $class = shift;
3836
3837 my $self = $class->SUPER::new (
3838 options => [], # [value, title, longdesc], ...
3839 value => undef,
3840 @_,
3841 );
3842
3843 $self->_set_value ($self->{value});
3844
3845 $self
3846}
3847
3848sub invoke_button_down {
3849 my ($self, $ev) = @_;
3850
3851 my @menu_items;
3852
3853 for (@{ $self->{options} }) {
3854 my ($value, $title, $tooltip) = @$_;
3855
3856 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3857 }
3858
3859 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3860}
3861
3862sub _set_value {
3863 my ($self, $value) = @_;
3864
3865 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3866 or return;
3867
3868 $self->{value} = $item->[0];
3869 $self->set_markup ("$item->[1] ⇓");
3870 $self->set_tooltip ($item->[2]);
3871}
3872
3873sub set_value {
3874 my ($self, $value) = @_;
3875
3876 return unless $self->{value} ne $value;
3877
3878 $self->_set_value ($value);
3879 $self->emit (changed => $value);
3880}
3881
3882#############################################################################
3883
3884package CFPlus::UI::Statusbox;
3885
3886our @ISA = CFPlus::UI::VBox::;
3887
3888sub new {
3889 my $class = shift;
3890
3891 my $self = $class->SUPER::new (
2887 fontsize => 0.8, 3892 fontsize => 0.8,
2888 @_, 3893 @_,
2889 ) 3894 );
3895
3896 CFPlus::weaken (my $this = $self);
3897
3898 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3899
3900 $self
2890} 3901}
2891 3902
2892sub reorder { 3903sub reorder {
2893 my ($self) = @_; 3904 my ($self) = @_;
2894 my $NOW = time; 3905 my $NOW = Time::HiRes::time;
3906
3907 # freeze display when hovering over any label
3908 return if $CFPlus::UI::TOOLTIP->{owner}
3909 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3910 values %{ $self->{item} };
2895 3911
2896 while (my ($k, $v) = each %{ $self->{item} }) { 3912 while (my ($k, $v) = each %{ $self->{item} }) {
2897 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3913 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2898 } 3914 }
2899 3915
… …
2902 my @items = sort { 3918 my @items = sort {
2903 $a->{pri} <=> $b->{pri} 3919 $a->{pri} <=> $b->{pri}
2904 or $b->{id} <=> $a->{id} 3920 or $b->{id} <=> $a->{id}
2905 } values %{ $self->{item} }; 3921 } values %{ $self->{item} };
2906 3922
3923 $self->{timer}->interval (1);
3924
2907 my $count = 10 + 1; 3925 my $count = 10 + 1;
2908 for my $item (@items) { 3926 for my $item (@items) {
2909 last unless --$count; 3927 last unless --$count;
2910 3928
2911 push @widgets, $item->{label} ||= do { 3929 my $label = $item->{label} ||= do {
2912 # TODO: doesn't handle markup well (read as: at all) 3930 # TODO: doesn't handle markup well (read as: at all)
2913 my $short = $item->{count} > 1 3931 my $short = $item->{count} > 1
2914 ? "<b>$item->{count} ×</b> $item->{text}" 3932 ? "<b>$item->{count} ×</b> $item->{text}"
2915 : $item->{text}; 3933 : $item->{text};
2916 3934
2917 for ($short) { 3935 for ($short) {
2918 s/^\s+//; 3936 s/^\s+//;
2919 s/\s+/ /g; 3937 s/\s+/ /g;
2920 } 3938 }
2921 3939
2922 new CFClient::UI::Label 3940 new CFPlus::UI::Label
2923 markup => $short, 3941 markup => $short,
2924 tooltip => $item->{tooltip}, 3942 tooltip => $item->{tooltip},
2925 tooltip_font => $::FONT_PROP, 3943 tooltip_font => $::FONT_PROP,
2926 tooltip_width => 0.67, 3944 tooltip_width => 0.67,
2927 fontsize => $item->{fontsize} || $self->{fontsize}, 3945 fontsize => $item->{fontsize} || $self->{fontsize},
2928 max_w => $::WIDTH * 0.44, 3946 max_w => $::WIDTH * 0.44,
2929 fg => $item->{fg}, 3947 fg => [@{ $item->{fg} }],
2930 can_events => 1, 3948 can_events => 1,
2931 can_hover => 1 3949 can_hover => 1
2932 }; 3950 };
3951
3952 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3953 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3954 $label->update;
3955 $label->set_max_size (undef, $label->{req_h} * $diff)
3956 if $diff < 1;
3957 $self->{timer}->interval (1/30);
3958 } else {
3959 $label->{fg}[3] = $item->{fg}[3] || 1;
3960 }
3961
3962 push @widgets, $label;
2933 } 3963 }
2934 3964
2935 $self->clear; 3965 $self->clear;
2936 $self->SUPER::add (reverse @widgets); 3966 $self->SUPER::add (reverse @widgets);
2937} 3967}
… …
2942 $text =~ s/^\s+//; 3972 $text =~ s/^\s+//;
2943 $text =~ s/\s+$//; 3973 $text =~ s/\s+$//;
2944 3974
2945 return unless $text; 3975 return unless $text;
2946 3976
2947 my $timeout = time + ((delete $arg{timeout}) || 60); 3977 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2948 3978
2949 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3979 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2950 3980
2951 if (my $item = $self->{item}{$group}) { 3981 if (my $item = $self->{item}{$group}) {
2952 if ($item->{text} eq $text) { 3982 if ($item->{text} eq $text) {
2953 $item->{count}++; 3983 $item->{count}++;
2954 } else { 3984 } else {
2955 $item->{count} = 1; 3985 $item->{count} = 1;
2956 $item->{text} = $item->{tooltip} = $text; 3986 $item->{text} = $item->{tooltip} = $text;
2957 } 3987 }
2958 $item->{id} = ++$self->{id}; 3988 $item->{id} += 0.2;#d#
2959 $item->{timeout} = $timeout; 3989 $item->{timeout} = $timeout;
2960 delete $item->{label}; 3990 delete $item->{label};
2961 } else { 3991 } else {
2962 $self->{item}{$group} = { 3992 $self->{item}{$group} = {
2963 id => ++$self->{id}, 3993 id => ++$self->{id},
… …
2969 count => 1, 3999 count => 1,
2970 %arg, 4000 %arg,
2971 }; 4001 };
2972 } 4002 }
2973 4003
4004 $ROOT->on_refresh (reorder => sub {
2974 $self->reorder; 4005 $self->reorder;
4006 });
2975} 4007}
2976 4008
2977sub reconfigure { 4009sub reconfigure {
2978 my ($self) = @_; 4010 my ($self) = @_;
2979 4011
… …
2982 4014
2983 $self->reorder; 4015 $self->reorder;
2984 $self->SUPER::reconfigure; 4016 $self->SUPER::reconfigure;
2985} 4017}
2986 4018
4019sub destroy {
4020 my ($self) = @_;
4021
4022 $self->{timer}->cancel;
4023
4024 $self->SUPER::destroy;
4025}
4026
2987############################################################################# 4027#############################################################################
2988 4028
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; 4029package CFPlus::UI::Root;
3281 4030
3282our @ISA = CFClient::UI::Container::; 4031our @ISA = CFPlus::UI::Container::;
3283 4032
4033use List::Util qw(min max);
4034
3284use CFClient::OpenGL; 4035use CFPlus::OpenGL;
3285 4036
3286sub new { 4037sub new {
3287 my $class = shift; 4038 my $class = shift;
3288 4039
3289 my $self = $class->SUPER::new ( 4040 my $self = $class->SUPER::new (
3290 visible => 1, 4041 visible => 1,
3291 @_, 4042 @_,
3292 ); 4043 );
3293 4044
3294 Scalar::Util::weaken ($self->{root} = $self); 4045 CFPlus::weaken ($self->{root} = $self);
3295 4046
3296 $self 4047 $self
3297} 4048}
3298 4049
3299sub size_request { 4050sub size_request {
… …
3314 $coord = $max - $size if $coord > $max - $size; 4065 $coord = $max - $size if $coord > $max - $size;
3315 4066
3316 int $coord + 0.5 4067 int $coord + 0.5
3317} 4068}
3318 4069
3319sub size_allocate { 4070sub invoke_size_allocate {
3320 my ($self, $w, $h) = @_; 4071 my ($self, $w, $h) = @_;
3321 4072
3322 for my $child ($self->children) { 4073 for my $child ($self->children) {
3323 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4074 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3324 4075
… …
3328 $X = _to_pixel $X, $W, $self->{w}; 4079 $X = _to_pixel $X, $W, $self->{w};
3329 $Y = _to_pixel $Y, $H, $self->{h}; 4080 $Y = _to_pixel $Y, $H, $self->{h};
3330 4081
3331 $child->configure ($X, $Y, $W, $H); 4082 $child->configure ($X, $Y, $W, $H);
3332 } 4083 }
4084
4085 1
3333} 4086}
3334 4087
3335sub coord2local { 4088sub coord2local {
3336 my ($self, $x, $y) = @_; 4089 my ($self, $x, $y) = @_;
3337 4090
… …
3392 while ($self->{refresh_hook}) { 4145 while ($self->{refresh_hook}) {
3393 $_->() 4146 $_->()
3394 for values %{delete $self->{refresh_hook}}; 4147 for values %{delete $self->{refresh_hook}};
3395 } 4148 }
3396 4149
3397 if ($self->{realloc}) { 4150 while ($self->{realloc}) {
3398 my %queue; 4151 my %queue;
3399 my @queue; 4152 my @queue;
3400 my $widget; 4153 my $widget;
3401 4154
3402 outer: 4155 outer:
… …
3422 4175
3423 delete $queue{$widget+0}; 4176 delete $queue{$widget+0};
3424 4177
3425 my ($w, $h) = $widget->size_request; 4178 my ($w, $h) = $widget->size_request;
3426 4179
3427 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4180 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3428 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4181 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4182
4183 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4184 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3429 4185
3430 $w = $widget->{force_w} if exists $widget->{force_w}; 4186 $w = $widget->{force_w} if exists $widget->{force_w};
3431 $h = $widget->{force_h} if exists $widget->{force_h}; 4187 $h = $widget->{force_h} if exists $widget->{force_h};
3432 4188
3433 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4189 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3446 } 4202 }
3447 } 4203 }
3448 4204
3449 delete $self->{realloc}{$widget+0}; 4205 delete $self->{realloc}{$widget+0};
3450 } 4206 }
3451 }
3452 4207
3453 while (my $size_alloc = delete $self->{size_alloc}) { 4208 while (my $size_alloc = delete $self->{size_alloc}) {
3454 my @queue = sort { $b->{visible} <=> $a->{visible} } 4209 my @queue = sort { $a->{visible} <=> $b->{visible} }
3455 values %$size_alloc; 4210 values %$size_alloc;
3456 4211
3457 while () { 4212 while () {
3458 my $widget = pop @queue || last; 4213 my $widget = pop @queue || last;
3459 4214
3460 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4215 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3461 4216
3462 $w = 0 if $w < 0; 4217 $w = max $widget->{min_w}, $w;
3463 $h = 0 if $h < 0; 4218 $h = max $widget->{min_h}, $h;
3464 4219
4220# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4221# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4222
4223 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4224 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4225
3465 $w = int $w + 0.5; 4226 $w = int $w + 0.5;
3466 $h = int $h + 0.5; 4227 $h = int $h + 0.5;
3467 4228
3468 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4229 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3469 $widget->{old_w} = $widget->{w}; 4230 $widget->{old_w} = $widget->{w};
3470 $widget->{old_h} = $widget->{h}; 4231 $widget->{old_h} = $widget->{h};
3471 4232
3472 $widget->{w} = $w; 4233 $widget->{w} = $w;
3473 $widget->{h} = $h; 4234 $widget->{h} = $h;
3474 4235
3475 $widget->emit (size_allocate => $w, $h); 4236 $widget->emit (size_allocate => $w, $h);
4237 }
3476 } 4238 }
3477 } 4239 }
3478 } 4240 }
3479 4241
3480 while ($self->{post_alloc_hook}) { 4242 while ($self->{post_alloc_hook}) {
3481 $_->() 4243 $_->()
3482 for values %{delete $self->{post_alloc_hook}}; 4244 for values %{delete $self->{post_alloc_hook}};
3483 } 4245 }
3484
3485 4246
3486 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4247 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3487 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4248 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3488 glClear GL_COLOR_BUFFER_BIT; 4249 glClear GL_COLOR_BUFFER_BIT;
3489 4250
… …
3492 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4253 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3493 glMatrixMode GL_MODELVIEW; 4254 glMatrixMode GL_MODELVIEW;
3494 glLoadIdentity; 4255 glLoadIdentity;
3495 4256
3496 { 4257 {
3497 package CFClient::UI::Base; 4258 package CFPlus::UI::Base;
3498 4259
3499 ($draw_x, $draw_y, $draw_w, $draw_h) = 4260 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3500 (0, 0, $self->{w}, $self->{h}); 4261 (0, 0, $self->{w}, $self->{h});
3501 }
3502 4262
3503 $self->_draw; 4263 $self->_draw;
4264 }
3504} 4265}
3505 4266
3506############################################################################# 4267#############################################################################
3507 4268
3508package CFClient::UI; 4269package CFPlus::UI;
3509 4270
3510$ROOT = new CFClient::UI::Root; 4271$ROOT = new CFPlus::UI::Root;
3511$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4272$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3512 4273
35131 42741
3514 4275

Diff Legend

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