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.458 by root, Fri Dec 28 15:05:33 2007 UTC

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

Diff Legend

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