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.362 by root, Sat Dec 9 21:26:46 2006 UTC

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

Diff Legend

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