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.224 by elmex, Tue May 23 20:00:55 2006 UTC vs.
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC

5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $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 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
50 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
51} 70}
52 71
53# class methods for events 72# class methods for events
54sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 75 if $FOCUS;
57} 76}
58 77
59sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 80 if $FOCUS;
62} 81}
63 82
64sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
65 my ($ev) = @_; 84 my ($ev) = @_;
74 check_tooltip; 93 check_tooltip;
75 } 94 }
76 95
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 97
79 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 100}
84 101
85sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
86 my ($ev) = @_; 103 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
88 105
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 107
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 109
93 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 112
98 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 115 $grab->update if $grab;
101 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 133
119 check_tooltip; 134 check_tooltip;
120 } 135 }
121 136
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 138 if $HOVER;
126} 139}
127 140
128# convert position array to integers 141# convert position array to integers
129sub harmonize { 142sub harmonize {
130 my ($vals) = @_; 143 my ($vals) = @_;
144 157
145 $_->update 158 $_->update
146 for @widgets; 159 for @widgets;
147} 160}
148 161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
149# call when resolution changes etc. 170# call when resolution changes etc.
150sub rescale_widgets { 171sub rescale_widgets {
151 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
152 173
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 174 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
166 } 189 }
167
168 $widget->reconfigure;
169 } 190 }
191
192 reconfigure_widgets;
170} 193}
171 194
172############################################################################# 195#############################################################################
173 196
174package CFClient::UI::Base; 197package CFClient::UI::Base;
179 202
180sub new { 203sub new {
181 my $class = shift; 204 my $class = shift;
182 205
183 my $self = bless { 206 my $self = bless {
184 x => 0, 207 x => "center",
185 y => 0, 208 y => "center",
186 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
187 can_events => 1, 212 can_events => 1,
188 @_ 213 @_
189 }, $class; 214 }, $class;
190 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
191 for (keys %$self) { 218 for (keys %$self) {
192 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
194 } 221 }
195 } 222 }
196 223
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
198 235
199 $self 236 $self
200} 237}
201 238
202sub destroy { 239sub destroy {
206 %$self = (); 243 %$self = ();
207} 244}
208 245
209sub show { 246sub show {
210 my ($self) = @_; 247 my ($self) = @_;
248
211 return if $self->{parent}; 249 return if $self->{parent};
212 250
213 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
214} 252}
215 253
216sub show_centered { 254sub set_visible {
217 my ($self) = @_; 255 my ($self) = @_;
256
218 return if $self->{parent}; 257 return if $self->{visible};
219 258
220 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
221 261
222 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228 263
229sub hide { 264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
230 my ($self) = @_; 270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
231 278
232 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
234 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
235 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
236 if $self->{parent}; 313 if $self->{parent};
237} 314}
238 315
239sub move { 316sub move_abs {
240 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
241 318
242 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
243 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
244 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
245 322
246 $self->update; 323 $self->update;
247} 324}
248 325
249sub set_size { 326sub set_size {
250 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
251 328
252 $self->{user_w} = $w; 329 $self->{force_w} = $w;
253 $self->{user_h} = $h; 330 $self->{force_h} = $h;
254 331
255 $self->check_size; 332 $self->realloc;
256} 333}
257 334
258sub size_request { 335sub size_request {
259 require Carp; 336 require Carp;
260 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
262 339
263sub configure { 340sub configure {
264 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
265 342
266 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
267 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
268 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
269 348
270 # use alignment to adjust x, y 349 # use alignment to adjust x, y
271 350
272 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
273 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
274
275 ($w, $h) = ($w2, $h2);
276 } 353 }
277 354
278 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
279 $self->{x} = $x; 356 $self->{x} = $x;
280 $self->{y} = $y; 357 $self->{y} = $y;
281 $self->update; 358 $self->update;
282 } 359 }
283 360
284 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
286 } 368 }
287} 369}
288 370
289sub size_allocate { 371sub size_allocate {
290 # nothing to be done 372 # nothing to be done
291} 373}
292 374
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
300sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
301} 381}
302 382
303sub set_max_size { 383sub set_max_size {
304 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
305 385
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
308} 388}
309 389
310sub set_tooltip { 390sub set_tooltip {
311 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
312 397
313 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
314 399
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
338 return if $FOCUS == $self; 423 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
340 425
341 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
342 427
343 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
344 429
345 $focus->update if $focus; 430 $focus->update if $focus;
346 $FOCUS->update; 431 $FOCUS->update;
347} 432}
348 433
351 436
352 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
353 438
354 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
355 440
356 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
357 442
358 $focus->update if $focus; #? 443 $focus->update if $focus; #?
359}
360 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
361sub mouse_motion { } 449sub mouse_motion { 0 }
362sub button_up { } 450sub button_up { 0 }
363sub key_down { } 451sub key_down { 0 }
364sub key_up { } 452sub key_up { 0 }
365 453
366sub button_down { 454sub button_down {
367 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
368 456
369 $self->focus_in; 457 $self->focus_in;
370}
371 458
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
376sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
377 535
378sub draw { 536sub draw {
379 my ($self) = @_; 537 my ($self) = @_;
380 538
381 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
382 550
383 glPushMatrix; 551 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw;
386 glPopMatrix;
387 553
388 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
389 my ($x, $y) = @$self{qw(x y)};
390
391 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
392 glEnable GL_BLEND; 556 glEnable GL_BLEND;
393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
394 glBegin GL_QUADS; 558 glBegin GL_QUADS;
395 glVertex $x , $y;
396 glVertex $x + $self->{w}, $y;
397 glVertex $x + $self->{w}, $y + $self->{h};
398 glVertex $x , $y + $self->{h};
399 glEnd;
400 glDisable GL_BLEND;
401 }
402
403 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix;
405 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 559 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 560 glVertex $self->{w}, 0;
410 glVertex $self->{w}, $self->{h}; 561 glVertex $self->{w}, $self->{h};
411 glVertex 0 , $self->{h}; 562 glVertex 0 , $self->{h};
412 glEnd; 563 glEnd;
564 glDisable GL_BLEND;
565 }
566
567 if ($ENV{CFPLUS_DEBUG} & 1) {
568 glPushMatrix;
569 glColor 1, 1, 0, 1;
570 glTranslate 0.375, 0.375;
571 glBegin GL_LINE_LOOP;
572 glVertex 0 , 0;
573 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1;
576 glEnd;
413 glPopMatrix; 577 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
416} 583}
417 584
418sub _draw { 585sub _draw {
419 my ($self) = @_; 586 my ($self) = @_;
420 587
421 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
422}
423
424sub find_widget {
425 my ($self, $x, $y) = @_;
426
427 return () unless $self->{can_events};
428
429 return $self
430 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433 ()
434}
435
436sub set_parent {
437 my ($self, $parent) = @_;
438
439 Scalar::Util::weaken ($self->{parent} = $parent);
440
441 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size
443 unless exists $self->{req_w};
444
445 $self->show;
446}
447
448sub check_size {
449 my ($self, $forced) = @_;
450
451 $self->{force_alloc} = 1 if $forced;
452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
453}
454
455sub update {
456 my ($self) = @_;
457
458 $self->{parent}->update
459 if $self->{parent};
460}
461
462sub connect {
463 my ($self, $signal, $cb) = @_;
464
465 push @{ $self->{signal_cb}{$signal} }, $cb;
466}
467
468sub emit {
469 my ($self, $signal, @args) = @_;
470
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472} 589}
473 590
474sub DESTROY { 591sub DESTROY {
475 my ($self) = @_; 592 my ($self) = @_;
476 593
508 625
509 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
510 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
511 628
512 glEnable GL_BLEND; 629 glEnable GL_BLEND;
513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
514 glColor @$color; 631 glColor_premultiply @$color;
515 632
516 glBegin GL_QUADS; 633 glBegin GL_QUADS;
517 glVertex 0 , 0; 634 glVertex 0 , 0;
518 glVertex 0 , $h; 635 glVertex 0 , $h;
519 glVertex $w, $h; 636 glVertex $w, $h;
534 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
536} 653}
537 654
538sub size_request { 655sub size_request {
539 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
540} 659}
541 660
542sub draw { } 661sub draw { }
543 662
544############################################################################# 663#############################################################################
548our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
549 668
550sub new { 669sub new {
551 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
552 671
553 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
554 673
555 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
556 children => [], 675 children => [],
557 can_events => 0, 676 can_events => 0,
558 %arg, 677 %arg,
559 ); 678 );
679
560 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
561 682
562 $self 683 $self
563} 684}
564 685
565sub add { 686sub add {
573 $self->{children} = [ 694 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
576 ]; 697 ];
577 698
578 $self->check_size (1); 699 $self->realloc;
579 $self->update;
580} 700}
581 701
582sub children { 702sub children {
583 @{ $_[0]{children} } 703 @{ $_[0]{children} }
584} 704}
589 delete $child->{parent}; 709 delete $child->{parent};
590 $child->hide; 710 $child->hide;
591 711
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 713
594 $self->check_size; 714 $self->realloc;
595 $self->update;
596} 715}
597 716
598sub clear { 717sub clear {
599 my ($self) = @_; 718 my ($self) = @_;
600 719
604 for (@$children) { 723 for (@$children) {
605 delete $_->{parent}; 724 delete $_->{parent};
606 $_->hide; 725 $_->hide;
607 } 726 }
608 727
609 $self->check_size; 728 $self->realloc;
610 $self->update;
611} 729}
612 730
613sub find_widget { 731sub find_widget {
614 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
615 733
616 $x -= $self->{x}; 734 $x -= $self->{x};
617 $y -= $self->{y}; 735 $y -= $self->{y};
618 736
619 my $res; 737 my $res;
620 738
621 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
622 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
623 and return $res; 741 and return $res;
624 } 742 }
625 743
626 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
675 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
676} 794}
677 795
678############################################################################# 796#############################################################################
679 797
798# back-buffered drawing area
799
680package CFClient::UI::Window; 800package CFClient::UI::Window;
681 801
682our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
683 803
684use CFClient::OpenGL; 804use CFClient::OpenGL;
702 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 823 $self->update;
704} 824}
705 825
706sub _render { 826sub _render {
827 my ($self) = @_;
828
707 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
708} 830}
709 831
710sub render_child { 832sub render_child {
711 my ($self) = @_; 833 my ($self) = @_;
712 834
713 $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 {
714 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
716 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
717 $self->_render; 846 $self->_render;
718 }; 847 };
719} 848}
720 849
721sub _draw { 850sub _draw {
722 my ($self) = @_; 851 my ($self) = @_;
723 852
724 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
725 854
726 my $tex = $self->{texture} 855 my $tex = $self->{texture}
727 or return; 856 or return;
728 857
729 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
731 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
732 861
733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
734 863
735 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
736} 865}
739 868
740package CFClient::UI::ViewPort; 869package CFClient::UI::ViewPort;
741 870
742our @ISA = CFClient::UI::Window::; 871our @ISA = CFClient::UI::Window::;
743 872
873sub new {
874 my $class = shift;
875
876 $class->SUPER::new (
877 scroll_x => 0,
878 scroll_y => 1,
879 @_,
880 )
881}
882
744sub size_request { 883sub size_request {
745 my ($self) = @_; 884 my ($self) = @_;
746 885
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 887
750 @$self{qw(child_w child_h)} 888 $w = 10 if $self->{scroll_x};
889 $h = 10 if $self->{scroll_y};
890
891 ($w, $h)
751} 892}
752 893
753sub size_allocate { 894sub size_allocate {
754 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
755 896
897 my $child = $self->child;
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
902 $self->child->configure (0, 0, $w, $h);
756 $self->update; 903 $self->update;
757} 904}
758 905
759sub set_offset { 906sub set_offset {
760 my ($self, $x, $y) = @_; 907 my ($self, $x, $y) = @_;
794} 941}
795 942
796sub _render { 943sub _render {
797 my ($self) = @_; 944 my ($self) = @_;
798 945
946 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
947 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
948
799 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 949 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
800 950
801 $self->SUPER::_render; 951 $self->SUPER::_render;
802} 952}
803 953
806package CFClient::UI::ScrolledWindow; 956package CFClient::UI::ScrolledWindow;
807 957
808our @ISA = CFClient::UI::HBox::; 958our @ISA = CFClient::UI::HBox::;
809 959
810sub new { 960sub new {
811 my $class = shift; 961 my ($class, %arg) = @_;
962
963 my $child = delete $arg{child};
812 964
813 my $self; 965 my $self;
814 966
815 my $slider = new CFClient::UI::Slider 967 my $slider = new CFClient::UI::Slider
816 vertical => 1, 968 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix 969 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub { 970 on_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 971 $self->{vp}->set_offset (0, $_[1]);
820 }, 972 },
821 ; 973 ;
822 974
823 $self = $class->SUPER::new ( 975 $self = $class->SUPER::new (
824 vp => (new CFClient::UI::ViewPort expand => 1), 976 vp => (new CFClient::UI::ViewPort expand => 1),
825 slider => $slider, 977 slider => $slider,
826 @_, 978 %arg,
827 ); 979 );
828 980
829 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp});
831 $self->add ($self->{slider}); 981 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child;
832 983
833 $self 984 $self
985}
986
987sub add {
988 my ($self, $widget) = @_;
989
990 $self->{vp}->add ($self->{child} = $widget);
991}
992
993sub update {
994 my ($self) = @_;
995
996 $self->SUPER::update;
997
998 # todo: overwrite size_allocate of child
999 my $child = $self->{vp}->child;
1000 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1001}
1002
1003sub size_allocate {
1004 my ($self, $w, $h) = @_;
1005
1006 $self->SUPER::size_allocate ($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]);
834} 1010}
835 1011
836#TODO# update range on size_allocate depending on child 1012#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll 1013# update viewport offset on scroll
838 1014
858 1034
859 if ($self->{bg}) { 1035 if ($self->{bg}) {
860 my ($w, $h) = @$self{qw(w h)}; 1036 my ($w, $h) = @$self{qw(w h)};
861 1037
862 glEnable GL_BLEND; 1038 glEnable GL_BLEND;
863 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1039 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
864 glColor @{ $self->{bg} }; 1040 glColor_premultiply @{ $self->{bg} };
865 1041
866 glBegin GL_QUADS; 1042 glBegin GL_QUADS;
867 glVertex 0 , 0; 1043 glVertex 0 , 0;
868 glVertex 0 , $h; 1044 glVertex 0 , $h;
869 glVertex $w, $h; 1045 glVertex $w, $h;
882 1058
883our @ISA = CFClient::UI::Bin::; 1059our @ISA = CFClient::UI::Bin::;
884 1060
885use CFClient::OpenGL; 1061use CFClient::OpenGL;
886 1062
887my @tex = 1063my $bg =
1064 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1065 mipmap => 1, wrap => 1;
1066
1067my @border =
888 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
889 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1069 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
890 1070
891sub new { 1071sub new {
892 my $class = shift; 1072 my ($class, %arg) = @_;
893 1073
894 # TODO: user_x, user_y, overwrite moveto? 1074 my $title = delete $arg{title};
895 1075
896 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
897 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
898 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
899 border => 0.6, 1079 border => 0.6,
900 toplevel => 1,
901 can_events => 1, 1080 can_events => 1,
902 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
903 ); 1084 );
904 1085
905 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title} = new CFClient::UI::Label
906 align => 0, 1087 align => 0,
907 valign => 1, 1088 valign => 1,
908 text => $self->{title}, 1089 text => $title,
909 fontsize => $self->{border}; 1090 fontsize => $self->{border}
1091 if defined $title;
910 1092
911 $self 1093 $self
1094}
1095
1096sub add {
1097 my ($self, @widgets) = @_;
1098
1099 $self->SUPER::add (@widgets);
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
912} 1101}
913 1102
914sub border { 1103sub border {
915 int $_[0]{border} * $::FONTSIZE 1104 int $_[0]{border} * $::FONTSIZE
916} 1105}
917 1106
918sub size_request { 1107sub size_request {
919 my ($self) = @_; 1108 my ($self) = @_;
1109
1110 $self->{title}->size_request
1111 if $self->{title};
920 1112
921 my ($w, $h) = $self->SUPER::size_request; 1113 my ($w, $h) = $self->SUPER::size_request;
922 1114
923 ( 1115 (
924 $w + $self->border * 2, 1116 $w + $self->border * 2,
927} 1119}
928 1120
929sub size_allocate { 1121sub size_allocate {
930 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
931 1123
1124 if ($self->{title}) {
1125 $self->{title}{w} = $w;
1126 $self->{title}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h);
1128 }
1129
1130 my $border = $self->border;
1131
932 $h -= List::Util::max 0, $self->border * 2; 1132 $h -= List::Util::max 0, $border * 2;
933 $w -= List::Util::max 0, $self->border * 2; 1133 $w -= List::Util::max 0, $border * 2;
934 1134
935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
936 if $self->{title};
937
938 $self->child->configure ($self->border, $self->border, $w, $h); 1135 $self->child->configure ($border, $border, $w, $h);
939} 1136}
940 1137
941sub button_down { 1138sub button_down {
942 my ($self, $ev, $x, $y) = @_; 1139 my ($self, $ev, $x, $y) = @_;
943 1140
959 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
960 1157
961 my $dx = $ev->{x} - $ox; 1158 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy; 1159 my $dy = $ev->{y} - $oy;
963 1160
964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1161 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1162 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1163
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
967 $self->check_size; 1165 $self->realloc;
968 }; 1166 };
969 1167
970 } elsif ($lr ^ $td) { 1168 } elsif ($lr ^ $td) {
971 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1169 my ($ox, $oy) = ($ev->{x}, $ev->{y});
972 my ($bx, $by) = ($self->{x}, $self->{y}); 1170 my ($bx, $by) = ($self->{x}, $self->{y});
974 $self->{motion} = sub { 1172 $self->{motion} = sub {
975 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
976 1174
977 ($x, $y) = ($ev->{x}, $ev->{y}); 1175 ($x, $y) = ($ev->{x}, $ev->{y});
978 1176
979 $self->move ($bx + $x - $ox, $by + $y - $oy); 1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
980 $self->update; 1178 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
981 }; 1180 };
1181 } else {
1182 return 0;
1183 }
1184
982 } 1185 1
983} 1186}
984 1187
985sub button_up { 1188sub button_up {
986 my ($self, $ev, $x, $y) = @_; 1189 my ($self, $ev, $x, $y) = @_;
987 1190
988 delete $self->{motion}; 1191 !!delete $self->{motion}
989} 1192}
990 1193
991sub mouse_motion { 1194sub mouse_motion {
992 my ($self, $ev, $x, $y) = @_; 1195 my ($self, $ev, $x, $y) = @_;
993 1196
994 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1197 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198
1199 !!$self->{motion}
995} 1200}
996 1201
997sub _draw { 1202sub _draw {
998 my ($self) = @_; 1203 my ($self) = @_;
999 1204
1205 my $child = $self->{children}[0];
1206
1000 my ($w, $h ) = ($self->{w}, $self->{h}); 1207 my ($w, $h ) = ($self->{w}, $self->{h});
1001 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1208 my ($cw, $ch) = ($child->{w}, $child->{h});
1002 1209
1003 glEnable GL_TEXTURE_2D; 1210 glEnable GL_TEXTURE_2D;
1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1005 1212
1006 my $border = $self->border; 1213 my $border = $self->border;
1007 1214
1008 glColor @{ $self->{border_bg} }; 1215 glColor @{ $self->{border_bg} };
1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1216 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1217 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1218 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1219 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1013 1220
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1221 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1015 my $bg = $tex[0]; 1222 glColor @{ $self->{bg} };
1016 1223
1017 # TODO: repeat texture not scale 1224 # TODO: repeat texture not scale
1225 # solve this better(?)
1018 my $rep_x = $cw / $bg->{w}; 1226 $bg->{s} = $cw / $bg->{w};
1019 my $rep_y = $ch / $bg->{h}; 1227 $bg->{t} = $ch / $bg->{h};
1020
1021 glColor @{ $self->{bg} };
1022
1023 $bg->{s} = $rep_x;
1024 $bg->{t} = $rep_y;
1025 $bg->{wrap_mode} = 1;
1026 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1228 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 } 1229 }
1028 1230
1029 glDisable GL_TEXTURE_2D; 1231 glDisable GL_TEXTURE_2D;
1030 1232
1031 $self->{title}->draw if $self->{title};
1032
1033 $self->child->draw; 1233 $child->draw;
1234
1235 if ($self->{title}) {
1236 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw;
1238 }
1034} 1239}
1035 1240
1036############################################################################# 1241#############################################################################
1037 1242
1038package CFClient::UI::Table; 1243package CFClient::UI::Table;
1046sub new { 1251sub new {
1047 my $class = shift; 1252 my $class = shift;
1048 1253
1049 $class->SUPER::new ( 1254 $class->SUPER::new (
1050 col_expand => [], 1255 col_expand => [],
1051 @_ 1256 @_,
1052 ) 1257 )
1258}
1259
1260sub children {
1261 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053} 1262}
1054 1263
1055sub add { 1264sub add {
1056 my ($self, $x, $y, $child) = @_; 1265 my ($self, $x, $y, $child) = @_;
1057 1266
1058 $child->set_parent ($self); 1267 $child->set_parent ($self);
1059 $self->{children}[$y][$x] = $child; 1268 $self->{children}[$y][$x] = $child;
1060 1269
1061 $child->check_size; 1270 $self->realloc;
1062} 1271}
1063 1272
1064sub children {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066}
1067
1068# TODO: move to container class maybe? send childs a signal on removal? 1273# TODO: move to container class maybe? send children a signal on removal?
1069sub clear { 1274sub clear {
1070 my ($self) = @_; 1275 my ($self) = @_;
1071 1276
1072 my @children = $self->children; 1277 my @children = $self->children;
1073 delete $self->{children}; 1278 delete $self->{children};
1075 for (@children) { 1280 for (@children) {
1076 delete $_->{parent}; 1281 delete $_->{parent};
1077 $_->hide; 1282 $_->hide;
1078 } 1283 }
1079 1284
1080 $self->update; 1285 $self->realloc;
1081} 1286}
1082 1287
1083sub get_wh { 1288sub get_wh {
1084 my ($self) = @_; 1289 my ($self) = @_;
1085 1290
1116sub size_allocate { 1321sub size_allocate {
1117 my ($self, $w, $h) = @_; 1322 my ($self, $w, $h) = @_;
1118 1323
1119 my ($ws, $hs) = $self->get_wh; 1324 my ($ws, $hs) = $self->get_wh;
1120 1325
1121 my $req_w = sum @$ws; 1326 my $req_w = (sum @$ws) || 1;
1122 my $req_h = sum @$hs; 1327 my $req_h = (sum @$hs) || 1;
1123 1328
1124 # TODO: nicer code && do row_expand 1329 # TODO: nicer code && do row_expand
1125 my @col_expand = @{$self->{col_expand}}; 1330 my @col_expand = @{$self->{col_expand}};
1126 @col_expand = (1) x @$ws unless @col_expand; 1331 @col_expand = (1) x @$ws unless @col_expand;
1127 my $col_expand = (sum @col_expand) || 1; 1332 my $col_expand = (sum @col_expand) || 1;
1181 } 1386 }
1182} 1387}
1183 1388
1184############################################################################# 1389#############################################################################
1185 1390
1186package CFClient::UI::HBox; 1391package CFClient::UI::Box;
1187
1188# TODO: wrap into common Box base class
1189 1392
1190our @ISA = CFClient::UI::Container::; 1393our @ISA = CFClient::UI::Container::;
1191 1394
1192sub size_request { 1395sub size_request {
1193 my ($self) = @_; 1396 my ($self) = @_;
1194 1397
1195 my @alloc = map [$_->size_request], @{$self->{children}}; 1398 $self->{vertical}
1196 1399 ? (
1197 ( 1400 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1198 (List::Util::sum map $_->[0], @alloc), 1401 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1199 (List::Util::max map $_->[1], @alloc), 1402 )
1200 ) 1403 : (
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 )
1201} 1407}
1202 1408
1203sub size_allocate { 1409sub size_allocate {
1204 my ($self, $w, $h) = @_; 1410 my ($self, $w, $h) = @_;
1205 1411
1206 ($h, $w) = ($w, $h); 1412 my $space = $self->{vertical} ? $h : $w;
1207
1208 my $children = $self->{children}; 1413 my $children = $self->{children};
1209 1414
1210 my @h = map $_->{req_w}, @$children; 1415 my @req;
1211 1416
1212 my $req_h = List::Util::sum @h; 1417 if ($self->{homogeneous}) {
1213 1418 @req = ($space / (@$children || 1)) x @$children;
1214 if ($req_h > $h) {
1215 # ah well, not enough space
1216 $_ *= $h / $req_h for @h;
1217 } else { 1419 } else {
1420 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1421 my $req = List::Util::sum @req;
1422
1423 if ($req > $space) {
1424 # ah well, not enough space
1425 $_ *= $space / $req for @req;
1426 } else {
1218 my $exp = List::Util::sum map $_->{expand}, @$children; 1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1219 $exp ||= 1;
1220 1428
1429 $space = ($space - $req) / $expand; # remaining space to give away
1430
1431 $req[$_] += $space * $children->[$_]{expand}
1221 for (0 .. $#$children) { 1432 for 0 .. $#$children;
1222 my $child = $children->[$_];
1223
1224 my $alloc_h = $h[$_];
1225 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1226 $h[$_] = $alloc_h;
1227 } 1433 }
1228 } 1434 }
1229 1435
1230 CFClient::UI::harmonize \@h; 1436 CFClient::UI::harmonize \@req;
1231 1437
1232 my $y = 0; 1438 my $pos = 0;
1233 for (0 .. $#$children) { 1439 for (0 .. $#$children) {
1234 my $child = $children->[$_];
1235 my $h = $h[$_]; 1440 my $alloc = $req[$_];
1236 $child->configure ($y, 0, $h, $w); 1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1237 1442
1238 $y += $h; 1443 $pos += $alloc;
1239 } 1444 }
1240 1445
1241 1 1446 1
1242} 1447}
1243 1448
1244############################################################################# 1449#############################################################################
1245 1450
1451package CFClient::UI::HBox;
1452
1453our @ISA = CFClient::UI::Box::;
1454
1455sub new {
1456 my $class = shift;
1457
1458 $class->SUPER::new (
1459 vertical => 0,
1460 @_,
1461 )
1462}
1463
1464#############################################################################
1465
1246package CFClient::UI::VBox; 1466package CFClient::UI::VBox;
1247 1467
1248# TODO: wrap into common Box base class
1249
1250our @ISA = CFClient::UI::Container::; 1468our @ISA = CFClient::UI::Box::;
1251 1469
1252sub size_request { 1470sub new {
1253 my ($self) = @_; 1471 my $class = shift;
1254 1472
1255 my @alloc = map [$_->size_request], @{$self->{children}}; 1473 $class->SUPER::new (
1256 1474 vertical => 1,
1257 ( 1475 @_,
1258 (List::Util::max map $_->[0], @alloc),
1259 (List::Util::sum map $_->[1], @alloc),
1260 ) 1476 )
1261}
1262
1263sub size_allocate {
1264 my ($self, $w, $h) = @_;
1265
1266 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1268 my $children = $self->{children};
1269
1270 my @h = map $_->{req_h}, @$children;
1271
1272 my $req_h = List::Util::sum @h;
1273
1274 if ($req_h > $h) {
1275 # ah well, not enough space
1276 $_ *= $h / $req_h for @h;
1277 } else {
1278 my $exp = List::Util::sum map $_->{expand}, @$children;
1279 $exp ||= 1;
1280
1281 for (0 .. $#$children) {
1282 my $child = $children->[$_];
1283
1284 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1285 }
1286 }
1287
1288 CFClient::UI::harmonize \@h;
1289
1290 my $y = 0;
1291 for (0 .. $#$children) {
1292 my $child = $children->[$_];
1293 my $h = $h[$_];
1294 $child->configure (0, $y, $w, $h);
1295
1296 $y += $h;
1297 }
1298
1299 1
1300} 1477}
1301 1478
1302############################################################################# 1479#############################################################################
1303 1480
1304package CFClient::UI::Label; 1481package CFClient::UI::Label;
1321 ellipsise => 3, # end 1498 ellipsise => 3, # end
1322 layout => (new CFClient::Layout), 1499 layout => (new CFClient::Layout),
1323 fontsize => 1, 1500 fontsize => 1,
1324 align => -1, 1501 align => -1,
1325 valign => -1, 1502 valign => -1,
1326 padding => 2, 1503 padding_x => 2,
1504 padding_y => 2,
1327 can_events => 0, 1505 can_events => 0,
1328 %arg 1506 %arg
1329 ); 1507 );
1330 1508
1331 if (exists $self->{template}) { 1509 if (exists $self->{template}) {
1367 $self->{text} = "T$text"; 1545 $self->{text} = "T$text";
1368 1546
1369 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1548 $self->{layout}->set_text ($text);
1371 1549
1550 $self->realloc;
1372 $self->update; 1551 $self->update;
1373 $self->check_size;
1374} 1552}
1375 1553
1376sub set_markup { 1554sub set_markup {
1377 my ($self, $markup) = @_; 1555 my ($self, $markup) = @_;
1378 1556
1382 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1560 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383 1561
1384 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1385 $self->{layout}->set_markup ($markup); 1563 $self->{layout}->set_markup ($markup);
1386 1564
1565 $self->realloc;
1387 $self->update; 1566 $self->update;
1388 $self->check_size;
1389} 1567}
1390 1568
1391sub size_request { 1569sub size_request {
1392 my ($self) = @_; 1570 my ($self) = @_;
1393 1571
1407 1585
1408 $w = List::Util::max $w, $w2; 1586 $w = List::Util::max $w, $w2;
1409 $h = List::Util::max $h, $h2; 1587 $h = List::Util::max $h, $h2;
1410 } 1588 }
1411 1589
1412 ( 1590 ($w, $h)
1413 $w + $self->{padding} * 2,
1414 $h + $self->{padding} * 2,
1415 )
1416} 1591}
1417 1592
1418sub size_allocate { 1593sub size_allocate {
1419 my ($self, $w, $h) = @_; 1594 my ($self, $w, $h) = @_;
1420 1595
1596 delete $self->{ox};
1597
1421 delete $self->{texture}; 1598 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1422} 1600}
1423 1601
1424sub set_fontsize { 1602sub set_fontsize {
1425 my ($self, $fontsize) = @_; 1603 my ($self, $fontsize) = @_;
1426 1604
1427 $self->{fontsize} = $fontsize; 1605 $self->{fontsize} = $fontsize;
1428 delete $self->{texture}; 1606 delete $self->{texture};
1429 1607
1430 $self->update; 1608 $self->realloc;
1431 $self->check_size;
1432} 1609}
1433 1610
1434sub _draw { 1611sub _draw {
1435 my ($self) = @_; 1612 my ($self) = @_;
1436 1613
1442 $self->{layout}->set_width ($self->{w}); 1619 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1620 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446 1623
1447 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1624 new_from_layout CFClient::Texture $self->{layout}
1625 };
1448 1626
1627 unless (exists $self->{ox}) {
1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1451 : ($self->{w} - $tex->{w}) * 0.5); 1630 : ($self->{w} - $tex->{w}) * 0.5);
1452 1631
1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1455 : ($self->{h} - $tex->{h}) * 0.5); 1634 : ($self->{h} - $tex->{h}) * 0.5);
1456
1457 $tex
1458 }; 1635 };
1459 1636
1460 glEnable GL_TEXTURE_2D; 1637 glEnable GL_TEXTURE_2D;
1461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1462 1639
1640 glColor_premultiply @{$self->{fg}}
1463 if ($tex->{format} == GL_ALPHA) { 1641 if $tex->{format} == GL_ALPHA;
1464 glColor @{$self->{fg}}; 1642
1465 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1466 } else {
1467 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1468 }
1469 1644
1470 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1471} 1646}
1472 1647
1473############################################################################# 1648#############################################################################
1488 active_fg => [0, 0, 0], 1663 active_fg => [0, 0, 0],
1489 can_hover => 1, 1664 can_hover => 1,
1490 can_focus => 1, 1665 can_focus => 1,
1491 valign => 0, 1666 valign => 0,
1492 can_events => 1, 1667 can_events => 1,
1668 #text => ...
1493 @_ 1669 @_
1494 ) 1670 )
1495} 1671}
1496 1672
1497sub _set_text { 1673sub _set_text {
1499 1675
1500 delete $self->{cur_h}; 1676 delete $self->{cur_h};
1501 1677
1502 return if $self->{text} eq $text; 1678 return if $self->{text} eq $text;
1503 1679
1504 delete $self->{texture};
1505
1506 $self->{last_activity} = $::NOW; 1680 $self->{last_activity} = $::NOW;
1507 $self->{text} = $text; 1681 $self->{text} = $text;
1508 1682
1509 $text =~ s/./*/g if $self->{hidden}; 1683 $text =~ s/./*/g if $self->{hidden};
1510 $self->{layout}->set_text ("$text "); 1684 $self->{layout}->set_text ("$text ");
1511 1685
1512 $self->emit (changed => $self->{text}); 1686 $self->_emit (changed => $self->{text});
1687 $self->update;
1513} 1688}
1514 1689
1515sub set_text { 1690sub set_text {
1516 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1517 1692
1518 $self->{cursor} = length $text; 1693 $self->{cursor} = length $text;
1519 $self->_set_text ($text); 1694 $self->_set_text ($text);
1520 $self->update; 1695
1521 $self->check_size; 1696 $self->realloc;
1522} 1697}
1523 1698
1524sub get_text { 1699sub get_text {
1525 $_[0]{text} 1700 $_[0]{text}
1526} 1701}
1529 my ($self) = @_; 1704 my ($self) = @_;
1530 1705
1531 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1532 1707
1533 ($w + 1, $h) # add 1 for cursor 1708 ($w + 1, $h) # add 1 for cursor
1534}
1535
1536sub size_allocate {
1537 my ($self, $w, $h) = @_;
1538
1539 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1540} 1709}
1541 1710
1542sub key_down { 1711sub key_down {
1543 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1544 1713
1559 } elsif ($sym == CFClient::SDLK_HOME) { 1728 } elsif ($sym == CFClient::SDLK_HOME) {
1560 $self->{cursor} = 0; 1729 $self->{cursor} = 0;
1561 } elsif ($sym == CFClient::SDLK_END) { 1730 } elsif ($sym == CFClient::SDLK_END) {
1562 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1563 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1564 $self->emit ('escape'); 1733 $self->_emit ('escape');
1565 } elsif ($uni) { 1734 } elsif ($uni) {
1566 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1567 } 1738 }
1568 1739
1569 $self->_set_text ($text); 1740 $self->_set_text ($text);
1570 $self->update; 1741
1571 $self->check_size; 1742 $self->realloc;
1743
1744 1
1572} 1745}
1573 1746
1574sub focus_in { 1747sub focus_in {
1575 my ($self) = @_; 1748 my ($self) = @_;
1576 1749
1591 utf8::encode $text; 1764 utf8::encode $text;
1592 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1593 1766
1594 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1595 $self->update; 1768 $self->update;
1769
1770 1
1596} 1771}
1597 1772
1598sub mouse_motion { 1773sub mouse_motion {
1599 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1600# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1601} 1778}
1602 1779
1603sub _draw { 1780sub _draw {
1604 my ($self) = @_; 1781 my ($self) = @_;
1605 1782
1606 local $self->{fg} = $self->{fg}; 1783 local $self->{fg} = $self->{fg};
1607 1784
1608 if ($FOCUS == $self) { 1785 if ($FOCUS == $self) {
1609 glColor @{$self->{active_bg}}; 1786 glColor_premultiply @{$self->{active_bg}};
1610 $self->{fg} = $self->{active_fg}; 1787 $self->{fg} = $self->{active_fg};
1611 } else { 1788 } else {
1612 glColor @{$self->{bg}}; 1789 glColor_premultiply @{$self->{bg}};
1613 } 1790 }
1614 1791
1615 glEnable GL_BLEND; 1792 glEnable GL_BLEND;
1616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1793 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1617 glBegin GL_QUADS; 1794 glBegin GL_QUADS;
1618 glVertex 0 , 0; 1795 glVertex 0 , 0;
1619 glVertex 0 , $self->{h}; 1796 glVertex 0 , $self->{h};
1620 glVertex $self->{w}, $self->{h}; 1797 glVertex $self->{w}, $self->{h};
1621 glVertex $self->{w}, 0; 1798 glVertex $self->{w}, 0;
1656 if ($sym == 13) { 1833 if ($sym == 13) {
1657 unshift @{$self->{history}}, 1834 unshift @{$self->{history}},
1658 my $txt = $self->get_text; 1835 my $txt = $self->get_text;
1659 $self->{history_pointer} = -1; 1836 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = ''; 1837 $self->{history_saveback} = '';
1661 $self->emit (activate => $txt); 1838 $self->_emit (activate => $txt);
1662 $self->update; 1839 $self->update;
1663 1840
1664 } elsif ($sym == CFClient::SDLK_UP) { 1841 } elsif ($sym == CFClient::SDLK_UP) {
1665 if ($self->{history_pointer} < 0) { 1842 if ($self->{history_pointer} < 0) {
1666 $self->{history_saveback} = $self->get_text; 1843 $self->{history_saveback} = $self->get_text;
1682 } else { 1859 } else {
1683 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1684 } 1861 }
1685 1862
1686 } else { 1863 } else {
1687 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1688 } 1867 1
1689
1690} 1868}
1691 1869
1692############################################################################# 1870#############################################################################
1693 1871
1694package CFClient::UI::Button; 1872package CFClient::UI::Button;
1703 1881
1704sub new { 1882sub new {
1705 my $class = shift; 1883 my $class = shift;
1706 1884
1707 $class->SUPER::new ( 1885 $class->SUPER::new (
1708 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1709 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1710 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1711 can_hover => 1, 1890 can_hover => 1,
1712 align => 0, 1891 align => 0,
1713 valign => 0, 1892 valign => 0,
1714 can_events => 1, 1893 can_events => 1,
1715 @_ 1894 @_
1716 ) 1895 )
1717} 1896}
1718 1897
1898sub activate { }
1899
1719sub button_up { 1900sub button_up {
1720 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1721 1902
1903 $self->emit ("activate")
1722 if ($x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1723 && $y >= 0 && $y < $self->{h}) { 1905 && $y >= 0 && $y < $self->{h};
1724 $self->emit ("activate"); 1906
1725 } 1907 1
1726} 1908}
1727 1909
1728sub _draw { 1910sub _draw {
1729 my ($self) = @_; 1911 my ($self) = @_;
1730 1912
1731 local $self->{fg} = $self->{fg}; 1913 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1732
1733 if ($GRAB == $self) {
1734 $self->{fg} = $self->{active_fg};
1735 }
1736 1914
1737 glEnable GL_TEXTURE_2D; 1915 glEnable GL_TEXTURE_2D;
1738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1739 glColor 0, 0, 0, 1; 1917 glColor 0, 0, 0, 1;
1740 1918
1759 1937
1760sub new { 1938sub new {
1761 my $class = shift; 1939 my $class = shift;
1762 1940
1763 $class->SUPER::new ( 1941 $class->SUPER::new (
1764 padding => 2, 1942 padding_x => 2,
1943 padding_y => 2,
1765 fg => [1, 1, 1], 1944 fg => [1, 1, 1],
1766 active_fg => [1, 1, 0], 1945 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2], 1946 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5], 1947 active_bg => [1, 1, 1, 0.5],
1769 state => 0, 1948 state => 0,
1773} 1952}
1774 1953
1775sub size_request { 1954sub size_request {
1776 my ($self) = @_; 1955 my ($self) = @_;
1777 1956
1778 ($self->{padding} * 2 + 6) x 2 1957 (6) x 2
1779} 1958}
1780 1959
1781sub button_down { 1960sub button_down {
1782 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1783 1962
1784 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1785 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1786 $self->{state} = !$self->{state}; 1965 $self->{state} = !$self->{state};
1787 $self->emit (changed => $self->{state}); 1966 $self->_emit (changed => $self->{state});
1967 } else {
1968 return 0
1969 }
1970
1788 } 1971 1
1789} 1972}
1790 1973
1791sub _draw { 1974sub _draw {
1792 my ($self) = @_; 1975 my ($self) = @_;
1793 1976
1794 $self->SUPER::_draw; 1977 $self->SUPER::_draw;
1795 1978
1796 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1979 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1797 1980
1798 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1981 my ($w, $h) = @$self{qw(w h)};
1982
1983 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1799 1984
1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1985 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1801 1986
1802 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1987 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803 1988
1958 2143
1959 my $h1 = $self->{h} * (1 - $ycut1); 2144 my $h1 = $self->{h} * (1 - $ycut1);
1960 my $h2 = $self->{h} * (1 - $ycut2); 2145 my $h2 = $self->{h} * (1 - $ycut2);
1961 2146
1962 glEnable GL_BLEND; 2147 glEnable GL_BLEND;
1963 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1964 glEnable GL_TEXTURE_2D; 2150 glEnable GL_TEXTURE_2D;
1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1966 2152
1967 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2153 glBindTexture GL_TEXTURE_2D, $t1->{name};
1968 glBegin GL_QUADS; 2154 glBegin GL_QUADS;
2067 my $self = $class->SUPER::new ( 2253 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2254 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2255 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2256 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2257 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2258 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2259 min_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2260 min_h => $::WIDTH / 80,
2075 vertical => 0, 2261 vertical => 0,
2076 can_hover => 1, 2262 can_hover => 1,
2077 inner_pad => 0.02, 2263 inner_pad => 0.02,
2078 @_ 2264 @_
2079 ); 2265 );
2082 $self->update; 2268 $self->update;
2083 2269
2084 $self 2270 $self
2085} 2271}
2086 2272
2273sub changed { }
2274
2275sub set_range {
2276 my ($self, $range) = @_;
2277
2278 ($range, $self->{range}) = ($self->{range}, $range);
2279
2280 $self->update
2281 if "@$range" ne "@{$self->{range}}";
2282}
2283
2087sub set_value { 2284sub set_value {
2088 my ($self, $value) = @_; 2285 my ($self, $value) = @_;
2089 2286
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2287 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2288
2092 $hi = $lo + 1 if $hi <= $lo; 2289 $hi = $lo + 1 if $hi <= $lo;
2093 2290
2291 $page = $hi - $lo if $page > $hi - $lo;
2292
2094 $value = $lo if $value < $lo; 2293 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2294 $value = $hi - $page if $value > $hi - $page;
2096 2295
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2296 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2297 if $unit;
2099 2298
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2299 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2300
2104 if ($value != $old_value) { 2301 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2302 $self->_emit (changed => $value);
2106 $self->update; 2303 $self->update;
2107 } 2304 }
2108} 2305}
2109 2306
2110sub size_request { 2307sub size_request {
2111 my ($self) = @_; 2308 my ($self) = @_;
2112 2309
2113 my $w = $self->{req_w}; 2310 ($self->{req_w}, $self->{req_h})
2114 my $h = $self->{req_h};
2115
2116 $self->{vertical} ? ($h, $w) : ($w, $h)
2117} 2311}
2118 2312
2119sub button_down { 2313sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2314 my ($self, $ev, $x, $y) = @_;
2121 2315
2122 $self->SUPER::button_down ($ev, $x, $y); 2316 $self->SUPER::button_down ($ev, $x, $y);
2317
2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2319
2123 $self->mouse_motion ($ev, $x, $y); 2320 $self->mouse_motion ($ev, $x, $y)
2124} 2321}
2125 2322
2126sub mouse_motion { 2323sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2324 my ($self, $ev, $x, $y) = @_;
2128 2325
2129 if ($GRAB == $self) { 2326 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2327 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2328
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2329 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2330
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2331 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2332
2136 $self->set_value ($x * ($hi - $lo) + $lo); 2333 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2334 } else {
2335 return 0;
2336 }
2337
2137 } 2338 1
2138} 2339}
2139 2340
2140sub update { 2341sub update {
2141 my ($self) = @_; 2342 my ($self) = @_;
2142 2343
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2344 delete $self->{knob_w};
2345 $self->SUPER::update;
2346}
2347
2348sub _draw {
2349 my ($self) = @_;
2350
2351 unless ($self->{knob_w}) {
2144 $self->set_value ($self->{range}[0]); 2352 $self->set_value ($self->{range}[0]);
2145 2353
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2354 my ($value, $lo, $hi, $page) = @{$self->{range}};
2355 my $range = ($hi - $page - $lo) || 1e-100;
2147 2356
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2357 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2358
2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2359 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2360 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151 2361
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2362 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2363 $value = $value * $self->{scale} + $self->{offset};
2154 2364
2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value; 2365 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2366 $self->{knob_w} = $knob_w;
2162 }); 2367 }
2163
2164 $self->SUPER::update;
2165}
2166
2167sub _draw {
2168 my ($self) = @_;
2169 2368
2170 $self->SUPER::_draw (); 2369 $self->SUPER::_draw ();
2171 2370
2172 glScale $self->{w}, $self->{h}; 2371 glScale $self->{w}, $self->{h};
2173 2372
2190 # draw handle 2389 # draw handle
2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2390 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192 2391
2193 glDisable GL_TEXTURE_2D; 2392 glDisable GL_TEXTURE_2D;
2194} 2393}
2394
2395#############################################################################
2396
2397package CFClient::UI::ValSlider;
2398
2399our @ISA = CFClient::UI::HBox::;
2400
2401sub new {
2402 my ($class, %arg) = @_;
2403
2404 my $range = delete $arg{range};
2405
2406 my $self = $class->SUPER::new (
2407 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2408 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2409 to_value => sub { shift },
2410 from_value => sub { shift },
2411 %arg,
2412 );
2413
2414 $self->{slider}->connect (changed => sub {
2415 my ($self, $value) = @_;
2416 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2417 $self->{parent}->emit (changed => $value);
2418 });
2419
2420# $self->{entry}->connect (changed => sub {
2421# my ($self, $value) = @_;
2422# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2423# $self->{parent}->emit (changed => $value);
2424# });
2425
2426 $self->add ($self->{slider}, $self->{entry});
2427
2428 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2429
2430 $self
2431}
2432
2433sub set_range { shift->{slider}->set_range (@_) }
2434sub set_value { shift->{slider}->set_value (@_) }
2195 2435
2196############################################################################# 2436#############################################################################
2197 2437
2198package CFClient::UI::TextView; 2438package CFClient::UI::TextView;
2199 2439
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2481 $self->{layout}->set_width ($self->{children}[0]{w});
2242 2482
2243 $self->reflow; 2483 $self->reflow;
2244} 2484}
2245 2485
2246sub text_height { 2486sub text_size {
2247 my ($self, $text, $indent) = @_; 2487 my ($self, $text, $indent) = @_;
2248 2488
2249 my $layout = $self->{layout}; 2489 my $layout = $self->{layout};
2250 2490
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2491 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2492 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text); 2493 $layout->set_markup ($text);
2254 2494
2255 ($layout->size)[1] 2495 $layout->size
2256} 2496}
2257 2497
2258sub reflow { 2498sub reflow {
2259 my ($self) = @_; 2499 my ($self) = @_;
2260 2500
2261 $self->{need_reflow}++; 2501 $self->{need_reflow}++;
2262 $self->update; 2502 $self->update;
2263} 2503}
2264 2504
2505sub set_offset {
2506 my ($self, $offset) = @_;
2507
2508 # todo: base offset on lines or so, not on pixels
2509 $self->{children}[1]->set_value ($offset);
2510}
2511
2512sub clear {
2513 my ($self) = @_;
2514
2515 $self->{par} = [];
2516 $self->{height} = 0;
2517 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2518}
2519
2265sub add_paragraph { 2520sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2521 my ($self, $color, $text, $indent) = @_;
2267 2522
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2523 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2524 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2525 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2527 }
2275 2528
2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2529 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277 $self->{children}[1]->update;
2278} 2530}
2279 2531
2280sub update { 2532sub update {
2281 my ($self) = @_; 2533 my ($self) = @_;
2282 2534
2285 return unless $self->{h} > 0; 2537 return unless $self->{h} > 0;
2286 2538
2287 delete $self->{texture}; 2539 delete $self->{texture};
2288 2540
2289 $ROOT->on_post_alloc ($self, sub { 2541 $ROOT->on_post_alloc ($self, sub {
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543
2290 if (delete $self->{need_reflow}) { 2544 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2545 my $height = 0;
2292 2546
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
2294 for @{$self->{par}}; 2551 for (@{$self->{par}}) {
2552 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2553 $layout->set_width ($W - $_->[3]);
2554 $layout->set_markup ($_->[4]);
2555 my ($w, $h) = $layout->size;
2556 $_->[0] = $w + $_->[3];
2557 $_->[1] = $h;
2558 }
2559
2560 $height += $_->[1];
2561 }
2295 2562
2296 $self->{height} = $height; 2563 $self->{height} = $height;
2297 2564
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update;
2300 2566
2301 delete $self->{texture}; 2567 delete $self->{texture};
2302 } 2568 }
2303 2569
2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2571 glClearColor 0, 0, 0, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2572 glClear GL_COLOR_BUFFER_BIT;
2307 2573
2308 my $top = int $self->{children}[1]{range}[0]; 2574 my $top = int $self->{children}[1]{range}[0];
2309 2575
2310 my $y0 = $top; 2576 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2577 my $y1 = $top + $H;
2312 2578
2313 my $y = 0; 2579 my $y = 0;
2314 2580
2315 my $layout = $self->{layout}; 2581 my $layout = $self->{layout};
2316 2582
2317 $layout->set_font ($self->{font}) if $self->{font}; 2583 $layout->set_font ($self->{font}) if $self->{font};
2318 2584
2319 glEnable GL_BLEND; 2585 glEnable GL_BLEND;
2586 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2587 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2588
2322 for my $par (@{$self->{par}}) { 2589 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2590 my $h = $par->[1];
2324 2591
2325 if ($y0 < $y + $h && $y < $y1) { 2592 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2593 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2594 $layout->set_width ($W - $par->[3]);
2328 $layout->set_markup ($par->[3]); 2595 $layout->set_markup ($par->[4]);
2329 2596
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2597 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2598
2332 glRasterPos $par->[2], $y - $y0; 2599 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2600 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2601 }
2335 2602
2336 $y += $h; 2603 $y += $h;
2337 } 2604 }
2344sub _draw { 2611sub _draw {
2345 my ($self) = @_; 2612 my ($self) = @_;
2346 2613
2347 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2349 glColor 1, 1, 1, 1; 2616 glColor 0, 0, 0, 1;
2350 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2617 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2351 glDisable GL_TEXTURE_2D; 2618 glDisable GL_TEXTURE_2D;
2352 2619
2353 $self->{children}[1]->draw; 2620 $self->{children}[1]->draw;
2354 2621
2355} 2622}
2404 2671
2405sub new { 2672sub new {
2406 my $class = shift; 2673 my $class = shift;
2407 2674
2408 my $self = $class->SUPER::new ( 2675 my $self = $class->SUPER::new (
2409 state => 0, 2676 state => 0,
2410 connect_activate => \&toggle_flopper, 2677 on_activate => \&toggle_flopper,
2411 @_ 2678 @_
2412 ); 2679 );
2413 2680
2414 if ($self->{state}) {
2415 $self->{state} = 0;
2416 $self->toggle_flopper;
2417 }
2418
2419 $self 2681 $self
2420} 2682}
2421 2683
2422sub toggle_flopper { 2684sub toggle_flopper {
2423 my ($self) = @_; 2685 my ($self) = @_;
2424 2686
2425 # TODO: use animation 2687 $self->{other}->toggle_visibility;
2426 if ($self->{state} = !$self->{state}) {
2427 $CFClient::UI::ROOT->add ($self->{other});
2428 $self->{other}->move ($self->coord2global (0, $self->{h}));
2429 $self->emit ("open");
2430 } else {
2431 $CFClient::UI::ROOT->remove ($self->{other});
2432 $self->emit ("close");
2433 }
2434
2435 $self->emit (changed => $self->{state});
2436} 2688}
2437 2689
2438############################################################################# 2690#############################################################################
2439 2691
2440package CFClient::UI::Tooltip; 2692package CFClient::UI::Tooltip;
2453} 2705}
2454 2706
2455sub set_tooltip_from { 2707sub set_tooltip_from {
2456 my ($self, $widget) = @_; 2708 my ($self, $widget) = @_;
2457 2709
2710 my $tooltip = $widget->{tooltip};
2711
2712 if ($ENV{CFPLUS_DEBUG} & 2) {
2713 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}";
2717 }
2718
2458 $self->add (new CFClient::UI::Label 2719 $self->add (new CFClient::UI::Label
2459 markup => $widget->{tooltip}, 2720 markup => $tooltip,
2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461 fontsize => 0.8, 2722 fontsize => 0.8,
2462 fg => [0, 0, 0, 1], 2723 fg => [0, 0, 0, 1],
2463 ellipsise => 0, 2724 ellipsise => 0,
2464 font => ($widget->{tooltip_font} || $::FONT_PROP), 2725 font => ($widget->{tooltip_font} || $::FONT_PROP),
2475 2736
2476sub size_allocate { 2737sub size_allocate {
2477 my ($self, $w, $h) = @_; 2738 my ($self, $w, $h) = @_;
2478 2739
2479 $self->SUPER::size_allocate ($w - 4, $h - 4); 2740 $self->SUPER::size_allocate ($w - 4, $h - 4);
2741}
2742
2743sub visibility_change {
2744 my ($self, $visible) = @_;
2745
2746 return unless $visible;
2747
2748 $self->{root}->on_post_alloc ("move_$self" => sub {
2749 my $widget = $self->{owner}
2750 or return;
2751
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH;
2756
2757 $self->move_abs ($x, $y);
2758 });
2480} 2759}
2481 2760
2482sub _draw { 2761sub _draw {
2483 my ($self) = @_; 2762 my ($self) = @_;
2484 2763
2501 glVertex $w, $h; 2780 glVertex $w, $h;
2502 glVertex $w, 0; 2781 glVertex $w, 0;
2503 glEnd; 2782 glEnd;
2504 2783
2505 glTranslate 2 - 0.375, 2 - 0.375; 2784 glTranslate 2 - 0.375, 2 - 0.375;
2785
2506 $self->SUPER::_draw; 2786 $self->SUPER::_draw;
2507} 2787}
2508 2788
2509############################################################################# 2789#############################################################################
2510 2790
2516 2796
2517sub new { 2797sub new {
2518 my $class = shift; 2798 my $class = shift;
2519 2799
2520 my $self = $class->SUPER::new ( 2800 my $self = $class->SUPER::new (
2521 aspect => 1, 2801 aspect => 1,
2802 can_events => 0,
2522 @_, 2803 @_,
2523 ); 2804 );
2524 2805
2525 if ($self->{anim} && $self->{animspeed}) { 2806 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self); 2807 Scalar::Util::weaken (my $widget = $self);
2552} 2833}
2553 2834
2554sub _draw { 2835sub _draw {
2555 my ($self) = @_; 2836 my ($self) = @_;
2556 2837
2557 return unless $::CONN;#d# manage and cache textures differently 2838 return unless $::CONN;
2558 2839
2559 my $face; 2840 my $face;
2560 2841
2561 if ($self->{frame}) { 2842 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}]; 2843 my $anim = $::CONN->{anim}[$self->{anim}];
2568 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2849 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2569 2850
2570 if ($tex) { 2851 if ($tex) {
2571 glEnable GL_TEXTURE_2D; 2852 glEnable GL_TEXTURE_2D;
2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2573 glColor 1, 1, 1, 1; 2854 glColor 0, 0, 0, 1;
2574 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2575 glDisable GL_TEXTURE_2D; 2856 glDisable GL_TEXTURE_2D;
2576 } 2857 }
2577} 2858}
2578 2859
2585 $self->SUPER::DESTROY; 2866 $self->SUPER::DESTROY;
2586} 2867}
2587 2868
2588############################################################################# 2869#############################################################################
2589 2870
2590package CFClient::UI::InventoryItem; 2871package CFClient::UI::Buttonbar;
2591 2872
2592our @ISA = CFClient::UI::HBox::; 2873our @ISA = CFClient::UI::HBox::;
2593 2874
2594sub _item_to_desc { 2875# TODO: should actualyl wrap buttons and other goodies.
2595 my ($item) = @_;
2596
2597 my $desc =
2598 $item->{nrof} < 2
2599 ? $item->{name}
2600 : "$item->{nrof} × $item->{name_pl}";
2601
2602 $item->{flags} & Crossfire::Protocol::F_OPEN
2603 and $desc .= " (open)";
2604 $item->{flags} & Crossfire::Protocol::F_APPLIED
2605 and $desc .= " (applied)";
2606 $item->{flags} & Crossfire::Protocol::F_UNPAID
2607 and $desc .= " (unpaid)";
2608 $item->{flags} & Crossfire::Protocol::F_MAGIC
2609 and $desc .= " (magic)";
2610 $item->{flags} & Crossfire::Protocol::F_CURSED
2611 and $desc .= " (cursed)";
2612 $item->{flags} & Crossfire::Protocol::F_DAMNED
2613 and $desc .= " (damned)";
2614 $item->{flags} & Crossfire::Protocol::F_LOCKED
2615 and $desc .= " *";
2616
2617 $desc
2618}
2619
2620sub new {
2621 my $class = shift;
2622
2623 my %args = @_;
2624
2625 my $item = delete $args{item};
2626
2627 my $desc = _item_to_desc ($item);
2628
2629 my $self = $class->SUPER::new (
2630 can_hover => 1,
2631 can_events => 1,
2632 tooltip => ((CFClient::UI::Label::escape $desc)
2633 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2634 connect_button_down => sub {
2635 my ($self, $ev, $x, $y) = @_;
2636
2637 # todo: maybe put examine on 1? but should just be a tooltip :(
2638 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag};
2640
2641 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT;
2643 }
2644
2645 $::CONN->send ("move $targ $item->{tag} 0");
2646 } elsif ($ev->{button} == 1) {
2647 $::CONN->send ("examine $item->{tag}");
2648 } elsif ($ev->{button} == 2) {
2649 $::CONN->send ("apply $item->{tag}");
2650 } elsif ($ev->{button} == 3) {
2651 my @menu_items = (
2652 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2653 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2654 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2655 (
2656 $item->{flags} & Crossfire::Protocol::F_LOCKED
2657 ? (
2658 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2659 )
2660 : (
2661 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2662 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2663 )
2664 ),
2665 );
2666
2667 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2668 }
2669
2670 1
2671 },
2672 %args
2673 );
2674
2675
2676 $self->add (new CFClient::UI::Face
2677 can_events => 0,
2678 face => $item->{face},
2679 anim => $item->{anim},
2680 animspeed => $item->{animspeed},
2681 );
2682
2683 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2684
2685 $self->{item} = $item;
2686
2687 $self->update_item;
2688
2689 $self
2690}
2691
2692sub update_item {
2693 my ($self) = @_;
2694
2695 my $desc = _item_to_desc ($self->{item});
2696
2697 $self->{name_lbl}->set_text ($desc);
2698}
2699
2700#############################################################################
2701
2702package CFClient::UI::Inventory;
2703
2704our @ISA = CFClient::UI::ScrolledWindow::;
2705
2706sub new {
2707 my $class = shift;
2708
2709 my $self = $class->SUPER::new (
2710 scrolled => (new CFClient::UI::Table),
2711 @_,
2712 );
2713
2714 $self
2715}
2716
2717sub set_items {
2718 my ($self, $items) = @_;
2719
2720 $self->{scrolled}->clear;
2721 return unless $items;
2722
2723 my @items = sort {
2724 ($a->{type} <=> $b->{type})
2725 or ($a->{name} cmp $b->{name})
2726 } @$items;
2727
2728 $self->{real_items} = \@items;
2729
2730 for my $item (@items) {
2731 $item->{item} = $item;
2732 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2733 $item->update_item ();
2734 }
2735
2736 my $i = 0;
2737 for (@items) {
2738 $self->{scrolled}->add (0, $i, $_);
2739 my $nrof = $_->{item}->{nrof} || 1;
2740 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2741 }
2742
2743# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2744}
2745
2746sub size_request {
2747 my ($self) = @_;
2748 ($self->{req_w}, $self->{req_h});
2749}
2750 2876
2751############################################################################# 2877#############################################################################
2752 2878
2753package CFClient::UI::Menu; 2879package CFClient::UI::Menu;
2754 2880
2788 2914
2789# popup given the event (must be a mouse button down event currently) 2915# popup given the event (must be a mouse button down event currently)
2790sub popup { 2916sub popup {
2791 my ($self, $ev) = @_; 2917 my ($self, $ev) = @_;
2792 2918
2793 $self->emit ("popdown"); 2919 $self->_emit ("popdown");
2794 2920
2795 # maybe save $GRAB? must be careful about events... 2921 # maybe save $GRAB? must be careful about events...
2796 $GRAB = $self; 2922 $GRAB = $self;
2797 $self->{button} = $ev->{button}; 2923 $self->{button} = $ev->{button};
2798 2924
2799 $self->show; 2925 $self->show;
2800 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2926 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2801} 2927}
2802 2928
2803sub mouse_motion { 2929sub mouse_motion {
2804 my ($self, $ev, $x, $y) = @_; 2930 my ($self, $ev, $x, $y) = @_;
2805 2931
2806 # TODO: should use vbox->find_widget or so 2932 # TODO: should use vbox->find_widget or so
2807 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2808 $self->{hover} = $self->{item}{$HOVER}; 2934 $self->{hover} = $self->{item}{$HOVER};
2935
2936 0
2809} 2937}
2810 2938
2811sub button_up { 2939sub button_up {
2812 my ($self, $ev, $x, $y) = @_; 2940 my ($self, $ev, $x, $y) = @_;
2813 2941
2814 if ($ev->{button} == $self->{button}) { 2942 if ($ev->{button} == $self->{button}) {
2815 undef $GRAB; 2943 undef $GRAB;
2816 $self->hide; 2944 $self->hide;
2817 2945
2818 $self->emit ("popdown"); 2946 $self->_emit ("popdown");
2819 $self->{hover}[1]->() if $self->{hover}; 2947 $self->{hover}[1]->() if $self->{hover};
2948 } else {
2949 return 0
2950 }
2951
2952 1
2953}
2954
2955#############################################################################
2956
2957package CFClient::UI::Multiplexer;
2958
2959our @ISA = CFClient::UI::Container::;
2960
2961sub new {
2962 my $class = shift;
2963
2964 my $self = $class->SUPER::new (
2965 @_,
2966 );
2967
2968 $self->{current} = $self->{children}[0]
2969 if @{ $self->{children} };
2970
2971 $self
2972}
2973
2974sub add {
2975 my ($self, @widgets) = @_;
2976
2977 $self->SUPER::add (@widgets);
2978
2979 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} };
2981}
2982
2983sub set_current_page {
2984 my ($self, $page_or_widget) = @_;
2985
2986 my $widget = ref $page_or_widget
2987 ? $page_or_widget
2988 : $self->{children}[$page_or_widget];
2989
2990 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992
2993 $self->_emit (page_changed => $self->{current});
2994
2995 $self->realloc;
2996}
2997
2998sub visible_children {
2999 $_[0]{current}
3000}
3001
3002sub size_request {
3003 my ($self) = @_;
3004
3005 $self->{current}->size_request
3006}
3007
3008sub size_allocate {
3009 my ($self, $w, $h) = @_;
3010
3011 $self->{current}->configure (0, 0, $w, $h);
3012}
3013
3014sub _draw {
3015 my ($self) = @_;
3016
3017 $self->{current}->draw;
3018}
3019
3020#############################################################################
3021
3022package CFClient::UI::Notebook;
3023
3024our @ISA = CFClient::UI::VBox::;
3025
3026sub new {
3027 my $class = shift;
3028
3029 my $self = $class->SUPER::new (
3030 buttonbar => (new CFClient::UI::Buttonbar),
3031 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3032 # filter => # will be put between multiplexer and $self
3033 @_,
3034 );
2820 } 3035
3036 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3037 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3038
3039 $self
3040}
3041
3042sub add {
3043 my ($self, $title, $widget, $tooltip) = @_;
3044
3045 Scalar::Util::weaken $self;
3046
3047 $self->{buttonbar}->add (new CFClient::UI::Button
3048 markup => $title,
3049 tooltip => $tooltip,
3050 on_activate => sub { $self->set_current_page ($widget) },
3051 );
3052
3053 $self->{multiplexer}->add ($widget);
3054}
3055
3056sub set_current_page {
3057 my ($self, $page) = @_;
3058
3059 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current});
2821} 3061}
2822 3062
2823############################################################################# 3063#############################################################################
2824 3064
2825package CFClient::UI::Statusbox; 3065package CFClient::UI::Statusbox;
2885sub add { 3125sub add {
2886 my ($self, $text, %arg) = @_; 3126 my ($self, $text, %arg) = @_;
2887 3127
2888 $text =~ s/^\s+//; 3128 $text =~ s/^\s+//;
2889 $text =~ s/\s+$//; 3129 $text =~ s/\s+$//;
3130
3131 return unless $text;
2890 3132
2891 my $timeout = time + ((delete $arg{timeout}) || 60); 3133 my $timeout = time + ((delete $arg{timeout}) || 60);
2892 3134
2893 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2894 3136
2928 $self->SUPER::reconfigure; 3170 $self->SUPER::reconfigure;
2929} 3171}
2930 3172
2931############################################################################# 3173#############################################################################
2932 3174
2933package CFClient::UI::Root; 3175package CFClient::UI::Inventory;
2934 3176
2935our @ISA = CFClient::UI::Container::; 3177our @ISA = CFClient::UI::ScrolledWindow::;
2936
2937use CFClient::OpenGL;
2938 3178
2939sub new { 3179sub new {
2940 my $class = shift; 3180 my $class = shift;
2941 3181
2942 $class->SUPER::new ( 3182 my $self = $class->SUPER::new (
3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3184 @_,
3185 );
3186
3187 $self
3188}
3189
3190sub set_items {
3191 my ($self, $items) = @_;
3192
3193 $self->{child}->clear;
3194 return unless $items;
3195
3196 my @items = sort {
3197 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name})
3199 } @$items;
3200
3201 $self->{real_items} = \@items;
3202
3203 my $row = 0;
3204 for my $item (@items) {
3205 CFClient::Item::update_widgets $item;
3206
3207 $self->{child}->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget});
3210
3211 $row++;
3212 }
3213}
3214
3215#############################################################################
3216
3217package CFClient::UI::BindEditor;
3218
3219our @ISA = CFClient::UI::FancyFrame::;
3220
3221sub new {
3222 my $class = shift;
3223
3224 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3225
3226 $self->add (my $vb = new CFClient::UI::VBox);
3227
3228
3229 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3230 text => "start recording",
3231 tooltip => "Start/Stops recording of actions."
3232 ."All subsequent actions after the recording started will be captured."
3233 ."The actions are displayed after the record was stopped."
3234 ."To bind the action you have to click on the 'Bind' button",
3235 on_activate => sub {
3236 unless ($self->{recording}) {
3237 $self->start;
3238 } else {
3239 $self->stop;
3240 }
3241 });
3242
3243 $vb->add (new CFClient::UI::Label text => "Actions:");
3244 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3245
3246 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3247 $vb->add (my $hb = new CFClient::UI::HBox);
3248 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3249 $hb->add (new CFClient::UI::Button
3250 text => "bind",
3251 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3252 on_activate => sub {
3253 $self->ask_for_bind;
3254 });
3255
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add (new CFClient::UI::Button
3258 text => "ok",
3259 expand => 1,
3260 tooltip => "This closes the binding editor and saves the binding",
3261 on_activate => sub {
3262 $self->hide;
3263 $self->commit;
3264 });
3265
3266 $hb->add (new CFClient::UI::Button
3267 text => "cancel",
3268 expand => 1,
3269 tooltip => "This closes the binding editor without saving",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->{binding_cancel}->()
3273 if $self->{binding_cancel};
3274 });
3275
3276 $self->update_binding_widgets;
3277
3278 $self
3279}
3280
3281sub commit {
3282 my ($self) = @_;
3283 my ($mod, $sym, $cmds) = $self->get_binding;
3284 if ($sym != 0 && @$cmds > 0) {
3285 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3286 ."'. Don't forget 'Save Config'!");
3287 $self->{binding_change}->($mod, $sym, $cmds)
3288 if $self->{binding_change};
3289 } else {
3290 $::STATUSBOX->add ("No action bound, no key or action specified!");
3291 $self->{binding_cancel}->()
3292 if $self->{binding_cancel};
3293 }
3294}
3295
3296sub start {
3297 my ($self) = @_;
3298
3299 $self->{rec_btn}->set_text ("stop recording");
3300 $self->{recording} = 1;
3301 $self->clear_command_list;
3302 $::CONN->start_record if $::CONN;
3303}
3304
3305sub stop {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("start recording");
3309 $self->{recording} = 0;
3310
3311 my $rec;
3312 $rec = $::CONN->stop_record if $::CONN;
3313 return unless ref $rec eq 'ARRAY';
3314 $self->set_command_list ($rec);
3315}
3316
3317
3318sub ask_for_bind_and_commit {
3319 my ($self) = @_;
3320 $self->ask_for_bind (1);
3321}
3322
3323sub ask_for_bind {
3324 my ($self, $commit) = @_;
3325
3326 CFClient::Binder::open_binding_dialog (sub {
3327 my ($mod, $sym) = @_;
3328 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3329 $self->update_binding_widgets;
3330 $self->commit if $commit;
3331 });
3332}
3333
3334# $mod and $sym are the modifiers and key symbol
3335# $cmds is a array ref of strings (the commands)
3336# $cb is the callback that is executed on OK
3337# $ccb is the callback that is executed on CANCEL and
3338# when the binding was unsuccessful on OK
3339sub set_binding {
3340 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3341
3342 $self->clear_command_list;
3343 $self->{recording} = 0;
3344 $self->{rec_btn}->set_text ("start recording");
3345
3346 $self->{binding} = [$mod, $sym];
3347 $self->{commands} = $cmds;
3348
3349 $self->{binding_change} = $cb;
3350 $self->{binding_cancel} = $ccb;
3351
3352 $self->update_binding_widgets;
3353}
3354
3355# this is a shortcut method that asks for a binding
3356# and then just binds it.
3357sub do_quick_binding {
3358 my ($self, $cmds) = @_;
3359 $self->set_binding (undef, undef, $cmds, sub {
3360 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361 });
3362 $self->ask_for_bind (1);
3363}
3364
3365sub update_binding_widgets {
3366 my ($self) = @_;
3367 my ($mod, $sym, $cmds) = $self->get_binding;
3368 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3369 $self->set_command_list ($cmds);
3370}
3371
3372sub get_binding {
3373 my ($self) = @_;
3374 return (
3375 $self->{binding}->[0],
3376 $self->{binding}->[1],
3377 [ grep { defined $_ } @{$self->{commands}} ]
3378 );
3379}
3380
3381sub clear_command_list {
3382 my ($self) = @_;
3383 $self->{cmdbox}->clear ();
3384}
3385
3386sub set_command_list {
3387 my ($self, $cmds) = @_;
3388
3389 $self->{cmdbox}->clear ();
3390 $self->{commands} = $cmds;
3391
3392 my $idx = 0;
3393
3394 for (@$cmds) {
3395 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3396
3397 my $i = $idx;
3398 $hb->add (new CFClient::UI::Label text => $_);
3399 $hb->add (new CFClient::UI::Button
3400 text => "delete",
3401 tooltip => "Deletes the action from the record",
3402 on_activate => sub {
3403 $self->{cmdbox}->remove ($hb);
3404 $cmds->[$i] = undef;
3405 });
3406
3407
3408 $idx++
3409 }
3410}
3411
3412#############################################################################
3413
3414package CFClient::UI::SpellList;
3415
3416our @ISA = CFClient::UI::Table::;
3417
3418sub new {
3419 my $class = shift;
3420
3421 my $self = $class->SUPER::new (
3422 binding => [],
3423 commands => [],
2943 @_, 3424 @_,
2944 ) 3425 )
2945} 3426}
2946 3427
2947sub configure { 3428# XXX: Do sorting? Argl...
2948 my ($self, $x, $y, $w, $h) = @_; 3429sub add_spell {
2949
2950 $self->{w} = $w;
2951 $self->{h} = $h;
2952}
2953
2954sub check_size {
2955 my ($self) = @_; 3430 my ($self, $spell) = @_;
3431 $self->{spells}->{$spell->{name}} = $spell;
2956 3432
2957 $self->size_allocate ($self->{w}, $self->{h}) 3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2958 if $self->{w}; 3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460}
3461
3462sub remove_spell {
3463 my ($self, $spell) = @_;
3464 delete $self->{spells}->{$spell->{name}};
3465 $self->rebuild_spell_list;
3466}
3467
3468#############################################################################
3469
3470package CFClient::UI::Root;
3471
3472our @ISA = CFClient::UI::Container::;
3473
3474use CFClient::OpenGL;
3475
3476sub new {
3477 my $class = shift;
3478
3479 my $self = $class->SUPER::new (
3480 visible => 1,
3481 @_,
3482 );
3483
3484 Scalar::Util::weaken ($self->{root} = $self);
3485
3486 $self
2959} 3487}
2960 3488
2961sub size_request { 3489sub size_request {
2962 my ($self) = @_; 3490 my ($self) = @_;
2963 3491
2964 ($self->{w}, $self->{h}) 3492 ($self->{w}, $self->{h})
3493}
3494
3495sub _to_pixel {
3496 my ($coord, $size, $max) = @_;
3497
3498 $coord =
3499 $coord eq "center" ? ($max - $size) * 0.5
3500 : $coord eq "max" ? $max
3501 : $coord;
3502
3503 $coord = 0 if $coord < 0;
3504 $coord = $max - $size if $coord > $max - $size;
3505
3506 int $coord + 0.5
2965} 3507}
2966 3508
2967sub size_allocate { 3509sub size_allocate {
2968 my ($self, $w, $h) = @_; 3510 my ($self, $w, $h) = @_;
2969 3511
2970 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2971 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2972
2973 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2974 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2975
2976 for my $child ($self->children) { 3512 for my $child ($self->children) {
2977 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3513 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2978 3514
2979 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3515 $X = $child->{force_x} if exists $child->{force_x};
2980 if exists $child->{req_x}; 3516 $Y = $child->{force_y} if exists $child->{force_y};
2981 3517
2982 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3518 $X = _to_pixel $X, $W, $self->{w};
2983 if exists $child->{req_y}; 3519 $Y = _to_pixel $Y, $H, $self->{h};
2984
2985 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2986 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2987 3520
2988 $child->configure ($X, $Y, $W, $H); 3521 $child->configure ($X, $Y, $W, $H);
2989 } 3522 }
2990} 3523}
2991 3524
3002} 3535}
3003 3536
3004sub update { 3537sub update {
3005 my ($self) = @_; 3538 my ($self) = @_;
3006 3539
3007 $self->check_size;
3008 $::WANT_REFRESH++; 3540 $::WANT_REFRESH++;
3009} 3541}
3010 3542
3011sub add { 3543sub add {
3012 my ($self, @children) = @_; 3544 my ($self, @children) = @_;
3013 3545
3014 for my $child (@children) {
3015 $child->{toplevel} = 1; 3546 $_->{is_toplevel} = 1
3016 3547 for @children;
3017 # integerise window positions
3018 $child->{x} = int $child->{x};
3019 $child->{y} = int $child->{y};
3020 }
3021 3548
3022 $self->SUPER::add (@children); 3549 $self->SUPER::add (@children);
3550}
3551
3552sub remove {
3553 my ($self, @children) = @_;
3554
3555 $self->SUPER::remove (@children);
3556
3557 delete $self->{is_toplevel}
3558 for @children;
3023 3559
3024 while (@children) { 3560 while (@children) {
3025 my $w = pop @children; 3561 my $w = pop @children;
3026 push @children, $w->children; 3562 push @children, $w->children;
3027 $w->{visible} = 1; 3563 $w->set_invisible;
3028 }
3029}
3030
3031sub remove {
3032 my ($self, @children) = @_;
3033
3034 $self->SUPER::remove (@children);
3035
3036 while (@children) {
3037 my $w = pop @children;
3038 push @children, $w->children;
3039 delete $w->{visible};
3040 } 3564 }
3041} 3565}
3042 3566
3043sub on_refresh { 3567sub on_refresh {
3044 my ($self, $id, $cb) = @_; 3568 my ($self, $id, $cb) = @_;
3058 while ($self->{refresh_hook}) { 3582 while ($self->{refresh_hook}) {
3059 $_->() 3583 $_->()
3060 for values %{delete $self->{refresh_hook}}; 3584 for values %{delete $self->{refresh_hook}};
3061 } 3585 }
3062 3586
3063 if ($self->{check_size}) { 3587 if ($self->{realloc}) {
3064 my @queue = ([], []); 3588 my %queue;
3589 my @queue;
3590 my $widget;
3065 3591
3066 for (;;) { 3592 outer:
3067 if ($self->{check_size}) { 3593 while () {
3068 # heuristic: check containers last 3594 if (my $realloc = delete $self->{realloc}) {
3069 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3595 for $widget (values %$realloc) {
3070 for values %{delete $self->{check_size}} 3596 $widget->{visible} or next; # do not resize invisible widgets
3597
3598 $queue{$widget+0}++ and next; # duplicates are common
3599
3600 push @{ $queue[$widget->{visible}] }, $widget;
3601 }
3071 } 3602 }
3072 3603
3073 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3604 while () {
3605 @queue or last outer;
3074 3606
3075 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3607 $widget = pop @{ $queue[-1] || [] }
3076 ? @$widget{qw(user_w user_h)} 3608 and last;
3077 : $widget->size_request;
3078
3079 if (delete $widget->{force_alloc}
3080 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3081 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3082 3609
3610 pop @queue;
3611 }
3612
3613 delete $queue{$widget+0};
3614
3615 my ($w, $h) = $widget->size_request;
3616
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3619
3620 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h};
3622
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3624 || delete $widget->{force_realloc}) {
3083 $widget->{req_w} = $w; 3625 $widget->{req_w} = $w;
3084 $widget->{req_h} = $h; 3626 $widget->{req_h} = $h;
3085 3627
3086 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3628 $self->{size_alloc}{$widget+0} = $widget;
3087 3629
3088 $widget->{parent}->check_size
3089 if $widget->{parent}; 3630 if (my $parent = $widget->{parent}) {
3631 $self->{realloc}{$parent+0} = $parent
3632 unless $queue{$parent+0};
3633
3634 $parent->{force_size_alloc} = 1;
3635 $self->{size_alloc}{$parent+0} = $parent;
3636 }
3090 } 3637 }
3638
3639 delete $self->{realloc}{$widget+0};
3091 } 3640 }
3092 } 3641 }
3093 3642
3094 while ($self->{size_alloc}) { 3643 while (my $size_alloc = delete $self->{size_alloc}) {
3095 for (values %{delete $self->{size_alloc}}) { 3644 my @queue = sort { $b->{visible} <=> $a->{visible} }
3096 my ($widget, $w, $h) = @$_; 3645 values %$size_alloc;
3646
3647 while () {
3648 my $widget = pop @queue || last;
3649
3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3097 3651
3098 $w = 0 if $w < 0; 3652 $w = 0 if $w < 0;
3099 $h = 0 if $h < 0; 3653 $h = 0 if $h < 0;
3100 3654
3655 $w = int $w + 0.5;
3656 $h = int $h + 0.5;
3657
3658 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3659 $widget->{old_w} = $widget->{w};
3660 $widget->{old_h} = $widget->{h};
3661
3101 $widget->{w} = $w; 3662 $widget->{w} = $w;
3102 $widget->{h} = $h; 3663 $widget->{h} = $h;
3103 $widget->size_allocate ($w, $h); 3664
3104 $widget->emit (size_allocate => $w, $h); 3665 $widget->emit (size_allocate => $w, $h);
3666 }
3105 } 3667 }
3106 } 3668 }
3107 3669
3108 while ($self->{post_alloc_hook}) { 3670 while ($self->{post_alloc_hook}) {
3109 $_->() 3671 $_->()
3110 for values %{delete $self->{post_alloc_hook}}; 3672 for values %{delete $self->{post_alloc_hook}};
3111 } 3673 }
3674
3112 3675
3113 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3676 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3114 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3115 glClear GL_COLOR_BUFFER_BIT; 3678 glClear GL_COLOR_BUFFER_BIT;
3116 3679
3118 glLoadIdentity; 3681 glLoadIdentity;
3119 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3120 glMatrixMode GL_MODELVIEW; 3683 glMatrixMode GL_MODELVIEW;
3121 glLoadIdentity; 3684 glLoadIdentity;
3122 3685
3686 {
3687 package CFClient::UI::Base;
3688
3689 ($draw_x, $draw_y, $draw_w, $draw_h) =
3690 (0, 0, $self->{w}, $self->{h});
3691 }
3692
3123 $self->_draw; 3693 $self->_draw;
3124} 3694}
3125 3695
3126############################################################################# 3696#############################################################################
3127 3697

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines