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.273 by root, Sat Jun 3 02:32:35 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
749############################################################################# 953#############################################################################
750 954
751package CFClient::UI::ScrolledWindow; 955package CFClient::UI::ScrolledWindow;
752 956
753our @ISA = CFClient::UI::HBox::; 957our @ISA = CFClient::UI::HBox::;
958
959sub new {
960 my ($class, %arg) = @_;
961
962 my $child = delete $arg{child};
963
964 my $self;
965
966 my $slider = new CFClient::UI::Slider
967 vertical => 1,
968 range => [0, 0, 1, 0.01], # HACK fix
969 on_changed => sub {
970 $self->{vp}->set_offset (0, $_[1]);
971 },
972 ;
973
974 $self = $class->SUPER::new (
975 vp => (new CFClient::UI::ViewPort expand => 1),
976 slider => $slider,
977 %arg,
978 );
979
980 $self->SUPER::add ($self->{vp}, $self->{slider});
981 $self->add ($child) if $child;
982
983 $self
984}
985
986sub add {
987 my ($self, $widget) = @_;
988
989 $self->{vp}->add ($self->{child} = $widget);
990}
991
992sub update {
993 my ($self) = @_;
994
995 $self->SUPER::update;
996
997 # todo: overwrite size_allocate of child
998 my $child = $self->{vp}->child;
999 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1000}
1001
1002sub size_allocate {
1003 my ($self, $w, $h) = @_;
1004
1005 $self->SUPER::size_allocate ($w, $h);
1006
1007 my $child = $self->{vp}->child;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009}
1010
1011#TODO# update range on size_allocate depending on child
1012# update viewport offset on scroll
1013
1014#############################################################################
1015
1016package CFClient::UI::Frame;
1017
1018our @ISA = CFClient::UI::Bin::;
1019
1020use CFClient::OpenGL;
754 1021
755sub new { 1022sub new {
756 my $class = shift; 1023 my $class = shift;
757 1024
758 my $self;
759
760 my $slider = new CFClient::UI::Slider
761 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 },
766 ;
767
768 $self = $class->SUPER::new ( 1025 $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 1026 bg => undef,
770 slider => $slider,
771 @_, 1027 @_,
1028 )
1029}
1030
1031sub _draw {
1032 my ($self) = @_;
1033
1034 if ($self->{bg}) {
1035 my ($w, $h) = @$self{qw(w h)};
1036
1037 glEnable GL_BLEND;
1038 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1039 glColor @{ $self->{bg} };
1040
1041 glBegin GL_QUADS;
1042 glVertex 0 , 0;
1043 glVertex 0 , $h;
1044 glVertex $w, $h;
1045 glVertex $w, 0;
1046 glEnd;
1047
1048 glDisable GL_BLEND;
1049 }
1050
1051 $self->SUPER::_draw;
1052}
1053
1054#############################################################################
1055
1056package CFClient::UI::FancyFrame;
1057
1058our @ISA = CFClient::UI::Bin::;
1059
1060use CFClient::OpenGL;
1061
1062my $bg =
1063 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1064 mipmap => 1, wrap => 1;
1065
1066my @border =
1067 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1068 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1069
1070sub new {
1071 my ($class, %arg) = @_;
1072
1073 my $title = delete $arg{title};
1074
1075 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1],
1078 border => 0.6,
1079 can_events => 1,
1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
772 ); 1083 );
773 1084
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
778 $self
779}
780
781#TODO# update range on size_allocate depeneing on child
782# update viewport offset on scroll
783
784#############################################################################
785
786package CFClient::UI::Frame;
787
788our @ISA = CFClient::UI::Bin::;
789
790use 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
804sub new {
805 my $class = shift;
806
807 # TODO: user_x, user_y, overwrite moveto?
808
809 my $self = $class->SUPER::new (
810 bg => [1, 1, 1, 1],
811 border_bg => [1, 1, 1, 1],
812 border => 0.6,
813 can_events => 1,
814 @_
815 );
816
817 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title} = new CFClient::UI::Label
818 align => 0, 1086 align => 0,
819 valign => 1, 1087 valign => 1,
820 text => $self->{title}, 1088 text => $title,
821 fontsize => $self->{border}; 1089 fontsize => $self->{border}
1090 if defined $title;
822 1091
823 $self 1092 $self
1093}
1094
1095sub add {
1096 my ($self, @widgets) = @_;
1097
1098 $self->SUPER::add (@widgets);
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
824} 1100}
825 1101
826sub border { 1102sub border {
827 int $_[0]{border} * $::FONTSIZE 1103 int $_[0]{border} * $::FONTSIZE
828} 1104}
829 1105
830sub size_request { 1106sub size_request {
831 my ($self) = @_; 1107 my ($self) = @_;
1108
1109 $self->{title}->size_request
1110 if $self->{title};
832 1111
833 my ($w, $h) = $self->SUPER::size_request; 1112 my ($w, $h) = $self->SUPER::size_request;
834 1113
835 ( 1114 (
836 $w + $self->border * 2, 1115 $w + $self->border * 2,
… …
839} 1118}
840 1119
841sub size_allocate { 1120sub size_allocate {
842 my ($self, $w, $h) = @_; 1121 my ($self, $w, $h) = @_;
843 1122
1123 if ($self->{title}) {
1124 $self->{title}{w} = $w;
1125 $self->{title}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h);
1127 }
1128
1129 my $border = $self->border;
1130
844 $h -= List::Util::max 0, $self->border * 2; 1131 $h -= List::Util::max 0, $border * 2;
845 $w -= List::Util::max 0, $self->border * 2; 1132 $w -= List::Util::max 0, $border * 2;
846 1133
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); 1134 $self->child->configure ($border, $border, $w, $h);
851} 1135}
852 1136
853sub button_down { 1137sub button_down {
854 my ($self, $ev, $x, $y) = @_; 1138 my ($self, $ev, $x, $y) = @_;
855 1139
… …
871 my ($ev, $x, $y) = @_; 1155 my ($ev, $x, $y) = @_;
872 1156
873 my $dx = $ev->{x} - $ox; 1157 my $dx = $ev->{x} - $ox;
874 my $dy = $ev->{y} - $oy; 1158 my $dy = $ev->{y} - $oy;
875 1159
876 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
877 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162
1163 $self->realloc;
878 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
879 $self->check_size;
880 }; 1165 };
881 1166
882 } elsif ($lr ^ $td) { 1167 } elsif ($lr ^ $td) {
883 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1168 my ($ox, $oy) = ($ev->{x}, $ev->{y});
884 my ($bx, $by) = ($self->{x}, $self->{y}); 1169 my ($bx, $by) = ($self->{x}, $self->{y});
… …
886 $self->{motion} = sub { 1171 $self->{motion} = sub {
887 my ($ev, $x, $y) = @_; 1172 my ($ev, $x, $y) = @_;
888 1173
889 ($x, $y) = ($ev->{x}, $ev->{y}); 1174 ($x, $y) = ($ev->{x}, $ev->{y});
890 1175
891 $self->move ($bx + $x - $ox, $by + $y - $oy); 1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
892 $self->update;
893 }; 1177 };
1178 } else {
1179 return 0;
1180 }
1181
894 } 1182 1
895} 1183}
896 1184
897sub button_up { 1185sub button_up {
898 my ($self, $ev, $x, $y) = @_; 1186 my ($self, $ev, $x, $y) = @_;
899 1187
900 delete $self->{motion}; 1188 !!delete $self->{motion}
901} 1189}
902 1190
903sub mouse_motion { 1191sub mouse_motion {
904 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
905 1193
906 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1194 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195
1196 !!$self->{motion}
907} 1197}
908 1198
909sub _draw { 1199sub _draw {
910 my ($self) = @_; 1200 my ($self) = @_;
911 1201
1202 my $child = $self->{children}[0];
1203
912 my ($w, $h ) = ($self->{w}, $self->{h}); 1204 my ($w, $h ) = ($self->{w}, $self->{h});
913 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1205 my ($cw, $ch) = ($child->{w}, $child->{h});
914 1206
915 glEnable GL_TEXTURE_2D; 1207 glEnable GL_TEXTURE_2D;
916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1208 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
917 1209
918 my $border = $self->border; 1210 my $border = $self->border;
919 1211
920 glColor @{ $self->{border_bg} }; 1212 glColor @{ $self->{border_bg} };
921 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1213 $border[0]->draw_quad_alpha (0, 0, $w, $border);
922 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1214 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
923 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1215 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
924 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1216 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
925 1217
926 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1218 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
927 my $bg = $tex[0]; 1219 glColor @{ $self->{bg} };
928 1220
929 # TODO: repeat texture not scale 1221 # TODO: repeat texture not scale
1222 # solve this better(?)
930 my $rep_x = $cw / $bg->{w}; 1223 $bg->{s} = $cw / $bg->{w};
931 my $rep_y = $ch / $bg->{h}; 1224 $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); 1225 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
939 } 1226 }
940 1227
941 glDisable GL_TEXTURE_2D; 1228 glDisable GL_TEXTURE_2D;
942 1229
943 $self->{title}->draw if $self->{title};
944
945 $self->child->draw; 1230 $child->draw;
1231
1232 if ($self->{title}) {
1233 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw;
1235 }
946} 1236}
947 1237
948############################################################################# 1238#############################################################################
949 1239
950package CFClient::UI::Table; 1240package CFClient::UI::Table;
… …
958sub new { 1248sub new {
959 my $class = shift; 1249 my $class = shift;
960 1250
961 $class->SUPER::new ( 1251 $class->SUPER::new (
962 col_expand => [], 1252 col_expand => [],
963 @_ 1253 @_,
964 ) 1254 )
1255}
1256
1257sub children {
1258 grep $_, map @$_, grep $_, @{ $_[0]{children} }
965} 1259}
966 1260
967sub add { 1261sub add {
968 my ($self, $x, $y, $child) = @_; 1262 my ($self, $x, $y, $child) = @_;
969 1263
970 $child->set_parent ($self); 1264 $child->set_parent ($self);
971 $self->{children}[$y][$x] = $child; 1265 $self->{children}[$y][$x] = $child;
972 1266
973 $child->check_size; 1267 $self->realloc;
974} 1268}
975 1269
976sub children {
977 grep $_, map @$_, grep $_, @{ $_[0]{children} }
978}
979
980# TODO: move to container class maybe? send childs a signal on removal? 1270# TODO: move to container class maybe? send children a signal on removal?
981sub clear { 1271sub clear {
982 my ($self) = @_; 1272 my ($self) = @_;
983 1273
984 my @children = $self->children; 1274 my @children = $self->children;
985 delete $self->{children}; 1275 delete $self->{children};
… …
987 for (@children) { 1277 for (@children) {
988 delete $_->{parent}; 1278 delete $_->{parent};
989 $_->hide; 1279 $_->hide;
990 } 1280 }
991 1281
992 $self->update; 1282 $self->realloc;
993} 1283}
994 1284
995sub get_wh { 1285sub get_wh {
996 my ($self) = @_; 1286 my ($self) = @_;
997 1287
… …
1028sub size_allocate { 1318sub size_allocate {
1029 my ($self, $w, $h) = @_; 1319 my ($self, $w, $h) = @_;
1030 1320
1031 my ($ws, $hs) = $self->get_wh; 1321 my ($ws, $hs) = $self->get_wh;
1032 1322
1033 my $req_w = sum @$ws; 1323 my $req_w = (sum @$ws) || 1;
1034 my $req_h = sum @$hs; 1324 my $req_h = (sum @$hs) || 1;
1035 1325
1036 # TODO: nicer code && do row_expand 1326 # TODO: nicer code && do row_expand
1037 my @col_expand = @{$self->{col_expand}}; 1327 my @col_expand = @{$self->{col_expand}};
1038 @col_expand = (1) x @$ws unless @col_expand; 1328 @col_expand = (1) x @$ws unless @col_expand;
1039 my $col_expand = (sum @col_expand) || 1; 1329 my $col_expand = (sum @col_expand) || 1;
… …
1093 } 1383 }
1094} 1384}
1095 1385
1096############################################################################# 1386#############################################################################
1097 1387
1098package CFClient::UI::HBox; 1388package CFClient::UI::Box;
1099
1100# TODO: wrap into common Box base class
1101 1389
1102our @ISA = CFClient::UI::Container::; 1390our @ISA = CFClient::UI::Container::;
1103 1391
1104sub size_request { 1392sub size_request {
1105 my ($self) = @_; 1393 my ($self) = @_;
1106 1394
1107 my @alloc = map [$_->size_request], @{$self->{children}}; 1395 $self->{vertical}
1108 1396 ? (
1109 ( 1397 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1110 (List::Util::sum map $_->[0], @alloc), 1398 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1111 (List::Util::max map $_->[1], @alloc), 1399 )
1112 ) 1400 : (
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 )
1113} 1404}
1114 1405
1115sub size_allocate { 1406sub size_allocate {
1116 my ($self, $w, $h) = @_; 1407 my ($self, $w, $h) = @_;
1117 1408
1118 ($h, $w) = ($w, $h); 1409 my $space = $self->{vertical} ? $h : $w;
1119
1120 my $children = $self->{children}; 1410 my $children = $self->{children};
1121 1411
1122 my @h = map $_->{req_w}, @$children; 1412 my @req;
1123 1413
1124 my $req_h = List::Util::sum @h; 1414 if ($self->{homogeneous}) {
1125 1415 @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 { 1416 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1418 my $req = List::Util::sum @req;
1419
1420 if ($req > $space) {
1421 # ah well, not enough space
1422 $_ *= $space / $req for @req;
1423 } else {
1130 my $exp = List::Util::sum map $_->{expand}, @$children; 1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1131 $exp ||= 1;
1132 1425
1426 $space = ($space - $req) / $expand; # remaining space to give away
1427
1428 $req[$_] += $space * $children->[$_]{expand}
1133 for (0 .. $#$children) { 1429 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 } 1430 }
1140 } 1431 }
1141 1432
1142 CFClient::UI::harmonize \@h; 1433 CFClient::UI::harmonize \@req;
1143 1434
1144 my $y = 0; 1435 my $pos = 0;
1145 for (0 .. $#$children) { 1436 for (0 .. $#$children) {
1146 my $child = $children->[$_];
1147 my $h = $h[$_]; 1437 my $alloc = $req[$_];
1148 $child->configure ($y, 0, $h, $w); 1438 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1149 1439
1150 $y += $h; 1440 $pos += $alloc;
1151 } 1441 }
1152 1442
1153 1 1443 1
1154} 1444}
1155 1445
1156############################################################################# 1446#############################################################################
1157 1447
1448package CFClient::UI::HBox;
1449
1450our @ISA = CFClient::UI::Box::;
1451
1452sub new {
1453 my $class = shift;
1454
1455 $class->SUPER::new (
1456 vertical => 0,
1457 @_,
1458 )
1459}
1460
1461#############################################################################
1462
1158package CFClient::UI::VBox; 1463package CFClient::UI::VBox;
1159 1464
1160# TODO: wrap into common Box base class
1161
1162our @ISA = CFClient::UI::Container::; 1465our @ISA = CFClient::UI::Box::;
1163 1466
1164sub size_request { 1467sub new {
1165 my ($self) = @_; 1468 my $class = shift;
1166 1469
1167 my @alloc = map [$_->size_request], @{$self->{children}}; 1470 $class->SUPER::new (
1168 1471 vertical => 1,
1169 ( 1472 @_,
1170 (List::Util::max map $_->[0], @alloc),
1171 (List::Util::sum map $_->[1], @alloc),
1172 ) 1473 )
1173} 1474}
1174 1475
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############################################################################# 1476#############################################################################
1215 1477
1216package CFClient::UI::Label; 1478package CFClient::UI::Label;
1217 1479
1218our @ISA = CFClient::UI::Base::; 1480our @ISA = CFClient::UI::DrawBG::;
1219 1481
1220use CFClient::OpenGL; 1482use CFClient::OpenGL;
1221 1483
1222sub new { 1484sub new {
1223 my ($class, %arg) = @_; 1485 my ($class, %arg) = @_;
1224 1486
1225 my $self = $class->SUPER::new ( 1487 my $self = $class->SUPER::new (
1226 fg => [1, 1, 1], 1488 fg => [1, 1, 1],
1489 #bg => none
1490 #active_bg => none
1227 #font => default_font 1491 #font => default_font
1228 #text => initial text 1492 #text => initial text
1229 #markup => initial narkup 1493 #markup => initial narkup
1494 #max_w => maximum pixel width
1495 ellipsise => 3, # end
1230 layout => (new CFClient::Layout), 1496 layout => (new CFClient::Layout),
1231 fontsize => 1, 1497 fontsize => 1,
1232 align => -1, 1498 align => -1,
1233 valign => -1, 1499 valign => -1,
1234 padding => 2, 1500 padding_x => 2,
1501 padding_y => 2,
1235 can_events => 0, 1502 can_events => 0,
1236 %arg 1503 %arg
1237 ); 1504 );
1238 1505
1239 if (exists $self->{template}) { 1506 if (exists $self->{template}) {
… …
1249 } 1516 }
1250 1517
1251 $self 1518 $self
1252} 1519}
1253 1520
1254sub escape { 1521sub escape($) {
1255 local $_ = $_[1]; 1522 local $_ = $_[0];
1256 1523
1257 s/&/&amp;/g; 1524 s/&/&amp;/g;
1258 s/>/&gt;/g; 1525 s/>/&gt;/g;
1259 s/</&lt;/g; 1526 s/</&lt;/g;
1260 1527
1261 $_[1] 1528 $_
1262} 1529}
1263 1530
1264sub update { 1531sub update {
1265 my ($self) = @_; 1532 my ($self) = @_;
1266 1533
… …
1275 $self->{text} = "T$text"; 1542 $self->{text} = "T$text";
1276 1543
1277 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1278 $self->{layout}->set_text ($text); 1545 $self->{layout}->set_text ($text);
1279 1546
1547 $self->realloc;
1280 $self->update; 1548 $self->update;
1281 $self->check_size;
1282} 1549}
1283 1550
1284sub set_markup { 1551sub set_markup {
1285 my ($self, $markup) = @_; 1552 my ($self, $markup) = @_;
1286 1553
… …
1290 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1557 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1291 1558
1292 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1293 $self->{layout}->set_markup ($markup); 1560 $self->{layout}->set_markup ($markup);
1294 1561
1562 $self->realloc;
1295 $self->update; 1563 $self->update;
1296 $self->check_size;
1297} 1564}
1298 1565
1299sub size_request { 1566sub size_request {
1300 my ($self) = @_; 1567 my ($self) = @_;
1301 1568
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1569 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $self->{layout}->set_width ($self->{max_w} || -1); 1570 $self->{layout}->set_width ($self->{max_w} || -1);
1571 $self->{layout}->set_ellipsise ($self->{ellipsise});
1572 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305 1574
1306 my ($w, $h) = $self->{layout}->size; 1575 my ($w, $h) = $self->{layout}->size;
1307 1576
1308 if (exists $self->{template}) { 1577 if (exists $self->{template}) {
… …
1313 1582
1314 $w = List::Util::max $w, $w2; 1583 $w = List::Util::max $w, $w2;
1315 $h = List::Util::max $h, $h2; 1584 $h = List::Util::max $h, $h2;
1316 } 1585 }
1317 1586
1318 ( 1587 ($w, $h)
1319 $w + $self->{padding} * 2,
1320 $h + $self->{padding} * 2,
1321 )
1322} 1588}
1323 1589
1324sub size_allocate { 1590sub size_allocate {
1325 my ($self, $w, $h) = @_; 1591 my ($self, $w, $h) = @_;
1326 1592
1593 delete $self->{ox};
1594
1327 delete $self->{texture}; 1595 delete $self->{texture}
1596 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1328} 1597}
1329 1598
1330sub set_fontsize { 1599sub set_fontsize {
1331 my ($self, $fontsize) = @_; 1600 my ($self, $fontsize) = @_;
1332 1601
1333 $self->{fontsize} = $fontsize; 1602 $self->{fontsize} = $fontsize;
1334 delete $self->{texture}; 1603 delete $self->{texture};
1335 1604
1336 $self->update; 1605 $self->realloc;
1337 $self->check_size;
1338} 1606}
1339 1607
1340sub _draw { 1608sub _draw {
1341 my ($self) = @_; 1609 my ($self) = @_;
1610
1611 $self->SUPER::_draw; # draw background, if applicable
1342 1612
1343 my $tex = $self->{texture} ||= do { 1613 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}}); 1614 $self->{layout}->set_foreground (@{$self->{fg}});
1345 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1615 $self->{layout}->set_font ($self->{font}) if $self->{font};
1346 $self->{layout}->set_width ($self->{w}); 1616 $self->{layout}->set_width ($self->{w});
1617 $self->{layout}->set_ellipsise ($self->{ellipsise});
1618 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1347 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348 1620
1349 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1621 new_from_layout CFClient::Texture $self->{layout}
1622 };
1350 1623
1624 unless (exists $self->{ox}) {
1351 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1625 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1352 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1626 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1353 : ($self->{w} - $tex->{w}) * 0.5; 1627 : ($self->{w} - $tex->{w}) * 0.5);
1354 1628
1355 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1629 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1356 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1357 : ($self->{h} - $tex->{h}) * 0.5; 1631 : ($self->{h} - $tex->{h}) * 0.5);
1358
1359 $tex
1360 }; 1632 };
1361 1633
1362 glEnable GL_TEXTURE_2D; 1634 glEnable GL_TEXTURE_2D;
1363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1364 1636
… …
1390 active_fg => [0, 0, 0], 1662 active_fg => [0, 0, 0],
1391 can_hover => 1, 1663 can_hover => 1,
1392 can_focus => 1, 1664 can_focus => 1,
1393 valign => 0, 1665 valign => 0,
1394 can_events => 1, 1666 can_events => 1,
1667 #text => ...
1395 @_ 1668 @_
1396 ) 1669 )
1397} 1670}
1398 1671
1399sub _set_text { 1672sub _set_text {
… …
1409 $self->{text} = $text; 1682 $self->{text} = $text;
1410 1683
1411 $text =~ s/./*/g if $self->{hidden}; 1684 $text =~ s/./*/g if $self->{hidden};
1412 $self->{layout}->set_text ("$text "); 1685 $self->{layout}->set_text ("$text ");
1413 1686
1414 $self->emit (changed => $self->{text}); 1687 $self->_emit (changed => $self->{text});
1415} 1688}
1416 1689
1417sub set_text { 1690sub set_text {
1418 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1419 1692
1420 $self->{cursor} = length $text; 1693 $self->{cursor} = length $text;
1421 $self->_set_text ($text); 1694 $self->_set_text ($text);
1422 $self->check_size; 1695
1423 $self->update; 1696 $self->realloc;
1424} 1697}
1425 1698
1426sub get_text { 1699sub get_text {
1427 $_[0]{text} 1700 $_[0]{text}
1428} 1701}
… …
1431 my ($self) = @_; 1704 my ($self) = @_;
1432 1705
1433 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1434 1707
1435 ($w + 1, $h) # add 1 for cursor 1708 ($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} 1709}
1443 1710
1444sub key_down { 1711sub key_down {
1445 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1446 1713
… …
1448 my $sym = $ev->{sym}; 1715 my $sym = $ev->{sym};
1449 my $uni = $ev->{unicode}; 1716 my $uni = $ev->{unicode};
1450 1717
1451 my $text = $self->get_text; 1718 my $text = $self->get_text;
1452 1719
1453 if ($sym == 8) { 1720 if ($uni == 8) {
1454 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455 } elsif ($sym == 127) { 1722 } elsif ($uni == 127) {
1456 substr $text, $self->{cursor}, 1, ""; 1723 substr $text, $self->{cursor}, 1, "";
1457 } elsif ($sym == CFClient::SDLK_LEFT) { 1724 } elsif ($sym == CFClient::SDLK_LEFT) {
1458 --$self->{cursor} if $self->{cursor}; 1725 --$self->{cursor} if $self->{cursor};
1459 } elsif ($sym == CFClient::SDLK_RIGHT) { 1726 } elsif ($sym == CFClient::SDLK_RIGHT) {
1460 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1727 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1461 } elsif ($sym == CFClient::SDLK_HOME) { 1728 } elsif ($sym == CFClient::SDLK_HOME) {
1462 $self->{cursor} = 0; 1729 $self->{cursor} = 0;
1463 } elsif ($sym == CFClient::SDLK_END) { 1730 } elsif ($sym == CFClient::SDLK_END) {
1464 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1465 } elsif ($sym == 27) { 1732 } elsif ($uni == 27) {
1466 $self->emit ('escape'); 1733 $self->_emit ('escape');
1467 } elsif ($uni) { 1734 } elsif ($uni) {
1468 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1469 } 1738 }
1470 1739
1471 $self->_set_text ($text); 1740 $self->_set_text ($text);
1472 $self->update; 1741
1742 $self->realloc;
1743
1744 1
1473} 1745}
1474 1746
1475sub focus_in { 1747sub focus_in {
1476 my ($self) = @_; 1748 my ($self) = @_;
1477 1749
… …
1492 utf8::encode $text; 1764 utf8::encode $text;
1493 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1494 1766
1495 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1496 $self->update; 1768 $self->update;
1769
1770 1
1497} 1771}
1498 1772
1499sub mouse_motion { 1773sub mouse_motion {
1500 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1501# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1502} 1778}
1503 1779
1504sub _draw { 1780sub _draw {
1505 my ($self) = @_; 1781 my ($self) = @_;
1506 1782
… …
1557 if ($sym == 13) { 1833 if ($sym == 13) {
1558 unshift @{$self->{history}}, 1834 unshift @{$self->{history}},
1559 my $txt = $self->get_text; 1835 my $txt = $self->get_text;
1560 $self->{history_pointer} = -1; 1836 $self->{history_pointer} = -1;
1561 $self->{history_saveback} = ''; 1837 $self->{history_saveback} = '';
1562 $self->emit (activate => $txt); 1838 $self->_emit (activate => $txt);
1563 $self->update; 1839 $self->update;
1564 1840
1565 } elsif ($sym == CFClient::SDLK_UP) { 1841 } elsif ($sym == CFClient::SDLK_UP) {
1566 if ($self->{history_pointer} < 0) { 1842 if ($self->{history_pointer} < 0) {
1567 $self->{history_saveback} = $self->get_text; 1843 $self->{history_saveback} = $self->get_text;
… …
1583 } else { 1859 } else {
1584 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1585 } 1861 }
1586 1862
1587 } else { 1863 } else {
1588 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1589 } 1867 1
1590
1591} 1868}
1592 1869
1593############################################################################# 1870#############################################################################
1594 1871
1595package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1604 1881
1605sub new { 1882sub new {
1606 my $class = shift; 1883 my $class = shift;
1607 1884
1608 $class->SUPER::new ( 1885 $class->SUPER::new (
1609 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1610 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1611 bg => [1, 1, 1, 0.2],
1612 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1613 can_hover => 1, 1890 can_hover => 1,
1614 align => 0, 1891 align => 0,
1615 valign => 0, 1892 valign => 0,
1616 can_events => 1, 1893 can_events => 1,
1617 @_ 1894 @_
1618 ) 1895 )
1619} 1896}
1620 1897
1898sub activate { }
1899
1621sub button_up { 1900sub button_up {
1622 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1623 1902
1903 $self->emit ("activate")
1624 if ($x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1625 && $y >= 0 && $y < $self->{h}) { 1905 && $y >= 0 && $y < $self->{h};
1626 $self->emit ("activate"); 1906
1627 } 1907 1
1628} 1908}
1629 1909
1630sub _draw { 1910sub _draw {
1631 my ($self) = @_; 1911 my ($self) = @_;
1632 1912
… …
1661 1941
1662sub new { 1942sub new {
1663 my $class = shift; 1943 my $class = shift;
1664 1944
1665 $class->SUPER::new ( 1945 $class->SUPER::new (
1666 padding => 2, 1946 padding_x => 2,
1947 padding_y => 2,
1667 fg => [1, 1, 1], 1948 fg => [1, 1, 1],
1668 active_fg => [1, 1, 0], 1949 active_fg => [1, 1, 0],
1950 bg => [0, 0, 0, 0.2],
1951 active_bg => [1, 1, 1, 0.5],
1669 state => 0, 1952 state => 0,
1670 can_hover => 1, 1953 can_hover => 1,
1671 @_ 1954 @_
1672 ) 1955 )
1673} 1956}
1674 1957
1675sub size_request { 1958sub size_request {
1676 my ($self) = @_; 1959 my ($self) = @_;
1677 1960
1678 ($self->{padding} * 2 + 6) x 2 1961 (6) x 2
1679} 1962}
1680 1963
1681sub button_down { 1964sub button_down {
1682 my ($self, $ev, $x, $y) = @_; 1965 my ($self, $ev, $x, $y) = @_;
1683 1966
1684 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1685 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1686 $self->{state} = !$self->{state}; 1969 $self->{state} = !$self->{state};
1687 $self->emit (changed => $self->{state}); 1970 $self->_emit (changed => $self->{state});
1971 } else {
1972 return 0
1973 }
1974
1688 } 1975 1
1689} 1976}
1690 1977
1691sub _draw { 1978sub _draw {
1692 my ($self) = @_; 1979 my ($self) = @_;
1693 1980
1694 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1695 1982
1696 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1983 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1697 1984
1698 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1985 my ($w, $h) = @$self{qw(w h)};
1986
1987 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1699 1988
1700 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1989 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1701 1990
1702 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1991 my $tex = $self->{state} ? $tex[1] : $tex[0];
1703 1992
… …
1957 qw(s1_slider.png s1_slider_bg.png); 2246 qw(s1_slider.png s1_slider_bg.png);
1958 2247
1959sub new { 2248sub new {
1960 my $class = shift; 2249 my $class = shift;
1961 2250
1962 # range [value, low, high, page] 2251 # range [value, low, high, page, unit]
1963 2252
1964 # TODO: 0-width page 2253 # TODO: 0-width page
1965 # TODO: req_w/h are wrong with vertical 2254 # TODO: req_w/h are wrong with vertical
1966 # TODO: calculations are off 2255 # TODO: calculations are off
1967 my $self = $class->SUPER::new ( 2256 my $self = $class->SUPER::new (
1968 fg => [1, 1, 1], 2257 fg => [1, 1, 1],
1969 active_fg => [0, 0, 0], 2258 active_fg => [0, 0, 0],
2259 bg => [0, 0, 0, 0.2],
2260 active_bg => [1, 1, 1, 0.5],
1970 range => [0, 0, 100, 10], 2261 range => [0, 0, 100, 10, 0],
1971 req_w => $::WIDTH / 80, 2262 min_w => $::WIDTH / 80,
1972 req_h => $::WIDTH / 80, 2263 min_h => $::WIDTH / 80,
1973 vertical => 0, 2264 vertical => 0,
1974 can_hover => 1, 2265 can_hover => 1,
1975 inner_pad => 5, 2266 inner_pad => 0.02,
1976 @_ 2267 @_
1977 ); 2268 );
1978 2269
2270 $self->set_value ($self->{range}[0]);
2271 $self->update;
2272
1979 $self 2273 $self
1980} 2274}
1981 2275
2276sub changed { }
2277
2278sub set_range {
2279 my ($self, $range) = @_;
2280
2281 ($range, $self->{range}) = ($self->{range}, $range);
2282
2283 $self->update
2284 if "@$range" ne "@{$self->{range}}";
2285}
2286
2287sub set_value {
2288 my ($self, $value) = @_;
2289
2290 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2291
2292 $hi = $lo + 1 if $hi <= $lo;
2293
2294 $page = $hi - $lo if $page > $hi - $lo;
2295
2296 $value = $lo if $value < $lo;
2297 $value = $hi - $page if $value > $hi - $page;
2298
2299 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2300 if $unit;
2301
2302 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2303
2304 if ($value != $old_value) {
2305 $self->_emit (changed => $value);
2306 $self->update;
2307 }
2308}
2309
1982sub size_request { 2310sub size_request {
1983 my ($self) = @_; 2311 my ($self) = @_;
1984 2312
1985 my $w = $self->{req_w}; 2313 ($self->{req_w}, $self->{req_h})
1986 my $h = $self->{req_h};
1987
1988 $self->{vertical} ? ($h, $w) : ($w, $h)
1989} 2314}
1990 2315
1991sub button_down { 2316sub button_down {
1992 my ($self, $ev, $x, $y) = @_; 2317 my ($self, $ev, $x, $y) = @_;
1993 2318
1994 $self->SUPER::button_down ($ev, $x, $y); 2319 $self->SUPER::button_down ($ev, $x, $y);
2320
2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2322
1995 $self->mouse_motion ($ev, $x, $y); 2323 $self->mouse_motion ($ev, $x, $y)
1996} 2324}
1997 2325
1998sub mouse_motion { 2326sub mouse_motion {
1999 my ($self, $ev, $x, $y) = @_; 2327 my ($self, $ev, $x, $y) = @_;
2000 2328
2001 if ($GRAB == $self) { 2329 if ($GRAB == $self) {
2330 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2331
2332 my (undef, $lo, $hi, $page) = @{$self->{range}};
2333
2334 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2335
2336 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2337 } else {
2338 return 0;
2339 }
2340
2341 1
2342}
2343
2344sub update {
2345 my ($self) = @_;
2346
2347 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2348 $self->set_value ($self->{range}[0]);
2349
2002 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2350 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100;
2003 2352
2004 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2353 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2005 2354
2006 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2355 $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 2356 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2008 2357
2009 $x -= $inner_pad_px; # substract the padding 2358 $value = ($value - $lo) / $range;
2010 $x = $x * ($hi - $lo) / $inner_w + $lo; 2359 $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 2360
2015 $self->emit (changed => $x); 2361 $self->{knob_x} = $value - $knob_w * 0.5;
2016 $self->update; 2362 $self->{knob_w} = $knob_w;
2017 } 2363 });
2018}
2019 2364
2020# the inner_* stuff is for generating a padding for the slider handle, 2365 $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} 2366}
2027 2367
2028sub _draw { 2368sub _draw {
2029 my ($self) = @_; 2369 my ($self) = @_;
2030 2370
2031 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2032 2372
2033 my ($w, $h) = @$self{qw(w h)}; 2373 glScale $self->{w}, $self->{h};
2034 2374
2035 if ($self->{vertical}) { 2375 if ($self->{vertical}) {
2036 # draw a vertical slider like a rotated horizontal slider 2376 # draw a vertical slider like a rotated horizontal slider
2037 2377
2378 glTranslate 1, 0, 0;
2038 glRotate 90, 0, 0, 1; 2379 glRotate 90, 0, 0, 1;
2039 glTranslate 0, -$self->{w}, 0;
2040
2041 ($w, $h) = ($h, $w);
2042 } 2380 }
2043 2381
2044 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2382 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2383 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046 2384
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; 2385 glEnable GL_TEXTURE_2D;
2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2386 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067 2387
2068 # draw background 2388 # draw background
2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2389 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070 2390
2071 # draw handle 2391 # draw handle
2072 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2392 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2073 2393
2074 glDisable GL_TEXTURE_2D; 2394 glDisable GL_TEXTURE_2D;
2075} 2395}
2396
2397#############################################################################
2398
2399package CFClient::UI::ValSlider;
2400
2401our @ISA = CFClient::UI::HBox::;
2402
2403sub new {
2404 my ($class, %arg) = @_;
2405
2406 my $range = delete $arg{range};
2407
2408 my $self = $class->SUPER::new (
2409 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2410 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2411 to_value => sub { shift },
2412 from_value => sub { shift },
2413 %arg,
2414 );
2415
2416 $self->{slider}->connect (changed => sub {
2417 my ($self, $value) = @_;
2418 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2419 $self->{parent}->emit (changed => $value);
2420 });
2421
2422# $self->{entry}->connect (changed => sub {
2423# my ($self, $value) = @_;
2424# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2425# $self->{parent}->emit (changed => $value);
2426# });
2427
2428 $self->add ($self->{slider}, $self->{entry});
2429
2430 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2431
2432 $self
2433}
2434
2435sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) }
2076 2437
2077############################################################################# 2438#############################################################################
2078 2439
2079package CFClient::UI::TextView; 2440package CFClient::UI::TextView;
2080 2441
… …
2110 2471
2111 $self->{fontsize} = $fontsize; 2472 $self->{fontsize} = $fontsize;
2112 $self->reflow; 2473 $self->reflow;
2113} 2474}
2114 2475
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 { 2476sub size_allocate {
2135 my ($self, $w, $h) = @_; 2477 my ($self, $w, $h) = @_;
2136 2478
2137 $self->SUPER::size_allocate ($w, $h); 2479 $self->SUPER::size_allocate ($w, $h);
2138 2480
… …
2141 $self->{layout}->set_width ($self->{children}[0]{w}); 2483 $self->{layout}->set_width ($self->{children}[0]{w});
2142 2484
2143 $self->reflow; 2485 $self->reflow;
2144} 2486}
2145 2487
2488sub text_size {
2489 my ($self, $text, $indent) = @_;
2490
2491 my $layout = $self->{layout};
2492
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent);
2495 $layout->set_markup ($text);
2496
2497 $layout->size
2498}
2499
2500sub reflow {
2501 my ($self) = @_;
2502
2503 $self->{need_reflow}++;
2504 $self->update;
2505}
2506
2507sub set_offset {
2508 my ($self, $offset) = @_;
2509
2510 # todo: base offset on lines or so, not on pixels
2511 $self->{children}[1]->set_value ($offset);
2512}
2513
2514sub clear {
2515 my ($self) = @_;
2516
2517 $self->{par} = [];
2518 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520}
2521
2146sub add_paragraph { 2522sub add_paragraph {
2147 my ($self, $color, $text) = @_; 2523 my ($self, $color, $text, $indent) = @_;
2148 2524
2149 #TODO: intelligently "reformat" paragraph 2525 for my $line (split /\n/, $text) {
2150 2526 my ($w, $h) = $self->text_size ($line);
2151 my $height = $self->text_height ($text);
2152
2153 $self->{height} += $height; 2527 $self->{height} += $h;
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2529 }
2154 2530
2155 push @{$self->{par}}, [$height, $color, $text];
2156
2157 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2158 $self->{children}[1]->update;
2159} 2532}
2160 2533
2161sub update { 2534sub update {
2162 my ($self) = @_; 2535 my ($self) = @_;
2163 2536
… …
2165 2538
2166 return unless $self->{h} > 0; 2539 return unless $self->{h} > 0;
2167 2540
2168 delete $self->{texture}; 2541 delete $self->{texture};
2169 2542
2170 $ROOT->on_refresh ($self, sub { 2543 $ROOT->on_post_alloc ($self, sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545
2171 if (delete $self->{need_reflow}) { 2546 if (delete $self->{need_reflow}) {
2172 my $height = 0; 2547 my $height = 0;
2173 2548
2174 $height += $_->[0] = $self->text_height ($_->[2]) 2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2175 for @{$self->{par}}; 2553 for (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555 $layout->set_width ($W - $_->[3]);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3];
2559 $_->[1] = $h;
2560 }
2561
2562 $height += $_->[1];
2563 }
2176 2564
2177 $self->{height} = $height; 2565 $self->{height} = $height;
2178 2566
2179 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2180 2568
2181 delete $self->{texture}; 2569 delete $self->{texture};
2182 } 2570 }
2183 2571
2184 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2185 glClearColor 0, 0, 0, 0; 2573 glClearColor 0.5, 0.5, 0.5, 0;
2186 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2187 2575
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]; 2576 my $top = int $self->{children}[1]{range}[0];
2192 2577
2193 my $y0 = $top; 2578 my $y0 = $top;
2194 my $y1 = $top + $self->{h}; 2579 my $y1 = $top + $H;
2195 2580
2196 my $y = 0; 2581 my $y = 0;
2197 2582
2198 my $layout = $self->{layout}; 2583 my $layout = $self->{layout};
2199 2584
2200 $layout->set_font ($self->{font}) if $self->{font}; 2585 $layout->set_font ($self->{font}) if $self->{font};
2201 2586
2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590
2202 for my $par (@{$self->{par}}) { 2591 for my $par (@{$self->{par}}) {
2203 my $h = $par->[0]; 2592 my $h = $par->[1];
2204 2593
2205 if ($y0 < $y + $h && $y < $y1) { 2594 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] }); 2595 $layout->set_foreground (@{ $par->[2] });
2596 $layout->set_width ($W - $par->[3]);
2207 $layout->set_markup ($par->[2]); 2597 $layout->set_markup ($par->[4]);
2208 2598
2209 my ($W, $H) = $layout->size; 2599 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2210 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2600
2601 glRasterPos $par->[3], $y - $y0;
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2211 } 2603 }
2212 2604
2213 $y += $h; 2605 $y += $h;
2214 } 2606 }
2215 2607
2216 glDisable GL_TEXTURE_2D; 2608 glDisable GL_BLEND;
2217 }; 2609 };
2218 }); 2610 });
2219} 2611}
2220 2612
2221sub _draw { 2613sub _draw {
2222 my ($self) = @_; 2614 my ($self) = @_;
2223 2615
2224 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2226 glColor 1, 1, 1, 1; 2618 glColor 1, 1, 1, 1;
2227 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2619 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2228 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2229 2621
2230 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2231 2623
2232} 2624}
… …
2281 2673
2282sub new { 2674sub new {
2283 my $class = shift; 2675 my $class = shift;
2284 2676
2285 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2286 state => 0, 2678 state => 0,
2287 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2288 @_ 2680 @_
2289 ); 2681 );
2290 2682
2291 if ($self->{state}) {
2292 $self->{state} = 0;
2293 $self->toggle_flopper;
2294 }
2295
2296 $self 2683 $self
2297} 2684}
2298 2685
2299sub toggle_flopper { 2686sub toggle_flopper {
2300 my ($self) = @_; 2687 my ($self) = @_;
2301 2688
2302 # TODO: use animation 2689 $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} 2690}
2314 2691
2315############################################################################# 2692#############################################################################
2316 2693
2317package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2330} 2707}
2331 2708
2332sub set_tooltip_from { 2709sub set_tooltip_from {
2333 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2334 2711
2712 my $tooltip = $widget->{tooltip};
2713
2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2335 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2336 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2337 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338 fontsize => 0.8, 2724 fontsize => 0.8,
2339 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2726 ellipsise => 0,
2340 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
2341 ); 2728 );
2342} 2729}
2343 2730
2344sub size_request { 2731sub size_request {
2345 my ($self) = @_; 2732 my ($self) = @_;
… …
2351 2738
2352sub size_allocate { 2739sub size_allocate {
2353 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2354 2741
2355 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2743}
2744
2745sub visibility_change {
2746 my ($self, $visible) = @_;
2747
2748 return unless $visible;
2749
2750 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner}
2752 or return;
2753
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH;
2758
2759 $self->move_abs ($x, $y);
2760 });
2356} 2761}
2357 2762
2358sub _draw { 2763sub _draw {
2359 my ($self) = @_; 2764 my ($self) = @_;
2360 2765
… …
2377 glVertex $w, $h; 2782 glVertex $w, $h;
2378 glVertex $w, 0; 2783 glVertex $w, 0;
2379 glEnd; 2784 glEnd;
2380 2785
2381 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2382 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2383} 2789}
2384 2790
2385############################################################################# 2791#############################################################################
2386 2792
… …
2391use CFClient::OpenGL; 2797use CFClient::OpenGL;
2392 2798
2393sub new { 2799sub new {
2394 my $class = shift; 2800 my $class = shift;
2395 2801
2396 $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2397 aspect => 1, 2803 aspect => 1,
2804 can_events => 0,
2398 @_, 2805 @_,
2399 ) 2806 );
2807
2808 if ($self->{anim} && $self->{animspeed}) {
2809 Scalar::Util::weaken (my $widget = $self);
2810
2811 $self->{timer} = Event->timer (
2812 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2813 hard => 1,
2814 interval => $self->{animspeed},
2815 cb => sub {
2816 ++$widget->{frame};
2817 $widget->update;
2818 },
2819 );
2820 }
2821
2822 $self
2400} 2823}
2401 2824
2402sub size_request { 2825sub size_request {
2403 (32, 8) 2826 (32, 8)
2404} 2827}
2405 2828
2829sub update {
2830 my ($self) = @_;
2831
2832 return unless $self->{visible};
2833
2834 $self->SUPER::update;
2835}
2836
2406sub _draw { 2837sub _draw {
2407 my ($self) = @_; 2838 my ($self) = @_;
2408 2839
2409 return unless $::CONN;#d# manage and cache textures differently 2840 return unless $::CONN;
2841
2842 my $face;
2843
2844 if ($self->{frame}) {
2845 my $anim = $::CONN->{anim}[$self->{anim}];
2846
2847 $face = $anim->[ $self->{frame} % @$anim ]
2848 if $anim && @$anim;
2849 }
2850
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2852
2412 # TODO animation
2413 if ($tex) { 2853 if ($tex) {
2414 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416 glColor 1, 1, 1, 1; 2856 glColor 1, 1, 1, 1;
2417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2419 } 2859 }
2420} 2860}
2421 2861
2862sub DESTROY {
2863 my ($self) = @_;
2864
2865 $self->{timer}->cancel
2866 if $self->{timer};
2867
2868 $self->SUPER::DESTROY;
2869}
2870
2422############################################################################# 2871#############################################################################
2423 2872
2424package CFClient::UI::InventoryItem; 2873package CFClient::UI::Buttonbar;
2425 2874
2426our @ISA = CFClient::UI::HBox::; 2875our @ISA = CFClient::UI::HBox::;
2427 2876
2428sub new { 2877# 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 2878
2531############################################################################# 2879#############################################################################
2532 2880
2533package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2534 2882
… …
2568 2916
2569# popup given the event (must be a mouse button down event currently) 2917# popup given the event (must be a mouse button down event currently)
2570sub popup { 2918sub popup {
2571 my ($self, $ev) = @_; 2919 my ($self, $ev) = @_;
2572 2920
2573 $self->emit ("popdown"); 2921 $self->_emit ("popdown");
2574 2922
2575 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2576 $GRAB = $self; 2924 $GRAB = $self;
2577 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2578 2926
2579 $self->show; 2927 $self->show;
2580 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2581} 2929}
2582 2930
2583sub mouse_motion { 2931sub mouse_motion {
2584 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2585 2933
2586 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2587 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2588 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2589} 2939}
2590 2940
2591sub button_up { 2941sub button_up {
2592 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2593 2943
2594 if ($ev->{button} == $self->{button}) { 2944 if ($ev->{button} == $self->{button}) {
2595 undef $GRAB; 2945 undef $GRAB;
2596 $self->hide; 2946 $self->hide;
2597 2947
2598 $self->emit ("popdown"); 2948 $self->_emit ("popdown");
2599 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2600 } 2954 1
2601} 2955}
2602 2956
2603############################################################################# 2957#############################################################################
2604 2958
2959package CFClient::UI::Multiplexer;
2960
2961our @ISA = CFClient::UI::Container::;
2962
2963sub new {
2964 my $class = shift;
2965
2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
3063}
3064
3065#############################################################################
3066
2605package CFClient::UI::Statusbox; 3067package CFClient::UI::Statusbox;
2606 3068
2607our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::VBox::;
3070
3071sub new {
3072 my $class = shift;
3073
3074 $class->SUPER::new (
3075 fontsize => 0.8,
3076 @_,
3077 )
3078}
2608 3079
2609sub reorder { 3080sub reorder {
2610 my ($self) = @_; 3081 my ($self) = @_;
2611 my $NOW = time; 3082 my $NOW = time;
2612 3083
… …
2631 ? "<b>$item->{count} ×</b> $item->{text}" 3102 ? "<b>$item->{count} ×</b> $item->{text}"
2632 : $item->{text}; 3103 : $item->{text};
2633 3104
2634 for ($short) { 3105 for ($short) {
2635 s/^\s+//; 3106 s/^\s+//;
2636 s/\012.*/…/s; 3107 s/\s+/ /g;
2637 my $len = int 30 / $item->{fontsize};
2638 substr $_, $len, length, "…" if $len < length;
2639 } 3108 }
2640 3109
2641 new CFClient::UI::Label 3110 new CFClient::UI::Label
2642 markup => $short, 3111 markup => $short,
2643 tooltip => $item->{tooltip}, 3112 tooltip => $item->{tooltip},
2644 tooltip_font => $::FONT_PROP, 3113 tooltip_font => $::FONT_PROP,
2645 tooltip_width => 0.67, 3114 tooltip_width => 0.67,
2646 fontsize => $item->{fontsize}, 3115 fontsize => $item->{fontsize} || $self->{fontsize},
3116 max_w => $::WIDTH * 0.44,
2647 color => $item->{color}, 3117 fg => $item->{fg},
2648 can_events => 1, 3118 can_events => 1,
2649 can_hover => 1 3119 can_hover => 1
2650 }; 3120 };
2651 } 3121 }
2652 3122
… …
2654 $self->SUPER::add (reverse @widgets); 3124 $self->SUPER::add (reverse @widgets);
2655} 3125}
2656 3126
2657sub add { 3127sub add {
2658 my ($self, $text, %arg) = @_; 3128 my ($self, $text, %arg) = @_;
3129
3130 $text =~ s/^\s+//;
3131 $text =~ s/\s+$//;
3132
3133 return unless $text;
2659 3134
2660 my $timeout = time + ((delete $arg{timeout}) || 60); 3135 my $timeout = time + ((delete $arg{timeout}) || 60);
2661 3136
2662 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663 3138
… …
2666 $item->{count}++; 3141 $item->{count}++;
2667 } else { 3142 } else {
2668 $item->{count} = 1; 3143 $item->{count} = 1;
2669 $item->{text} = $item->{tooltip} = $text; 3144 $item->{text} = $item->{tooltip} = $text;
2670 } 3145 }
3146 $item->{id} = ++$self->{id};
2671 $item->{timeout} = $timeout; 3147 $item->{timeout} = $timeout;
2672 delete $item->{label}; 3148 delete $item->{label};
2673 } else { 3149 } else {
2674 $self->{item}{$group} = { 3150 $self->{item}{$group} = {
2675 id => ++$self->{id}, 3151 id => ++$self->{id},
2676 text => $text, 3152 text => $text,
2677 timeout => $timeout, 3153 timeout => $timeout,
2678 tooltip => $text, 3154 tooltip => $text,
2679 fontsize => 0.8,
2680 color => [0.8, 0.8, 0.8, 0.8], 3155 fg => [0.8, 0.8, 0.8, 0.8],
2681 pri => 0, 3156 pri => 0,
2682 count => 1, 3157 count => 1,
2683 %arg, 3158 %arg,
2684 }; 3159 };
2685 } 3160 }
2686 3161
2687 $self->reorder; 3162 $self->reorder;
2688} 3163}
2689 3164
3165sub reconfigure {
3166 my ($self) = @_;
3167
3168 delete $_->{label}
3169 for values %{ $self->{item} || {} };
3170
3171 $self->reorder;
3172 $self->SUPER::reconfigure;
3173}
3174
2690############################################################################# 3175#############################################################################
2691 3176
2692package CFClient::UI::Root; 3177package CFClient::UI::Inventory;
2693 3178
2694our @ISA = CFClient::UI::Container::; 3179our @ISA = CFClient::UI::ScrolledWindow::;
2695
2696use CFClient::OpenGL;
2697 3180
2698sub new { 3181sub new {
2699 my $class = shift; 3182 my $class = shift;
2700 3183
2701 $class->SUPER::new ( 3184 my $self = $class->SUPER::new (
3185 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3186 @_,
3187 );
3188
3189 $self
3190}
3191
3192sub set_items {
3193 my ($self, $items) = @_;
3194
3195 $self->{child}->clear;
3196 return unless $items;
3197
3198 my @items = sort {
3199 ($a->{type} <=> $b->{type})
3200 or ($a->{name} cmp $b->{name})
3201 } @$items;
3202
3203 $self->{real_items} = \@items;
3204
3205 my $row = 0;
3206 for my $item (@items) {
3207 CFClient::Item::update_widgets $item;
3208
3209 $self->{child}->add (0, $row, $item->{face_widget});
3210 $self->{child}->add (1, $row, $item->{desc_widget});
3211 $self->{child}->add (2, $row, $item->{weight_widget});
3212
3213 $row++;
3214 }
3215}
3216
3217#############################################################################
3218
3219package CFClient::UI::BindEditor;
3220
3221our @ISA = CFClient::UI::FancyFrame::;
3222
3223sub new {
3224 my $class = shift;
3225
3226 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3227
3228 $self->add (my $vb = new CFClient::UI::VBox);
3229
3230
3231 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3232 text => "start recording",
3233 tooltip => "Start/Stops recording of actions."
3234 ."All subsequent actions after the recording started will be captured."
3235 ."The actions are displayed after the record was stopped."
3236 ."To bind the action you have to click on the 'Bind' button",
3237 on_activate => sub {
3238 unless ($self->{recording}) {
3239 $self->start;
3240 } else {
3241 $self->stop;
3242 }
3243 });
3244
3245 $vb->add (new CFClient::UI::Label text => "Actions:");
3246 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3247
3248 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3251 $hb->add (new CFClient::UI::Button
3252 text => "bind",
3253 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3254 on_activate => sub {
3255 $self->ask_for_bind;
3256 });
3257
3258 $vb->add (my $hb = new CFClient::UI::HBox);
3259 $hb->add (new CFClient::UI::Button
3260 text => "ok",
3261 expand => 1,
3262 tooltip => "This closes the binding editor and saves the binding",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->commit;
3266 });
3267
3268 $hb->add (new CFClient::UI::Button
3269 text => "cancel",
3270 expand => 1,
3271 tooltip => "This closes the binding editor without saving",
3272 on_activate => sub {
3273 $self->hide;
3274 $self->{binding_cancel}->()
3275 if $self->{binding_cancel};
3276 });
3277
3278 $self->update_binding_widgets;
3279
3280 $self
3281}
3282
3283sub commit {
3284 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3288 ."'. Don't forget 'Save Config'!");
3289 $self->{binding_change}->($mod, $sym, $cmds)
3290 if $self->{binding_change};
3291 } else {
3292 $::STATUSBOX->add ("No action bound, no key or action specified!");
3293 $self->{binding_cancel}->()
3294 if $self->{binding_cancel};
3295 }
3296}
3297
3298sub start {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("stop recording");
3302 $self->{recording} = 1;
3303 $self->clear_command_list;
3304 $::CONN->start_record if $::CONN;
3305}
3306
3307sub stop {
3308 my ($self) = @_;
3309
3310 $self->{rec_btn}->set_text ("start recording");
3311 $self->{recording} = 0;
3312
3313 my $rec;
3314 $rec = $::CONN->stop_record if $::CONN;
3315 return unless ref $rec eq 'ARRAY';
3316 $self->set_command_list ($rec);
3317}
3318
3319
3320sub ask_for_bind_and_commit {
3321 my ($self) = @_;
3322 $self->ask_for_bind (1);
3323}
3324
3325sub ask_for_bind {
3326 my ($self, $commit) = @_;
3327
3328 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets;
3332 $self->commit if $commit;
3333 });
3334}
3335
3336# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands)
3338# $cb is the callback that is executed on OK
3339# $ccb is the callback that is executed on CANCEL and
3340# when the binding was unsuccessful on OK
3341sub set_binding {
3342 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3343
3344 $self->clear_command_list;
3345 $self->{recording} = 0;
3346 $self->{rec_btn}->set_text ("start recording");
3347
3348 $self->{binding} = [$mod, $sym];
3349 $self->{commands} = $cmds;
3350
3351 $self->{binding_change} = $cb;
3352 $self->{binding_cancel} = $ccb;
3353
3354 $self->update_binding_widgets;
3355}
3356
3357# this is a shortcut method that asks for a binding
3358# and then just binds it.
3359sub do_quick_binding {
3360 my ($self, $cmds) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub {
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1);
3365}
3366
3367sub update_binding_widgets {
3368 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding;
3370 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3371 $self->set_command_list ($cmds);
3372}
3373
3374sub get_binding {
3375 my ($self) = @_;
3376 return (
3377 $self->{binding}->[0],
3378 $self->{binding}->[1],
3379 [ grep { defined $_ } @{$self->{commands}} ]
3380 );
3381}
3382
3383sub clear_command_list {
3384 my ($self) = @_;
3385 $self->{cmdbox}->clear ();
3386}
3387
3388sub set_command_list {
3389 my ($self, $cmds) = @_;
3390
3391 $self->{cmdbox}->clear ();
3392 $self->{commands} = $cmds;
3393
3394 my $idx = 0;
3395
3396 for (@$cmds) {
3397 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3398
3399 my $i = $idx;
3400 $hb->add (new CFClient::UI::Label text => $_);
3401 $hb->add (new CFClient::UI::Button
3402 text => "delete",
3403 tooltip => "Deletes the action from the record",
3404 on_activate => sub {
3405 $self->{cmdbox}->remove ($hb);
3406 $cmds->[$i] = undef;
3407 });
3408
3409
3410 $idx++
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::SpellList;
3417
3418our @ISA = CFClient::UI::Table::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (
3424 binding => [],
3425 commands => [],
2702 @_, 3426 @_,
2703 ) 3427 )
2704} 3428}
2705 3429
2706sub configure { 3430# XXX: Do sorting? Argl...
2707 my ($self, $x, $y, $w, $h) = @_; 3431sub add_spell {
2708
2709 $self->{w} = $w;
2710 $self->{h} = $h;
2711}
2712
2713sub check_size {
2714 my ($self) = @_; 3432 my ($self, $spell) = @_;
3433 $self->{spells}->{$spell->{name}} = $spell;
2715 3434
2716 $self->size_allocate ($self->{w}, $self->{h}) 3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2717 if $self->{w}; 3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462}
3463
3464sub remove_spell {
3465 my ($self, $spell) = @_;
3466 delete $self->{spells}->{$spell->{name}};
3467 $self->rebuild_spell_list;
3468}
3469
3470#############################################################################
3471
3472package CFClient::UI::Root;
3473
3474our @ISA = CFClient::UI::Container::;
3475
3476use CFClient::OpenGL;
3477
3478sub new {
3479 my $class = shift;
3480
3481 my $self = $class->SUPER::new (
3482 visible => 1,
3483 @_,
3484 );
3485
3486 Scalar::Util::weaken ($self->{root} = $self);
3487
3488 $self
2718} 3489}
2719 3490
2720sub size_request { 3491sub size_request {
2721 my ($self) = @_; 3492 my ($self) = @_;
2722 3493
2723 ($self->{w}, $self->{h}) 3494 ($self->{w}, $self->{h})
3495}
3496
3497sub _to_pixel {
3498 my ($coord, $size, $max) = @_;
3499
3500 $coord =
3501 $coord eq "center" ? ($max - $size) * 0.5
3502 : $coord eq "max" ? $max
3503 : $coord;
3504
3505 $coord = 0 if $coord < 0;
3506 $coord = $max - $size if $coord > $max - $size;
3507
3508 int $coord + 0.5
2724} 3509}
2725 3510
2726sub size_allocate { 3511sub size_allocate {
2727 my ($self, $w, $h) = @_; 3512 my ($self, $w, $h) = @_;
2728 3513
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) { 3514 for my $child ($self->children) {
2746 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2747 3516
2748 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3517 $X = $child->{force_x} if exists $child->{force_x};
2749 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3518 $Y = $child->{force_y} if exists $child->{force_y};
3519
3520 $X = _to_pixel $X, $W, $self->{w};
3521 $Y = _to_pixel $Y, $H, $self->{h};
3522
2750 $child->configure ($X, $Y, $W, $H); 3523 $child->configure ($X, $Y, $W, $H);
2751 } 3524 }
2752
2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755} 3525}
2756 3526
2757sub coord2local { 3527sub coord2local {
2758 my ($self, $x, $y) = @_; 3528 my ($self, $x, $y) = @_;
2759 3529
… …
2767} 3537}
2768 3538
2769sub update { 3539sub update {
2770 my ($self) = @_; 3540 my ($self) = @_;
2771 3541
2772 $self->check_size;
2773 $::WANT_REFRESH++; 3542 $::WANT_REFRESH++;
2774} 3543}
2775 3544
2776sub add { 3545sub add {
2777 my ($self, $child) = @_; 3546 my ($self, @children) = @_;
2778 3547
2779 # integerise window positions 3548 $_->{is_toplevel} = 1
2780 $child->{x} = int $child->{x}; 3549 for @children;
2781 $child->{y} = int $child->{y};
2782 3550
2783 $self->SUPER::add ($child); 3551 $self->SUPER::add (@children);
3552}
3553
3554sub remove {
3555 my ($self, @children) = @_;
3556
3557 $self->SUPER::remove (@children);
3558
3559 delete $self->{is_toplevel}
3560 for @children;
3561
3562 while (@children) {
3563 my $w = pop @children;
3564 push @children, $w->children;
3565 $w->set_invisible;
3566 }
2784} 3567}
2785 3568
2786sub on_refresh { 3569sub on_refresh {
2787 my ($self, $id, $cb) = @_; 3570 my ($self, $id, $cb) = @_;
2788 3571
2789 $self->{refresh_hook}{$id} = $cb; 3572 $self->{refresh_hook}{$id} = $cb;
2790} 3573}
2791 3574
3575sub on_post_alloc {
3576 my ($self, $id, $cb) = @_;
3577
3578 $self->{post_alloc_hook}{$id} = $cb;
3579}
3580
2792sub draw { 3581sub draw {
2793 my ($self) = @_; 3582 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 3583
2840 while ($self->{refresh_hook}) { 3584 while ($self->{refresh_hook}) {
2841 $_->() 3585 $_->()
2842 for values %{delete $self->{refresh_hook}}; 3586 for values %{delete $self->{refresh_hook}};
2843 } 3587 }
2844 3588
3589 if ($self->{realloc}) {
3590 my %queue;
3591 my @queue;
3592 my $widget;
3593
3594 outer:
3595 while () {
3596 if (my $realloc = delete $self->{realloc}) {
3597 for $widget (values %$realloc) {
3598 $widget->{visible} or next; # do not resize invisible widgets
3599
3600 $queue{$widget+0}++ and next; # duplicates are common
3601
3602 push @{ $queue[$widget->{visible}] }, $widget;
3603 }
3604 }
3605
3606 while () {
3607 @queue or last outer;
3608
3609 $widget = pop @{ $queue[-1] || [] }
3610 and last;
3611
3612 pop @queue;
3613 }
3614
3615 delete $queue{$widget+0};
3616
3617 my ($w, $h) = $widget->size_request;
3618
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3621
3622 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h};
3624
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3626 || delete $widget->{force_realloc}) {
3627 $widget->{req_w} = $w;
3628 $widget->{req_h} = $h;
3629
3630 $self->{size_alloc}{$widget+0} = $widget;
3631
3632 if (my $parent = $widget->{parent}) {
3633 $self->{realloc}{$parent+0} = $parent
3634 unless $queue{$parent+0};
3635
3636 $parent->{force_size_alloc} = 1;
3637 $self->{size_alloc}{$parent+0} = $parent;
3638 }
3639 }
3640
3641 delete $self->{realloc}{$widget+0};
3642 }
3643 }
3644
3645 while (my $size_alloc = delete $self->{size_alloc}) {
3646 my @queue = sort { $b->{visible} <=> $a->{visible} }
3647 values %$size_alloc;
3648
3649 while () {
3650 my $widget = pop @queue || last;
3651
3652 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3653
3654 $w = 0 if $w < 0;
3655 $h = 0 if $h < 0;
3656
3657 $w = int $w + 0.5;
3658 $h = int $h + 0.5;
3659
3660 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3661 $widget->{old_w} = $widget->{w};
3662 $widget->{old_h} = $widget->{h};
3663
3664 $widget->{w} = $w;
3665 $widget->{h} = $h;
3666
3667 $widget->emit (size_allocate => $w, $h);
3668 }
3669 }
3670 }
3671
3672 while ($self->{post_alloc_hook}) {
3673 $_->()
3674 for values %{delete $self->{post_alloc_hook}};
3675 }
3676
3677
2845 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3678 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3679 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847 glClear GL_COLOR_BUFFER_BIT; 3680 glClear GL_COLOR_BUFFER_BIT;
2848 3681
2849 glMatrixMode GL_PROJECTION; 3682 glMatrixMode GL_PROJECTION;
2850 glLoadIdentity; 3683 glLoadIdentity;
2851 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3684 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2852 glMatrixMode GL_MODELVIEW; 3685 glMatrixMode GL_MODELVIEW;
2853 glLoadIdentity; 3686 glLoadIdentity;
2854 3687
3688 {
3689 package CFClient::UI::Base;
3690
3691 ($draw_x, $draw_y, $draw_w, $draw_h) =
3692 (0, 0, $self->{w}, $self->{h});
3693 }
3694
2855 $self->_draw; 3695 $self->_draw;
2856} 3696}
2857 3697
2858############################################################################# 3698#############################################################################
2859 3699
2860package CFClient::UI; 3700package CFClient::UI;
2861 3701
2862$ROOT = new CFClient::UI::Root; 3702$ROOT = new CFClient::UI::Root;
2863$TOOLTIP = new CFClient::UI::Tooltip; 3703$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864 3704
28651 37051
2866 3706

Diff Legend

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