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

Diff Legend

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