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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.467 by root, Wed Sep 3 06:07:39 2008 UTC

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

Diff Legend

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