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

Diff Legend

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