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

Diff Legend

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