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.312 by root, Fri Jun 23 23:54:30 2006 UTC vs.
Revision 1.482 by root, Sat Aug 13 23:18:19 2011 UTC

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

Diff Legend

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