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.283 by root, Mon Jun 5 02:28:30 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 $self->SUPER::realloc;
1548}
1549
1349sub set_text { 1550sub set_text {
1350 my ($self, $text) = @_; 1551 my ($self, $text) = @_;
1351 1552
1352 return if $self->{text} eq "T$text"; 1553 return if $self->{text} eq "T$text";
1353 $self->{text} = "T$text"; 1554 $self->{text} = "T$text";
1354 1555
1355 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1356 $self->{layout}->set_text ($text); 1557 $self->{layout}->set_text ($text);
1558 delete $self->{req_h};
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
… …
1367 1569
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);
1574 delete $self->{req_h};
1372 1575
1576 $self->realloc;
1373 $self->update; 1577 $self->update;
1374 $self->check_size;
1375} 1578}
1376 1579
1377sub size_request { 1580sub size_request {
1378 my ($self) = @_; 1581 my ($self) = @_;
1379 1582
1583 if (exists $self->{req_h}) {
1584 @$self{qw(req_w req_h)}
1585 } else {
1380 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1586 $self->{layout}->set_font ($self->{font}) if $self->{font};
1381 $self->{layout}->set_width ($self->{max_w} || -1); 1587 $self->{layout}->set_width ($self->{max_w} || -1);
1382 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1588 $self->{layout}->set_ellipsise ($self->{ellipsise});
1383 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1385 1591
1386 my ($w, $h) = $self->{layout}->size; 1592 my ($w, $h) = $self->{layout}->size;
1387 1593
1388 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
1389 $self->{template}->set_font ($self->{font}) if $self->{font}; 1595 $self->{template}->set_font ($self->{font}) if $self->{font};
1390 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1391 1597
1392 my ($w2, $h2) = $self->{template}->size; 1598 my ($w2, $h2) = $self->{template}->size;
1393 1599
1394 $w = List::Util::max $w, $w2; 1600 $w = List::Util::max $w, $w2;
1395 $h = List::Util::max $h, $h2; 1601 $h = List::Util::max $h, $h2;
1396 } 1602 }
1397 1603
1604 ($w, $h)
1398 ( 1605 }
1399 $w + $self->{padding} * 2,
1400 $h + $self->{padding} * 2,
1401 )
1402} 1606}
1403 1607
1404sub size_allocate { 1608sub size_allocate {
1405 my ($self, $w, $h) = @_; 1609 my ($self, $w, $h) = @_;
1406 1610
1611 delete $self->{ox};
1612
1407 delete $self->{texture}; 1613 delete $self->{texture}
1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1408} 1615}
1409 1616
1410sub set_fontsize { 1617sub set_fontsize {
1411 my ($self, $fontsize) = @_; 1618 my ($self, $fontsize) = @_;
1412 1619
1413 $self->{fontsize} = $fontsize; 1620 $self->{fontsize} = $fontsize;
1414 delete $self->{texture}; 1621 delete $self->{texture};
1415 1622
1416 $self->update; 1623 $self->realloc;
1417 $self->check_size;
1418} 1624}
1419 1625
1420sub _draw { 1626sub _draw {
1421 my ($self) = @_; 1627 my ($self) = @_;
1422 1628
… …
1428 $self->{layout}->set_width ($self->{w}); 1634 $self->{layout}->set_width ($self->{w});
1429 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1635 $self->{layout}->set_ellipsise ($self->{ellipsise});
1430 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1431 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1432 1638
1433 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1639 new_from_layout CFClient::Texture $self->{layout}
1640 };
1434 1641
1642 unless (exists $self->{ox}) {
1435 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1436 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1437 : ($self->{w} - $tex->{w}) * 0.5); 1645 : ($self->{w} - $tex->{w}) * 0.5);
1438 1646
1439 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1440 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1441 : ($self->{h} - $tex->{h}) * 0.5); 1649 : ($self->{h} - $tex->{h}) * 0.5);
1442
1443 $tex
1444 }; 1650 };
1445 1651
1446 glEnable GL_TEXTURE_2D; 1652 glEnable GL_TEXTURE_2D;
1447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1448 1654
1655 glColor_premultiply @{$self->{fg}}
1449 if ($tex->{format} == GL_ALPHA) { 1656 if $tex->{format} == GL_ALPHA;
1450 glColor @{$self->{fg}}; 1657
1451 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1452 } else {
1453 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1454 }
1455 1659
1456 glDisable GL_TEXTURE_2D; 1660 glDisable GL_TEXTURE_2D;
1457} 1661}
1458 1662
1459############################################################################# 1663#############################################################################
… …
1474 active_fg => [0, 0, 0], 1678 active_fg => [0, 0, 0],
1475 can_hover => 1, 1679 can_hover => 1,
1476 can_focus => 1, 1680 can_focus => 1,
1477 valign => 0, 1681 valign => 0,
1478 can_events => 1, 1682 can_events => 1,
1683 #text => ...
1479 @_ 1684 @_
1480 ) 1685 )
1481} 1686}
1482 1687
1483sub _set_text { 1688sub _set_text {
… …
1485 1690
1486 delete $self->{cur_h}; 1691 delete $self->{cur_h};
1487 1692
1488 return if $self->{text} eq $text; 1693 return if $self->{text} eq $text;
1489 1694
1490 delete $self->{texture};
1491
1492 $self->{last_activity} = $::NOW; 1695 $self->{last_activity} = $::NOW;
1493 $self->{text} = $text; 1696 $self->{text} = $text;
1494 1697
1495 $text =~ s/./*/g if $self->{hidden}; 1698 $text =~ s/./*/g if $self->{hidden};
1496 $self->{layout}->set_text ("$text "); 1699 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h};
1497 1701
1498 $self->emit (changed => $self->{text}); 1702 $self->_emit (changed => $self->{text});
1703
1704 $self->realloc;
1705 $self->update;
1499} 1706}
1500 1707
1501sub set_text { 1708sub set_text {
1502 my ($self, $text) = @_; 1709 my ($self, $text) = @_;
1503 1710
1504 $self->{cursor} = length $text; 1711 $self->{cursor} = length $text;
1505 $self->_set_text ($text); 1712 $self->_set_text ($text);
1506 $self->update;
1507 $self->check_size;
1508} 1713}
1509 1714
1510sub get_text { 1715sub get_text {
1511 $_[0]{text} 1716 $_[0]{text}
1512} 1717}
… …
1515 my ($self) = @_; 1720 my ($self) = @_;
1516 1721
1517 my ($w, $h) = $self->SUPER::size_request; 1722 my ($w, $h) = $self->SUPER::size_request;
1518 1723
1519 ($w + 1, $h) # add 1 for cursor 1724 ($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} 1725}
1527 1726
1528sub key_down { 1727sub key_down {
1529 my ($self, $ev) = @_; 1728 my ($self, $ev) = @_;
1530 1729
… …
1545 } elsif ($sym == CFClient::SDLK_HOME) { 1744 } elsif ($sym == CFClient::SDLK_HOME) {
1546 $self->{cursor} = 0; 1745 $self->{cursor} = 0;
1547 } elsif ($sym == CFClient::SDLK_END) { 1746 } elsif ($sym == CFClient::SDLK_END) {
1548 $self->{cursor} = length $text; 1747 $self->{cursor} = length $text;
1549 } elsif ($uni == 27) { 1748 } elsif ($uni == 27) {
1550 $self->emit ('escape'); 1749 $self->_emit ('escape');
1551 } elsif ($uni) { 1750 } elsif ($uni) {
1552 substr $text, $self->{cursor}++, 0, chr $uni; 1751 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else {
1753 return 0;
1553 } 1754 }
1554 1755
1555 $self->_set_text ($text); 1756 $self->_set_text ($text);
1556 $self->update; 1757
1557 $self->check_size; 1758 $self->realloc;
1759
1760 1
1558} 1761}
1559 1762
1560sub focus_in { 1763sub focus_in {
1561 my ($self) = @_; 1764 my ($self) = @_;
1562 1765
… …
1577 utf8::encode $text; 1780 utf8::encode $text;
1578 $self->{cursor} = length substr $text, 0, $idx; 1781 $self->{cursor} = length substr $text, 0, $idx;
1579 1782
1580 $self->_set_text ($self->{text}); 1783 $self->_set_text ($self->{text});
1581 $self->update; 1784 $self->update;
1785
1786 1
1582} 1787}
1583 1788
1584sub mouse_motion { 1789sub mouse_motion {
1585 my ($self, $ev, $x, $y) = @_; 1790 my ($self, $ev, $x, $y) = @_;
1586# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1791# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1792
1793 0
1587} 1794}
1588 1795
1589sub _draw { 1796sub _draw {
1590 my ($self) = @_; 1797 my ($self) = @_;
1591 1798
1592 local $self->{fg} = $self->{fg}; 1799 local $self->{fg} = $self->{fg};
1593 1800
1594 if ($FOCUS == $self) { 1801 if ($FOCUS == $self) {
1595 glColor @{$self->{active_bg}}; 1802 glColor_premultiply @{$self->{active_bg}};
1596 $self->{fg} = $self->{active_fg}; 1803 $self->{fg} = $self->{active_fg};
1597 } else { 1804 } else {
1598 glColor @{$self->{bg}}; 1805 glColor_premultiply @{$self->{bg}};
1599 } 1806 }
1600 1807
1601 glEnable GL_BLEND; 1808 glEnable GL_BLEND;
1602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1603 glBegin GL_QUADS; 1810 glBegin GL_QUADS;
1604 glVertex 0 , 0; 1811 glVertex 0 , 0;
1605 glVertex 0 , $self->{h}; 1812 glVertex 0 , $self->{h};
1606 glVertex $self->{w}, $self->{h}; 1813 glVertex $self->{w}, $self->{h};
1607 glVertex $self->{w}, 0; 1814 glVertex $self->{w}, 0;
… …
1642 if ($sym == 13) { 1849 if ($sym == 13) {
1643 unshift @{$self->{history}}, 1850 unshift @{$self->{history}},
1644 my $txt = $self->get_text; 1851 my $txt = $self->get_text;
1645 $self->{history_pointer} = -1; 1852 $self->{history_pointer} = -1;
1646 $self->{history_saveback} = ''; 1853 $self->{history_saveback} = '';
1647 $self->emit (activate => $txt); 1854 $self->_emit (activate => $txt);
1648 $self->update; 1855 $self->update;
1649 1856
1650 } elsif ($sym == CFClient::SDLK_UP) { 1857 } elsif ($sym == CFClient::SDLK_UP) {
1651 if ($self->{history_pointer} < 0) { 1858 if ($self->{history_pointer} < 0) {
1652 $self->{history_saveback} = $self->get_text; 1859 $self->{history_saveback} = $self->get_text;
… …
1668 } else { 1875 } else {
1669 $self->set_text ($self->{history_saveback}); 1876 $self->set_text ($self->{history_saveback});
1670 } 1877 }
1671 1878
1672 } else { 1879 } else {
1673 $self->SUPER::key_down ($ev); 1880 return $self->SUPER::key_down ($ev)
1881 }
1882
1674 } 1883 1
1675
1676} 1884}
1677 1885
1678############################################################################# 1886#############################################################################
1679 1887
1680package CFClient::UI::Button; 1888package CFClient::UI::Button;
… …
1689 1897
1690sub new { 1898sub new {
1691 my $class = shift; 1899 my $class = shift;
1692 1900
1693 $class->SUPER::new ( 1901 $class->SUPER::new (
1694 padding => 4, 1902 padding_x => 4,
1903 padding_y => 4,
1695 fg => [1, 1, 1], 1904 fg => [1, 1, 1],
1696 active_fg => [0, 0, 1], 1905 active_fg => [0, 0, 1],
1697 can_hover => 1, 1906 can_hover => 1,
1698 align => 0, 1907 align => 0,
1699 valign => 0, 1908 valign => 0,
1700 can_events => 1, 1909 can_events => 1,
1701 @_ 1910 @_
1702 ) 1911 )
1703} 1912}
1704 1913
1914sub activate { }
1915
1705sub button_up { 1916sub button_up {
1706 my ($self, $ev, $x, $y) = @_; 1917 my ($self, $ev, $x, $y) = @_;
1707 1918
1919 $self->emit ("activate")
1708 if ($x >= 0 && $x < $self->{w} 1920 if $x >= 0 && $x < $self->{w}
1709 && $y >= 0 && $y < $self->{h}) { 1921 && $y >= 0 && $y < $self->{h};
1710 $self->emit ("activate"); 1922
1711 } 1923 1
1712} 1924}
1713 1925
1714sub _draw { 1926sub _draw {
1715 my ($self) = @_; 1927 my ($self) = @_;
1716 1928
1717 local $self->{fg} = $self->{fg}; 1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1718
1719 if ($GRAB == $self) {
1720 $self->{fg} = $self->{active_fg};
1721 }
1722 1930
1723 glEnable GL_TEXTURE_2D; 1931 glEnable GL_TEXTURE_2D;
1724 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1725 glColor 0, 0, 0, 1; 1933 glColor 0, 0, 0, 1;
1726 1934
… …
1745 1953
1746sub new { 1954sub new {
1747 my $class = shift; 1955 my $class = shift;
1748 1956
1749 $class->SUPER::new ( 1957 $class->SUPER::new (
1750 padding => 2, 1958 padding_x => 2,
1959 padding_y => 2,
1751 fg => [1, 1, 1], 1960 fg => [1, 1, 1],
1752 active_fg => [1, 1, 0], 1961 active_fg => [1, 1, 0],
1753 bg => [0, 0, 0, 0.2], 1962 bg => [0, 0, 0, 0.2],
1754 active_bg => [1, 1, 1, 0.5], 1963 active_bg => [1, 1, 1, 0.5],
1755 state => 0, 1964 state => 0,
… …
1759} 1968}
1760 1969
1761sub size_request { 1970sub size_request {
1762 my ($self) = @_; 1971 my ($self) = @_;
1763 1972
1764 ($self->{padding} * 2 + 6) x 2 1973 (6) x 2
1765} 1974}
1766 1975
1767sub button_down { 1976sub button_down {
1768 my ($self, $ev, $x, $y) = @_; 1977 my ($self, $ev, $x, $y) = @_;
1769 1978
1770 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1771 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1772 $self->{state} = !$self->{state}; 1981 $self->{state} = !$self->{state};
1773 $self->emit (changed => $self->{state}); 1982 $self->_emit (changed => $self->{state});
1983 } else {
1984 return 0
1985 }
1986
1774 } 1987 1
1775} 1988}
1776 1989
1777sub _draw { 1990sub _draw {
1778 my ($self) = @_; 1991 my ($self) = @_;
1779 1992
1780 $self->SUPER::_draw; 1993 $self->SUPER::_draw;
1781 1994
1782 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1995 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1783 1996
1784 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1997 my ($w, $h) = @$self{qw(w h)};
1998
1999 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1785 2000
1786 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2001 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1787 2002
1788 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2003 my $tex = $self->{state} ? $tex[1] : $tex[0];
1789 2004
… …
1944 2159
1945 my $h1 = $self->{h} * (1 - $ycut1); 2160 my $h1 = $self->{h} * (1 - $ycut1);
1946 my $h2 = $self->{h} * (1 - $ycut2); 2161 my $h2 = $self->{h} * (1 - $ycut2);
1947 2162
1948 glEnable GL_BLEND; 2163 glEnable GL_BLEND;
1949 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1950 glEnable GL_TEXTURE_2D; 2166 glEnable GL_TEXTURE_2D;
1951 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1952 2168
1953 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2169 glBindTexture GL_TEXTURE_2D, $t1->{name};
1954 glBegin GL_QUADS; 2170 glBegin GL_QUADS;
… …
2053 my $self = $class->SUPER::new ( 2269 my $self = $class->SUPER::new (
2054 fg => [1, 1, 1], 2270 fg => [1, 1, 1],
2055 active_fg => [0, 0, 0], 2271 active_fg => [0, 0, 0],
2056 bg => [0, 0, 0, 0.2], 2272 bg => [0, 0, 0, 0.2],
2057 active_bg => [1, 1, 1, 0.5], 2273 active_bg => [1, 1, 1, 0.5],
2058 range => [0, 0, 100, 10], 2274 range => [0, 0, 100, 10, 0],
2059 req_w => $::WIDTH / 80, 2275 min_w => $::WIDTH / 80,
2060 req_h => $::WIDTH / 80, 2276 min_h => $::WIDTH / 80,
2061 vertical => 0, 2277 vertical => 0,
2062 can_hover => 1, 2278 can_hover => 1,
2063 inner_pad => 0.02, 2279 inner_pad => 0.02,
2064 @_ 2280 @_
2065 ); 2281 );
… …
2068 $self->update; 2284 $self->update;
2069 2285
2070 $self 2286 $self
2071} 2287}
2072 2288
2289sub changed { }
2290
2291sub set_range {
2292 my ($self, $range) = @_;
2293
2294 ($range, $self->{range}) = ($self->{range}, $range);
2295
2296 $self->update
2297 if "@$range" ne "@{$self->{range}}";
2298}
2299
2073sub set_value { 2300sub set_value {
2074 my ($self, $value) = @_; 2301 my ($self, $value) = @_;
2075 2302
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2303 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077 2304
2078 $hi = $lo + 1 if $hi <= $lo; 2305 $hi = $lo + 1 if $hi <= $lo;
2079 2306
2307 $page = $hi - $lo if $page > $hi - $lo;
2308
2080 $value = $lo if $value < $lo; 2309 $value = $lo if $value < $lo;
2081 $value = $hi if $value > $hi; 2310 $value = $hi - $page if $value > $hi - $page;
2082 2311
2083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2312 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084 if $unit; 2313 if $unit;
2085 2314
2086 $page = $hi - $lo if $page > $hi - $lo;
2087
2088 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2315 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089 2316
2090 if ($value != $old_value) { 2317 if ($value != $old_value) {
2091 $self->emit (changed => $value); 2318 $self->_emit (changed => $value);
2092 $self->update; 2319 $self->update;
2093 } 2320 }
2094} 2321}
2095 2322
2096sub size_request { 2323sub size_request {
2097 my ($self) = @_; 2324 my ($self) = @_;
2098 2325
2099 my $w = $self->{req_w}; 2326 ($self->{req_w}, $self->{req_h})
2100 my $h = $self->{req_h};
2101
2102 $self->{vertical} ? ($h, $w) : ($w, $h)
2103} 2327}
2104 2328
2105sub button_down { 2329sub button_down {
2106 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2107 2331
2108 $self->SUPER::button_down ($ev, $x, $y); 2332 $self->SUPER::button_down ($ev, $x, $y);
2333
2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2335
2109 $self->mouse_motion ($ev, $x, $y); 2336 $self->mouse_motion ($ev, $x, $y)
2110} 2337}
2111 2338
2112sub mouse_motion { 2339sub mouse_motion {
2113 my ($self, $ev, $x, $y) = @_; 2340 my ($self, $ev, $x, $y) = @_;
2114 2341
2115 if ($GRAB == $self) { 2342 if ($GRAB == $self) {
2116 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2343 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117 2344
2118 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2345 my (undef, $lo, $hi, $page) = @{$self->{range}};
2119 2346
2120 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2347 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121 2348
2122 $self->set_value ($x * ($hi - $lo) + $lo); 2349 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2350 } else {
2351 return 0;
2352 }
2353
2123 } 2354 1
2124} 2355}
2125 2356
2126sub update { 2357sub update {
2127 my ($self) = @_; 2358 my ($self) = @_;
2128 2359
2129 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2360 delete $self->{knob_w};
2361 $self->SUPER::update;
2362}
2363
2364sub _draw {
2365 my ($self) = @_;
2366
2367 unless ($self->{knob_w}) {
2130 $self->set_value ($self->{range}[0]); 2368 $self->set_value ($self->{range}[0]);
2131 2369
2132 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2370 my ($value, $lo, $hi, $page) = @{$self->{range}};
2371 my $range = ($hi - $page - $lo) || 1e-100;
2133 2372
2134 my $inner_w = 1 - 2 * $self->{inner_pad}; 2373 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135 2374
2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2375 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2376 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2137 2377
2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2378 $value = ($value - $lo) / $range;
2139 $value = $self->{scale} * ($value - $lo); 2379 $value = $value * $self->{scale} + $self->{offset};
2140 2380
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; 2381 $self->{knob_x} = $value - $knob_w * 0.5;
2147 $self->{knob_w} = $page; 2382 $self->{knob_w} = $knob_w;
2148 }); 2383 }
2149
2150 $self->SUPER::update;
2151}
2152
2153sub _draw {
2154 my ($self) = @_;
2155 2384
2156 $self->SUPER::_draw (); 2385 $self->SUPER::_draw ();
2157 2386
2158 glScale $self->{w}, $self->{h}; 2387 glScale $self->{w}, $self->{h};
2159 2388
… …
2176 # draw handle 2405 # draw handle
2177 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2406 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2178 2407
2179 glDisable GL_TEXTURE_2D; 2408 glDisable GL_TEXTURE_2D;
2180} 2409}
2410
2411#############################################################################
2412
2413package CFClient::UI::ValSlider;
2414
2415our @ISA = CFClient::UI::HBox::;
2416
2417sub new {
2418 my ($class, %arg) = @_;
2419
2420 my $range = delete $arg{range};
2421
2422 my $self = $class->SUPER::new (
2423 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2424 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2425 to_value => sub { shift },
2426 from_value => sub { shift },
2427 %arg,
2428 );
2429
2430 $self->{slider}->connect (changed => sub {
2431 my ($self, $value) = @_;
2432 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2433 $self->{parent}->emit (changed => $value);
2434 });
2435
2436# $self->{entry}->connect (changed => sub {
2437# my ($self, $value) = @_;
2438# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2439# $self->{parent}->emit (changed => $value);
2440# });
2441
2442 $self->add ($self->{slider}, $self->{entry});
2443
2444 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2445
2446 $self
2447}
2448
2449sub set_range { shift->{slider}->set_range (@_) }
2450sub set_value { shift->{slider}->set_value (@_) }
2181 2451
2182############################################################################# 2452#############################################################################
2183 2453
2184package CFClient::UI::TextView; 2454package CFClient::UI::TextView;
2185 2455
… …
2227 $self->{layout}->set_width ($self->{children}[0]{w}); 2497 $self->{layout}->set_width ($self->{children}[0]{w});
2228 2498
2229 $self->reflow; 2499 $self->reflow;
2230} 2500}
2231 2501
2232sub text_height { 2502sub text_size {
2233 my ($self, $text, $indent) = @_; 2503 my ($self, $text, $indent) = @_;
2234 2504
2235 my $layout = $self->{layout}; 2505 my $layout = $self->{layout};
2236 2506
2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $layout->set_width ($self->{children}[0]{w} - $indent); 2508 $layout->set_width ($self->{children}[0]{w} - $indent);
2239 $layout->set_markup ($text); 2509 $layout->set_markup ($text);
2240 2510
2241 ($layout->size)[1] 2511 $layout->size
2242} 2512}
2243 2513
2244sub reflow { 2514sub reflow {
2245 my ($self) = @_; 2515 my ($self) = @_;
2246 2516
2247 $self->{need_reflow}++; 2517 $self->{need_reflow}++;
2248 $self->update; 2518 $self->update;
2249} 2519}
2250 2520
2521sub set_offset {
2522 my ($self, $offset) = @_;
2523
2524 # todo: base offset on lines or so, not on pixels
2525 $self->{children}[1]->set_value ($offset);
2526}
2527
2528sub clear {
2529 my ($self) = @_;
2530
2531 $self->{par} = [];
2532 $self->{height} = 0;
2533 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2534}
2535
2251sub add_paragraph { 2536sub add_paragraph {
2252 my ($self, $color, $text, $indent) = @_; 2537 my ($self, $color, $text, $indent) = @_;
2253 2538
2254 #TODO: intelligently "reformat" paragraph
2255
2256 for my $line (split /\n/, $text) { 2539 for my $line (split /\n/, $text) {
2257 my $height = $self->text_height ($line); 2540 my ($w, $h) = $self->text_size ($line);
2258 $self->{height} += $height; 2541 $self->{height} += $h;
2259 push @{$self->{par}}, [$height, $color, $indent, $line]; 2542 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2260 } 2543 }
2261 2544
2262 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2545 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2263 $self->{children}[1]->update;
2264} 2546}
2265 2547
2266sub update { 2548sub update {
2267 my ($self) = @_; 2549 my ($self) = @_;
2268 2550
… …
2271 return unless $self->{h} > 0; 2553 return unless $self->{h} > 0;
2272 2554
2273 delete $self->{texture}; 2555 delete $self->{texture};
2274 2556
2275 $ROOT->on_post_alloc ($self, sub { 2557 $ROOT->on_post_alloc ($self, sub {
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559
2276 if (delete $self->{need_reflow}) { 2560 if (delete $self->{need_reflow}) {
2277 my $height = 0; 2561 my $height = 0;
2278 2562
2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2563 my $layout = $self->{layout};
2564
2565 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566
2280 for @{$self->{par}}; 2567 for (@{$self->{par}}) {
2568 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2569 $layout->set_width ($W - $_->[3]);
2570 $layout->set_markup ($_->[4]);
2571 my ($w, $h) = $layout->size;
2572 $_->[0] = $w + $_->[3];
2573 $_->[1] = $h;
2574 }
2575
2576 $height += $_->[1];
2577 }
2281 2578
2282 $self->{height} = $height; 2579 $self->{height} = $height;
2283 2580
2284 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2581 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2285 $self->{children}[1]->update;
2286 2582
2287 delete $self->{texture}; 2583 delete $self->{texture};
2288 } 2584 }
2289 2585
2290 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2291 glClearColor 0.5, 0.5, 0.5, 0; 2587 glClearColor 0, 0, 0, 0;
2292 glClear GL_COLOR_BUFFER_BIT; 2588 glClear GL_COLOR_BUFFER_BIT;
2293 2589
2294 my $top = int $self->{children}[1]{range}[0]; 2590 my $top = int $self->{children}[1]{range}[0];
2295 2591
2296 my $y0 = $top; 2592 my $y0 = $top;
2297 my $y1 = $top + $self->{h}; 2593 my $y1 = $top + $H;
2298 2594
2299 my $y = 0; 2595 my $y = 0;
2300 2596
2301 my $layout = $self->{layout}; 2597 my $layout = $self->{layout};
2302 2598
2303 $layout->set_font ($self->{font}) if $self->{font}; 2599 $layout->set_font ($self->{font}) if $self->{font};
2304 2600
2305 glEnable GL_BLEND; 2601 glEnable GL_BLEND;
2602 #TODO# not correct in windows where rgba is forced off
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307 2604
2308 for my $par (@{$self->{par}}) { 2605 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2606 my $h = $par->[1];
2310 2607
2311 if ($y0 < $y + $h && $y < $y1) { 2608 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_foreground (@{ $par->[1] }); 2609 $layout->set_foreground (@{ $par->[2] });
2313 $layout->set_width ($self->{w} - $par->[2]); 2610 $layout->set_width ($W - $par->[3]);
2314 $layout->set_markup ($par->[3]); 2611 $layout->set_markup ($par->[4]);
2315 2612
2316 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2613 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2317 2614
2318 glRasterPos $par->[2], $y - $y0; 2615 glRasterPos $par->[3], $y - $y0;
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2616 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2320 } 2617 }
2321 2618
2322 $y += $h; 2619 $y += $h;
2323 } 2620 }
… …
2330sub _draw { 2627sub _draw {
2331 my ($self) = @_; 2628 my ($self) = @_;
2332 2629
2333 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 2632 glColor 0, 0, 0, 1;
2336 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2633 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2337 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2338 2635
2339 $self->{children}[1]->draw; 2636 $self->{children}[1]->draw;
2340 2637
2341} 2638}
… …
2390 2687
2391sub new { 2688sub new {
2392 my $class = shift; 2689 my $class = shift;
2393 2690
2394 my $self = $class->SUPER::new ( 2691 my $self = $class->SUPER::new (
2395 state => 0, 2692 state => 0,
2396 connect_activate => \&toggle_flopper, 2693 on_activate => \&toggle_flopper,
2397 @_ 2694 @_
2398 ); 2695 );
2399 2696
2400 if ($self->{state}) {
2401 $self->{state} = 0;
2402 $self->toggle_flopper;
2403 }
2404
2405 $self 2697 $self
2406} 2698}
2407 2699
2408sub toggle_flopper { 2700sub toggle_flopper {
2409 my ($self) = @_; 2701 my ($self) = @_;
2410 2702
2411 # TODO: use animation 2703 $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} 2704}
2423 2705
2424############################################################################# 2706#############################################################################
2425 2707
2426package CFClient::UI::Tooltip; 2708package CFClient::UI::Tooltip;
… …
2439} 2721}
2440 2722
2441sub set_tooltip_from { 2723sub set_tooltip_from {
2442 my ($self, $widget) = @_; 2724 my ($self, $widget) = @_;
2443 2725
2726 my $tooltip = $widget->{tooltip};
2727
2728 if ($ENV{CFPLUS_DEBUG} & 2) {
2729 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}";
2733 }
2734
2444 $self->add (new CFClient::UI::Label 2735 $self->add (new CFClient::UI::Label
2445 markup => $widget->{tooltip}, 2736 markup => $tooltip,
2446 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2447 fontsize => 0.8, 2738 fontsize => 0.8,
2448 fg => [0, 0, 0, 1], 2739 fg => [0, 0, 0, 1],
2449 ellipsise => 0, 2740 ellipsise => 0,
2450 font => ($widget->{tooltip_font} || $::FONT_PROP), 2741 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2461 2752
2462sub size_allocate { 2753sub size_allocate {
2463 my ($self, $w, $h) = @_; 2754 my ($self, $w, $h) = @_;
2464 2755
2465 $self->SUPER::size_allocate ($w - 4, $h - 4); 2756 $self->SUPER::size_allocate ($w - 4, $h - 4);
2757}
2758
2759sub visibility_change {
2760 my ($self, $visible) = @_;
2761
2762 return unless $visible;
2763
2764 $self->{root}->on_post_alloc ("move_$self" => sub {
2765 my $widget = $self->{owner}
2766 or return;
2767
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH;
2772
2773 $self->move_abs ($x, $y);
2774 });
2466} 2775}
2467 2776
2468sub _draw { 2777sub _draw {
2469 my ($self) = @_; 2778 my ($self) = @_;
2470 2779
… …
2487 glVertex $w, $h; 2796 glVertex $w, $h;
2488 glVertex $w, 0; 2797 glVertex $w, 0;
2489 glEnd; 2798 glEnd;
2490 2799
2491 glTranslate 2 - 0.375, 2 - 0.375; 2800 glTranslate 2 - 0.375, 2 - 0.375;
2801
2492 $self->SUPER::_draw; 2802 $self->SUPER::_draw;
2493} 2803}
2494 2804
2495############################################################################# 2805#############################################################################
2496 2806
… …
2502 2812
2503sub new { 2813sub new {
2504 my $class = shift; 2814 my $class = shift;
2505 2815
2506 my $self = $class->SUPER::new ( 2816 my $self = $class->SUPER::new (
2507 aspect => 1, 2817 aspect => 1,
2818 can_events => 0,
2508 @_, 2819 @_,
2509 ); 2820 );
2510 2821
2511 if ($self->{anim} && $self->{animspeed}) { 2822 if ($self->{anim} && $self->{animspeed}) {
2512 Scalar::Util::weaken (my $widget = $self); 2823 Scalar::Util::weaken (my $widget = $self);
… …
2527 2838
2528sub size_request { 2839sub size_request {
2529 (32, 8) 2840 (32, 8)
2530} 2841}
2531 2842
2843sub update {
2844 my ($self) = @_;
2845
2846 return unless $self->{visible};
2847
2848 $self->SUPER::update;
2849}
2850
2532sub _draw { 2851sub _draw {
2533 my ($self) = @_; 2852 my ($self) = @_;
2534 2853
2535 return unless $::CONN;#d# manage and cache textures differently 2854 return unless $::CONN;
2536 2855
2537 my $face; 2856 my $face;
2538 2857
2539 if ($self->{frame}) { 2858 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}]; 2859 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2546 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2547 2866
2548 if ($tex) { 2867 if ($tex) {
2549 glEnable GL_TEXTURE_2D; 2868 glEnable GL_TEXTURE_2D;
2550 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2551 glColor 1, 1, 1, 1; 2870 glColor 0, 0, 0, 1;
2552 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2553 glDisable GL_TEXTURE_2D; 2872 glDisable GL_TEXTURE_2D;
2554 } 2873 }
2555} 2874}
2556 2875
… …
2563 $self->SUPER::DESTROY; 2882 $self->SUPER::DESTROY;
2564} 2883}
2565 2884
2566############################################################################# 2885#############################################################################
2567 2886
2568package CFClient::UI::InventoryItem; 2887package CFClient::UI::Buttonbar;
2569 2888
2570our @ISA = CFClient::UI::HBox::; 2889our @ISA = CFClient::UI::HBox::;
2571 2890
2572sub _item_to_desc { 2891# 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 2892
2721############################################################################# 2893#############################################################################
2722 2894
2723package CFClient::UI::Menu; 2895package CFClient::UI::Menu;
2724 2896
… …
2758 2930
2759# popup given the event (must be a mouse button down event currently) 2931# popup given the event (must be a mouse button down event currently)
2760sub popup { 2932sub popup {
2761 my ($self, $ev) = @_; 2933 my ($self, $ev) = @_;
2762 2934
2763 $self->emit ("popdown"); 2935 $self->_emit ("popdown");
2764 2936
2765 # maybe save $GRAB? must be careful about events... 2937 # maybe save $GRAB? must be careful about events...
2766 $GRAB = $self; 2938 $GRAB = $self;
2767 $self->{button} = $ev->{button}; 2939 $self->{button} = $ev->{button};
2768 2940
2769 $self->show; 2941 $self->show;
2770 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2942 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2771} 2943}
2772 2944
2773sub mouse_motion { 2945sub mouse_motion {
2774 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2775 2947
2776 # TODO: should use vbox->find_widget or so 2948 # TODO: should use vbox->find_widget or so
2777 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2778 $self->{hover} = $self->{item}{$HOVER}; 2950 $self->{hover} = $self->{item}{$HOVER};
2951
2952 0
2779} 2953}
2780 2954
2781sub button_up { 2955sub button_up {
2782 my ($self, $ev, $x, $y) = @_; 2956 my ($self, $ev, $x, $y) = @_;
2783 2957
2784 if ($ev->{button} == $self->{button}) { 2958 if ($ev->{button} == $self->{button}) {
2785 undef $GRAB; 2959 undef $GRAB;
2786 $self->hide; 2960 $self->hide;
2787 2961
2788 $self->emit ("popdown"); 2962 $self->_emit ("popdown");
2789 $self->{hover}[1]->() if $self->{hover}; 2963 $self->{hover}[1]->() if $self->{hover};
2964 } else {
2965 return 0
2966 }
2967
2790 } 2968 1
2791} 2969}
2792 2970
2793############################################################################# 2971#############################################################################
2794 2972
2795package CFClient::UI::Statusbox; 2973package CFClient::UI::Multiplexer;
2796 2974
2797our @ISA = CFClient::UI::VBox::; 2975our @ISA = CFClient::UI::Container::;
2798 2976
2799sub new { 2977sub new {
2800 my $class = shift; 2978 my $class = shift;
2801 2979
2802 $class->SUPER::new ( 2980 my $self = $class->SUPER::new (
2981 @_,
2982 );
2983
2984 $self->{current} = $self->{children}[0]
2985 if @{ $self->{children} };
2986
2987 $self
2988}
2989
2990sub add {
2991 my ($self, @widgets) = @_;
2992
2993 $self->SUPER::add (@widgets);
2994
2995 $self->{current} = $self->{children}[0]
2996 if @{ $self->{children} };
2997}
2998
2999sub set_current_page {
3000 my ($self, $page_or_widget) = @_;
3001
3002 my $widget = ref $page_or_widget
3003 ? $page_or_widget
3004 : $self->{children}[$page_or_widget];
3005
3006 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008
3009 $self->_emit (page_changed => $self->{current});
3010
3011 $self->realloc;
3012}
3013
3014sub visible_children {
3015 $_[0]{current}
3016}
3017
3018sub size_request {
3019 my ($self) = @_;
3020
3021 $self->{current}->size_request
3022}
3023
3024sub size_allocate {
3025 my ($self, $w, $h) = @_;
3026
3027 $self->{current}->configure (0, 0, $w, $h);
3028}
3029
3030sub _draw {
3031 my ($self) = @_;
3032
3033 $self->{current}->draw;
3034}
3035
3036#############################################################################
3037
3038package CFClient::UI::Notebook;
3039
3040our @ISA = CFClient::UI::VBox::;
3041
3042sub new {
3043 my $class = shift;
3044
3045 my $self = $class->SUPER::new (
3046 buttonbar => (new CFClient::UI::Buttonbar),
3047 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3048 # filter => # will be put between multiplexer and $self
3049 @_,
3050 );
3051
3052 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3053 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3054
3055 $self
3056}
3057
3058sub add {
3059 my ($self, $title, $widget, $tooltip) = @_;
3060
3061 Scalar::Util::weaken $self;
3062
3063 $self->{buttonbar}->add (new CFClient::UI::Button
3064 markup => $title,
3065 tooltip => $tooltip,
3066 on_activate => sub { $self->set_current_page ($widget) },
3067 );
3068
3069 $self->{multiplexer}->add ($widget);
3070}
3071
3072sub set_current_page {
3073 my ($self, $page) = @_;
3074
3075 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current});
3077}
3078
3079#############################################################################
3080
3081package CFClient::UI::Statusbox;
3082
3083our @ISA = CFClient::UI::VBox::;
3084
3085sub new {
3086 my $class = shift;
3087
3088 my $self = $class->SUPER::new (
2803 fontsize => 0.8, 3089 fontsize => 0.8,
2804 @_, 3090 @_,
2805 ) 3091 );
3092
3093 Scalar::Util::weaken (my $this = $self);
3094
3095 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3096
3097 $self
2806} 3098}
2807 3099
2808sub reorder { 3100sub reorder {
2809 my ($self) = @_; 3101 my ($self) = @_;
2810 my $NOW = time; 3102 my $NOW = Time::HiRes::time;
3103
3104 # freeze display when hovering over any label
3105 return if $CFClient::UI::TOOLTIP->{owner}
3106 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3107 values %{ $self->{item} };
2811 3108
2812 while (my ($k, $v) = each %{ $self->{item} }) { 3109 while (my ($k, $v) = each %{ $self->{item} }) {
2813 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3110 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2814 } 3111 }
2815 3112
… …
2818 my @items = sort { 3115 my @items = sort {
2819 $a->{pri} <=> $b->{pri} 3116 $a->{pri} <=> $b->{pri}
2820 or $b->{id} <=> $a->{id} 3117 or $b->{id} <=> $a->{id}
2821 } values %{ $self->{item} }; 3118 } values %{ $self->{item} };
2822 3119
3120 $self->{timer}->interval (1);
3121
2823 my $count = 10 + 1; 3122 my $count = 10 + 1;
2824 for my $item (@items) { 3123 for my $item (@items) {
2825 last unless --$count; 3124 last unless --$count;
2826 3125
2827 push @widgets, $item->{label} ||= do { 3126 my $label = $item->{label} ||= do {
2828 # TODO: doesn't handle markup well (read as: at all) 3127 # TODO: doesn't handle markup well (read as: at all)
2829 my $short = $item->{count} > 1 3128 my $short = $item->{count} > 1
2830 ? "<b>$item->{count} ×</b> $item->{text}" 3129 ? "<b>$item->{count} ×</b> $item->{text}"
2831 : $item->{text}; 3130 : $item->{text};
2832 3131
… …
2840 tooltip => $item->{tooltip}, 3139 tooltip => $item->{tooltip},
2841 tooltip_font => $::FONT_PROP, 3140 tooltip_font => $::FONT_PROP,
2842 tooltip_width => 0.67, 3141 tooltip_width => 0.67,
2843 fontsize => $item->{fontsize} || $self->{fontsize}, 3142 fontsize => $item->{fontsize} || $self->{fontsize},
2844 max_w => $::WIDTH * 0.44, 3143 max_w => $::WIDTH * 0.44,
2845 fg => $item->{fg}, 3144 fg => [@{ $item->{fg} }],
2846 can_events => 1, 3145 can_events => 1,
2847 can_hover => 1 3146 can_hover => 1
2848 }; 3147 };
3148
3149 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3150 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3151 $label->update;
3152 $label->set_max_size (undef, $label->{req_h} * $diff)
3153 if $diff < 1;
3154 $self->{timer}->interval (1/30);
3155 } else {
3156 $label->{fg}[3] = $item->{fg}[3] || 1;
3157 }
3158
3159 push @widgets, $label;
2849 } 3160 }
2850 3161
2851 $self->clear; 3162 $self->clear;
2852 $self->SUPER::add (reverse @widgets); 3163 $self->SUPER::add (reverse @widgets);
2853} 3164}
… …
2856 my ($self, $text, %arg) = @_; 3167 my ($self, $text, %arg) = @_;
2857 3168
2858 $text =~ s/^\s+//; 3169 $text =~ s/^\s+//;
2859 $text =~ s/\s+$//; 3170 $text =~ s/\s+$//;
2860 3171
3172 return unless $text;
3173
2861 my $timeout = time + ((delete $arg{timeout}) || 60); 3174 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2862 3175
2863 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3176 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864 3177
2865 if (my $item = $self->{item}{$group}) { 3178 if (my $item = $self->{item}{$group}) {
2866 if ($item->{text} eq $text) { 3179 if ($item->{text} eq $text) {
… …
2896 3209
2897 $self->reorder; 3210 $self->reorder;
2898 $self->SUPER::reconfigure; 3211 $self->SUPER::reconfigure;
2899} 3212}
2900 3213
3214sub DESTROY {
3215 my ($self) = @_;
3216
3217 $self->{timer}->cancel;
3218
3219 $self->SUPER::DESTROY;
3220}
3221
2901############################################################################# 3222#############################################################################
2902 3223
2903package CFClient::UI::Root; 3224package CFClient::UI::Inventory;
2904 3225
2905our @ISA = CFClient::UI::Container::; 3226our @ISA = CFClient::UI::ScrolledWindow::;
2906
2907use CFClient::OpenGL;
2908 3227
2909sub new { 3228sub new {
2910 my $class = shift; 3229 my $class = shift;
2911 3230
2912 $class->SUPER::new ( 3231 my $self = $class->SUPER::new (
3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3233 @_,
3234 );
3235
3236 $self
3237}
3238
3239sub set_items {
3240 my ($self, $items) = @_;
3241
3242 $self->{child}->clear;
3243 return unless $items;
3244
3245 my @items = sort {
3246 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name})
3248 } @$items;
3249
3250 $self->{real_items} = \@items;
3251
3252 my $row = 0;
3253 for my $item (@items) {
3254 CFClient::Item::update_widgets $item;
3255
3256 $self->{child}->add (0, $row, $item->{face_widget});
3257 $self->{child}->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget});
3259
3260 $row++;
3261 }
3262}
3263
3264#############################################################################
3265
3266package CFClient::UI::BindEditor;
3267
3268our @ISA = CFClient::UI::FancyFrame::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3274
3275 $self->add (my $vb = new CFClient::UI::VBox);
3276
3277
3278 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3279 text => "start recording",
3280 tooltip => "Start/Stops recording of actions."
3281 ."All subsequent actions after the recording started will be captured."
3282 ."The actions are displayed after the record was stopped."
3283 ."To bind the action you have to click on the 'Bind' button",
3284 on_activate => sub {
3285 unless ($self->{recording}) {
3286 $self->start;
3287 } else {
3288 $self->stop;
3289 }
3290 });
3291
3292 $vb->add (new CFClient::UI::Label text => "Actions:");
3293 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3294
3295 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3296 $vb->add (my $hb = new CFClient::UI::HBox);
3297 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3298 $hb->add (new CFClient::UI::Button
3299 text => "bind",
3300 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3301 on_activate => sub {
3302 $self->ask_for_bind;
3303 });
3304
3305 $vb->add (my $hb = new CFClient::UI::HBox);
3306 $hb->add (new CFClient::UI::Button
3307 text => "ok",
3308 expand => 1,
3309 tooltip => "This closes the binding editor and saves the binding",
3310 on_activate => sub {
3311 $self->hide;
3312 $self->commit;
3313 });
3314
3315 $hb->add (new CFClient::UI::Button
3316 text => "cancel",
3317 expand => 1,
3318 tooltip => "This closes the binding editor without saving",
3319 on_activate => sub {
3320 $self->hide;
3321 $self->{binding_cancel}->()
3322 if $self->{binding_cancel};
3323 });
3324
3325 $self->update_binding_widgets;
3326
3327 $self
3328}
3329
3330sub commit {
3331 my ($self) = @_;
3332 my ($mod, $sym, $cmds) = $self->get_binding;
3333 if ($sym != 0 && @$cmds > 0) {
3334 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3335 ."'. Don't forget 'Save Config'!");
3336 $self->{binding_change}->($mod, $sym, $cmds)
3337 if $self->{binding_change};
3338 } else {
3339 $::STATUSBOX->add ("No action bound, no key or action specified!");
3340 $self->{binding_cancel}->()
3341 if $self->{binding_cancel};
3342 }
3343}
3344
3345sub start {
3346 my ($self) = @_;
3347
3348 $self->{rec_btn}->set_text ("stop recording");
3349 $self->{recording} = 1;
3350 $self->clear_command_list;
3351 $::CONN->start_record if $::CONN;
3352}
3353
3354sub stop {
3355 my ($self) = @_;
3356
3357 $self->{rec_btn}->set_text ("start recording");
3358 $self->{recording} = 0;
3359
3360 my $rec;
3361 $rec = $::CONN->stop_record if $::CONN;
3362 return unless ref $rec eq 'ARRAY';
3363 $self->set_command_list ($rec);
3364}
3365
3366
3367sub ask_for_bind_and_commit {
3368 my ($self) = @_;
3369 $self->ask_for_bind (1);
3370}
3371
3372sub ask_for_bind {
3373 my ($self, $commit) = @_;
3374
3375 CFClient::Binder::open_binding_dialog (sub {
3376 my ($mod, $sym) = @_;
3377 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3378 $self->update_binding_widgets;
3379 $self->commit if $commit;
3380 });
3381}
3382
3383# $mod and $sym are the modifiers and key symbol
3384# $cmds is a array ref of strings (the commands)
3385# $cb is the callback that is executed on OK
3386# $ccb is the callback that is executed on CANCEL and
3387# when the binding was unsuccessful on OK
3388sub set_binding {
3389 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3390
3391 $self->clear_command_list;
3392 $self->{recording} = 0;
3393 $self->{rec_btn}->set_text ("start recording");
3394
3395 $self->{binding} = [$mod, $sym];
3396 $self->{commands} = $cmds;
3397
3398 $self->{binding_change} = $cb;
3399 $self->{binding_cancel} = $ccb;
3400
3401 $self->update_binding_widgets;
3402}
3403
3404# this is a shortcut method that asks for a binding
3405# and then just binds it.
3406sub do_quick_binding {
3407 my ($self, $cmds) = @_;
3408 $self->set_binding (undef, undef, $cmds, sub {
3409 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3410 });
3411 $self->ask_for_bind (1);
3412}
3413
3414sub update_binding_widgets {
3415 my ($self) = @_;
3416 my ($mod, $sym, $cmds) = $self->get_binding;
3417 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3418 $self->set_command_list ($cmds);
3419}
3420
3421sub get_binding {
3422 my ($self) = @_;
3423 return (
3424 $self->{binding}->[0],
3425 $self->{binding}->[1],
3426 [ grep { defined $_ } @{$self->{commands}} ]
3427 );
3428}
3429
3430sub clear_command_list {
3431 my ($self) = @_;
3432 $self->{cmdbox}->clear ();
3433}
3434
3435sub set_command_list {
3436 my ($self, $cmds) = @_;
3437
3438 $self->{cmdbox}->clear ();
3439 $self->{commands} = $cmds;
3440
3441 my $idx = 0;
3442
3443 for (@$cmds) {
3444 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3445
3446 my $i = $idx;
3447 $hb->add (new CFClient::UI::Label text => $_);
3448 $hb->add (new CFClient::UI::Button
3449 text => "delete",
3450 tooltip => "Deletes the action from the record",
3451 on_activate => sub {
3452 $self->{cmdbox}->remove ($hb);
3453 $cmds->[$i] = undef;
3454 });
3455
3456
3457 $idx++
3458 }
3459}
3460
3461#############################################################################
3462
3463package CFClient::UI::SpellList;
3464
3465our @ISA = CFClient::UI::Table::;
3466
3467sub new {
3468 my $class = shift;
3469
3470 my $self = $class->SUPER::new (
3471 binding => [],
3472 commands => [],
2913 @_, 3473 @_,
2914 ) 3474 )
2915} 3475}
2916 3476
2917sub configure { 3477# XXX: Do sorting? Argl...
2918 my ($self, $x, $y, $w, $h) = @_; 3478sub add_spell {
2919
2920 $self->{w} = $w;
2921 $self->{h} = $h;
2922}
2923
2924sub check_size {
2925 my ($self) = @_; 3479 my ($self, $spell) = @_;
3480 $self->{spells}->{$spell->{name}} = $spell;
2926 3481
2927 $self->size_allocate ($self->{w}, $self->{h}) 3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2928 if $self->{w}; 3483 face => $spell->{face},
3484 can_hover => 1,
3485 can_events => 1,
3486 tooltip => $spell->{message});
3487
3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489 text => $spell->{name},
3490 can_hover => 1,
3491 can_events => 1,
3492 tooltip => $spell->{message},
3493 expand => 1);
3494
3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3498 expand => 1);
3499
3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501 text => "bind to key",
3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503}
3504
3505sub rebuild_spell_list {
3506 my ($self) = @_;
3507 $self->{tbl_idx} = 0;
3508 $self->add_spell ($_) for values %{$self->{spells}};
3509}
3510
3511sub remove_spell {
3512 my ($self, $spell) = @_;
3513 delete $self->{spells}->{$spell->{name}};
3514 $self->rebuild_spell_list;
3515}
3516
3517#############################################################################
3518
3519package CFClient::UI::Root;
3520
3521our @ISA = CFClient::UI::Container::;
3522
3523use List::Util qw(min max);
3524
3525use CFClient::OpenGL;
3526
3527sub new {
3528 my $class = shift;
3529
3530 my $self = $class->SUPER::new (
3531 visible => 1,
3532 @_,
3533 );
3534
3535 Scalar::Util::weaken ($self->{root} = $self);
3536
3537 $self
2929} 3538}
2930 3539
2931sub size_request { 3540sub size_request {
2932 my ($self) = @_; 3541 my ($self) = @_;
2933 3542
2934 ($self->{w}, $self->{h}) 3543 ($self->{w}, $self->{h})
3544}
3545
3546sub _to_pixel {
3547 my ($coord, $size, $max) = @_;
3548
3549 $coord =
3550 $coord eq "center" ? ($max - $size) * 0.5
3551 : $coord eq "max" ? $max
3552 : $coord;
3553
3554 $coord = 0 if $coord < 0;
3555 $coord = $max - $size if $coord > $max - $size;
3556
3557 int $coord + 0.5
2935} 3558}
2936 3559
2937sub size_allocate { 3560sub size_allocate {
2938 my ($self, $w, $h) = @_; 3561 my ($self, $w, $h) = @_;
2939 3562
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) { 3563 for my $child ($self->children) {
2947 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3564 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2948 3565
2949 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3566 $X = $child->{force_x} if exists $child->{force_x};
2950 if exists $child->{req_x}; 3567 $Y = $child->{force_y} if exists $child->{force_y};
2951 3568
2952 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3569 $X = _to_pixel $X, $W, $self->{w};
2953 if exists $child->{req_y}; 3570 $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 3571
2958 $child->configure ($X, $Y, $W, $H); 3572 $child->configure ($X, $Y, $W, $H);
2959 } 3573 }
2960} 3574}
2961 3575
… …
2972} 3586}
2973 3587
2974sub update { 3588sub update {
2975 my ($self) = @_; 3589 my ($self) = @_;
2976 3590
2977 $self->check_size;
2978 $::WANT_REFRESH++; 3591 $::WANT_REFRESH++;
2979} 3592}
2980 3593
2981sub add { 3594sub add {
2982 my ($self, @children) = @_; 3595 my ($self, @children) = @_;
2983 3596
2984 for my $child (@children) {
2985 $child->{toplevel} = 1; 3597 $_->{is_toplevel} = 1
2986 3598 for @children;
2987 # integerise window positions
2988 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y};
2990 }
2991 3599
2992 $self->SUPER::add (@children); 3600 $self->SUPER::add (@children);
3601}
3602
3603sub remove {
3604 my ($self, @children) = @_;
3605
3606 $self->SUPER::remove (@children);
3607
3608 delete $self->{is_toplevel}
3609 for @children;
3610
3611 while (@children) {
3612 my $w = pop @children;
3613 push @children, $w->children;
3614 $w->set_invisible;
3615 }
2993} 3616}
2994 3617
2995sub on_refresh { 3618sub on_refresh {
2996 my ($self, $id, $cb) = @_; 3619 my ($self, $id, $cb) = @_;
2997 3620
… …
3010 while ($self->{refresh_hook}) { 3633 while ($self->{refresh_hook}) {
3011 $_->() 3634 $_->()
3012 for values %{delete $self->{refresh_hook}}; 3635 for values %{delete $self->{refresh_hook}};
3013 } 3636 }
3014 3637
3015 if ($self->{check_size}) { 3638 if ($self->{realloc}) {
3016 my @queue = ([], []); 3639 my %queue;
3640 my @queue;
3641 my $widget;
3017 3642
3018 for (;;) { 3643 outer:
3019 if ($self->{check_size}) { 3644 while () {
3020 # heuristic: check containers last 3645 if (my $realloc = delete $self->{realloc}) {
3021 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3646 for $widget (values %$realloc) {
3022 for values %{delete $self->{check_size}} 3647 $widget->{visible} or next; # do not resize invisible widgets
3648
3649 $queue{$widget+0}++ and next; # duplicates are common
3650
3651 push @{ $queue[$widget->{visible}] }, $widget;
3652 }
3023 } 3653 }
3024 3654
3025 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3655 while () {
3656 @queue or last outer;
3026 3657
3027 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3658 $widget = pop @{ $queue[-1] || [] }
3028 ? @$widget{qw(user_w user_h)} 3659 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 3660
3661 pop @queue;
3662 }
3663
3664 delete $queue{$widget+0};
3665
3666 my ($w, $h) = $widget->size_request;
3667
3668 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3669 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3670
3671 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3672 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3673
3674 $w = $widget->{force_w} if exists $widget->{force_w};
3675 $h = $widget->{force_h} if exists $widget->{force_h};
3676
3677 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3678 || delete $widget->{force_realloc}) {
3035 $widget->{req_w} = $w; 3679 $widget->{req_w} = $w;
3036 $widget->{req_h} = $h; 3680 $widget->{req_h} = $h;
3037 3681
3038 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3682 $self->{size_alloc}{$widget+0} = $widget;
3039 3683
3040 $widget->{parent}->check_size
3041 if $widget->{parent}; 3684 if (my $parent = $widget->{parent}) {
3685 $self->{realloc}{$parent+0} = $parent
3686 unless $queue{$parent+0};
3687
3688 $parent->{force_size_alloc} = 1;
3689 $self->{size_alloc}{$parent+0} = $parent;
3690 }
3042 } 3691 }
3692
3693 delete $self->{realloc}{$widget+0};
3043 } 3694 }
3044 } 3695 }
3045 3696
3046 while ($self->{size_alloc}) { 3697 while (my $size_alloc = delete $self->{size_alloc}) {
3047 for (values %{delete $self->{size_alloc}}) { 3698 my @queue = sort { $b->{visible} <=> $a->{visible} }
3048 my ($widget, $w, $h) = @$_; 3699 values %$size_alloc;
3700
3701 while () {
3702 my $widget = pop @queue || last;
3703
3704 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3049 3705
3050 $w = 0 if $w < 0; 3706 $w = 0 if $w < 0;
3051 $h = 0 if $h < 0; 3707 $h = 0 if $h < 0;
3052 3708
3709 $w = int $w + 0.5;
3710 $h = int $h + 0.5;
3711
3712 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3713 $widget->{old_w} = $widget->{w};
3714 $widget->{old_h} = $widget->{h};
3715
3053 $widget->{w} = $w; 3716 $widget->{w} = $w;
3054 $widget->{h} = $h; 3717 $widget->{h} = $h;
3055 $widget->size_allocate ($w, $h); 3718
3056 $widget->emit (size_allocate => $w, $h); 3719 $widget->emit (size_allocate => $w, $h);
3720 }
3057 } 3721 }
3058 } 3722 }
3059 3723
3060 while ($self->{post_alloc_hook}) { 3724 while ($self->{post_alloc_hook}) {
3061 $_->() 3725 $_->()
3062 for values %{delete $self->{post_alloc_hook}}; 3726 for values %{delete $self->{post_alloc_hook}};
3063 } 3727 }
3728
3064 3729
3065 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3730 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3066 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3731 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3067 glClear GL_COLOR_BUFFER_BIT; 3732 glClear GL_COLOR_BUFFER_BIT;
3068 3733
… …
3070 glLoadIdentity; 3735 glLoadIdentity;
3071 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3736 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3072 glMatrixMode GL_MODELVIEW; 3737 glMatrixMode GL_MODELVIEW;
3073 glLoadIdentity; 3738 glLoadIdentity;
3074 3739
3740 {
3741 package CFClient::UI::Base;
3742
3743 ($draw_x, $draw_y, $draw_w, $draw_h) =
3744 (0, 0, $self->{w}, $self->{h});
3745 }
3746
3075 $self->_draw; 3747 $self->_draw;
3076} 3748}
3077 3749
3078############################################################################# 3750#############################################################################
3079 3751

Diff Legend

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