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

Diff Legend

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