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.280 by root, Mon Jun 5 01:22:08 2006 UTC vs.
Revision 1.432 by root, Tue Aug 21 23:42:02 2007 UTC

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

Diff Legend

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