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

Diff Legend

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