ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.224 by elmex, Tue May 23 20:00:55 2006 UTC vs.
Revision 1.304 by elmex, Tue Jun 13 11:01:04 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $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 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
102 118
103 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
104 } 120 }
105} 121}
106 122
107sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
108 my ($ev) = @_; 124 my ($ev) = @_;
… …
114 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
115 131
116 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 $TOOLTIP_WATCHER->start;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
144 158
145 $_->update 159 $_->update
146 for @widgets; 160 for @widgets;
147} 161}
148 162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
149# call when resolution changes etc. 171# call when resolution changes etc.
150sub rescale_widgets { 172sub rescale_widgets {
151 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
152 174
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
166 } 190 }
167
168 $widget->reconfigure;
169 } 191 }
192
193 reconfigure_widgets;
170} 194}
171 195
172############################################################################# 196#############################################################################
173 197
174package CFClient::UI::Base; 198package CFClient::UI::Base;
… …
179 203
180sub new { 204sub new {
181 my $class = shift; 205 my $class = shift;
182 206
183 my $self = bless { 207 my $self = bless {
184 x => 0, 208 x => "center",
185 y => 0, 209 y => "center",
186 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
187 can_events => 1, 213 can_events => 1,
188 @_ 214 @_
189 }, $class; 215 }, $class;
190 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
191 for (keys %$self) { 219 for (keys %$self) {
192 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
194 } 222 }
195 } 223 }
196 224
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
198 236
199 $self 237 $self
200} 238}
201 239
202sub destroy { 240sub destroy {
… …
206 %$self = (); 244 %$self = ();
207} 245}
208 246
209sub show { 247sub show {
210 my ($self) = @_; 248 my ($self) = @_;
249
211 return if $self->{parent}; 250 return if $self->{parent};
212 251
213 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
214} 253}
215 254
216sub show_centered { 255sub set_visible {
217 my ($self) = @_; 256 my ($self) = @_;
257
218 return if $self->{parent}; 258 return if $self->{visible};
219 259
220 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
221 262
222 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228 264
229sub hide { 265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
230 my ($self) = @_; 271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
278 delete $self->{root};
231 279
232 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
234 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
306}
307
308sub hide {
309 my ($self) = @_;
310
311 $self->set_invisible;
312
235 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
236 if $self->{parent}; 314 if $self->{parent};
237} 315}
238 316
239sub move { 317sub move_abs {
240 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
241 319
242 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
243 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
244 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
245 323
246 $self->update; 324 $self->update;
247} 325}
248 326
249sub set_size { 327sub set_size {
250 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
251 329
252 $self->{user_w} = $w; 330 $self->{force_w} = $w;
253 $self->{user_h} = $h; 331 $self->{force_h} = $h;
254 332
255 $self->check_size; 333 $self->realloc;
256} 334}
257 335
258sub size_request { 336sub size_request {
259 require Carp; 337 require Carp;
260 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
262 340
263sub configure { 341sub configure {
264 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
265 343
266 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
267 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
268 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
269 349
270 # use alignment to adjust x, y 350 # use alignment to adjust x, y
271 351
272 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
273 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
274
275 ($w, $h) = ($w2, $h2);
276 } 354 }
277 355
278 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
279 $self->{x} = $x; 357 $self->{x} = $x;
280 $self->{y} = $y; 358 $self->{y} = $y;
281 $self->update; 359 $self->update;
282 } 360 }
283 361
284 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 return unless $self->{visible};
364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
368 $self->{root}{size_alloc}{$self+0} = $self;
286 } 369 }
287} 370}
288 371
289sub size_allocate { 372sub size_allocate {
290 # nothing to be done 373 # nothing to be done
291} 374}
292 375
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
300sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
301} 382}
302 383
303sub set_max_size { 384sub set_max_size {
304 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
305 386
306 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
308} 391}
309 392
310sub set_tooltip { 393sub set_tooltip {
311 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
312 395
396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
313 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
314 402
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
318 } 406 }
319} 407}
320 408
321# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
322sub coord2local { 410sub coord2local {
… …
338 return if $FOCUS == $self; 426 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
340 428
341 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
342 430
343 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
344 432
345 $focus->update if $focus; 433 $focus->update if $focus;
346 $FOCUS->update; 434 $FOCUS->update;
347} 435}
348 436
… …
351 439
352 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
353 441
354 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
355 443
356 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
357 445
358 $focus->update if $focus; #? 446 $focus->update if $focus; #?
359}
360 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
361sub mouse_motion { } 452sub mouse_motion { 0 }
362sub button_up { } 453sub button_up { 0 }
363sub key_down { } 454sub key_down { 0 }
364sub key_up { } 455sub key_up { 0 }
365 456
366sub button_down { 457sub button_down {
367 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
368 459
369 $self->focus_in; 460 $self->focus_in;
370}
371 461
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
376sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
377 538
378sub draw { 539sub draw {
379 my ($self) = @_; 540 my ($self) = @_;
380 541
381 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
382 553
383 glPushMatrix; 554 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw;
386 glPopMatrix;
387 556
388 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
389 my ($x, $y) = @$self{qw(x y)};
390
391 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
392 glEnable GL_BLEND; 559 glEnable GL_BLEND;
393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
394 glBegin GL_QUADS; 561 glBegin GL_QUADS;
395 glVertex $x , $y;
396 glVertex $x + $self->{w}, $y;
397 glVertex $x + $self->{w}, $y + $self->{h};
398 glVertex $x , $y + $self->{h};
399 glEnd;
400 glDisable GL_BLEND;
401 }
402
403 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix;
405 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 562 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
410 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
411 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
412 glEnd; 566 glEnd;
567 glDisable GL_BLEND;
568 }
569
570 if ($ENV{CFPLUS_DEBUG} & 1) {
571 glPushMatrix;
572 glColor 1, 1, 0, 1;
573 glTranslate 0.375, 0.375;
574 glBegin GL_LINE_LOOP;
575 glVertex 0 , 0;
576 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1;
579 glEnd;
413 glPopMatrix; 580 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
416} 586}
417 587
418sub _draw { 588sub _draw {
419 my ($self) = @_; 589 my ($self) = @_;
420 590
421 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
422} 592}
423 593
424sub find_widget {
425 my ($self, $x, $y) = @_;
426
427 return () unless $self->{can_events};
428
429 return $self
430 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433 ()
434}
435
436sub set_parent {
437 my ($self, $parent) = @_;
438
439 Scalar::Util::weaken ($self->{parent} = $parent);
440
441 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size
443 unless exists $self->{req_w};
444
445 $self->show;
446}
447
448sub check_size {
449 my ($self, $forced) = @_;
450
451 $self->{force_alloc} = 1 if $forced;
452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
453}
454
455sub update {
456 my ($self) = @_;
457
458 $self->{parent}->update
459 if $self->{parent};
460}
461
462sub connect {
463 my ($self, $signal, $cb) = @_;
464
465 push @{ $self->{signal_cb}{$signal} }, $cb;
466}
467
468sub emit {
469 my ($self, $signal, @args) = @_;
470
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472}
473
474sub DESTROY { 594sub DESTROY {
475 my ($self) = @_; 595 my ($self) = @_;
476 596
477 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
478 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
479} 601}
480 602
481############################################################################# 603#############################################################################
482 604
483package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
508 630
509 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
510 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
511 633
512 glEnable GL_BLEND; 634 glEnable GL_BLEND;
513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
514 glColor @$color; 636 glColor_premultiply @$color;
515 637
516 glBegin GL_QUADS; 638 glBegin GL_QUADS;
517 glVertex 0 , 0; 639 glVertex 0 , 0;
518 glVertex 0 , $h; 640 glVertex 0 , $h;
519 glVertex $w, $h; 641 glVertex $w, $h;
… …
534 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
536} 658}
537 659
538sub size_request { 660sub size_request {
539 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
540} 664}
541 665
542sub draw { } 666sub draw { }
543 667
544############################################################################# 668#############################################################################
… …
548our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
549 673
550sub new { 674sub new {
551 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
552 676
553 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
554 678
555 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
556 children => [], 680 children => [],
557 can_events => 0, 681 can_events => 0,
558 %arg, 682 %arg,
559 ); 683 );
684
560 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
561 687
562 $self 688 $self
563} 689}
564 690
565sub add { 691sub add {
… …
573 $self->{children} = [ 699 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
576 ]; 702 ];
577 703
578 $self->check_size (1); 704 $self->realloc;
579 $self->update;
580} 705}
581 706
582sub children { 707sub children {
583 @{ $_[0]{children} } 708 @{ $_[0]{children} }
584} 709}
… …
589 delete $child->{parent}; 714 delete $child->{parent};
590 $child->hide; 715 $child->hide;
591 716
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 718
594 $self->check_size; 719 $self->realloc;
595 $self->update;
596} 720}
597 721
598sub clear { 722sub clear {
599 my ($self) = @_; 723 my ($self) = @_;
600 724
… …
604 for (@$children) { 728 for (@$children) {
605 delete $_->{parent}; 729 delete $_->{parent};
606 $_->hide; 730 $_->hide;
607 } 731 }
608 732
609 $self->check_size; 733 $self->realloc;
610 $self->update;
611} 734}
612 735
613sub find_widget { 736sub find_widget {
614 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
615 738
616 $x -= $self->{x}; 739 $x -= $self->{x};
617 $y -= $self->{y}; 740 $y -= $self->{y};
618 741
619 my $res; 742 my $res;
620 743
621 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
622 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
623 and return $res; 746 and return $res;
624 } 747 }
625 748
626 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
647} 770}
648 771
649sub add { 772sub add {
650 my ($self, $child) = @_; 773 my ($self, $child) = @_;
651 774
652 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
653
654 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
655} 777}
656 778
657sub remove { 779sub remove {
658 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
675 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
676} 798}
677 799
678############################################################################# 800#############################################################################
679 801
802# back-buffered drawing area
803
680package CFClient::UI::Window; 804package CFClient::UI::Window;
681 805
682our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
683 807
684use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
702 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 827 $self->update;
704} 828}
705 829
706sub _render { 830sub _render {
831 my ($self) = @_;
832
707 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
708} 834}
709 835
710sub render_child { 836sub render_child {
711 my ($self) = @_; 837 my ($self) = @_;
712 838
713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
716 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
717 $self->_render; 850 $self->_render;
718 }; 851 };
719} 852}
720 853
721sub _draw { 854sub _draw {
722 my ($self) = @_; 855 my ($self) = @_;
723 856
724 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
725 858
726 my $tex = $self->{texture} 859 my $tex = $self->{texture}
727 or return; 860 or return;
728 861
729 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
731 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
732 865
733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
734 867
735 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
736} 869}
… …
739 872
740package CFClient::UI::ViewPort; 873package CFClient::UI::ViewPort;
741 874
742our @ISA = CFClient::UI::Window::; 875our @ISA = CFClient::UI::Window::;
743 876
877sub new {
878 my $class = shift;
879
880 $class->SUPER::new (
881 scroll_x => 0,
882 scroll_y => 1,
883 @_,
884 )
885}
886
744sub size_request { 887sub size_request {
745 my ($self) = @_; 888 my ($self) = @_;
746 889
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 891
750 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
751} 896}
752 897
753sub size_allocate { 898sub size_allocate {
754 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
755 900
901 my $child = $self->child;
902
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905
906 $self->child->configure (0, 0, $w, $h);
756 $self->update; 907 $self->update;
757} 908}
758 909
759sub set_offset { 910sub set_offset {
760 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
… …
794} 945}
795 946
796sub _render { 947sub _render {
797 my ($self) = @_; 948 my ($self) = @_;
798 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
799 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
800 954
801 $self->SUPER::_render; 955 $self->SUPER::_render;
802} 956}
803 957
… …
806package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
807 961
808our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
809 963
810sub new { 964sub new {
811 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
812 968
813 my $self; 969 my $self;
814 970
815 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
816 vertical => 1, 972 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub { 974 on_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 975 $self->{vp}->set_offset (0, $_[1]);
820 }, 976 },
821 ; 977 ;
822 978
823 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
824 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
825 slider => $slider, 981 slider => $slider,
826 @_, 982 %arg,
827 ); 983 );
828 984
829 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp});
831 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
832 987
833 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
995}
996
997sub update {
998 my ($self) = @_;
999
1000 $self->SUPER::update;
1001
1002 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005}
1006
1007sub size_allocate {
1008 my ($self, $w, $h) = @_;
1009
1010 $self->SUPER::size_allocate ($w, $h);
1011
1012 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
834} 1014}
835 1015
836#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll 1017# update viewport offset on scroll
838 1018
… …
858 1038
859 if ($self->{bg}) { 1039 if ($self->{bg}) {
860 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
861 1041
862 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
863 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
864 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
865 1045
866 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
867 glVertex 0 , 0; 1047 glVertex 0 , 0;
868 glVertex 0 , $h; 1048 glVertex 0 , $h;
869 glVertex $w, $h; 1049 glVertex $w, $h;
… …
882 1062
883our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
884 1064
885use CFClient::OpenGL; 1065use CFClient::OpenGL;
886 1066
887my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
888 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
889 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
890 1074
891sub new { 1075sub new {
892 my $class = shift; 1076 my ($class, %arg) = @_;
893
894 # TODO: user_x, user_y, overwrite moveto?
895 1077
896 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
897 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
898 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
899 border => 0.6, 1081 border => 0.6,
900 toplevel => 1,
901 can_events => 1, 1082 can_events => 1,
902 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
903 ); 1086 );
904 1087
905 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
906 align => 0, 1089 align => 0,
907 valign => 1, 1090 valign => 1,
908 text => $self->{title}, 1091 text => $self->{title},
909 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1094
1095 unless ($self->{no_close_button}) {
1096 $self->{close_btn} =
1097 new CFClient::UI::ImageButton
1098 image => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_btn});
1102 }
910 1103
911 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
912} 1113}
913 1114
914sub border { 1115sub border {
915 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
916} 1117}
917 1118
918sub size_request { 1119sub size_request {
919 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_btn}->size_request
1126 if $self->{close_btn};
920 1127
921 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
922 1129
923 ( 1130 (
924 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
927} 1134}
928 1135
929sub size_allocate { 1136sub size_allocate {
930 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
931 1138
1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h);
1143 }
1144
1145 my $border = $self->border;
1146
932 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
933 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
934 1149
935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
936 if $self->{title};
937
938 $self->child->configure ($self->border, $self->border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1151
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)
1153 if $self->{close_btn};
939} 1154}
940 1155
941sub button_down { 1156sub button_down {
942 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
943 1158
… …
959 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
960 1175
961 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
963 1178
964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1181
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
967 $self->check_size; 1183 $self->realloc;
968 }; 1184 };
969 1185
970 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
971 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
972 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
974 $self->{motion} = sub { 1190 $self->{motion} = sub {
975 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
976 1192
977 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
978 1194
979 $self->move ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
980 $self->update; 1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
981 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
982 } 1203 1
983} 1204}
984 1205
985sub button_up { 1206sub button_up {
986 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
987 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
988 delete $self->{motion}; 1212 !!delete $self->{motion}
989} 1213}
990 1214
991sub mouse_motion { 1215sub mouse_motion {
992 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
993 1217
994 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
995} 1221}
996 1222
997sub _draw { 1223sub _draw {
998 my ($self) = @_; 1224 my ($self) = @_;
999 1225
1226 my $child = $self->{children}[0];
1227
1000 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
1001 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
1002 1230
1003 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1005 1233
1006 my $border = $self->border; 1234 my $border = $self->border;
1007 1235
1008 glColor @{ $self->{border_bg} }; 1236 glColor @{ $self->{border_bg} };
1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1237 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1013 1241
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1015 my $bg = $tex[0]; 1243 glColor @{ $self->{bg} };
1016 1244
1017 # TODO: repeat texture not scale 1245 # TODO: repeat texture not scale
1246 # solve this better(?)
1018 my $rep_x = $cw / $bg->{w}; 1247 $bg->{s} = $cw / $bg->{w};
1019 my $rep_y = $ch / $bg->{h}; 1248 $bg->{t} = $ch / $bg->{h};
1020
1021 glColor @{ $self->{bg} };
1022
1023 $bg->{s} = $rep_x;
1024 $bg->{t} = $rep_y;
1025 $bg->{wrap_mode} = 1;
1026 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 } 1250 }
1028 1251
1029 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1030 1253
1031 $self->{title}->draw if $self->{title};
1032
1033 $self->child->draw; 1254 $child->draw;
1255
1256 if ($self->{title_widget}) {
1257 glTranslate 0, $border - $self->{h};
1258 $self->{title_widget}->_draw;
1259
1260 glTranslate 0, - ($border - $self->{h});
1261 }
1262
1263 $self->{close_btn}->draw
1264 if $self->{close_btn};
1034} 1265}
1035 1266
1036############################################################################# 1267#############################################################################
1037 1268
1038package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1046sub new { 1277sub new {
1047 my $class = shift; 1278 my $class = shift;
1048 1279
1049 $class->SUPER::new ( 1280 $class->SUPER::new (
1050 col_expand => [], 1281 col_expand => [],
1051 @_ 1282 @_,
1052 ) 1283 )
1284}
1285
1286sub children {
1287 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053} 1288}
1054 1289
1055sub add { 1290sub add {
1056 my ($self, $x, $y, $child) = @_; 1291 my ($self, $x, $y, $child) = @_;
1057 1292
1058 $child->set_parent ($self); 1293 $child->set_parent ($self);
1059 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1060 1295
1061 $child->check_size; 1296 $self->realloc;
1062} 1297}
1063 1298
1064sub children { 1299sub remove {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1300 my ($self, $child) = @_;
1066}
1067 1301
1302 # TODO: not yet implemented
1303}
1304
1068# TODO: move to container class maybe? send childs a signal on removal? 1305# TODO: move to container class maybe? send children a signal on removal?
1069sub clear { 1306sub clear {
1070 my ($self) = @_; 1307 my ($self) = @_;
1071 1308
1072 my @children = $self->children; 1309 my @children = $self->children;
1073 delete $self->{children}; 1310 delete $self->{children};
… …
1075 for (@children) { 1312 for (@children) {
1076 delete $_->{parent}; 1313 delete $_->{parent};
1077 $_->hide; 1314 $_->hide;
1078 } 1315 }
1079 1316
1080 $self->update; 1317 $self->realloc;
1081} 1318}
1082 1319
1083sub get_wh { 1320sub get_wh {
1084 my ($self) = @_; 1321 my ($self) = @_;
1085 1322
… …
1116sub size_allocate { 1353sub size_allocate {
1117 my ($self, $w, $h) = @_; 1354 my ($self, $w, $h) = @_;
1118 1355
1119 my ($ws, $hs) = $self->get_wh; 1356 my ($ws, $hs) = $self->get_wh;
1120 1357
1121 my $req_w = sum @$ws; 1358 my $req_w = (sum @$ws) || 1;
1122 my $req_h = sum @$hs; 1359 my $req_h = (sum @$hs) || 1;
1123 1360
1124 # TODO: nicer code && do row_expand 1361 # TODO: nicer code && do row_expand
1125 my @col_expand = @{$self->{col_expand}}; 1362 my @col_expand = @{$self->{col_expand}};
1126 @col_expand = (1) x @$ws unless @col_expand; 1363 @col_expand = (1) x @$ws unless @col_expand;
1127 my $col_expand = (sum @col_expand) || 1; 1364 my $col_expand = (sum @col_expand) || 1;
… …
1181 } 1418 }
1182} 1419}
1183 1420
1184############################################################################# 1421#############################################################################
1185 1422
1186package CFClient::UI::HBox; 1423package CFClient::UI::Box;
1187
1188# TODO: wrap into common Box base class
1189 1424
1190our @ISA = CFClient::UI::Container::; 1425our @ISA = CFClient::UI::Container::;
1191 1426
1192sub size_request { 1427sub size_request {
1193 my ($self) = @_; 1428 my ($self) = @_;
1194 1429
1195 my @alloc = map [$_->size_request], @{$self->{children}}; 1430 $self->{vertical}
1196 1431 ? (
1197 ( 1432 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1198 (List::Util::sum map $_->[0], @alloc), 1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1199 (List::Util::max map $_->[1], @alloc), 1434 )
1200 ) 1435 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 )
1201} 1439}
1202 1440
1203sub size_allocate { 1441sub size_allocate {
1204 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1205 1443
1206 ($h, $w) = ($w, $h); 1444 my $space = $self->{vertical} ? $h : $w;
1207
1208 my $children = $self->{children}; 1445 my $children = $self->{children};
1209 1446
1210 my @h = map $_->{req_w}, @$children; 1447 my @req;
1211 1448
1212 my $req_h = List::Util::sum @h; 1449 if ($self->{homogeneous}) {
1213 1450 @req = ($space / (@$children || 1)) x @$children;
1214 if ($req_h > $h) {
1215 # ah well, not enough space
1216 $_ *= $h / $req_h for @h;
1217 } else { 1451 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1453 my $req = List::Util::sum @req;
1454
1455 if ($req > $space) {
1456 # ah well, not enough space
1457 $_ *= $space / $req for @req;
1458 } else {
1218 my $exp = List::Util::sum map $_->{expand}, @$children; 1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1219 $exp ||= 1;
1220 1460
1461 $space = ($space - $req) / $expand; # remaining space to give away
1462
1463 $req[$_] += $space * $children->[$_]{expand}
1221 for (0 .. $#$children) { 1464 for 0 .. $#$children;
1222 my $child = $children->[$_];
1223
1224 my $alloc_h = $h[$_];
1225 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1226 $h[$_] = $alloc_h;
1227 } 1465 }
1228 } 1466 }
1229 1467
1230 CFClient::UI::harmonize \@h; 1468 CFClient::UI::harmonize \@req;
1231 1469
1232 my $y = 0; 1470 my $pos = 0;
1233 for (0 .. $#$children) { 1471 for (0 .. $#$children) {
1234 my $child = $children->[$_];
1235 my $h = $h[$_]; 1472 my $alloc = $req[$_];
1236 $child->configure ($y, 0, $h, $w); 1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1237 1474
1238 $y += $h; 1475 $pos += $alloc;
1239 } 1476 }
1240 1477
1241 1 1478 1
1242} 1479}
1243 1480
1244############################################################################# 1481#############################################################################
1245 1482
1483package CFClient::UI::HBox;
1484
1485our @ISA = CFClient::UI::Box::;
1486
1487sub new {
1488 my $class = shift;
1489
1490 $class->SUPER::new (
1491 vertical => 0,
1492 @_,
1493 )
1494}
1495
1496#############################################################################
1497
1246package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1247 1499
1248# TODO: wrap into common Box base class
1249
1250our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1251 1501
1252sub size_request { 1502sub new {
1253 my ($self) = @_; 1503 my $class = shift;
1254 1504
1255 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1256 1506 vertical => 1,
1257 ( 1507 @_,
1258 (List::Util::max map $_->[0], @alloc),
1259 (List::Util::sum map $_->[1], @alloc),
1260 ) 1508 )
1261}
1262
1263sub size_allocate {
1264 my ($self, $w, $h) = @_;
1265
1266 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1268 my $children = $self->{children};
1269
1270 my @h = map $_->{req_h}, @$children;
1271
1272 my $req_h = List::Util::sum @h;
1273
1274 if ($req_h > $h) {
1275 # ah well, not enough space
1276 $_ *= $h / $req_h for @h;
1277 } else {
1278 my $exp = List::Util::sum map $_->{expand}, @$children;
1279 $exp ||= 1;
1280
1281 for (0 .. $#$children) {
1282 my $child = $children->[$_];
1283
1284 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1285 }
1286 }
1287
1288 CFClient::UI::harmonize \@h;
1289
1290 my $y = 0;
1291 for (0 .. $#$children) {
1292 my $child = $children->[$_];
1293 my $h = $h[$_];
1294 $child->configure (0, $y, $w, $h);
1295
1296 $y += $h;
1297 }
1298
1299 1
1300} 1509}
1301 1510
1302############################################################################# 1511#############################################################################
1303 1512
1304package CFClient::UI::Label; 1513package CFClient::UI::Label;
… …
1321 ellipsise => 3, # end 1530 ellipsise => 3, # end
1322 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1323 fontsize => 1, 1532 fontsize => 1,
1324 align => -1, 1533 align => -1,
1325 valign => -1, 1534 valign => -1,
1326 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1327 can_events => 0, 1537 can_events => 0,
1328 %arg 1538 %arg
1329 ); 1539 );
1330 1540
1331 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1358 1568
1359 delete $self->{texture}; 1569 delete $self->{texture};
1360 $self->SUPER::update; 1570 $self->SUPER::update;
1361} 1571}
1362 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1363sub set_text { 1580sub set_text {
1364 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1365 1582
1366 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1367 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1368 1585
1369 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1371 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1372 $self->update; 1591 $self->update;
1373 $self->check_size;
1374} 1592}
1375 1593
1376sub set_markup { 1594sub set_markup {
1377 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1378 1596
… …
1382 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383 1601
1384 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1385 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1386 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1387 $self->update; 1607 $self->update;
1388 $self->check_size;
1389} 1608}
1390 1609
1391sub size_request { 1610sub size_request {
1392 my ($self) = @_; 1611 my ($self) = @_;
1393 1612
1613 $self->{size_req} ||= do {
1394 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1395 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1396 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1397 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1398 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1399 1619
1400 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1401 1621
1402 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1403 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1404 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1405 1625
1406 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1407 1627
1408 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1409 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1410 } 1633 };
1411 1634
1412 ( 1635 @{ $self->{size_req} }
1413 $w + $self->{padding} * 2,
1414 $h + $self->{padding} * 2,
1415 )
1416} 1636}
1417 1637
1418sub size_allocate { 1638sub size_allocate {
1419 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1420 1640
1641 delete $self->{ox};
1642
1421 delete $self->{texture}; 1643 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1422} 1645}
1423 1646
1424sub set_fontsize { 1647sub set_fontsize {
1425 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1426 1649
1427 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1428 delete $self->{texture}; 1651 delete $self->{texture};
1429 1652
1430 $self->update; 1653 $self->realloc;
1431 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1432} 1662}
1433 1663
1434sub _draw { 1664sub _draw {
1435 my ($self) = @_; 1665 my ($self) = @_;
1436 1666
… …
1442 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446 1676
1447 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1448 1679
1680 unless (exists $self->{ox}) {
1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1451 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1452 1684
1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1455 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1456
1457 $tex
1458 }; 1688 };
1459 1689
1460 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1462 1694
1463 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1464 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1465 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1466 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1467 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1468 } 1702 }
1469 1703
1470 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1471} 1705}
1472 1706
… …
1488 active_fg => [0, 0, 0], 1722 active_fg => [0, 0, 0],
1489 can_hover => 1, 1723 can_hover => 1,
1490 can_focus => 1, 1724 can_focus => 1,
1491 valign => 0, 1725 valign => 0,
1492 can_events => 1, 1726 can_events => 1,
1727 #text => ...
1728 #hidden => "*",
1493 @_ 1729 @_
1494 ) 1730 )
1495} 1731}
1496 1732
1497sub _set_text { 1733sub _set_text {
… …
1499 1735
1500 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1501 1737
1502 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1503 1739
1504 delete $self->{texture};
1505
1506 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1507 $self->{text} = $text; 1741 $self->{text} = $text;
1508 1742
1509 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1510 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1511 1746
1512 $self->emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1513} 1751}
1514 1752
1515sub set_text { 1753sub set_text {
1516 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1517 1755
1518 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1519 $self->_set_text ($text); 1757 $self->_set_text ($text);
1520 $self->update;
1521 $self->check_size;
1522} 1758}
1523 1759
1524sub get_text { 1760sub get_text {
1525 $_[0]{text} 1761 $_[0]{text}
1526} 1762}
… …
1529 my ($self) = @_; 1765 my ($self) = @_;
1530 1766
1531 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1532 1768
1533 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1534}
1535
1536sub size_allocate {
1537 my ($self, $w, $h) = @_;
1538
1539 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1540} 1770}
1541 1771
1542sub key_down { 1772sub key_down {
1543 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1544 1774
… …
1559 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1560 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1561 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1562 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1563 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1564 $self->emit ('escape'); 1794 $self->_emit ('escape');
1565 } elsif ($uni) { 1795 } elsif ($uni) {
1566 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1567 } 1799 }
1568 1800
1569 $self->_set_text ($text); 1801 $self->_set_text ($text);
1570 $self->update; 1802
1571 $self->check_size; 1803 $self->realloc;
1804
1805 1
1572} 1806}
1573 1807
1574sub focus_in { 1808sub focus_in {
1575 my ($self) = @_; 1809 my ($self) = @_;
1576 1810
… …
1591 utf8::encode $text; 1825 utf8::encode $text;
1592 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1593 1827
1594 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1595 $self->update; 1829 $self->update;
1830
1831 1
1596} 1832}
1597 1833
1598sub mouse_motion { 1834sub mouse_motion {
1599 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1600# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 0
1601} 1839}
1602 1840
1603sub _draw { 1841sub _draw {
1604 my ($self) = @_; 1842 my ($self) = @_;
1605 1843
1606 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1607 1845
1608 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1609 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1610 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1611 } else { 1849 } else {
1612 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1613 } 1851 }
1614 1852
1615 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1617 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1618 glVertex 0 , 0; 1856 glVertex 0 , 0;
1619 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1620 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1621 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1656 if ($sym == 13) { 1894 if ($sym == 13) {
1657 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1658 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1659 $self->{history_pointer} = -1; 1897 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = ''; 1898 $self->{history_saveback} = '';
1661 $self->emit (activate => $txt); 1899 $self->_emit (activate => $txt);
1662 $self->update; 1900 $self->update;
1663 1901
1664 } elsif ($sym == CFClient::SDLK_UP) { 1902 } elsif ($sym == CFClient::SDLK_UP) {
1665 if ($self->{history_pointer} < 0) { 1903 if ($self->{history_pointer} < 0) {
1666 $self->{history_saveback} = $self->get_text; 1904 $self->{history_saveback} = $self->get_text;
… …
1682 } else { 1920 } else {
1683 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1684 } 1922 }
1685 1923
1686 } else { 1924 } else {
1687 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1688 } 1928 1
1689
1690} 1929}
1691 1930
1692############################################################################# 1931#############################################################################
1693 1932
1694package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1703 1942
1704sub new { 1943sub new {
1705 my $class = shift; 1944 my $class = shift;
1706 1945
1707 $class->SUPER::new ( 1946 $class->SUPER::new (
1708 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1709 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1710 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1711 can_hover => 1, 1951 can_hover => 1,
1712 align => 0, 1952 align => 0,
1713 valign => 0, 1953 valign => 0,
1714 can_events => 1, 1954 can_events => 1,
1715 @_ 1955 @_
1716 ) 1956 )
1717} 1957}
1718 1958
1959sub activate { }
1960
1719sub button_up { 1961sub button_up {
1720 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1721 1963
1964 $self->emit ("activate")
1722 if ($x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1723 && $y >= 0 && $y < $self->{h}) { 1966 && $y >= 0 && $y < $self->{h};
1724 $self->emit ("activate"); 1967
1725 } 1968 1
1726} 1969}
1727 1970
1728sub _draw { 1971sub _draw {
1729 my ($self) = @_; 1972 my ($self) = @_;
1730 1973
1731 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1732
1733 if ($GRAB == $self) {
1734 $self->{fg} = $self->{active_fg};
1735 }
1736 1975
1737 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1739 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1740 1979
… …
1745 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1746} 1985}
1747 1986
1748############################################################################# 1987#############################################################################
1749 1988
1989package CFClient::UI::ImageButton;
1990
1991our @ISA = CFClient::UI::Image::;
1992
1993use CFClient::OpenGL;
1994
1995my %textures;
1996
1997sub new {
1998 my $class = shift;
1999
2000 my $self = $class->SUPER::new (
2001 padding_x => 4,
2002 padding_y => 4,
2003 fg => [1, 1, 1],
2004 active_fg => [0, 0, 1],
2005 can_hover => 1,
2006 align => 0,
2007 valign => 0,
2008 can_events => 1,
2009 @_
2010 );
2011}
2012
2013sub activate { }
2014
2015sub button_up {
2016 my ($self, $ev, $x, $y) = @_;
2017
2018 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h};
2021
2022 1
2023}
2024
2025#############################################################################
2026
1750package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1751 2028
1752our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1753 2030
1754my @tex = 2031my @tex =
… …
1759 2036
1760sub new { 2037sub new {
1761 my $class = shift; 2038 my $class = shift;
1762 2039
1763 $class->SUPER::new ( 2040 $class->SUPER::new (
1764 padding => 2, 2041 padding_x => 2,
2042 padding_y => 2,
1765 fg => [1, 1, 1], 2043 fg => [1, 1, 1],
1766 active_fg => [1, 1, 0], 2044 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2], 2045 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5], 2046 active_bg => [1, 1, 1, 0.5],
1769 state => 0, 2047 state => 0,
… …
1773} 2051}
1774 2052
1775sub size_request { 2053sub size_request {
1776 my ($self) = @_; 2054 my ($self) = @_;
1777 2055
1778 ($self->{padding} * 2 + 6) x 2 2056 (6) x 2
1779} 2057}
1780 2058
1781sub button_down { 2059sub button_down {
1782 my ($self, $ev, $x, $y) = @_; 2060 my ($self, $ev, $x, $y) = @_;
1783 2061
1784 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1785 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1786 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1787 $self->emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1788 } 2070 1
1789} 2071}
1790 2072
1791sub _draw { 2073sub _draw {
1792 my ($self) = @_; 2074 my ($self) = @_;
1793 2075
1794 $self->SUPER::_draw; 2076 $self->SUPER::_draw;
1795 2077
1796 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1797 2079
1798 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2080 my ($w, $h) = @$self{qw(w h)};
2081
2082 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1799 2083
1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1801 2085
1802 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803 2087
… …
1958 2242
1959 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
1960 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
1961 2245
1962 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
1963 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1964 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1966 2251
1967 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
1968 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
… …
2067 my $self = $class->SUPER::new ( 2352 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2353 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2354 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2355 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2356 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2357 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2358 min_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2359 min_h => $::WIDTH / 80,
2075 vertical => 0, 2360 vertical => 0,
2076 can_hover => 1, 2361 can_hover => 1,
2077 inner_pad => 0.02, 2362 inner_pad => 0.02,
2078 @_ 2363 @_
2079 ); 2364 );
… …
2082 $self->update; 2367 $self->update;
2083 2368
2084 $self 2369 $self
2085} 2370}
2086 2371
2372sub changed { }
2373
2374sub set_range {
2375 my ($self, $range) = @_;
2376
2377 ($range, $self->{range}) = ($self->{range}, $range);
2378
2379 if ("@$range" ne "@{$self->{range}}") {
2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2383}
2384
2087sub set_value { 2385sub set_value {
2088 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2089 2387
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2388 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2389
2092 $hi = $lo + 1 if $hi <= $lo; 2390 $hi = $lo + 1 if $hi <= $lo;
2093 2391
2392 $page = $hi - $lo if $page > $hi - $lo;
2393
2094 $value = $lo if $value < $lo; 2394 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2395 $value = $hi - $page if $value > $hi - $page;
2096 2396
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2397 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2398 if $unit;
2099 2399
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2401
2104 if ($value != $old_value) { 2402 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2403 $self->_emit (changed => $value);
2106 $self->update; 2404 $self->update;
2107 } 2405 }
2108} 2406}
2109 2407
2110sub size_request { 2408sub size_request {
2111 my ($self) = @_; 2409 my ($self) = @_;
2112 2410
2113 my $w = $self->{req_w}; 2411 ($self->{req_w}, $self->{req_h})
2114 my $h = $self->{req_h};
2115
2116 $self->{vertical} ? ($h, $w) : ($w, $h)
2117} 2412}
2118 2413
2119sub button_down { 2414sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2415 my ($self, $ev, $x, $y) = @_;
2121 2416
2122 $self->SUPER::button_down ($ev, $x, $y); 2417 $self->SUPER::button_down ($ev, $x, $y);
2418
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420
2123 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
2124} 2422}
2125 2423
2126sub mouse_motion { 2424sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
2128 2426
2129 if ($GRAB == $self) { 2427 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2429
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2430 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2431
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2432 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2433
2136 $self->set_value ($x * ($hi - $lo) + $lo); 2434 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2435 } else {
2436 return 0;
2437 }
2438
2137 } 2439 1
2138} 2440}
2139 2441
2140sub update { 2442sub update {
2141 my ($self) = @_; 2443 my ($self) = @_;
2142 2444
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2445 delete $self->{knob_w};
2446 $self->SUPER::update;
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 unless ($self->{knob_w}) {
2144 $self->set_value ($self->{range}[0]); 2453 $self->set_value ($self->{range}[0]);
2145 2454
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2456 my $range = ($hi - $page - $lo) || 1e-100;
2147 2457
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2458 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2459
2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2460 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2461 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151 2462
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2463 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2464 $value = $value * $self->{scale} + $self->{offset};
2154 2465
2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value; 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2467 $self->{knob_w} = $knob_w;
2162 }); 2468 }
2163
2164 $self->SUPER::update;
2165}
2166
2167sub _draw {
2168 my ($self) = @_;
2169 2469
2170 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2171 2471
2172 glScale $self->{w}, $self->{h}; 2472 glScale $self->{w}, $self->{h};
2173 2473
… …
2193 glDisable GL_TEXTURE_2D; 2493 glDisable GL_TEXTURE_2D;
2194} 2494}
2195 2495
2196############################################################################# 2496#############################################################################
2197 2497
2498package CFClient::UI::ValSlider;
2499
2500our @ISA = CFClient::UI::HBox::;
2501
2502sub new {
2503 my ($class, %arg) = @_;
2504
2505 my $range = delete $arg{range};
2506
2507 my $self = $class->SUPER::new (
2508 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2509 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2510 to_value => sub { shift },
2511 from_value => sub { shift },
2512 %arg,
2513 );
2514
2515 $self->{slider}->connect (changed => sub {
2516 my ($self, $value) = @_;
2517 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2518 $self->{parent}->emit (changed => $value);
2519 });
2520
2521# $self->{entry}->connect (changed => sub {
2522# my ($self, $value) = @_;
2523# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2524# $self->{parent}->emit (changed => $value);
2525# });
2526
2527 $self->add ($self->{slider}, $self->{entry});
2528
2529 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2530
2531 $self
2532}
2533
2534sub set_range { shift->{slider}->set_range (@_) }
2535sub set_value { shift->{slider}->set_value (@_) }
2536
2537#############################################################################
2538
2198package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2199 2540
2200our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2201 2542
2202use CFClient::OpenGL; 2543use CFClient::OpenGL;
2203 2544
… …
2205 my $class = shift; 2546 my $class = shift;
2206 2547
2207 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2208 fontsize => 1, 2549 fontsize => 1,
2209 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2210 #font => default_font 2552 #font => default_font
2211 @_, 2553 @_,
2212 2554
2213 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2214 par => [], 2556 par => [],
… …
2237 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2238 2580
2239 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2240 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2583 $self->{layout}->set_width ($self->{children}[0]{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2242 2585
2243 $self->reflow; 2586 $self->reflow;
2244} 2587}
2245 2588
2246sub text_height { 2589sub text_size {
2247 my ($self, $text, $indent) = @_; 2590 my ($self, $text, $indent) = @_;
2248 2591
2249 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2250 2593
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2595 $layout->set_width ($self->{children}[0]{w} - $indent);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2253 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2254 2598
2255 ($layout->size)[1] 2599 $layout->size
2256} 2600}
2257 2601
2258sub reflow { 2602sub reflow {
2259 my ($self) = @_; 2603 my ($self) = @_;
2260 2604
2261 $self->{need_reflow}++; 2605 $self->{need_reflow}++;
2262 $self->update; 2606 $self->update;
2263} 2607}
2264 2608
2609sub set_offset {
2610 my ($self, $offset) = @_;
2611
2612 # todo: base offset on lines or so, not on pixels
2613 $self->{children}[1]->set_value ($offset);
2614}
2615
2616sub clear {
2617 my ($self) = @_;
2618
2619 $self->{par} = [];
2620 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622}
2623
2265sub add_paragraph { 2624sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2625 my ($self, $color, $text, $indent) = @_;
2267 2626
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2627 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2628 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2629 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2631 }
2275 2632
2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2633 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277 $self->{children}[1]->update;
2278} 2634}
2279 2635
2280sub update { 2636sub update {
2281 my ($self) = @_; 2637 my ($self) = @_;
2282 2638
… …
2284 2640
2285 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2286 2642
2287 delete $self->{texture}; 2643 delete $self->{texture};
2288 2644
2289 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647
2290 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2649 my $height = 0;
2292 2650
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2294 for @{$self->{par}}; 2655 for (@{$self->{par}}) {
2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2659 $layout->set_markup ($_->[4]);
2660 my ($w, $h) = $layout->size;
2661 $_->[0] = $w + $_->[3];
2662 $_->[1] = $h;
2663 }
2664
2665 $height += $_->[1];
2666 }
2295 2667
2296 $self->{height} = $height; 2668 $self->{height} = $height;
2297 2669
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update; 2671
2300
2301 delete $self->{texture}; 2672 delete $self->{texture};
2302 } 2673 }
2303 2674
2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2676 glClearColor 0, 0, 0, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2307 2678
2308 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2309 2680
2310 my $y0 = $top; 2681 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2682 my $y1 = $top + $H;
2312 2683
2313 my $y = 0; 2684 my $y = 0;
2314 2685
2315 my $layout = $self->{layout}; 2686 my $layout = $self->{layout};
2316 2687
2317 $layout->set_font ($self->{font}) if $self->{font}; 2688 $layout->set_font ($self->{font}) if $self->{font};
2318 2689
2319 glEnable GL_BLEND; 2690 glEnable GL_BLEND;
2691 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2692 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2693
2322 for my $par (@{$self->{par}}) { 2694 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2695 my $h = $par->[1];
2324 2696
2325 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2698 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2328 $layout->set_markup ($par->[3]); 2701 $layout->set_markup ($par->[4]);
2329 2702
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2704
2332 glRasterPos $par->[2], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2706 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2707 }
2335 2708
2336 $y += $h; 2709 $y += $h;
2337 } 2710 }
… …
2344sub _draw { 2717sub _draw {
2345 my ($self) = @_; 2718 my ($self) = @_;
2346 2719
2347 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2349 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2350 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2351 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2352 2725
2353 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2354 2727
2355} 2728}
… …
2404 2777
2405sub new { 2778sub new {
2406 my $class = shift; 2779 my $class = shift;
2407 2780
2408 my $self = $class->SUPER::new ( 2781 my $self = $class->SUPER::new (
2409 state => 0, 2782 state => 0,
2410 connect_activate => \&toggle_flopper, 2783 on_activate => \&toggle_flopper,
2411 @_ 2784 @_
2412 ); 2785 );
2413 2786
2414 if ($self->{state}) {
2415 $self->{state} = 0;
2416 $self->toggle_flopper;
2417 }
2418
2419 $self 2787 $self
2420} 2788}
2421 2789
2422sub toggle_flopper { 2790sub toggle_flopper {
2423 my ($self) = @_; 2791 my ($self) = @_;
2424 2792
2425 # TODO: use animation 2793 $self->{other}->toggle_visibility;
2426 if ($self->{state} = !$self->{state}) {
2427 $CFClient::UI::ROOT->add ($self->{other});
2428 $self->{other}->move ($self->coord2global (0, $self->{h}));
2429 $self->emit ("open");
2430 } else {
2431 $CFClient::UI::ROOT->remove ($self->{other});
2432 $self->emit ("close");
2433 }
2434
2435 $self->emit (changed => $self->{state});
2436} 2794}
2437 2795
2438############################################################################# 2796#############################################################################
2439 2797
2440package CFClient::UI::Tooltip; 2798package CFClient::UI::Tooltip;
… …
2453} 2811}
2454 2812
2455sub set_tooltip_from { 2813sub set_tooltip_from {
2456 my ($self, $widget) = @_; 2814 my ($self, $widget) = @_;
2457 2815
2816 my $tooltip = $widget->{tooltip};
2817
2818 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n"
2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2821 . "req $widget->{req_w} $widget->{req_h}\n"
2822 . "visible $widget->{visible}";
2823 }
2824
2825 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//;
2827
2458 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2459 markup => $widget->{tooltip}, 2829 markup => $tooltip,
2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461 fontsize => 0.8, 2831 fontsize => 0.8,
2462 fg => [0, 0, 0, 1], 2832 fg => [0, 0, 0, 1],
2463 ellipsise => 0, 2833 ellipsise => 0,
2464 font => ($widget->{tooltip_font} || $::FONT_PROP), 2834 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2475 2845
2476sub size_allocate { 2846sub size_allocate {
2477 my ($self, $w, $h) = @_; 2847 my ($self, $w, $h) = @_;
2478 2848
2479 $self->SUPER::size_allocate ($w - 4, $h - 4); 2849 $self->SUPER::size_allocate ($w - 4, $h - 4);
2850}
2851
2852sub visibility_change {
2853 my ($self, $visible) = @_;
2854
2855 return unless $visible;
2856
2857 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner}
2859 or return;
2860
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w};
2865
2866 $self->move_abs ($x, $y);
2867 });
2480} 2868}
2481 2869
2482sub _draw { 2870sub _draw {
2483 my ($self) = @_; 2871 my ($self) = @_;
2484 2872
… …
2501 glVertex $w, $h; 2889 glVertex $w, $h;
2502 glVertex $w, 0; 2890 glVertex $w, 0;
2503 glEnd; 2891 glEnd;
2504 2892
2505 glTranslate 2 - 0.375, 2 - 0.375; 2893 glTranslate 2 - 0.375, 2 - 0.375;
2894
2506 $self->SUPER::_draw; 2895 $self->SUPER::_draw;
2507} 2896}
2508 2897
2509############################################################################# 2898#############################################################################
2510 2899
… …
2516 2905
2517sub new { 2906sub new {
2518 my $class = shift; 2907 my $class = shift;
2519 2908
2520 my $self = $class->SUPER::new ( 2909 my $self = $class->SUPER::new (
2521 aspect => 1, 2910 aspect => 1,
2911 can_events => 0,
2522 @_, 2912 @_,
2523 ); 2913 );
2524 2914
2525 if ($self->{anim} && $self->{animspeed}) { 2915 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self); 2916 Scalar::Util::weaken (my $widget = $self);
… …
2552} 2942}
2553 2943
2554sub _draw { 2944sub _draw {
2555 my ($self) = @_; 2945 my ($self) = @_;
2556 2946
2557 return unless $::CONN;#d# manage and cache textures differently 2947 return unless $::CONN;
2558 2948
2559 my $face; 2949 my $face;
2560 2950
2561 if ($self->{frame}) { 2951 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}]; 2952 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2568 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2569 2959
2570 if ($tex) { 2960 if ($tex) {
2571 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2573 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2574 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2575 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2576 } 2966 }
2577} 2967}
2578 2968
2579sub DESTROY { 2969sub destroy {
2580 my ($self) = @_; 2970 my ($self) = @_;
2581 2971
2582 $self->{timer}->cancel 2972 $self->{timer}->cancel
2583 if $self->{timer}; 2973 if $self->{timer};
2584 2974
2585 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2586} 2976}
2587 2977
2588############################################################################# 2978#############################################################################
2589 2979
2590package CFClient::UI::InventoryItem; 2980package CFClient::UI::Buttonbar;
2591 2981
2592our @ISA = CFClient::UI::HBox::; 2982our @ISA = CFClient::UI::HBox::;
2593 2983
2594sub _item_to_desc { 2984# TODO: should actualyl wrap buttons and other goodies.
2595 my ($item) = @_;
2596
2597 my $desc =
2598 $item->{nrof} < 2
2599 ? $item->{name}
2600 : "$item->{nrof} × $item->{name_pl}";
2601
2602 $item->{flags} & Crossfire::Protocol::F_OPEN
2603 and $desc .= " (open)";
2604 $item->{flags} & Crossfire::Protocol::F_APPLIED
2605 and $desc .= " (applied)";
2606 $item->{flags} & Crossfire::Protocol::F_UNPAID
2607 and $desc .= " (unpaid)";
2608 $item->{flags} & Crossfire::Protocol::F_MAGIC
2609 and $desc .= " (magic)";
2610 $item->{flags} & Crossfire::Protocol::F_CURSED
2611 and $desc .= " (cursed)";
2612 $item->{flags} & Crossfire::Protocol::F_DAMNED
2613 and $desc .= " (damned)";
2614 $item->{flags} & Crossfire::Protocol::F_LOCKED
2615 and $desc .= " *";
2616
2617 $desc
2618}
2619
2620sub new {
2621 my $class = shift;
2622
2623 my %args = @_;
2624
2625 my $item = delete $args{item};
2626
2627 my $desc = _item_to_desc ($item);
2628
2629 my $self = $class->SUPER::new (
2630 can_hover => 1,
2631 can_events => 1,
2632 tooltip => ((CFClient::UI::Label::escape $desc)
2633 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2634 connect_button_down => sub {
2635 my ($self, $ev, $x, $y) = @_;
2636
2637 # todo: maybe put examine on 1? but should just be a tooltip :(
2638 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag};
2640
2641 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT;
2643 }
2644
2645 $::CONN->send ("move $targ $item->{tag} 0");
2646 } elsif ($ev->{button} == 1) {
2647 $::CONN->send ("examine $item->{tag}");
2648 } elsif ($ev->{button} == 2) {
2649 $::CONN->send ("apply $item->{tag}");
2650 } elsif ($ev->{button} == 3) {
2651 my @menu_items = (
2652 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2653 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2654 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2655 (
2656 $item->{flags} & Crossfire::Protocol::F_LOCKED
2657 ? (
2658 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2659 )
2660 : (
2661 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2662 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2663 )
2664 ),
2665 );
2666
2667 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2668 }
2669
2670 1
2671 },
2672 %args
2673 );
2674
2675
2676 $self->add (new CFClient::UI::Face
2677 can_events => 0,
2678 face => $item->{face},
2679 anim => $item->{anim},
2680 animspeed => $item->{animspeed},
2681 );
2682
2683 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2684
2685 $self->{item} = $item;
2686
2687 $self->update_item;
2688
2689 $self
2690}
2691
2692sub update_item {
2693 my ($self) = @_;
2694
2695 my $desc = _item_to_desc ($self->{item});
2696
2697 $self->{name_lbl}->set_text ($desc);
2698}
2699
2700#############################################################################
2701
2702package CFClient::UI::Inventory;
2703
2704our @ISA = CFClient::UI::ScrolledWindow::;
2705
2706sub new {
2707 my $class = shift;
2708
2709 my $self = $class->SUPER::new (
2710 scrolled => (new CFClient::UI::Table),
2711 @_,
2712 );
2713
2714 $self
2715}
2716
2717sub set_items {
2718 my ($self, $items) = @_;
2719
2720 $self->{scrolled}->clear;
2721 return unless $items;
2722
2723 my @items = sort {
2724 ($a->{type} <=> $b->{type})
2725 or ($a->{name} cmp $b->{name})
2726 } @$items;
2727
2728 $self->{real_items} = \@items;
2729
2730 for my $item (@items) {
2731 $item->{item} = $item;
2732 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2733 $item->update_item ();
2734 }
2735
2736 my $i = 0;
2737 for (@items) {
2738 $self->{scrolled}->add (0, $i, $_);
2739 my $nrof = $_->{item}->{nrof} || 1;
2740 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2741 }
2742
2743# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2744}
2745
2746sub size_request {
2747 my ($self) = @_;
2748 ($self->{req_w}, $self->{req_h});
2749}
2750 2985
2751############################################################################# 2986#############################################################################
2752 2987
2753package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2754 2989
… …
2766 ); 3001 );
2767 3002
2768 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2769 3004
2770 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2771 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2772 3007
2773 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2774 if (!ref $widget) { 3009 if (!ref $widget) {
2775 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2776 can_hover => 1, 3011 can_hover => 1,
2777 can_events => 1, 3012 can_events => 1,
2778 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2779 } 3015 }
2780 3016
2781 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2782 3018
2783 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
2788 3024
2789# popup given the event (must be a mouse button down event currently) 3025# popup given the event (must be a mouse button down event currently)
2790sub popup { 3026sub popup {
2791 my ($self, $ev) = @_; 3027 my ($self, $ev) = @_;
2792 3028
2793 $self->emit ("popdown"); 3029 $self->_emit ("popdown");
2794 3030
2795 # maybe save $GRAB? must be careful about events... 3031 # maybe save $GRAB? must be careful about events...
2796 $GRAB = $self; 3032 $GRAB = $self;
2797 $self->{button} = $ev->{button}; 3033 $self->{button} = $ev->{button};
2798 3034
2799 $self->show; 3035 $self->show;
2800 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2801} 3037}
2802 3038
2803sub mouse_motion { 3039sub mouse_motion {
2804 my ($self, $ev, $x, $y) = @_; 3040 my ($self, $ev, $x, $y) = @_;
2805 3041
2806 # TODO: should use vbox->find_widget or so 3042 # TODO: should use vbox->find_widget or so
2807 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2808 $self->{hover} = $self->{item}{$HOVER}; 3044 $self->{hover} = $self->{item}{$HOVER};
3045
3046 0
2809} 3047}
2810 3048
2811sub button_up { 3049sub button_up {
2812 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2813 3051
2814 if ($ev->{button} == $self->{button}) { 3052 if ($ev->{button} == $self->{button}) {
2815 undef $GRAB; 3053 undef $GRAB;
2816 $self->hide; 3054 $self->hide;
2817 3055
2818 $self->emit ("popdown"); 3056 $self->_emit ("popdown");
2819 $self->{hover}[1]->() if $self->{hover}; 3057 $self->{hover}[1]->() if $self->{hover};
3058 } else {
3059 return 0
3060 }
3061
2820 } 3062 1
2821} 3063}
2822 3064
2823############################################################################# 3065#############################################################################
2824 3066
2825package CFClient::UI::Statusbox; 3067package CFClient::UI::Multiplexer;
2826 3068
2827our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::Container::;
2828 3070
2829sub new { 3071sub new {
2830 my $class = shift; 3072 my $class = shift;
2831 3073
2832 $class->SUPER::new ( 3074 my $self = $class->SUPER::new (
3075 @_,
3076 );
3077
3078 $self->{current} = $self->{children}[0]
3079 if @{ $self->{children} };
3080
3081 $self
3082}
3083
3084sub add {
3085 my ($self, @widgets) = @_;
3086
3087 $self->SUPER::add (@widgets);
3088
3089 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} };
3091}
3092
3093sub set_current_page {
3094 my ($self, $page_or_widget) = @_;
3095
3096 my $widget = ref $page_or_widget
3097 ? $page_or_widget
3098 : $self->{children}[$page_or_widget];
3099
3100 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102
3103 $self->_emit (page_changed => $self->{current});
3104
3105 $self->realloc;
3106}
3107
3108sub visible_children {
3109 $_[0]{current}
3110}
3111
3112sub size_request {
3113 my ($self) = @_;
3114
3115 $self->{current}->size_request
3116}
3117
3118sub size_allocate {
3119 my ($self, $w, $h) = @_;
3120
3121 $self->{current}->configure (0, 0, $w, $h);
3122}
3123
3124sub _draw {
3125 my ($self) = @_;
3126
3127 $self->{current}->draw;
3128}
3129
3130#############################################################################
3131
3132package CFClient::UI::Notebook;
3133
3134our @ISA = CFClient::UI::VBox::;
3135
3136sub new {
3137 my $class = shift;
3138
3139 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self
3143 @_,
3144 );
3145
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3147 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3148
3149 $self
3150}
3151
3152sub add {
3153 my ($self, $title, $widget, $tooltip) = @_;
3154
3155 Scalar::Util::weaken $self;
3156
3157 $self->{buttonbar}->add (new CFClient::UI::Button
3158 markup => $title,
3159 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) },
3161 );
3162
3163 $self->{multiplexer}->add ($widget);
3164}
3165
3166sub set_current_page {
3167 my ($self, $page) = @_;
3168
3169 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current});
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Combobox;
3176
3177use utf8;
3178
3179our @ISA = CFClient::UI::Button::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 options => [], # [value, title, longdesc], ...
3186 value => undef,
3187 @_,
3188 );
3189
3190 $self->_set_value ($self->{value});
3191
3192 $self
3193}
3194
3195sub button_down {
3196 my ($self, $ev) = @_;
3197
3198 my @menu_items;
3199
3200 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_;
3202
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 }
3205
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207}
3208
3209sub _set_value {
3210 my ($self, $value) = @_;
3211
3212 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3213 or return;
3214
3215 $self->{value} = $item->[0];
3216 $self->set_markup ("$item->[1] ⇓");
3217 $self->set_tooltip ($item->[2]);
3218}
3219
3220sub set_value {
3221 my ($self, $value) = @_;
3222
3223 return unless $self->{value} ne $value;
3224
3225 $self->_set_value ($value);
3226 $self->_emit (changed => $value);
3227}
3228
3229#############################################################################
3230
3231package CFClient::UI::Statusbox;
3232
3233our @ISA = CFClient::UI::VBox::;
3234
3235sub new {
3236 my $class = shift;
3237
3238 my $self = $class->SUPER::new (
2833 fontsize => 0.8, 3239 fontsize => 0.8,
2834 @_, 3240 @_,
2835 ) 3241 );
3242
3243 Scalar::Util::weaken (my $this = $self);
3244
3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246
3247 $self
2836} 3248}
2837 3249
2838sub reorder { 3250sub reorder {
2839 my ($self) = @_; 3251 my ($self) = @_;
2840 my $NOW = time; 3252 my $NOW = Time::HiRes::time;
3253
3254 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} };
2841 3258
2842 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2843 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2844 } 3261 }
2845 3262
… …
2848 my @items = sort { 3265 my @items = sort {
2849 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2850 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2851 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2852 3269
3270 $self->{timer}->interval (1);
3271
2853 my $count = 10 + 1; 3272 my $count = 10 + 1;
2854 for my $item (@items) { 3273 for my $item (@items) {
2855 last unless --$count; 3274 last unless --$count;
2856 3275
2857 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2858 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2859 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2860 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2861 : $item->{text}; 3280 : $item->{text};
2862 3281
… …
2870 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2871 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2872 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2873 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2874 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
2875 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
2876 can_events => 1, 3295 can_events => 1,
2877 can_hover => 1 3296 can_hover => 1
2878 }; 3297 };
3298
3299 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3300 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3301 $label->update;
3302 $label->set_max_size (undef, $label->{req_h} * $diff)
3303 if $diff < 1;
3304 $self->{timer}->interval (1/30);
3305 } else {
3306 $label->{fg}[3] = $item->{fg}[3] || 1;
3307 }
3308
3309 push @widgets, $label;
2879 } 3310 }
2880 3311
2881 $self->clear; 3312 $self->clear;
2882 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2883} 3314}
… …
2886 my ($self, $text, %arg) = @_; 3317 my ($self, $text, %arg) = @_;
2887 3318
2888 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
2889 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
2890 3321
3322 return unless $text;
3323
2891 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2892 3325
2893 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2894 3327
2895 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
2896 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
2897 $item->{count}++; 3330 $item->{count}++;
2898 } else { 3331 } else {
2899 $item->{count} = 1; 3332 $item->{count} = 1;
2900 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
2901 } 3334 }
2902 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
2903 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
2904 delete $item->{label}; 3337 delete $item->{label};
2905 } else { 3338 } else {
2906 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
2907 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
2926 3359
2927 $self->reorder; 3360 $self->reorder;
2928 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
2929} 3362}
2930 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
2931############################################################################# 3372#############################################################################
2932 3373
2933package CFClient::UI::Root; 3374package CFClient::UI::Inventory;
2934 3375
2935our @ISA = CFClient::UI::Container::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
2936
2937use CFClient::OpenGL;
2938 3377
2939sub new { 3378sub new {
2940 my $class = shift; 3379 my $class = shift;
2941 3380
2942 $class->SUPER::new ( 3381 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3383 @_,
3384 );
3385
3386 $self
3387}
3388
3389sub set_items {
3390 my ($self, $items) = @_;
3391
3392 $self->{child}->clear;
3393 return unless $items;
3394
3395 my @items = sort {
3396 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name})
3398 } @$items;
3399
3400 $self->{real_items} = \@items;
3401
3402 my $row = 0;
3403 for my $item (@items) {
3404 CFClient::Item::update_widgets $item;
3405
3406 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget});
3409
3410 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit, $end_cb) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 $end_cb->() if $end_cb;
3531 });
3532}
3533
3534# $mod and $sym are the modifiers and key symbol
3535# $cmds is a array ref of strings (the commands)
3536# $cb is the callback that is executed on OK
3537# $ccb is the callback that is executed on CANCEL and
3538# when the binding was unsuccessful on OK
3539sub set_binding {
3540 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542 $self->clear_command_list;
3543 $self->{recording} = 0;
3544 $self->{rec_btn}->set_text ("start recording");
3545
3546 $self->{binding} = [$mod, $sym];
3547 $self->{commands} = $cmds;
3548
3549 $self->{binding_change} = $cb;
3550 $self->{binding_cancel} = $ccb;
3551
3552 $self->update_binding_widgets;
3553}
3554
3555# this is a shortcut method that asks for a binding
3556# and then just binds it.
3557sub do_quick_binding {
3558 my ($self, $cmds, $end_cb) = @_;
3559 $self->set_binding (undef, undef, $cmds, sub {
3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561 });
3562 $self->ask_for_bind (1, $end_cb);
3563}
3564
3565sub update_binding_widgets {
3566 my ($self) = @_;
3567 my ($mod, $sym, $cmds) = $self->get_binding;
3568 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569 $self->set_command_list ($cmds);
3570}
3571
3572sub get_binding {
3573 my ($self) = @_;
3574 return (
3575 $self->{binding}->[0],
3576 $self->{binding}->[1],
3577 [ grep { defined $_ } @{$self->{commands}} ]
3578 );
3579}
3580
3581sub clear_command_list {
3582 my ($self) = @_;
3583 $self->{cmdbox}->clear ();
3584}
3585
3586sub set_command_list {
3587 my ($self, $cmds) = @_;
3588
3589 $self->{cmdbox}->clear ();
3590 $self->{commands} = $cmds;
3591
3592 my $idx = 0;
3593
3594 for (@$cmds) {
3595 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597 my $i = $idx;
3598 $hb->add (new CFClient::UI::Label text => $_);
3599 $hb->add (new CFClient::UI::Button
3600 text => "delete",
3601 tooltip => "Deletes the action from the record",
3602 on_activate => sub {
3603 $self->{cmdbox}->remove ($hb);
3604 $cmds->[$i] = undef;
3605 });
3606
3607
3608 $idx++
3609 }
3610}
3611
3612#############################################################################
3613
3614package CFClient::UI::SpellList;
3615
3616our @ISA = CFClient::UI::Table::;
3617
3618sub new {
3619 my $class = shift;
3620
3621 my $self = $class->SUPER::new (
3622 binding => [],
3623 commands => [],
2943 @_, 3624 @_,
2944 ) 3625 )
2945} 3626}
2946 3627
2947sub configure { 3628my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2948 my ($self, $x, $y, $w, $h) = @_;
2949 3629
2950 $self->{w} = $w; 3630my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2951 $self->{h} = $h; 3631 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2952} 3632my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3634my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3636my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3637 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3638my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3639 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2953 3640
2954sub check_size { 3641sub rebuild_spell_list {
3642 my ($self) = @_;
3643
3644 $CFClient::UI::ROOT->on_refresh ($self => sub {
3645 $self->clear;
3646
3647 return unless $::CONN;
3648
3649 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3650 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3651 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3652 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3653 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3654
3655 my $row = 0;
3656
3657 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3658 my $spell = $self->{spell}{$_};
3659
3660 $row++;
3661
3662 my $spell_cb = sub {
3663 my ($widget, $ev) = @_;
3664
3665 if ($ev->{button} == 1) {
3666 $::CONN->user_send ("cast $spell->{name}");
3667 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu
3671 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ],
3675 )->popup ($ev);
3676 } else {
3677 return 0;
3678 }
3679
3680 1
3681 };
3682
3683 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3684
3685 #TODO: add path info to tooltip
3686 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3687
3688 $self->add (0, $row, new CFClient::UI::Face
3689 face => $spell->{face},
3690 can_hover => 1,
3691 can_events => 1,
3692 tooltip => $tooltip,
3693 on_button_down => $spell_cb,
3694 );
3695
3696 $self->add (1, $row, new CFClient::UI::Label
3697 expand => 1,
3698 text => $spell->{name},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3706 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3707 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3708 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3709 }
3710 });
3711}
3712
3713sub add_spell {
2955 my ($self) = @_; 3714 my ($self, $spell) = @_;
2956 3715
2957 $self->size_allocate ($self->{w}, $self->{h}) 3716 $self->{spell}->{$spell->{name}} = $spell;
2958 if $self->{w}; 3717 $self->rebuild_spell_list;
3718}
3719
3720sub remove_spell {
3721 my ($self, $spell) = @_;
3722
3723 delete $self->{spell}->{$spell->{name}};
3724 $self->rebuild_spell_list;
3725}
3726
3727sub clear_spells {
3728 my ($self) = @_;
3729
3730 $self->{spell} = {};
3731 $self->rebuild_spell_list;
3732}
3733
3734#############################################################################
3735
3736package CFClient::UI::Root;
3737
3738our @ISA = CFClient::UI::Container::;
3739
3740use List::Util qw(min max);
3741
3742use CFClient::OpenGL;
3743
3744sub new {
3745 my $class = shift;
3746
3747 my $self = $class->SUPER::new (
3748 visible => 1,
3749 @_,
3750 );
3751
3752 Scalar::Util::weaken ($self->{root} = $self);
3753
3754 $self
2959} 3755}
2960 3756
2961sub size_request { 3757sub size_request {
2962 my ($self) = @_; 3758 my ($self) = @_;
2963 3759
2964 ($self->{w}, $self->{h}) 3760 ($self->{w}, $self->{h})
3761}
3762
3763sub _to_pixel {
3764 my ($coord, $size, $max) = @_;
3765
3766 $coord =
3767 $coord eq "center" ? ($max - $size) * 0.5
3768 : $coord eq "max" ? $max
3769 : $coord;
3770
3771 $coord = 0 if $coord < 0;
3772 $coord = $max - $size if $coord > $max - $size;
3773
3774 int $coord + 0.5
2965} 3775}
2966 3776
2967sub size_allocate { 3777sub size_allocate {
2968 my ($self, $w, $h) = @_; 3778 my ($self, $w, $h) = @_;
2969 3779
2970 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2971 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2972
2973 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2974 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2975
2976 for my $child ($self->children) { 3780 for my $child ($self->children) {
2977 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3781 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2978 3782
2979 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3783 $X = $child->{force_x} if exists $child->{force_x};
2980 if exists $child->{req_x}; 3784 $Y = $child->{force_y} if exists $child->{force_y};
2981 3785
2982 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3786 $X = _to_pixel $X, $W, $self->{w};
2983 if exists $child->{req_y}; 3787 $Y = _to_pixel $Y, $H, $self->{h};
2984
2985 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2986 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2987 3788
2988 $child->configure ($X, $Y, $W, $H); 3789 $child->configure ($X, $Y, $W, $H);
2989 } 3790 }
2990} 3791}
2991 3792
… …
3002} 3803}
3003 3804
3004sub update { 3805sub update {
3005 my ($self) = @_; 3806 my ($self) = @_;
3006 3807
3007 $self->check_size;
3008 $::WANT_REFRESH++; 3808 $::WANT_REFRESH++;
3009} 3809}
3010 3810
3011sub add { 3811sub add {
3012 my ($self, @children) = @_; 3812 my ($self, @children) = @_;
3013 3813
3014 for my $child (@children) {
3015 $child->{toplevel} = 1; 3814 $_->{is_toplevel} = 1
3016 3815 for @children;
3017 # integerise window positions
3018 $child->{x} = int $child->{x};
3019 $child->{y} = int $child->{y};
3020 }
3021 3816
3022 $self->SUPER::add (@children); 3817 $self->SUPER::add (@children);
3818}
3819
3820sub remove {
3821 my ($self, @children) = @_;
3822
3823 $self->SUPER::remove (@children);
3824
3825 delete $self->{is_toplevel}
3826 for @children;
3023 3827
3024 while (@children) { 3828 while (@children) {
3025 my $w = pop @children; 3829 my $w = pop @children;
3026 push @children, $w->children; 3830 push @children, $w->children;
3027 $w->{visible} = 1; 3831 $w->set_invisible;
3028 }
3029}
3030
3031sub remove {
3032 my ($self, @children) = @_;
3033
3034 $self->SUPER::remove (@children);
3035
3036 while (@children) {
3037 my $w = pop @children;
3038 push @children, $w->children;
3039 delete $w->{visible};
3040 } 3832 }
3041} 3833}
3042 3834
3043sub on_refresh { 3835sub on_refresh {
3044 my ($self, $id, $cb) = @_; 3836 my ($self, $id, $cb) = @_;
… …
3058 while ($self->{refresh_hook}) { 3850 while ($self->{refresh_hook}) {
3059 $_->() 3851 $_->()
3060 for values %{delete $self->{refresh_hook}}; 3852 for values %{delete $self->{refresh_hook}};
3061 } 3853 }
3062 3854
3063 if ($self->{check_size}) { 3855 if ($self->{realloc}) {
3064 my @queue = ([], []); 3856 my %queue;
3857 my @queue;
3858 my $widget;
3065 3859
3066 for (;;) { 3860 outer:
3067 if ($self->{check_size}) { 3861 while () {
3068 # heuristic: check containers last 3862 if (my $realloc = delete $self->{realloc}) {
3069 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3863 for $widget (values %$realloc) {
3070 for values %{delete $self->{check_size}} 3864 $widget->{visible} or next; # do not resize invisible widgets
3865
3866 $queue{$widget+0}++ and next; # duplicates are common
3867
3868 push @{ $queue[$widget->{visible}] }, $widget;
3869 }
3071 } 3870 }
3072 3871
3073 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3872 while () {
3873 @queue or last outer;
3074 3874
3075 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3875 $widget = pop @{ $queue[-1] || [] }
3076 ? @$widget{qw(user_w user_h)} 3876 and last;
3077 : $widget->size_request;
3078
3079 if (delete $widget->{force_alloc}
3080 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3081 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3082 3877
3878 pop @queue;
3879 }
3880
3881 delete $queue{$widget+0};
3882
3883 my ($w, $h) = $widget->size_request;
3884
3885 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3886 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3887
3888 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3889 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3890
3891 $w = $widget->{force_w} if exists $widget->{force_w};
3892 $h = $widget->{force_h} if exists $widget->{force_h};
3893
3894 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3895 || delete $widget->{force_realloc}) {
3083 $widget->{req_w} = $w; 3896 $widget->{req_w} = $w;
3084 $widget->{req_h} = $h; 3897 $widget->{req_h} = $h;
3085 3898
3086 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3899 $self->{size_alloc}{$widget+0} = $widget;
3087 3900
3088 $widget->{parent}->check_size
3089 if $widget->{parent}; 3901 if (my $parent = $widget->{parent}) {
3902 $self->{realloc}{$parent+0} = $parent
3903 unless $queue{$parent+0};
3904
3905 $parent->{force_size_alloc} = 1;
3906 $self->{size_alloc}{$parent+0} = $parent;
3907 }
3090 } 3908 }
3909
3910 delete $self->{realloc}{$widget+0};
3091 } 3911 }
3092 } 3912 }
3093 3913
3094 while ($self->{size_alloc}) { 3914 while (my $size_alloc = delete $self->{size_alloc}) {
3095 for (values %{delete $self->{size_alloc}}) { 3915 my @queue = sort { $b->{visible} <=> $a->{visible} }
3096 my ($widget, $w, $h) = @$_; 3916 values %$size_alloc;
3917
3918 while () {
3919 my $widget = pop @queue || last;
3920
3921 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3097 3922
3098 $w = 0 if $w < 0; 3923 $w = 0 if $w < 0;
3099 $h = 0 if $h < 0; 3924 $h = 0 if $h < 0;
3100 3925
3926 $w = int $w + 0.5;
3927 $h = int $h + 0.5;
3928
3929 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930 $widget->{old_w} = $widget->{w};
3931 $widget->{old_h} = $widget->{h};
3932
3101 $widget->{w} = $w; 3933 $widget->{w} = $w;
3102 $widget->{h} = $h; 3934 $widget->{h} = $h;
3103 $widget->size_allocate ($w, $h); 3935
3104 $widget->emit (size_allocate => $w, $h); 3936 $widget->emit (size_allocate => $w, $h);
3937 }
3105 } 3938 }
3106 } 3939 }
3107 3940
3108 while ($self->{post_alloc_hook}) { 3941 while ($self->{post_alloc_hook}) {
3109 $_->() 3942 $_->()
3110 for values %{delete $self->{post_alloc_hook}}; 3943 for values %{delete $self->{post_alloc_hook}};
3111 } 3944 }
3945
3112 3946
3113 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3114 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3115 glClear GL_COLOR_BUFFER_BIT; 3949 glClear GL_COLOR_BUFFER_BIT;
3116 3950
… …
3118 glLoadIdentity; 3952 glLoadIdentity;
3119 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3120 glMatrixMode GL_MODELVIEW; 3954 glMatrixMode GL_MODELVIEW;
3121 glLoadIdentity; 3955 glLoadIdentity;
3122 3956
3957 {
3958 package CFClient::UI::Base;
3959
3960 ($draw_x, $draw_y, $draw_w, $draw_h) =
3961 (0, 0, $self->{w}, $self->{h});
3962 }
3963
3123 $self->_draw; 3964 $self->_draw;
3124} 3965}
3125 3966
3126############################################################################# 3967#############################################################################
3127 3968

Diff Legend

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