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.267 by root, Thu Jun 1 04:10:29 2006 UTC vs.
Revision 1.462 by root, Thu Mar 20 22:28:33 2008 UTC

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

Diff Legend

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