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.230 by root, Wed May 24 21:59:54 2006 UTC vs.
Revision 1.362 by root, Sat Dec 9 21:26:46 2006 UTC

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

Diff Legend

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