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.249 by root, Sun May 28 01:40:02 2006 UTC vs.
Revision 1.340 by root, Sun Jul 30 13:16:44 2006 UTC

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

Diff Legend

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