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.224 by elmex, Tue May 23 20:00:55 2006 UTC vs.
Revision 1.348 by root, Thu Aug 17 01:27:28 2006 UTC

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

Diff Legend

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