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.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.455 by root, Thu Dec 27 19:12:19 2007 UTC

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

Diff Legend

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