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.230 by root, Wed May 24 21:59:54 2006 UTC vs.
Revision 1.322 by root, Wed Jul 5 01:53:24 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 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;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
102 118
103 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
104 } 120 }
105} 121}
106 122
107sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
108 my ($ev) = @_; 124 my ($ev) = @_;
… …
114 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
115 131
116 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 $TOOLTIP_WATCHER->start;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
158sub rescale_widgets { 172sub rescale_widgets {
159 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
160 174
161 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
162 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
163 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
164 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
165 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
166 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
167 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
168 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
169 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
170 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
171 } 190 }
172 } 191 }
173 192
174 reconfigure_widgets; 193 reconfigure_widgets;
175} 194}
… …
184 203
185sub new { 204sub new {
186 my $class = shift; 205 my $class = shift;
187 206
188 my $self = bless { 207 my $self = bless {
189 x => 0, 208 x => "center",
190 y => 0, 209 y => "center",
191 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
192 can_events => 1, 213 can_events => 1,
193 @_ 214 @_
194 }, $class; 215 }, $class;
195 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
196 for (keys %$self) { 219 for (keys %$self) {
197 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
198 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
199 } 222 }
200 } 223 }
201 224
202 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
203 236
204 $self 237 $self
205} 238}
206 239
207sub destroy { 240sub destroy {
… …
211 %$self = (); 244 %$self = ();
212} 245}
213 246
214sub show { 247sub show {
215 my ($self) = @_; 248 my ($self) = @_;
249
216 return if $self->{parent}; 250 return if $self->{parent};
217 251
218 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
219} 253}
220 254
221sub show_centered { 255sub set_visible {
222 my ($self) = @_; 256 my ($self) = @_;
257
223 return if $self->{parent}; 258 return if $self->{visible};
224 259
225 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
226 262
227 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
228 "centered $self" => sub {
229 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
230 },
231 );
232}
233 264
234sub hide { 265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
235 my ($self) = @_; 271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
278 delete $self->{root};
236 279
237 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
239 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
240 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
241 if $self->{parent}; 313 if $self->{parent};
242} 314}
243 315
244sub move { 316sub move_abs {
245 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
246 318
247 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
248 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
249 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
250 322
251 $self->update; 323 $self->update;
252} 324}
253 325
254sub set_size { 326sub set_size {
255 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
256 328
257 $self->{user_w} = $w; 329 $self->{force_w} = $w;
258 $self->{user_h} = $h; 330 $self->{force_h} = $h;
259 331
260 $self->check_size; 332 $self->realloc;
261} 333}
262 334
263sub size_request { 335sub size_request {
264 require Carp; 336 require Carp;
265 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
266} 338}
267 339
340sub baseline_shift {
341 0
342}
343
268sub configure { 344sub configure {
269 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
270 346
271 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
272 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
273 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
274 352
275 # use alignment to adjust x, y 353 # use alignment to adjust x, y
276 354
277 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
278 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
279
280 ($w, $h) = ($w2, $h2);
281 } 357 }
282 358
283 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
284 $self->{x} = $x; 360 $self->{x} = $x;
285 $self->{y} = $y; 361 $self->{y} = $y;
286 $self->update; 362 $self->update;
287 } 363 }
288 364
289 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
290 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
291 }
292}
293 367
294sub size_allocate { 368 $self->{alloc_w} = $w;
295 # nothing to be done 369 $self->{alloc_h} = $h;
296}
297 370
298sub reconfigure { 371 $self->{root}{size_alloc}{$self+0} = $self;
299 my ($self) = @_; 372 }
300
301 $self->check_size (1);
302 $self->update;
303} 373}
304 374
305sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
306} 381}
307 382
308sub set_max_size { 383sub set_max_size {
309 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
310 385
311 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
312 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
313} 390}
314 391
315sub set_tooltip { 392sub set_tooltip {
316 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
317 394
395 $tooltip =~ s/^\s+//;
396 $tooltip =~ s/\s+$//;
397
398 return if $self->{tooltip} eq $tooltip;
399
318 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
319 401
320 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
321 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
322 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
323 } 405 }
324} 406}
325 407
326# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
327sub coord2local { 409sub coord2local {
… …
335 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
336 418
337 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
338} 420}
339 421
340sub focus_in { 422sub invoke_focus_in {
341 my ($self) = @_; 423 my ($self) = @_;
342 424
343 return if $FOCUS == $self; 425 return if $FOCUS == $self;
344 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
345 427
346 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
347 429
348 $self->emit (focus_in => $focus); 430 $self->update;
349 431
350 $focus->update if $focus; 432 0
351 $FOCUS->update;
352} 433}
353 434
354sub focus_out { 435sub invoke_focus_out {
355 my ($self) = @_; 436 my ($self) = @_;
356 437
357 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
358 439
359 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
360 441
361 $self->emit (focus_out => $focus); 442 $self->update;
362 443
363 $focus->update if $focus; #? 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
364} 445 unless $FOCUS;
365 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
366sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
367sub button_up { } 458sub invoke_button_up { 1 }
368sub key_down { } 459sub invoke_key_down { 1 }
369sub key_up { } 460sub invoke_key_up { 1 }
370 461
371sub button_down { 462sub invoke_button_down {
372 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
373 464
374 $self->focus_in; 465 $self->grab_focus;
375}
376 466
377sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
378sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
379sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
380sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
381sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
484
485sub find_widget {
486 my ($self, $x, $y) = @_;
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496
497sub set_parent {
498 my ($self, $parent) = @_;
499
500 Scalar::Util::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible};
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
382 535
383sub draw { 536sub draw {
384 my ($self) = @_; 537 my ($self) = @_;
385 538
386 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
387 548
388 glPushMatrix; 549 glPushMatrix;
389 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
390 $self->_draw;
391 glPopMatrix;
392 551
393 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
394 my ($x, $y) = @$self{qw(x y)};
395
396 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
397 glEnable GL_BLEND; 554 glEnable GL_BLEND;
398 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
399 glBegin GL_QUADS; 556 glBegin GL_QUADS;
400 glVertex $x , $y;
401 glVertex $x + $self->{w}, $y;
402 glVertex $x + $self->{w}, $y + $self->{h};
403 glVertex $x , $y + $self->{h};
404 glEnd;
405 glDisable GL_BLEND;
406 }
407
408 if ($ENV{PCLIENT_DEBUG}) {
409 glPushMatrix;
410 glColor 1, 1, 0, 1;
411 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
412 glBegin GL_LINE_LOOP;
413 glVertex 0 , 0; 557 glVertex 0 , 0;
414 glVertex $self->{w}, 0; 558 glVertex $self->{w}, 0;
415 glVertex $self->{w}, $self->{h}; 559 glVertex $self->{w}, $self->{h};
416 glVertex 0 , $self->{h}; 560 glVertex 0 , $self->{h};
417 glEnd; 561 glEnd;
562 glDisable GL_BLEND;
563 }
564
565 if ($ENV{CFPLUS_DEBUG} & 1) {
566 glPushMatrix;
567 glColor 1, 1, 0, 1;
568 glTranslate 0.375, 0.375;
569 glBegin GL_LINE_LOOP;
570 glVertex 0 , 0;
571 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1;
574 glEnd;
418 glPopMatrix; 575 glPopMatrix;
419 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
420 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
421} 581}
422 582
423sub _draw { 583sub _draw {
424 my ($self) = @_; 584 my ($self) = @_;
425 585
426 warn "no draw defined for $self\n"; 586 warn "no draw defined for $self\n";
427} 587}
428 588
429sub find_widget {
430 my ($self, $x, $y) = @_;
431
432 return () unless $self->{can_events};
433
434 return $self
435 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
436 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
437
438 ()
439}
440
441sub set_parent {
442 my ($self, $parent) = @_;
443
444 Scalar::Util::weaken ($self->{parent} = $parent);
445
446 # TODO: req_w _does_change after ->reconfigure
447 $self->check_size
448 unless exists $self->{req_w};
449
450 $self->show;
451}
452
453sub check_size {
454 my ($self, $forced) = @_;
455
456 $self->{force_alloc} = 1 if $forced;
457 $CFClient::UI::ROOT->{check_size}{$self} = $self;
458}
459
460sub update {
461 my ($self) = @_;
462
463 $self->{parent}->update
464 if $self->{parent};
465}
466
467sub connect {
468 my ($self, $signal, $cb) = @_;
469
470 push @{ $self->{signal_cb}{$signal} }, $cb;
471}
472
473sub emit {
474 my ($self, $signal, @args) = @_;
475
476 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
477}
478
479sub DESTROY { 589sub DESTROY {
480 my ($self) = @_; 590 my ($self) = @_;
481 591
482 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
483 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
484} 596}
485 597
486############################################################################# 598#############################################################################
487 599
488package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
513 625
514 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
515 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
516 628
517 glEnable GL_BLEND; 629 glEnable GL_BLEND;
518 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
519 glColor @$color; 631 glColor_premultiply @$color;
520 632
521 glBegin GL_QUADS; 633 glBegin GL_QUADS;
522 glVertex 0 , 0; 634 glVertex 0 , 0;
523 glVertex 0 , $h; 635 glVertex 0 , $h;
524 glVertex $w, $h; 636 glVertex $w, $h;
… …
539 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
540 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
541} 653}
542 654
543sub size_request { 655sub size_request {
544 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
545} 659}
546 660
547sub draw { } 661sub draw { }
548 662
549############################################################################# 663#############################################################################
… …
553our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
554 668
555sub new { 669sub new {
556 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
557 671
558 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
559 673
560 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
561 children => [], 675 children => [],
562 can_events => 0, 676 can_events => 0,
563 %arg, 677 %arg,
564 ); 678 );
679
565 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
566 682
567 $self 683 $self
568} 684}
569 685
570sub add { 686sub add {
… …
578 $self->{children} = [ 694 $self->{children} = [
579 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
580 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
581 ]; 697 ];
582 698
583 $self->check_size (1); 699 $self->realloc;
584 $self->update;
585} 700}
586 701
587sub children { 702sub children {
588 @{ $_[0]{children} } 703 @{ $_[0]{children} }
589} 704}
… …
594 delete $child->{parent}; 709 delete $child->{parent};
595 $child->hide; 710 $child->hide;
596 711
597 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
598 713
599 $self->check_size; 714 $self->realloc;
600 $self->update;
601} 715}
602 716
603sub clear { 717sub clear {
604 my ($self) = @_; 718 my ($self) = @_;
605 719
… …
609 for (@$children) { 723 for (@$children) {
610 delete $_->{parent}; 724 delete $_->{parent};
611 $_->hide; 725 $_->hide;
612 } 726 }
613 727
614 $self->check_size; 728 $self->realloc;
615 $self->update;
616} 729}
617 730
618sub find_widget { 731sub find_widget {
619 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
620 733
621 $x -= $self->{x}; 734 $x -= $self->{x};
622 $y -= $self->{y}; 735 $y -= $self->{y};
623 736
624 my $res; 737 my $res;
625 738
626 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
627 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
628 and return $res; 741 and return $res;
629 } 742 }
630 743
631 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
652} 765}
653 766
654sub add { 767sub add {
655 my ($self, $child) = @_; 768 my ($self, $child) = @_;
656 769
657 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
658
659 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
660} 772}
661 773
662sub remove { 774sub remove {
663 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
672 784
673sub size_request { 785sub size_request {
674 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
675} 787}
676 788
677sub size_allocate { 789sub invoke_size_allocate {
678 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
679 791
680 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
681} 795}
682 796
683############################################################################# 797#############################################################################
798
799# back-buffered drawing area
684 800
685package CFClient::UI::Window; 801package CFClient::UI::Window;
686 802
687our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
688 804
… …
699 815
700 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
701 $self->SUPER::update; 817 $self->SUPER::update;
702} 818}
703 819
704sub size_allocate { 820sub invoke_size_allocate {
705 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
706 822
707 $self->SUPER::size_allocate ($w, $h);
708 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
709} 826}
710 827
711sub _render { 828sub _render {
829 my ($self) = @_;
830
712 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
713} 832}
714 833
715sub render_child { 834sub render_child {
716 my ($self) = @_; 835 my ($self) = @_;
717 836
718 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
719 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
720 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
721 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
722 $self->_render; 848 $self->_render;
723 }; 849 };
724} 850}
725 851
726sub _draw { 852sub _draw {
727 my ($self) = @_; 853 my ($self) = @_;
728 854
729 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
730 856
731 my $tex = $self->{texture} 857 my $tex = $self->{texture}
732 or return; 858 or return;
733 859
734 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
735 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
736 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
737 863
738 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
739 865
740 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
741} 867}
… …
744 870
745package CFClient::UI::ViewPort; 871package CFClient::UI::ViewPort;
746 872
747our @ISA = CFClient::UI::Window::; 873our @ISA = CFClient::UI::Window::;
748 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 scroll_x => 0,
880 scroll_y => 1,
881 @_,
882 )
883}
884
749sub size_request { 885sub size_request {
750 my ($self) = @_; 886 my ($self) = @_;
751 887
752 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
753 889
754 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
755} 891 $h = 10 if $self->{scroll_y};
756 892
893 ($w, $h)
894}
895
757sub size_allocate { 896sub invoke_size_allocate {
758 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
759 898
760 my ($cw, $ch) = @$self{qw(child_w child_h)}; 899 my $child = $self->child;
761# $w = $self->{w}; 900
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903
762 $self->child->configure (0, 0, $cw, $ch); 904 $self->child->configure (0, 0, $w, $h);
763 $self->update; 905 $self->update;
906
907 1
764} 908}
765 909
766sub set_offset { 910sub set_offset {
767 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
768 912
… …
801} 945}
802 946
803sub _render { 947sub _render {
804 my ($self) = @_; 948 my ($self) = @_;
805 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
806 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
807 954
808 $self->SUPER::_render; 955 $self->SUPER::_render;
809} 956}
810 957
… …
813package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
814 961
815our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
816 963
817sub new { 964sub new {
818 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
819 968
820 my $self; 969 my $self;
821 970
822 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
823 vertical => 1, 972 vertical => 1,
824 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
825 connect_changed => sub { 974 on_changed => sub {
826 $self->{vp}->set_offset (0, $_[1]); 975 $self->{vp}->set_offset (0, $_[1]);
827 }, 976 },
828 ; 977 ;
829 978
830 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
831 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
832 slider => $slider, 981 slider => $slider,
833 @_, 982 %arg,
834 ); 983 );
835 984
836 $self->{vp}->add ($self->{scrolled});
837 $self->add ($self->{vp});
838 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
839 987
840 $self 988 $self
841} 989}
842 990
991#TODO# update range on size_allocate depending on child
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
997}
998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
1005sub update {
1006 my ($self) = @_;
1007
1008 $self->SUPER::update;
1009
1010 $self->update_slider;
1011}
1012
843sub size_allocate { 1013sub invoke_size_allocate {
844 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
845 1015
1016 $self->update_slider;
1017
846 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
847
848 my $child = $self->{vp}->child;
849 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
850} 1019}
851
852#TODO# update range on size_allocate depending on child
853# update viewport offset on scroll
854 1020
855############################################################################# 1021#############################################################################
856 1022
857package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
858 1024
… …
874 1040
875 if ($self->{bg}) { 1041 if ($self->{bg}) {
876 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
877 1043
878 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
879 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
880 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
881 1047
882 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
883 glVertex 0 , 0; 1049 glVertex 0 , 0;
884 glVertex 0 , $h; 1050 glVertex 0 , $h;
885 glVertex $w, $h; 1051 glVertex $w, $h;
… …
898 1064
899our @ISA = CFClient::UI::Bin::; 1065our @ISA = CFClient::UI::Bin::;
900 1066
901use CFClient::OpenGL; 1067use CFClient::OpenGL;
902 1068
903my @tex = 1069my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1;
1072
1073my @border =
904 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
905 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
906 1076
907sub new { 1077sub new {
908 my $class = shift; 1078 my ($class, %arg) = @_;
909
910 # TODO: user_x, user_y, overwrite moveto?
911 1079
912 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
913 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
914 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
915 border => 0.6, 1083 border => 0.6,
916 is_toplevel => 1,
917 can_events => 1, 1084 can_events => 1,
918 @_ 1085 min_w => 16,
1086 min_h => 16,
1087 %arg,
919 ); 1088 );
920 1089
921 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
922 align => 0, 1091 align => 0,
923 valign => 1, 1092 valign => 1,
924 text => $self->{title}, 1093 text => $self->{title},
925 fontsize => $self->{border}; 1094 fontsize => $self->{border},
1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
926 1105
927 $self 1106 $self
1107}
1108
1109sub add {
1110 my ($self, @widgets) = @_;
1111
1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
928} 1115}
929 1116
930sub border { 1117sub border {
931 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
932} 1119}
933 1120
934sub size_request { 1121sub size_request {
935 my ($self) = @_; 1122 my ($self) = @_;
1123
1124 $self->{title_widget}->size_request
1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
936 1129
937 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
938 1131
939 ( 1132 (
940 $w + $self->border * 2, 1133 $w + $self->border * 2,
941 $h + $self->border * 2, 1134 $h + $self->border * 2,
942 ) 1135 )
943} 1136}
944 1137
945sub size_allocate { 1138sub invoke_size_allocate {
946 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
947 1140
1141 if ($self->{title_widget}) {
1142 $self->{title_widget}{w} = $w;
1143 $self->{title_widget}{h} = $h;
1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1145 }
1146
1147 my $border = $self->border;
1148
948 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
949 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
950 1151
951 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
952 if $self->{title};
953
954 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
955}
956 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1165 1
1166}
1167
957sub button_down { 1168sub invoke_button_down {
958 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
959 1170
960 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
961 my $border = $self->border; 1172 my $border = $self->border;
962 1173
… …
975 my ($ev, $x, $y) = @_; 1186 my ($ev, $x, $y) = @_;
976 1187
977 my $dx = $ev->{x} - $ox; 1188 my $dx = $ev->{x} - $ox;
978 my $dy = $ev->{y} - $oy; 1189 my $dy = $ev->{y} - $oy;
979 1190
980 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1191 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
981 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1192 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1193
982 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1194 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
983 $self->check_size; 1195 $self->realloc;
984 }; 1196 };
985 1197
986 } elsif ($lr ^ $td) { 1198 } elsif ($lr ^ $td) {
987 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1199 my ($ox, $oy) = ($ev->{x}, $ev->{y});
988 my ($bx, $by) = ($self->{x}, $self->{y}); 1200 my ($bx, $by) = ($self->{x}, $self->{y});
… …
990 $self->{motion} = sub { 1202 $self->{motion} = sub {
991 my ($ev, $x, $y) = @_; 1203 my ($ev, $x, $y) = @_;
992 1204
993 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
994 1206
995 $self->move ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
996 $self->update; 1208 # HACK: the next line is required to enforce placement
1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
997 }; 1210 };
1211 } else {
1212 return 0;
1213 }
1214
998 } 1215 1
999} 1216}
1000 1217
1001sub button_up { 1218sub invoke_button_up {
1002 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1003 1220
1004 delete $self->{motion}; 1221 ! ! delete $self->{motion}
1005} 1222}
1006 1223
1007sub mouse_motion { 1224sub invoke_mouse_motion {
1008 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1009 1226
1010 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228
1229 ! ! $self->{motion}
1011} 1230}
1012 1231
1013sub _draw { 1232sub _draw {
1014 my ($self) = @_; 1233 my ($self) = @_;
1015 1234
1235 my $child = $self->{children}[0];
1236
1016 my ($w, $h ) = ($self->{w}, $self->{h}); 1237 my ($w, $h ) = ($self->{w}, $self->{h});
1017 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1238 my ($cw, $ch) = ($child->{w}, $child->{h});
1018 1239
1019 glEnable GL_TEXTURE_2D; 1240 glEnable GL_TEXTURE_2D;
1020 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1241 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1021 1242
1022 my $border = $self->border; 1243 my $border = $self->border;
1023 1244
1024 glColor @{ $self->{border_bg} }; 1245 glColor @{ $self->{border_bg} };
1025 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1246 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1026 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1247 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1027 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1248 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1028 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1249 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1029 1250
1030 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1251 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1031 my $bg = $tex[0]; 1252 glColor @{ $self->{bg} };
1032 1253
1033 # TODO: repeat texture not scale 1254 # TODO: repeat texture not scale
1255 # solve this better(?)
1034 my $rep_x = $cw / $bg->{w}; 1256 $bg->{s} = $cw / $bg->{w};
1035 my $rep_y = $ch / $bg->{h}; 1257 $bg->{t} = $ch / $bg->{h};
1036
1037 glColor @{ $self->{bg} };
1038
1039 $bg->{s} = $rep_x;
1040 $bg->{t} = $rep_y;
1041 $bg->{wrap_mode} = 1;
1042 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1258 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1043 } 1259 }
1044 1260
1045 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1046 1262
1047 $self->{title}->draw if $self->{title};
1048
1049 $self->child->draw; 1263 $child->draw;
1264
1265 if ($self->{title_widget}) {
1266 glTranslate 0, $border - $self->{h};
1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1050} 1274}
1051 1275
1052############################################################################# 1276#############################################################################
1053 1277
1054package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1062sub new { 1286sub new {
1063 my $class = shift; 1287 my $class = shift;
1064 1288
1065 $class->SUPER::new ( 1289 $class->SUPER::new (
1066 col_expand => [], 1290 col_expand => [],
1067 @_ 1291 @_,
1068 ) 1292 )
1293}
1294
1295sub children {
1296 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1069} 1297}
1070 1298
1071sub add { 1299sub add {
1072 my ($self, $x, $y, $child) = @_; 1300 my ($self, $x, $y, $child) = @_;
1073 1301
1074 $child->set_parent ($self); 1302 $child->set_parent ($self);
1075 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1076 1304
1077 $child->check_size; 1305 $self->realloc;
1078} 1306}
1079 1307
1080sub children { 1308sub remove {
1081 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1309 my ($self, $child) = @_;
1082}
1083 1310
1311 # TODO: not yet implemented
1312}
1313
1084# TODO: move to container class maybe? send childs a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1085sub clear { 1315sub clear {
1086 my ($self) = @_; 1316 my ($self) = @_;
1087 1317
1088 my @children = $self->children; 1318 my @children = $self->children;
1089 delete $self->{children}; 1319 delete $self->{children};
… …
1091 for (@children) { 1321 for (@children) {
1092 delete $_->{parent}; 1322 delete $_->{parent};
1093 $_->hide; 1323 $_->hide;
1094 } 1324 }
1095 1325
1096 $self->update; 1326 $self->realloc;
1097} 1327}
1098 1328
1099sub get_wh { 1329sub get_wh {
1100 my ($self) = @_; 1330 my ($self) = @_;
1101 1331
… …
1127 (sum @$ws), 1357 (sum @$ws),
1128 (sum @$hs), 1358 (sum @$hs),
1129 ) 1359 )
1130} 1360}
1131 1361
1132sub size_allocate { 1362sub invoke_size_allocate {
1133 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1134 1364
1135 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1136 1366
1137 my $req_w = sum @$ws; 1367 my $req_w = (sum @$ws) || 1;
1138 my $req_h = sum @$hs; 1368 my $req_h = (sum @$hs) || 1;
1139 1369
1140 # TODO: nicer code && do row_expand 1370 # TODO: nicer code && do row_expand
1141 my @col_expand = @{$self->{col_expand}}; 1371 my @col_expand = @{$self->{col_expand}};
1142 @col_expand = (1) x @$ws unless @col_expand; 1372 @col_expand = (1) x @$ws unless @col_expand;
1143 my $col_expand = (sum @col_expand) || 1; 1373 my $col_expand = (sum @col_expand) || 1;
… …
1169 } 1399 }
1170 1400
1171 $y += $row_h; 1401 $y += $row_h;
1172 } 1402 }
1173 1403
1404 1
1174} 1405}
1175 1406
1176sub find_widget { 1407sub find_widget {
1177 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1178 1409
… …
1197 } 1428 }
1198} 1429}
1199 1430
1200############################################################################# 1431#############################################################################
1201 1432
1433package CFClient::UI::Box;
1434
1435our @ISA = CFClient::UI::Container::;
1436
1437sub size_request {
1438 my ($self) = @_;
1439
1440 $self->{vertical}
1441 ? (
1442 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1443 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1444 )
1445 : (
1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1448 )
1449}
1450
1451sub invoke_size_allocate {
1452 my ($self, $w, $h) = @_;
1453
1454 my $space = $self->{vertical} ? $h : $w;
1455 my @children = $self->visible_children;
1456
1457 my @req;
1458
1459 if ($self->{homogeneous}) {
1460 @req = ($space / (@children || 1)) x @children;
1461 } else {
1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1463 my $req = List::Util::sum @req;
1464
1465 if ($req > $space) {
1466 # ah well, not enough space
1467 $_ *= $space / $req for @req;
1468 } else {
1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1470
1471 $space = ($space - $req) / $expand; # remaining space to give away
1472
1473 $req[$_] += $space * $children[$_]{expand}
1474 for 0 .. $#children;
1475 }
1476 }
1477
1478 CFClient::UI::harmonize \@req;
1479
1480 my $pos = 0;
1481 for (0 .. $#children) {
1482 my $alloc = $req[$_];
1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1484
1485 $pos += $alloc;
1486 }
1487
1488 1
1489}
1490
1491#############################################################################
1492
1202package CFClient::UI::HBox; 1493package CFClient::UI::HBox;
1203 1494
1204# TODO: wrap into common Box base class
1205
1206our @ISA = CFClient::UI::Container::; 1495our @ISA = CFClient::UI::Box::;
1207 1496
1208sub size_request { 1497sub new {
1209 my ($self) = @_; 1498 my $class = shift;
1210 1499
1211 my @alloc = map [$_->size_request], @{$self->{children}}; 1500 $class->SUPER::new (
1212 1501 vertical => 0,
1213 ( 1502 @_,
1214 (List::Util::sum map $_->[0], @alloc),
1215 (List::Util::max map $_->[1], @alloc),
1216 ) 1503 )
1217} 1504}
1218 1505
1219sub size_allocate {
1220 my ($self, $w, $h) = @_;
1221
1222 ($h, $w) = ($w, $h);
1223
1224 my $children = $self->{children};
1225
1226 my @h = map $_->{req_w}, @$children;
1227
1228 my $req_h = List::Util::sum @h;
1229
1230 if ($req_h > $h) {
1231 # ah well, not enough space
1232 $_ *= $h / $req_h for @h;
1233 } else {
1234 my $exp = List::Util::sum map $_->{expand}, @$children;
1235 $exp ||= 1;
1236
1237 for (0 .. $#$children) {
1238 my $child = $children->[$_];
1239
1240 my $alloc_h = $h[$_];
1241 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1242 $h[$_] = $alloc_h;
1243 }
1244 }
1245
1246 CFClient::UI::harmonize \@h;
1247
1248 my $y = 0;
1249 for (0 .. $#$children) {
1250 my $child = $children->[$_];
1251 my $h = $h[$_];
1252 $child->configure ($y, 0, $h, $w);
1253
1254 $y += $h;
1255 }
1256
1257 1
1258}
1259
1260############################################################################# 1506#############################################################################
1261 1507
1262package CFClient::UI::VBox; 1508package CFClient::UI::VBox;
1263 1509
1264# TODO: wrap into common Box base class
1265
1266our @ISA = CFClient::UI::Container::; 1510our @ISA = CFClient::UI::Box::;
1267 1511
1268sub size_request { 1512sub new {
1269 my ($self) = @_; 1513 my $class = shift;
1270 1514
1271 my @alloc = map [$_->size_request], @{$self->{children}}; 1515 $class->SUPER::new (
1272 1516 vertical => 1,
1273 ( 1517 @_,
1274 (List::Util::max map $_->[0], @alloc),
1275 (List::Util::sum map $_->[1], @alloc),
1276 ) 1518 )
1277}
1278
1279sub size_allocate {
1280 my ($self, $w, $h) = @_;
1281
1282 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1283
1284 my $children = $self->{children};
1285
1286 my @h = map $_->{req_h}, @$children;
1287
1288 my $req_h = List::Util::sum @h;
1289
1290 if ($req_h > $h) {
1291 # ah well, not enough space
1292 $_ *= $h / $req_h for @h;
1293 } else {
1294 my $exp = List::Util::sum map $_->{expand}, @$children;
1295 $exp ||= 1;
1296
1297 for (0 .. $#$children) {
1298 my $child = $children->[$_];
1299
1300 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1301 }
1302 }
1303
1304 CFClient::UI::harmonize \@h;
1305
1306 my $y = 0;
1307 for (0 .. $#$children) {
1308 my $child = $children->[$_];
1309 my $h = $h[$_];
1310 $child->configure (0, $y, $w, $h);
1311
1312 $y += $h;
1313 }
1314
1315 1
1316} 1519}
1317 1520
1318############################################################################# 1521#############################################################################
1319 1522
1320package CFClient::UI::Label; 1523package CFClient::UI::Label;
… …
1333 #font => default_font 1536 #font => default_font
1334 #text => initial text 1537 #text => initial text
1335 #markup => initial narkup 1538 #markup => initial narkup
1336 #max_w => maximum pixel width 1539 #max_w => maximum pixel width
1337 ellipsise => 3, # end 1540 ellipsise => 3, # end
1338 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout 2),
1339 fontsize => 1, 1542 fontsize => 1,
1340 align => -1, 1543 align => -1,
1341 valign => -1, 1544 valign => -1,
1342 padding => 2, 1545 padding_x => 2,
1546 padding_y => 2,
1343 can_events => 0, 1547 can_events => 0,
1344 %arg 1548 %arg
1345 ); 1549 );
1346 1550
1347 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
1348 my $layout = new CFClient::Layout; 1552 my $layout = new CFClient::Layout 2;
1349 $layout->set_text (delete $self->{template}); 1553 $layout->set_text (delete $self->{template});
1350 $self->{template} = $layout; 1554 $self->{template} = $layout;
1351 } 1555 }
1352 1556
1353 if (exists $self->{markup}) { 1557 if (exists $self->{markup}) {
… …
1374 1578
1375 delete $self->{texture}; 1579 delete $self->{texture};
1376 $self->SUPER::update; 1580 $self->SUPER::update;
1377} 1581}
1378 1582
1583sub realloc {
1584 my ($self) = @_;
1585
1586 delete $self->{ox};
1587 $self->SUPER::realloc;
1588}
1589
1379sub set_text { 1590sub set_text {
1380 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1381 1592
1382 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1383 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1384 1595
1385 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1386 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1387 1597
1598 delete $self->{size_req};
1599 $self->realloc;
1388 $self->update; 1600 $self->update;
1389 $self->check_size;
1390} 1601}
1391 1602
1392sub set_markup { 1603sub set_markup {
1393 my ($self, $markup) = @_; 1604 my ($self, $markup) = @_;
1394 1605
1395 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1396 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1397 1608
1398 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1399 1610
1400 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1401 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1402 1612
1613 delete $self->{size_req};
1614 $self->realloc;
1403 $self->update; 1615 $self->update;
1404 $self->check_size;
1405} 1616}
1406 1617
1407sub size_request { 1618sub size_request {
1408 my ($self) = @_; 1619 my ($self) = @_;
1409 1620
1621 $self->{size_req} ||= do {
1410 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1622 $self->{layout}->set_font ($self->{font}) if $self->{font};
1411 $self->{layout}->set_width ($self->{max_w} || -1); 1623 $self->{layout}->set_width ($self->{max_w} || -1);
1412 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1624 $self->{layout}->set_ellipsise ($self->{ellipsise});
1413 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1625 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1414 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1415 1627
1416 my ($w, $h) = $self->{layout}->size; 1628 my ($w, $h) = $self->{layout}->size;
1417 1629
1418 if (exists $self->{template}) { 1630 if (exists $self->{template}) {
1419 $self->{template}->set_font ($self->{font}) if $self->{font}; 1631 $self->{template}->set_font ($self->{font}) if $self->{font};
1420 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1632 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1421 1633
1422 my ($w2, $h2) = $self->{template}->size; 1634 my ($w2, $h2) = $self->{template}->size;
1423 1635
1424 $w = List::Util::max $w, $w2; 1636 $w = List::Util::max $w, $w2;
1425 $h = List::Util::max $h, $h2; 1637 $h = List::Util::max $h, $h2;
1638 }
1639
1640 [$w, $h]
1426 } 1641 };
1427 1642
1428 ( 1643 @{ $self->{size_req} }
1429 $w + $self->{padding} * 2,
1430 $h + $self->{padding} * 2,
1431 )
1432} 1644}
1433 1645
1646sub baseline_shift {
1647 $_[0]{layout}->descent
1648}
1649
1434sub size_allocate { 1650sub invoke_size_allocate {
1435 my ($self, $w, $h) = @_; 1651 my ($self, $w, $h) = @_;
1436 1652
1653 delete $self->{ox};
1654
1437 delete $self->{texture}; 1655 delete $self->{texture}
1656 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1657
1658 1
1438} 1659}
1439 1660
1440sub set_fontsize { 1661sub set_fontsize {
1441 my ($self, $fontsize) = @_; 1662 my ($self, $fontsize) = @_;
1442 1663
1443 $self->{fontsize} = $fontsize; 1664 $self->{fontsize} = $fontsize;
1665 delete $self->{size_req};
1444 delete $self->{texture}; 1666 delete $self->{texture};
1445 1667
1446 $self->update; 1668 $self->realloc;
1447 $self->check_size; 1669}
1670
1671sub reconfigure {
1672 my ($self) = @_;
1673
1674 delete $self->{size_req};
1675 delete $self->{texture};
1676
1677 $self->SUPER::reconfigure;
1448} 1678}
1449 1679
1450sub _draw { 1680sub _draw {
1451 my ($self) = @_; 1681 my ($self) = @_;
1452 1682
1453 $self->SUPER::_draw; # draw background, if applicable 1683 $self->SUPER::_draw; # draw background, if applicable
1454 1684
1455 my $tex = $self->{texture} ||= do { 1685 my $size = $self->{texture} ||= do {
1456 $self->{layout}->set_foreground (@{$self->{fg}}); 1686 $self->{layout}->set_foreground (@{$self->{fg}});
1457 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1687 $self->{layout}->set_font ($self->{font}) if $self->{font};
1458 $self->{layout}->set_width ($self->{w}); 1688 $self->{layout}->set_width ($self->{w});
1459 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1689 $self->{layout}->set_ellipsise ($self->{ellipsise});
1460 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1690 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1461 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1691 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1462 1692
1463 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1693 $self->{size_req}
1464
1465 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1466 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1467 : ($self->{w} - $tex->{w}) * 0.5);
1468
1469 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1470 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1471 : ($self->{h} - $tex->{h}) * 0.5);
1472
1473 $tex
1474 }; 1694 };
1475 1695
1476 glEnable GL_TEXTURE_2D; 1696 unless (exists $self->{ox}) {
1477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1697 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1698 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1699 : ($self->{w} - $size->[0]) * 0.5);
1478 1700
1479 if ($tex->{format} == GL_ALPHA) { 1701 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1480 glColor @{$self->{fg}}; 1702 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1481 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1703 : ($self->{h} - $size->[1]) * 0.5);
1482 } else {
1483 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1484 } 1704 };
1485 1705
1486 glDisable GL_TEXTURE_2D; 1706 my $w = List::Util::min $self->{w} + 4, $size->[0];
1707 my $h = List::Util::min $self->{h} + 2, $size->[1];
1708
1709 $self->{layout}->render ($self->{ox}, $self->{oy});
1487} 1710}
1488 1711
1489############################################################################# 1712#############################################################################
1490 1713
1491package CFClient::UI::EntryBase; 1714package CFClient::UI::EntryBase;
… …
1505 can_hover => 1, 1728 can_hover => 1,
1506 can_focus => 1, 1729 can_focus => 1,
1507 valign => 0, 1730 valign => 0,
1508 can_events => 1, 1731 can_events => 1,
1509 #text => ... 1732 #text => ...
1733 #hidden => "*",
1510 @_ 1734 @_
1511 ) 1735 )
1512} 1736}
1513 1737
1514sub _set_text { 1738sub _set_text {
… …
1516 1740
1517 delete $self->{cur_h}; 1741 delete $self->{cur_h};
1518 1742
1519 return if $self->{text} eq $text; 1743 return if $self->{text} eq $text;
1520 1744
1521 delete $self->{texture};
1522
1523 $self->{last_activity} = $::NOW; 1745 $self->{last_activity} = $::NOW;
1524 $self->{text} = $text; 1746 $self->{text} = $text;
1525 1747
1526 $text =~ s/./*/g if $self->{hidden}; 1748 $text =~ s/./*/g if $self->{hidden};
1527 $self->{layout}->set_text ("$text "); 1749 $self->{layout}->set_text ("$text ");
1750 delete $self->{size_req};
1528 1751
1529 $self->emit (changed => $self->{text}); 1752 $self->emit (changed => $self->{text});
1753
1754 $self->realloc;
1755 $self->update;
1530} 1756}
1531 1757
1532sub set_text { 1758sub set_text {
1533 my ($self, $text) = @_; 1759 my ($self, $text) = @_;
1534 1760
1535 $self->{cursor} = length $text; 1761 $self->{cursor} = length $text;
1536 $self->_set_text ($text); 1762 $self->_set_text ($text);
1537 $self->update;
1538 $self->check_size;
1539} 1763}
1540 1764
1541sub get_text { 1765sub get_text {
1542 $_[0]{text} 1766 $_[0]{text}
1543} 1767}
… …
1548 my ($w, $h) = $self->SUPER::size_request; 1772 my ($w, $h) = $self->SUPER::size_request;
1549 1773
1550 ($w + 1, $h) # add 1 for cursor 1774 ($w + 1, $h) # add 1 for cursor
1551} 1775}
1552 1776
1553sub size_allocate {
1554 my ($self, $w, $h) = @_;
1555
1556 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1557}
1558
1559sub key_down { 1777sub invoke_key_down {
1560 my ($self, $ev) = @_; 1778 my ($self, $ev) = @_;
1561 1779
1562 my $mod = $ev->{mod}; 1780 my $mod = $ev->{mod};
1563 my $sym = $ev->{sym}; 1781 my $sym = $ev->{sym};
1564 my $uni = $ev->{unicode}; 1782 my $uni = $ev->{unicode};
… …
1579 $self->{cursor} = length $text; 1797 $self->{cursor} = length $text;
1580 } elsif ($uni == 27) { 1798 } elsif ($uni == 27) {
1581 $self->emit ('escape'); 1799 $self->emit ('escape');
1582 } elsif ($uni) { 1800 } elsif ($uni) {
1583 substr $text, $self->{cursor}++, 0, chr $uni; 1801 substr $text, $self->{cursor}++, 0, chr $uni;
1802 } else {
1803 return 0;
1584 } 1804 }
1585 1805
1586 $self->_set_text ($text); 1806 $self->_set_text ($text);
1587 $self->update;
1588 $self->check_size;
1589}
1590 1807
1808 $self->realloc;
1809
1810 1
1811}
1812
1591sub focus_in { 1813sub invoke_focus_in {
1592 my ($self) = @_; 1814 my ($self) = @_;
1593 1815
1594 $self->{last_activity} = $::NOW; 1816 $self->{last_activity} = $::NOW;
1595 1817
1596 $self->SUPER::focus_in; 1818 $self->SUPER::invoke_focus_in
1597} 1819}
1598 1820
1599sub button_down { 1821sub invoke_button_down {
1600 my ($self, $ev, $x, $y) = @_; 1822 my ($self, $ev, $x, $y) = @_;
1601 1823
1602 $self->SUPER::button_down ($ev, $x, $y); 1824 $self->SUPER::invoke_button_down ($ev, $x, $y);
1603 1825
1604 my $idx = $self->{layout}->xy_to_index ($x, $y); 1826 my $idx = $self->{layout}->xy_to_index ($x, $y);
1605 1827
1606 # byte-index to char-index 1828 # byte-index to char-index
1607 my $text = $self->{text}; 1829 my $text = $self->{text};
1608 utf8::encode $text; 1830 utf8::encode $text;
1609 $self->{cursor} = length substr $text, 0, $idx; 1831 $self->{cursor} = length substr $text, 0, $idx;
1610 1832
1611 $self->_set_text ($self->{text}); 1833 $self->_set_text ($self->{text});
1612 $self->update; 1834 $self->update;
1835
1836 1
1613} 1837}
1614 1838
1615sub mouse_motion { 1839sub invoke_mouse_motion {
1616 my ($self, $ev, $x, $y) = @_; 1840 my ($self, $ev, $x, $y) = @_;
1617# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1841# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1842
1843 1
1618} 1844}
1619 1845
1620sub _draw { 1846sub _draw {
1621 my ($self) = @_; 1847 my ($self) = @_;
1622 1848
1623 local $self->{fg} = $self->{fg}; 1849 local $self->{fg} = $self->{fg};
1624 1850
1625 if ($FOCUS == $self) { 1851 if ($FOCUS == $self) {
1626 glColor @{$self->{active_bg}}; 1852 glColor_premultiply @{$self->{active_bg}};
1627 $self->{fg} = $self->{active_fg}; 1853 $self->{fg} = $self->{active_fg};
1628 } else { 1854 } else {
1629 glColor @{$self->{bg}}; 1855 glColor_premultiply @{$self->{bg}};
1630 } 1856 }
1631 1857
1632 glEnable GL_BLEND; 1858 glEnable GL_BLEND;
1633 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1859 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1634 glBegin GL_QUADS; 1860 glBegin GL_QUADS;
1635 glVertex 0 , 0; 1861 glVertex 0 , 0;
1636 glVertex 0 , $self->{h}; 1862 glVertex 0 , $self->{h};
1637 glVertex $self->{w}, $self->{h}; 1863 glVertex $self->{w}, $self->{h};
1638 glVertex $self->{w}, 0; 1864 glVertex $self->{w}, 0;
… …
1663 1889
1664our @ISA = CFClient::UI::EntryBase::; 1890our @ISA = CFClient::UI::EntryBase::;
1665 1891
1666use CFClient::OpenGL; 1892use CFClient::OpenGL;
1667 1893
1668sub key_down { 1894sub invoke_key_down {
1669 my ($self, $ev) = @_; 1895 my ($self, $ev) = @_;
1670 1896
1671 my $sym = $ev->{sym}; 1897 my $sym = $ev->{sym};
1672 1898
1673 if ($sym == 13) { 1899 if ($sym == 13) {
1674 unshift @{$self->{history}}, 1900 unshift @{$self->{history}},
1675 my $txt = $self->get_text; 1901 my $txt = $self->get_text;
1902
1676 $self->{history_pointer} = -1; 1903 $self->{history_pointer} = -1;
1677 $self->{history_saveback} = ''; 1904 $self->{history_saveback} = '';
1678 $self->emit (activate => $txt); 1905 $self->emit (activate => $txt);
1679 $self->update; 1906 $self->update;
1680 1907
… …
1699 } else { 1926 } else {
1700 $self->set_text ($self->{history_saveback}); 1927 $self->set_text ($self->{history_saveback});
1701 } 1928 }
1702 1929
1703 } else { 1930 } else {
1704 $self->SUPER::key_down ($ev); 1931 return $self->SUPER::invoke_key_down ($ev)
1932 }
1933
1705 } 1934 1
1706
1707} 1935}
1708 1936
1709############################################################################# 1937#############################################################################
1710 1938
1711package CFClient::UI::Button; 1939package CFClient::UI::Button;
… …
1720 1948
1721sub new { 1949sub new {
1722 my $class = shift; 1950 my $class = shift;
1723 1951
1724 $class->SUPER::new ( 1952 $class->SUPER::new (
1725 padding => 4, 1953 padding_x => 4,
1954 padding_y => 4,
1726 fg => [1, 1, 1], 1955 fg => [1, 1, 1],
1727 active_fg => [0, 0, 1], 1956 active_fg => [0, 0, 1],
1728 can_hover => 1, 1957 can_hover => 1,
1729 align => 0, 1958 align => 0,
1730 valign => 0, 1959 valign => 0,
1731 can_events => 1, 1960 can_events => 1,
1732 @_ 1961 @_
1733 ) 1962 )
1734} 1963}
1735 1964
1736sub button_up { 1965sub invoke_button_up {
1737 my ($self, $ev, $x, $y) = @_; 1966 my ($self, $ev, $x, $y) = @_;
1738 1967
1968 $self->emit ("activate")
1739 if ($x >= 0 && $x < $self->{w} 1969 if $x >= 0 && $x < $self->{w}
1740 && $y >= 0 && $y < $self->{h}) { 1970 && $y >= 0 && $y < $self->{h};
1741 $self->emit ("activate"); 1971
1742 } 1972 1
1743} 1973}
1744 1974
1745sub _draw { 1975sub _draw {
1746 my ($self) = @_; 1976 my ($self) = @_;
1747 1977
1748 local $self->{fg} = $self->{fg}; 1978 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1749
1750 if ($GRAB == $self) {
1751 $self->{fg} = $self->{active_fg};
1752 }
1753 1979
1754 glEnable GL_TEXTURE_2D; 1980 glEnable GL_TEXTURE_2D;
1755 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1981 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1756 glColor 0, 0, 0, 1; 1982 glColor 0, 0, 0, 1;
1757 1983
… …
1762 $self->SUPER::_draw; 1988 $self->SUPER::_draw;
1763} 1989}
1764 1990
1765############################################################################# 1991#############################################################################
1766 1992
1993package CFClient::UI::ImageButton;
1994
1995our @ISA = CFClient::UI::Image::;
1996
1997use CFClient::OpenGL;
1998
1999my %textures;
2000
2001sub new {
2002 my $class = shift;
2003
2004 my $self = $class->SUPER::new (
2005 padding_x => 4,
2006 padding_y => 4,
2007 fg => [1, 1, 1],
2008 active_fg => [0, 0, 1],
2009 can_hover => 1,
2010 align => 0,
2011 valign => 0,
2012 can_events => 1,
2013 @_
2014 );
2015}
2016
2017sub invoke_button_up {
2018 my ($self, $ev, $x, $y) = @_;
2019
2020 $self->emit ("activate")
2021 if $x >= 0 && $x < $self->{w}
2022 && $y >= 0 && $y < $self->{h};
2023
2024 1
2025}
2026
2027#############################################################################
2028
1767package CFClient::UI::CheckBox; 2029package CFClient::UI::CheckBox;
1768 2030
1769our @ISA = CFClient::UI::DrawBG::; 2031our @ISA = CFClient::UI::DrawBG::;
1770 2032
1771my @tex = 2033my @tex =
… …
1776 2038
1777sub new { 2039sub new {
1778 my $class = shift; 2040 my $class = shift;
1779 2041
1780 $class->SUPER::new ( 2042 $class->SUPER::new (
1781 padding => 2, 2043 padding_x => 2,
2044 padding_y => 2,
1782 fg => [1, 1, 1], 2045 fg => [1, 1, 1],
1783 active_fg => [1, 1, 0], 2046 active_fg => [1, 1, 0],
1784 bg => [0, 0, 0, 0.2], 2047 bg => [0, 0, 0, 0.2],
1785 active_bg => [1, 1, 1, 0.5], 2048 active_bg => [1, 1, 1, 0.5],
1786 state => 0, 2049 state => 0,
… …
1790} 2053}
1791 2054
1792sub size_request { 2055sub size_request {
1793 my ($self) = @_; 2056 my ($self) = @_;
1794 2057
1795 ($self->{padding} * 2 + 6) x 2 2058 (6) x 2
1796} 2059}
1797 2060
2061sub toggle {
2062 my ($self) = @_;
2063
2064 $self->{state} = !$self->{state};
2065 $self->emit (changed => $self->{state});
2066 $self->update;
2067}
2068
1798sub button_down { 2069sub invoke_button_down {
1799 my ($self, $ev, $x, $y) = @_; 2070 my ($self, $ev, $x, $y) = @_;
1800 2071
1801 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2072 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1802 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2073 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1803 $self->{state} = !$self->{state}; 2074 $self->toggle;
1804 $self->emit (changed => $self->{state}); 2075 } else {
2076 return 0
2077 }
2078
1805 } 2079 1
1806} 2080}
1807 2081
1808sub _draw { 2082sub _draw {
1809 my ($self) = @_; 2083 my ($self) = @_;
1810 2084
1811 $self->SUPER::_draw; 2085 $self->SUPER::_draw;
1812 2086
1813 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2087 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1814 2088
1815 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2089 my ($w, $h) = @$self{qw(w h)};
2090
2091 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1816 2092
1817 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2093 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1818 2094
1819 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2095 my $tex = $self->{state} ? $tex[1] : $tex[0];
1820 2096
… …
1828package CFClient::UI::Image; 2104package CFClient::UI::Image;
1829 2105
1830our @ISA = CFClient::UI::Base::; 2106our @ISA = CFClient::UI::Base::;
1831 2107
1832use CFClient::OpenGL; 2108use CFClient::OpenGL;
1833use Carp qw/confess/;
1834 2109
1835our %loaded_images; 2110our %texture_cache;
1836 2111
1837sub new { 2112sub new {
1838 my $class = shift; 2113 my $class = shift;
1839 2114
1840 my $self = $class->SUPER::new (can_events => 0, @_); 2115 my $self = $class->SUPER::new (
2116 can_events => 0,
2117 @_,
2118 );
1841 2119
1842 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2120 $self->{path}
2121 or Carp::croak "required attribute 'path' not set";
1843 2122
1844 $loaded_images{$self->{image}} ||= 2123 $self->{tex} = $texture_cache{$self->{path}} ||=
1845 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2124 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1846 2125
1847 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2126 Scalar::Util::weaken $texture_cache{$self->{path}};
1848 2127
1849 Scalar::Util::weaken $loaded_images{$self->{image}}; 2128 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1850
1851 $self->{aspect} = $tex->{w} / $tex->{h};
1852 2129
1853 $self 2130 $self
1854} 2131}
1855 2132
1856sub size_request { 2133sub size_request {
1857 my ($self) = @_; 2134 my ($self) = @_;
1858 2135
1859 ($self->{tex}->{w}, $self->{tex}->{h}) 2136 ($self->{tex}{w}, $self->{tex}{h})
1860} 2137}
1861 2138
1862sub _draw { 2139sub _draw {
1863 my ($self) = @_; 2140 my ($self) = @_;
1864 2141
… …
1973 my $ycut1 = max 0, min 1, $ycut; 2250 my $ycut1 = max 0, min 1, $ycut;
1974 my $ycut2 = max 0, min 1, $ycut - 1; 2251 my $ycut2 = max 0, min 1, $ycut - 1;
1975 2252
1976 my $h1 = $self->{h} * (1 - $ycut1); 2253 my $h1 = $self->{h} * (1 - $ycut1);
1977 my $h2 = $self->{h} * (1 - $ycut2); 2254 my $h2 = $self->{h} * (1 - $ycut2);
2255 my $h3 = $self->{h};
2256
2257 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1978 2258
1979 glEnable GL_BLEND; 2259 glEnable GL_BLEND;
1980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2260 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2261 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1981 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 2264
1984 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2265 glBindTexture GL_TEXTURE_2D, $t1->{name};
1985 glBegin GL_QUADS; 2266 glBegin GL_QUADS;
… …
2000 2281
2001 if ($t3) { 2282 if ($t3) {
2002 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2283 glBindTexture GL_TEXTURE_2D, $t3->{name};
2003 glBegin GL_QUADS; 2284 glBegin GL_QUADS;
2004 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2285 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2005 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2286 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2006 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2287 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2007 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2288 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2008 glEnd; 2289 glEnd;
2009 } 2290 }
2010 2291
2011 glDisable GL_BLEND; 2292 glDisable GL_BLEND;
… …
2085 fg => [1, 1, 1], 2366 fg => [1, 1, 1],
2086 active_fg => [0, 0, 0], 2367 active_fg => [0, 0, 0],
2087 bg => [0, 0, 0, 0.2], 2368 bg => [0, 0, 0, 0.2],
2088 active_bg => [1, 1, 1, 0.5], 2369 active_bg => [1, 1, 1, 0.5],
2089 range => [0, 0, 100, 10, 0], 2370 range => [0, 0, 100, 10, 0],
2090 req_w => $::WIDTH / 80, 2371 min_w => $::WIDTH / 80,
2091 req_h => $::WIDTH / 80, 2372 min_h => $::WIDTH / 80,
2092 vertical => 0, 2373 vertical => 0,
2093 can_hover => 1, 2374 can_hover => 1,
2094 inner_pad => 0.02, 2375 inner_pad => 0.02,
2095 @_ 2376 @_
2096 ); 2377 );
… …
2102} 2383}
2103 2384
2104sub set_range { 2385sub set_range {
2105 my ($self, $range) = @_; 2386 my ($self, $range) = @_;
2106 2387
2107 $self->{range} = $range; 2388 ($range, $self->{range}) = ($self->{range}, $range);
2108 2389
2390 if ("@$range" ne "@{$self->{range}}") {
2109 $self->update; 2391 $self->update;
2392 $self->set_value ($self->{range}[0]);
2393 }
2110} 2394}
2111 2395
2112sub set_value { 2396sub set_value {
2113 my ($self, $value) = @_; 2397 my ($self, $value) = @_;
2114 2398
… …
2133} 2417}
2134 2418
2135sub size_request { 2419sub size_request {
2136 my ($self) = @_; 2420 my ($self) = @_;
2137 2421
2138 my $w = $self->{req_w}; 2422 ($self->{req_w}, $self->{req_h})
2139 my $h = $self->{req_h};
2140
2141 $self->{vertical} ? ($h, $w) : ($w, $h)
2142} 2423}
2143 2424
2144sub button_down { 2425sub invoke_button_down {
2145 my ($self, $ev, $x, $y) = @_; 2426 my ($self, $ev, $x, $y) = @_;
2146 2427
2147 $self->SUPER::button_down ($ev, $x, $y); 2428 $self->SUPER::invoke_button_down ($ev, $x, $y);
2148 2429
2149 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2430 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2150 2431
2151 $self->mouse_motion ($ev, $x, $y); 2432 $self->invoke_mouse_motion ($ev, $x, $y)
2152} 2433}
2153 2434
2154sub mouse_motion { 2435sub invoke_mouse_motion {
2155 my ($self, $ev, $x, $y) = @_; 2436 my ($self, $ev, $x, $y) = @_;
2156 2437
2157 if ($GRAB == $self) { 2438 if ($GRAB == $self) {
2158 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2439 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2159 2440
2160 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2441 my (undef, $lo, $hi, $page) = @{$self->{range}};
2161 2442
2162 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2443 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2163 2444
2164 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2445 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2446 } else {
2447 return 0;
2448 }
2449
2165 } 2450 1
2166} 2451}
2167 2452
2168sub update { 2453sub update {
2169 my ($self) = @_; 2454 my ($self) = @_;
2170 2455
2171 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2456 delete $self->{knob_w};
2457 $self->SUPER::update;
2458}
2459
2460sub _draw {
2461 my ($self) = @_;
2462
2463 unless ($self->{knob_w}) {
2172 $self->set_value ($self->{range}[0]); 2464 $self->set_value ($self->{range}[0]);
2173 2465
2174 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2466 my ($value, $lo, $hi, $page) = @{$self->{range}};
2175 my $range = ($hi - $page - $lo) || 1e-100; 2467 my $range = ($hi - $page - $lo) || 1e-100;
2176 2468
… …
2182 $value = ($value - $lo) / $range; 2474 $value = ($value - $lo) / $range;
2183 $value = $value * $self->{scale} + $self->{offset}; 2475 $value = $value * $self->{scale} + $self->{offset};
2184 2476
2185 $self->{knob_x} = $value - $knob_w * 0.5; 2477 $self->{knob_x} = $value - $knob_w * 0.5;
2186 $self->{knob_w} = $knob_w; 2478 $self->{knob_w} = $knob_w;
2187 }); 2479 }
2188
2189 $self->SUPER::update;
2190}
2191
2192sub _draw {
2193 my ($self) = @_;
2194 2480
2195 $self->SUPER::_draw (); 2481 $self->SUPER::_draw ();
2196 2482
2197 glScale $self->{w}, $self->{h}; 2483 glScale $self->{w}, $self->{h};
2198 2484
… …
2259sub set_range { shift->{slider}->set_range (@_) } 2545sub set_range { shift->{slider}->set_range (@_) }
2260sub set_value { shift->{slider}->set_value (@_) } 2546sub set_value { shift->{slider}->set_value (@_) }
2261 2547
2262############################################################################# 2548#############################################################################
2263 2549
2264package CFClient::UI::TextView; 2550package CFClient::UI::TextScroller;
2265 2551
2266our @ISA = CFClient::UI::HBox::; 2552our @ISA = CFClient::UI::HBox::;
2267 2553
2268use CFClient::OpenGL; 2554use CFClient::OpenGL;
2269 2555
… …
2271 my $class = shift; 2557 my $class = shift;
2272 2558
2273 my $self = $class->SUPER::new ( 2559 my $self = $class->SUPER::new (
2274 fontsize => 1, 2560 fontsize => 1,
2275 can_events => 0, 2561 can_events => 0,
2562 indent => 0,
2276 #font => default_font 2563 #font => default_font
2277 @_, 2564 @_,
2278 2565
2279 layout => (new CFClient::Layout 1), 2566 layout => (new CFClient::Layout 2),
2280 par => [], 2567 par => [],
2281 height => 0, 2568 height => 0,
2282 children => [ 2569 children => [
2283 (new CFClient::UI::Empty expand => 1), 2570 (new CFClient::UI::Empty expand => 1),
2284 (new CFClient::UI::Slider vertical => 1), 2571 (new CFClient::UI::Slider vertical => 1),
… …
2295 2582
2296 $self->{fontsize} = $fontsize; 2583 $self->{fontsize} = $fontsize;
2297 $self->reflow; 2584 $self->reflow;
2298} 2585}
2299 2586
2587sub size_request {
2588 my ($self) = @_;
2589
2590 my ($empty, $slider) = @{ $self->{children} };
2591
2592 local $self->{children} = [$empty, $slider];
2593 $self->SUPER::size_request
2594}
2595
2300sub size_allocate { 2596sub invoke_size_allocate {
2301 my ($self, $w, $h) = @_; 2597 my ($self, $w, $h) = @_;
2302 2598
2303 $self->SUPER::size_allocate ($w, $h); 2599 my ($empty, $slider, @other) = @{ $self->{children} };
2600 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2304 2601
2305 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2602 $self->{layout}->set_font ($self->{font}) if $self->{font};
2306 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2603 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2307 $self->{layout}->set_width ($self->{children}[0]{w}); 2604 $self->{layout}->set_width ($empty->{w});
2605 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2308 2606
2309 $self->reflow; 2607 $self->reflow;
2310}
2311 2608
2312sub text_size { 2609 local $self->{children} = [$empty, $slider];
2313 my ($self, $text, $indent) = @_; 2610 $self->SUPER::invoke_size_allocate ($w, $h)
2611}
2612
2613sub get_layout {
2614 my ($self, $para) = @_;
2314 2615
2315 my $layout = $self->{layout}; 2616 my $layout = $self->{layout};
2316 2617
2618 $layout->set_font ($self->{font}) if $self->{font};
2619 $layout->set_foreground (@{$para->{fg}});
2317 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2620 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2318 $layout->set_width ($self->{children}[0]{w} - $indent); 2621 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2622 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2319 $layout->set_markup ($text); 2623 $layout->set_markup ($para->{markup});
2624
2625 $layout->set_shapes (
2626 map
2627 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2628 @{$para->{widget}}
2320 2629 );
2630
2321 $layout->size 2631 $layout
2322} 2632}
2323 2633
2324sub reflow { 2634sub reflow {
2325 my ($self) = @_; 2635 my ($self) = @_;
2326 2636
… …
2335 $self->{children}[1]->set_value ($offset); 2645 $self->{children}[1]->set_value ($offset);
2336} 2646}
2337 2647
2338sub clear { 2648sub clear {
2339 my ($self) = @_; 2649 my ($self) = @_;
2650
2651 my (undef, undef, @other) = @{ $self->{children} };
2652 $self->remove ($_) for @other;
2340 2653
2341 $self->{par} = []; 2654 $self->{par} = [];
2342 $self->{height} = 0; 2655 $self->{height} = 0;
2343 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2656 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2344} 2657}
2345 2658
2346sub add_paragraph { 2659sub add_paragraph {
2347 my ($self, $color, $text, $indent) = @_; 2660 my ($self, $color, $para, $indent) = @_;
2348 2661
2349 for my $line (split /\n/, $text) { 2662 my ($text, @w) = ref $para ? @$para : $para;
2350 my ($w, $h) = $self->text_size ($line); 2663
2351 $self->{height} += $h; 2664 $para = {
2352 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2665 w => 1e10,
2666 wrapped => 1,
2667 fg => $color,
2668 indent => $indent,
2669 markup => $text,
2670 widget => \@w,
2353 } 2671 };
2354 2672
2355 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2673 $self->add (@w) if @w;
2674 push @{$self->{par}}, $para;
2675
2676 $self->{need_reflow}++;
2677 $self->update;
2678}
2679
2680sub scroll_to_bottom {
2681 my ($self) = @_;
2682
2683 $self->{scroll_to_bottom} = 1;
2684 $self->update;
2356} 2685}
2357 2686
2358sub update { 2687sub update {
2359 my ($self) = @_; 2688 my ($self) = @_;
2360 2689
… …
2362 2691
2363 return unless $self->{h} > 0; 2692 return unless $self->{h} > 0;
2364 2693
2365 delete $self->{texture}; 2694 delete $self->{texture};
2366 2695
2367 $ROOT->on_post_alloc ($self, sub { 2696 $ROOT->on_post_alloc ($self => sub {
2368 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2697 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2369 2698
2370 if (delete $self->{need_reflow}) { 2699 if (delete $self->{need_reflow}) {
2371 my $height = 0; 2700 my $height = 0;
2372 2701
2373 my $layout = $self->{layout};
2374
2375 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2376
2377 for (@{$self->{par}}) { 2702 for my $para (@{$self->{par}}) {
2378 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2703 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2379 $layout->set_width ($W - $_->[3]); 2704 my $layout = $self->get_layout ($para);
2380 $layout->set_markup ($_->[4]);
2381 my ($w, $h) = $layout->size; 2705 my ($w, $h) = $layout->size;
2382 $_->[0] = $w + $_->[3]; 2706
2383 $_->[1] = $h; 2707 $para->{w} = $w + $para->{indent};
2708 $para->{h} = $h;
2709 $para->{wrapped} = $layout->has_wrapped;
2384 } 2710 }
2385 2711
2386 $height += $_->[1]; 2712 $height += $para->{h};
2387 } 2713 }
2388 2714
2389 $self->{height} = $height; 2715 $self->{height} = $height;
2390 2716
2391 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2717 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2392 2718
2393 delete $self->{texture}; 2719 delete $self->{texture};
2394 } 2720 }
2395 2721
2722 if (delete $self->{scroll_to_bottom}) {
2723 $self->{children}[1]->set_value (1e10);
2724 }
2725
2396 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2726 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2397 glClearColor 0.5, 0.5, 0.5, 0; 2727 glClearColor 0, 0, 0, 0;
2398 glClear GL_COLOR_BUFFER_BIT; 2728 glClear GL_COLOR_BUFFER_BIT;
2399 2729
2400 my $top = int $self->{children}[1]{range}[0]; 2730 my $top = int $self->{children}[1]{range}[0];
2401 2731
2402 my $y0 = $top; 2732 my $y0 = $top;
2403 my $y1 = $top + $H; 2733 my $y1 = $top + $H;
2404 2734
2405 my $y = 0; 2735 my $y = 0;
2406 2736
2407 my $layout = $self->{layout};
2408
2409 $layout->set_font ($self->{font}) if $self->{font};
2410
2411 glEnable GL_BLEND;
2412 #TODO# not correct in windows where rgba is forced off
2413 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2414
2415 for my $par (@{$self->{par}}) { 2737 for my $para (@{$self->{par}}) {
2416 my $h = $par->[1]; 2738 my $h = $para->{h};
2417 2739
2418 if ($y0 < $y + $h && $y < $y1) { 2740 if ($y0 < $y + $h && $y < $y1) {
2419 $layout->set_foreground (@{ $par->[2] });
2420 $layout->set_width ($W - $par->[3]);
2421 $layout->set_markup ($par->[4]);
2422 2741
2423 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my $layout = $self->get_layout ($para);
2424 2743
2425 glRasterPos $par->[3], $y - $y0; 2744 $layout->render ($para->{indent}, $y - $y0);
2426 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2745
2746 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes;
2748
2749 for (@w) {
2750 my ($dx, $dy) = splice @s, 0, 2, ();
2751
2752 $_->{x} = $dx + $para->{indent};
2753 $_->{y} = $dy + $y - $y0;
2754
2755 $_->draw;
2756 }
2757 }
2427 } 2758 }
2428 2759
2429 $y += $h; 2760 $y += $h;
2430 } 2761 }
2431
2432 glDisable GL_BLEND;
2433 }; 2762 };
2434 }); 2763 });
2435} 2764}
2436 2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2773}
2774
2437sub _draw { 2775sub _draw {
2438 my ($self) = @_; 2776 my ($self) = @_;
2439 2777
2440 glEnable GL_TEXTURE_2D; 2778 glEnable GL_TEXTURE_2D;
2441 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2442 glColor 1, 1, 1, 1; 2780 glColor 0, 0, 0, 1;
2443 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2781 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2444 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2445 2783
2446 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2447
2448} 2785}
2449 2786
2450############################################################################# 2787#############################################################################
2451 2788
2452package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2497 2834
2498sub new { 2835sub new {
2499 my $class = shift; 2836 my $class = shift;
2500 2837
2501 my $self = $class->SUPER::new ( 2838 my $self = $class->SUPER::new (
2502 state => 0, 2839 state => 0,
2503 connect_activate => \&toggle_flopper, 2840 on_activate => \&toggle_flopper,
2504 @_ 2841 @_
2505 ); 2842 );
2506 2843
2507 if ($self->{state}) {
2508 $self->{state} = 0;
2509 $self->toggle_flopper;
2510 }
2511
2512 $self 2844 $self
2513} 2845}
2514 2846
2515sub toggle_flopper { 2847sub toggle_flopper {
2516 my ($self) = @_; 2848 my ($self) = @_;
2517 2849
2518 # TODO: use animation 2850 $self->{other}->toggle_visibility;
2519 if ($self->{state} = !$self->{state}) {
2520 $CFClient::UI::ROOT->add ($self->{other});
2521 $self->{other}->move ($self->coord2global (0, $self->{h}));
2522 $self->emit ("open");
2523 } else {
2524 $CFClient::UI::ROOT->remove ($self->{other});
2525 $self->emit ("close");
2526 }
2527
2528 $self->emit (changed => $self->{state});
2529} 2851}
2530 2852
2531############################################################################# 2853#############################################################################
2532 2854
2533package CFClient::UI::Tooltip; 2855package CFClient::UI::Tooltip;
… …
2546} 2868}
2547 2869
2548sub set_tooltip_from { 2870sub set_tooltip_from {
2549 my ($self, $widget) = @_; 2871 my ($self, $widget) = @_;
2550 2872
2873 my $tooltip = $widget->{tooltip};
2874
2875 if ($ENV{CFPLUS_DEBUG} & 2) {
2876 $tooltip .= "\n\n" . (ref $widget) . "\n"
2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2878 . "req $widget->{req_w} $widget->{req_h}\n"
2879 . "visible $widget->{visible}";
2880 }
2881
2882 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//;
2884
2551 $self->add (new CFClient::UI::Label 2885 $self->add (new CFClient::UI::Label
2552 markup => $widget->{tooltip}, 2886 markup => $tooltip,
2553 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2554 fontsize => 0.8, 2888 fontsize => 0.8,
2555 fg => [0, 0, 0, 1], 2889 fg => [0, 0, 0, 1],
2556 ellipsise => 0, 2890 ellipsise => 0,
2557 font => ($widget->{tooltip_font} || $::FONT_PROP), 2891 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2564 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2565 2899
2566 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2567} 2901}
2568 2902
2569sub size_allocate { 2903sub invoke_size_allocate {
2570 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2571 2905
2572 $self->SUPER::size_allocate ($w - 4, $h - 4); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2907}
2908
2909sub invoke_visibility_change {
2910 my ($self, $visible) = @_;
2911
2912 return unless $visible;
2913
2914 $self->{root}->on_post_alloc ("move_$self" => sub {
2915 my $widget = $self->{owner}
2916 or return;
2917
2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919
2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921 if $x + $self->{w} > $self->{root}{w};
2922
2923 $self->move_abs ($x, $y);
2924 });
2573} 2925}
2574 2926
2575sub _draw { 2927sub _draw {
2576 my ($self) = @_; 2928 my ($self) = @_;
2577 2929
… …
2594 glVertex $w, $h; 2946 glVertex $w, $h;
2595 glVertex $w, 0; 2947 glVertex $w, 0;
2596 glEnd; 2948 glEnd;
2597 2949
2598 glTranslate 2 - 0.375, 2 - 0.375; 2950 glTranslate 2 - 0.375, 2 - 0.375;
2951
2599 $self->SUPER::_draw; 2952 $self->SUPER::_draw;
2600} 2953}
2601 2954
2602############################################################################# 2955#############################################################################
2603 2956
… …
2609 2962
2610sub new { 2963sub new {
2611 my $class = shift; 2964 my $class = shift;
2612 2965
2613 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2614 aspect => 1, 2967 aspect => 1,
2968 can_events => 0,
2615 @_, 2969 @_,
2616 ); 2970 );
2617 2971
2618 if ($self->{anim} && $self->{animspeed}) { 2972 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self); 2973 Scalar::Util::weaken (my $widget = $self);
… …
2661 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2662 3016
2663 if ($tex) { 3017 if ($tex) {
2664 glEnable GL_TEXTURE_2D; 3018 glEnable GL_TEXTURE_2D;
2665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2666 glColor 1, 1, 1, 1; 3020 glColor 0, 0, 0, 1;
2667 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2668 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2669 } 3023 }
2670} 3024}
2671 3025
2672sub DESTROY { 3026sub destroy {
2673 my ($self) = @_; 3027 my ($self) = @_;
2674 3028
2675 $self->{timer}->cancel 3029 $self->{timer}->cancel
2676 if $self->{timer}; 3030 if $self->{timer};
2677 3031
2678 $self->SUPER::DESTROY; 3032 $self->SUPER::destroy;
2679} 3033}
2680 3034
2681############################################################################# 3035#############################################################################
2682 3036
2683package CFClient::UI::InventoryItem; 3037package CFClient::UI::Buttonbar;
2684 3038
2685our @ISA = CFClient::UI::HBox::; 3039our @ISA = CFClient::UI::HBox::;
2686 3040
2687sub _item_to_desc { 3041# TODO: should actualyl wrap buttons and other goodies.
2688 my ($item) = @_;
2689
2690 my $desc =
2691 $item->{nrof} < 2
2692 ? $item->{name}
2693 : "$item->{nrof} × $item->{name_pl}";
2694
2695 $item->{flags} & Crossfire::Protocol::F_OPEN
2696 and $desc .= " (open)";
2697 $item->{flags} & Crossfire::Protocol::F_APPLIED
2698 and $desc .= " (applied)";
2699 $item->{flags} & Crossfire::Protocol::F_UNPAID
2700 and $desc .= " (unpaid)";
2701 $item->{flags} & Crossfire::Protocol::F_MAGIC
2702 and $desc .= " (magic)";
2703 $item->{flags} & Crossfire::Protocol::F_CURSED
2704 and $desc .= " (cursed)";
2705 $item->{flags} & Crossfire::Protocol::F_DAMNED
2706 and $desc .= " (damned)";
2707 $item->{flags} & Crossfire::Protocol::F_LOCKED
2708 and $desc .= " *";
2709
2710 $desc
2711}
2712
2713sub new {
2714 my $class = shift;
2715
2716 my %args = @_;
2717
2718 my $item = delete $args{item};
2719
2720 my $desc = _item_to_desc ($item);
2721
2722 my $self = $class->SUPER::new (
2723 can_hover => 1,
2724 can_events => 1,
2725 tooltip => ((CFClient::UI::Label::escape $desc)
2726 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2727 connect_button_down => sub {
2728 my ($self, $ev, $x, $y) = @_;
2729
2730 # todo: maybe put examine on 1? but should just be a tooltip :(
2731 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2732 my $targ = $::CONN->{player}{tag};
2733
2734 if ($item->{container} == $::CONN->{player}{tag}) {
2735 $targ = $main::OPENCONT;
2736 }
2737
2738 $::CONN->send ("move $targ $item->{tag} 0");
2739 } elsif ($ev->{button} == 1) {
2740 $::CONN->send ("examine $item->{tag}");
2741 } elsif ($ev->{button} == 2) {
2742 $::CONN->send ("apply $item->{tag}");
2743 } elsif ($ev->{button} == 3) {
2744 my @menu_items = (
2745 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2746 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2747 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2748 (
2749 $item->{flags} & Crossfire::Protocol::F_LOCKED
2750 ? (
2751 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2752 )
2753 : (
2754 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2755 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2756 )
2757 ),
2758 );
2759
2760 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2761 }
2762
2763 1
2764 },
2765 %args
2766 );
2767
2768
2769 $self->add (new CFClient::UI::Face
2770 can_events => 0,
2771 face => $item->{face},
2772 anim => $item->{anim},
2773 animspeed => $item->{animspeed},
2774 );
2775
2776 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2777
2778 $self->{item} = $item;
2779
2780 $self->update_item;
2781
2782 $self
2783}
2784
2785sub update_item {
2786 my ($self) = @_;
2787
2788 my $desc = _item_to_desc ($self->{item});
2789
2790 $self->{name_lbl}->set_text ($desc);
2791}
2792
2793#############################################################################
2794
2795package CFClient::UI::Inventory;
2796
2797our @ISA = CFClient::UI::ScrolledWindow::;
2798
2799sub new {
2800 my $class = shift;
2801
2802 my $self = $class->SUPER::new (
2803 scrolled => (new CFClient::UI::Table),
2804 @_,
2805 );
2806
2807 $self
2808}
2809
2810sub set_items {
2811 my ($self, $items) = @_;
2812
2813 $self->{scrolled}->clear;
2814 return unless $items;
2815
2816 my @items = sort {
2817 ($a->{type} <=> $b->{type})
2818 or ($a->{name} cmp $b->{name})
2819 } @$items;
2820
2821 $self->{real_items} = \@items;
2822
2823 for my $item (@items) {
2824 $item->{item} = $item;
2825 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2826 $item->update_item ();
2827 }
2828
2829 my $i = 0;
2830 for (@items) {
2831 $self->{scrolled}->add (0, $i, $_);
2832 my $nrof = $_->{item}->{nrof} || 1;
2833 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2834 }
2835
2836# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2837}
2838
2839sub size_request {
2840 my ($self) = @_;
2841 ($self->{req_w}, $self->{req_h});
2842}
2843 3042
2844############################################################################# 3043#############################################################################
2845 3044
2846package CFClient::UI::Menu; 3045package CFClient::UI::Menu;
2847 3046
… …
2859 ); 3058 );
2860 3059
2861 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3060 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2862 3061
2863 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
2864 my ($widget, $cb) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
2865 3064
2866 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
2867 if (!ref $widget) { 3066 if (!ref $widget) {
3067 if ($widget =~ /\t/) {
3068 my ($left, $right) = split /\t/, $widget, 2;
3069
3070 $widget = new CFClient::UI::HBox
3071 can_hover => 1,
3072 can_events => 1,
3073 tooltip => $tooltip,
3074 children => [
3075 (new CFClient::UI::Label markup => $left, expand => 1),
3076 (new CFClient::UI::Label markup => $right, align => +1),
3077 ],
3078 ;
3079
3080 } else {
2868 $widget = new CFClient::UI::Label 3081 $widget = new CFClient::UI::Label
2869 can_hover => 1, 3082 can_hover => 1,
2870 can_events => 1, 3083 can_events => 1,
2871 text => $widget; 3084 markup => $widget,
3085 tooltip => $tooltip;
3086 }
2872 } 3087 }
2873 3088
2874 $self->{item}{$widget} = $item; 3089 $self->{item}{$widget} = $item;
2875 3090
2876 $self->{vbox}->add ($widget); 3091 $self->{vbox}->add ($widget);
… …
2888 # maybe save $GRAB? must be careful about events... 3103 # maybe save $GRAB? must be careful about events...
2889 $GRAB = $self; 3104 $GRAB = $self;
2890 $self->{button} = $ev->{button}; 3105 $self->{button} = $ev->{button};
2891 3106
2892 $self->show; 3107 $self->show;
2893 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3108 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2894} 3109}
2895 3110
2896sub mouse_motion { 3111sub invoke_mouse_motion {
2897 my ($self, $ev, $x, $y) = @_; 3112 my ($self, $ev, $x, $y) = @_;
2898 3113
2899 # TODO: should use vbox->find_widget or so 3114 # TODO: should use vbox->find_widget or so
2900 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3115 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2901 $self->{hover} = $self->{item}{$HOVER}; 3116 $self->{hover} = $self->{item}{$HOVER};
2902}
2903 3117
3118 0
3119}
3120
2904sub button_up { 3121sub invoke_button_up {
2905 my ($self, $ev, $x, $y) = @_; 3122 my ($self, $ev, $x, $y) = @_;
2906 3123
2907 if ($ev->{button} == $self->{button}) { 3124 if ($ev->{button} == $self->{button}) {
2908 undef $GRAB; 3125 undef $GRAB;
2909 $self->hide; 3126 $self->hide;
2910 3127
2911 $self->emit ("popdown"); 3128 $self->emit ("popdown");
2912 $self->{hover}[1]->() if $self->{hover}; 3129 $self->{hover}[1]->() if $self->{hover};
3130 } else {
3131 return 0
3132 }
3133
2913 } 3134 1
2914} 3135}
2915 3136
2916############################################################################# 3137#############################################################################
2917 3138
2918package CFClient::UI::Statusbox; 3139package CFClient::UI::Multiplexer;
2919 3140
2920our @ISA = CFClient::UI::VBox::; 3141our @ISA = CFClient::UI::Container::;
2921 3142
2922sub new { 3143sub new {
2923 my $class = shift; 3144 my $class = shift;
2924 3145
2925 $class->SUPER::new ( 3146 my $self = $class->SUPER::new (
3147 @_,
3148 );
3149
3150 $self->{current} = $self->{children}[0]
3151 if @{ $self->{children} };
3152
3153 $self
3154}
3155
3156sub add {
3157 my ($self, @widgets) = @_;
3158
3159 $self->SUPER::add (@widgets);
3160
3161 $self->{current} = $self->{children}[0]
3162 if @{ $self->{children} };
3163}
3164
3165sub get_current_page {
3166 my ($self) = @_;
3167
3168 $self->{current}
3169}
3170
3171sub set_current_page {
3172 my ($self, $page_or_widget) = @_;
3173
3174 my $widget = ref $page_or_widget
3175 ? $page_or_widget
3176 : $self->{children}[$page_or_widget];
3177
3178 $self->{current} = $widget;
3179 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3180
3181 $self->emit (page_changed => $self->{current});
3182
3183 $self->realloc;
3184}
3185
3186sub visible_children {
3187 $_[0]{current}
3188}
3189
3190sub size_request {
3191 my ($self) = @_;
3192
3193 $self->{current}->size_request
3194}
3195
3196sub invoke_size_allocate {
3197 my ($self, $w, $h) = @_;
3198
3199 $self->{current}->configure (0, 0, $w, $h);
3200
3201 1
3202}
3203
3204sub _draw {
3205 my ($self) = @_;
3206
3207 $self->{current}->draw;
3208}
3209
3210#############################################################################
3211
3212package CFClient::UI::Notebook;
3213
3214our @ISA = CFClient::UI::VBox::;
3215
3216sub new {
3217 my $class = shift;
3218
3219 my $self = $class->SUPER::new (
3220 buttonbar => (new CFClient::UI::Buttonbar),
3221 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3222 # filter => # will be put between multiplexer and $self
3223 @_,
3224 );
3225
3226 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3227 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3228
3229 $self
3230}
3231
3232sub add {
3233 my ($self, $title, $widget, $tooltip) = @_;
3234
3235 Scalar::Util::weaken $self;
3236
3237 $self->{buttonbar}->add (new CFClient::UI::Button
3238 markup => $title,
3239 tooltip => $tooltip,
3240 on_activate => sub { $self->set_current_page ($widget) },
3241 );
3242
3243 $self->{multiplexer}->add ($widget);
3244}
3245
3246sub get_current_page {
3247 my ($self) = @_;
3248
3249 $self->{multiplexer}->get_current_page
3250}
3251
3252sub set_current_page {
3253 my ($self, $page) = @_;
3254
3255 $self->{multiplexer}->set_current_page ($page);
3256 $self->emit (page_changed => $self->{multiplexer}{current});
3257}
3258
3259#############################################################################
3260
3261package CFClient::UI::Combobox;
3262
3263use utf8;
3264
3265our @ISA = CFClient::UI::Button::;
3266
3267sub new {
3268 my $class = shift;
3269
3270 my $self = $class->SUPER::new (
3271 options => [], # [value, title, longdesc], ...
3272 value => undef,
3273 @_,
3274 );
3275
3276 $self->_set_value ($self->{value});
3277
3278 $self
3279}
3280
3281sub invoke_button_down {
3282 my ($self, $ev) = @_;
3283
3284 my @menu_items;
3285
3286 for (@{ $self->{options} }) {
3287 my ($value, $title, $tooltip) = @$_;
3288
3289 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3290 }
3291
3292 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3293}
3294
3295sub _set_value {
3296 my ($self, $value) = @_;
3297
3298 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3299 or return;
3300
3301 $self->{value} = $item->[0];
3302 $self->set_markup ("$item->[1] ⇓");
3303 $self->set_tooltip ($item->[2]);
3304}
3305
3306sub set_value {
3307 my ($self, $value) = @_;
3308
3309 return unless $self->{value} ne $value;
3310
3311 $self->_set_value ($value);
3312 $self->emit (changed => $value);
3313}
3314
3315#############################################################################
3316
3317package CFClient::UI::Statusbox;
3318
3319our @ISA = CFClient::UI::VBox::;
3320
3321sub new {
3322 my $class = shift;
3323
3324 my $self = $class->SUPER::new (
2926 fontsize => 0.8, 3325 fontsize => 0.8,
2927 @_, 3326 @_,
2928 ) 3327 );
3328
3329 Scalar::Util::weaken (my $this = $self);
3330
3331 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3332
3333 $self
2929} 3334}
2930 3335
2931sub reorder { 3336sub reorder {
2932 my ($self) = @_; 3337 my ($self) = @_;
2933 my $NOW = time; 3338 my $NOW = Time::HiRes::time;
3339
3340 # freeze display when hovering over any label
3341 return if $CFClient::UI::TOOLTIP->{owner}
3342 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3343 values %{ $self->{item} };
2934 3344
2935 while (my ($k, $v) = each %{ $self->{item} }) { 3345 while (my ($k, $v) = each %{ $self->{item} }) {
2936 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3346 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2937 } 3347 }
2938 3348
… …
2941 my @items = sort { 3351 my @items = sort {
2942 $a->{pri} <=> $b->{pri} 3352 $a->{pri} <=> $b->{pri}
2943 or $b->{id} <=> $a->{id} 3353 or $b->{id} <=> $a->{id}
2944 } values %{ $self->{item} }; 3354 } values %{ $self->{item} };
2945 3355
3356 $self->{timer}->interval (1);
3357
2946 my $count = 10 + 1; 3358 my $count = 10 + 1;
2947 for my $item (@items) { 3359 for my $item (@items) {
2948 last unless --$count; 3360 last unless --$count;
2949 3361
2950 push @widgets, $item->{label} ||= do { 3362 my $label = $item->{label} ||= do {
2951 # TODO: doesn't handle markup well (read as: at all) 3363 # TODO: doesn't handle markup well (read as: at all)
2952 my $short = $item->{count} > 1 3364 my $short = $item->{count} > 1
2953 ? "<b>$item->{count} ×</b> $item->{text}" 3365 ? "<b>$item->{count} ×</b> $item->{text}"
2954 : $item->{text}; 3366 : $item->{text};
2955 3367
… …
2963 tooltip => $item->{tooltip}, 3375 tooltip => $item->{tooltip},
2964 tooltip_font => $::FONT_PROP, 3376 tooltip_font => $::FONT_PROP,
2965 tooltip_width => 0.67, 3377 tooltip_width => 0.67,
2966 fontsize => $item->{fontsize} || $self->{fontsize}, 3378 fontsize => $item->{fontsize} || $self->{fontsize},
2967 max_w => $::WIDTH * 0.44, 3379 max_w => $::WIDTH * 0.44,
2968 fg => $item->{fg}, 3380 fg => [@{ $item->{fg} }],
2969 can_events => 1, 3381 can_events => 1,
2970 can_hover => 1 3382 can_hover => 1
2971 }; 3383 };
3384
3385 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3386 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3387 $label->update;
3388 $label->set_max_size (undef, $label->{req_h} * $diff)
3389 if $diff < 1;
3390 $self->{timer}->interval (1/30);
3391 } else {
3392 $label->{fg}[3] = $item->{fg}[3] || 1;
3393 }
3394
3395 push @widgets, $label;
2972 } 3396 }
2973 3397
2974 $self->clear; 3398 $self->clear;
2975 $self->SUPER::add (reverse @widgets); 3399 $self->SUPER::add (reverse @widgets);
2976} 3400}
… …
2979 my ($self, $text, %arg) = @_; 3403 my ($self, $text, %arg) = @_;
2980 3404
2981 $text =~ s/^\s+//; 3405 $text =~ s/^\s+//;
2982 $text =~ s/\s+$//; 3406 $text =~ s/\s+$//;
2983 3407
3408 return unless $text;
3409
2984 my $timeout = time + ((delete $arg{timeout}) || 60); 3410 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2985 3411
2986 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3412 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987 3413
2988 if (my $item = $self->{item}{$group}) { 3414 if (my $item = $self->{item}{$group}) {
2989 if ($item->{text} eq $text) { 3415 if ($item->{text} eq $text) {
2990 $item->{count}++; 3416 $item->{count}++;
2991 } else { 3417 } else {
2992 $item->{count} = 1; 3418 $item->{count} = 1;
2993 $item->{text} = $item->{tooltip} = $text; 3419 $item->{text} = $item->{tooltip} = $text;
2994 } 3420 }
2995 $item->{id} = ++$self->{id}; 3421 $item->{id} += 0.2;#d#
2996 $item->{timeout} = $timeout; 3422 $item->{timeout} = $timeout;
2997 delete $item->{label}; 3423 delete $item->{label};
2998 } else { 3424 } else {
2999 $self->{item}{$group} = { 3425 $self->{item}{$group} = {
3000 id => ++$self->{id}, 3426 id => ++$self->{id},
… …
3006 count => 1, 3432 count => 1,
3007 %arg, 3433 %arg,
3008 }; 3434 };
3009 } 3435 }
3010 3436
3437 $ROOT->on_refresh (reorder => sub {
3011 $self->reorder; 3438 $self->reorder;
3439 });
3012} 3440}
3013 3441
3014sub reconfigure { 3442sub reconfigure {
3015 my ($self) = @_; 3443 my ($self) = @_;
3016 3444
… …
3019 3447
3020 $self->reorder; 3448 $self->reorder;
3021 $self->SUPER::reconfigure; 3449 $self->SUPER::reconfigure;
3022} 3450}
3023 3451
3452sub destroy {
3453 my ($self) = @_;
3454
3455 $self->{timer}->cancel;
3456
3457 $self->SUPER::destroy;
3458}
3459
3024############################################################################# 3460#############################################################################
3025 3461
3026package CFClient::UI::Root; 3462package CFClient::UI::Inventory;
3027 3463
3028our @ISA = CFClient::UI::Container::; 3464our @ISA = CFClient::UI::Table::;
3029
3030use CFClient::OpenGL;
3031 3465
3032sub new { 3466sub new {
3033 my $class = shift; 3467 my $class = shift;
3034 3468
3035 $class->SUPER::new ( 3469 my $self = $class->SUPER::new (
3470 col_expand => [0, 1, 0],
3471 @_,
3472 );
3473
3474 $self
3475}
3476
3477sub set_items {
3478 my ($self, $items) = @_;
3479
3480 $self->clear;
3481 return unless $items;
3482
3483 my @items = sort {
3484 ($a->{type} <=> $b->{type})
3485 or ($a->{name} cmp $b->{name})
3486 } values %$items;
3487
3488 $self->{real_items} = \@items;
3489
3490 my $row = 0;
3491 for my $item (@items) {
3492 CFClient::Item::update_widgets $item;
3493
3494 $self->add (0, $row, $item->{face_widget});
3495 $self->add (1, $row, $item->{desc_widget});
3496 $self->add (2, $row, $item->{weight_widget});
3497
3498 $row++;
3499 }
3500}
3501
3502#############################################################################
3503
3504package CFClient::UI::SpellList;
3505
3506our @ISA = CFClient::UI::Table::;
3507
3508sub new {
3509 my $class = shift;
3510
3511 my $self = $class->SUPER::new (
3512 binding => [],
3513 commands => [],
3036 @_, 3514 @_,
3037 ) 3515 )
3038} 3516}
3039 3517
3040sub configure { 3518my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3041 my ($self, $x, $y, $w, $h) = @_;
3042 3519
3043 $self->{w} = $w; 3520my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3044 $self->{h} = $h; 3521 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3045} 3522my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3523 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3524my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3525 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3526my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3527 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3528my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3529 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3046 3530
3047sub check_size { 3531sub rebuild_spell_list {
3532 my ($self) = @_;
3533
3534 $CFClient::UI::ROOT->on_refresh ($self => sub {
3535 $self->clear;
3536
3537 return unless $::CONN;
3538
3539 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3540 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3541 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3542 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3543 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3544
3545 my $row = 0;
3546
3547 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3548 my $spell = $self->{spell}{$_};
3549
3550 $row++;
3551
3552 my $spell_cb = sub {
3553 my ($widget, $ev) = @_;
3554
3555 if ($ev->{button} == 1) {
3556 $::CONN->user_send ("cast $spell->{name}");
3557 } elsif ($ev->{button} == 2) {
3558 $::CONN->user_send ("invoke $spell->{name}");
3559 } elsif ($ev->{button} == 3) {
3560 (new CFClient::UI::Menu
3561 items => [
3562 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3563 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3564 ],
3565 )->popup ($ev);
3566 } else {
3567 return 0;
3568 }
3569
3570 1
3571 };
3572
3573 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3574
3575 #TODO: add path info to tooltip
3576 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3577
3578 $self->add (0, $row, new CFClient::UI::Face
3579 face => $spell->{face},
3580 can_hover => 1,
3581 can_events => 1,
3582 tooltip => $tooltip,
3583 on_button_down => $spell_cb,
3584 );
3585
3586 $self->add (1, $row, new CFClient::UI::Label
3587 expand => 1,
3588 text => $spell->{name},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3596 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3597 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3598 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3599 }
3600 });
3601}
3602
3603sub add_spell {
3048 my ($self) = @_; 3604 my ($self, $spell) = @_;
3049 3605
3050 $self->size_allocate ($self->{w}, $self->{h}) 3606 $self->{spell}->{$spell->{name}} = $spell;
3051 if $self->{w}; 3607 $self->rebuild_spell_list;
3608}
3609
3610sub remove_spell {
3611 my ($self, $spell) = @_;
3612
3613 delete $self->{spell}->{$spell->{name}};
3614 $self->rebuild_spell_list;
3615}
3616
3617sub clear_spells {
3618 my ($self) = @_;
3619
3620 $self->{spell} = {};
3621 $self->rebuild_spell_list;
3622}
3623
3624#############################################################################
3625
3626package CFClient::UI::Root;
3627
3628our @ISA = CFClient::UI::Container::;
3629
3630use List::Util qw(min max);
3631
3632use CFClient::OpenGL;
3633
3634sub new {
3635 my $class = shift;
3636
3637 my $self = $class->SUPER::new (
3638 visible => 1,
3639 @_,
3640 );
3641
3642 Scalar::Util::weaken ($self->{root} = $self);
3643
3644 $self
3052} 3645}
3053 3646
3054sub size_request { 3647sub size_request {
3055 my ($self) = @_; 3648 my ($self) = @_;
3056 3649
3057 ($self->{w}, $self->{h}) 3650 ($self->{w}, $self->{h})
3058} 3651}
3059 3652
3653sub _to_pixel {
3654 my ($coord, $size, $max) = @_;
3655
3656 $coord =
3657 $coord eq "center" ? ($max - $size) * 0.5
3658 : $coord eq "max" ? $max
3659 : $coord;
3660
3661 $coord = 0 if $coord < 0;
3662 $coord = $max - $size if $coord > $max - $size;
3663
3664 int $coord + 0.5
3665}
3666
3060sub size_allocate { 3667sub invoke_size_allocate {
3061 my ($self, $w, $h) = @_; 3668 my ($self, $w, $h) = @_;
3062 3669
3063 for my $child ($self->children) { 3670 for my $child ($self->children) {
3064 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3671 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3065 3672
3066 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3673 $X = $child->{force_x} if exists $child->{force_x};
3067 if exists $child->{req_x}; 3674 $Y = $child->{force_y} if exists $child->{force_y};
3068 3675
3069 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3676 $X = _to_pixel $X, $W, $self->{w};
3070 if exists $child->{req_y}; 3677 $Y = _to_pixel $Y, $H, $self->{h};
3071
3072 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3073 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3074 3678
3075 $child->configure ($X, $Y, $W, $H); 3679 $child->configure ($X, $Y, $W, $H);
3076 } 3680 }
3681
3682 1
3077} 3683}
3078 3684
3079sub coord2local { 3685sub coord2local {
3080 my ($self, $x, $y) = @_; 3686 my ($self, $x, $y) = @_;
3081 3687
… …
3089} 3695}
3090 3696
3091sub update { 3697sub update {
3092 my ($self) = @_; 3698 my ($self) = @_;
3093 3699
3094 $self->check_size;
3095 $::WANT_REFRESH++; 3700 $::WANT_REFRESH++;
3096} 3701}
3097 3702
3098sub add { 3703sub add {
3099 my ($self, @children) = @_; 3704 my ($self, @children) = @_;
3100 3705
3101 for (my @widgets = @children; my $w = pop @widgets; ) {
3102 push @widgets, $w->children;
3103 $w->{root} = $self;
3104 $w->{visible} = 1;
3105 }
3106
3107 for my $child (@children) {
3108 $child->{is_toplevel} = 1; 3706 $_->{is_toplevel} = 1
3109 3707 for @children;
3110 # integerise window positions
3111 $child->{x} = int $child->{x};
3112 $child->{y} = int $child->{y};
3113 }
3114 3708
3115 $self->SUPER::add (@children); 3709 $self->SUPER::add (@children);
3116} 3710}
3117 3711
3118sub remove { 3712sub remove {
3119 my ($self, @children) = @_; 3713 my ($self, @children) = @_;
3120 3714
3121 $self->SUPER::remove (@children); 3715 $self->SUPER::remove (@children);
3716
3717 delete $self->{is_toplevel}
3718 for @children;
3122 3719
3123 while (@children) { 3720 while (@children) {
3124 my $w = pop @children; 3721 my $w = pop @children;
3125 push @children, $w->children; 3722 push @children, $w->children;
3126 delete $w->{visible}; 3723 $w->set_invisible;
3127 } 3724 }
3128} 3725}
3129 3726
3130sub on_refresh { 3727sub on_refresh {
3131 my ($self, $id, $cb) = @_; 3728 my ($self, $id, $cb) = @_;
… …
3145 while ($self->{refresh_hook}) { 3742 while ($self->{refresh_hook}) {
3146 $_->() 3743 $_->()
3147 for values %{delete $self->{refresh_hook}}; 3744 for values %{delete $self->{refresh_hook}};
3148 } 3745 }
3149 3746
3150 if ($self->{check_size}) { 3747 if ($self->{realloc}) {
3151 my @queue = ([], []); 3748 my %queue;
3749 my @queue;
3750 my $widget;
3152 3751
3153 for (;;) { 3752 outer:
3154 if ($self->{check_size}) { 3753 while () {
3155 # heuristic: check containers last 3754 if (my $realloc = delete $self->{realloc}) {
3156 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3755 for $widget (values %$realloc) {
3157 for values %{delete $self->{check_size}} 3756 $widget->{visible} or next; # do not resize invisible widgets
3757
3758 $queue{$widget+0}++ and next; # duplicates are common
3759
3760 push @{ $queue[$widget->{visible}] }, $widget;
3761 }
3158 } 3762 }
3159 3763
3160 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3764 while () {
3765 @queue or last outer;
3161 3766
3162 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3767 $widget = pop @{ $queue[-1] || [] }
3163 ? @$widget{qw(user_w user_h)} 3768 and last;
3164 : $widget->size_request;
3165
3166 if (delete $widget->{force_alloc}
3167 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3168 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3169 3769
3770 pop @queue;
3771 }
3772
3773 delete $queue{$widget+0};
3774
3775 my ($w, $h) = $widget->size_request;
3776
3777 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3778 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3779
3780 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3781 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3782
3783 $w = $widget->{force_w} if exists $widget->{force_w};
3784 $h = $widget->{force_h} if exists $widget->{force_h};
3785
3786 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3787 || delete $widget->{force_realloc}) {
3170 $widget->{req_w} = $w; 3788 $widget->{req_w} = $w;
3171 $widget->{req_h} = $h; 3789 $widget->{req_h} = $h;
3172 3790
3173 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3791 $self->{size_alloc}{$widget+0} = $widget;
3174 3792
3175 $widget->{parent}->check_size
3176 if $widget->{parent}; 3793 if (my $parent = $widget->{parent}) {
3794 $self->{realloc}{$parent+0} = $parent
3795 unless $queue{$parent+0};
3796
3797 $parent->{force_size_alloc} = 1;
3798 $self->{size_alloc}{$parent+0} = $parent;
3799 }
3177 } 3800 }
3801
3802 delete $self->{realloc}{$widget+0};
3178 } 3803 }
3179 } 3804 }
3180 3805
3181 while ($self->{size_alloc}) { 3806 while (my $size_alloc = delete $self->{size_alloc}) {
3182 for (values %{delete $self->{size_alloc}}) { 3807 my @queue = sort { $b->{visible} <=> $a->{visible} }
3183 my ($widget, $w, $h) = @$_; 3808 values %$size_alloc;
3809
3810 while () {
3811 my $widget = pop @queue || last;
3812
3813 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3184 3814
3185 $w = 0 if $w < 0; 3815 $w = 0 if $w < 0;
3186 $h = 0 if $h < 0; 3816 $h = 0 if $h < 0;
3187 3817
3818 $w = int $w + 0.5;
3819 $h = int $h + 0.5;
3820
3821 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3822 $widget->{old_w} = $widget->{w};
3823 $widget->{old_h} = $widget->{h};
3824
3188 $widget->{w} = $w; 3825 $widget->{w} = $w;
3189 $widget->{h} = $h; 3826 $widget->{h} = $h;
3190 $widget->size_allocate ($w, $h); 3827
3191 $widget->emit (size_allocate => $w, $h); 3828 $widget->emit (size_allocate => $w, $h);
3829 }
3192 } 3830 }
3193 } 3831 }
3194 3832
3195 while ($self->{post_alloc_hook}) { 3833 while ($self->{post_alloc_hook}) {
3196 $_->() 3834 $_->()
3197 for values %{delete $self->{post_alloc_hook}}; 3835 for values %{delete $self->{post_alloc_hook}};
3198 } 3836 }
3837
3199 3838
3200 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3839 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3840 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202 glClear GL_COLOR_BUFFER_BIT; 3841 glClear GL_COLOR_BUFFER_BIT;
3203 3842
… …
3205 glLoadIdentity; 3844 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3845 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 3846 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 3847 glLoadIdentity;
3209 3848
3849 {
3850 package CFClient::UI::Base;
3851
3852 ($draw_x, $draw_y, $draw_w, $draw_h) =
3853 (0, 0, $self->{w}, $self->{h});
3854 }
3855
3210 $self->_draw; 3856 $self->_draw;
3211} 3857}
3212 3858
3213############################################################################# 3859#############################################################################
3214 3860

Diff Legend

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