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

Diff Legend

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