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.305 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.472 by root, Wed Dec 24 04:09:27 2008 UTC

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

Diff Legend

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