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.312 by root, Fri Jun 23 23:54:30 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 my $focus = $FOCUS; $FOCUS = $self;
347 429
348 $self->emit (focus_in => $focus);
349
350 $focus->update if $focus; 430 $focus->update if $focus;
351 $FOCUS->update; 431 $FOCUS->update;
352}
353 432
433 0
434}
435
354sub focus_out { 436sub invoke_focus_out {
355 my ($self) = @_; 437 my ($self) = @_;
356 438
357 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
358 440
359 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
360 442
361 $self->emit (focus_out => $focus);
362
363 $focus->update if $focus; #? 443 $focus->update if $focus; #?
364}
365 444
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
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
843sub size_allocate { 991sub add {
844 my ($self, $w, $h) = @_; 992 my ($self, $widget) = @_;
845 993
846 $self->SUPER::size_allocate ($w, $h); 994 $self->{vp}->add ($self->{child} = $widget);
995}
847 996
997sub update {
998 my ($self) = @_;
999
1000 $self->SUPER::update;
1001
1002 # todo: overwrite size_allocate of child
848 my $child = $self->{vp}->child; 1003 my $child = $self->{vp}->child;
849 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005}
1006
1007sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_;
1009
1010 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h)
850} 1014}
851 1015
852#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
853# update viewport offset on scroll 1017# update viewport offset on scroll
854 1018
… …
874 1038
875 if ($self->{bg}) { 1039 if ($self->{bg}) {
876 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
877 1041
878 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
879 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
880 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
881 1045
882 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
883 glVertex 0 , 0; 1047 glVertex 0 , 0;
884 glVertex 0 , $h; 1048 glVertex 0 , $h;
885 glVertex $w, $h; 1049 glVertex $w, $h;
… …
898 1062
899our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
900 1064
901use CFClient::OpenGL; 1065use CFClient::OpenGL;
902 1066
903my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
904 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 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); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
906 1074
907sub new { 1075sub new {
908 my $class = shift; 1076 my ($class, %arg) = @_;
909
910 # TODO: user_x, user_y, overwrite moveto?
911 1077
912 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
913 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
914 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
915 border => 0.6, 1081 border => 0.6,
916 is_toplevel => 1,
917 can_events => 1, 1082 can_events => 1,
918 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
919 ); 1086 );
920 1087
921 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
922 align => 0, 1089 align => 0,
923 valign => 1, 1090 valign => 1,
924 text => $self->{title}, 1091 text => $self->{title},
925 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1094
1095 if ($self->{has_close_button}) {
1096 $self->{close_button} =
1097 new CFClient::UI::ImageButton
1098 path => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_button});
1102 }
926 1103
927 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
928} 1113}
929 1114
930sub border { 1115sub border {
931 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
932} 1117}
933 1118
934sub size_request { 1119sub size_request {
935 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_button}->size_request
1126 if $self->{close_button};
936 1127
937 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
938 1129
939 ( 1130 (
940 $w + $self->border * 2, 1131 $w + $self->border * 2,
941 $h + $self->border * 2, 1132 $h + $self->border * 2,
942 ) 1133 )
943} 1134}
944 1135
945sub size_allocate { 1136sub invoke_size_allocate {
946 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
947 1138
1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 }
1144
1145 my $border = $self->border;
1146
948 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
949 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
950 1149
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); 1150 $self->child->configure ($border, $border, $w, $h);
955}
956 1151
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button};
1154
1155 1
1156}
1157
957sub button_down { 1158sub invoke_button_down {
958 my ($self, $ev, $x, $y) = @_; 1159 my ($self, $ev, $x, $y) = @_;
959 1160
960 my ($w, $h) = @$self{qw(w h)}; 1161 my ($w, $h) = @$self{qw(w h)};
961 my $border = $self->border; 1162 my $border = $self->border;
962 1163
… …
975 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
976 1177
977 my $dx = $ev->{x} - $ox; 1178 my $dx = $ev->{x} - $ox;
978 my $dy = $ev->{y} - $oy; 1179 my $dy = $ev->{y} - $oy;
979 1180
980 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1181 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
981 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1182 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1183
982 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1184 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
983 $self->check_size; 1185 $self->realloc;
984 }; 1186 };
985 1187
986 } elsif ($lr ^ $td) { 1188 } elsif ($lr ^ $td) {
987 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1189 my ($ox, $oy) = ($ev->{x}, $ev->{y});
988 my ($bx, $by) = ($self->{x}, $self->{y}); 1190 my ($bx, $by) = ($self->{x}, $self->{y});
… …
990 $self->{motion} = sub { 1192 $self->{motion} = sub {
991 my ($ev, $x, $y) = @_; 1193 my ($ev, $x, $y) = @_;
992 1194
993 ($x, $y) = ($ev->{x}, $ev->{y}); 1195 ($x, $y) = ($ev->{x}, $ev->{y});
994 1196
995 $self->move ($bx + $x - $ox, $by + $y - $oy); 1197 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
996 $self->update; 1198 # HACK: the next line is required to enforce placement
1199 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
997 }; 1200 };
1201 } else {
1202 return 0;
1203 }
1204
998 } 1205 1
999} 1206}
1000 1207
1001sub button_up { 1208sub invoke_button_up {
1002 my ($self, $ev, $x, $y) = @_; 1209 my ($self, $ev, $x, $y) = @_;
1003 1210
1004 delete $self->{motion}; 1211 ! ! delete $self->{motion}
1005} 1212}
1006 1213
1007sub mouse_motion { 1214sub invoke_mouse_motion {
1008 my ($self, $ev, $x, $y) = @_; 1215 my ($self, $ev, $x, $y) = @_;
1009 1216
1010 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1217 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218
1219 ! ! $self->{motion}
1011} 1220}
1012 1221
1013sub _draw { 1222sub _draw {
1014 my ($self) = @_; 1223 my ($self) = @_;
1015 1224
1225 my $child = $self->{children}[0];
1226
1016 my ($w, $h ) = ($self->{w}, $self->{h}); 1227 my ($w, $h ) = ($self->{w}, $self->{h});
1017 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1228 my ($cw, $ch) = ($child->{w}, $child->{h});
1018 1229
1019 glEnable GL_TEXTURE_2D; 1230 glEnable GL_TEXTURE_2D;
1020 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1231 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1021 1232
1022 my $border = $self->border; 1233 my $border = $self->border;
1023 1234
1024 glColor @{ $self->{border_bg} }; 1235 glColor @{ $self->{border_bg} };
1025 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1236 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1026 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1237 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1027 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1238 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1028 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1239 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1029 1240
1030 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1241 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1031 my $bg = $tex[0]; 1242 glColor @{ $self->{bg} };
1032 1243
1033 # TODO: repeat texture not scale 1244 # TODO: repeat texture not scale
1245 # solve this better(?)
1034 my $rep_x = $cw / $bg->{w}; 1246 $bg->{s} = $cw / $bg->{w};
1035 my $rep_y = $ch / $bg->{h}; 1247 $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); 1248 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1043 } 1249 }
1044 1250
1045 glDisable GL_TEXTURE_2D; 1251 glDisable GL_TEXTURE_2D;
1046 1252
1047 $self->{title}->draw if $self->{title};
1048
1049 $self->child->draw; 1253 $child->draw;
1254
1255 if ($self->{title_widget}) {
1256 glTranslate 0, $border - $self->{h};
1257 $self->{title_widget}->_draw;
1258
1259 glTranslate 0, - ($border - $self->{h});
1260 }
1261
1262 $self->{close_button}->draw
1263 if $self->{close_button};
1050} 1264}
1051 1265
1052############################################################################# 1266#############################################################################
1053 1267
1054package CFClient::UI::Table; 1268package CFClient::UI::Table;
… …
1062sub new { 1276sub new {
1063 my $class = shift; 1277 my $class = shift;
1064 1278
1065 $class->SUPER::new ( 1279 $class->SUPER::new (
1066 col_expand => [], 1280 col_expand => [],
1067 @_ 1281 @_,
1068 ) 1282 )
1283}
1284
1285sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1069} 1287}
1070 1288
1071sub add { 1289sub add {
1072 my ($self, $x, $y, $child) = @_; 1290 my ($self, $x, $y, $child) = @_;
1073 1291
1074 $child->set_parent ($self); 1292 $child->set_parent ($self);
1075 $self->{children}[$y][$x] = $child; 1293 $self->{children}[$y][$x] = $child;
1076 1294
1077 $child->check_size; 1295 $self->realloc;
1078} 1296}
1079 1297
1080sub children { 1298sub remove {
1081 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1299 my ($self, $child) = @_;
1082}
1083 1300
1301 # TODO: not yet implemented
1302}
1303
1084# TODO: move to container class maybe? send childs a signal on removal? 1304# TODO: move to container class maybe? send children a signal on removal?
1085sub clear { 1305sub clear {
1086 my ($self) = @_; 1306 my ($self) = @_;
1087 1307
1088 my @children = $self->children; 1308 my @children = $self->children;
1089 delete $self->{children}; 1309 delete $self->{children};
… …
1091 for (@children) { 1311 for (@children) {
1092 delete $_->{parent}; 1312 delete $_->{parent};
1093 $_->hide; 1313 $_->hide;
1094 } 1314 }
1095 1315
1096 $self->update; 1316 $self->realloc;
1097} 1317}
1098 1318
1099sub get_wh { 1319sub get_wh {
1100 my ($self) = @_; 1320 my ($self) = @_;
1101 1321
… …
1127 (sum @$ws), 1347 (sum @$ws),
1128 (sum @$hs), 1348 (sum @$hs),
1129 ) 1349 )
1130} 1350}
1131 1351
1132sub size_allocate { 1352sub invoke_size_allocate {
1133 my ($self, $w, $h) = @_; 1353 my ($self, $w, $h) = @_;
1134 1354
1135 my ($ws, $hs) = $self->get_wh; 1355 my ($ws, $hs) = $self->get_wh;
1136 1356
1137 my $req_w = sum @$ws; 1357 my $req_w = (sum @$ws) || 1;
1138 my $req_h = sum @$hs; 1358 my $req_h = (sum @$hs) || 1;
1139 1359
1140 # TODO: nicer code && do row_expand 1360 # TODO: nicer code && do row_expand
1141 my @col_expand = @{$self->{col_expand}}; 1361 my @col_expand = @{$self->{col_expand}};
1142 @col_expand = (1) x @$ws unless @col_expand; 1362 @col_expand = (1) x @$ws unless @col_expand;
1143 my $col_expand = (sum @col_expand) || 1; 1363 my $col_expand = (sum @col_expand) || 1;
… …
1169 } 1389 }
1170 1390
1171 $y += $row_h; 1391 $y += $row_h;
1172 } 1392 }
1173 1393
1394 1
1174} 1395}
1175 1396
1176sub find_widget { 1397sub find_widget {
1177 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1178 1399
… …
1197 } 1418 }
1198} 1419}
1199 1420
1200############################################################################# 1421#############################################################################
1201 1422
1423package CFClient::UI::Box;
1424
1425our @ISA = CFClient::UI::Container::;
1426
1427sub size_request {
1428 my ($self) = @_;
1429
1430 $self->{vertical}
1431 ? (
1432 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1434 )
1435 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 )
1439}
1440
1441sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_;
1443
1444 my $space = $self->{vertical} ? $h : $w;
1445 my @children = $self->visible_children;
1446
1447 my @req;
1448
1449 if ($self->{homogeneous}) {
1450 @req = ($space / (@children || 1)) x @children;
1451 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453 my $req = List::Util::sum @req;
1454
1455 if ($req > $space) {
1456 # ah well, not enough space
1457 $_ *= $space / $req for @req;
1458 } else {
1459 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460
1461 $space = ($space - $req) / $expand; # remaining space to give away
1462
1463 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#children;
1465 }
1466 }
1467
1468 CFClient::UI::harmonize \@req;
1469
1470 my $pos = 0;
1471 for (0 .. $#children) {
1472 my $alloc = $req[$_];
1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1474
1475 $pos += $alloc;
1476 }
1477
1478 1
1479}
1480
1481#############################################################################
1482
1202package CFClient::UI::HBox; 1483package CFClient::UI::HBox;
1203 1484
1204# TODO: wrap into common Box base class
1205
1206our @ISA = CFClient::UI::Container::; 1485our @ISA = CFClient::UI::Box::;
1207 1486
1208sub size_request { 1487sub new {
1209 my ($self) = @_; 1488 my $class = shift;
1210 1489
1211 my @alloc = map [$_->size_request], @{$self->{children}}; 1490 $class->SUPER::new (
1212 1491 vertical => 0,
1213 ( 1492 @_,
1214 (List::Util::sum map $_->[0], @alloc),
1215 (List::Util::max map $_->[1], @alloc),
1216 ) 1493 )
1217} 1494}
1218 1495
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############################################################################# 1496#############################################################################
1261 1497
1262package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1263 1499
1264# TODO: wrap into common Box base class
1265
1266our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1267 1501
1268sub size_request { 1502sub new {
1269 my ($self) = @_; 1503 my $class = shift;
1270 1504
1271 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1272 1506 vertical => 1,
1273 ( 1507 @_,
1274 (List::Util::max map $_->[0], @alloc),
1275 (List::Util::sum map $_->[1], @alloc),
1276 ) 1508 )
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} 1509}
1317 1510
1318############################################################################# 1511#############################################################################
1319 1512
1320package CFClient::UI::Label; 1513package CFClient::UI::Label;
… …
1337 ellipsise => 3, # end 1530 ellipsise => 3, # end
1338 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1339 fontsize => 1, 1532 fontsize => 1,
1340 align => -1, 1533 align => -1,
1341 valign => -1, 1534 valign => -1,
1342 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1343 can_events => 0, 1537 can_events => 0,
1344 %arg 1538 %arg
1345 ); 1539 );
1346 1540
1347 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1374 1568
1375 delete $self->{texture}; 1569 delete $self->{texture};
1376 $self->SUPER::update; 1570 $self->SUPER::update;
1377} 1571}
1378 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1379sub set_text { 1580sub set_text {
1380 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1381 1582
1382 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1383 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1384 1585
1385 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1386 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1387 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1388 $self->update; 1591 $self->update;
1389 $self->check_size;
1390} 1592}
1391 1593
1392sub set_markup { 1594sub set_markup {
1393 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1394 1596
… …
1398 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1399 1601
1400 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1401 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1402 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1403 $self->update; 1607 $self->update;
1404 $self->check_size;
1405} 1608}
1406 1609
1407sub size_request { 1610sub size_request {
1408 my ($self) = @_; 1611 my ($self) = @_;
1409 1612
1613 $self->{size_req} ||= do {
1410 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1411 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1412 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1413 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1414 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1415 1619
1416 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1417 1621
1418 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1419 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1420 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1421 1625
1422 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1423 1627
1424 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1425 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1426 } 1633 };
1427 1634
1428 ( 1635 @{ $self->{size_req} }
1429 $w + $self->{padding} * 2,
1430 $h + $self->{padding} * 2,
1431 )
1432} 1636}
1433 1637
1638sub baseline_shift {
1639 $_[0]{layout}->descent
1640}
1641
1434sub size_allocate { 1642sub invoke_size_allocate {
1435 my ($self, $w, $h) = @_; 1643 my ($self, $w, $h) = @_;
1436 1644
1645 delete $self->{ox};
1646
1437 delete $self->{texture}; 1647 delete $self->{texture}
1648 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1649
1650 1
1438} 1651}
1439 1652
1440sub set_fontsize { 1653sub set_fontsize {
1441 my ($self, $fontsize) = @_; 1654 my ($self, $fontsize) = @_;
1442 1655
1443 $self->{fontsize} = $fontsize; 1656 $self->{fontsize} = $fontsize;
1444 delete $self->{texture}; 1657 delete $self->{texture};
1445 1658
1446 $self->update; 1659 $self->realloc;
1447 $self->check_size; 1660}
1661
1662sub reconfigure {
1663 my ($self) = @_;
1664
1665 delete $self->{size_req};
1666
1667 $self->SUPER::reconfigure;
1448} 1668}
1449 1669
1450sub _draw { 1670sub _draw {
1451 my ($self) = @_; 1671 my ($self) = @_;
1452 1672
… …
1458 $self->{layout}->set_width ($self->{w}); 1678 $self->{layout}->set_width ($self->{w});
1459 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1679 $self->{layout}->set_ellipsise ($self->{ellipsise});
1460 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1461 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1462 1682
1463 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1683 new_from_layout CFClient::Texture $self->{layout}
1684 };
1464 1685
1686 unless (exists $self->{ox}) {
1465 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1466 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1467 : ($self->{w} - $tex->{w}) * 0.5); 1689 : ($self->{w} - $tex->{w}) * 0.5);
1468 1690
1469 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1470 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1471 : ($self->{h} - $tex->{h}) * 0.5); 1693 : ($self->{h} - $tex->{h}) * 0.5);
1472
1473 $tex
1474 }; 1694 };
1475 1695
1476 glEnable GL_TEXTURE_2D; 1696 glEnable GL_TEXTURE_2D;
1477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1478 1700
1479 if ($tex->{format} == GL_ALPHA) { 1701 if ($tex->{format} == GL_ALPHA) {
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1480 glColor @{$self->{fg}}; 1703 glColor @{$self->{fg}};
1481 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1482 } else { 1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1483 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1484 } 1708 }
1485 1709
1486 glDisable GL_TEXTURE_2D; 1710 glDisable GL_TEXTURE_2D;
1487} 1711}
1488 1712
… …
1505 can_hover => 1, 1729 can_hover => 1,
1506 can_focus => 1, 1730 can_focus => 1,
1507 valign => 0, 1731 valign => 0,
1508 can_events => 1, 1732 can_events => 1,
1509 #text => ... 1733 #text => ...
1734 #hidden => "*",
1510 @_ 1735 @_
1511 ) 1736 )
1512} 1737}
1513 1738
1514sub _set_text { 1739sub _set_text {
… …
1516 1741
1517 delete $self->{cur_h}; 1742 delete $self->{cur_h};
1518 1743
1519 return if $self->{text} eq $text; 1744 return if $self->{text} eq $text;
1520 1745
1521 delete $self->{texture};
1522
1523 $self->{last_activity} = $::NOW; 1746 $self->{last_activity} = $::NOW;
1524 $self->{text} = $text; 1747 $self->{text} = $text;
1525 1748
1526 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1527 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1751 delete $self->{size_req};
1528 1752
1529 $self->emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1754
1755 $self->realloc;
1756 $self->update;
1530} 1757}
1531 1758
1532sub set_text { 1759sub set_text {
1533 my ($self, $text) = @_; 1760 my ($self, $text) = @_;
1534 1761
1535 $self->{cursor} = length $text; 1762 $self->{cursor} = length $text;
1536 $self->_set_text ($text); 1763 $self->_set_text ($text);
1537 $self->update;
1538 $self->check_size;
1539} 1764}
1540 1765
1541sub get_text { 1766sub get_text {
1542 $_[0]{text} 1767 $_[0]{text}
1543} 1768}
… …
1548 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1549 1774
1550 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1551} 1776}
1552 1777
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 { 1778sub invoke_key_down {
1560 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1561 1780
1562 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1563 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1564 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1579 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1580 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1581 $self->emit ('escape'); 1800 $self->emit ('escape');
1582 } elsif ($uni) { 1801 } elsif ($uni) {
1583 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else {
1804 return 0;
1584 } 1805 }
1585 1806
1586 $self->_set_text ($text); 1807 $self->_set_text ($text);
1587 $self->update;
1588 $self->check_size;
1589}
1590 1808
1809 $self->realloc;
1810
1811 1
1812}
1813
1591sub focus_in { 1814sub invoke_focus_in {
1592 my ($self) = @_; 1815 my ($self) = @_;
1593 1816
1594 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1595 1818
1596 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1597} 1820}
1598 1821
1599sub button_down { 1822sub invoke_button_down {
1600 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1601 1824
1602 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1603 1826
1604 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1605 1828
1606 # byte-index to char-index 1829 # byte-index to char-index
1607 my $text = $self->{text}; 1830 my $text = $self->{text};
1608 utf8::encode $text; 1831 utf8::encode $text;
1609 $self->{cursor} = length substr $text, 0, $idx; 1832 $self->{cursor} = length substr $text, 0, $idx;
1610 1833
1611 $self->_set_text ($self->{text}); 1834 $self->_set_text ($self->{text});
1612 $self->update; 1835 $self->update;
1836
1837 1
1613} 1838}
1614 1839
1615sub mouse_motion { 1840sub invoke_mouse_motion {
1616 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1617# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1842# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1843
1844 1
1618} 1845}
1619 1846
1620sub _draw { 1847sub _draw {
1621 my ($self) = @_; 1848 my ($self) = @_;
1622 1849
1623 local $self->{fg} = $self->{fg}; 1850 local $self->{fg} = $self->{fg};
1624 1851
1625 if ($FOCUS == $self) { 1852 if ($FOCUS == $self) {
1626 glColor @{$self->{active_bg}}; 1853 glColor_premultiply @{$self->{active_bg}};
1627 $self->{fg} = $self->{active_fg}; 1854 $self->{fg} = $self->{active_fg};
1628 } else { 1855 } else {
1629 glColor @{$self->{bg}}; 1856 glColor_premultiply @{$self->{bg}};
1630 } 1857 }
1631 1858
1632 glEnable GL_BLEND; 1859 glEnable GL_BLEND;
1633 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1634 glBegin GL_QUADS; 1861 glBegin GL_QUADS;
1635 glVertex 0 , 0; 1862 glVertex 0 , 0;
1636 glVertex 0 , $self->{h}; 1863 glVertex 0 , $self->{h};
1637 glVertex $self->{w}, $self->{h}; 1864 glVertex $self->{w}, $self->{h};
1638 glVertex $self->{w}, 0; 1865 glVertex $self->{w}, 0;
… …
1663 1890
1664our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1665 1892
1666use CFClient::OpenGL; 1893use CFClient::OpenGL;
1667 1894
1668sub key_down { 1895sub invoke_key_down {
1669 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1670 1897
1671 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1672 1899
1673 if ($sym == 13) { 1900 if ($sym == 13) {
1674 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1675 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1676 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1677 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1678 $self->emit (activate => $txt); 1906 $self->emit (activate => $txt);
1679 $self->update; 1907 $self->update;
1680 1908
… …
1699 } else { 1927 } else {
1700 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1701 } 1929 }
1702 1930
1703 } else { 1931 } else {
1704 $self->SUPER::key_down ($ev); 1932 return $self->SUPER::invoke_key_down ($ev)
1933 }
1934
1705 } 1935 1
1706
1707} 1936}
1708 1937
1709############################################################################# 1938#############################################################################
1710 1939
1711package CFClient::UI::Button; 1940package CFClient::UI::Button;
… …
1720 1949
1721sub new { 1950sub new {
1722 my $class = shift; 1951 my $class = shift;
1723 1952
1724 $class->SUPER::new ( 1953 $class->SUPER::new (
1725 padding => 4, 1954 padding_x => 4,
1955 padding_y => 4,
1726 fg => [1, 1, 1], 1956 fg => [1, 1, 1],
1727 active_fg => [0, 0, 1], 1957 active_fg => [0, 0, 1],
1728 can_hover => 1, 1958 can_hover => 1,
1729 align => 0, 1959 align => 0,
1730 valign => 0, 1960 valign => 0,
1731 can_events => 1, 1961 can_events => 1,
1732 @_ 1962 @_
1733 ) 1963 )
1734} 1964}
1735 1965
1736sub button_up { 1966sub invoke_button_up {
1737 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1738 1968
1969 $self->emit ("activate")
1739 if ($x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1740 && $y >= 0 && $y < $self->{h}) { 1971 && $y >= 0 && $y < $self->{h};
1741 $self->emit ("activate"); 1972
1742 } 1973 1
1743} 1974}
1744 1975
1745sub _draw { 1976sub _draw {
1746 my ($self) = @_; 1977 my ($self) = @_;
1747 1978
1748 local $self->{fg} = $self->{fg}; 1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1749
1750 if ($GRAB == $self) {
1751 $self->{fg} = $self->{active_fg};
1752 }
1753 1980
1754 glEnable GL_TEXTURE_2D; 1981 glEnable GL_TEXTURE_2D;
1755 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1756 glColor 0, 0, 0, 1; 1983 glColor 0, 0, 0, 1;
1757 1984
… …
1762 $self->SUPER::_draw; 1989 $self->SUPER::_draw;
1763} 1990}
1764 1991
1765############################################################################# 1992#############################################################################
1766 1993
1994package CFClient::UI::ImageButton;
1995
1996our @ISA = CFClient::UI::Image::;
1997
1998use CFClient::OpenGL;
1999
2000my %textures;
2001
2002sub new {
2003 my $class = shift;
2004
2005 my $self = $class->SUPER::new (
2006 padding_x => 4,
2007 padding_y => 4,
2008 fg => [1, 1, 1],
2009 active_fg => [0, 0, 1],
2010 can_hover => 1,
2011 align => 0,
2012 valign => 0,
2013 can_events => 1,
2014 @_
2015 );
2016}
2017
2018sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_;
2020
2021 $self->emit ("activate")
2022 if $x >= 0 && $x < $self->{w}
2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
2026}
2027
2028#############################################################################
2029
1767package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
1768 2031
1769our @ISA = CFClient::UI::DrawBG::; 2032our @ISA = CFClient::UI::DrawBG::;
1770 2033
1771my @tex = 2034my @tex =
… …
1776 2039
1777sub new { 2040sub new {
1778 my $class = shift; 2041 my $class = shift;
1779 2042
1780 $class->SUPER::new ( 2043 $class->SUPER::new (
1781 padding => 2, 2044 padding_x => 2,
2045 padding_y => 2,
1782 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
1783 active_fg => [1, 1, 0], 2047 active_fg => [1, 1, 0],
1784 bg => [0, 0, 0, 0.2], 2048 bg => [0, 0, 0, 0.2],
1785 active_bg => [1, 1, 1, 0.5], 2049 active_bg => [1, 1, 1, 0.5],
1786 state => 0, 2050 state => 0,
… …
1790} 2054}
1791 2055
1792sub size_request { 2056sub size_request {
1793 my ($self) = @_; 2057 my ($self) = @_;
1794 2058
1795 ($self->{padding} * 2 + 6) x 2 2059 (6) x 2
1796} 2060}
1797 2061
1798sub button_down { 2062sub invoke_button_down {
1799 my ($self, $ev, $x, $y) = @_; 2063 my ($self, $ev, $x, $y) = @_;
1800 2064
1801 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1802 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1803 $self->{state} = !$self->{state}; 2067 $self->{state} = !$self->{state};
1804 $self->emit (changed => $self->{state}); 2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
1805 } 2073 1
1806} 2074}
1807 2075
1808sub _draw { 2076sub _draw {
1809 my ($self) = @_; 2077 my ($self) = @_;
1810 2078
1811 $self->SUPER::_draw; 2079 $self->SUPER::_draw;
1812 2080
1813 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2081 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1814 2082
1815 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2083 my ($w, $h) = @$self{qw(w h)};
2084
2085 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1816 2086
1817 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2087 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1818 2088
1819 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2089 my $tex = $self->{state} ? $tex[1] : $tex[0];
1820 2090
… …
1828package CFClient::UI::Image; 2098package CFClient::UI::Image;
1829 2099
1830our @ISA = CFClient::UI::Base::; 2100our @ISA = CFClient::UI::Base::;
1831 2101
1832use CFClient::OpenGL; 2102use CFClient::OpenGL;
1833use Carp qw/confess/;
1834 2103
1835our %loaded_images; 2104our %texture_cache;
1836 2105
1837sub new { 2106sub new {
1838 my $class = shift; 2107 my $class = shift;
1839 2108
1840 my $self = $class->SUPER::new (can_events => 0, @_); 2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
1841 2113
1842 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
1843 2116
1844 $loaded_images{$self->{image}} ||= 2117 $self->{tex} = $texture_cache{$self->{path}} ||=
1845 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1846 2119
1847 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2120 Scalar::Util::weaken $texture_cache{$self->{path}};
1848 2121
1849 Scalar::Util::weaken $loaded_images{$self->{image}}; 2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1850
1851 $self->{aspect} = $tex->{w} / $tex->{h};
1852 2123
1853 $self 2124 $self
1854} 2125}
1855 2126
1856sub size_request { 2127sub size_request {
1857 my ($self) = @_; 2128 my ($self) = @_;
1858 2129
1859 ($self->{tex}->{w}, $self->{tex}->{h}) 2130 ($self->{tex}{w}, $self->{tex}{h})
1860} 2131}
1861 2132
1862sub _draw { 2133sub _draw {
1863 my ($self) = @_; 2134 my ($self) = @_;
1864 2135
… …
1975 2246
1976 my $h1 = $self->{h} * (1 - $ycut1); 2247 my $h1 = $self->{h} * (1 - $ycut1);
1977 my $h2 = $self->{h} * (1 - $ycut2); 2248 my $h2 = $self->{h} * (1 - $ycut2);
1978 2249
1979 glEnable GL_BLEND; 2250 glEnable GL_BLEND;
1980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1981 glEnable GL_TEXTURE_2D; 2253 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 2255
1984 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2256 glBindTexture GL_TEXTURE_2D, $t1->{name};
1985 glBegin GL_QUADS; 2257 glBegin GL_QUADS;
… …
2085 fg => [1, 1, 1], 2357 fg => [1, 1, 1],
2086 active_fg => [0, 0, 0], 2358 active_fg => [0, 0, 0],
2087 bg => [0, 0, 0, 0.2], 2359 bg => [0, 0, 0, 0.2],
2088 active_bg => [1, 1, 1, 0.5], 2360 active_bg => [1, 1, 1, 0.5],
2089 range => [0, 0, 100, 10, 0], 2361 range => [0, 0, 100, 10, 0],
2090 req_w => $::WIDTH / 80, 2362 min_w => $::WIDTH / 80,
2091 req_h => $::WIDTH / 80, 2363 min_h => $::WIDTH / 80,
2092 vertical => 0, 2364 vertical => 0,
2093 can_hover => 1, 2365 can_hover => 1,
2094 inner_pad => 0.02, 2366 inner_pad => 0.02,
2095 @_ 2367 @_
2096 ); 2368 );
… …
2102} 2374}
2103 2375
2104sub set_range { 2376sub set_range {
2105 my ($self, $range) = @_; 2377 my ($self, $range) = @_;
2106 2378
2107 $self->{range} = $range; 2379 ($range, $self->{range}) = ($self->{range}, $range);
2108 2380
2381 if ("@$range" ne "@{$self->{range}}") {
2109 $self->update; 2382 $self->update;
2383 $self->set_value ($self->{range}[0]);
2384 }
2110} 2385}
2111 2386
2112sub set_value { 2387sub set_value {
2113 my ($self, $value) = @_; 2388 my ($self, $value) = @_;
2114 2389
… …
2133} 2408}
2134 2409
2135sub size_request { 2410sub size_request {
2136 my ($self) = @_; 2411 my ($self) = @_;
2137 2412
2138 my $w = $self->{req_w}; 2413 ($self->{req_w}, $self->{req_h})
2139 my $h = $self->{req_h};
2140
2141 $self->{vertical} ? ($h, $w) : ($w, $h)
2142} 2414}
2143 2415
2144sub button_down { 2416sub invoke_button_down {
2145 my ($self, $ev, $x, $y) = @_; 2417 my ($self, $ev, $x, $y) = @_;
2146 2418
2147 $self->SUPER::button_down ($ev, $x, $y); 2419 $self->SUPER::invoke_button_down ($ev, $x, $y);
2148 2420
2149 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2421 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2150 2422
2151 $self->mouse_motion ($ev, $x, $y); 2423 $self->invoke_mouse_motion ($ev, $x, $y)
2152} 2424}
2153 2425
2154sub mouse_motion { 2426sub invoke_mouse_motion {
2155 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2156 2428
2157 if ($GRAB == $self) { 2429 if ($GRAB == $self) {
2158 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2159 2431
2160 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2432 my (undef, $lo, $hi, $page) = @{$self->{range}};
2161 2433
2162 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2434 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2163 2435
2164 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2436 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2437 } else {
2438 return 0;
2439 }
2440
2165 } 2441 1
2166} 2442}
2167 2443
2168sub update { 2444sub update {
2169 my ($self) = @_; 2445 my ($self) = @_;
2170 2446
2171 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2447 delete $self->{knob_w};
2448 $self->SUPER::update;
2449}
2450
2451sub _draw {
2452 my ($self) = @_;
2453
2454 unless ($self->{knob_w}) {
2172 $self->set_value ($self->{range}[0]); 2455 $self->set_value ($self->{range}[0]);
2173 2456
2174 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2457 my ($value, $lo, $hi, $page) = @{$self->{range}};
2175 my $range = ($hi - $page - $lo) || 1e-100; 2458 my $range = ($hi - $page - $lo) || 1e-100;
2176 2459
… …
2182 $value = ($value - $lo) / $range; 2465 $value = ($value - $lo) / $range;
2183 $value = $value * $self->{scale} + $self->{offset}; 2466 $value = $value * $self->{scale} + $self->{offset};
2184 2467
2185 $self->{knob_x} = $value - $knob_w * 0.5; 2468 $self->{knob_x} = $value - $knob_w * 0.5;
2186 $self->{knob_w} = $knob_w; 2469 $self->{knob_w} = $knob_w;
2187 }); 2470 }
2188
2189 $self->SUPER::update;
2190}
2191
2192sub _draw {
2193 my ($self) = @_;
2194 2471
2195 $self->SUPER::_draw (); 2472 $self->SUPER::_draw ();
2196 2473
2197 glScale $self->{w}, $self->{h}; 2474 glScale $self->{w}, $self->{h};
2198 2475
… …
2259sub set_range { shift->{slider}->set_range (@_) } 2536sub set_range { shift->{slider}->set_range (@_) }
2260sub set_value { shift->{slider}->set_value (@_) } 2537sub set_value { shift->{slider}->set_value (@_) }
2261 2538
2262############################################################################# 2539#############################################################################
2263 2540
2264package CFClient::UI::TextView; 2541package CFClient::UI::TextScroller;
2265 2542
2266our @ISA = CFClient::UI::HBox::; 2543our @ISA = CFClient::UI::HBox::;
2267 2544
2268use CFClient::OpenGL; 2545use CFClient::OpenGL;
2269 2546
… …
2271 my $class = shift; 2548 my $class = shift;
2272 2549
2273 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
2274 fontsize => 1, 2551 fontsize => 1,
2275 can_events => 0, 2552 can_events => 0,
2553 indent => 0,
2276 #font => default_font 2554 #font => default_font
2277 @_, 2555 @_,
2278 2556
2279 layout => (new CFClient::Layout 1), 2557 layout => (new CFClient::Layout 1),
2280 par => [], 2558 par => [],
… …
2295 2573
2296 $self->{fontsize} = $fontsize; 2574 $self->{fontsize} = $fontsize;
2297 $self->reflow; 2575 $self->reflow;
2298} 2576}
2299 2577
2578sub size_request {
2579 my ($self) = @_;
2580
2581 my ($empty, $slider) = @{ $self->{children} };
2582
2583 local $self->{children} = [$empty, $slider];
2584 $self->SUPER::size_request
2585}
2586
2300sub size_allocate { 2587sub invoke_size_allocate {
2301 my ($self, $w, $h) = @_; 2588 my ($self, $w, $h) = @_;
2302 2589
2303 $self->SUPER::size_allocate ($w, $h); 2590 my ($empty, $slider, @other) = @{ $self->{children} };
2591 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2304 2592
2305 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2593 $self->{layout}->set_font ($self->{font}) if $self->{font};
2306 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2307 $self->{layout}->set_width ($self->{children}[0]{w}); 2595 $self->{layout}->set_width ($empty->{w});
2596 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2308 2597
2309 $self->reflow; 2598 $self->reflow;
2310}
2311 2599
2312sub text_size { 2600 local $self->{children} = [$empty, $slider];
2313 my ($self, $text, $indent) = @_; 2601 $self->SUPER::invoke_size_allocate ($w, $h)
2602}
2603
2604sub get_layout {
2605 my ($self, $para) = @_;
2314 2606
2315 my $layout = $self->{layout}; 2607 my $layout = $self->{layout};
2316 2608
2609 $layout->set_font ($self->{font}) if $self->{font};
2610 $layout->set_foreground (@{$para->{fg}});
2317 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2611 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2318 $layout->set_width ($self->{children}[0]{w} - $indent); 2612 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2613 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2319 $layout->set_markup ($text); 2614 $layout->set_markup ($para->{markup});
2615
2616 $layout->set_shapes (
2617 map
2618 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2619 @{$para->{widget}}
2320 2620 );
2621
2321 $layout->size 2622 $layout
2322} 2623}
2323 2624
2324sub reflow { 2625sub reflow {
2325 my ($self) = @_; 2626 my ($self) = @_;
2326 2627
… …
2335 $self->{children}[1]->set_value ($offset); 2636 $self->{children}[1]->set_value ($offset);
2336} 2637}
2337 2638
2338sub clear { 2639sub clear {
2339 my ($self) = @_; 2640 my ($self) = @_;
2641
2642 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other;
2340 2644
2341 $self->{par} = []; 2645 $self->{par} = [];
2342 $self->{height} = 0; 2646 $self->{height} = 0;
2343 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2344} 2648}
2345 2649
2346sub add_paragraph { 2650sub add_paragraph {
2347 my ($self, $color, $text, $indent) = @_; 2651 my ($self, $color, $para, $indent) = @_;
2348 2652
2349 for my $line (split /\n/, $text) { 2653 my ($text, @w) = ref $para ? @$para : $para;
2350 my ($w, $h) = $self->text_size ($line); 2654
2351 $self->{height} += $h; 2655 $para = {
2352 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2656 w => 1e10,
2657 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2353 } 2662 };
2354 2663
2355 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2664 $self->add (@w) if @w;
2665 push @{$self->{par}}, $para;
2666
2667 $self->{need_reflow}++;
2668 $self->update;
2669}
2670
2671sub scroll_to_bottom {
2672 my ($self) = @_;
2673
2674 $self->{scroll_to_bottom} = 1;
2675 $self->update;
2356} 2676}
2357 2677
2358sub update { 2678sub update {
2359 my ($self) = @_; 2679 my ($self) = @_;
2360 2680
… …
2362 2682
2363 return unless $self->{h} > 0; 2683 return unless $self->{h} > 0;
2364 2684
2365 delete $self->{texture}; 2685 delete $self->{texture};
2366 2686
2367 $ROOT->on_post_alloc ($self, sub { 2687 $ROOT->on_post_alloc ($self => sub {
2368 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2369 2689
2370 if (delete $self->{need_reflow}) { 2690 if (delete $self->{need_reflow}) {
2371 my $height = 0; 2691 my $height = 0;
2372 2692
2373 my $layout = $self->{layout};
2374
2375 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2376
2377 for (@{$self->{par}}) { 2693 for my $para (@{$self->{par}}) {
2378 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2379 $layout->set_width ($W - $_->[3]); 2695 my $layout = $self->get_layout ($para);
2380 $layout->set_markup ($_->[4]);
2381 my ($w, $h) = $layout->size; 2696 my ($w, $h) = $layout->size;
2382 $_->[0] = $w + $_->[3]; 2697
2383 $_->[1] = $h; 2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2384 } 2701 }
2385 2702
2386 $height += $_->[1]; 2703 $height += $para->{h};
2387 } 2704 }
2388 2705
2389 $self->{height} = $height; 2706 $self->{height} = $height;
2390 2707
2391 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2392 2709
2393 delete $self->{texture}; 2710 delete $self->{texture};
2394 } 2711 }
2395 2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2396 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2397 glClearColor 0.5, 0.5, 0.5, 0; 2718 glClearColor 0, 0, 0, 0;
2398 glClear GL_COLOR_BUFFER_BIT; 2719 glClear GL_COLOR_BUFFER_BIT;
2399 2720
2400 my $top = int $self->{children}[1]{range}[0]; 2721 my $top = int $self->{children}[1]{range}[0];
2401 2722
2402 my $y0 = $top; 2723 my $y0 = $top;
2403 my $y1 = $top + $H; 2724 my $y1 = $top + $H;
2404 2725
2405 my $y = 0; 2726 my $y = 0;
2406
2407 my $layout = $self->{layout};
2408
2409 $layout->set_font ($self->{font}) if $self->{font};
2410 2727
2411 glEnable GL_BLEND; 2728 glEnable GL_BLEND;
2412 #TODO# not correct in windows where rgba is forced off 2729 #TODO# not correct in windows where rgba is forced off
2413 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2414 2731
2415 for my $par (@{$self->{par}}) { 2732 for my $para (@{$self->{par}}) {
2416 my $h = $par->[1]; 2733 my $h = $para->{h};
2417 2734
2418 if ($y0 < $y + $h && $y < $y1) { 2735 if ($y0 < $y + $h && $y < $y1) {
2419 $layout->set_foreground (@{ $par->[2] }); 2736
2420 $layout->set_width ($W - $par->[3]); 2737 my $layout = $self->get_layout ($para);
2421 $layout->set_markup ($par->[4]);
2422 2738
2423 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2424 2740
2425 glRasterPos $par->[3], $y - $y0; 2741 glRasterPos $para->{indent}, $y - $y0;
2426 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743
2744 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes;
2746
2747 for (@w) {
2748 my ($dx, $dy) = splice @s, 0, 2, ();
2749
2750 $_->{x} = $dx + $para->{indent};
2751 $_->{y} = $dy + $y - $y0;
2752
2753 $_->draw;
2754 }
2755 }
2427 } 2756 }
2428 2757
2429 $y += $h; 2758 $y += $h;
2430 } 2759 }
2431 2760
2432 glDisable GL_BLEND; 2761 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) {
2868 $widget = new CFClient::UI::Label 3067 $widget = new CFClient::UI::Label
2869 can_hover => 1, 3068 can_hover => 1,
2870 can_events => 1, 3069 can_events => 1,
2871 text => $widget; 3070 markup => $widget,
3071 tooltip => $tooltip
2872 } 3072 }
2873 3073
2874 $self->{item}{$widget} = $item; 3074 $self->{item}{$widget} = $item;
2875 3075
2876 $self->{vbox}->add ($widget); 3076 $self->{vbox}->add ($widget);
… …
2888 # maybe save $GRAB? must be careful about events... 3088 # maybe save $GRAB? must be careful about events...
2889 $GRAB = $self; 3089 $GRAB = $self;
2890 $self->{button} = $ev->{button}; 3090 $self->{button} = $ev->{button};
2891 3091
2892 $self->show; 3092 $self->show;
2893 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3093 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2894} 3094}
2895 3095
2896sub mouse_motion { 3096sub invoke_mouse_motion {
2897 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
2898 3098
2899 # TODO: should use vbox->find_widget or so 3099 # TODO: should use vbox->find_widget or so
2900 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3100 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2901 $self->{hover} = $self->{item}{$HOVER}; 3101 $self->{hover} = $self->{item}{$HOVER};
2902}
2903 3102
3103 0
3104}
3105
2904sub button_up { 3106sub invoke_button_up {
2905 my ($self, $ev, $x, $y) = @_; 3107 my ($self, $ev, $x, $y) = @_;
2906 3108
2907 if ($ev->{button} == $self->{button}) { 3109 if ($ev->{button} == $self->{button}) {
2908 undef $GRAB; 3110 undef $GRAB;
2909 $self->hide; 3111 $self->hide;
2910 3112
2911 $self->emit ("popdown"); 3113 $self->emit ("popdown");
2912 $self->{hover}[1]->() if $self->{hover}; 3114 $self->{hover}[1]->() if $self->{hover};
3115 } else {
3116 return 0
3117 }
3118
2913 } 3119 1
2914} 3120}
2915 3121
2916############################################################################# 3122#############################################################################
2917 3123
2918package CFClient::UI::Statusbox; 3124package CFClient::UI::Multiplexer;
2919 3125
2920our @ISA = CFClient::UI::VBox::; 3126our @ISA = CFClient::UI::Container::;
2921 3127
2922sub new { 3128sub new {
2923 my $class = shift; 3129 my $class = shift;
2924 3130
2925 $class->SUPER::new ( 3131 my $self = $class->SUPER::new (
3132 @_,
3133 );
3134
3135 $self->{current} = $self->{children}[0]
3136 if @{ $self->{children} };
3137
3138 $self
3139}
3140
3141sub add {
3142 my ($self, @widgets) = @_;
3143
3144 $self->SUPER::add (@widgets);
3145
3146 $self->{current} = $self->{children}[0]
3147 if @{ $self->{children} };
3148}
3149
3150sub set_current_page {
3151 my ($self, $page_or_widget) = @_;
3152
3153 my $widget = ref $page_or_widget
3154 ? $page_or_widget
3155 : $self->{children}[$page_or_widget];
3156
3157 $self->{current} = $widget;
3158 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3159
3160 $self->emit (page_changed => $self->{current});
3161
3162 $self->realloc;
3163}
3164
3165sub visible_children {
3166 $_[0]{current}
3167}
3168
3169sub size_request {
3170 my ($self) = @_;
3171
3172 $self->{current}->size_request
3173}
3174
3175sub invoke_size_allocate {
3176 my ($self, $w, $h) = @_;
3177
3178 $self->{current}->configure (0, 0, $w, $h);
3179
3180 1
3181}
3182
3183sub _draw {
3184 my ($self) = @_;
3185
3186 $self->{current}->draw;
3187}
3188
3189#############################################################################
3190
3191package CFClient::UI::Notebook;
3192
3193our @ISA = CFClient::UI::VBox::;
3194
3195sub new {
3196 my $class = shift;
3197
3198 my $self = $class->SUPER::new (
3199 buttonbar => (new CFClient::UI::Buttonbar),
3200 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3201 # filter => # will be put between multiplexer and $self
3202 @_,
3203 );
3204
3205 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3206 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3207
3208 $self
3209}
3210
3211sub add {
3212 my ($self, $title, $widget, $tooltip) = @_;
3213
3214 Scalar::Util::weaken $self;
3215
3216 $self->{buttonbar}->add (new CFClient::UI::Button
3217 markup => $title,
3218 tooltip => $tooltip,
3219 on_activate => sub { $self->set_current_page ($widget) },
3220 );
3221
3222 $self->{multiplexer}->add ($widget);
3223}
3224
3225sub set_current_page {
3226 my ($self, $page) = @_;
3227
3228 $self->{multiplexer}->set_current_page ($page);
3229 $self->emit (page_changed => $self->{multiplexer}{current});
3230}
3231
3232#############################################################################
3233
3234package CFClient::UI::Combobox;
3235
3236use utf8;
3237
3238our @ISA = CFClient::UI::Button::;
3239
3240sub new {
3241 my $class = shift;
3242
3243 my $self = $class->SUPER::new (
3244 options => [], # [value, title, longdesc], ...
3245 value => undef,
3246 @_,
3247 );
3248
3249 $self->_set_value ($self->{value});
3250
3251 $self
3252}
3253
3254sub invoke_button_down {
3255 my ($self, $ev) = @_;
3256
3257 my @menu_items;
3258
3259 for (@{ $self->{options} }) {
3260 my ($value, $title, $tooltip) = @$_;
3261
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 }
3264
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266}
3267
3268sub _set_value {
3269 my ($self, $value) = @_;
3270
3271 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3272 or return;
3273
3274 $self->{value} = $item->[0];
3275 $self->set_markup ("$item->[1] ⇓");
3276 $self->set_tooltip ($item->[2]);
3277}
3278
3279sub set_value {
3280 my ($self, $value) = @_;
3281
3282 return unless $self->{value} ne $value;
3283
3284 $self->_set_value ($value);
3285 $self->emit (changed => $value);
3286}
3287
3288#############################################################################
3289
3290package CFClient::UI::Statusbox;
3291
3292our @ISA = CFClient::UI::VBox::;
3293
3294sub new {
3295 my $class = shift;
3296
3297 my $self = $class->SUPER::new (
2926 fontsize => 0.8, 3298 fontsize => 0.8,
2927 @_, 3299 @_,
2928 ) 3300 );
3301
3302 Scalar::Util::weaken (my $this = $self);
3303
3304 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305
3306 $self
2929} 3307}
2930 3308
2931sub reorder { 3309sub reorder {
2932 my ($self) = @_; 3310 my ($self) = @_;
2933 my $NOW = time; 3311 my $NOW = Time::HiRes::time;
3312
3313 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} };
2934 3317
2935 while (my ($k, $v) = each %{ $self->{item} }) { 3318 while (my ($k, $v) = each %{ $self->{item} }) {
2936 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3319 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2937 } 3320 }
2938 3321
… …
2941 my @items = sort { 3324 my @items = sort {
2942 $a->{pri} <=> $b->{pri} 3325 $a->{pri} <=> $b->{pri}
2943 or $b->{id} <=> $a->{id} 3326 or $b->{id} <=> $a->{id}
2944 } values %{ $self->{item} }; 3327 } values %{ $self->{item} };
2945 3328
3329 $self->{timer}->interval (1);
3330
2946 my $count = 10 + 1; 3331 my $count = 10 + 1;
2947 for my $item (@items) { 3332 for my $item (@items) {
2948 last unless --$count; 3333 last unless --$count;
2949 3334
2950 push @widgets, $item->{label} ||= do { 3335 my $label = $item->{label} ||= do {
2951 # TODO: doesn't handle markup well (read as: at all) 3336 # TODO: doesn't handle markup well (read as: at all)
2952 my $short = $item->{count} > 1 3337 my $short = $item->{count} > 1
2953 ? "<b>$item->{count} ×</b> $item->{text}" 3338 ? "<b>$item->{count} ×</b> $item->{text}"
2954 : $item->{text}; 3339 : $item->{text};
2955 3340
… …
2963 tooltip => $item->{tooltip}, 3348 tooltip => $item->{tooltip},
2964 tooltip_font => $::FONT_PROP, 3349 tooltip_font => $::FONT_PROP,
2965 tooltip_width => 0.67, 3350 tooltip_width => 0.67,
2966 fontsize => $item->{fontsize} || $self->{fontsize}, 3351 fontsize => $item->{fontsize} || $self->{fontsize},
2967 max_w => $::WIDTH * 0.44, 3352 max_w => $::WIDTH * 0.44,
2968 fg => $item->{fg}, 3353 fg => [@{ $item->{fg} }],
2969 can_events => 1, 3354 can_events => 1,
2970 can_hover => 1 3355 can_hover => 1
2971 }; 3356 };
3357
3358 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3359 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3360 $label->update;
3361 $label->set_max_size (undef, $label->{req_h} * $diff)
3362 if $diff < 1;
3363 $self->{timer}->interval (1/30);
3364 } else {
3365 $label->{fg}[3] = $item->{fg}[3] || 1;
3366 }
3367
3368 push @widgets, $label;
2972 } 3369 }
2973 3370
2974 $self->clear; 3371 $self->clear;
2975 $self->SUPER::add (reverse @widgets); 3372 $self->SUPER::add (reverse @widgets);
2976} 3373}
… …
2979 my ($self, $text, %arg) = @_; 3376 my ($self, $text, %arg) = @_;
2980 3377
2981 $text =~ s/^\s+//; 3378 $text =~ s/^\s+//;
2982 $text =~ s/\s+$//; 3379 $text =~ s/\s+$//;
2983 3380
3381 return unless $text;
3382
2984 my $timeout = time + ((delete $arg{timeout}) || 60); 3383 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2985 3384
2986 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3385 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987 3386
2988 if (my $item = $self->{item}{$group}) { 3387 if (my $item = $self->{item}{$group}) {
2989 if ($item->{text} eq $text) { 3388 if ($item->{text} eq $text) {
2990 $item->{count}++; 3389 $item->{count}++;
2991 } else { 3390 } else {
2992 $item->{count} = 1; 3391 $item->{count} = 1;
2993 $item->{text} = $item->{tooltip} = $text; 3392 $item->{text} = $item->{tooltip} = $text;
2994 } 3393 }
2995 $item->{id} = ++$self->{id}; 3394 $item->{id} += 0.2;#d#
2996 $item->{timeout} = $timeout; 3395 $item->{timeout} = $timeout;
2997 delete $item->{label}; 3396 delete $item->{label};
2998 } else { 3397 } else {
2999 $self->{item}{$group} = { 3398 $self->{item}{$group} = {
3000 id => ++$self->{id}, 3399 id => ++$self->{id},
… …
3019 3418
3020 $self->reorder; 3419 $self->reorder;
3021 $self->SUPER::reconfigure; 3420 $self->SUPER::reconfigure;
3022} 3421}
3023 3422
3423sub destroy {
3424 my ($self) = @_;
3425
3426 $self->{timer}->cancel;
3427
3428 $self->SUPER::destroy;
3429}
3430
3024############################################################################# 3431#############################################################################
3025 3432
3026package CFClient::UI::Root; 3433package CFClient::UI::Inventory;
3027 3434
3028our @ISA = CFClient::UI::Container::; 3435our @ISA = CFClient::UI::ScrolledWindow::;
3029
3030use CFClient::OpenGL;
3031 3436
3032sub new { 3437sub new {
3033 my $class = shift; 3438 my $class = shift;
3034 3439
3035 $class->SUPER::new ( 3440 my $self = $class->SUPER::new (
3441 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3442 @_,
3443 );
3444
3445 $self
3446}
3447
3448sub set_items {
3449 my ($self, $items) = @_;
3450
3451 $self->{child}->clear;
3452 return unless $items;
3453
3454 my @items = sort {
3455 ($a->{type} <=> $b->{type})
3456 or ($a->{name} cmp $b->{name})
3457 } @$items;
3458
3459 $self->{real_items} = \@items;
3460
3461 my $row = 0;
3462 for my $item (@items) {
3463 CFClient::Item::update_widgets $item;
3464
3465 $self->{child}->add (0, $row, $item->{face_widget});
3466 $self->{child}->add (1, $row, $item->{desc_widget});
3467 $self->{child}->add (2, $row, $item->{weight_widget});
3468
3469 $row++;
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::BindEditor;
3476
3477our @ISA = CFClient::UI::FancyFrame::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3483
3484 $self->add (my $vb = new CFClient::UI::VBox);
3485
3486
3487 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3488 text => "start recording",
3489 tooltip => "Start/Stops recording of actions."
3490 ."All subsequent actions after the recording started will be captured."
3491 ."The actions are displayed after the record was stopped."
3492 ."To bind the action you have to click on the 'Bind' button",
3493 on_activate => sub {
3494 unless ($self->{recording}) {
3495 $self->start;
3496 } else {
3497 $self->stop;
3498 }
3499 });
3500
3501 $vb->add (new CFClient::UI::Label text => "Actions:");
3502 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3503
3504 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3505 $vb->add (my $hb = new CFClient::UI::HBox);
3506 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3507 $hb->add (new CFClient::UI::Button
3508 text => "bind",
3509 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3510 on_activate => sub {
3511 $self->ask_for_bind;
3512 });
3513
3514 $vb->add (my $hb = new CFClient::UI::HBox);
3515 $hb->add (new CFClient::UI::Button
3516 text => "ok",
3517 expand => 1,
3518 tooltip => "This closes the binding editor and saves the binding",
3519 on_activate => sub {
3520 $self->hide;
3521 $self->commit;
3522 });
3523
3524 $hb->add (new CFClient::UI::Button
3525 text => "cancel",
3526 expand => 1,
3527 tooltip => "This closes the binding editor without saving",
3528 on_activate => sub {
3529 $self->hide;
3530 $self->{binding_cancel}->()
3531 if $self->{binding_cancel};
3532 });
3533
3534 $self->update_binding_widgets;
3535
3536 $self
3537}
3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3551sub commit {
3552 my ($self) = @_;
3553 my ($mod, $sym, $cmds) = $self->get_binding;
3554 if ($sym != 0 && @$cmds > 0) {
3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3556 ."'. Don't forget 'Save Config'!");
3557 $self->{binding_change}->($mod, $sym, $cmds)
3558 if $self->{binding_change};
3559 } else {
3560 $::STATUSBOX->add ("No action bound, no key or action specified!");
3561 $self->{binding_cancel}->()
3562 if $self->{binding_cancel};
3563 }
3564}
3565
3566sub start {
3567 my ($self) = @_;
3568
3569 $self->{rec_btn}->set_text ("stop recording");
3570 $self->{recording} = 1;
3571 $self->clear_command_list;
3572 $::CONN->start_record if $::CONN;
3573}
3574
3575sub stop {
3576 my ($self) = @_;
3577
3578 $self->{rec_btn}->set_text ("start recording");
3579 $self->{recording} = 0;
3580
3581 my $rec;
3582 $rec = $::CONN->stop_record if $::CONN;
3583 return unless ref $rec eq 'ARRAY';
3584 $self->set_command_list ($rec);
3585}
3586
3587
3588sub ask_for_bind_and_commit {
3589 my ($self) = @_;
3590 $self->ask_for_bind (1);
3591}
3592
3593sub ask_for_bind {
3594 my ($self, $commit, $end_cb) = @_;
3595
3596 CFClient::Binder::open_binding_dialog (sub {
3597 my ($mod, $sym) = @_;
3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3599 $self->update_binding_widgets;
3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3602 });
3603}
3604
3605# $mod and $sym are the modifiers and key symbol
3606# $cmds is a array ref of strings (the commands)
3607# $cb is the callback that is executed on OK
3608# $ccb is the callback that is executed on CANCEL and
3609# when the binding was unsuccessful on OK
3610sub set_binding {
3611 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3612
3613 $self->clear_command_list;
3614 $self->{recording} = 0;
3615 $self->{rec_btn}->set_text ("start recording");
3616
3617 $self->{binding} = [$mod, $sym];
3618 $self->{commands} = $cmds;
3619
3620 $self->{binding_change} = $cb;
3621 $self->{binding_cancel} = $ccb;
3622
3623 $self->update_binding_widgets;
3624}
3625
3626# this is a shortcut method that asks for a binding
3627# and then just binds it.
3628sub do_quick_binding {
3629 my ($self, $cmds, $end_cb) = @_;
3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3631 $self->ask_for_bind (1, $end_cb);
3632}
3633
3634sub update_binding_widgets {
3635 my ($self) = @_;
3636 my ($mod, $sym, $cmds) = $self->get_binding;
3637 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3638 $self->set_command_list ($cmds);
3639}
3640
3641sub get_binding {
3642 my ($self) = @_;
3643 return (
3644 $self->{binding}->[0],
3645 $self->{binding}->[1],
3646 [ grep { defined $_ } @{$self->{commands}} ]
3647 );
3648}
3649
3650sub clear_command_list {
3651 my ($self) = @_;
3652 $self->{cmdbox}->clear ();
3653}
3654
3655sub set_command_list {
3656 my ($self, $cmds) = @_;
3657
3658 $self->{cmdbox}->clear ();
3659 $self->{commands} = $cmds;
3660
3661 my $idx = 0;
3662
3663 for (@$cmds) {
3664 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3665
3666 my $i = $idx;
3667 $hb->add (new CFClient::UI::Label text => $_);
3668 $hb->add (new CFClient::UI::Button
3669 text => "delete",
3670 tooltip => "Deletes the action from the record",
3671 on_activate => sub {
3672 $self->{cmdbox}->remove ($hb);
3673 $cmds->[$i] = undef;
3674 });
3675
3676
3677 $idx++
3678 }
3679}
3680
3681#############################################################################
3682
3683package CFClient::UI::SpellList;
3684
3685our @ISA = CFClient::UI::Table::;
3686
3687sub new {
3688 my $class = shift;
3689
3690 my $self = $class->SUPER::new (
3691 binding => [],
3692 commands => [],
3036 @_, 3693 @_,
3037 ) 3694 )
3038} 3695}
3039 3696
3040sub configure { 3697my $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 3698
3043 $self->{w} = $w; 3699my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3044 $self->{h} = $h; 3700 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3045} 3701my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3046 3709
3047sub check_size { 3710sub rebuild_spell_list {
3711 my ($self) = @_;
3712
3713 $CFClient::UI::ROOT->on_refresh ($self => sub {
3714 $self->clear;
3715
3716 return unless $::CONN;
3717
3718 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724 my $row = 0;
3725
3726 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727 my $spell = $self->{spell}{$_};
3728
3729 $row++;
3730
3731 my $spell_cb = sub {
3732 my ($widget, $ev) = @_;
3733
3734 if ($ev->{button} == 1) {
3735 $::CONN->user_send ("cast $spell->{name}");
3736 } elsif ($ev->{button} == 2) {
3737 $::CONN->user_send ("invoke $spell->{name}");
3738 } elsif ($ev->{button} == 3) {
3739 (new CFClient::UI::Menu
3740 items => [
3741 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743 ],
3744 )->popup ($ev);
3745 } else {
3746 return 0;
3747 }
3748
3749 1
3750 };
3751
3752 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754 #TODO: add path info to tooltip
3755 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757 $self->add (0, $row, new CFClient::UI::Face
3758 face => $spell->{face},
3759 can_hover => 1,
3760 can_events => 1,
3761 tooltip => $tooltip,
3762 on_button_down => $spell_cb,
3763 );
3764
3765 $self->add (1, $row, new CFClient::UI::Label
3766 expand => 1,
3767 text => $spell->{name},
3768 can_hover => 1,
3769 can_events => 1,
3770 tooltip => $tooltip,
3771 on_button_down => $spell_cb,
3772 );
3773
3774 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778 }
3779 });
3780}
3781
3782sub add_spell {
3048 my ($self) = @_; 3783 my ($self, $spell) = @_;
3049 3784
3050 $self->size_allocate ($self->{w}, $self->{h}) 3785 $self->{spell}->{$spell->{name}} = $spell;
3051 if $self->{w}; 3786 $self->rebuild_spell_list;
3787}
3788
3789sub remove_spell {
3790 my ($self, $spell) = @_;
3791
3792 delete $self->{spell}->{$spell->{name}};
3793 $self->rebuild_spell_list;
3794}
3795
3796sub clear_spells {
3797 my ($self) = @_;
3798
3799 $self->{spell} = {};
3800 $self->rebuild_spell_list;
3801}
3802
3803#############################################################################
3804
3805package CFClient::UI::Root;
3806
3807our @ISA = CFClient::UI::Container::;
3808
3809use List::Util qw(min max);
3810
3811use CFClient::OpenGL;
3812
3813sub new {
3814 my $class = shift;
3815
3816 my $self = $class->SUPER::new (
3817 visible => 1,
3818 @_,
3819 );
3820
3821 Scalar::Util::weaken ($self->{root} = $self);
3822
3823 $self
3052} 3824}
3053 3825
3054sub size_request { 3826sub size_request {
3055 my ($self) = @_; 3827 my ($self) = @_;
3056 3828
3057 ($self->{w}, $self->{h}) 3829 ($self->{w}, $self->{h})
3058} 3830}
3059 3831
3832sub _to_pixel {
3833 my ($coord, $size, $max) = @_;
3834
3835 $coord =
3836 $coord eq "center" ? ($max - $size) * 0.5
3837 : $coord eq "max" ? $max
3838 : $coord;
3839
3840 $coord = 0 if $coord < 0;
3841 $coord = $max - $size if $coord > $max - $size;
3842
3843 int $coord + 0.5
3844}
3845
3060sub size_allocate { 3846sub invoke_size_allocate {
3061 my ($self, $w, $h) = @_; 3847 my ($self, $w, $h) = @_;
3062 3848
3063 for my $child ($self->children) { 3849 for my $child ($self->children) {
3064 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3850 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3065 3851
3066 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3852 $X = $child->{force_x} if exists $child->{force_x};
3067 if exists $child->{req_x}; 3853 $Y = $child->{force_y} if exists $child->{force_y};
3068 3854
3069 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3855 $X = _to_pixel $X, $W, $self->{w};
3070 if exists $child->{req_y}; 3856 $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 3857
3075 $child->configure ($X, $Y, $W, $H); 3858 $child->configure ($X, $Y, $W, $H);
3076 } 3859 }
3860
3861 1
3077} 3862}
3078 3863
3079sub coord2local { 3864sub coord2local {
3080 my ($self, $x, $y) = @_; 3865 my ($self, $x, $y) = @_;
3081 3866
… …
3089} 3874}
3090 3875
3091sub update { 3876sub update {
3092 my ($self) = @_; 3877 my ($self) = @_;
3093 3878
3094 $self->check_size;
3095 $::WANT_REFRESH++; 3879 $::WANT_REFRESH++;
3096} 3880}
3097 3881
3098sub add { 3882sub add {
3099 my ($self, @children) = @_; 3883 my ($self, @children) = @_;
3100 3884
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; 3885 $_->{is_toplevel} = 1
3109 3886 for @children;
3110 # integerise window positions
3111 $child->{x} = int $child->{x};
3112 $child->{y} = int $child->{y};
3113 }
3114 3887
3115 $self->SUPER::add (@children); 3888 $self->SUPER::add (@children);
3116} 3889}
3117 3890
3118sub remove { 3891sub remove {
3119 my ($self, @children) = @_; 3892 my ($self, @children) = @_;
3120 3893
3121 $self->SUPER::remove (@children); 3894 $self->SUPER::remove (@children);
3895
3896 delete $self->{is_toplevel}
3897 for @children;
3122 3898
3123 while (@children) { 3899 while (@children) {
3124 my $w = pop @children; 3900 my $w = pop @children;
3125 push @children, $w->children; 3901 push @children, $w->children;
3126 delete $w->{visible}; 3902 $w->set_invisible;
3127 } 3903 }
3128} 3904}
3129 3905
3130sub on_refresh { 3906sub on_refresh {
3131 my ($self, $id, $cb) = @_; 3907 my ($self, $id, $cb) = @_;
… …
3145 while ($self->{refresh_hook}) { 3921 while ($self->{refresh_hook}) {
3146 $_->() 3922 $_->()
3147 for values %{delete $self->{refresh_hook}}; 3923 for values %{delete $self->{refresh_hook}};
3148 } 3924 }
3149 3925
3150 if ($self->{check_size}) { 3926 if ($self->{realloc}) {
3151 my @queue = ([], []); 3927 my %queue;
3928 my @queue;
3929 my $widget;
3152 3930
3153 for (;;) { 3931 outer:
3154 if ($self->{check_size}) { 3932 while () {
3155 # heuristic: check containers last 3933 if (my $realloc = delete $self->{realloc}) {
3156 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3934 for $widget (values %$realloc) {
3157 for values %{delete $self->{check_size}} 3935 $widget->{visible} or next; # do not resize invisible widgets
3936
3937 $queue{$widget+0}++ and next; # duplicates are common
3938
3939 push @{ $queue[$widget->{visible}] }, $widget;
3940 }
3158 } 3941 }
3159 3942
3160 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3943 while () {
3944 @queue or last outer;
3161 3945
3162 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3946 $widget = pop @{ $queue[-1] || [] }
3163 ? @$widget{qw(user_w user_h)} 3947 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 3948
3949 pop @queue;
3950 }
3951
3952 delete $queue{$widget+0};
3953
3954 my ($w, $h) = $widget->size_request;
3955
3956 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3957 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3958
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3961
3962 $w = $widget->{force_w} if exists $widget->{force_w};
3963 $h = $widget->{force_h} if exists $widget->{force_h};
3964
3965 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3966 || delete $widget->{force_realloc}) {
3170 $widget->{req_w} = $w; 3967 $widget->{req_w} = $w;
3171 $widget->{req_h} = $h; 3968 $widget->{req_h} = $h;
3172 3969
3173 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3970 $self->{size_alloc}{$widget+0} = $widget;
3174 3971
3175 $widget->{parent}->check_size
3176 if $widget->{parent}; 3972 if (my $parent = $widget->{parent}) {
3973 $self->{realloc}{$parent+0} = $parent
3974 unless $queue{$parent+0};
3975
3976 $parent->{force_size_alloc} = 1;
3977 $self->{size_alloc}{$parent+0} = $parent;
3978 }
3177 } 3979 }
3980
3981 delete $self->{realloc}{$widget+0};
3178 } 3982 }
3179 } 3983 }
3180 3984
3181 while ($self->{size_alloc}) { 3985 while (my $size_alloc = delete $self->{size_alloc}) {
3182 for (values %{delete $self->{size_alloc}}) { 3986 my @queue = sort { $b->{visible} <=> $a->{visible} }
3183 my ($widget, $w, $h) = @$_; 3987 values %$size_alloc;
3988
3989 while () {
3990 my $widget = pop @queue || last;
3991
3992 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3184 3993
3185 $w = 0 if $w < 0; 3994 $w = 0 if $w < 0;
3186 $h = 0 if $h < 0; 3995 $h = 0 if $h < 0;
3187 3996
3997 $w = int $w + 0.5;
3998 $h = int $h + 0.5;
3999
4000 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001 $widget->{old_w} = $widget->{w};
4002 $widget->{old_h} = $widget->{h};
4003
3188 $widget->{w} = $w; 4004 $widget->{w} = $w;
3189 $widget->{h} = $h; 4005 $widget->{h} = $h;
3190 $widget->size_allocate ($w, $h); 4006
3191 $widget->emit (size_allocate => $w, $h); 4007 $widget->emit (size_allocate => $w, $h);
4008 }
3192 } 4009 }
3193 } 4010 }
3194 4011
3195 while ($self->{post_alloc_hook}) { 4012 while ($self->{post_alloc_hook}) {
3196 $_->() 4013 $_->()
3197 for values %{delete $self->{post_alloc_hook}}; 4014 for values %{delete $self->{post_alloc_hook}};
3198 } 4015 }
4016
3199 4017
3200 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4018 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4019 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202 glClear GL_COLOR_BUFFER_BIT; 4020 glClear GL_COLOR_BUFFER_BIT;
3203 4021
… …
3205 glLoadIdentity; 4023 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4024 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 4025 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 4026 glLoadIdentity;
3209 4027
4028 {
4029 package CFClient::UI::Base;
4030
4031 ($draw_x, $draw_y, $draw_w, $draw_h) =
4032 (0, 0, $self->{w}, $self->{h});
4033 }
4034
3210 $self->_draw; 4035 $self->_draw;
3211} 4036}
3212 4037
3213############################################################################# 4038#############################################################################
3214 4039

Diff Legend

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