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

Diff Legend

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