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

Diff Legend

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