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

Diff Legend

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