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.266 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.456 by root, Fri Dec 28 11:44:02 2007 UTC

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

Diff Legend

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