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.283 by root, Mon Jun 5 02:28:30 2006 UTC

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

Diff Legend

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