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

Diff Legend

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