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.340 by root, Sun Jul 30 13:16:44 2006 UTC

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

Diff Legend

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