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.226 by root, Tue May 23 23:14:46 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 887
749 @$self{qw(child_w child_h)} 888 $w = 10 if $self->{scroll_x};
889 $h = 10 if $self->{scroll_y};
890
891 ($w, $h)
750} 892}
751 893
752sub size_allocate { 894sub size_allocate {
753 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
754 896
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 897 my $child = $self->child;
756# $w = $self->{w}; 898
899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
901
757 $self->child->configure (0, 0, $cw, $ch); 902 $self->child->configure (0, 0, $w, $h);
758 $self->update; 903 $self->update;
759} 904}
760 905
761sub set_offset { 906sub set_offset {
762 my ($self, $x, $y) = @_; 907 my ($self, $x, $y) = @_;
… …
796} 941}
797 942
798sub _render { 943sub _render {
799 my ($self) = @_; 944 my ($self) = @_;
800 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
801 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 949 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
802 950
803 $self->SUPER::_render; 951 $self->SUPER::_render;
804} 952}
805 953
… …
808package CFClient::UI::ScrolledWindow; 956package CFClient::UI::ScrolledWindow;
809 957
810our @ISA = CFClient::UI::HBox::; 958our @ISA = CFClient::UI::HBox::;
811 959
812sub new { 960sub new {
813 my $class = shift; 961 my ($class, %arg) = @_;
962
963 my $child = delete $arg{child};
814 964
815 my $self; 965 my $self;
816 966
817 my $slider = new CFClient::UI::Slider 967 my $slider = new CFClient::UI::Slider
818 vertical => 1, 968 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 969 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 970 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 971 $self->{vp}->set_offset (0, $_[1]);
822 }, 972 },
823 ; 973 ;
824 974
825 $self = $class->SUPER::new ( 975 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 976 vp => (new CFClient::UI::ViewPort expand => 1),
827 slider => $slider, 977 slider => $slider,
828 @_, 978 %arg,
829 ); 979 );
830 980
831 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 981 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child;
834 983
835 $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]);
836} 1010}
837 1011
838#TODO# update range on size_allocate depending on child 1012#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 1013# update viewport offset on scroll
840 1014
… …
860 1034
861 if ($self->{bg}) { 1035 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)}; 1036 my ($w, $h) = @$self{qw(w h)};
863 1037
864 glEnable GL_BLEND; 1038 glEnable GL_BLEND;
865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1039 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
866 glColor @{ $self->{bg} }; 1040 glColor_premultiply @{ $self->{bg} };
867 1041
868 glBegin GL_QUADS; 1042 glBegin GL_QUADS;
869 glVertex 0 , 0; 1043 glVertex 0 , 0;
870 glVertex 0 , $h; 1044 glVertex 0 , $h;
871 glVertex $w, $h; 1045 glVertex $w, $h;
… …
884 1058
885our @ISA = CFClient::UI::Bin::; 1059our @ISA = CFClient::UI::Bin::;
886 1060
887use CFClient::OpenGL; 1061use CFClient::OpenGL;
888 1062
889my @tex = 1063my $bg =
1064 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1065 mipmap => 1, wrap => 1;
1066
1067my @border =
890 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
891 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);
892 1070
893sub new { 1071sub new {
894 my $class = shift; 1072 my ($class, %arg) = @_;
895 1073
896 # TODO: user_x, user_y, overwrite moveto? 1074 my $title = delete $arg{title};
897 1075
898 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
901 border => 0.6, 1079 border => 0.6,
902 toplevel => 1,
903 can_events => 1, 1080 can_events => 1,
904 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
905 ); 1084 );
906 1085
907 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title} = new CFClient::UI::Label
908 align => 0, 1087 align => 0,
909 valign => 1, 1088 valign => 1,
910 text => $self->{title}, 1089 text => $title,
911 fontsize => $self->{border}; 1090 fontsize => $self->{border}
1091 if defined $title;
912 1092
913 $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};
914} 1101}
915 1102
916sub border { 1103sub border {
917 int $_[0]{border} * $::FONTSIZE 1104 int $_[0]{border} * $::FONTSIZE
918} 1105}
919 1106
920sub size_request { 1107sub size_request {
921 my ($self) = @_; 1108 my ($self) = @_;
1109
1110 $self->{title}->size_request
1111 if $self->{title};
922 1112
923 my ($w, $h) = $self->SUPER::size_request; 1113 my ($w, $h) = $self->SUPER::size_request;
924 1114
925 ( 1115 (
926 $w + $self->border * 2, 1116 $w + $self->border * 2,
… …
929} 1119}
930 1120
931sub size_allocate { 1121sub size_allocate {
932 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
933 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
934 $h -= List::Util::max 0, $self->border * 2; 1132 $h -= List::Util::max 0, $border * 2;
935 $w -= List::Util::max 0, $self->border * 2; 1133 $w -= List::Util::max 0, $border * 2;
936 1134
937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
938 if $self->{title};
939
940 $self->child->configure ($self->border, $self->border, $w, $h); 1135 $self->child->configure ($border, $border, $w, $h);
941} 1136}
942 1137
943sub button_down { 1138sub button_down {
944 my ($self, $ev, $x, $y) = @_; 1139 my ($self, $ev, $x, $y) = @_;
945 1140
… …
961 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
962 1157
963 my $dx = $ev->{x} - $ox; 1158 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy; 1159 my $dy = $ev->{y} - $oy;
965 1160
966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1161 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1162 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1163
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
969 $self->check_size; 1165 $self->realloc;
970 }; 1166 };
971 1167
972 } elsif ($lr ^ $td) { 1168 } elsif ($lr ^ $td) {
973 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1169 my ($ox, $oy) = ($ev->{x}, $ev->{y});
974 my ($bx, $by) = ($self->{x}, $self->{y}); 1170 my ($bx, $by) = ($self->{x}, $self->{y});
… …
976 $self->{motion} = sub { 1172 $self->{motion} = sub {
977 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
978 1174
979 ($x, $y) = ($ev->{x}, $ev->{y}); 1175 ($x, $y) = ($ev->{x}, $ev->{y});
980 1176
981 $self->move ($bx + $x - $ox, $by + $y - $oy); 1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
982 $self->update; 1178 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
983 }; 1180 };
1181 } else {
1182 return 0;
1183 }
1184
984 } 1185 1
985} 1186}
986 1187
987sub button_up { 1188sub button_up {
988 my ($self, $ev, $x, $y) = @_; 1189 my ($self, $ev, $x, $y) = @_;
989 1190
990 delete $self->{motion}; 1191 !!delete $self->{motion}
991} 1192}
992 1193
993sub mouse_motion { 1194sub mouse_motion {
994 my ($self, $ev, $x, $y) = @_; 1195 my ($self, $ev, $x, $y) = @_;
995 1196
996 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1197 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198
1199 !!$self->{motion}
997} 1200}
998 1201
999sub _draw { 1202sub _draw {
1000 my ($self) = @_; 1203 my ($self) = @_;
1001 1204
1205 my $child = $self->{children}[0];
1206
1002 my ($w, $h ) = ($self->{w}, $self->{h}); 1207 my ($w, $h ) = ($self->{w}, $self->{h});
1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1208 my ($cw, $ch) = ($child->{w}, $child->{h});
1004 1209
1005 glEnable GL_TEXTURE_2D; 1210 glEnable GL_TEXTURE_2D;
1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1007 1212
1008 my $border = $self->border; 1213 my $border = $self->border;
1009 1214
1010 glColor @{ $self->{border_bg} }; 1215 glColor @{ $self->{border_bg} };
1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1216 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1217 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1218 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1219 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1015 1220
1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1221 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1017 my $bg = $tex[0]; 1222 glColor @{ $self->{bg} };
1018 1223
1019 # TODO: repeat texture not scale 1224 # TODO: repeat texture not scale
1225 # solve this better(?)
1020 my $rep_x = $cw / $bg->{w}; 1226 $bg->{s} = $cw / $bg->{w};
1021 my $rep_y = $ch / $bg->{h}; 1227 $bg->{t} = $ch / $bg->{h};
1022
1023 glColor @{ $self->{bg} };
1024
1025 $bg->{s} = $rep_x;
1026 $bg->{t} = $rep_y;
1027 $bg->{wrap_mode} = 1;
1028 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1228 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 } 1229 }
1030 1230
1031 glDisable GL_TEXTURE_2D; 1231 glDisable GL_TEXTURE_2D;
1032 1232
1033 $self->{title}->draw if $self->{title};
1034
1035 $self->child->draw; 1233 $child->draw;
1234
1235 if ($self->{title}) {
1236 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw;
1238 }
1036} 1239}
1037 1240
1038############################################################################# 1241#############################################################################
1039 1242
1040package CFClient::UI::Table; 1243package CFClient::UI::Table;
… …
1048sub new { 1251sub new {
1049 my $class = shift; 1252 my $class = shift;
1050 1253
1051 $class->SUPER::new ( 1254 $class->SUPER::new (
1052 col_expand => [], 1255 col_expand => [],
1053 @_ 1256 @_,
1054 ) 1257 )
1258}
1259
1260sub children {
1261 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1262}
1056 1263
1057sub add { 1264sub add {
1058 my ($self, $x, $y, $child) = @_; 1265 my ($self, $x, $y, $child) = @_;
1059 1266
1060 $child->set_parent ($self); 1267 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1268 $self->{children}[$y][$x] = $child;
1062 1269
1063 $child->check_size; 1270 $self->realloc;
1064} 1271}
1065 1272
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
1070# 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?
1071sub clear { 1274sub clear {
1072 my ($self) = @_; 1275 my ($self) = @_;
1073 1276
1074 my @children = $self->children; 1277 my @children = $self->children;
1075 delete $self->{children}; 1278 delete $self->{children};
… …
1077 for (@children) { 1280 for (@children) {
1078 delete $_->{parent}; 1281 delete $_->{parent};
1079 $_->hide; 1282 $_->hide;
1080 } 1283 }
1081 1284
1082 $self->update; 1285 $self->realloc;
1083} 1286}
1084 1287
1085sub get_wh { 1288sub get_wh {
1086 my ($self) = @_; 1289 my ($self) = @_;
1087 1290
… …
1118sub size_allocate { 1321sub size_allocate {
1119 my ($self, $w, $h) = @_; 1322 my ($self, $w, $h) = @_;
1120 1323
1121 my ($ws, $hs) = $self->get_wh; 1324 my ($ws, $hs) = $self->get_wh;
1122 1325
1123 my $req_w = sum @$ws; 1326 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1327 my $req_h = (sum @$hs) || 1;
1125 1328
1126 # TODO: nicer code && do row_expand 1329 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1330 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1331 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1332 my $col_expand = (sum @col_expand) || 1;
… …
1183 } 1386 }
1184} 1387}
1185 1388
1186############################################################################# 1389#############################################################################
1187 1390
1188package CFClient::UI::HBox; 1391package CFClient::UI::Box;
1189
1190# TODO: wrap into common Box base class
1191 1392
1192our @ISA = CFClient::UI::Container::; 1393our @ISA = CFClient::UI::Container::;
1193 1394
1194sub size_request { 1395sub size_request {
1195 my ($self) = @_; 1396 my ($self) = @_;
1196 1397
1197 my @alloc = map [$_->size_request], @{$self->{children}}; 1398 $self->{vertical}
1198 1399 ? (
1199 ( 1400 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1200 (List::Util::sum map $_->[0], @alloc), 1401 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1201 (List::Util::max map $_->[1], @alloc), 1402 )
1202 ) 1403 : (
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 )
1203} 1407}
1204 1408
1205sub size_allocate { 1409sub size_allocate {
1206 my ($self, $w, $h) = @_; 1410 my ($self, $w, $h) = @_;
1207 1411
1208 ($h, $w) = ($w, $h); 1412 my $space = $self->{vertical} ? $h : $w;
1209
1210 my $children = $self->{children}; 1413 my $children = $self->{children};
1211 1414
1212 my @h = map $_->{req_w}, @$children; 1415 my @req;
1213 1416
1214 my $req_h = List::Util::sum @h; 1417 if ($self->{homogeneous}) {
1215 1418 @req = ($space / (@$children || 1)) x @$children;
1216 if ($req_h > $h) {
1217 # ah well, not enough space
1218 $_ *= $h / $req_h for @h;
1219 } 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 {
1220 my $exp = List::Util::sum map $_->{expand}, @$children; 1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1221 $exp ||= 1;
1222 1428
1429 $space = ($space - $req) / $expand; # remaining space to give away
1430
1431 $req[$_] += $space * $children->[$_]{expand}
1223 for (0 .. $#$children) { 1432 for 0 .. $#$children;
1224 my $child = $children->[$_];
1225
1226 my $alloc_h = $h[$_];
1227 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1228 $h[$_] = $alloc_h;
1229 } 1433 }
1230 } 1434 }
1231 1435
1232 CFClient::UI::harmonize \@h; 1436 CFClient::UI::harmonize \@req;
1233 1437
1234 my $y = 0; 1438 my $pos = 0;
1235 for (0 .. $#$children) { 1439 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_]; 1440 my $alloc = $req[$_];
1238 $child->configure ($y, 0, $h, $w); 1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1239 1442
1240 $y += $h; 1443 $pos += $alloc;
1241 } 1444 }
1242 1445
1243 1 1446 1
1244} 1447}
1245 1448
1246############################################################################# 1449#############################################################################
1247 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
1248package CFClient::UI::VBox; 1466package CFClient::UI::VBox;
1249 1467
1250# TODO: wrap into common Box base class
1251
1252our @ISA = CFClient::UI::Container::; 1468our @ISA = CFClient::UI::Box::;
1253 1469
1254sub size_request { 1470sub new {
1255 my ($self) = @_; 1471 my $class = shift;
1256 1472
1257 my @alloc = map [$_->size_request], @{$self->{children}}; 1473 $class->SUPER::new (
1258 1474 vertical => 1,
1259 ( 1475 @_,
1260 (List::Util::max map $_->[0], @alloc),
1261 (List::Util::sum map $_->[1], @alloc),
1262 ) 1476 )
1263}
1264
1265sub size_allocate {
1266 my ($self, $w, $h) = @_;
1267
1268 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1270 my $children = $self->{children};
1271
1272 my @h = map $_->{req_h}, @$children;
1273
1274 my $req_h = List::Util::sum @h;
1275
1276 if ($req_h > $h) {
1277 # ah well, not enough space
1278 $_ *= $h / $req_h for @h;
1279 } else {
1280 my $exp = List::Util::sum map $_->{expand}, @$children;
1281 $exp ||= 1;
1282
1283 for (0 .. $#$children) {
1284 my $child = $children->[$_];
1285
1286 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1287 }
1288 }
1289
1290 CFClient::UI::harmonize \@h;
1291
1292 my $y = 0;
1293 for (0 .. $#$children) {
1294 my $child = $children->[$_];
1295 my $h = $h[$_];
1296 $child->configure (0, $y, $w, $h);
1297
1298 $y += $h;
1299 }
1300
1301 1
1302} 1477}
1303 1478
1304############################################################################# 1479#############################################################################
1305 1480
1306package CFClient::UI::Label; 1481package CFClient::UI::Label;
… …
1323 ellipsise => 3, # end 1498 ellipsise => 3, # end
1324 layout => (new CFClient::Layout), 1499 layout => (new CFClient::Layout),
1325 fontsize => 1, 1500 fontsize => 1,
1326 align => -1, 1501 align => -1,
1327 valign => -1, 1502 valign => -1,
1328 padding => 2, 1503 padding_x => 2,
1504 padding_y => 2,
1329 can_events => 0, 1505 can_events => 0,
1330 %arg 1506 %arg
1331 ); 1507 );
1332 1508
1333 if (exists $self->{template}) { 1509 if (exists $self->{template}) {
… …
1369 $self->{text} = "T$text"; 1545 $self->{text} = "T$text";
1370 1546
1371 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372 $self->{layout}->set_text ($text); 1548 $self->{layout}->set_text ($text);
1373 1549
1550 $self->realloc;
1374 $self->update; 1551 $self->update;
1375 $self->check_size;
1376} 1552}
1377 1553
1378sub set_markup { 1554sub set_markup {
1379 my ($self, $markup) = @_; 1555 my ($self, $markup) = @_;
1380 1556
… …
1384 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1560 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385 1561
1386 $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;
1387 $self->{layout}->set_markup ($markup); 1563 $self->{layout}->set_markup ($markup);
1388 1564
1565 $self->realloc;
1389 $self->update; 1566 $self->update;
1390 $self->check_size;
1391} 1567}
1392 1568
1393sub size_request { 1569sub size_request {
1394 my ($self) = @_; 1570 my ($self) = @_;
1395 1571
… …
1409 1585
1410 $w = List::Util::max $w, $w2; 1586 $w = List::Util::max $w, $w2;
1411 $h = List::Util::max $h, $h2; 1587 $h = List::Util::max $h, $h2;
1412 } 1588 }
1413 1589
1414 ( 1590 ($w, $h)
1415 $w + $self->{padding} * 2,
1416 $h + $self->{padding} * 2,
1417 )
1418} 1591}
1419 1592
1420sub size_allocate { 1593sub size_allocate {
1421 my ($self, $w, $h) = @_; 1594 my ($self, $w, $h) = @_;
1422 1595
1596 delete $self->{ox};
1597
1423 delete $self->{texture}; 1598 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1424} 1600}
1425 1601
1426sub set_fontsize { 1602sub set_fontsize {
1427 my ($self, $fontsize) = @_; 1603 my ($self, $fontsize) = @_;
1428 1604
1429 $self->{fontsize} = $fontsize; 1605 $self->{fontsize} = $fontsize;
1430 delete $self->{texture}; 1606 delete $self->{texture};
1431 1607
1432 $self->update; 1608 $self->realloc;
1433 $self->check_size;
1434} 1609}
1435 1610
1436sub _draw { 1611sub _draw {
1437 my ($self) = @_; 1612 my ($self) = @_;
1438 1613
… …
1444 $self->{layout}->set_width ($self->{w}); 1619 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1620 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448 1623
1449 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1624 new_from_layout CFClient::Texture $self->{layout}
1625 };
1450 1626
1627 unless (exists $self->{ox}) {
1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1453 : ($self->{w} - $tex->{w}) * 0.5); 1630 : ($self->{w} - $tex->{w}) * 0.5);
1454 1631
1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1457 : ($self->{h} - $tex->{h}) * 0.5); 1634 : ($self->{h} - $tex->{h}) * 0.5);
1458
1459 $tex
1460 }; 1635 };
1461 1636
1462 glEnable GL_TEXTURE_2D; 1637 glEnable GL_TEXTURE_2D;
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1464 1639
1640 glColor_premultiply @{$self->{fg}}
1465 if ($tex->{format} == GL_ALPHA) { 1641 if $tex->{format} == GL_ALPHA;
1466 glColor @{$self->{fg}}; 1642
1467 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1468 } else {
1469 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1470 }
1471 1644
1472 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1473} 1646}
1474 1647
1475############################################################################# 1648#############################################################################
… …
1502 1675
1503 delete $self->{cur_h}; 1676 delete $self->{cur_h};
1504 1677
1505 return if $self->{text} eq $text; 1678 return if $self->{text} eq $text;
1506 1679
1507 delete $self->{texture};
1508
1509 $self->{last_activity} = $::NOW; 1680 $self->{last_activity} = $::NOW;
1510 $self->{text} = $text; 1681 $self->{text} = $text;
1511 1682
1512 $text =~ s/./*/g if $self->{hidden}; 1683 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1684 $self->{layout}->set_text ("$text ");
1514 1685
1515 $self->emit (changed => $self->{text}); 1686 $self->_emit (changed => $self->{text});
1687 $self->update;
1516} 1688}
1517 1689
1518sub set_text { 1690sub set_text {
1519 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1520 1692
1521 $self->{cursor} = length $text; 1693 $self->{cursor} = length $text;
1522 $self->_set_text ($text); 1694 $self->_set_text ($text);
1523 $self->update; 1695
1524 $self->check_size; 1696 $self->realloc;
1525} 1697}
1526 1698
1527sub get_text { 1699sub get_text {
1528 $_[0]{text} 1700 $_[0]{text}
1529} 1701}
… …
1532 my ($self) = @_; 1704 my ($self) = @_;
1533 1705
1534 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1535 1707
1536 ($w + 1, $h) # add 1 for cursor 1708 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543} 1709}
1544 1710
1545sub key_down { 1711sub key_down {
1546 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1547 1713
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1728 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1729 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1730 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1733 $self->_emit ('escape');
1568 } elsif ($uni) { 1734 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1570 } 1738 }
1571 1739
1572 $self->_set_text ($text); 1740 $self->_set_text ($text);
1573 $self->update; 1741
1574 $self->check_size; 1742 $self->realloc;
1743
1744 1
1575} 1745}
1576 1746
1577sub focus_in { 1747sub focus_in {
1578 my ($self) = @_; 1748 my ($self) = @_;
1579 1749
… …
1594 utf8::encode $text; 1764 utf8::encode $text;
1595 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1596 1766
1597 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1598 $self->update; 1768 $self->update;
1769
1770 1
1599} 1771}
1600 1772
1601sub mouse_motion { 1773sub mouse_motion {
1602 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1603# 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
1604} 1778}
1605 1779
1606sub _draw { 1780sub _draw {
1607 my ($self) = @_; 1781 my ($self) = @_;
1608 1782
1609 local $self->{fg} = $self->{fg}; 1783 local $self->{fg} = $self->{fg};
1610 1784
1611 if ($FOCUS == $self) { 1785 if ($FOCUS == $self) {
1612 glColor @{$self->{active_bg}}; 1786 glColor_premultiply @{$self->{active_bg}};
1613 $self->{fg} = $self->{active_fg}; 1787 $self->{fg} = $self->{active_fg};
1614 } else { 1788 } else {
1615 glColor @{$self->{bg}}; 1789 glColor_premultiply @{$self->{bg}};
1616 } 1790 }
1617 1791
1618 glEnable GL_BLEND; 1792 glEnable GL_BLEND;
1619 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1793 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1620 glBegin GL_QUADS; 1794 glBegin GL_QUADS;
1621 glVertex 0 , 0; 1795 glVertex 0 , 0;
1622 glVertex 0 , $self->{h}; 1796 glVertex 0 , $self->{h};
1623 glVertex $self->{w}, $self->{h}; 1797 glVertex $self->{w}, $self->{h};
1624 glVertex $self->{w}, 0; 1798 glVertex $self->{w}, 0;
… …
1659 if ($sym == 13) { 1833 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1834 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1835 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1836 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1837 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1838 $self->_emit (activate => $txt);
1665 $self->update; 1839 $self->update;
1666 1840
1667 } elsif ($sym == CFClient::SDLK_UP) { 1841 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1842 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1843 $self->{history_saveback} = $self->get_text;
… …
1685 } else { 1859 } else {
1686 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1687 } 1861 }
1688 1862
1689 } else { 1863 } else {
1690 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1691 } 1867 1
1692
1693} 1868}
1694 1869
1695############################################################################# 1870#############################################################################
1696 1871
1697package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1706 1881
1707sub new { 1882sub new {
1708 my $class = shift; 1883 my $class = shift;
1709 1884
1710 $class->SUPER::new ( 1885 $class->SUPER::new (
1711 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1712 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1713 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1714 can_hover => 1, 1890 can_hover => 1,
1715 align => 0, 1891 align => 0,
1716 valign => 0, 1892 valign => 0,
1717 can_events => 1, 1893 can_events => 1,
1718 @_ 1894 @_
1719 ) 1895 )
1720} 1896}
1721 1897
1898sub activate { }
1899
1722sub button_up { 1900sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1724 1902
1903 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1905 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate"); 1906
1728 } 1907 1
1729} 1908}
1730 1909
1731sub _draw { 1910sub _draw {
1732 my ($self) = @_; 1911 my ($self) = @_;
1733 1912
1734 local $self->{fg} = $self->{fg}; 1913 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1735
1736 if ($GRAB == $self) {
1737 $self->{fg} = $self->{active_fg};
1738 }
1739 1914
1740 glEnable GL_TEXTURE_2D; 1915 glEnable GL_TEXTURE_2D;
1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1742 glColor 0, 0, 0, 1; 1917 glColor 0, 0, 0, 1;
1743 1918
… …
1762 1937
1763sub new { 1938sub new {
1764 my $class = shift; 1939 my $class = shift;
1765 1940
1766 $class->SUPER::new ( 1941 $class->SUPER::new (
1767 padding => 2, 1942 padding_x => 2,
1943 padding_y => 2,
1768 fg => [1, 1, 1], 1944 fg => [1, 1, 1],
1769 active_fg => [1, 1, 0], 1945 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2], 1946 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5], 1947 active_bg => [1, 1, 1, 0.5],
1772 state => 0, 1948 state => 0,
… …
1776} 1952}
1777 1953
1778sub size_request { 1954sub size_request {
1779 my ($self) = @_; 1955 my ($self) = @_;
1780 1956
1781 ($self->{padding} * 2 + 6) x 2 1957 (6) x 2
1782} 1958}
1783 1959
1784sub button_down { 1960sub button_down {
1785 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1786 1962
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1789 $self->{state} = !$self->{state}; 1965 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1966 $self->_emit (changed => $self->{state});
1967 } else {
1968 return 0
1969 }
1970
1791 } 1971 1
1792} 1972}
1793 1973
1794sub _draw { 1974sub _draw {
1795 my ($self) = @_; 1975 my ($self) = @_;
1796 1976
1797 $self->SUPER::_draw; 1977 $self->SUPER::_draw;
1798 1978
1799 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1979 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1800 1980
1801 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;
1802 1984
1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1985 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1804 1986
1805 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1987 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806 1988
… …
1961 2143
1962 my $h1 = $self->{h} * (1 - $ycut1); 2144 my $h1 = $self->{h} * (1 - $ycut1);
1963 my $h2 = $self->{h} * (1 - $ycut2); 2145 my $h2 = $self->{h} * (1 - $ycut2);
1964 2146
1965 glEnable GL_BLEND; 2147 glEnable GL_BLEND;
1966 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;
1967 glEnable GL_TEXTURE_2D; 2150 glEnable GL_TEXTURE_2D;
1968 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1969 2152
1970 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2153 glBindTexture GL_TEXTURE_2D, $t1->{name};
1971 glBegin GL_QUADS; 2154 glBegin GL_QUADS;
… …
2070 my $self = $class->SUPER::new ( 2253 my $self = $class->SUPER::new (
2071 fg => [1, 1, 1], 2254 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2255 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2256 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2257 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10], 2258 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2259 min_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2260 min_h => $::WIDTH / 80,
2078 vertical => 0, 2261 vertical => 0,
2079 can_hover => 1, 2262 can_hover => 1,
2080 inner_pad => 0.02, 2263 inner_pad => 0.02,
2081 @_ 2264 @_
2082 ); 2265 );
… …
2085 $self->update; 2268 $self->update;
2086 2269
2087 $self 2270 $self
2088} 2271}
2089 2272
2273sub changed { }
2274
2090sub set_range { 2275sub set_range {
2091 my ($self, $range) = @_; 2276 my ($self, $range) = @_;
2092 2277
2093 $self->{range} = $range; 2278 ($range, $self->{range}) = ($self->{range}, $range);
2094 2279
2095 $self->update; 2280 $self->update
2281 if "@$range" ne "@{$self->{range}}";
2096} 2282}
2097 2283
2098sub set_value { 2284sub set_value {
2099 my ($self, $value) = @_; 2285 my ($self, $value) = @_;
2100 2286
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2287 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102 2288
2103 $hi = $lo + 1 if $hi <= $lo; 2289 $hi = $lo + 1 if $hi <= $lo;
2104 2290
2291 $page = $hi - $lo if $page > $hi - $lo;
2292
2105 $value = $lo if $value < $lo; 2293 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi; 2294 $value = $hi - $page if $value > $hi - $page;
2107 2295
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2296 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit; 2297 if $unit;
2110 2298
2111 $page = $hi - $lo if $page > $hi - $lo;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2299 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2300
2115 if ($value != $old_value) { 2301 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2302 $self->_emit (changed => $value);
2117 $self->update; 2303 $self->update;
2118 } 2304 }
2119} 2305}
2120 2306
2121sub size_request { 2307sub size_request {
2122 my ($self) = @_; 2308 my ($self) = @_;
2123 2309
2124 my $w = $self->{req_w}; 2310 ($self->{req_w}, $self->{req_h})
2125 my $h = $self->{req_h};
2126
2127 $self->{vertical} ? ($h, $w) : ($w, $h)
2128} 2311}
2129 2312
2130sub button_down { 2313sub button_down {
2131 my ($self, $ev, $x, $y) = @_; 2314 my ($self, $ev, $x, $y) = @_;
2132 2315
2133 $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
2134 $self->mouse_motion ($ev, $x, $y); 2320 $self->mouse_motion ($ev, $x, $y)
2135} 2321}
2136 2322
2137sub mouse_motion { 2323sub mouse_motion {
2138 my ($self, $ev, $x, $y) = @_; 2324 my ($self, $ev, $x, $y) = @_;
2139 2325
2140 if ($GRAB == $self) { 2326 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2327 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142 2328
2143 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2329 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144 2330
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2331 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2146 2332
2147 $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
2148 } 2338 1
2149} 2339}
2150 2340
2151sub update { 2341sub update {
2152 my ($self) = @_; 2342 my ($self) = @_;
2153 2343
2154 $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}) {
2155 $self->set_value ($self->{range}[0]); 2352 $self->set_value ($self->{range}[0]);
2156 2353
2157 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2354 my ($value, $lo, $hi, $page) = @{$self->{range}};
2355 my $range = ($hi - $page - $lo) || 1e-100;
2158 2356
2159 my $inner_w = 1 - 2 * $self->{inner_pad}; 2357 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2160 2358
2161 $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;
2162 2361
2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2362 $value = ($value - $lo) / $range;
2164 $value = $self->{scale} * ($value - $lo); 2363 $value = $value * $self->{scale} + $self->{offset};
2165 2364
2166 $value = $self->{inner_pad} + ($value - $page * 0.5);
2167
2168 $value = 0 if $value < 0;
2169 $page = 1 - $value if $value + $page > 1;
2170
2171 $self->{knob_x} = $value; 2365 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $page; 2366 $self->{knob_w} = $knob_w;
2173 }); 2367 }
2174
2175 $self->SUPER::update;
2176}
2177
2178sub _draw {
2179 my ($self) = @_;
2180 2368
2181 $self->SUPER::_draw (); 2369 $self->SUPER::_draw ();
2182 2370
2183 glScale $self->{w}, $self->{h}; 2371 glScale $self->{w}, $self->{h};
2184 2372
… …
2293 $self->{layout}->set_width ($self->{children}[0]{w}); 2481 $self->{layout}->set_width ($self->{children}[0]{w});
2294 2482
2295 $self->reflow; 2483 $self->reflow;
2296} 2484}
2297 2485
2298sub text_height { 2486sub text_size {
2299 my ($self, $text, $indent) = @_; 2487 my ($self, $text, $indent) = @_;
2300 2488
2301 my $layout = $self->{layout}; 2489 my $layout = $self->{layout};
2302 2490
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2491 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent); 2492 $layout->set_width ($self->{children}[0]{w} - $indent);
2305 $layout->set_markup ($text); 2493 $layout->set_markup ($text);
2306 2494
2307 ($layout->size)[1] 2495 $layout->size
2308} 2496}
2309 2497
2310sub reflow { 2498sub reflow {
2311 my ($self) = @_; 2499 my ($self) = @_;
2312 2500
2313 $self->{need_reflow}++; 2501 $self->{need_reflow}++;
2314 $self->update; 2502 $self->update;
2315} 2503}
2316 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
2317sub clear { 2512sub clear {
2318 my ($self) = @_; 2513 my ($self) = @_;
2319 2514
2320 $self->{par} = []; 2515 $self->{par} = [];
2321 $self->{height} = 0; 2516 $self->{height} = 0;
2322 2517 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2323 $self->reflow;
2324} 2518}
2325 2519
2326sub add_paragraph { 2520sub add_paragraph {
2327 my ($self, $color, $text, $indent) = @_; 2521 my ($self, $color, $text, $indent) = @_;
2328 2522
2329 for my $line (split /\n/, $text) { 2523 for my $line (split /\n/, $text) {
2330 my $height = $self->text_height ($line); 2524 my ($w, $h) = $self->text_size ($line);
2331 $self->{height} += $height; 2525 $self->{height} += $h;
2332 push @{$self->{par}}, [$height, $color, $indent, $line]; 2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2333 } 2527 }
2334 2528
2335 $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]);
2336 $self->{children}[1]->update;
2337} 2530}
2338 2531
2339sub update { 2532sub update {
2340 my ($self) = @_; 2533 my ($self) = @_;
2341 2534
… …
2344 return unless $self->{h} > 0; 2537 return unless $self->{h} > 0;
2345 2538
2346 delete $self->{texture}; 2539 delete $self->{texture};
2347 2540
2348 $ROOT->on_post_alloc ($self, sub { 2541 $ROOT->on_post_alloc ($self, sub {
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543
2349 if (delete $self->{need_reflow}) { 2544 if (delete $self->{need_reflow}) {
2350 my $height = 0; 2545 my $height = 0;
2351 2546
2352 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
2353 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 }
2354 2562
2355 $self->{height} = $height; 2563 $self->{height} = $height;
2356 2564
2357 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2358 $self->{children}[1]->update;
2359 2566
2360 delete $self->{texture}; 2567 delete $self->{texture};
2361 } 2568 }
2362 2569
2363 $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 {
2364 glClearColor 0.5, 0.5, 0.5, 0; 2571 glClearColor 0, 0, 0, 0;
2365 glClear GL_COLOR_BUFFER_BIT; 2572 glClear GL_COLOR_BUFFER_BIT;
2366 2573
2367 my $top = int $self->{children}[1]{range}[0]; 2574 my $top = int $self->{children}[1]{range}[0];
2368 2575
2369 my $y0 = $top; 2576 my $y0 = $top;
2370 my $y1 = $top + $self->{h}; 2577 my $y1 = $top + $H;
2371 2578
2372 my $y = 0; 2579 my $y = 0;
2373 2580
2374 my $layout = $self->{layout}; 2581 my $layout = $self->{layout};
2375 2582
2376 $layout->set_font ($self->{font}) if $self->{font}; 2583 $layout->set_font ($self->{font}) if $self->{font};
2377 2584
2378 glEnable GL_BLEND; 2585 glEnable GL_BLEND;
2586 #TODO# not correct in windows where rgba is forced off
2379 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2587 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2380 2588
2381 for my $par (@{$self->{par}}) { 2589 for my $par (@{$self->{par}}) {
2382 my $h = $par->[0]; 2590 my $h = $par->[1];
2383 2591
2384 if ($y0 < $y + $h && $y < $y1) { 2592 if ($y0 < $y + $h && $y < $y1) {
2385 $layout->set_foreground (@{ $par->[1] }); 2593 $layout->set_foreground (@{ $par->[2] });
2386 $layout->set_width ($self->{w} - $par->[2]); 2594 $layout->set_width ($W - $par->[3]);
2387 $layout->set_markup ($par->[3]); 2595 $layout->set_markup ($par->[4]);
2388 2596
2389 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2597 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2390 2598
2391 glRasterPos $par->[2], $y - $y0; 2599 glRasterPos $par->[3], $y - $y0;
2392 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2600 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2393 } 2601 }
2394 2602
2395 $y += $h; 2603 $y += $h;
2396 } 2604 }
… …
2403sub _draw { 2611sub _draw {
2404 my ($self) = @_; 2612 my ($self) = @_;
2405 2613
2406 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2407 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2408 glColor 1, 1, 1, 1; 2616 glColor 0, 0, 0, 1;
2409 $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});
2410 glDisable GL_TEXTURE_2D; 2618 glDisable GL_TEXTURE_2D;
2411 2619
2412 $self->{children}[1]->draw; 2620 $self->{children}[1]->draw;
2413 2621
2414} 2622}
… …
2463 2671
2464sub new { 2672sub new {
2465 my $class = shift; 2673 my $class = shift;
2466 2674
2467 my $self = $class->SUPER::new ( 2675 my $self = $class->SUPER::new (
2468 state => 0, 2676 state => 0,
2469 connect_activate => \&toggle_flopper, 2677 on_activate => \&toggle_flopper,
2470 @_ 2678 @_
2471 ); 2679 );
2472 2680
2473 if ($self->{state}) {
2474 $self->{state} = 0;
2475 $self->toggle_flopper;
2476 }
2477
2478 $self 2681 $self
2479} 2682}
2480 2683
2481sub toggle_flopper { 2684sub toggle_flopper {
2482 my ($self) = @_; 2685 my ($self) = @_;
2483 2686
2484 # TODO: use animation 2687 $self->{other}->toggle_visibility;
2485 if ($self->{state} = !$self->{state}) {
2486 $CFClient::UI::ROOT->add ($self->{other});
2487 $self->{other}->move ($self->coord2global (0, $self->{h}));
2488 $self->emit ("open");
2489 } else {
2490 $CFClient::UI::ROOT->remove ($self->{other});
2491 $self->emit ("close");
2492 }
2493
2494 $self->emit (changed => $self->{state});
2495} 2688}
2496 2689
2497############################################################################# 2690#############################################################################
2498 2691
2499package CFClient::UI::Tooltip; 2692package CFClient::UI::Tooltip;
… …
2512} 2705}
2513 2706
2514sub set_tooltip_from { 2707sub set_tooltip_from {
2515 my ($self, $widget) = @_; 2708 my ($self, $widget) = @_;
2516 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
2517 $self->add (new CFClient::UI::Label 2719 $self->add (new CFClient::UI::Label
2518 markup => $widget->{tooltip}, 2720 markup => $tooltip,
2519 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2520 fontsize => 0.8, 2722 fontsize => 0.8,
2521 fg => [0, 0, 0, 1], 2723 fg => [0, 0, 0, 1],
2522 ellipsise => 0, 2724 ellipsise => 0,
2523 font => ($widget->{tooltip_font} || $::FONT_PROP), 2725 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2534 2736
2535sub size_allocate { 2737sub size_allocate {
2536 my ($self, $w, $h) = @_; 2738 my ($self, $w, $h) = @_;
2537 2739
2538 $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 });
2539} 2759}
2540 2760
2541sub _draw { 2761sub _draw {
2542 my ($self) = @_; 2762 my ($self) = @_;
2543 2763
… …
2560 glVertex $w, $h; 2780 glVertex $w, $h;
2561 glVertex $w, 0; 2781 glVertex $w, 0;
2562 glEnd; 2782 glEnd;
2563 2783
2564 glTranslate 2 - 0.375, 2 - 0.375; 2784 glTranslate 2 - 0.375, 2 - 0.375;
2785
2565 $self->SUPER::_draw; 2786 $self->SUPER::_draw;
2566} 2787}
2567 2788
2568############################################################################# 2789#############################################################################
2569 2790
… …
2575 2796
2576sub new { 2797sub new {
2577 my $class = shift; 2798 my $class = shift;
2578 2799
2579 my $self = $class->SUPER::new ( 2800 my $self = $class->SUPER::new (
2580 aspect => 1, 2801 aspect => 1,
2802 can_events => 0,
2581 @_, 2803 @_,
2582 ); 2804 );
2583 2805
2584 if ($self->{anim} && $self->{animspeed}) { 2806 if ($self->{anim} && $self->{animspeed}) {
2585 Scalar::Util::weaken (my $widget = $self); 2807 Scalar::Util::weaken (my $widget = $self);
… …
2611} 2833}
2612 2834
2613sub _draw { 2835sub _draw {
2614 my ($self) = @_; 2836 my ($self) = @_;
2615 2837
2616 return unless $::CONN;#d# manage and cache textures differently 2838 return unless $::CONN;
2617 2839
2618 my $face; 2840 my $face;
2619 2841
2620 if ($self->{frame}) { 2842 if ($self->{frame}) {
2621 my $anim = $::CONN->{anim}[$self->{anim}]; 2843 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2627 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2849 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2628 2850
2629 if ($tex) { 2851 if ($tex) {
2630 glEnable GL_TEXTURE_2D; 2852 glEnable GL_TEXTURE_2D;
2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2632 glColor 1, 1, 1, 1; 2854 glColor 0, 0, 0, 1;
2633 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2634 glDisable GL_TEXTURE_2D; 2856 glDisable GL_TEXTURE_2D;
2635 } 2857 }
2636} 2858}
2637 2859
… …
2644 $self->SUPER::DESTROY; 2866 $self->SUPER::DESTROY;
2645} 2867}
2646 2868
2647############################################################################# 2869#############################################################################
2648 2870
2649package CFClient::UI::InventoryItem; 2871package CFClient::UI::Buttonbar;
2650 2872
2651our @ISA = CFClient::UI::HBox::; 2873our @ISA = CFClient::UI::HBox::;
2652 2874
2653sub _item_to_desc { 2875# TODO: should actualyl wrap buttons and other goodies.
2654 my ($item) = @_;
2655
2656 my $desc =
2657 $item->{nrof} < 2
2658 ? $item->{name}
2659 : "$item->{nrof} × $item->{name_pl}";
2660
2661 $item->{flags} & Crossfire::Protocol::F_OPEN
2662 and $desc .= " (open)";
2663 $item->{flags} & Crossfire::Protocol::F_APPLIED
2664 and $desc .= " (applied)";
2665 $item->{flags} & Crossfire::Protocol::F_UNPAID
2666 and $desc .= " (unpaid)";
2667 $item->{flags} & Crossfire::Protocol::F_MAGIC
2668 and $desc .= " (magic)";
2669 $item->{flags} & Crossfire::Protocol::F_CURSED
2670 and $desc .= " (cursed)";
2671 $item->{flags} & Crossfire::Protocol::F_DAMNED
2672 and $desc .= " (damned)";
2673 $item->{flags} & Crossfire::Protocol::F_LOCKED
2674 and $desc .= " *";
2675
2676 $desc
2677}
2678
2679sub new {
2680 my $class = shift;
2681
2682 my %args = @_;
2683
2684 my $item = delete $args{item};
2685
2686 my $desc = _item_to_desc ($item);
2687
2688 my $self = $class->SUPER::new (
2689 can_hover => 1,
2690 can_events => 1,
2691 tooltip => ((CFClient::UI::Label::escape $desc)
2692 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2693 connect_button_down => sub {
2694 my ($self, $ev, $x, $y) = @_;
2695
2696 # todo: maybe put examine on 1? but should just be a tooltip :(
2697 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2698 my $targ = $::CONN->{player}{tag};
2699
2700 if ($item->{container} == $::CONN->{player}{tag}) {
2701 $targ = $main::OPENCONT;
2702 }
2703
2704 $::CONN->send ("move $targ $item->{tag} 0");
2705 } elsif ($ev->{button} == 1) {
2706 $::CONN->send ("examine $item->{tag}");
2707 } elsif ($ev->{button} == 2) {
2708 $::CONN->send ("apply $item->{tag}");
2709 } elsif ($ev->{button} == 3) {
2710 my @menu_items = (
2711 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2712 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2713 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2714 (
2715 $item->{flags} & Crossfire::Protocol::F_LOCKED
2716 ? (
2717 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2718 )
2719 : (
2720 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2721 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2722 )
2723 ),
2724 );
2725
2726 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2727 }
2728
2729 1
2730 },
2731 %args
2732 );
2733
2734
2735 $self->add (new CFClient::UI::Face
2736 can_events => 0,
2737 face => $item->{face},
2738 anim => $item->{anim},
2739 animspeed => $item->{animspeed},
2740 );
2741
2742 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2743
2744 $self->{item} = $item;
2745
2746 $self->update_item;
2747
2748 $self
2749}
2750
2751sub update_item {
2752 my ($self) = @_;
2753
2754 my $desc = _item_to_desc ($self->{item});
2755
2756 $self->{name_lbl}->set_text ($desc);
2757}
2758
2759#############################################################################
2760
2761package CFClient::UI::Inventory;
2762
2763our @ISA = CFClient::UI::ScrolledWindow::;
2764
2765sub new {
2766 my $class = shift;
2767
2768 my $self = $class->SUPER::new (
2769 scrolled => (new CFClient::UI::Table),
2770 @_,
2771 );
2772
2773 $self
2774}
2775
2776sub set_items {
2777 my ($self, $items) = @_;
2778
2779 $self->{scrolled}->clear;
2780 return unless $items;
2781
2782 my @items = sort {
2783 ($a->{type} <=> $b->{type})
2784 or ($a->{name} cmp $b->{name})
2785 } @$items;
2786
2787 $self->{real_items} = \@items;
2788
2789 for my $item (@items) {
2790 $item->{item} = $item;
2791 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2792 $item->update_item ();
2793 }
2794
2795 my $i = 0;
2796 for (@items) {
2797 $self->{scrolled}->add (0, $i, $_);
2798 my $nrof = $_->{item}->{nrof} || 1;
2799 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2800 }
2801
2802# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2803}
2804
2805sub size_request {
2806 my ($self) = @_;
2807 ($self->{req_w}, $self->{req_h});
2808}
2809 2876
2810############################################################################# 2877#############################################################################
2811 2878
2812package CFClient::UI::Menu; 2879package CFClient::UI::Menu;
2813 2880
… …
2847 2914
2848# 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)
2849sub popup { 2916sub popup {
2850 my ($self, $ev) = @_; 2917 my ($self, $ev) = @_;
2851 2918
2852 $self->emit ("popdown"); 2919 $self->_emit ("popdown");
2853 2920
2854 # maybe save $GRAB? must be careful about events... 2921 # maybe save $GRAB? must be careful about events...
2855 $GRAB = $self; 2922 $GRAB = $self;
2856 $self->{button} = $ev->{button}; 2923 $self->{button} = $ev->{button};
2857 2924
2858 $self->show; 2925 $self->show;
2859 $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);
2860} 2927}
2861 2928
2862sub mouse_motion { 2929sub mouse_motion {
2863 my ($self, $ev, $x, $y) = @_; 2930 my ($self, $ev, $x, $y) = @_;
2864 2931
2865 # TODO: should use vbox->find_widget or so 2932 # TODO: should use vbox->find_widget or so
2866 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2867 $self->{hover} = $self->{item}{$HOVER}; 2934 $self->{hover} = $self->{item}{$HOVER};
2935
2936 0
2868} 2937}
2869 2938
2870sub button_up { 2939sub button_up {
2871 my ($self, $ev, $x, $y) = @_; 2940 my ($self, $ev, $x, $y) = @_;
2872 2941
2873 if ($ev->{button} == $self->{button}) { 2942 if ($ev->{button} == $self->{button}) {
2874 undef $GRAB; 2943 undef $GRAB;
2875 $self->hide; 2944 $self->hide;
2876 2945
2877 $self->emit ("popdown"); 2946 $self->_emit ("popdown");
2878 $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 );
2879 } 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});
2880} 3061}
2881 3062
2882############################################################################# 3063#############################################################################
2883 3064
2884package CFClient::UI::Statusbox; 3065package CFClient::UI::Statusbox;
… …
2944sub add { 3125sub add {
2945 my ($self, $text, %arg) = @_; 3126 my ($self, $text, %arg) = @_;
2946 3127
2947 $text =~ s/^\s+//; 3128 $text =~ s/^\s+//;
2948 $text =~ s/\s+$//; 3129 $text =~ s/\s+$//;
3130
3131 return unless $text;
2949 3132
2950 my $timeout = time + ((delete $arg{timeout}) || 60); 3133 my $timeout = time + ((delete $arg{timeout}) || 60);
2951 3134
2952 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2953 3136
… …
2987 $self->SUPER::reconfigure; 3170 $self->SUPER::reconfigure;
2988} 3171}
2989 3172
2990############################################################################# 3173#############################################################################
2991 3174
2992package CFClient::UI::Root; 3175package CFClient::UI::Inventory;
2993 3176
2994our @ISA = CFClient::UI::Container::; 3177our @ISA = CFClient::UI::ScrolledWindow::;
2995
2996use CFClient::OpenGL;
2997 3178
2998sub new { 3179sub new {
2999 my $class = shift; 3180 my $class = shift;
3000 3181
3001 $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 => [],
3002 @_, 3424 @_,
3003 ) 3425 )
3004} 3426}
3005 3427
3006sub configure { 3428# XXX: Do sorting? Argl...
3007 my ($self, $x, $y, $w, $h) = @_; 3429sub add_spell {
3008
3009 $self->{w} = $w;
3010 $self->{h} = $h;
3011}
3012
3013sub check_size {
3014 my ($self) = @_; 3430 my ($self, $spell) = @_;
3431 $self->{spells}->{$spell->{name}} = $spell;
3015 3432
3016 $self->size_allocate ($self->{w}, $self->{h}) 3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3017 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
3018} 3487}
3019 3488
3020sub size_request { 3489sub size_request {
3021 my ($self) = @_; 3490 my ($self) = @_;
3022 3491
3023 ($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
3024} 3507}
3025 3508
3026sub size_allocate { 3509sub size_allocate {
3027 my ($self, $w, $h) = @_; 3510 my ($self, $w, $h) = @_;
3028 3511
3029 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3030 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3031
3032 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3033 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3034
3035 for my $child ($self->children) { 3512 for my $child ($self->children) {
3036 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)};
3037 3514
3038 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3515 $X = $child->{force_x} if exists $child->{force_x};
3039 if exists $child->{req_x}; 3516 $Y = $child->{force_y} if exists $child->{force_y};
3040 3517
3041 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3518 $X = _to_pixel $X, $W, $self->{w};
3042 if exists $child->{req_y}; 3519 $Y = _to_pixel $Y, $H, $self->{h};
3043
3044 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3045 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3046 3520
3047 $child->configure ($X, $Y, $W, $H); 3521 $child->configure ($X, $Y, $W, $H);
3048 } 3522 }
3049} 3523}
3050 3524
… …
3061} 3535}
3062 3536
3063sub update { 3537sub update {
3064 my ($self) = @_; 3538 my ($self) = @_;
3065 3539
3066 $self->check_size;
3067 $::WANT_REFRESH++; 3540 $::WANT_REFRESH++;
3068} 3541}
3069 3542
3070sub add { 3543sub add {
3071 my ($self, @children) = @_; 3544 my ($self, @children) = @_;
3072 3545
3073 for my $child (@children) {
3074 $child->{toplevel} = 1; 3546 $_->{is_toplevel} = 1
3075 3547 for @children;
3076 # integerise window positions
3077 $child->{x} = int $child->{x};
3078 $child->{y} = int $child->{y};
3079 }
3080 3548
3081 $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;
3082 3559
3083 while (@children) { 3560 while (@children) {
3084 my $w = pop @children; 3561 my $w = pop @children;
3085 push @children, $w->children; 3562 push @children, $w->children;
3086 $w->{visible} = 1; 3563 $w->set_invisible;
3087 }
3088}
3089
3090sub remove {
3091 my ($self, @children) = @_;
3092
3093 $self->SUPER::remove (@children);
3094
3095 while (@children) {
3096 my $w = pop @children;
3097 push @children, $w->children;
3098 delete $w->{visible};
3099 } 3564 }
3100} 3565}
3101 3566
3102sub on_refresh { 3567sub on_refresh {
3103 my ($self, $id, $cb) = @_; 3568 my ($self, $id, $cb) = @_;
… …
3117 while ($self->{refresh_hook}) { 3582 while ($self->{refresh_hook}) {
3118 $_->() 3583 $_->()
3119 for values %{delete $self->{refresh_hook}}; 3584 for values %{delete $self->{refresh_hook}};
3120 } 3585 }
3121 3586
3122 if ($self->{check_size}) { 3587 if ($self->{realloc}) {
3123 my @queue = ([], []); 3588 my %queue;
3589 my @queue;
3590 my $widget;
3124 3591
3125 for (;;) { 3592 outer:
3126 if ($self->{check_size}) { 3593 while () {
3127 # heuristic: check containers last 3594 if (my $realloc = delete $self->{realloc}) {
3128 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3595 for $widget (values %$realloc) {
3129 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 }
3130 } 3602 }
3131 3603
3132 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3604 while () {
3605 @queue or last outer;
3133 3606
3134 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3607 $widget = pop @{ $queue[-1] || [] }
3135 ? @$widget{qw(user_w user_h)} 3608 and last;
3136 : $widget->size_request;
3137
3138 if (delete $widget->{force_alloc}
3139 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3140 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3141 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}) {
3142 $widget->{req_w} = $w; 3625 $widget->{req_w} = $w;
3143 $widget->{req_h} = $h; 3626 $widget->{req_h} = $h;
3144 3627
3145 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3628 $self->{size_alloc}{$widget+0} = $widget;
3146 3629
3147 $widget->{parent}->check_size
3148 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 }
3149 } 3637 }
3638
3639 delete $self->{realloc}{$widget+0};
3150 } 3640 }
3151 } 3641 }
3152 3642
3153 while ($self->{size_alloc}) { 3643 while (my $size_alloc = delete $self->{size_alloc}) {
3154 for (values %{delete $self->{size_alloc}}) { 3644 my @queue = sort { $b->{visible} <=> $a->{visible} }
3155 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)};
3156 3651
3157 $w = 0 if $w < 0; 3652 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0; 3653 $h = 0 if $h < 0;
3159 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
3160 $widget->{w} = $w; 3662 $widget->{w} = $w;
3161 $widget->{h} = $h; 3663 $widget->{h} = $h;
3162 $widget->size_allocate ($w, $h); 3664
3163 $widget->emit (size_allocate => $w, $h); 3665 $widget->emit (size_allocate => $w, $h);
3666 }
3164 } 3667 }
3165 } 3668 }
3166 3669
3167 while ($self->{post_alloc_hook}) { 3670 while ($self->{post_alloc_hook}) {
3168 $_->() 3671 $_->()
3169 for values %{delete $self->{post_alloc_hook}}; 3672 for values %{delete $self->{post_alloc_hook}};
3170 } 3673 }
3674
3171 3675
3172 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3676 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3173 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3174 glClear GL_COLOR_BUFFER_BIT; 3678 glClear GL_COLOR_BUFFER_BIT;
3175 3679
… …
3177 glLoadIdentity; 3681 glLoadIdentity;
3178 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3179 glMatrixMode GL_MODELVIEW; 3683 glMatrixMode GL_MODELVIEW;
3180 glLoadIdentity; 3684 glLoadIdentity;
3181 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
3182 $self->_draw; 3693 $self->_draw;
3183} 3694}
3184 3695
3185############################################################################# 3696#############################################################################
3186 3697

Diff Legend

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