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

Diff Legend

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