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

Diff Legend

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