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.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.445 by root, Sat Dec 8 19:17:02 2007 UTC

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

Diff Legend

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