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.227 by root, Wed May 24 03:29:20 2006 UTC vs.
Revision 1.310 by root, Fri Jun 23 20:28:20 2006 UTC

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

Diff Legend

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