ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.198 by root, Fri May 12 02:08:52 2006 UTC vs.
Revision 1.272 by root, Sat Jun 3 01:47:14 2006 UTC

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

Diff Legend

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