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

Diff Legend

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