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.214 by root, Wed May 17 22:59:13 2006 UTC vs.
Revision 1.442 by root, Mon Oct 8 17:01:03 2007 UTC

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

Diff Legend

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