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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines