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.200 by root, Sat May 13 00:27:09 2006 UTC vs.
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines