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

Diff Legend

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