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.224 by elmex, Tue May 23 20:00:55 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
50 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
51} 70}
52 71
53# class methods for events 72# class methods for events
54sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 75 if $FOCUS;
57} 76}
58 77
59sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 80 if $FOCUS;
62} 81}
63 82
64sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
65 my ($ev) = @_; 84 my ($ev) = @_;
… …
74 check_tooltip; 93 check_tooltip;
75 } 94 }
76 95
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 97
79 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 100}
84 101
85sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
86 my ($ev) = @_; 103 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
88 105
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 107
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 109
93 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 112
98 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 115 $grab->update if $grab;
101 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 133
119 check_tooltip; 134 check_tooltip;
120 } 135 }
121 136
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 138 if $HOVER;
126} 139}
127 140
128# convert position array to integers 141# convert position array to integers
129sub harmonize { 142sub harmonize {
130 my ($vals) = @_; 143 my ($vals) = @_;
… …
144 157
145 $_->update 158 $_->update
146 for @widgets; 159 for @widgets;
147} 160}
148 161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
149# call when resolution changes etc. 170# call when resolution changes etc.
150sub rescale_widgets { 171sub rescale_widgets {
151 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
152 173
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 174 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
166 } 189 }
167
168 $widget->reconfigure;
169 } 190 }
191
192 reconfigure_widgets;
170} 193}
171 194
172############################################################################# 195#############################################################################
173 196
174package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
179 202
180sub new { 203sub new {
181 my $class = shift; 204 my $class = shift;
182 205
183 my $self = bless { 206 my $self = bless {
184 x => 0, 207 x => "center",
185 y => 0, 208 y => "center",
186 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
187 can_events => 1, 212 can_events => 1,
188 @_ 213 @_
189 }, $class; 214 }, $class;
190 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
191 for (keys %$self) { 218 for (keys %$self) {
192 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
194 } 221 }
195 } 222 }
196 223
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
198 235
199 $self 236 $self
200} 237}
201 238
202sub destroy { 239sub destroy {
… …
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 show_centered { 254sub set_visible {
217 my ($self) = @_; 255 my ($self) = @_;
256
218 return if $self->{parent}; 257 return if $self->{visible};
219 258
220 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
221 261
222 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228 263
229sub hide { 264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
230 my ($self) = @_; 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};
231 278
232 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
234 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
235 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
236 if $self->{parent}; 313 if $self->{parent};
237} 314}
238 315
239sub move { 316sub move_abs {
240 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
241 318
242 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
243 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
244 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
245 322
246 $self->update; 323 $self->update;
247} 324}
248 325
249sub set_size { 326sub set_size {
250 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
251 328
252 $self->{user_w} = $w; 329 $self->{force_w} = $w;
253 $self->{user_h} = $h; 330 $self->{force_h} = $h;
254 331
255 $self->check_size; 332 $self->realloc;
256} 333}
257 334
258sub size_request { 335sub size_request {
259 require Carp; 336 require Carp;
260 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
262 339
263sub configure { 340sub configure {
264 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
265 342
266 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
267 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
268 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
269 348
270 # use alignment to adjust x, y 349 # use alignment to adjust x, y
271 350
272 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
273 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
274
275 ($w, $h) = ($w2, $h2);
276 } 353 }
277 354
278 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
279 $self->{x} = $x; 356 $self->{x} = $x;
280 $self->{y} = $y; 357 $self->{y} = $y;
281 $self->update; 358 $self->update;
282 } 359 }
283 360
284 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285 $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;
286 } 368 }
287} 369}
288 370
289sub size_allocate { 371sub size_allocate {
290 # nothing to be done 372 # nothing to be done
291} 373}
292 374
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
300sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
301} 381}
302 382
303sub set_max_size { 383sub set_max_size {
304 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
305 385
306 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
308} 390}
309 391
310sub set_tooltip { 392sub set_tooltip {
311 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
394
395 $tooltip =~ s/^\s+//;
396 $tooltip =~ s/\s+$//;
397
398 return if $self->{tooltip} eq $tooltip;
312 399
313 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
314 401
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
… …
338 return if $FOCUS == $self; 425 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
340 427
341 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
342 429
343 $self->emit (focus_in => $focus); 430 $self->_emit (focus_in => $focus);
344 431
345 $focus->update if $focus; 432 $focus->update if $focus;
346 $FOCUS->update; 433 $FOCUS->update;
347} 434}
348 435
… …
351 438
352 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
353 440
354 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
355 442
356 $self->emit (focus_out => $focus); 443 $self->_emit (focus_out => $focus);
357 444
358 $focus->update if $focus; #? 445 $focus->update if $focus; #?
359}
360 446
447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
448 unless $FOCUS;
449}
450
361sub mouse_motion { } 451sub mouse_motion { 0 }
362sub button_up { } 452sub button_up { 0 }
363sub key_down { } 453sub key_down { 0 }
364sub key_up { } 454sub key_up { 0 }
365 455
366sub button_down { 456sub button_down {
367 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
368 458
369 $self->focus_in; 459 $self->focus_in;
370}
371 460
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
376sub 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
377 537
378sub draw { 538sub draw {
379 my ($self) = @_; 539 my ($self) = @_;
380 540
381 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);
382 552
383 glPushMatrix; 553 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw;
386 glPopMatrix;
387 555
388 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
389 my ($x, $y) = @$self{qw(x y)};
390
391 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
392 glEnable GL_BLEND; 558 glEnable GL_BLEND;
393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
394 glBegin GL_QUADS; 560 glBegin GL_QUADS;
395 glVertex $x , $y;
396 glVertex $x + $self->{w}, $y;
397 glVertex $x + $self->{w}, $y + $self->{h};
398 glVertex $x , $y + $self->{h};
399 glEnd;
400 glDisable GL_BLEND;
401 }
402
403 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix;
405 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 561 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 562 glVertex $self->{w}, 0;
410 glVertex $self->{w}, $self->{h}; 563 glVertex $self->{w}, $self->{h};
411 glVertex 0 , $self->{h}; 564 glVertex 0 , $self->{h};
412 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;
413 glPopMatrix; 579 glPopMatrix;
414 #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;
415 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
416} 585}
417 586
418sub _draw { 587sub _draw {
419 my ($self) = @_; 588 my ($self) = @_;
420 589
421 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
422}
423
424sub find_widget {
425 my ($self, $x, $y) = @_;
426
427 return () unless $self->{can_events};
428
429 return $self
430 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433 ()
434}
435
436sub set_parent {
437 my ($self, $parent) = @_;
438
439 Scalar::Util::weaken ($self->{parent} = $parent);
440
441 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size
443 unless exists $self->{req_w};
444
445 $self->show;
446}
447
448sub check_size {
449 my ($self, $forced) = @_;
450
451 $self->{force_alloc} = 1 if $forced;
452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
453}
454
455sub update {
456 my ($self) = @_;
457
458 $self->{parent}->update
459 if $self->{parent};
460}
461
462sub connect {
463 my ($self, $signal, $cb) = @_;
464
465 push @{ $self->{signal_cb}{$signal} }, $cb;
466}
467
468sub emit {
469 my ($self, $signal, @args) = @_;
470
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472} 591}
473 592
474sub DESTROY { 593sub DESTROY {
475 my ($self) = @_; 594 my ($self) = @_;
476 595
… …
508 627
509 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
510 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
511 630
512 glEnable GL_BLEND; 631 glEnable GL_BLEND;
513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
514 glColor @$color; 633 glColor_premultiply @$color;
515 634
516 glBegin GL_QUADS; 635 glBegin GL_QUADS;
517 glVertex 0 , 0; 636 glVertex 0 , 0;
518 glVertex 0 , $h; 637 glVertex 0 , $h;
519 glVertex $w, $h; 638 glVertex $w, $h;
… …
534 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
536} 655}
537 656
538sub size_request { 657sub size_request {
539 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
540} 661}
541 662
542sub draw { } 663sub draw { }
543 664
544############################################################################# 665#############################################################################
… …
548our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
549 670
550sub new { 671sub new {
551 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
552 673
553 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
554 675
555 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
556 children => [], 677 children => [],
557 can_events => 0, 678 can_events => 0,
558 %arg, 679 %arg,
559 ); 680 );
681
560 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
561 684
562 $self 685 $self
563} 686}
564 687
565sub add { 688sub add {
… …
573 $self->{children} = [ 696 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
576 ]; 699 ];
577 700
578 $self->check_size (1); 701 $self->realloc;
579 $self->update;
580} 702}
581 703
582sub children { 704sub children {
583 @{ $_[0]{children} } 705 @{ $_[0]{children} }
584} 706}
… …
589 delete $child->{parent}; 711 delete $child->{parent};
590 $child->hide; 712 $child->hide;
591 713
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 715
594 $self->check_size; 716 $self->realloc;
595 $self->update;
596} 717}
597 718
598sub clear { 719sub clear {
599 my ($self) = @_; 720 my ($self) = @_;
600 721
… …
604 for (@$children) { 725 for (@$children) {
605 delete $_->{parent}; 726 delete $_->{parent};
606 $_->hide; 727 $_->hide;
607 } 728 }
608 729
609 $self->check_size; 730 $self->realloc;
610 $self->update;
611} 731}
612 732
613sub find_widget { 733sub find_widget {
614 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
615 735
616 $x -= $self->{x}; 736 $x -= $self->{x};
617 $y -= $self->{y}; 737 $y -= $self->{y};
618 738
619 my $res; 739 my $res;
620 740
621 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
622 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
623 and return $res; 743 and return $res;
624 } 744 }
625 745
626 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
675 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
676} 796}
677 797
678############################################################################# 798#############################################################################
679 799
800# back-buffered drawing area
801
680package CFClient::UI::Window; 802package CFClient::UI::Window;
681 803
682our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
683 805
684use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
702 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 825 $self->update;
704} 826}
705 827
706sub _render { 828sub _render {
829 my ($self) = @_;
830
707 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
708} 832}
709 833
710sub render_child { 834sub render_child {
711 my ($self) = @_; 835 my ($self) = @_;
712 836
713 $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 {
714 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
716 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
717 $self->_render; 848 $self->_render;
718 }; 849 };
719} 850}
720 851
721sub _draw { 852sub _draw {
722 my ($self) = @_; 853 my ($self) = @_;
723 854
724 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
725 856
726 my $tex = $self->{texture} 857 my $tex = $self->{texture}
727 or return; 858 or return;
728 859
729 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
731 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
732 863
733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
734 865
735 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
736} 867}
… …
739 870
740package CFClient::UI::ViewPort; 871package CFClient::UI::ViewPort;
741 872
742our @ISA = CFClient::UI::Window::; 873our @ISA = CFClient::UI::Window::;
743 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 scroll_x => 0,
880 scroll_y => 1,
881 @_,
882 )
883}
884
744sub size_request { 885sub size_request {
745 my ($self) = @_; 886 my ($self) = @_;
746 887
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 889
750 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y};
892
893 ($w, $h)
751} 894}
752 895
753sub size_allocate { 896sub size_allocate {
754 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
755 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);
756 $self->update; 905 $self->update;
757} 906}
758 907
759sub set_offset { 908sub set_offset {
760 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
… …
794} 943}
795 944
796sub _render { 945sub _render {
797 my ($self) = @_; 946 my ($self) = @_;
798 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
799 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
800 952
801 $self->SUPER::_render; 953 $self->SUPER::_render;
802} 954}
803 955
… …
806package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
807 959
808our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
809 961
810sub new { 962sub new {
811 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
812 966
813 my $self; 967 my $self;
814 968
815 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
816 vertical => 1, 970 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub { 972 on_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 973 $self->{vp}->set_offset (0, $_[1]);
820 }, 974 },
821 ; 975 ;
822 976
823 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
824 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
825 slider => $slider, 979 slider => $slider,
826 @_, 980 %arg,
827 ); 981 );
828 982
829 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp});
831 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
832 985
833 $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]);
834} 1012}
835 1013
836#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll 1015# update viewport offset on scroll
838 1016
… …
858 1036
859 if ($self->{bg}) { 1037 if ($self->{bg}) {
860 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
861 1039
862 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
863 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
864 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
865 1043
866 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
867 glVertex 0 , 0; 1045 glVertex 0 , 0;
868 glVertex 0 , $h; 1046 glVertex 0 , $h;
869 glVertex $w, $h; 1047 glVertex $w, $h;
… …
882 1060
883our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
884 1062
885use CFClient::OpenGL; 1063use CFClient::OpenGL;
886 1064
887my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
888 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
889 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);
890 1072
891sub new { 1073sub new {
892 my $class = shift; 1074 my ($class, %arg) = @_;
893 1075
894 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
895 1077
896 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
897 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
898 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
899 border => 0.6, 1081 border => 0.6,
900 toplevel => 1,
901 can_events => 1, 1082 can_events => 1,
902 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
903 ); 1086 );
904 1087
905 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
906 align => 0, 1089 align => 0,
907 valign => 1, 1090 valign => 1,
908 text => $self->{title}, 1091 text => $title,
909 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
910 1094
911 $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};
912} 1103}
913 1104
914sub border { 1105sub border {
915 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
916} 1107}
917 1108
918sub size_request { 1109sub size_request {
919 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
920 1114
921 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
922 1116
923 ( 1117 (
924 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
927} 1121}
928 1122
929sub size_allocate { 1123sub size_allocate {
930 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
931 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
932 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
933 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
934 1136
935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
936 if $self->{title};
937
938 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
939} 1138}
940 1139
941sub button_down { 1140sub button_down {
942 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
943 1142
… …
959 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
960 1159
961 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
963 1162
964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
967 $self->check_size; 1167 $self->realloc;
968 }; 1168 };
969 1169
970 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
971 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
972 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
974 $self->{motion} = sub { 1174 $self->{motion} = sub {
975 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
976 1176
977 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
978 1178
979 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
980 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
981 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
982 } 1187 1
983} 1188}
984 1189
985sub button_up { 1190sub button_up {
986 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
987 1192
988 delete $self->{motion}; 1193 !!delete $self->{motion}
989} 1194}
990 1195
991sub mouse_motion { 1196sub mouse_motion {
992 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
993 1198
994 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
995} 1202}
996 1203
997sub _draw { 1204sub _draw {
998 my ($self) = @_; 1205 my ($self) = @_;
999 1206
1207 my $child = $self->{children}[0];
1208
1000 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1001 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1002 1211
1003 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1005 1214
1006 my $border = $self->border; 1215 my $border = $self->border;
1007 1216
1008 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1013 1222
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1015 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1016 1225
1017 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1018 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1019 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1020
1021 glColor @{ $self->{bg} };
1022
1023 $bg->{s} = $rep_x;
1024 $bg->{t} = $rep_y;
1025 $bg->{wrap_mode} = 1;
1026 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 } 1231 }
1028 1232
1029 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1030 1234
1031 $self->{title}->draw if $self->{title};
1032
1033 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1034} 1241}
1035 1242
1036############################################################################# 1243#############################################################################
1037 1244
1038package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1046sub new { 1253sub new {
1047 my $class = shift; 1254 my $class = shift;
1048 1255
1049 $class->SUPER::new ( 1256 $class->SUPER::new (
1050 col_expand => [], 1257 col_expand => [],
1051 @_ 1258 @_,
1052 ) 1259 )
1260}
1261
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053} 1264}
1054 1265
1055sub add { 1266sub add {
1056 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1057 1268
1058 $child->set_parent ($self); 1269 $child->set_parent ($self);
1059 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1060 1271
1061 $child->check_size; 1272 $self->realloc;
1062} 1273}
1063 1274
1064sub children {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066}
1067
1068# 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?
1069sub clear { 1276sub clear {
1070 my ($self) = @_; 1277 my ($self) = @_;
1071 1278
1072 my @children = $self->children; 1279 my @children = $self->children;
1073 delete $self->{children}; 1280 delete $self->{children};
… …
1075 for (@children) { 1282 for (@children) {
1076 delete $_->{parent}; 1283 delete $_->{parent};
1077 $_->hide; 1284 $_->hide;
1078 } 1285 }
1079 1286
1080 $self->update; 1287 $self->realloc;
1081} 1288}
1082 1289
1083sub get_wh { 1290sub get_wh {
1084 my ($self) = @_; 1291 my ($self) = @_;
1085 1292
… …
1116sub size_allocate { 1323sub size_allocate {
1117 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1118 1325
1119 my ($ws, $hs) = $self->get_wh; 1326 my ($ws, $hs) = $self->get_wh;
1120 1327
1121 my $req_w = sum @$ws; 1328 my $req_w = (sum @$ws) || 1;
1122 my $req_h = sum @$hs; 1329 my $req_h = (sum @$hs) || 1;
1123 1330
1124 # TODO: nicer code && do row_expand 1331 # TODO: nicer code && do row_expand
1125 my @col_expand = @{$self->{col_expand}}; 1332 my @col_expand = @{$self->{col_expand}};
1126 @col_expand = (1) x @$ws unless @col_expand; 1333 @col_expand = (1) x @$ws unless @col_expand;
1127 my $col_expand = (sum @col_expand) || 1; 1334 my $col_expand = (sum @col_expand) || 1;
… …
1181 } 1388 }
1182} 1389}
1183 1390
1184############################################################################# 1391#############################################################################
1185 1392
1186package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1187
1188# TODO: wrap into common Box base class
1189 1394
1190our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1191 1396
1192sub size_request { 1397sub size_request {
1193 my ($self) = @_; 1398 my ($self) = @_;
1194 1399
1195 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1196 1401 ? (
1197 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1198 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1199 (List::Util::max map $_->[1], @alloc), 1404 )
1200 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1201} 1409}
1202 1410
1203sub size_allocate { 1411sub size_allocate {
1204 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1205 1413
1206 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1207
1208 my $children = $self->{children}; 1415 my $children = $self->{children};
1209 1416
1210 my @h = map $_->{req_w}, @$children; 1417 my @req;
1211 1418
1212 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1213 1420 @req = ($space / (@$children || 1)) x @$children;
1214 if ($req_h > $h) {
1215 # ah well, not enough space
1216 $_ *= $h / $req_h for @h;
1217 } 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 {
1218 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1219 $exp ||= 1;
1220 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1221 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1222 my $child = $children->[$_];
1223
1224 my $alloc_h = $h[$_];
1225 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1226 $h[$_] = $alloc_h;
1227 } 1435 }
1228 } 1436 }
1229 1437
1230 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1231 1439
1232 my $y = 0; 1440 my $pos = 0;
1233 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1234 my $child = $children->[$_];
1235 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1236 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1237 1444
1238 $y += $h; 1445 $pos += $alloc;
1239 } 1446 }
1240 1447
1241 1 1448 1
1242} 1449}
1243 1450
1244############################################################################# 1451#############################################################################
1245 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
1246package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1247 1469
1248# TODO: wrap into common Box base class
1249
1250our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1251 1471
1252sub size_request { 1472sub new {
1253 my ($self) = @_; 1473 my $class = shift;
1254 1474
1255 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1256 1476 vertical => 1,
1257 ( 1477 @_,
1258 (List::Util::max map $_->[0], @alloc),
1259 (List::Util::sum map $_->[1], @alloc),
1260 ) 1478 )
1261}
1262
1263sub size_allocate {
1264 my ($self, $w, $h) = @_;
1265
1266 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1268 my $children = $self->{children};
1269
1270 my @h = map $_->{req_h}, @$children;
1271
1272 my $req_h = List::Util::sum @h;
1273
1274 if ($req_h > $h) {
1275 # ah well, not enough space
1276 $_ *= $h / $req_h for @h;
1277 } else {
1278 my $exp = List::Util::sum map $_->{expand}, @$children;
1279 $exp ||= 1;
1280
1281 for (0 .. $#$children) {
1282 my $child = $children->[$_];
1283
1284 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1285 }
1286 }
1287
1288 CFClient::UI::harmonize \@h;
1289
1290 my $y = 0;
1291 for (0 .. $#$children) {
1292 my $child = $children->[$_];
1293 my $h = $h[$_];
1294 $child->configure (0, $y, $w, $h);
1295
1296 $y += $h;
1297 }
1298
1299 1
1300} 1479}
1301 1480
1302############################################################################# 1481#############################################################################
1303 1482
1304package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1321 ellipsise => 3, # end 1500 ellipsise => 3, # end
1322 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1323 fontsize => 1, 1502 fontsize => 1,
1324 align => -1, 1503 align => -1,
1325 valign => -1, 1504 valign => -1,
1326 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1327 can_events => 0, 1507 can_events => 0,
1328 %arg 1508 %arg
1329 ); 1509 );
1330 1510
1331 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1358 1538
1359 delete $self->{texture}; 1539 delete $self->{texture};
1360 $self->SUPER::update; 1540 $self->SUPER::update;
1361} 1541}
1362 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 $self->SUPER::realloc;
1548}
1549
1363sub set_text { 1550sub set_text {
1364 my ($self, $text) = @_; 1551 my ($self, $text) = @_;
1365 1552
1366 return if $self->{text} eq "T$text"; 1553 return if $self->{text} eq "T$text";
1367 $self->{text} = "T$text"; 1554 $self->{text} = "T$text";
1368 1555
1369 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1557 $self->{layout}->set_text ($text);
1558 delete $self->{req_h};
1371 1559
1560 $self->realloc;
1372 $self->update; 1561 $self->update;
1373 $self->check_size;
1374} 1562}
1375 1563
1376sub set_markup { 1564sub set_markup {
1377 my ($self, $markup) = @_; 1565 my ($self, $markup) = @_;
1378 1566
… …
1381 1569
1382 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383 1571
1384 $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;
1385 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1574 delete $self->{req_h};
1386 1575
1576 $self->realloc;
1387 $self->update; 1577 $self->update;
1388 $self->check_size;
1389} 1578}
1390 1579
1391sub size_request { 1580sub size_request {
1392 my ($self) = @_; 1581 my ($self) = @_;
1393 1582
1583 if (exists $self->{req_h}) {
1584 @$self{qw(req_w req_h)}
1585 } else {
1394 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1586 $self->{layout}->set_font ($self->{font}) if $self->{font};
1395 $self->{layout}->set_width ($self->{max_w} || -1); 1587 $self->{layout}->set_width ($self->{max_w} || -1);
1396 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1588 $self->{layout}->set_ellipsise ($self->{ellipsise});
1397 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1398 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1399 1591
1400 my ($w, $h) = $self->{layout}->size; 1592 my ($w, $h) = $self->{layout}->size;
1401 1593
1402 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
1403 $self->{template}->set_font ($self->{font}) if $self->{font}; 1595 $self->{template}->set_font ($self->{font}) if $self->{font};
1404 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1405 1597
1406 my ($w2, $h2) = $self->{template}->size; 1598 my ($w2, $h2) = $self->{template}->size;
1407 1599
1408 $w = List::Util::max $w, $w2; 1600 $w = List::Util::max $w, $w2;
1409 $h = List::Util::max $h, $h2; 1601 $h = List::Util::max $h, $h2;
1410 } 1602 }
1411 1603
1604 ($w, $h)
1412 ( 1605 }
1413 $w + $self->{padding} * 2,
1414 $h + $self->{padding} * 2,
1415 )
1416} 1606}
1417 1607
1418sub size_allocate { 1608sub size_allocate {
1419 my ($self, $w, $h) = @_; 1609 my ($self, $w, $h) = @_;
1420 1610
1611 delete $self->{ox};
1612
1421 delete $self->{texture}; 1613 delete $self->{texture}
1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1422} 1615}
1423 1616
1424sub set_fontsize { 1617sub set_fontsize {
1425 my ($self, $fontsize) = @_; 1618 my ($self, $fontsize) = @_;
1426 1619
1427 $self->{fontsize} = $fontsize; 1620 $self->{fontsize} = $fontsize;
1428 delete $self->{texture}; 1621 delete $self->{texture};
1429 1622
1430 $self->update; 1623 $self->realloc;
1431 $self->check_size;
1432} 1624}
1433 1625
1434sub _draw { 1626sub _draw {
1435 my ($self) = @_; 1627 my ($self) = @_;
1436 1628
… …
1442 $self->{layout}->set_width ($self->{w}); 1634 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1635 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446 1638
1447 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1639 new_from_layout CFClient::Texture $self->{layout}
1640 };
1448 1641
1642 unless (exists $self->{ox}) {
1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1451 : ($self->{w} - $tex->{w}) * 0.5); 1645 : ($self->{w} - $tex->{w}) * 0.5);
1452 1646
1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1455 : ($self->{h} - $tex->{h}) * 0.5); 1649 : ($self->{h} - $tex->{h}) * 0.5);
1456
1457 $tex
1458 }; 1650 };
1459 1651
1460 glEnable GL_TEXTURE_2D; 1652 glEnable GL_TEXTURE_2D;
1461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1462 1654
1655 glColor_premultiply @{$self->{fg}}
1463 if ($tex->{format} == GL_ALPHA) { 1656 if $tex->{format} == GL_ALPHA;
1464 glColor @{$self->{fg}}; 1657
1465 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1466 } else {
1467 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1468 }
1469 1659
1470 glDisable GL_TEXTURE_2D; 1660 glDisable GL_TEXTURE_2D;
1471} 1661}
1472 1662
1473############################################################################# 1663#############################################################################
… …
1488 active_fg => [0, 0, 0], 1678 active_fg => [0, 0, 0],
1489 can_hover => 1, 1679 can_hover => 1,
1490 can_focus => 1, 1680 can_focus => 1,
1491 valign => 0, 1681 valign => 0,
1492 can_events => 1, 1682 can_events => 1,
1683 #text => ...
1493 @_ 1684 @_
1494 ) 1685 )
1495} 1686}
1496 1687
1497sub _set_text { 1688sub _set_text {
… …
1499 1690
1500 delete $self->{cur_h}; 1691 delete $self->{cur_h};
1501 1692
1502 return if $self->{text} eq $text; 1693 return if $self->{text} eq $text;
1503 1694
1504 delete $self->{texture};
1505
1506 $self->{last_activity} = $::NOW; 1695 $self->{last_activity} = $::NOW;
1507 $self->{text} = $text; 1696 $self->{text} = $text;
1508 1697
1509 $text =~ s/./*/g if $self->{hidden}; 1698 $text =~ s/./*/g if $self->{hidden};
1510 $self->{layout}->set_text ("$text "); 1699 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h};
1511 1701
1512 $self->emit (changed => $self->{text}); 1702 $self->_emit (changed => $self->{text});
1703
1704 $self->realloc;
1705 $self->update;
1513} 1706}
1514 1707
1515sub set_text { 1708sub set_text {
1516 my ($self, $text) = @_; 1709 my ($self, $text) = @_;
1517 1710
1518 $self->{cursor} = length $text; 1711 $self->{cursor} = length $text;
1519 $self->_set_text ($text); 1712 $self->_set_text ($text);
1520 $self->update;
1521 $self->check_size;
1522} 1713}
1523 1714
1524sub get_text { 1715sub get_text {
1525 $_[0]{text} 1716 $_[0]{text}
1526} 1717}
… …
1529 my ($self) = @_; 1720 my ($self) = @_;
1530 1721
1531 my ($w, $h) = $self->SUPER::size_request; 1722 my ($w, $h) = $self->SUPER::size_request;
1532 1723
1533 ($w + 1, $h) # add 1 for cursor 1724 ($w + 1, $h) # add 1 for cursor
1534}
1535
1536sub size_allocate {
1537 my ($self, $w, $h) = @_;
1538
1539 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1540} 1725}
1541 1726
1542sub key_down { 1727sub key_down {
1543 my ($self, $ev) = @_; 1728 my ($self, $ev) = @_;
1544 1729
… …
1559 } elsif ($sym == CFClient::SDLK_HOME) { 1744 } elsif ($sym == CFClient::SDLK_HOME) {
1560 $self->{cursor} = 0; 1745 $self->{cursor} = 0;
1561 } elsif ($sym == CFClient::SDLK_END) { 1746 } elsif ($sym == CFClient::SDLK_END) {
1562 $self->{cursor} = length $text; 1747 $self->{cursor} = length $text;
1563 } elsif ($uni == 27) { 1748 } elsif ($uni == 27) {
1564 $self->emit ('escape'); 1749 $self->_emit ('escape');
1565 } elsif ($uni) { 1750 } elsif ($uni) {
1566 substr $text, $self->{cursor}++, 0, chr $uni; 1751 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else {
1753 return 0;
1567 } 1754 }
1568 1755
1569 $self->_set_text ($text); 1756 $self->_set_text ($text);
1570 $self->update; 1757
1571 $self->check_size; 1758 $self->realloc;
1759
1760 1
1572} 1761}
1573 1762
1574sub focus_in { 1763sub focus_in {
1575 my ($self) = @_; 1764 my ($self) = @_;
1576 1765
… …
1591 utf8::encode $text; 1780 utf8::encode $text;
1592 $self->{cursor} = length substr $text, 0, $idx; 1781 $self->{cursor} = length substr $text, 0, $idx;
1593 1782
1594 $self->_set_text ($self->{text}); 1783 $self->_set_text ($self->{text});
1595 $self->update; 1784 $self->update;
1785
1786 1
1596} 1787}
1597 1788
1598sub mouse_motion { 1789sub mouse_motion {
1599 my ($self, $ev, $x, $y) = @_; 1790 my ($self, $ev, $x, $y) = @_;
1600# 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
1601} 1794}
1602 1795
1603sub _draw { 1796sub _draw {
1604 my ($self) = @_; 1797 my ($self) = @_;
1605 1798
1606 local $self->{fg} = $self->{fg}; 1799 local $self->{fg} = $self->{fg};
1607 1800
1608 if ($FOCUS == $self) { 1801 if ($FOCUS == $self) {
1609 glColor @{$self->{active_bg}}; 1802 glColor_premultiply @{$self->{active_bg}};
1610 $self->{fg} = $self->{active_fg}; 1803 $self->{fg} = $self->{active_fg};
1611 } else { 1804 } else {
1612 glColor @{$self->{bg}}; 1805 glColor_premultiply @{$self->{bg}};
1613 } 1806 }
1614 1807
1615 glEnable GL_BLEND; 1808 glEnable GL_BLEND;
1616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1617 glBegin GL_QUADS; 1810 glBegin GL_QUADS;
1618 glVertex 0 , 0; 1811 glVertex 0 , 0;
1619 glVertex 0 , $self->{h}; 1812 glVertex 0 , $self->{h};
1620 glVertex $self->{w}, $self->{h}; 1813 glVertex $self->{w}, $self->{h};
1621 glVertex $self->{w}, 0; 1814 glVertex $self->{w}, 0;
… …
1656 if ($sym == 13) { 1849 if ($sym == 13) {
1657 unshift @{$self->{history}}, 1850 unshift @{$self->{history}},
1658 my $txt = $self->get_text; 1851 my $txt = $self->get_text;
1659 $self->{history_pointer} = -1; 1852 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = ''; 1853 $self->{history_saveback} = '';
1661 $self->emit (activate => $txt); 1854 $self->_emit (activate => $txt);
1662 $self->update; 1855 $self->update;
1663 1856
1664 } elsif ($sym == CFClient::SDLK_UP) { 1857 } elsif ($sym == CFClient::SDLK_UP) {
1665 if ($self->{history_pointer} < 0) { 1858 if ($self->{history_pointer} < 0) {
1666 $self->{history_saveback} = $self->get_text; 1859 $self->{history_saveback} = $self->get_text;
… …
1682 } else { 1875 } else {
1683 $self->set_text ($self->{history_saveback}); 1876 $self->set_text ($self->{history_saveback});
1684 } 1877 }
1685 1878
1686 } else { 1879 } else {
1687 $self->SUPER::key_down ($ev); 1880 return $self->SUPER::key_down ($ev)
1881 }
1882
1688 } 1883 1
1689
1690} 1884}
1691 1885
1692############################################################################# 1886#############################################################################
1693 1887
1694package CFClient::UI::Button; 1888package CFClient::UI::Button;
… …
1703 1897
1704sub new { 1898sub new {
1705 my $class = shift; 1899 my $class = shift;
1706 1900
1707 $class->SUPER::new ( 1901 $class->SUPER::new (
1708 padding => 4, 1902 padding_x => 4,
1903 padding_y => 4,
1709 fg => [1, 1, 1], 1904 fg => [1, 1, 1],
1710 active_fg => [0, 0, 1], 1905 active_fg => [0, 0, 1],
1711 can_hover => 1, 1906 can_hover => 1,
1712 align => 0, 1907 align => 0,
1713 valign => 0, 1908 valign => 0,
1714 can_events => 1, 1909 can_events => 1,
1715 @_ 1910 @_
1716 ) 1911 )
1717} 1912}
1718 1913
1914sub activate { }
1915
1719sub button_up { 1916sub button_up {
1720 my ($self, $ev, $x, $y) = @_; 1917 my ($self, $ev, $x, $y) = @_;
1721 1918
1919 $self->emit ("activate")
1722 if ($x >= 0 && $x < $self->{w} 1920 if $x >= 0 && $x < $self->{w}
1723 && $y >= 0 && $y < $self->{h}) { 1921 && $y >= 0 && $y < $self->{h};
1724 $self->emit ("activate"); 1922
1725 } 1923 1
1726} 1924}
1727 1925
1728sub _draw { 1926sub _draw {
1729 my ($self) = @_; 1927 my ($self) = @_;
1730 1928
1731 local $self->{fg} = $self->{fg}; 1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1732
1733 if ($GRAB == $self) {
1734 $self->{fg} = $self->{active_fg};
1735 }
1736 1930
1737 glEnable GL_TEXTURE_2D; 1931 glEnable GL_TEXTURE_2D;
1738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1739 glColor 0, 0, 0, 1; 1933 glColor 0, 0, 0, 1;
1740 1934
… …
1759 1953
1760sub new { 1954sub new {
1761 my $class = shift; 1955 my $class = shift;
1762 1956
1763 $class->SUPER::new ( 1957 $class->SUPER::new (
1764 padding => 2, 1958 padding_x => 2,
1959 padding_y => 2,
1765 fg => [1, 1, 1], 1960 fg => [1, 1, 1],
1766 active_fg => [1, 1, 0], 1961 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2], 1962 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5], 1963 active_bg => [1, 1, 1, 0.5],
1769 state => 0, 1964 state => 0,
… …
1773} 1968}
1774 1969
1775sub size_request { 1970sub size_request {
1776 my ($self) = @_; 1971 my ($self) = @_;
1777 1972
1778 ($self->{padding} * 2 + 6) x 2 1973 (6) x 2
1779} 1974}
1780 1975
1781sub button_down { 1976sub button_down {
1782 my ($self, $ev, $x, $y) = @_; 1977 my ($self, $ev, $x, $y) = @_;
1783 1978
1784 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1785 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1786 $self->{state} = !$self->{state}; 1981 $self->{state} = !$self->{state};
1787 $self->emit (changed => $self->{state}); 1982 $self->_emit (changed => $self->{state});
1983 } else {
1984 return 0
1985 }
1986
1788 } 1987 1
1789} 1988}
1790 1989
1791sub _draw { 1990sub _draw {
1792 my ($self) = @_; 1991 my ($self) = @_;
1793 1992
1794 $self->SUPER::_draw; 1993 $self->SUPER::_draw;
1795 1994
1796 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1995 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1797 1996
1798 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;
1799 2000
1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2001 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1801 2002
1802 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2003 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803 2004
… …
1958 2159
1959 my $h1 = $self->{h} * (1 - $ycut1); 2160 my $h1 = $self->{h} * (1 - $ycut1);
1960 my $h2 = $self->{h} * (1 - $ycut2); 2161 my $h2 = $self->{h} * (1 - $ycut2);
1961 2162
1962 glEnable GL_BLEND; 2163 glEnable GL_BLEND;
1963 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;
1964 glEnable GL_TEXTURE_2D; 2166 glEnable GL_TEXTURE_2D;
1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1966 2168
1967 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2169 glBindTexture GL_TEXTURE_2D, $t1->{name};
1968 glBegin GL_QUADS; 2170 glBegin GL_QUADS;
… …
2067 my $self = $class->SUPER::new ( 2269 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2270 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2271 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2272 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2273 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2274 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2275 min_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2276 min_h => $::WIDTH / 80,
2075 vertical => 0, 2277 vertical => 0,
2076 can_hover => 1, 2278 can_hover => 1,
2077 inner_pad => 0.02, 2279 inner_pad => 0.02,
2078 @_ 2280 @_
2079 ); 2281 );
… …
2082 $self->update; 2284 $self->update;
2083 2285
2084 $self 2286 $self
2085} 2287}
2086 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
2087sub set_value { 2300sub set_value {
2088 my ($self, $value) = @_; 2301 my ($self, $value) = @_;
2089 2302
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2303 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2304
2092 $hi = $lo + 1 if $hi <= $lo; 2305 $hi = $lo + 1 if $hi <= $lo;
2093 2306
2307 $page = $hi - $lo if $page > $hi - $lo;
2308
2094 $value = $lo if $value < $lo; 2309 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2310 $value = $hi - $page if $value > $hi - $page;
2096 2311
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2312 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2313 if $unit;
2099 2314
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2315 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2316
2104 if ($value != $old_value) { 2317 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2318 $self->_emit (changed => $value);
2106 $self->update; 2319 $self->update;
2107 } 2320 }
2108} 2321}
2109 2322
2110sub size_request { 2323sub size_request {
2111 my ($self) = @_; 2324 my ($self) = @_;
2112 2325
2113 my $w = $self->{req_w}; 2326 ($self->{req_w}, $self->{req_h})
2114 my $h = $self->{req_h};
2115
2116 $self->{vertical} ? ($h, $w) : ($w, $h)
2117} 2327}
2118 2328
2119sub button_down { 2329sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2121 2331
2122 $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
2123 $self->mouse_motion ($ev, $x, $y); 2336 $self->mouse_motion ($ev, $x, $y)
2124} 2337}
2125 2338
2126sub mouse_motion { 2339sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2340 my ($self, $ev, $x, $y) = @_;
2128 2341
2129 if ($GRAB == $self) { 2342 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2343 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2344
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2345 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2346
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2347 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2348
2136 $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
2137 } 2354 1
2138} 2355}
2139 2356
2140sub update { 2357sub update {
2141 my ($self) = @_; 2358 my ($self) = @_;
2142 2359
2143 $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}) {
2144 $self->set_value ($self->{range}[0]); 2368 $self->set_value ($self->{range}[0]);
2145 2369
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2370 my ($value, $lo, $hi, $page) = @{$self->{range}};
2371 my $range = ($hi - $page - $lo) || 1e-100;
2147 2372
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2373 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2374
2150 $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;
2151 2377
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2378 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2379 $value = $value * $self->{scale} + $self->{offset};
2154 2380
2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value; 2381 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2382 $self->{knob_w} = $knob_w;
2162 }); 2383 }
2163
2164 $self->SUPER::update;
2165}
2166
2167sub _draw {
2168 my ($self) = @_;
2169 2384
2170 $self->SUPER::_draw (); 2385 $self->SUPER::_draw ();
2171 2386
2172 glScale $self->{w}, $self->{h}; 2387 glScale $self->{w}, $self->{h};
2173 2388
… …
2190 # draw handle 2405 # draw handle
2191 $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);
2192 2407
2193 glDisable GL_TEXTURE_2D; 2408 glDisable GL_TEXTURE_2D;
2194} 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 (@_) }
2195 2451
2196############################################################################# 2452#############################################################################
2197 2453
2198package CFClient::UI::TextView; 2454package CFClient::UI::TextView;
2199 2455
… …
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2497 $self->{layout}->set_width ($self->{children}[0]{w});
2242 2498
2243 $self->reflow; 2499 $self->reflow;
2244} 2500}
2245 2501
2246sub text_height { 2502sub text_size {
2247 my ($self, $text, $indent) = @_; 2503 my ($self, $text, $indent) = @_;
2248 2504
2249 my $layout = $self->{layout}; 2505 my $layout = $self->{layout};
2250 2506
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2508 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text); 2509 $layout->set_markup ($text);
2254 2510
2255 ($layout->size)[1] 2511 $layout->size
2256} 2512}
2257 2513
2258sub reflow { 2514sub reflow {
2259 my ($self) = @_; 2515 my ($self) = @_;
2260 2516
2261 $self->{need_reflow}++; 2517 $self->{need_reflow}++;
2262 $self->update; 2518 $self->update;
2263} 2519}
2264 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
2265sub add_paragraph { 2536sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2537 my ($self, $color, $text, $indent) = @_;
2267 2538
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2539 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2540 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2541 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2542 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2543 }
2275 2544
2276 $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]);
2277 $self->{children}[1]->update;
2278} 2546}
2279 2547
2280sub update { 2548sub update {
2281 my ($self) = @_; 2549 my ($self) = @_;
2282 2550
… …
2285 return unless $self->{h} > 0; 2553 return unless $self->{h} > 0;
2286 2554
2287 delete $self->{texture}; 2555 delete $self->{texture};
2288 2556
2289 $ROOT->on_post_alloc ($self, sub { 2557 $ROOT->on_post_alloc ($self, sub {
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559
2290 if (delete $self->{need_reflow}) { 2560 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2561 my $height = 0;
2292 2562
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2563 my $layout = $self->{layout};
2564
2565 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566
2294 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 }
2295 2578
2296 $self->{height} = $height; 2579 $self->{height} = $height;
2297 2580
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2581 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update;
2300 2582
2301 delete $self->{texture}; 2583 delete $self->{texture};
2302 } 2584 }
2303 2585
2304 $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 {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2587 glClearColor 0, 0, 0, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2588 glClear GL_COLOR_BUFFER_BIT;
2307 2589
2308 my $top = int $self->{children}[1]{range}[0]; 2590 my $top = int $self->{children}[1]{range}[0];
2309 2591
2310 my $y0 = $top; 2592 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2593 my $y1 = $top + $H;
2312 2594
2313 my $y = 0; 2595 my $y = 0;
2314 2596
2315 my $layout = $self->{layout}; 2597 my $layout = $self->{layout};
2316 2598
2317 $layout->set_font ($self->{font}) if $self->{font}; 2599 $layout->set_font ($self->{font}) if $self->{font};
2318 2600
2319 glEnable GL_BLEND; 2601 glEnable GL_BLEND;
2602 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2604
2322 for my $par (@{$self->{par}}) { 2605 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2606 my $h = $par->[1];
2324 2607
2325 if ($y0 < $y + $h && $y < $y1) { 2608 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2609 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2610 $layout->set_width ($W - $par->[3]);
2328 $layout->set_markup ($par->[3]); 2611 $layout->set_markup ($par->[4]);
2329 2612
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2613 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2614
2332 glRasterPos $par->[2], $y - $y0; 2615 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2616 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2617 }
2335 2618
2336 $y += $h; 2619 $y += $h;
2337 } 2620 }
… …
2344sub _draw { 2627sub _draw {
2345 my ($self) = @_; 2628 my ($self) = @_;
2346 2629
2347 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2349 glColor 1, 1, 1, 1; 2632 glColor 0, 0, 0, 1;
2350 $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});
2351 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2352 2635
2353 $self->{children}[1]->draw; 2636 $self->{children}[1]->draw;
2354 2637
2355} 2638}
… …
2404 2687
2405sub new { 2688sub new {
2406 my $class = shift; 2689 my $class = shift;
2407 2690
2408 my $self = $class->SUPER::new ( 2691 my $self = $class->SUPER::new (
2409 state => 0, 2692 state => 0,
2410 connect_activate => \&toggle_flopper, 2693 on_activate => \&toggle_flopper,
2411 @_ 2694 @_
2412 ); 2695 );
2413 2696
2414 if ($self->{state}) {
2415 $self->{state} = 0;
2416 $self->toggle_flopper;
2417 }
2418
2419 $self 2697 $self
2420} 2698}
2421 2699
2422sub toggle_flopper { 2700sub toggle_flopper {
2423 my ($self) = @_; 2701 my ($self) = @_;
2424 2702
2425 # TODO: use animation 2703 $self->{other}->toggle_visibility;
2426 if ($self->{state} = !$self->{state}) {
2427 $CFClient::UI::ROOT->add ($self->{other});
2428 $self->{other}->move ($self->coord2global (0, $self->{h}));
2429 $self->emit ("open");
2430 } else {
2431 $CFClient::UI::ROOT->remove ($self->{other});
2432 $self->emit ("close");
2433 }
2434
2435 $self->emit (changed => $self->{state});
2436} 2704}
2437 2705
2438############################################################################# 2706#############################################################################
2439 2707
2440package CFClient::UI::Tooltip; 2708package CFClient::UI::Tooltip;
… …
2453} 2721}
2454 2722
2455sub set_tooltip_from { 2723sub set_tooltip_from {
2456 my ($self, $widget) = @_; 2724 my ($self, $widget) = @_;
2457 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
2458 $self->add (new CFClient::UI::Label 2735 $self->add (new CFClient::UI::Label
2459 markup => $widget->{tooltip}, 2736 markup => $tooltip,
2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461 fontsize => 0.8, 2738 fontsize => 0.8,
2462 fg => [0, 0, 0, 1], 2739 fg => [0, 0, 0, 1],
2463 ellipsise => 0, 2740 ellipsise => 0,
2464 font => ($widget->{tooltip_font} || $::FONT_PROP), 2741 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2475 2752
2476sub size_allocate { 2753sub size_allocate {
2477 my ($self, $w, $h) = @_; 2754 my ($self, $w, $h) = @_;
2478 2755
2479 $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 });
2480} 2775}
2481 2776
2482sub _draw { 2777sub _draw {
2483 my ($self) = @_; 2778 my ($self) = @_;
2484 2779
… …
2501 glVertex $w, $h; 2796 glVertex $w, $h;
2502 glVertex $w, 0; 2797 glVertex $w, 0;
2503 glEnd; 2798 glEnd;
2504 2799
2505 glTranslate 2 - 0.375, 2 - 0.375; 2800 glTranslate 2 - 0.375, 2 - 0.375;
2801
2506 $self->SUPER::_draw; 2802 $self->SUPER::_draw;
2507} 2803}
2508 2804
2509############################################################################# 2805#############################################################################
2510 2806
… …
2516 2812
2517sub new { 2813sub new {
2518 my $class = shift; 2814 my $class = shift;
2519 2815
2520 my $self = $class->SUPER::new ( 2816 my $self = $class->SUPER::new (
2521 aspect => 1, 2817 aspect => 1,
2818 can_events => 0,
2522 @_, 2819 @_,
2523 ); 2820 );
2524 2821
2525 if ($self->{anim} && $self->{animspeed}) { 2822 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self); 2823 Scalar::Util::weaken (my $widget = $self);
… …
2552} 2849}
2553 2850
2554sub _draw { 2851sub _draw {
2555 my ($self) = @_; 2852 my ($self) = @_;
2556 2853
2557 return unless $::CONN;#d# manage and cache textures differently 2854 return unless $::CONN;
2558 2855
2559 my $face; 2856 my $face;
2560 2857
2561 if ($self->{frame}) { 2858 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}]; 2859 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2568 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2569 2866
2570 if ($tex) { 2867 if ($tex) {
2571 glEnable GL_TEXTURE_2D; 2868 glEnable GL_TEXTURE_2D;
2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2573 glColor 1, 1, 1, 1; 2870 glColor 0, 0, 0, 1;
2574 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2575 glDisable GL_TEXTURE_2D; 2872 glDisable GL_TEXTURE_2D;
2576 } 2873 }
2577} 2874}
2578 2875
… …
2585 $self->SUPER::DESTROY; 2882 $self->SUPER::DESTROY;
2586} 2883}
2587 2884
2588############################################################################# 2885#############################################################################
2589 2886
2590package CFClient::UI::InventoryItem; 2887package CFClient::UI::Buttonbar;
2591 2888
2592our @ISA = CFClient::UI::HBox::; 2889our @ISA = CFClient::UI::HBox::;
2593 2890
2594sub _item_to_desc { 2891# TODO: should actualyl wrap buttons and other goodies.
2595 my ($item) = @_;
2596
2597 my $desc =
2598 $item->{nrof} < 2
2599 ? $item->{name}
2600 : "$item->{nrof} × $item->{name_pl}";
2601
2602 $item->{flags} & Crossfire::Protocol::F_OPEN
2603 and $desc .= " (open)";
2604 $item->{flags} & Crossfire::Protocol::F_APPLIED
2605 and $desc .= " (applied)";
2606 $item->{flags} & Crossfire::Protocol::F_UNPAID
2607 and $desc .= " (unpaid)";
2608 $item->{flags} & Crossfire::Protocol::F_MAGIC
2609 and $desc .= " (magic)";
2610 $item->{flags} & Crossfire::Protocol::F_CURSED
2611 and $desc .= " (cursed)";
2612 $item->{flags} & Crossfire::Protocol::F_DAMNED
2613 and $desc .= " (damned)";
2614 $item->{flags} & Crossfire::Protocol::F_LOCKED
2615 and $desc .= " *";
2616
2617 $desc
2618}
2619
2620sub new {
2621 my $class = shift;
2622
2623 my %args = @_;
2624
2625 my $item = delete $args{item};
2626
2627 my $desc = _item_to_desc ($item);
2628
2629 my $self = $class->SUPER::new (
2630 can_hover => 1,
2631 can_events => 1,
2632 tooltip => ((CFClient::UI::Label::escape $desc)
2633 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2634 connect_button_down => sub {
2635 my ($self, $ev, $x, $y) = @_;
2636
2637 # todo: maybe put examine on 1? but should just be a tooltip :(
2638 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag};
2640
2641 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT;
2643 }
2644
2645 $::CONN->send ("move $targ $item->{tag} 0");
2646 } elsif ($ev->{button} == 1) {
2647 $::CONN->send ("examine $item->{tag}");
2648 } elsif ($ev->{button} == 2) {
2649 $::CONN->send ("apply $item->{tag}");
2650 } elsif ($ev->{button} == 3) {
2651 my @menu_items = (
2652 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2653 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2654 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2655 (
2656 $item->{flags} & Crossfire::Protocol::F_LOCKED
2657 ? (
2658 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2659 )
2660 : (
2661 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2662 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2663 )
2664 ),
2665 );
2666
2667 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2668 }
2669
2670 1
2671 },
2672 %args
2673 );
2674
2675
2676 $self->add (new CFClient::UI::Face
2677 can_events => 0,
2678 face => $item->{face},
2679 anim => $item->{anim},
2680 animspeed => $item->{animspeed},
2681 );
2682
2683 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2684
2685 $self->{item} = $item;
2686
2687 $self->update_item;
2688
2689 $self
2690}
2691
2692sub update_item {
2693 my ($self) = @_;
2694
2695 my $desc = _item_to_desc ($self->{item});
2696
2697 $self->{name_lbl}->set_text ($desc);
2698}
2699
2700#############################################################################
2701
2702package CFClient::UI::Inventory;
2703
2704our @ISA = CFClient::UI::ScrolledWindow::;
2705
2706sub new {
2707 my $class = shift;
2708
2709 my $self = $class->SUPER::new (
2710 scrolled => (new CFClient::UI::Table),
2711 @_,
2712 );
2713
2714 $self
2715}
2716
2717sub set_items {
2718 my ($self, $items) = @_;
2719
2720 $self->{scrolled}->clear;
2721 return unless $items;
2722
2723 my @items = sort {
2724 ($a->{type} <=> $b->{type})
2725 or ($a->{name} cmp $b->{name})
2726 } @$items;
2727
2728 $self->{real_items} = \@items;
2729
2730 for my $item (@items) {
2731 $item->{item} = $item;
2732 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2733 $item->update_item ();
2734 }
2735
2736 my $i = 0;
2737 for (@items) {
2738 $self->{scrolled}->add (0, $i, $_);
2739 my $nrof = $_->{item}->{nrof} || 1;
2740 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2741 }
2742
2743# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2744}
2745
2746sub size_request {
2747 my ($self) = @_;
2748 ($self->{req_w}, $self->{req_h});
2749}
2750 2892
2751############################################################################# 2893#############################################################################
2752 2894
2753package CFClient::UI::Menu; 2895package CFClient::UI::Menu;
2754 2896
… …
2788 2930
2789# 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)
2790sub popup { 2932sub popup {
2791 my ($self, $ev) = @_; 2933 my ($self, $ev) = @_;
2792 2934
2793 $self->emit ("popdown"); 2935 $self->_emit ("popdown");
2794 2936
2795 # maybe save $GRAB? must be careful about events... 2937 # maybe save $GRAB? must be careful about events...
2796 $GRAB = $self; 2938 $GRAB = $self;
2797 $self->{button} = $ev->{button}; 2939 $self->{button} = $ev->{button};
2798 2940
2799 $self->show; 2941 $self->show;
2800 $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);
2801} 2943}
2802 2944
2803sub mouse_motion { 2945sub mouse_motion {
2804 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2805 2947
2806 # TODO: should use vbox->find_widget or so 2948 # TODO: should use vbox->find_widget or so
2807 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2808 $self->{hover} = $self->{item}{$HOVER}; 2950 $self->{hover} = $self->{item}{$HOVER};
2951
2952 0
2809} 2953}
2810 2954
2811sub button_up { 2955sub button_up {
2812 my ($self, $ev, $x, $y) = @_; 2956 my ($self, $ev, $x, $y) = @_;
2813 2957
2814 if ($ev->{button} == $self->{button}) { 2958 if ($ev->{button} == $self->{button}) {
2815 undef $GRAB; 2959 undef $GRAB;
2816 $self->hide; 2960 $self->hide;
2817 2961
2818 $self->emit ("popdown"); 2962 $self->_emit ("popdown");
2819 $self->{hover}[1]->() if $self->{hover}; 2963 $self->{hover}[1]->() if $self->{hover};
2964 } else {
2965 return 0
2966 }
2967
2820 } 2968 1
2821} 2969}
2822 2970
2823############################################################################# 2971#############################################################################
2824 2972
2825package CFClient::UI::Statusbox; 2973package CFClient::UI::Multiplexer;
2826 2974
2827our @ISA = CFClient::UI::VBox::; 2975our @ISA = CFClient::UI::Container::;
2828 2976
2829sub new { 2977sub new {
2830 my $class = shift; 2978 my $class = shift;
2831 2979
2832 $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 (
2833 fontsize => 0.8, 3089 fontsize => 0.8,
2834 @_, 3090 @_,
2835 ) 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
2836} 3098}
2837 3099
2838sub reorder { 3100sub reorder {
2839 my ($self) = @_; 3101 my ($self) = @_;
2840 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} };
2841 3108
2842 while (my ($k, $v) = each %{ $self->{item} }) { 3109 while (my ($k, $v) = each %{ $self->{item} }) {
2843 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3110 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2844 } 3111 }
2845 3112
… …
2848 my @items = sort { 3115 my @items = sort {
2849 $a->{pri} <=> $b->{pri} 3116 $a->{pri} <=> $b->{pri}
2850 or $b->{id} <=> $a->{id} 3117 or $b->{id} <=> $a->{id}
2851 } values %{ $self->{item} }; 3118 } values %{ $self->{item} };
2852 3119
3120 $self->{timer}->interval (1);
3121
2853 my $count = 10 + 1; 3122 my $count = 10 + 1;
2854 for my $item (@items) { 3123 for my $item (@items) {
2855 last unless --$count; 3124 last unless --$count;
2856 3125
2857 push @widgets, $item->{label} ||= do { 3126 my $label = $item->{label} ||= do {
2858 # TODO: doesn't handle markup well (read as: at all) 3127 # TODO: doesn't handle markup well (read as: at all)
2859 my $short = $item->{count} > 1 3128 my $short = $item->{count} > 1
2860 ? "<b>$item->{count} ×</b> $item->{text}" 3129 ? "<b>$item->{count} ×</b> $item->{text}"
2861 : $item->{text}; 3130 : $item->{text};
2862 3131
… …
2870 tooltip => $item->{tooltip}, 3139 tooltip => $item->{tooltip},
2871 tooltip_font => $::FONT_PROP, 3140 tooltip_font => $::FONT_PROP,
2872 tooltip_width => 0.67, 3141 tooltip_width => 0.67,
2873 fontsize => $item->{fontsize} || $self->{fontsize}, 3142 fontsize => $item->{fontsize} || $self->{fontsize},
2874 max_w => $::WIDTH * 0.44, 3143 max_w => $::WIDTH * 0.44,
2875 fg => $item->{fg}, 3144 fg => [@{ $item->{fg} }],
2876 can_events => 1, 3145 can_events => 1,
2877 can_hover => 1 3146 can_hover => 1
2878 }; 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;
2879 } 3160 }
2880 3161
2881 $self->clear; 3162 $self->clear;
2882 $self->SUPER::add (reverse @widgets); 3163 $self->SUPER::add (reverse @widgets);
2883} 3164}
… …
2886 my ($self, $text, %arg) = @_; 3167 my ($self, $text, %arg) = @_;
2887 3168
2888 $text =~ s/^\s+//; 3169 $text =~ s/^\s+//;
2889 $text =~ s/\s+$//; 3170 $text =~ s/\s+$//;
2890 3171
3172 return unless $text;
3173
2891 my $timeout = time + ((delete $arg{timeout}) || 60); 3174 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2892 3175
2893 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3176 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2894 3177
2895 if (my $item = $self->{item}{$group}) { 3178 if (my $item = $self->{item}{$group}) {
2896 if ($item->{text} eq $text) { 3179 if ($item->{text} eq $text) {
… …
2926 3209
2927 $self->reorder; 3210 $self->reorder;
2928 $self->SUPER::reconfigure; 3211 $self->SUPER::reconfigure;
2929} 3212}
2930 3213
3214sub DESTROY {
3215 my ($self) = @_;
3216
3217 $self->{timer}->cancel;
3218
3219 $self->SUPER::DESTROY;
3220}
3221
2931############################################################################# 3222#############################################################################
2932 3223
2933package CFClient::UI::Root; 3224package CFClient::UI::Inventory;
2934 3225
2935our @ISA = CFClient::UI::Container::; 3226our @ISA = CFClient::UI::ScrolledWindow::;
2936
2937use CFClient::OpenGL;
2938 3227
2939sub new { 3228sub new {
2940 my $class = shift; 3229 my $class = shift;
2941 3230
2942 $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 => [],
2943 @_, 3473 @_,
2944 ) 3474 )
2945} 3475}
2946 3476
2947sub configure { 3477# XXX: Do sorting? Argl...
2948 my ($self, $x, $y, $w, $h) = @_; 3478sub add_spell {
2949
2950 $self->{w} = $w;
2951 $self->{h} = $h;
2952}
2953
2954sub check_size {
2955 my ($self) = @_; 3479 my ($self, $spell) = @_;
3480 $self->{spells}->{$spell->{name}} = $spell;
2956 3481
2957 $self->size_allocate ($self->{w}, $self->{h}) 3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2958 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
2959} 3538}
2960 3539
2961sub size_request { 3540sub size_request {
2962 my ($self) = @_; 3541 my ($self) = @_;
2963 3542
2964 ($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
2965} 3558}
2966 3559
2967sub size_allocate { 3560sub size_allocate {
2968 my ($self, $w, $h) = @_; 3561 my ($self, $w, $h) = @_;
2969 3562
2970 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2971 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2972
2973 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2974 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2975
2976 for my $child ($self->children) { 3563 for my $child ($self->children) {
2977 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)};
2978 3565
2979 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3566 $X = $child->{force_x} if exists $child->{force_x};
2980 if exists $child->{req_x}; 3567 $Y = $child->{force_y} if exists $child->{force_y};
2981 3568
2982 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3569 $X = _to_pixel $X, $W, $self->{w};
2983 if exists $child->{req_y}; 3570 $Y = _to_pixel $Y, $H, $self->{h};
2984
2985 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2986 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2987 3571
2988 $child->configure ($X, $Y, $W, $H); 3572 $child->configure ($X, $Y, $W, $H);
2989 } 3573 }
2990} 3574}
2991 3575
… …
3002} 3586}
3003 3587
3004sub update { 3588sub update {
3005 my ($self) = @_; 3589 my ($self) = @_;
3006 3590
3007 $self->check_size;
3008 $::WANT_REFRESH++; 3591 $::WANT_REFRESH++;
3009} 3592}
3010 3593
3011sub add { 3594sub add {
3012 my ($self, @children) = @_; 3595 my ($self, @children) = @_;
3013 3596
3014 for my $child (@children) {
3015 $child->{toplevel} = 1; 3597 $_->{is_toplevel} = 1
3016 3598 for @children;
3017 # integerise window positions
3018 $child->{x} = int $child->{x};
3019 $child->{y} = int $child->{y};
3020 }
3021 3599
3022 $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;
3023 3610
3024 while (@children) { 3611 while (@children) {
3025 my $w = pop @children; 3612 my $w = pop @children;
3026 push @children, $w->children; 3613 push @children, $w->children;
3027 $w->{visible} = 1; 3614 $w->set_invisible;
3028 }
3029}
3030
3031sub remove {
3032 my ($self, @children) = @_;
3033
3034 $self->SUPER::remove (@children);
3035
3036 while (@children) {
3037 my $w = pop @children;
3038 push @children, $w->children;
3039 delete $w->{visible};
3040 } 3615 }
3041} 3616}
3042 3617
3043sub on_refresh { 3618sub on_refresh {
3044 my ($self, $id, $cb) = @_; 3619 my ($self, $id, $cb) = @_;
… …
3058 while ($self->{refresh_hook}) { 3633 while ($self->{refresh_hook}) {
3059 $_->() 3634 $_->()
3060 for values %{delete $self->{refresh_hook}}; 3635 for values %{delete $self->{refresh_hook}};
3061 } 3636 }
3062 3637
3063 if ($self->{check_size}) { 3638 if ($self->{realloc}) {
3064 my @queue = ([], []); 3639 my %queue;
3640 my @queue;
3641 my $widget;
3065 3642
3066 for (;;) { 3643 outer:
3067 if ($self->{check_size}) { 3644 while () {
3068 # heuristic: check containers last 3645 if (my $realloc = delete $self->{realloc}) {
3069 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3646 for $widget (values %$realloc) {
3070 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 }
3071 } 3653 }
3072 3654
3073 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3655 while () {
3656 @queue or last outer;
3074 3657
3075 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3658 $widget = pop @{ $queue[-1] || [] }
3076 ? @$widget{qw(user_w user_h)} 3659 and last;
3077 : $widget->size_request;
3078
3079 if (delete $widget->{force_alloc}
3080 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3081 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3082 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}) {
3083 $widget->{req_w} = $w; 3679 $widget->{req_w} = $w;
3084 $widget->{req_h} = $h; 3680 $widget->{req_h} = $h;
3085 3681
3086 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3682 $self->{size_alloc}{$widget+0} = $widget;
3087 3683
3088 $widget->{parent}->check_size
3089 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 }
3090 } 3691 }
3692
3693 delete $self->{realloc}{$widget+0};
3091 } 3694 }
3092 } 3695 }
3093 3696
3094 while ($self->{size_alloc}) { 3697 while (my $size_alloc = delete $self->{size_alloc}) {
3095 for (values %{delete $self->{size_alloc}}) { 3698 my @queue = sort { $b->{visible} <=> $a->{visible} }
3096 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)};
3097 3705
3098 $w = 0 if $w < 0; 3706 $w = 0 if $w < 0;
3099 $h = 0 if $h < 0; 3707 $h = 0 if $h < 0;
3100 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
3101 $widget->{w} = $w; 3716 $widget->{w} = $w;
3102 $widget->{h} = $h; 3717 $widget->{h} = $h;
3103 $widget->size_allocate ($w, $h); 3718
3104 $widget->emit (size_allocate => $w, $h); 3719 $widget->emit (size_allocate => $w, $h);
3720 }
3105 } 3721 }
3106 } 3722 }
3107 3723
3108 while ($self->{post_alloc_hook}) { 3724 while ($self->{post_alloc_hook}) {
3109 $_->() 3725 $_->()
3110 for values %{delete $self->{post_alloc_hook}}; 3726 for values %{delete $self->{post_alloc_hook}};
3111 } 3727 }
3728
3112 3729
3113 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3730 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3114 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3731 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3115 glClear GL_COLOR_BUFFER_BIT; 3732 glClear GL_COLOR_BUFFER_BIT;
3116 3733
… …
3118 glLoadIdentity; 3735 glLoadIdentity;
3119 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3736 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3120 glMatrixMode GL_MODELVIEW; 3737 glMatrixMode GL_MODELVIEW;
3121 glLoadIdentity; 3738 glLoadIdentity;
3122 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
3123 $self->_draw; 3747 $self->_draw;
3124} 3748}
3125 3749
3126############################################################################# 3750#############################################################################
3127 3751

Diff Legend

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