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.283 by root, Mon Jun 5 02:28:30 2006 UTC vs.
Revision 1.433 by root, Wed Aug 22 21:27:13 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
10use CFClient::Texture; 11use CFPlus::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
14our $LAYOUT; 15our $LAYOUT;
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show;
41 }
42
43 return;
44 }
45 }
46 }
47
48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner};
51});
20 52
21sub get_layout { 53sub get_layout {
22 my $layout; 54 my $layout;
23 55
24 for (grep { $_->{name} } values %WIDGET) { 56 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 71 my ($layout) = @_;
40 72
41 $LAYOUT = $layout; 73 $LAYOUT = $layout;
42} 74}
43 75
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 76# class methods for events
73sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 78 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 79 if $FOCUS;
76} 80}
… …
78sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 84 if $FOCUS;
81} 85}
82 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
83sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
84 my ($ev) = @_; 101 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
86 103
87 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
89 108
90 $GRAB = $widget; 109 $GRAB = $widget;
91 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
92 111
93 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
94 } 113 }
95 114
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
97 120
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 121 $ev->{dx} = $shift ? $delta : 0;
99 if $GRAB; 122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
128 }
100} 129}
101 130
102sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
103 my ($ev) = @_; 132 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 133
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 135
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 137
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 138 $GRAB->emit (button_up => $ev)
111 if $GRAB; 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 140
113 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 143 $grab->update if $grab;
116 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
117 145
118 check_tooltip; 146 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->();
119 } 148 }
120} 149}
121 150
122sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
123 my ($ev) = @_; 152 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
125 154
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 156
128 if ($widget != $HOVER) { 157 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 158
131 $hover->update if $hover && $hover->{can_hover}; 159 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 160 if $HOVER;
139} 161}
140 162
141# convert position array to integers 163# convert position array to integers
142sub harmonize { 164sub harmonize {
… …
192 reconfigure_widgets; 214 reconfigure_widgets;
193} 215}
194 216
195############################################################################# 217#############################################################################
196 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
197package CFClient::UI::Base; 227package CFPlus::UI::Base;
198 228
199use strict; 229use strict;
200 230
201use CFClient::OpenGL; 231use CFPlus::OpenGL;
202 232
203sub new { 233sub new {
204 my $class = shift; 234 my $class = shift;
205 235
206 my $self = bless { 236 my $self = bless {
… …
211 h => undef, 241 h => undef,
212 can_events => 1, 242 can_events => 1,
213 @_ 243 @_
214 }, $class; 244 }, $class;
215 245
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217 247
218 for (keys %$self) { 248 for (keys %$self) {
219 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
220 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
221 } 251 }
222 } 252 }
223 253
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
229 259
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232 262
233 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
238 268
239sub destroy { 269sub destroy {
240 my ($self) = @_; 270 my ($self) = @_;
241 271
242 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
243 %$self = (); 274 %$self = ();
244} 275}
245 276
277sub TO_JSON {
278 { __w_ => $_[0]{s_id} }
279}
280
246sub show { 281sub show {
247 my ($self) = @_; 282 my ($self) = @_;
248 283
249 return if $self->{parent}; 284 return if $self->{parent};
250 285
251 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
252} 287}
253 288
254sub set_visible { 289sub set_visible {
255 my ($self) = @_; 290 my ($self) = @_;
256 291
… …
271 306
272 return unless $self->{visible}; 307 return unless $self->{visible};
273 308
274 $_->set_invisible for $self->children; 309 $_->set_invisible for $self->children;
275 310
311 delete $self->{visible};
276 delete $self->{root}; 312 delete $self->{root};
277 delete $self->{visible};
278 313
279 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
281 316
282 CFClient::UI::check_tooltip 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
284 319
285 $self->focus_out; 320 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
288} 322}
289 323
290sub set_visibility { 324sub set_visibility {
291 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
292 326
293 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
294 328
295 $visible ? $self->hide 329 $visible ? $self->show
296 : $self->show; 330 : $self->hide;
297} 331}
298 332
299sub toggle_visibility { 333sub toggle_visibility {
300 my ($self) = @_; 334 my ($self) = @_;
301 335
… …
314} 348}
315 349
316sub move_abs { 350sub move_abs {
317 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
318 352
319 $self->{x} = List::Util::max 0, int $x; 353 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 354 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 355 $self->{z} = $z if defined $z;
322 356
323 $self->update; 357 $self->update;
324} 358}
325 359
… …
335sub size_request { 369sub size_request {
336 require Carp; 370 require Carp;
337 Carp::confess "size_request is abstract"; 371 Carp::confess "size_request is abstract";
338} 372}
339 373
374sub baseline_shift {
375 0
376}
377
340sub configure { 378sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
342 380
343 if ($self->{aspect}) { 381 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
345 383
346 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 386
349 # use alignment to adjust x, y 387 # use alignment to adjust x, y
350 388
351 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
366 404
367 $self->{root}{size_alloc}{$self+0} = $self; 405 $self->{root}{size_alloc}{$self+0} = $self;
368 } 406 }
369} 407}
370 408
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 409sub children {
376 # nop 410 # nop
377} 411}
378 412
379sub visible_children { 413sub visible_children {
… …
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;
… …
1545 1908
1546 delete $self->{ox}; 1909 delete $self->{ox};
1547 $self->SUPER::realloc; 1910 $self->SUPER::realloc;
1548} 1911}
1549 1912
1913sub clear {
1914 my ($self) = @_;
1915
1916 $self->set_text ("");
1917}
1918
1550sub set_text { 1919sub set_text {
1551 my ($self, $text) = @_; 1920 my ($self, $text) = @_;
1552 1921
1553 return if $self->{text} eq "T$text"; 1922 return if $self->{text} eq "T$text";
1554 $self->{text} = "T$text"; 1923 $self->{text} = "T$text";
1555 1924
1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1557 $self->{layout}->set_text ($text); 1925 $self->{layout}->set_text ($text);
1926
1558 delete $self->{req_h}; 1927 delete $self->{size_req};
1559
1560 $self->realloc; 1928 $self->realloc;
1561 $self->update; 1929 $self->update;
1562} 1930}
1563 1931
1564sub set_markup { 1932sub set_markup {
… …
1567 return if $self->{text} eq "M$markup"; 1935 return if $self->{text} eq "M$markup";
1568 $self->{text} = "M$markup"; 1936 $self->{text} = "M$markup";
1569 1937
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1938 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571 1939
1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573 $self->{layout}->set_markup ($markup); 1940 $self->{layout}->set_markup ($markup);
1941
1574 delete $self->{req_h}; 1942 delete $self->{size_req};
1575
1576 $self->realloc; 1943 $self->realloc;
1577 $self->update; 1944 $self->update;
1578} 1945}
1579 1946
1580sub size_request { 1947sub size_request {
1581 my ($self) = @_; 1948 my ($self) = @_;
1582 1949
1583 if (exists $self->{req_h}) { 1950 $self->{size_req} ||= do {
1584 @$self{qw(req_w req_h)}
1585 } else {
1586 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1951 $self->{layout}->set_font ($self->{font}) if $self->{font};
1587 $self->{layout}->set_width ($self->{max_w} || -1); 1952 $self->{layout}->set_width ($self->{max_w} || -1);
1588 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1953 $self->{layout}->set_ellipsise ($self->{ellipsise});
1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1954 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1955 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1591 1956
1592 my ($w, $h) = $self->{layout}->size; 1957 my ($w, $h) = $self->{layout}->size;
1593 1958
1594 if (exists $self->{template}) { 1959 if (exists $self->{template}) {
1595 $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);
1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1962 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1597 1963
1598 my ($w2, $h2) = $self->{template}->size; 1964 my ($w2, $h2) = $self->{template}->size;
1599 1965
1600 $w = List::Util::max $w, $w2; 1966 $w = List::Util::max $w, $w2;
1601 $h = List::Util::max $h, $h2; 1967 $h = List::Util::max $h, $h2;
1602 } 1968 }
1603 1969
1604 ($w, $h) 1970 [$w, $h]
1605 } 1971 };
1606}
1607 1972
1973 @{ $self->{size_req} }
1974}
1975
1976sub baseline_shift {
1977 $_[0]{layout}->descent
1978}
1979
1608sub size_allocate { 1980sub invoke_size_allocate {
1609 my ($self, $w, $h) = @_; 1981 my ($self, $w, $h) = @_;
1610 1982
1611 delete $self->{ox}; 1983 delete $self->{ox};
1612 1984
1613 delete $self->{texture} 1985 delete $self->{texture}
1614 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
1615} 1989}
1616 1990
1617sub set_fontsize { 1991sub set_fontsize {
1618 my ($self, $fontsize) = @_; 1992 my ($self, $fontsize) = @_;
1619 1993
1620 $self->{fontsize} = $fontsize; 1994 $self->{fontsize} = $fontsize;
1995 delete $self->{size_req};
1621 delete $self->{texture}; 1996 delete $self->{texture};
1622 1997
1623 $self->realloc; 1998 $self->realloc;
1624} 1999}
1625 2000
2001sub reconfigure {
2002 my ($self) = @_;
2003
2004 delete $self->{size_req};
2005 delete $self->{texture};
2006
2007 $self->SUPER::reconfigure;
2008}
2009
1626sub _draw { 2010sub _draw {
1627 my ($self) = @_; 2011 my ($self) = @_;
1628 2012
1629 $self->SUPER::_draw; # draw background, if applicable 2013 $self->SUPER::_draw; # draw background, if applicable
1630 2014
1631 my $tex = $self->{texture} ||= do { 2015 my $size = $self->{texture} ||= do {
1632 $self->{layout}->set_foreground (@{$self->{fg}}); 2016 $self->{layout}->set_foreground (@{$self->{fg}});
1633 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2017 $self->{layout}->set_font ($self->{font}) if $self->{font};
1634 $self->{layout}->set_width ($self->{w}); 2018 $self->{layout}->set_width ($self->{w});
1635 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2019 $self->{layout}->set_ellipsise ($self->{ellipsise});
1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2020 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2021 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1638 2022
1639 new_from_layout CFClient::Texture $self->{layout} 2023 [$self->{layout}->size]
1640 }; 2024 };
1641 2025
1642 unless (exists $self->{ox}) { 2026 unless (exists $self->{ox}) {
1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2027 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2028 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1645 : ($self->{w} - $tex->{w}) * 0.5); 2029 : ($self->{w} - $size->[0]) * 0.5);
1646 2030
1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2031 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2032 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1649 : ($self->{h} - $tex->{h}) * 0.5); 2033 : ($self->{h} - $size->[1]) * 0.5);
2034
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1650 }; 2036 };
1651 2037
1652 glEnable GL_TEXTURE_2D; 2038# unless ($self->{list}) {
1653 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};
1654 2046
1655 glColor_premultiply @{$self->{fg}} 2047 $self->{layout}->draw;
1656 if $tex->{format} == GL_ALPHA;
1657
1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1659
1660 glDisable GL_TEXTURE_2D;
1661} 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#}
1662 2057
1663############################################################################# 2058#############################################################################
1664 2059
1665package CFClient::UI::EntryBase; 2060package CFPlus::UI::EntryBase;
1666 2061
1667our @ISA = CFClient::UI::Label::; 2062our @ISA = CFPlus::UI::Label::;
1668 2063
1669use CFClient::OpenGL; 2064use CFPlus::OpenGL;
1670 2065
1671sub new { 2066sub new {
1672 my $class = shift; 2067 my $class = shift;
1673 2068
1674 $class->SUPER::new ( 2069 $class->SUPER::new (
1675 fg => [1, 1, 1], 2070 fg => [1, 1, 1],
1676 bg => [0, 0, 0, 0.2], 2071 bg => [0, 0, 0, 0.2],
2072 outline => [0.6, 0.3, 0.1],
1677 active_bg => [1, 1, 1, 0.5], 2073 active_bg => [0, 0, 1, .2],
1678 active_fg => [0, 0, 0], 2074 active_fg => [1, 1, 1],
2075 active_outline => [1, 1, 0],
1679 can_hover => 1, 2076 can_hover => 1,
1680 can_focus => 1, 2077 can_focus => 1,
1681 valign => 0, 2078 valign => 0,
1682 can_events => 1, 2079 can_events => 1,
2080 ellipsise => 0,
1683 #text => ... 2081 #text => ...
2082 #hidden => "*",
1684 @_ 2083 @_
1685 ) 2084 )
1686} 2085}
1687 2086
1688sub _set_text { 2087sub _set_text {
… …
1695 $self->{last_activity} = $::NOW; 2094 $self->{last_activity} = $::NOW;
1696 $self->{text} = $text; 2095 $self->{text} = $text;
1697 2096
1698 $text =~ s/./*/g if $self->{hidden}; 2097 $text =~ s/./*/g if $self->{hidden};
1699 $self->{layout}->set_text ("$text "); 2098 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h}; 2099 delete $self->{size_req};
1701 2100
1702 $self->_emit (changed => $self->{text}); 2101 $self->emit (changed => $self->{text});
1703 2102
1704 $self->realloc; 2103 $self->realloc;
1705 $self->update; 2104 $self->update;
1706} 2105}
1707 2106
… …
1722 my ($w, $h) = $self->SUPER::size_request; 2121 my ($w, $h) = $self->SUPER::size_request;
1723 2122
1724 ($w + 1, $h) # add 1 for cursor 2123 ($w + 1, $h) # add 1 for cursor
1725} 2124}
1726 2125
1727sub key_down { 2126sub invoke_key_down {
1728 my ($self, $ev) = @_; 2127 my ($self, $ev) = @_;
1729 2128
1730 my $mod = $ev->{mod}; 2129 my $mod = $ev->{mod};
1731 my $sym = $ev->{sym}; 2130 my $sym = $ev->{sym};
1732 my $uni = $ev->{unicode}; 2131 my $uni = $ev->{unicode};
1733 2132
1734 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;
1735 2136
1736 if ($uni == 8) { 2137 if ($uni == 8) {
1737 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2138 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1738 } elsif ($uni == 127) { 2139 } elsif ($uni == 127) {
1739 substr $text, $self->{cursor}, 1, ""; 2140 substr $text, $self->{cursor}, 1, "";
1740 } elsif ($sym == CFClient::SDLK_LEFT) { 2141 } elsif ($sym == CFPlus::SDLK_LEFT) {
1741 --$self->{cursor} if $self->{cursor}; 2142 --$self->{cursor} if $self->{cursor};
1742 } elsif ($sym == CFClient::SDLK_RIGHT) { 2143 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1743 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2144 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1744 } 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 = "";
1745 $self->{cursor} = 0; 2159 $self->{cursor} = 0;
1746 } elsif ($sym == CFClient::SDLK_END) {
1747 $self->{cursor} = length $text;
1748 } elsif ($uni == 27) { 2160 } elsif ($uni == 27) {
1749 $self->_emit ('escape'); 2161 $self->emit ('escape');
1750 } elsif ($uni) { 2162 } elsif ($uni == 0x0d) {
2163 substr $text, $self->{cursor}++, 0, "\012";
2164 } elsif ($uni >= 0x20) {
1751 substr $text, $self->{cursor}++, 0, chr $uni; 2165 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else { 2166 } else {
1753 return 0; 2167 return 0;
1754 } 2168 }
1755 2169
1756 $self->_set_text ($text); 2170 $self->_set_text ($text);
1757 2171
1758 $self->realloc; 2172 $self->realloc;
2173 $self->update;
1759 2174
1760 1 2175 1
1761} 2176}
1762 2177
1763sub focus_in { 2178sub invoke_focus_in {
1764 my ($self) = @_; 2179 my ($self) = @_;
1765 2180
1766 $self->{last_activity} = $::NOW; 2181 $self->{last_activity} = $::NOW;
1767 2182
1768 $self->SUPER::focus_in; 2183 $self->SUPER::invoke_focus_in
1769} 2184}
1770 2185
1771sub button_down { 2186sub invoke_button_down {
1772 my ($self, $ev, $x, $y) = @_; 2187 my ($self, $ev, $x, $y) = @_;
1773 2188
1774 $self->SUPER::button_down ($ev, $x, $y); 2189 $self->SUPER::invoke_button_down ($ev, $x, $y);
1775 2190
1776 my $idx = $self->{layout}->xy_to_index ($x, $y); 2191 my $idx = $self->{layout}->xy_to_index ($x, $y);
1777 2192
1778 # byte-index to char-index 2193 # byte-index to char-index
1779 my $text = $self->{text}; 2194 my $text = $self->{text};
1780 utf8::encode $text; 2195 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1781 $self->{cursor} = length substr $text, 0, $idx; 2196 $self->{cursor} = length $text;
1782 2197
1783 $self->_set_text ($self->{text}); 2198 $self->_set_text ($self->{text});
1784 $self->update; 2199 $self->update;
1785 2200
1786 1 2201 1
1787} 2202}
1788 2203
1789sub mouse_motion { 2204sub invoke_mouse_motion {
1790 my ($self, $ev, $x, $y) = @_; 2205 my ($self, $ev, $x, $y) = @_;
1791# 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#
1792 2207
1793 0 2208 1
1794} 2209}
1795 2210
1796sub _draw { 2211sub _draw {
1797 my ($self) = @_; 2212 my ($self) = @_;
1798 2213
… …
1805 glColor_premultiply @{$self->{bg}}; 2220 glColor_premultiply @{$self->{bg}};
1806 } 2221 }
1807 2222
1808 glEnable GL_BLEND; 2223 glEnable GL_BLEND;
1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2224 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1810 glBegin GL_QUADS;
1811 glVertex 0 , 0;
1812 glVertex 0 , $self->{h};
1813 glVertex $self->{w}, $self->{h}; 2225 glRect 0, 0, $self->{w}, $self->{h};
1814 glVertex $self->{w}, 0;
1815 glEnd;
1816 glDisable GL_BLEND; 2226 glDisable GL_BLEND;
1817 2227
1818 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
1819 2229
1820 #TODO: force update every cursor change :( 2230 #TODO: force update every cursor change :(
… …
1822 2232
1823 unless (exists $self->{cur_h}) { 2233 unless (exists $self->{cur_h}) {
1824 my $text = substr $self->{text}, 0, $self->{cursor}; 2234 my $text = substr $self->{text}, 0, $self->{cursor};
1825 utf8::encode $text; 2235 utf8::encode $text;
1826 2236
1827 @$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);
1828 } 2238 }
1829 2239
1830 glColor @{$self->{fg}}; 2240 glColor_premultiply @{$self->{active_fg}};
1831 glBegin GL_LINES; 2241 glBegin GL_LINES;
1832 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};
1833 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};
1834 glEnd; 2244 glEnd;
1835 }
1836}
1837 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
1838package CFClient::UI::Entry; 2265package CFPlus::UI::Entry;
1839 2266
1840our @ISA = CFClient::UI::EntryBase::; 2267our @ISA = CFPlus::UI::EntryBase::;
1841 2268
1842use CFClient::OpenGL; 2269use CFPlus::OpenGL;
1843 2270
1844sub key_down { 2271sub invoke_key_down {
1845 my ($self, $ev) = @_; 2272 my ($self, $ev) = @_;
1846 2273
1847 my $sym = $ev->{sym}; 2274 my $sym = $ev->{sym};
1848 2275
1849 if ($sym == 13) { 2276 if ($ev->{uni} == 0x0d || $sym == 13) {
1850 unshift @{$self->{history}}, 2277 unshift @{$self->{history}},
1851 my $txt = $self->get_text; 2278 my $txt = $self->get_text;
2279
1852 $self->{history_pointer} = -1; 2280 $self->{history_pointer} = -1;
1853 $self->{history_saveback} = ''; 2281 $self->{history_saveback} = '';
1854 $self->_emit (activate => $txt); 2282 $self->emit (activate => $txt);
1855 $self->update; 2283 $self->update;
1856 2284
1857 } elsif ($sym == CFClient::SDLK_UP) { 2285 } elsif ($sym == CFPlus::SDLK_UP) {
1858 if ($self->{history_pointer} < 0) { 2286 if ($self->{history_pointer} < 0) {
1859 $self->{history_saveback} = $self->get_text; 2287 $self->{history_saveback} = $self->get_text;
1860 } 2288 }
1861 if (@{$self->{history} || []} > 0) { 2289 if (@{$self->{history} || []} > 0) {
1862 $self->{history_pointer}++; 2290 $self->{history_pointer}++;
… …
1864 $self->{history_pointer} = @{$self->{history} || []} - 1; 2292 $self->{history_pointer} = @{$self->{history} || []} - 1;
1865 } 2293 }
1866 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2294 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1867 } 2295 }
1868 2296
1869 } elsif ($sym == CFClient::SDLK_DOWN) { 2297 } elsif ($sym == CFPlus::SDLK_DOWN) {
1870 $self->{history_pointer}--; 2298 $self->{history_pointer}--;
1871 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2299 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1872 2300
1873 if ($self->{history_pointer} >= 0) { 2301 if ($self->{history_pointer} >= 0) {
1874 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2302 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1875 } else { 2303 } else {
1876 $self->set_text ($self->{history_saveback}); 2304 $self->set_text ($self->{history_saveback});
1877 } 2305 }
1878 2306
1879 } else { 2307 } else {
1880 return $self->SUPER::key_down ($ev) 2308 return $self->SUPER::invoke_key_down ($ev)
1881 } 2309 }
1882 2310
1883 1 2311 1
1884} 2312}
1885 2313
1886############################################################################# 2314#############################################################################
1887 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
1888package CFClient::UI::Button; 2355package CFPlus::UI::ButtonBin;
1889 2356
1890our @ISA = CFClient::UI::Label::; 2357our @ISA = CFPlus::UI::Bin::;
1891 2358
1892use CFClient::OpenGL; 2359use CFPlus::OpenGL;
1893 2360
1894my @tex = 2361my @tex =
1895 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2362 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1896 qw(b1_button_active.png); 2363 qw(b1_button_inactive.png b1_button_active.png);
1897 2364
1898sub new { 2365sub new {
1899 my $class = shift; 2366 my $class = shift;
1900 2367
1901 $class->SUPER::new ( 2368 $class->SUPER::new (
1902 padding_x => 4,
1903 padding_y => 4,
1904 fg => [1, 1, 1],
1905 active_fg => [0, 0, 1],
1906 can_hover => 1, 2369 can_hover => 1,
1907 align => 0, 2370 align => 0,
1908 valign => 0, 2371 valign => 0,
1909 can_events => 1, 2372 can_events => 1,
1910 @_ 2373 @_
1911 ) 2374 )
1912} 2375}
1913 2376
1914sub activate { }
1915
1916sub button_up { 2377sub invoke_button_up {
1917 my ($self, $ev, $x, $y) = @_; 2378 my ($self, $ev, $x, $y) = @_;
1918 2379
1919 $self->emit ("activate") 2380 $self->emit ("activate")
1920 if $x >= 0 && $x < $self->{w} 2381 if $x >= 0 && $x < $self->{w}
1921 && $y >= 0 && $y < $self->{h}; 2382 && $y >= 0 && $y < $self->{h};
… …
1924} 2385}
1925 2386
1926sub _draw { 2387sub _draw {
1927 my ($self) = @_; 2388 my ($self) = @_;
1928 2389
1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1930
1931 glEnable GL_TEXTURE_2D; 2390 glEnable GL_TEXTURE_2D;
1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1933 glColor 0, 0, 0, 1; 2392 glColor 0, 0, 0, 1;
1934 2393
2394 my $tex = $tex[$GRAB == $self];
1935 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2395 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1936 2396
1937 glDisable GL_TEXTURE_2D; 2397 glDisable GL_TEXTURE_2D;
1938 2398
1939 $self->SUPER::_draw; 2399 $self->SUPER::_draw;
1940} 2400}
1941 2401
1942############################################################################# 2402#############################################################################
1943 2403
1944package CFClient::UI::CheckBox; 2404package CFPlus::UI::Button;
1945 2405
1946our @ISA = CFClient::UI::DrawBG::; 2406our @ISA = CFPlus::UI::Label::;
2407
2408use CFPlus::OpenGL;
1947 2409
1948my @tex = 2410my @tex =
1949 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 }
1950 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2465 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1951 2466
1952use CFClient::OpenGL; 2467use CFPlus::OpenGL;
1953 2468
1954sub new { 2469sub new {
1955 my $class = shift; 2470 my $class = shift;
1956 2471
1957 $class->SUPER::new ( 2472 $class->SUPER::new (
… …
1971 my ($self) = @_; 2486 my ($self) = @_;
1972 2487
1973 (6) x 2 2488 (6) x 2
1974} 2489}
1975 2490
2491sub toggle {
2492 my ($self) = @_;
2493
2494 $self->{state} = !$self->{state};
2495 $self->emit (changed => $self->{state});
2496 $self->update;
2497}
2498
1976sub button_down { 2499sub invoke_button_down {
1977 my ($self, $ev, $x, $y) = @_; 2500 my ($self, $ev, $x, $y) = @_;
1978 2501
1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2502 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2503 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1981 $self->{state} = !$self->{state}; 2504 $self->toggle;
1982 $self->_emit (changed => $self->{state});
1983 } else { 2505 } else {
1984 return 0 2506 return 0
1985 } 2507 }
1986 2508
1987 1 2509 1
… …
2007 glDisable GL_TEXTURE_2D; 2529 glDisable GL_TEXTURE_2D;
2008} 2530}
2009 2531
2010############################################################################# 2532#############################################################################
2011 2533
2012package CFClient::UI::Image; 2534package CFPlus::UI::Image;
2013 2535
2014our @ISA = CFClient::UI::Base::; 2536our @ISA = CFPlus::UI::Base::;
2015 2537
2016use CFClient::OpenGL; 2538use CFPlus::OpenGL;
2017use Carp qw/confess/;
2018 2539
2019our %loaded_images; 2540our %texture_cache;
2020 2541
2021sub new { 2542sub new {
2022 my $class = shift; 2543 my $class = shift;
2023 2544
2024 my $self = $class->SUPER::new (can_events => 0, @_); 2545 my $self = $class->SUPER::new (
2546 can_events => 0,
2547 scale => 1,
2548 @_,
2549 );
2025 2550
2026 $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";
2027 2553
2028 $loaded_images{$self->{image}} ||= 2554 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2029 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;
2030 2556
2031 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2557 CFPlus::weaken $texture_cache{$self->{path}};
2032 2558
2033 Scalar::Util::weaken $loaded_images{$self->{image}}; 2559 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2034
2035 $self->{aspect} = $tex->{w} / $tex->{h};
2036 2560
2037 $self 2561 $self
2038} 2562}
2039 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
2040sub size_request { 2579sub size_request {
2041 my ($self) = @_; 2580 my ($self) = @_;
2042 2581
2043 ($self->{tex}->{w}, $self->{tex}->{h}) 2582 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2044} 2583}
2045 2584
2046sub _draw { 2585sub _draw {
2047 my ($self) = @_; 2586 my ($self) = @_;
2048 2587
… …
2065 glDisable GL_TEXTURE_2D; 2604 glDisable GL_TEXTURE_2D;
2066} 2605}
2067 2606
2068############################################################################# 2607#############################################################################
2069 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
2070package CFClient::UI::VGauge; 2651package CFPlus::UI::VGauge;
2071 2652
2072our @ISA = CFClient::UI::Base::; 2653our @ISA = CFPlus::UI::Base::;
2073 2654
2074use List::Util qw(min max); 2655use List::Util qw(min max);
2075 2656
2076use CFClient::OpenGL; 2657use CFPlus::OpenGL;
2077 2658
2078my %tex = ( 2659my %tex = (
2079 food => [ 2660 food => [
2080 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2661 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2081 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2662 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2082 ], 2663 ],
2083 grace => [ 2664 grace => [
2084 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2665 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2085 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/
2086 ], 2667 ],
2087 hp => [ 2668 hp => [
2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2669 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2089 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2670 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2090 ], 2671 ],
2091 mana => [ 2672 mana => [
2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2673 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2093 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/
2094 ], 2675 ],
2095); 2676);
2096 2677
2097# eg. VGauge->new (gauge => 'food'), default gauge: food 2678# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2157 my $ycut1 = max 0, min 1, $ycut; 2738 my $ycut1 = max 0, min 1, $ycut;
2158 my $ycut2 = max 0, min 1, $ycut - 1; 2739 my $ycut2 = max 0, min 1, $ycut - 1;
2159 2740
2160 my $h1 = $self->{h} * (1 - $ycut1); 2741 my $h1 = $self->{h} * (1 - $ycut1);
2161 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);
2162 2746
2163 glEnable GL_BLEND; 2747 glEnable GL_BLEND;
2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2748 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2749 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2166 glEnable GL_TEXTURE_2D; 2750 glEnable GL_TEXTURE_2D;
… …
2185 2769
2186 if ($t3) { 2770 if ($t3) {
2187 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2771 glBindTexture GL_TEXTURE_2D, $t3->{name};
2188 glBegin GL_QUADS; 2772 glBegin GL_QUADS;
2189 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2773 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2190 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2774 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2191 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2775 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2192 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2776 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2193 glEnd; 2777 glEnd;
2194 } 2778 }
2195 2779
2196 glDisable GL_BLEND; 2780 glDisable GL_BLEND;
2197 glDisable GL_TEXTURE_2D; 2781 glDisable GL_TEXTURE_2D;
2198} 2782}
2199 2783
2200############################################################################# 2784#############################################################################
2201 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 label => "%d%%",
2806 %arg,
2807 );
2808
2809 $self->set_value ($arg{value} || -1);
2810
2811 $self
2812}
2813
2814sub set_label {
2815 my ($self, $label) = @_;
2816
2817 return if $self->{label} eq $label;
2818 $self->{label} = $label;
2819
2820 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2821}
2822
2823sub set_value {
2824 my ($self, $value) = @_;
2825
2826 if ($self->{value} ne $value) {
2827 $self->{value} = $value;
2828
2829 if ($value < 0) {
2830 $self->set_text ("-");
2831 } else {
2832 $self->set_text (sprintf $self->{label}, $value * 100);
2833 }
2834
2835 $self->update;
2836 }
2837}
2838
2839sub _draw {
2840 my ($self) = @_;
2841
2842 glEnable GL_BLEND;
2843 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2844
2845 if ($self->{value} >= 0) {
2846 my $s = 3 + ($self->{w} - 6) * $self->{value};
2847
2848 glColor_premultiply @{$self->{bar}};
2849 glRect 2, 2, $s, $self->{h} - 2;
2850 glColor_premultiply @{$self->{bg}};
2851 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2852 }
2853
2854 glColor_premultiply @{$self->{outline}};
2855 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2856
2857 glDisable GL_BLEND;
2858
2859 {
2860 local $self->{bg}; # do not draw background
2861 $self->SUPER::_draw;
2862 }
2863}
2864
2865#############################################################################
2866
2867package CFPlus::UI::ExperienceProgress;
2868
2869our @ISA = CFPlus::UI::Progress::;
2870
2871sub new {
2872 my ($class, %arg) = @_;
2873
2874 my $self = $class->SUPER::new (
2875 %arg
2876 );
2877
2878 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2879 if $::CONN;
2880
2881 $self
2882}
2883
2884sub DESTROY {
2885 my ($self) = @_;
2886
2887 delete $::CONN->{on_exp_update}{$self+0}
2888 if $::CONN;
2889
2890 $self->SUPER::DESTROY;
2891}
2892
2893sub set_value {
2894 my ($self, $lvl, $exp) = @_;
2895
2896 my $v = -1;
2897
2898 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2899 my $l0 = $table->[$lvl - 1];
2900 my $l1 = $table->[$lvl];
2901
2902 $v = ($exp - $l0) / ($l1 - $l0);
2903 }
2904
2905 $self->SUPER::set_value ($v);
2906}
2907
2908#############################################################################
2909
2202package CFClient::UI::Gauge; 2910package CFPlus::UI::Gauge;
2203 2911
2204our @ISA = CFClient::UI::VBox::; 2912our @ISA = CFPlus::UI::VBox::;
2205 2913
2206sub new { 2914sub new {
2207 my ($class, %arg) = @_; 2915 my ($class, %arg) = @_;
2208 2916
2209 my $self = $class->SUPER::new ( 2917 my $self = $class->SUPER::new (
… …
2211 can_hover => 1, 2919 can_hover => 1,
2212 can_events => 1, 2920 can_events => 1,
2213 %arg, 2921 %arg,
2214 ); 2922 );
2215 2923
2216 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2924 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2217 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2925 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2218 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2926 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2219 2927
2220 $self 2928 $self
2221} 2929}
2222 2930
2223sub set_fontsize { 2931sub set_fontsize {
… …
2244 $self->{value}->set_text ($val); 2952 $self->{value}->set_text ($val);
2245} 2953}
2246 2954
2247############################################################################# 2955#############################################################################
2248 2956
2249package CFClient::UI::Slider; 2957package CFPlus::UI::Slider;
2250 2958
2251use strict; 2959use strict;
2252 2960
2253use CFClient::OpenGL; 2961use CFPlus::OpenGL;
2254 2962
2255our @ISA = CFClient::UI::DrawBG::; 2963our @ISA = CFPlus::UI::DrawBG::;
2256 2964
2257my @tex = 2965my @tex =
2258 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2966 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2259 qw(s1_slider.png s1_slider_bg.png); 2967 qw(s1_slider.png s1_slider_bg.png);
2260 2968
2261sub new { 2969sub new {
2262 my $class = shift; 2970 my $class = shift;
2263 2971
… …
2284 $self->update; 2992 $self->update;
2285 2993
2286 $self 2994 $self
2287} 2995}
2288 2996
2289sub changed { }
2290
2291sub set_range { 2997sub set_range {
2292 my ($self, $range) = @_; 2998 my ($self, $range) = @_;
2293 2999
2294 ($range, $self->{range}) = ($self->{range}, $range); 3000 ($range, $self->{range}) = ($self->{range}, $range);
2295 3001
2296 $self->update
2297 if "@$range" ne "@{$self->{range}}"; 3002 if ("@$range" ne "@{$self->{range}}") {
3003 $self->update;
3004 $self->set_value ($self->{range}[0]);
3005 }
2298} 3006}
2299 3007
2300sub set_value { 3008sub set_value {
2301 my ($self, $value) = @_; 3009 my ($self, $value) = @_;
2302 3010
… …
2313 if $unit; 3021 if $unit;
2314 3022
2315 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3023 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2316 3024
2317 if ($value != $old_value) { 3025 if ($value != $old_value) {
2318 $self->_emit (changed => $value); 3026 $self->emit (changed => $value);
2319 $self->update; 3027 $self->update;
2320 } 3028 }
2321} 3029}
2322 3030
2323sub size_request { 3031sub size_request {
2324 my ($self) = @_; 3032 my ($self) = @_;
2325 3033
2326 ($self->{req_w}, $self->{req_h}) 3034 ($self->{req_w}, $self->{req_h})
2327} 3035}
2328 3036
2329sub button_down { 3037sub invoke_button_down {
2330 my ($self, $ev, $x, $y) = @_; 3038 my ($self, $ev, $x, $y) = @_;
2331 3039
2332 $self->SUPER::button_down ($ev, $x, $y); 3040 $self->SUPER::invoke_button_down ($ev, $x, $y);
2333 3041
2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3042 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2335 3043
2336 $self->mouse_motion ($ev, $x, $y) 3044 $self->invoke_mouse_motion ($ev, $x, $y);
2337}
2338 3045
3046 1
3047}
3048
2339sub mouse_motion { 3049sub invoke_mouse_motion {
2340 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2341 3051
2342 if ($GRAB == $self) { 3052 if ($GRAB == $self) {
2343 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3053 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2344 3054
… …
2348 3058
2349 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3059 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2350 } else { 3060 } else {
2351 return 0; 3061 return 0;
2352 } 3062 }
3063
3064 1
3065}
3066
3067sub invoke_mouse_wheel {
3068 my ($self, $ev) = @_;
3069
3070 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3071
3072 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3073
3074 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2353 3075
2354 1 3076 1
2355} 3077}
2356 3078
2357sub update { 3079sub update {
… …
2408 glDisable GL_TEXTURE_2D; 3130 glDisable GL_TEXTURE_2D;
2409} 3131}
2410 3132
2411############################################################################# 3133#############################################################################
2412 3134
2413package CFClient::UI::ValSlider; 3135package CFPlus::UI::ValSlider;
2414 3136
2415our @ISA = CFClient::UI::HBox::; 3137our @ISA = CFPlus::UI::HBox::;
2416 3138
2417sub new { 3139sub new {
2418 my ($class, %arg) = @_; 3140 my ($class, %arg) = @_;
2419 3141
2420 my $range = delete $arg{range}; 3142 my $range = delete $arg{range};
2421 3143
2422 my $self = $class->SUPER::new ( 3144 my $self = $class->SUPER::new (
2423 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3145 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2424 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3146 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2425 to_value => sub { shift }, 3147 to_value => sub { shift },
2426 from_value => sub { shift }, 3148 from_value => sub { shift },
2427 %arg, 3149 %arg,
2428 ); 3150 );
2429 3151
… …
2449sub set_range { shift->{slider}->set_range (@_) } 3171sub set_range { shift->{slider}->set_range (@_) }
2450sub set_value { shift->{slider}->set_value (@_) } 3172sub set_value { shift->{slider}->set_value (@_) }
2451 3173
2452############################################################################# 3174#############################################################################
2453 3175
2454package CFClient::UI::TextView; 3176package CFPlus::UI::TextScroller;
2455 3177
2456our @ISA = CFClient::UI::HBox::; 3178our @ISA = CFPlus::UI::HBox::;
2457 3179
2458use CFClient::OpenGL; 3180use CFPlus::OpenGL;
2459 3181
2460sub new { 3182sub new {
2461 my $class = shift; 3183 my $class = shift;
2462 3184
2463 my $self = $class->SUPER::new ( 3185 my $self = $class->SUPER::new (
2464 fontsize => 1, 3186 fontsize => 1,
2465 can_events => 0, 3187 can_events => 1,
3188 indent => 0,
2466 #font => default_font 3189 #font => default_font
2467 @_, 3190 @_,
2468 3191
2469 layout => (new CFClient::Layout 1), 3192 layout => (new CFPlus::Layout),
2470 par => [], 3193 par => [],
3194 max_par => 0,
2471 height => 0, 3195 height => 0,
2472 children => [ 3196 children => [
2473 (new CFClient::UI::Empty expand => 1), 3197 (new CFPlus::UI::Empty expand => 1),
2474 (new CFClient::UI::Slider vertical => 1), 3198 (new CFPlus::UI::Slider vertical => 1),
2475 ], 3199 ],
2476 ); 3200 );
2477 3201
2478 $self->{children}[1]->connect (changed => sub { $self->update }); 3202 $self->{children}[1]->connect (changed => sub { $self->update });
2479 3203
… …
2485 3209
2486 $self->{fontsize} = $fontsize; 3210 $self->{fontsize} = $fontsize;
2487 $self->reflow; 3211 $self->reflow;
2488} 3212}
2489 3213
3214sub size_request {
3215 my ($self) = @_;
3216
3217 my ($empty, $slider) = $self->visible_children;
3218
3219 local $self->{children} = [$empty, $slider];
3220 $self->SUPER::size_request
3221}
3222
2490sub size_allocate { 3223sub invoke_size_allocate {
2491 my ($self, $w, $h) = @_; 3224 my ($self, $w, $h) = @_;
2492 3225
2493 $self->SUPER::size_allocate ($w, $h); 3226 my ($empty, $slider, @other) = @{ $self->{children} };
3227 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2494 3228
2495 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3229 $self->{layout}->set_font ($self->{font}) if $self->{font};
2496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3230 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2497 $self->{layout}->set_width ($self->{children}[0]{w}); 3231 $self->{layout}->set_width ($empty->{w});
3232 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2498 3233
2499 $self->reflow; 3234 $self->reflow;
2500}
2501 3235
2502sub text_size { 3236 local $self->{children} = [$empty, $slider];
3237 $self->SUPER::invoke_size_allocate ($w, $h)
3238}
3239
3240sub invoke_mouse_wheel {
2503 my ($self, $text, $indent) = @_; 3241 my ($self, $ev) = @_;
3242
3243 return 0 unless $ev->{dy}; # only vertical movements
3244
3245 $self->{children}[1]->emit (mouse_wheel => $ev);
3246
3247 1
3248}
3249
3250sub get_layout {
3251 my ($self, $para) = @_;
2504 3252
2505 my $layout = $self->{layout}; 3253 my $layout = $self->{layout};
2506 3254
3255 $layout->set_font ($self->{font}) if $self->{font};
3256 $layout->set_foreground (@{$para->{fg}});
2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3257 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508 $layout->set_width ($self->{children}[0]{w} - $indent); 3258 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3259 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2509 $layout->set_markup ($text); 3260 $layout->set_markup ($para->{markup});
3261
3262 $layout->set_shapes (
3263 map
3264 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3265 @{$para->{widget}}
2510 3266 );
3267
2511 $layout->size 3268 $layout
2512} 3269}
2513 3270
2514sub reflow { 3271sub reflow {
2515 my ($self) = @_; 3272 my ($self) = @_;
2516 3273
… …
2523 3280
2524 # todo: base offset on lines or so, not on pixels 3281 # todo: base offset on lines or so, not on pixels
2525 $self->{children}[1]->set_value ($offset); 3282 $self->{children}[1]->set_value ($offset);
2526} 3283}
2527 3284
3285sub current_paragraph {
3286 my ($self) = @_;
3287
3288 $self->{top_paragraph} - 1
3289}
3290
3291sub scroll_to {
3292 my ($self, $para) = @_;
3293
3294 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3295
3296 $self->{scroll_to} = $para;
3297 $self->update;
3298}
3299
2528sub clear { 3300sub clear {
2529 my ($self) = @_; 3301 my ($self) = @_;
3302
3303 my (undef, undef, @other) = @{ $self->{children} };
3304 $self->remove ($_) for @other;
2530 3305
2531 $self->{par} = []; 3306 $self->{par} = [];
2532 $self->{height} = 0; 3307 $self->{height} = 0;
2533 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3308 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2534} 3309}
2535 3310
2536sub add_paragraph { 3311sub add_paragraph {
2537 my ($self, $color, $text, $indent) = @_; 3312 my $self = shift;
2538 3313
2539 for my $line (split /\n/, $text) { 3314 for my $para (@_) {
2540 my ($w, $h) = $self->text_size ($line); 3315 $para = {
3316 fg => [1, 1, 1, 1],
3317 indent => 0,
3318 markup => "",
3319 widget => [],
3320 ref $para ? %$para : (markup => $para),
3321 w => 1e10,
3322 wrapped => 1,
3323 };
3324
3325 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3326 push @{$self->{par}}, $para;
3327 }
3328
3329 if (my $max = $self->{max_par}) {
3330 shift @{$self->{par}} while @{$self->{par}} > $max;
3331 }
3332
3333 $self->{need_reflow}++;
3334 $self->update;
3335}
3336
3337sub scroll_to_bottom {
3338 my ($self) = @_;
3339
3340 $self->{scroll_to} = $#{$self->{par}};
3341 $self->update;
3342}
3343
3344sub force_uptodate {
3345 my ($self) = @_;
3346
3347 if (delete $self->{need_reflow}) {
3348 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3349
3350 my $height = 0;
3351
3352 for my $para (@{$self->{par}}) {
3353 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3354 my $layout = $self->get_layout ($para);
3355 my ($w, $h) = $layout->size;
3356
3357 $para->{w} = $w + $para->{indent};
3358 $para->{h} = $h;
3359 $para->{wrapped} = $layout->has_wrapped;
3360 }
3361
3362 $para->{y} = $height;
3363 $height += $para->{h};
3364 }
3365
2541 $self->{height} += $h; 3366 $self->{height} = $height;
2542 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3367 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2543 }
2544 3368
2545 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3369 delete $self->{texture};
3370 }
3371
3372 if (my $paridx = delete $self->{scroll_to}) {
3373 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3374 }
2546} 3375}
2547 3376
2548sub update { 3377sub update {
2549 my ($self) = @_; 3378 my ($self) = @_;
2550 3379
… …
2552 3381
2553 return unless $self->{h} > 0; 3382 return unless $self->{h} > 0;
2554 3383
2555 delete $self->{texture}; 3384 delete $self->{texture};
2556 3385
2557 $ROOT->on_post_alloc ($self, sub { 3386 $ROOT->on_post_alloc ($self => sub {
3387 $self->force_uptodate;
3388
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3389 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559 3390
2560 if (delete $self->{need_reflow}) {
2561 my $height = 0;
2562
2563 my $layout = $self->{layout};
2564
2565 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566
2567 for (@{$self->{par}}) {
2568 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2569 $layout->set_width ($W - $_->[3]);
2570 $layout->set_markup ($_->[4]);
2571 my ($w, $h) = $layout->size;
2572 $_->[0] = $w + $_->[3];
2573 $_->[1] = $h;
2574 }
2575
2576 $height += $_->[1];
2577 }
2578
2579 $self->{height} = $height;
2580
2581 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2582
2583 delete $self->{texture};
2584 }
2585
2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3391 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2587 glClearColor 0, 0, 0, 0; 3392 glClearColor 0, 0, 0, 0;
2588 glClear GL_COLOR_BUFFER_BIT; 3393 glClear GL_COLOR_BUFFER_BIT;
2589 3394
3395 package CFPlus::UI::Base;
3396 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3397 (0, 0, $self->{w}, $self->{h});
3398
3399 my $top = int $self->{children}[1]{range}[0];
3400
3401 my $paridx = 0;
3402 my $top_paragraph;
2590 my $top = int $self->{children}[1]{range}[0]; 3403 my $top = int $self->{children}[1]{range}[0];
2591 3404
2592 my $y0 = $top; 3405 my $y0 = $top;
2593 my $y1 = $top + $H; 3406 my $y1 = $top + $H;
2594 3407
2595 my $y = 0;
2596
2597 my $layout = $self->{layout};
2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2600
2601 glEnable GL_BLEND;
2602 #TODO# not correct in windows where rgba is forced off
2603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2604
2605 for my $par (@{$self->{par}}) { 3408 for my $para (@{$self->{par}}) {
2606 my $h = $par->[1]; 3409 my $h = $para->{h};
3410 my $y = $para->{y};
2607 3411
2608 if ($y0 < $y + $h && $y < $y1) { 3412 if ($y0 < $y + $h && $y < $y1) {
2609 $layout->set_foreground (@{ $par->[2] }); 3413 my $layout = $self->get_layout ($para);
2610 $layout->set_width ($W - $par->[3]);
2611 $layout->set_markup ($par->[4]);
2612 3414
2613 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3415 $layout->render ($para->{indent}, $y - $y0);
3416 $layout->draw;
2614 3417
2615 glRasterPos $par->[3], $y - $y0; 3418 if (my @w = @{ $para->{widget} }) {
2616 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3419 my @s = $layout->get_shapes;
3420
3421 for (@w) {
3422 my ($dx, $dy) = splice @s, 0, 2, ();
3423
3424 $_->{x} = $dx + $para->{indent};
3425 $_->{y} = $dy + $y - $y0;
3426
3427 $_->draw;
3428 }
3429 }
2617 } 3430 }
2618 3431
2619 $y += $h; 3432 $paridx++;
3433 $top_paragraph ||= $paridx if $y >= $top;
2620 } 3434 }
2621 3435
2622 glDisable GL_BLEND; 3436 $self->{top_paragraph} = $top_paragraph;
2623 }; 3437 };
2624 }); 3438 });
3439}
3440
3441sub reconfigure {
3442 my ($self) = @_;
3443
3444 $self->SUPER::reconfigure;
3445
3446 $_->{w} = 1e10 for @{ $self->{par} };
3447 $self->reflow;
2625} 3448}
2626 3449
2627sub _draw { 3450sub _draw {
2628 my ($self) = @_; 3451 my ($self) = @_;
2629 3452
… …
2632 glColor 0, 0, 0, 1; 3455 glColor 0, 0, 0, 1;
2633 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3456 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2634 glDisable GL_TEXTURE_2D; 3457 glDisable GL_TEXTURE_2D;
2635 3458
2636 $self->{children}[1]->draw; 3459 $self->{children}[1]->draw;
2637
2638} 3460}
2639 3461
2640############################################################################# 3462#############################################################################
2641 3463
2642package CFClient::UI::Animator; 3464package CFPlus::UI::Animator;
2643 3465
2644use CFClient::OpenGL; 3466use CFPlus::OpenGL;
2645 3467
2646our @ISA = CFClient::UI::Bin::; 3468our @ISA = CFPlus::UI::Bin::;
2647 3469
2648sub moveto { 3470sub moveto {
2649 my ($self, $x, $y) = @_; 3471 my ($self, $x, $y) = @_;
2650 3472
2651 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3473 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2679 glPopMatrix; 3501 glPopMatrix;
2680} 3502}
2681 3503
2682############################################################################# 3504#############################################################################
2683 3505
2684package CFClient::UI::Flopper; 3506package CFPlus::UI::Flopper;
2685 3507
2686our @ISA = CFClient::UI::Button::; 3508our @ISA = CFPlus::UI::Button::;
2687 3509
2688sub new { 3510sub new {
2689 my $class = shift; 3511 my $class = shift;
2690 3512
2691 my $self = $class->SUPER::new ( 3513 my $self = $class->SUPER::new (
… …
2703 $self->{other}->toggle_visibility; 3525 $self->{other}->toggle_visibility;
2704} 3526}
2705 3527
2706############################################################################# 3528#############################################################################
2707 3529
2708package CFClient::UI::Tooltip; 3530package CFPlus::UI::Tooltip;
2709 3531
2710our @ISA = CFClient::UI::Bin::; 3532our @ISA = CFPlus::UI::Bin::;
2711 3533
2712use CFClient::OpenGL; 3534use CFPlus::OpenGL;
2713 3535
2714sub new { 3536sub new {
2715 my $class = shift; 3537 my $class = shift;
2716 3538
2717 $class->SUPER::new ( 3539 $class->SUPER::new (
… …
2720 ) 3542 )
2721} 3543}
2722 3544
2723sub set_tooltip_from { 3545sub set_tooltip_from {
2724 my ($self, $widget) = @_; 3546 my ($self, $widget) = @_;
3547
3548 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3549 if $widget->{tooltip} =~ /^#(.*)$/;
2725 3550
2726 my $tooltip = $widget->{tooltip}; 3551 my $tooltip = $widget->{tooltip};
2727 3552
2728 if ($ENV{CFPLUS_DEBUG} & 2) { 3553 if ($ENV{CFPLUS_DEBUG} & 2) {
2729 $tooltip .= "\n\n" . (ref $widget) . "\n" 3554 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3555 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n" 3556 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}"; 3557 . "visible $widget->{visible}";
2733 } 3558 }
2734 3559
3560 $tooltip =~ s/^\n+//;
3561 $tooltip =~ s/\n+$//;
3562
2735 $self->add (new CFClient::UI::Label 3563 $self->add (new CFPlus::UI::Label
2736 markup => $tooltip, 3564 markup => $tooltip,
2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3565 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2738 fontsize => 0.8, 3566 fontsize => 0.8,
2739 fg => [0, 0, 0, 1], 3567 style => 1, # FLAG_INVERSE
2740 ellipsise => 0, 3568 ellipsise => 0,
2741 font => ($widget->{tooltip_font} || $::FONT_PROP), 3569 font => ($widget->{tooltip_font} || $::FONT_PROP),
2742 ); 3570 );
2743} 3571}
2744 3572
… …
2748 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3576 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2749 3577
2750 ($w + 4, $h + 4) 3578 ($w + 4, $h + 4)
2751} 3579}
2752 3580
2753sub size_allocate { 3581sub invoke_size_allocate {
2754 my ($self, $w, $h) = @_; 3582 my ($self, $w, $h) = @_;
2755 3583
2756 $self->SUPER::size_allocate ($w - 4, $h - 4); 3584 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2757} 3585}
2758 3586
2759sub visibility_change { 3587sub invoke_visibility_change {
2760 my ($self, $visible) = @_; 3588 my ($self, $visible) = @_;
2761 3589
2762 return unless $visible; 3590 return unless $visible;
2763 3591
2764 $self->{root}->on_post_alloc ("move_$self" => sub { 3592 $self->{root}->on_post_alloc ("move_$self" => sub {
2765 my $widget = $self->{owner} 3593 my $widget = $self->{owner}
2766 or return; 3594 or return;
2767 3595
3596 if ($widget->{visible}) {
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3597 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769 3598
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3599 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH; 3600 if $x + $self->{w} > $self->{root}{w};
2772 3601
2773 $self->move_abs ($x, $y); 3602 $self->move_abs ($x, $y);
3603 } else {
3604 $self->hide;
3605 }
2774 }); 3606 });
2775} 3607}
2776 3608
2777sub _draw { 3609sub _draw {
2778 my ($self) = @_; 3610 my ($self) = @_;
… …
2780 glTranslate 0.375, 0.375; 3612 glTranslate 0.375, 0.375;
2781 3613
2782 my ($w, $h) = @$self{qw(w h)}; 3614 my ($w, $h) = @$self{qw(w h)};
2783 3615
2784 glColor 1, 0.8, 0.4; 3616 glColor 1, 0.8, 0.4;
2785 glBegin GL_QUADS; 3617 glRect 0, 0, $w, $h;
2786 glVertex 0 , 0;
2787 glVertex 0 , $h;
2788 glVertex $w, $h;
2789 glVertex $w, 0;
2790 glEnd;
2791 3618
2792 glColor 0, 0, 0; 3619 glColor 0, 0, 0;
2793 glBegin GL_LINE_LOOP; 3620 glRect_lineloop 0, 0, $w, $h;
2794 glVertex 0 , 0;
2795 glVertex 0 , $h;
2796 glVertex $w, $h;
2797 glVertex $w, 0;
2798 glEnd;
2799 3621
2800 glTranslate 2 - 0.375, 2 - 0.375; 3622 glTranslate 2 - 0.375, 2 - 0.375;
2801 3623
2802 $self->SUPER::_draw; 3624 $self->SUPER::_draw;
2803} 3625}
2804 3626
2805############################################################################# 3627#############################################################################
2806 3628
2807package CFClient::UI::Face; 3629package CFPlus::UI::Face;
2808 3630
2809our @ISA = CFClient::UI::Base::; 3631our @ISA = CFPlus::UI::DrawBG::;
2810 3632
2811use CFClient::OpenGL; 3633use CFPlus::OpenGL;
2812 3634
2813sub new { 3635sub new {
2814 my $class = shift; 3636 my $class = shift;
2815 3637
2816 my $self = $class->SUPER::new ( 3638 my $self = $class->SUPER::new (
3639 size_w => 32,
3640 size_h => 8,
2817 aspect => 1, 3641 aspect => 1,
2818 can_events => 0, 3642 can_events => 0,
2819 @_, 3643 @_,
2820 ); 3644 );
2821 3645
2822 if ($self->{anim} && $self->{animspeed}) { 3646 if ($self->{anim} && $self->{animspeed}) {
2823 Scalar::Util::weaken (my $widget = $self); 3647 CFPlus::weaken (my $widget = $self);
2824 3648
3649 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3650 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2825 $self->{timer} = Event->timer ( 3651 $self->{timer} = Event->timer (
2826 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2827 hard => 1, 3652 parked => 1,
2828 interval => $self->{animspeed},
2829 cb => sub { 3653 cb => sub {
3654 return unless $::CONN;
3655
3656 my $w = $widget
3657 or return;
3658
2830 ++$widget->{frame}; 3659 ++$w->{frame};
3660 $w->update_face;
3661
3662 # somehow, $widget can go away
2831 $widget->update; 3663 $w->update;
3664 $w->update_timer;
2832 }, 3665 },
2833 ); 3666 );
3667
3668 $self->update_face;
3669 $self->update_timer;
2834 } 3670 }
2835 3671
2836 $self 3672 $self
2837} 3673}
2838 3674
3675sub update_timer {
3676 my ($self) = @_;
3677
3678 return unless $self->{timer};
3679
3680 if ($self->{visible}) {
3681 $self->{timer}->at (
3682 $self->{anim_start}
3683 + $self->{animspeed}
3684 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3685 );
3686 $self->{timer}->start;
3687 } else {
3688 $self->{timer}->stop;
3689 }
3690}
3691
3692sub update_face {
3693 my ($self) = @_;
3694
3695 if ($::CONN) {
3696 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3697 if ($anim && @$anim) {
3698 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3699 delete $self->{face_change_cb};
3700
3701 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3702 unless ($tex->{name} || $tex->{loading}) {
3703 $tex->upload (sub { $self->reconfigure });
3704 }
3705 }
3706 }
3707 }
3708 }
3709}
3710
2839sub size_request { 3711sub size_request {
2840 (32, 8) 3712 my ($self) = @_;
3713
3714 if ($::CONN) {
3715 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3716 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3717 if ($tex->{name}) {
3718 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3719 } elsif (!$tex->{loading}) {
3720 $tex->upload (sub { $self->reconfigure });
3721 }
3722 }
3723
3724 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3725 }
3726 }
3727
3728 ($self->{size_w} || 8, $self->{size_h} || 8)
2841} 3729}
2842 3730
2843sub update { 3731sub update {
2844 my ($self) = @_; 3732 my ($self) = @_;
2845 3733
2846 return unless $self->{visible}; 3734 return unless $self->{visible};
2847 3735
2848 $self->SUPER::update; 3736 $self->SUPER::update;
2849} 3737}
2850 3738
3739sub invoke_visibility_change {
3740 my ($self) = @_;
3741
3742 $self->update_timer;
3743
3744 0
3745}
3746
2851sub _draw { 3747sub _draw {
2852 my ($self) = @_; 3748 my ($self) = @_;
2853 3749
2854 return unless $::CONN; 3750 $self->SUPER::_draw;
2855 3751
2856 my $face; 3752 if (my $tex = $self->{tex}) {
2857
2858 if ($self->{frame}) {
2859 my $anim = $::CONN->{anim}[$self->{anim}];
2860
2861 $face = $anim->[ $self->{frame} % @$anim ]
2862 if $anim && @$anim;
2863 }
2864
2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2866
2867 if ($tex) {
2868 glEnable GL_TEXTURE_2D; 3753 glEnable GL_TEXTURE_2D;
2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3754 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2870 glColor 0, 0, 0, 1; 3755 glColor 0, 0, 0, 1;
2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3756 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2872 glDisable GL_TEXTURE_2D; 3757 glDisable GL_TEXTURE_2D;
2873 } 3758 }
2874} 3759}
2875 3760
2876sub DESTROY { 3761sub destroy {
2877 my ($self) = @_; 3762 my ($self) = @_;
2878 3763
2879 $self->{timer}->cancel 3764 (delete $self->{timer})->cancel
2880 if $self->{timer}; 3765 if $self->{timer};
2881 3766
2882 $self->SUPER::DESTROY; 3767 $self->SUPER::destroy;
2883} 3768}
2884 3769
2885############################################################################# 3770#############################################################################
2886 3771
2887package CFClient::UI::Buttonbar; 3772package CFPlus::UI::Buttonbar;
2888 3773
2889our @ISA = CFClient::UI::HBox::; 3774our @ISA = CFPlus::UI::HBox::;
2890 3775
2891# TODO: should actualyl wrap buttons and other goodies. 3776# TODO: should actually wrap buttons and other goodies.
2892 3777
2893############################################################################# 3778#############################################################################
2894 3779
2895package CFClient::UI::Menu; 3780package CFPlus::UI::Menu;
2896 3781
2897our @ISA = CFClient::UI::FancyFrame::; 3782our @ISA = CFPlus::UI::Toplevel::;
2898 3783
2899use CFClient::OpenGL; 3784use CFPlus::OpenGL;
2900 3785
2901sub new { 3786sub new {
2902 my $class = shift; 3787 my $class = shift;
2903 3788
2904 my $self = $class->SUPER::new ( 3789 my $self = $class->SUPER::new (
2905 items => [], 3790 items => [],
2906 z => 100, 3791 z => 100,
2907 @_, 3792 @_,
2908 ); 3793 );
2909 3794
2910 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3795 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2911 3796
2912 for my $item (@{ $self->{items} }) { 3797 for my $item (@{ $self->{items} }) {
2913 my ($widget, $cb) = @$item; 3798 my ($widget, $cb, $tooltip) = @$item;
2914 3799
2915 # handle various types of items, only text for now 3800 # handle various types of items, only text for now
2916 if (!ref $widget) { 3801 if (!ref $widget) {
3802 if ($widget =~ /\t/) {
3803 my ($left, $right) = split /\t/, $widget, 2;
3804
2917 $widget = new CFClient::UI::Label 3805 $widget = new CFPlus::UI::HBox
2918 can_hover => 1, 3806 can_hover => 1,
2919 can_events => 1, 3807 can_events => 1,
3808 tooltip => $tooltip,
3809 children => [
3810 (new CFPlus::UI::Label markup => $left, expand => 1),
3811 (new CFPlus::UI::Label markup => $right, align => +1),
3812 ],
3813 ;
3814
3815 } else {
3816 $widget = new CFPlus::UI::Label
3817 can_hover => 1,
3818 can_events => 1,
2920 text => $widget; 3819 markup => $widget,
3820 tooltip => $tooltip;
3821 }
2921 } 3822 }
2922 3823
2923 $self->{item}{$widget} = $item; 3824 $self->{item}{$widget} = $item;
2924 3825
2925 $self->{vbox}->add ($widget); 3826 $self->{vbox}->add ($widget);
… …
2930 3831
2931# popup given the event (must be a mouse button down event currently) 3832# popup given the event (must be a mouse button down event currently)
2932sub popup { 3833sub popup {
2933 my ($self, $ev) = @_; 3834 my ($self, $ev) = @_;
2934 3835
2935 $self->_emit ("popdown"); 3836 $self->emit ("popdown");
2936 3837
2937 # maybe save $GRAB? must be careful about events... 3838 # maybe save $GRAB? must be careful about events...
2938 $GRAB = $self; 3839 $GRAB = $self;
2939 $self->{button} = $ev->{button}; 3840 $self->{button} = $ev->{button};
2940 3841
2941 $self->show; 3842 $self->show;
2942 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3843 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2943} 3844}
2944 3845
2945sub mouse_motion { 3846sub invoke_mouse_motion {
2946 my ($self, $ev, $x, $y) = @_; 3847 my ($self, $ev, $x, $y) = @_;
2947 3848
2948 # TODO: should use vbox->find_widget or so 3849 # TODO: should use vbox->find_widget or so
2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3850 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2950 $self->{hover} = $self->{item}{$HOVER}; 3851 $self->{hover} = $self->{item}{$HOVER};
2951 3852
2952 0 3853 0
2953} 3854}
2954 3855
2955sub button_up { 3856sub invoke_button_up {
2956 my ($self, $ev, $x, $y) = @_; 3857 my ($self, $ev, $x, $y) = @_;
2957 3858
2958 if ($ev->{button} == $self->{button}) { 3859 if ($ev->{button} == $self->{button}) {
2959 undef $GRAB; 3860 undef $GRAB;
2960 $self->hide; 3861 $self->hide;
2961 3862
2962 $self->_emit ("popdown"); 3863 $self->emit ("popdown");
2963 $self->{hover}[1]->() if $self->{hover}; 3864 $self->{hover}[1]->() if $self->{hover};
2964 } else { 3865 } else {
2965 return 0 3866 return 0
2966 } 3867 }
2967 3868
2968 1 3869 1
2969} 3870}
2970 3871
2971############################################################################# 3872#############################################################################
2972 3873
2973package CFClient::UI::Multiplexer; 3874package CFPlus::UI::Multiplexer;
2974 3875
2975our @ISA = CFClient::UI::Container::; 3876our @ISA = CFPlus::UI::Container::;
2976 3877
2977sub new { 3878sub new {
2978 my $class = shift; 3879 my $class = shift;
2979 3880
2980 my $self = $class->SUPER::new ( 3881 my $self = $class->SUPER::new (
… …
2994 3895
2995 $self->{current} = $self->{children}[0] 3896 $self->{current} = $self->{children}[0]
2996 if @{ $self->{children} }; 3897 if @{ $self->{children} };
2997} 3898}
2998 3899
3900sub get_current_page {
3901 my ($self) = @_;
3902
3903 $self->{current}
3904}
3905
2999sub set_current_page { 3906sub set_current_page {
3000 my ($self, $page_or_widget) = @_; 3907 my ($self, $page_or_widget) = @_;
3001 3908
3002 my $widget = ref $page_or_widget 3909 my $widget = ref $page_or_widget
3003 ? $page_or_widget 3910 ? $page_or_widget
3004 : $self->{children}[$page_or_widget]; 3911 : $self->{children}[$page_or_widget];
3005 3912
3006 $self->{current} = $widget; 3913 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3914 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008 3915
3009 $self->_emit (page_changed => $self->{current}); 3916 $self->emit (page_changed => $self->{current});
3010 3917
3011 $self->realloc; 3918 $self->realloc;
3012} 3919}
3013 3920
3014sub visible_children { 3921sub visible_children {
… …
3019 my ($self) = @_; 3926 my ($self) = @_;
3020 3927
3021 $self->{current}->size_request 3928 $self->{current}->size_request
3022} 3929}
3023 3930
3024sub size_allocate { 3931sub invoke_size_allocate {
3025 my ($self, $w, $h) = @_; 3932 my ($self, $w, $h) = @_;
3026 3933
3027 $self->{current}->configure (0, 0, $w, $h); 3934 $self->{current}->configure (0, 0, $w, $h);
3935
3936 1
3028} 3937}
3029 3938
3030sub _draw { 3939sub _draw {
3031 my ($self) = @_; 3940 my ($self) = @_;
3032 3941
3033 $self->{current}->draw; 3942 $self->{current}->draw;
3034} 3943}
3035 3944
3036############################################################################# 3945#############################################################################
3037 3946
3038package CFClient::UI::Notebook; 3947package CFPlus::UI::Notebook;
3039 3948
3949use CFPlus::OpenGL;
3950
3040our @ISA = CFClient::UI::VBox::; 3951our @ISA = CFPlus::UI::VBox::;
3041 3952
3042sub new { 3953sub new {
3043 my $class = shift; 3954 my $class = shift;
3044 3955
3045 my $self = $class->SUPER::new ( 3956 my $self = $class->SUPER::new (
3046 buttonbar => (new CFClient::UI::Buttonbar), 3957 buttonbar => (new CFPlus::UI::Buttonbar),
3047 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3958 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3959 active_outline => [1, 1, 0],
3048 # filter => # will be put between multiplexer and $self 3960 # filter => # will be put between multiplexer and $self
3049 @_, 3961 @_,
3050 ); 3962 );
3051 3963
3052 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3964 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3053 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3965 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3054 3966
3967 {
3968 Scalar::Util::weaken (my $wself = $self);
3969
3970 $self->{multiplexer}->connect (c_add => sub {
3971 my ($mplex, $widgets) = @_;
3972
3973 for my $child (@$widgets) {
3974 Scalar::Util::weaken $child;
3975 $child->{c_tab_} ||= do {
3976 my $tab =
3977 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3978 ? $child->{c_tab}
3979 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3980
3981 $tab->connect (activate => sub {
3982 $wself->set_current_page ($child);
3983 });
3984
3985 $tab
3986 };
3987
3988 $self->{buttonbar}->add ($child->{c_tab_});
3989 }
3990 });
3991
3992 $self->{multiplexer}->connect (c_remove => sub {
3993 my ($mplex, $widgets) = @_;
3994
3995 for my $child (@$widgets) {
3996 $wself->{buttonbar}->remove ($child->{c_tab_});
3997 }
3998 });
3999 }
4000
3055 $self 4001 $self
3056} 4002}
3057 4003
3058sub add { 4004sub add {
4005 my ($self, @widgets) = @_;
4006
4007 $self->{multiplexer}->add (@widgets)
4008}
4009
4010sub remove {
4011 my ($self, @widgets) = @_;
4012
4013 $self->{multiplexer}->remove (@widgets)
4014}
4015
4016sub pages {
4017 my ($self) = @_;
4018 $self->{multiplexer}->children
4019}
4020
4021sub add_tab {
3059 my ($self, $title, $widget, $tooltip) = @_; 4022 my ($self, $title, $widget, $tooltip) = @_;
3060 4023
3061 Scalar::Util::weaken $self; 4024 $title = [$title, $tooltip] unless ref $title;
4025 $widget->{c_tab} = $title;
3062 4026
3063 $self->{buttonbar}->add (new CFClient::UI::Button
3064 markup => $title,
3065 tooltip => $tooltip,
3066 on_activate => sub { $self->set_current_page ($widget) },
3067 );
3068
3069 $self->{multiplexer}->add ($widget); 4027 $self->add ($widget);
4028}
4029
4030sub get_current_page {
4031 my ($self) = @_;
4032
4033 $self->{multiplexer}->get_current_page
3070} 4034}
3071 4035
3072sub set_current_page { 4036sub set_current_page {
3073 my ($self, $page) = @_; 4037 my ($self, $page) = @_;
3074 4038
3075 $self->{multiplexer}->set_current_page ($page); 4039 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current}); 4040 $self->emit (page_changed => $self->{multiplexer}{current});
4041}
4042
4043sub _draw {
4044 my ($self) = @_;
4045
4046 $self->SUPER::_draw ();
4047
4048 if (my $cur = $self->{multiplexer}{current}) {
4049 if ($cur = $cur->{c_tab_}) {
4050 glTranslate $cur->{x}, $cur->{y};
4051 glLineWidth 3;
4052 glColor @{$self->{active_outline}};
4053 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4054 glLineWidth 1;
4055 }
4056 }
3077} 4057}
3078 4058
3079############################################################################# 4059#############################################################################
3080 4060
4061package CFPlus::UI::Selector;
4062
4063use utf8;
4064
4065our @ISA = CFPlus::UI::Button::;
4066
4067sub new {
4068 my $class = shift;
4069
4070 my $self = $class->SUPER::new (
4071 options => [], # [value, title, longdesc], ...
4072 value => undef,
4073 @_,
4074 );
4075
4076 $self->_set_value ($self->{value});
4077
4078 $self
4079}
4080
4081sub invoke_button_down {
4082 my ($self, $ev) = @_;
4083
4084 my @menu_items;
4085
4086 for (@{ $self->{options} }) {
4087 my ($value, $title, $tooltip) = @$_;
4088
4089 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
4090 }
4091
4092 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
4093}
4094
4095sub _set_value {
4096 my ($self, $value) = @_;
4097
4098 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
4099 or return;
4100
4101 $self->{value} = $item->[0];
4102 $self->set_markup ("$item->[1] ⇓");
4103 $self->set_tooltip ($item->[2]);
4104}
4105
4106sub set_value {
4107 my ($self, $value) = @_;
4108
4109 return unless $self->{value} ne $value;
4110
4111 $self->_set_value ($value);
4112 $self->emit (changed => $value);
4113}
4114
4115#############################################################################
4116
3081package CFClient::UI::Statusbox; 4117package CFPlus::UI::Statusbox;
3082 4118
3083our @ISA = CFClient::UI::VBox::; 4119our @ISA = CFPlus::UI::VBox::;
3084 4120
3085sub new { 4121sub new {
3086 my $class = shift; 4122 my $class = shift;
3087 4123
3088 my $self = $class->SUPER::new ( 4124 my $self = $class->SUPER::new (
3089 fontsize => 0.8, 4125 fontsize => 0.8,
3090 @_, 4126 @_,
3091 ); 4127 );
3092 4128
3093 Scalar::Util::weaken (my $this = $self); 4129 CFPlus::weaken (my $this = $self);
3094 4130
3095 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4131 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3096 4132
3097 $self 4133 $self
3098} 4134}
… …
3100sub reorder { 4136sub reorder {
3101 my ($self) = @_; 4137 my ($self) = @_;
3102 my $NOW = Time::HiRes::time; 4138 my $NOW = Time::HiRes::time;
3103 4139
3104 # freeze display when hovering over any label 4140 # freeze display when hovering over any label
3105 return if $CFClient::UI::TOOLTIP->{owner} 4141 return if $CFPlus::UI::TOOLTIP->{owner}
3106 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4142 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3107 values %{ $self->{item} }; 4143 values %{ $self->{item} };
3108 4144
3109 while (my ($k, $v) = each %{ $self->{item} }) { 4145 while (my ($k, $v) = each %{ $self->{item} }) {
3110 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4146 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3111 } 4147 }
… …
3132 for ($short) { 4168 for ($short) {
3133 s/^\s+//; 4169 s/^\s+//;
3134 s/\s+/ /g; 4170 s/\s+/ /g;
3135 } 4171 }
3136 4172
3137 new CFClient::UI::Label 4173 new CFPlus::UI::Label
3138 markup => $short, 4174 markup => $short,
3139 tooltip => $item->{tooltip}, 4175 tooltip => $item->{tooltip},
3140 tooltip_font => $::FONT_PROP, 4176 tooltip_font => $::FONT_PROP,
3141 tooltip_width => 0.67, 4177 tooltip_width => 0.67,
3142 fontsize => $item->{fontsize} || $self->{fontsize}, 4178 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3180 $item->{count}++; 4216 $item->{count}++;
3181 } else { 4217 } else {
3182 $item->{count} = 1; 4218 $item->{count} = 1;
3183 $item->{text} = $item->{tooltip} = $text; 4219 $item->{text} = $item->{tooltip} = $text;
3184 } 4220 }
3185 $item->{id} = ++$self->{id}; 4221 $item->{id} += 0.2;#d#
3186 $item->{timeout} = $timeout; 4222 $item->{timeout} = $timeout;
3187 delete $item->{label}; 4223 delete $item->{label};
3188 } else { 4224 } else {
3189 $self->{item}{$group} = { 4225 $self->{item}{$group} = {
3190 id => ++$self->{id}, 4226 id => ++$self->{id},
… …
3196 count => 1, 4232 count => 1,
3197 %arg, 4233 %arg,
3198 }; 4234 };
3199 } 4235 }
3200 4236
4237 $ROOT->on_refresh (reorder => sub {
3201 $self->reorder; 4238 $self->reorder;
4239 });
3202} 4240}
3203 4241
3204sub reconfigure { 4242sub reconfigure {
3205 my ($self) = @_; 4243 my ($self) = @_;
3206 4244
… …
3209 4247
3210 $self->reorder; 4248 $self->reorder;
3211 $self->SUPER::reconfigure; 4249 $self->SUPER::reconfigure;
3212} 4250}
3213 4251
3214sub DESTROY { 4252sub destroy {
3215 my ($self) = @_; 4253 my ($self) = @_;
3216 4254
3217 $self->{timer}->cancel; 4255 $self->{timer}->cancel;
3218 4256
3219 $self->SUPER::DESTROY; 4257 $self->SUPER::destroy;
3220} 4258}
3221 4259
3222############################################################################# 4260#############################################################################
3223 4261
3224package CFClient::UI::Inventory;
3225
3226our @ISA = CFClient::UI::ScrolledWindow::;
3227
3228sub new {
3229 my $class = shift;
3230
3231 my $self = $class->SUPER::new (
3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3233 @_,
3234 );
3235
3236 $self
3237}
3238
3239sub set_items {
3240 my ($self, $items) = @_;
3241
3242 $self->{child}->clear;
3243 return unless $items;
3244
3245 my @items = sort {
3246 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name})
3248 } @$items;
3249
3250 $self->{real_items} = \@items;
3251
3252 my $row = 0;
3253 for my $item (@items) {
3254 CFClient::Item::update_widgets $item;
3255
3256 $self->{child}->add (0, $row, $item->{face_widget});
3257 $self->{child}->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget});
3259
3260 $row++;
3261 }
3262}
3263
3264#############################################################################
3265
3266package CFClient::UI::BindEditor;
3267
3268our @ISA = CFClient::UI::FancyFrame::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3274
3275 $self->add (my $vb = new CFClient::UI::VBox);
3276
3277
3278 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3279 text => "start recording",
3280 tooltip => "Start/Stops recording of actions."
3281 ."All subsequent actions after the recording started will be captured."
3282 ."The actions are displayed after the record was stopped."
3283 ."To bind the action you have to click on the 'Bind' button",
3284 on_activate => sub {
3285 unless ($self->{recording}) {
3286 $self->start;
3287 } else {
3288 $self->stop;
3289 }
3290 });
3291
3292 $vb->add (new CFClient::UI::Label text => "Actions:");
3293 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3294
3295 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3296 $vb->add (my $hb = new CFClient::UI::HBox);
3297 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3298 $hb->add (new CFClient::UI::Button
3299 text => "bind",
3300 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3301 on_activate => sub {
3302 $self->ask_for_bind;
3303 });
3304
3305 $vb->add (my $hb = new CFClient::UI::HBox);
3306 $hb->add (new CFClient::UI::Button
3307 text => "ok",
3308 expand => 1,
3309 tooltip => "This closes the binding editor and saves the binding",
3310 on_activate => sub {
3311 $self->hide;
3312 $self->commit;
3313 });
3314
3315 $hb->add (new CFClient::UI::Button
3316 text => "cancel",
3317 expand => 1,
3318 tooltip => "This closes the binding editor without saving",
3319 on_activate => sub {
3320 $self->hide;
3321 $self->{binding_cancel}->()
3322 if $self->{binding_cancel};
3323 });
3324
3325 $self->update_binding_widgets;
3326
3327 $self
3328}
3329
3330sub commit {
3331 my ($self) = @_;
3332 my ($mod, $sym, $cmds) = $self->get_binding;
3333 if ($sym != 0 && @$cmds > 0) {
3334 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3335 ."'. Don't forget 'Save Config'!");
3336 $self->{binding_change}->($mod, $sym, $cmds)
3337 if $self->{binding_change};
3338 } else {
3339 $::STATUSBOX->add ("No action bound, no key or action specified!");
3340 $self->{binding_cancel}->()
3341 if $self->{binding_cancel};
3342 }
3343}
3344
3345sub start {
3346 my ($self) = @_;
3347
3348 $self->{rec_btn}->set_text ("stop recording");
3349 $self->{recording} = 1;
3350 $self->clear_command_list;
3351 $::CONN->start_record if $::CONN;
3352}
3353
3354sub stop {
3355 my ($self) = @_;
3356
3357 $self->{rec_btn}->set_text ("start recording");
3358 $self->{recording} = 0;
3359
3360 my $rec;
3361 $rec = $::CONN->stop_record if $::CONN;
3362 return unless ref $rec eq 'ARRAY';
3363 $self->set_command_list ($rec);
3364}
3365
3366
3367sub ask_for_bind_and_commit {
3368 my ($self) = @_;
3369 $self->ask_for_bind (1);
3370}
3371
3372sub ask_for_bind {
3373 my ($self, $commit) = @_;
3374
3375 CFClient::Binder::open_binding_dialog (sub {
3376 my ($mod, $sym) = @_;
3377 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3378 $self->update_binding_widgets;
3379 $self->commit if $commit;
3380 });
3381}
3382
3383# $mod and $sym are the modifiers and key symbol
3384# $cmds is a array ref of strings (the commands)
3385# $cb is the callback that is executed on OK
3386# $ccb is the callback that is executed on CANCEL and
3387# when the binding was unsuccessful on OK
3388sub set_binding {
3389 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3390
3391 $self->clear_command_list;
3392 $self->{recording} = 0;
3393 $self->{rec_btn}->set_text ("start recording");
3394
3395 $self->{binding} = [$mod, $sym];
3396 $self->{commands} = $cmds;
3397
3398 $self->{binding_change} = $cb;
3399 $self->{binding_cancel} = $ccb;
3400
3401 $self->update_binding_widgets;
3402}
3403
3404# this is a shortcut method that asks for a binding
3405# and then just binds it.
3406sub do_quick_binding {
3407 my ($self, $cmds) = @_;
3408 $self->set_binding (undef, undef, $cmds, sub {
3409 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3410 });
3411 $self->ask_for_bind (1);
3412}
3413
3414sub update_binding_widgets {
3415 my ($self) = @_;
3416 my ($mod, $sym, $cmds) = $self->get_binding;
3417 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3418 $self->set_command_list ($cmds);
3419}
3420
3421sub get_binding {
3422 my ($self) = @_;
3423 return (
3424 $self->{binding}->[0],
3425 $self->{binding}->[1],
3426 [ grep { defined $_ } @{$self->{commands}} ]
3427 );
3428}
3429
3430sub clear_command_list {
3431 my ($self) = @_;
3432 $self->{cmdbox}->clear ();
3433}
3434
3435sub set_command_list {
3436 my ($self, $cmds) = @_;
3437
3438 $self->{cmdbox}->clear ();
3439 $self->{commands} = $cmds;
3440
3441 my $idx = 0;
3442
3443 for (@$cmds) {
3444 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3445
3446 my $i = $idx;
3447 $hb->add (new CFClient::UI::Label text => $_);
3448 $hb->add (new CFClient::UI::Button
3449 text => "delete",
3450 tooltip => "Deletes the action from the record",
3451 on_activate => sub {
3452 $self->{cmdbox}->remove ($hb);
3453 $cmds->[$i] = undef;
3454 });
3455
3456
3457 $idx++
3458 }
3459}
3460
3461#############################################################################
3462
3463package CFClient::UI::SpellList;
3464
3465our @ISA = CFClient::UI::Table::;
3466
3467sub new {
3468 my $class = shift;
3469
3470 my $self = $class->SUPER::new (
3471 binding => [],
3472 commands => [],
3473 @_,
3474 )
3475}
3476
3477# XXX: Do sorting? Argl...
3478sub add_spell {
3479 my ($self, $spell) = @_;
3480 $self->{spells}->{$spell->{name}} = $spell;
3481
3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3483 face => $spell->{face},
3484 can_hover => 1,
3485 can_events => 1,
3486 tooltip => $spell->{message});
3487
3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489 text => $spell->{name},
3490 can_hover => 1,
3491 can_events => 1,
3492 tooltip => $spell->{message},
3493 expand => 1);
3494
3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3498 expand => 1);
3499
3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501 text => "bind to key",
3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503}
3504
3505sub rebuild_spell_list {
3506 my ($self) = @_;
3507 $self->{tbl_idx} = 0;
3508 $self->add_spell ($_) for values %{$self->{spells}};
3509}
3510
3511sub remove_spell {
3512 my ($self, $spell) = @_;
3513 delete $self->{spells}->{$spell->{name}};
3514 $self->rebuild_spell_list;
3515}
3516
3517#############################################################################
3518
3519package CFClient::UI::Root; 4262package CFPlus::UI::Root;
3520 4263
3521our @ISA = CFClient::UI::Container::; 4264our @ISA = CFPlus::UI::Container::;
3522 4265
3523use List::Util qw(min max); 4266use List::Util qw(min max);
3524 4267
3525use CFClient::OpenGL; 4268use CFPlus::OpenGL;
3526 4269
3527sub new { 4270sub new {
3528 my $class = shift; 4271 my $class = shift;
3529 4272
3530 my $self = $class->SUPER::new ( 4273 my $self = $class->SUPER::new (
3531 visible => 1, 4274 visible => 1,
3532 @_, 4275 @_,
3533 ); 4276 );
3534 4277
3535 Scalar::Util::weaken ($self->{root} = $self); 4278 CFPlus::weaken ($self->{root} = $self);
3536 4279
3537 $self 4280 $self
3538} 4281}
3539 4282
3540sub size_request { 4283sub size_request {
… …
3555 $coord = $max - $size if $coord > $max - $size; 4298 $coord = $max - $size if $coord > $max - $size;
3556 4299
3557 int $coord + 0.5 4300 int $coord + 0.5
3558} 4301}
3559 4302
3560sub size_allocate { 4303sub invoke_size_allocate {
3561 my ($self, $w, $h) = @_; 4304 my ($self, $w, $h) = @_;
3562 4305
3563 for my $child ($self->children) { 4306 for my $child ($self->children) {
3564 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4307 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3565 4308
… …
3569 $X = _to_pixel $X, $W, $self->{w}; 4312 $X = _to_pixel $X, $W, $self->{w};
3570 $Y = _to_pixel $Y, $H, $self->{h}; 4313 $Y = _to_pixel $Y, $H, $self->{h};
3571 4314
3572 $child->configure ($X, $Y, $W, $H); 4315 $child->configure ($X, $Y, $W, $H);
3573 } 4316 }
4317
4318 1
3574} 4319}
3575 4320
3576sub coord2local { 4321sub coord2local {
3577 my ($self, $x, $y) = @_; 4322 my ($self, $x, $y) = @_;
3578 4323
… …
3586} 4331}
3587 4332
3588sub update { 4333sub update {
3589 my ($self) = @_; 4334 my ($self) = @_;
3590 4335
3591 $::WANT_REFRESH++; 4336 $::WANT_REFRESH->start;
3592} 4337}
3593 4338
3594sub add { 4339sub add {
3595 my ($self, @children) = @_; 4340 my ($self, @children) = @_;
3596 4341
… …
3633 while ($self->{refresh_hook}) { 4378 while ($self->{refresh_hook}) {
3634 $_->() 4379 $_->()
3635 for values %{delete $self->{refresh_hook}}; 4380 for values %{delete $self->{refresh_hook}};
3636 } 4381 }
3637 4382
3638 if ($self->{realloc}) { 4383 while ($self->{realloc}) {
3639 my %queue; 4384 my %queue;
3640 my @queue; 4385 my @queue;
3641 my $widget; 4386 my $widget;
3642 4387
3643 outer: 4388 outer:
… …
3690 } 4435 }
3691 } 4436 }
3692 4437
3693 delete $self->{realloc}{$widget+0}; 4438 delete $self->{realloc}{$widget+0};
3694 } 4439 }
3695 }
3696 4440
3697 while (my $size_alloc = delete $self->{size_alloc}) { 4441 while (my $size_alloc = delete $self->{size_alloc}) {
3698 my @queue = sort { $b->{visible} <=> $a->{visible} } 4442 my @queue = sort { $a->{visible} <=> $b->{visible} }
3699 values %$size_alloc; 4443 values %$size_alloc;
3700 4444
3701 while () { 4445 while () {
3702 my $widget = pop @queue || last; 4446 my $widget = pop @queue || last;
3703 4447
3704 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4448 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3705 4449
3706 $w = 0 if $w < 0; 4450 $w = max $widget->{min_w}, $w;
3707 $h = 0 if $h < 0; 4451 $h = max $widget->{min_h}, $h;
3708 4452
4453# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4454# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4455
4456 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4457 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4458
3709 $w = int $w + 0.5; 4459 $w = int $w + 0.5;
3710 $h = int $h + 0.5; 4460 $h = int $h + 0.5;
3711 4461
3712 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4462 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3713 $widget->{old_w} = $widget->{w}; 4463 $widget->{old_w} = $widget->{w};
3714 $widget->{old_h} = $widget->{h}; 4464 $widget->{old_h} = $widget->{h};
3715 4465
3716 $widget->{w} = $w; 4466 $widget->{w} = $w;
3717 $widget->{h} = $h; 4467 $widget->{h} = $h;
3718 4468
3719 $widget->emit (size_allocate => $w, $h); 4469 $widget->emit (size_allocate => $w, $h);
4470 }
3720 } 4471 }
3721 } 4472 }
3722 } 4473 }
3723 4474
3724 while ($self->{post_alloc_hook}) { 4475 while ($self->{post_alloc_hook}) {
3725 $_->() 4476 $_->()
3726 for values %{delete $self->{post_alloc_hook}}; 4477 for values %{delete $self->{post_alloc_hook}};
3727 } 4478 }
3728
3729 4479
3730 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4480 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3731 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4481 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3732 glClear GL_COLOR_BUFFER_BIT; 4482 glClear GL_COLOR_BUFFER_BIT;
3733 4483
… …
3736 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4486 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3737 glMatrixMode GL_MODELVIEW; 4487 glMatrixMode GL_MODELVIEW;
3738 glLoadIdentity; 4488 glLoadIdentity;
3739 4489
3740 { 4490 {
3741 package CFClient::UI::Base; 4491 package CFPlus::UI::Base;
3742 4492
3743 ($draw_x, $draw_y, $draw_w, $draw_h) = 4493 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3744 (0, 0, $self->{w}, $self->{h}); 4494 (0, 0, $self->{w}, $self->{h});
3745 }
3746 4495
3747 $self->_draw; 4496 $self->_draw;
4497 }
3748} 4498}
3749 4499
3750############################################################################# 4500#############################################################################
3751 4501
3752package CFClient::UI; 4502package CFPlus::UI;
3753 4503
3754$ROOT = new CFClient::UI::Root; 4504$ROOT = new CFPlus::UI::Root;
3755$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4505$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3756 4506
37571 45071
3758 4508

Diff Legend

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