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

Diff Legend

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