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

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

Diff Legend

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