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

Diff Legend

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