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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 2007 UTC

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

Diff Legend

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