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.62 by root, Tue Apr 11 13:27:48 2006 UTC vs.
Revision 1.82 by root, Wed Apr 12 02:00:06 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
… …
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73} 71}
74 72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
80
75sub new { 81sub new {
76 my $class = shift; 82 my $class = shift;
77 83
78 bless { @_ }, $class 84 my $self = bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 w => -1,
89 h => -1,
90 @_
91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
79} 100}
80 101
81sub move { 102sub move {
82 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
83 $self->{x} = $x; 104 $self->{x} = $x;
… …
92sub size_request { 113sub size_request {
93 require Carp; 114 require Carp;
94 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
95} 116}
96 117
97sub size_allocate { 118sub _size_allocate {
98 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
99 125
100 $self->{w} = $w; 126 $self->{w} = $w;
101 $self->{h} = $h; 127 $self->{h} = $h;
102}
103 128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
104# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
105sub translate { 139sub translate {
106 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
107 141
108 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
109} 143}
110 144
111sub focus_in { 145sub focus_in {
112 my ($self) = @_; 146 my ($self) = @_;
147
148 return if $FOCUS == $self;
113 149
114 my $focus = $FOCUS; $FOCUS = $self; 150 my $focus = $FOCUS; $FOCUS = $self;
115 $focus->update if $focus; 151 $focus->update if $focus;
116 $FOCUS->update; 152 $FOCUS->update;
117} 153}
… …
125 $focus->update if $focus; #? 161 $focus->update if $focus; #?
126} 162}
127 163
128sub mouse_motion { } 164sub mouse_motion { }
129sub button_up { } 165sub button_up { }
130sub button_down { }
131sub key_down { } 166sub key_down { }
132sub key_up { } 167sub key_up { }
168
169sub button_down {
170 my ($self, $ev, $x, $y) = @_;
171
172 $self->focus_in;
173}
133 174
134sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 175sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
135sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 176sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
136sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 177sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
137sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 178sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
138sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 179sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
139 180
140sub draw { 181sub draw {
141 my ($self) = @_; 182 my ($self) = @_;
142 183
184 return unless $self->{h} && $self->{w};
185
143 glPushMatrix; 186 glPushMatrix;
144 glTranslate $self->{x}, $self->{y}, 0; 187 glTranslate $self->{x}, $self->{y}, 0;
145 $self->_draw; 188 $self->_draw;
189 glPopMatrix;
190
146 if ($self == $HOVER) { 191 if ($self == $HOVER) {
147 glColor 1, 1, 1, 0.4; 192 my ($x, $y) = @$self{qw(x y)};
193
194 glColor 0, 0, 1, 0.2;
148 glEnable GL_BLEND; 195 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
149 glBegin GL_QUADS; 197 glBegin GL_QUADS;
150 glVertex 0 , 0; 198 glVertex $x , $y;
151 glVertex $self->{w}, 0; 199 glVertex $x + $self->{w}, $y;
152 glVertex $self->{w}, $self->{h}; 200 glVertex $x + $self->{w}, $y + $self->{h};
153 glVertex 0 , $self->{h}; 201 glVertex $x , $y + $self->{h};
154 glEnd; 202 glEnd;
155 glDisable GL_BLEND; 203 glDisable GL_BLEND;
156 } 204 }
157 glPopMatrix;
158} 205}
159 206
160sub _draw { 207sub _draw {
161 my ($self) = @_; 208 my ($self) = @_;
162 209
163 warn "no draw defined for $self\n"; 210 warn "no draw defined for $self\n";
164}
165
166sub bbox {
167 my ($self) = @_;
168 my ($w, $h) = $self->size_request;
169 (
170 $self->{x},
171 $self->{y},
172 $self->{x} = $w,
173 $self->{y} = $h
174 )
175} 211}
176 212
177sub find_widget { 213sub find_widget {
178 my ($self, $x, $y) = @_; 214 my ($self, $x, $y) = @_;
179 215
… …
182 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 218 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
183 219
184 () 220 ()
185} 221}
186 222
187sub del_parent { $_[0]->{parent} = undef }
188
189sub set_parent { 223sub set_parent {
190 my ($self, $par) = @_; 224 my ($self, $par) = @_;
191 225
192 $self->{parent} = $par; 226 $self->{parent} = $par;
193 Scalar::Util::weaken $self->{parent}; 227 Scalar::Util::weaken $self->{parent};
… …
202 236
203 $self->{parent}->update 237 $self->{parent}->update
204 if $self->{parent}; 238 if $self->{parent};
205} 239}
206 240
241sub connect {
242 my ($self, $signal, $cb) = @_;
243
244 push @{ $self->{cb}{$signal} }, $cb;
245}
246
247sub emit {
248 my ($self, $signal, @args) = @_;
249
250 $_->($self, @args)
251 for @{$self->{cb}{$signal} || []};
252}
253
207sub DESTROY { 254sub DESTROY {
208 my ($self) = @_; 255 my ($self) = @_;
209 256
210 #$self->deactivate; 257 #$self->deactivate;
211} 258}
212 259
213############################################################################# 260#############################################################################
214 261
215package CFClient::Widget::Container; 262package CFClient::UI::DrawBG;
216 263
217our @ISA = CFClient::Widget::; 264our @ISA = CFClient::UI::Base::;
265
266use strict;
267use SDL::OpenGL;
218 268
219sub new { 269sub new {
270 my $class = shift;
271
272 # range [value, low, high, page]
273
274 $class->SUPER::new (
275 bg => [0, 0, 0, 0.2],
276 active_bg => [1, 1, 1, 0.5],
277 @_
278 )
279}
280
281sub _draw {
282 my ($self) = @_;
283
284 my ($w, $h) = @$self{qw(w h)};
285
286 glEnable GL_BLEND;
287 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
288 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
289
290 glBegin GL_QUADS;
291 glVertex 0 , 0;
292 glVertex 0 , $h;
293 glVertex $w, $h;
294 glVertex $w, 0;
295 glEnd;
296
297 glDisable GL_BLEND;
298}
299
300#############################################################################
301
302package CFClient::UI::Empty;
303
304our @ISA = CFClient::UI::Base::;
305
306sub size_request {
307 (0, 0)
308}
309
310sub draw { }
311
312#############################################################################
313
314package CFClient::UI::Container;
315
316our @ISA = CFClient::UI::Base::;
317
318sub new {
220 my ($class, @widgets) = @_; 319 my ($class, %arg) = @_;
221 320
321 my $children = delete $arg{children} || [];
322
222 my $self = $class->SUPER::new (children => []); 323 my $self = $class->SUPER::new (children => [], %arg);
223 $self->add ($_) for @widgets; 324 $self->add ($_) for @$children;
224 325
225 $self 326 $self
226} 327}
227 328
228sub add { 329sub add {
229 my ($self, $chld, $expand) = @_; 330 my ($self, $chld) = @_;
230 331
231 $chld->{expand} = $expand;
232 $chld->set_parent ($self); 332 $chld->set_parent ($self);
233 333
234 @{$self->{children}} = 334 $self->{children} = [
235 sort { $a->{z} <=> $b->{z} } 335 sort { $a->{z} <=> $b->{z} }
236 @{$self->{children}}, $chld; 336 @{$self->{children}}, $chld
337 ];
237 338
238 $self->size_allocate ($self->{w}, $self->{h}) 339 $self->{w} = $self->{h} = -1;
239 if $self->{w}; #TODO: check for "realised state" 340 $self->update;
240} 341}
241 342
242sub remove { 343sub remove {
243 my ($self, $widget) = @_; 344 my ($self, $widget) = @_;
244 345
245 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 346 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
246 347
247 $self->size_allocate ($self->{w}, $self->{h}); 348 $self->size_allocate (0, 0, $self->{w}, $self->{h});
248} 349}
249 350
250sub find_widget { 351sub find_widget {
251 my ($self, $x, $y) = @_; 352 my ($self, $x, $y) = @_;
252 353
… …
269 $_->draw for @{$self->{children}}; 370 $_->draw for @{$self->{children}};
270} 371}
271 372
272############################################################################# 373#############################################################################
273 374
274package CFClient::Widget::Bin; 375package CFClient::UI::Bin;
275 376
276our @ISA = CFClient::Widget::Container::; 377our @ISA = CFClient::UI::Container::;
378
379sub new {
380 my ($class, %arg) = @_;
381
382 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
383
384 $class->SUPER::new (children => [$child], %arg)
385}
386
387sub add {
388 my ($self, $widget) = @_;
389
390 $self->{children} = [];
391
392 $self->SUPER::add ($widget);
393}
394
395sub remove {
396 my ($self, $widget) = @_;
397
398 $self->SUPER::remove ($widget);
399
400 $self->{children} = [new CFClient::UI::Empty]
401 unless @{$self->{children}};
402}
277 403
278sub child { $_[0]->{children}[0] } 404sub child { $_[0]->{children}[0] }
279 405
280sub size_request { 406sub size_request {
281 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 407 $_[0]{children}[0]->size_request
282} 408}
283 409
284sub size_allocate { 410sub size_allocate {
285 my ($self, $w, $h) = @_; 411 my ($self, $x, $y, $w, $h) = @_;
286 412
287 $self->SUPER::size_allocate ($w, $h); 413 $self->_size_allocate ($x, $y, $w, $h) or return;
414
288 $self->{children}[0]->size_allocate ($w, $h) 415 $self->{children}[0]->size_allocate (0, 0, $w, $h);
289 if $self->{children}[0]
290} 416}
291 417
292############################################################################# 418#############################################################################
293 419
294package CFClient::Widget::Window; 420package CFClient::UI::Window;
295 421
296our @ISA = CFClient::Widget::Bin::; 422our @ISA = CFClient::UI::Bin::;
297 423
298use SDL::OpenGL; 424use SDL::OpenGL;
299 425
300sub new { 426sub new {
301 my ($class, $x, $y, $z, $w, $h) = @_; 427 my ($class, %arg) = @_;
302 428
303 my $self = $class->SUPER::new; 429 my $self = $class->SUPER::new (%arg);
304
305 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
306} 430}
307 431
308sub update { 432sub update {
309 my ($self) = @_; 433 my ($self) = @_;
310 434
435 # we want to do this delayed...
311 $self->render_chld; 436 $self->render_chld;
312 $self->SUPER::update; 437 $self->SUPER::update;
313} 438}
314 439
315sub render_chld { 440sub render_chld {
… …
320 $self->{w}, $self->{h}, sub { $self->child->draw } 445 $self->{w}, $self->{h}, sub { $self->child->draw }
321 ); 446 );
322} 447}
323 448
324sub size_allocate { 449sub size_allocate {
325 my ($self, $w, $h) = @_; 450 my ($self, $x, $y, $w, $h) = @_;
326 451
327 $self->{w} = $w; 452 $self->_size_allocate ($x, $y, $w, $h) or return;
328 $self->{h} = $h;
329 453
330 $self->child->size_allocate ($w, $h); 454 $self->child->size_allocate (0, 0, $w, $h);
331 455
332 $self->render_chld; 456 $self->render_chld;
333} 457}
334 458
335sub _draw { 459sub _draw {
… …
339 463
340 my $tex = $self->{texture} 464 my $tex = $self->{texture}
341 or return; 465 or return;
342 466
343 glEnable GL_BLEND; 467 glEnable GL_BLEND;
468 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
344 glEnable GL_TEXTURE_2D; 469 glEnable GL_TEXTURE_2D;
345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
346 471
347 $tex->draw_quad (0, 0, $w, $h); 472 $tex->draw_quad (0, 0, $w, $h);
348 473
… …
350 glDisable GL_TEXTURE_2D; 475 glDisable GL_TEXTURE_2D;
351} 476}
352 477
353############################################################################# 478#############################################################################
354 479
355package CFClient::Widget::Frame; 480package CFClient::UI::Frame;
356 481
357our @ISA = CFClient::Widget::Bin::; 482our @ISA = CFClient::UI::Bin::;
358 483
359use SDL::OpenGL; 484use SDL::OpenGL;
360 485
361sub size_request { 486sub size_request {
362 my ($self) = @_; 487 my ($self) = @_;
… …
367 492
368 map { $_ + 4 } $chld->size_request; 493 map { $_ + 4 } $chld->size_request;
369} 494}
370 495
371sub size_allocate { 496sub size_allocate {
372 my ($self, $w, $h) = @_; 497 my ($self, $x, $y, $w, $h) = @_;
373 498
374 $self->{w} = $w; 499 $self->_size_allocate ($x, $y, $w, $h) or return;
375 $self->{h} = $h;
376 500
377 $self->child->size_allocate ($w - 4, $h - 4); 501 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
378 $self->child->move (2, 2);
379} 502}
380 503
381sub _draw { 504sub _draw {
382 my ($self) = @_; 505 my ($self) = @_;
383 506
… …
396 $chld->draw; 519 $chld->draw;
397} 520}
398 521
399############################################################################# 522#############################################################################
400 523
401package CFClient::Widget::FancyFrame; 524package CFClient::UI::FancyFrame;
402 525
403our @ISA = CFClient::Widget::Bin::; 526our @ISA = CFClient::UI::Bin::;
404 527
405use SDL::OpenGL; 528use SDL::OpenGL;
406 529
407my @tex = 530my @tex =
408 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
409 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
410 533
411sub size_request { 534sub size_request {
412 my ($self) = @_; 535 my ($self) = @_;
413 536
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538
414 my ($w, $h) = $self->SUPER::size_request; 539 my ($w, $h) = $self->SUPER::size_request;
415 540
416 $h += $tex[1]->{height}; 541 $h += $tex[1]->{h};
417 $h += $tex[4]->{height}; 542 $h += $tex[4]->{h};
418 $w += $tex[2]->{width}; 543 $w += $tex[2]->{w};
419 $w += $tex[3]->{width}; 544 $w += $tex[3]->{w};
420 545
421 ($w, $h) 546 ($w, $h)
422} 547}
423 548
424sub size_allocate { 549sub size_allocate {
425 my ($self, $w, $h) = @_; 550 my ($self, $x, $y, $w, $h) = @_;
426 551
427 $self->SUPER::size_allocate ($w, $h); 552 $self->_size_allocate ($x, $y, $w, $h) or return;
428 553
429 $h -= $tex[1]->{height}; 554 $h -= $tex[1]{h};
430 $h -= $tex[4]->{height}; 555 $h -= $tex[4]{h};
431 $w -= $tex[2]->{width}; 556 $w -= $tex[2]{w};
432 $w -= $tex[3]->{width}; 557 $w -= $tex[3]{w};
433 558
434 $h = $h < 0 ? 0 : $h; 559 $h = $h < 0 ? 0 : $h;
435 $w = $w < 0 ? 0 : $w; 560 $w = $w < 0 ? 0 : $w;
436 561
437 $self->child->size_allocate ($w, $h); 562 my $child = $self->child;
438 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 563
564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565}
566
567sub button_down {
568 my ($self, $ev, $x, $y) = @_;
569
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
572
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574 my ($bw, $bh) = ($self->{w}, $self->{h});
575
576 $self->{motion} = sub {
577 my ($ev, $x, $y) = @_;
578
579 ($x, $y) = ($ev->motion_x, $ev->motion_y);
580
581 $self->{user_w} = $bw + $x - $ox;
582 $self->{user_h} = $bh + $y - $oy;
583 $self->update;
584 };
585
586 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) {
588
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590 my ($bx, $by) = ($self->{x}, $self->{y});
591
592 $self->{motion} = sub {
593 my ($ev, $x, $y) = @_;
594
595 ($x, $y) = ($ev->motion_x, $ev->motion_y);
596
597 $self->move ($bx + $x - $ox, $by + $y - $oy);
598 $self->update;
599 };
600 }
601}
602
603sub button_up {
604 my ($self, $ev, $x, $y) = @_;
605
606 delete $self->{motion};
607}
608
609sub mouse_motion {
610 my ($self, $ev, $x, $y) = @_;
611
612 $self->{motion}->($ev, $x, $y) if $self->{motion};
439} 613}
440 614
441sub _draw { 615sub _draw {
442 my ($self) = @_; 616 my ($self) = @_;
443 617
444 my ($w, $h) = ($self->{w}, $self->{h}); 618 my ($w, $h) = ($self->{w}, $self->{h});
445 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
446 620
447 glEnable GL_BLEND; 621 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448 glEnable GL_TEXTURE_2D; 623 glEnable GL_TEXTURE_2D;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
451 625
452 my $top = $tex[1]; 626 my $top = $tex[1];
453 $top->draw_quad (0, 0, $w, $top->{height}); 627 $top->draw_quad (0, 0, $w, $top->{h});
454 628
455 my $left = $tex[3]; 629 my $left = $tex[3];
456 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
457 631
458 my $right = $tex[2]; 632 my $right = $tex[2];
459 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch); 633 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
460 634
461 my $bottom = $tex[4]; 635 my $bottom = $tex[4];
462 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height}); 636 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
463 637
464 my $bg = $tex[0]; 638 my $bg = $tex[0];
639
465 glBindTexture GL_TEXTURE_2D, $bg->{name}; 640 glBindTexture GL_TEXTURE_2D, $bg->{name};
466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
467 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
469 642
470 my $rep_x = $cw / $bg->{width}; 643 my $rep_x = $cw / $bg->{w};
471 my $rep_y = $ch / $bg->{height}; 644 my $rep_y = $ch / $bg->{h};
472 645
473 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 646 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
474 647
648 glDisable GL_TEXTURE_2D;
475 glDisable GL_BLEND; 649 glDisable GL_BLEND;
476 glDisable GL_TEXTURE_2D;
477 650
478 $self->child->draw; 651 $self->child->draw;
479 652
480} 653}
481 654
482############################################################################# 655#############################################################################
483 656
484package CFClient::Widget::Table; 657package CFClient::UI::Table;
485 658
486our @ISA = CFClient::Widget::Bin::; 659our @ISA = CFClient::UI::Base::;
660
661use List::Util qw(max sum);
487 662
488use SDL::OpenGL; 663use SDL::OpenGL;
664
665sub new {
666 my $class = shift;
667
668 $class->SUPER::new (
669 col_expand => [],
670 @_
671 )
672}
489 673
490sub add { 674sub add {
491 my ($self, $x, $y, $chld) = @_; 675 my ($self, $x, $y, $chld) = @_;
492 my $old_chld = $self->{children}[$y][$x];
493 676
494 $self->{children}[$y][$x] = $chld; 677 $self->{children}[$y][$x] = $chld;
495 $chld->set_parent ($self); 678 $chld->set_parent ($self);
679
680 $self->{w} = $self->{h} = -1;
496 $self->update; 681 $self->update;
497} 682}
498 683
499sub max_row_height { 684sub get_wh {
500 my ($self, $row) = @_; 685 my ($self) = @_;
501 686
502 my $hs = 0; 687 my (@w, @h);
503 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 688
689 for my $y (0 .. $#{$self->{children}}) {
504 my $c = $self->{children}->[$row]->[$xi]; 690 my $row = $self->{children}[$y]
505 if ($c) { 691 or next;
692
693 for my $x (0 .. $#$row) {
694 my $widget = $row->[$x]
695 or next;
506 my ($w, $h) = $c->size_request; 696 my ($w, $h) = $widget->size_request;
507 if ($hs < $h) { $hs = $h } 697
698 $w[$x] = max $w[$x], $w;
699 $h[$y] = max $h[$y], $h;
508 } 700 }
509 } 701 }
510 return $hs;
511}
512 702
513sub max_col_width { 703 (\@w, \@h)
704}
705
706sub size_request {
514 my ($self, $col) = @_; 707 my ($self) = @_;
515 708
709 my ($ws, $hs) = $self->get_wh;
710
711 (
712 (sum @$ws),
713 (sum @$hs),
714 )
715}
716
717sub size_allocate {
718 my ($self, $x, $y, $w, $h) = @_;
719
720 $self->_size_allocate ($x, $y, $w, $h) or return;
721
722 my ($ws, $hs) = $self->get_wh;
723
724 my $req_w = sum @$ws;
725 my $req_h = sum @$hs;
726
727 # TODO: nicer code && do row_expand
728 my @col_expand = @{$self->{col_expand}};
729 @col_expand = (1) x @$ws unless @col_expand;
730 my $col_expand = (sum @col_expand) || 1;
731
732 # linearly scale sizes
733 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
734 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
735
736 my $y;
737
738 for my $r (0 .. $#{$self->{children}}) {
739 my $row = $self->{children}[$r]
740 or next;
741
516 my $ws = 0; 742 my $x = 0;
517 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 743 my $row_h = $hs->[$r];
518 my $c = ($self->{children}->[$yi] || [])->[$col]; 744
519 if ($c) { 745 for my $c (0 .. $#$row) {
520 my ($w, $h) = $c->size_request; 746 my $widget = $row->[$c]
521 if ($ws < $w) { $ws = $w } 747 or next;
748
749 my $col_w = $ws->[$c];
750
751 $widget->size_allocate ($x, $y, $col_w, $row_h);
752
753 $x += $col_w;
522 } 754 }
755
756 $y += $row_h;
523 } 757 }
524 return $ws; 758
525} 759}
760
761sub find_widget {
762 my ($self, $x, $y) = @_;
763
764 $x -= $self->{x};
765 $y -= $self->{y};
766
767 my $res;
768
769 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
770 $res = $_->find_widget ($x, $y)
771 and return $res;
772 }
773
774 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
775}
776
777sub _draw {
778 my ($self) = @_;
779
780 for (grep $_, @{$self->{children}}) {
781 $_->draw for grep $_, @$_;
782 }
783}
784
785#############################################################################
786
787package CFClient::UI::HBox;
788
789# TODO: wrap into common Box base class
790
791our @ISA = CFClient::UI::Container::;
526 792
527sub size_request { 793sub size_request {
528 my ($self) = @_; 794 my ($self) = @_;
529 795
796 my @alloc = map [$_->size_request], @{$self->{children}};
797
798 (
799 (List::Util::sum map $_->[0], @alloc),
800 (List::Util::max map $_->[1], @alloc),
801 )
802}
803
804sub size_allocate {
805 my ($self, $x, $y, $w, $h) = @_;
806
807 $self->_size_allocate ($x, $y, $w, $h) or return;
808
809 return unless $self->{w};
810
530 my ($hs, $ws) = (0, 0); 811 ($h, $w) = ($w, $h);
531 812
532 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 813 my $children = $self->{children};
533 $hs += $self->max_row_height ($yi);
534 }
535 814
536 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 815 my @h = map +($_->size_request)[0], @$children;
537 my $wm = 0; 816
538 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 817 my $req_h = List::Util::sum @h;
539 $wm += $self->max_col_width ($xi) 818
819 if ($req_h > $h) {
820 # ah well, not enough space
821 $_ *= $h / $req_h for @h;
822 } else {
823 my $exp = List::Util::sum map $_->{expand}, @$children;
824 $exp ||= 1;
825
826 for (0 .. $#$children) {
827 my $child = $children->[$_];
828
829 my $alloc_h = $h[$_];
830 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
831 $h[$_] = $alloc_h;
540 } 832 }
541 if ($ws < $wm) { $ws = $wm }
542 } 833 }
543
544 return ($ws, $hs);
545}
546
547sub _draw {
548 my ($self) = @_;
549 834
550 my $y = 0; 835 my $y = 0;
551 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 836 for (0 .. $#$children) {
837 my $child = $children->[$_];
552 my $x = 0; 838 my $h = $h[$_];
839 $child->size_allocate ($y, 0, $h, $w);
553 840
554 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 841 $y += $h;
555
556 my $c = $self->{children}->[$yi]->[$xi];
557 if ($c) {
558 $c->move ($x, $y, 0); #TODO: Move to size_request
559 $c->draw if $c;
560 }
561
562 $x += $self->max_col_width ($xi);
563 }
564
565 $y += $self->max_row_height ($yi);
566 } 842 }
567} 843}
568 844
569############################################################################# 845#############################################################################
570 846
571package CFClient::Widget::VBox; 847package CFClient::UI::VBox;
572 848
849# TODO: wrap into common Box base class
850
573our @ISA = CFClient::Widget::Container::; 851our @ISA = CFClient::UI::Container::;
574
575use SDL::OpenGL;
576 852
577sub size_request { 853sub size_request {
578 my ($self) = @_; 854 my ($self) = @_;
579 855
580 my @alloc = map [$_->size_request], @{$self->{children}}; 856 my @alloc = map [$_->size_request], @{$self->{children}};
… …
584 (List::Util::sum map $_->[1], @alloc), 860 (List::Util::sum map $_->[1], @alloc),
585 ) 861 )
586} 862}
587 863
588sub size_allocate { 864sub size_allocate {
589 my ($self, $w, $h) = @_; 865 my ($self, $x, $y, $w, $h) = @_;
590 866
591 $self->w ($w); 867 $self->_size_allocate ($x, $y, $w, $h) or return;
592 $self->h ($h);
593 868
594 my $exp; 869 return unless $self->{h};
595 my @oth; 870
596 # find expand widget 871 my $children = $self->{children};
597 for (@{$self->{children}}) { 872
598 if ($_->{expand}) { 873 my @h = map +($_->size_request)[1], @$children;
874
875 my $req_h = List::Util::sum @h;
876
877 if ($req_h > $h) {
878 # ah well, not enough space
879 $_ *= $h / $req_h for @h;
880 } else {
881 my $exp = List::Util::sum map $_->{expand}, @$children;
599 $exp = $_; 882 $exp ||= 1;
600 last; 883
884 for (0 .. $#$children) {
885 my $child = $children->[$_];
886
887 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
601 } 888 }
602 push @oth, $_;
603 }
604
605 my ($ow, $oh);
606
607 # get sizes of other widgets
608 for (@oth) {
609 my ($w, $h) = $_->size_request;
610 $oh += $h;
611 if ($ow < $w) { $ow = $w }
612 } 889 }
613 890
614 my $y = 0; 891 my $y = 0;
615 for (@{$self->{children}}) { 892 for (0 .. $#$children) {
616 $_->move (0, $y); 893 my $child = $children->[$_];
617 894 my $h = $h[$_];
618 if ($_ == $exp) {
619 $_->size_allocate ($w, $h - $oh);
620 $y += $h - $oh;
621 } else {
622 my ($cw, $h) = $_->size_request;
623 $_->size_allocate ($w, $h); 895 $child->size_allocate (0, $y, $w, $h);
896
624 $y += $h; 897 $y += $h;
625 }
626 } 898 }
627} 899}
628 900
629############################################################################# 901#############################################################################
630 902
631package CFClient::Widget::Label; 903package CFClient::UI::Label;
632 904
633our @ISA = CFClient::Widget::; 905our @ISA = CFClient::UI::Base::;
634 906
635use SDL::OpenGL; 907use SDL::OpenGL;
636 908
637sub new { 909sub new {
638 my ($class, $x, $y, $z, $height, $text) = @_; 910 my ($class, %arg) = @_;
639 911
640 $height ||= $::FONTSIZE;
641
642 # TODO: color, and make height, xyz etc. optional
643 my $self = $class->SUPER::new ( 912 my $self = $class->SUPER::new (
644 color => [1, 1, 1], 913 fg => [1, 1, 1],
645 x => $x, 914 height => $::FONTSIZE,
646 y => $y, 915 text => "",
647 z => $z, 916 align => -1,
648 height => $height, 917 padding => 2,
649 layout => new CFClient::Layout $height, 918 layout => new CFClient::Layout,
919 %arg
650 ); 920 );
651 921
652 $self->set_text ($text); 922 $self->set_text ($self->{text});
653 923
654 $self 924 $self
925}
926
927sub escape_text {
928 local $_ = $_[1];
929
930 s/&/&amp;/g;
931 s/>/&gt;/g;
932 s/</&lt;/g;
933
934 $_[1]
655} 935}
656 936
657sub set_text { 937sub set_text {
658 my ($self, $text) = @_; 938 my ($self, $text) = @_;
659 939
660 $self->{text} = $text; 940 $self->{text} = $text;
661 $self->{layout}->set_markup ($text); 941 $self->{layout}->set_markup ($text);
662 942
663 delete $self->{texture}; 943 delete $self->{texture};
944# $self->{w} = $self->{h} = -1;
945 $self->update;
664} 946}
665 947
666sub get_text { 948sub get_text {
667 my ($self, $text) = @_; 949 my ($self, $text) = @_;
668 950
… …
671 953
672sub size_request { 954sub size_request {
673 my ($self) = @_; 955 my ($self) = @_;
674 956
675 $self->{layout}->set_width; 957 $self->{layout}->set_width;
958 $self->{layout}->set_height ($self->{height});
676 $self->{layout}->size 959 my ($w, $h) = $self->{layout}->size;
677# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 960
678# ( 961 (
679# $self->{texture}{width}, 962 $w + $self->{padding} * 2,
680# $self->{texture}{height}, 963 $h + $self->{padding} * 2,
681# ) 964 )
682# } else {
683# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
684#
685# ($w, $h)
686# }
687} 965}
688 966
689sub size_allocate { 967sub size_allocate {
690 my ($self, $w, $h) = @_; 968 my ($self, $x, $y, $w, $h) = @_;
691 969
692 $self->SUPER::size_allocate ($w, $h); 970 $self->_size_allocate ($x, $y, $w, $h) or return;
971
693 delete $self->{texture}; 972 delete $self->{texture};
973}
974
975sub update {
976 my ($self) = @_;
977
978 delete $self->{texture};
979 $self->SUPER::update;
694} 980}
695 981
696sub _draw { 982sub _draw {
697 my ($self) = @_; 983 my ($self) = @_;
698 984
699 my $tex = $self->{texture} ||= do { 985 my $tex = $self->{texture} ||= do {
700 $self->{layout}->set_width ($self->{w}); 986 $self->{layout}->set_width ($self->{w});
987 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
701 new_from_layout CFClient::Texture $self->{layout}; 988 new_from_layout CFClient::Texture $self->{layout}
702 }; 989 };
703 990
704 glEnable GL_BLEND; 991 glEnable GL_BLEND;
992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
705 glEnable GL_TEXTURE_2D; 993 glEnable GL_TEXTURE_2D;
706 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
708 995
709 glColor @{$self->{color}}; 996 glColor @{$self->{fg}};
710 997
998 my $x =
999 $self->{align} < 0 ? $self->{padding}
1000 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1001 : ($self->{w} - $tex->{w}) * 0.5;
1002
1003 glTranslate $x, $self->{padding}, 0;
711 $tex->draw_quad (0, 0); 1004 $tex->draw_quad (0, 0);
712 1005
1006 glDisable GL_TEXTURE_2D;
713 glDisable GL_BLEND; 1007 glDisable GL_BLEND;
714 glDisable GL_TEXTURE_2D;
715} 1008}
716 1009
717############################################################################# 1010#############################################################################
718 1011
719package CFClient::Widget::Entry; 1012package CFClient::UI::Entry;
720 1013
721our @ISA = CFClient::Widget::Label::; 1014our @ISA = CFClient::UI::Label::;
722 1015
723use SDL; 1016use SDL;
724use SDL::OpenGL; 1017use SDL::OpenGL;
725 1018
1019sub new {
1020 my $class = shift;
1021
1022 $class->SUPER::new (
1023 fg => [1, 1, 1],
1024 bg => [0, 0, 0, 0.2],
1025 active_bg => [1, 1, 1, 0.5],
1026 active_fg => [0, 0, 0],
1027 @_
1028 )
1029}
1030
1031sub _set_text {
1032 my ($self, $text) = @_;
1033
1034 $self->{last_activity} = $::NOW;
1035
1036 $self->{text} = $text;
1037 $self->{layout}->set_width ($self->{w});
1038 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1039
1040 $text =~ s/./*/g if $self->{hidden};
1041
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1043
1044 $text = substr $text, 0, $self->{cursor};
1045 utf8::encode $text;
1046
1047 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048}
1049
1050sub size_request {
1051 my ($self) = @_;
1052
1053 my ($w, $h) = $self->SUPER::size_request;
1054
1055 ($w + 1, $h) # add 1 for cursor
1056}
1057
1058sub size_allocate {
1059 my ($self, $x, $y, $w, $h) = @_;
1060
1061 $self->SUPER::size_allocate ($x, $y, $w, $h);
1062
1063 $self->_set_text ($self->{text});
1064}
1065
1066sub set_text {
1067 my ($self, $text) = @_;
1068
1069 $self->{cursor} = length $text;
1070 $self->_set_text ($text);
1071 $self->update;
1072}
1073
726sub key_down { 1074sub key_down {
727 my ($self, $ev) = @_; 1075 my ($self, $ev) = @_;
728 1076
729 my $mod = $ev->key_mod; 1077 my $mod = $ev->key_mod;
730 my $sym = $ev->key_sym; 1078 my $sym = $ev->key_sym;
… …
732 my $uni = $ev->key_unicode; 1080 my $uni = $ev->key_unicode;
733 1081
734 my $text = $self->get_text; 1082 my $text = $self->get_text;
735 1083
736 if ($sym == SDLK_BACKSPACE) { 1084 if ($sym == SDLK_BACKSPACE) {
737 substr $text, -1, 1, ''; 1085 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1086 } elsif ($sym == SDLK_DELETE) {
1087 substr $text, $self->{cursor}, 1, "";
1088 } elsif ($sym == SDLK_LEFT) {
1089 --$self->{cursor} if $self->{cursor};
1090 } elsif ($sym == SDLK_RIGHT) {
1091 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1092 } elsif ($sym == SDLK_HOME) {
1093 $self->{cursor} = 0;
1094 } elsif ($sym == SDLK_END) {
1095 $self->{cursor} = length $text;
738 } elsif ($uni) { 1096 } elsif ($uni) {
739 $text .= chr $uni; 1097 substr $text, $self->{cursor}++, 0, chr $uni;
740 } 1098 }
741 1099
742 $self->set_text ($text); 1100 $self->_set_text ($text);
1101 $self->update;
1102}
1103
1104sub focus_in {
1105 my ($self) = @_;
1106
1107 $self->{last_activity} = $::NOW;
1108
1109 $self->SUPER::focus_in;
743} 1110}
744 1111
745sub button_down { 1112sub button_down {
746 my ($self, $ev) = @_; 1113 my ($self, $ev, $x, $y) = @_;
747 1114
748 $self->focus_in; 1115 $self->SUPER::button_down ($ev, $x, $y);
1116
1117 my $idx = $self->{layout}->xy_to_index ($x, $y);
1118
1119 # byte-index to char-index
1120 my $text = $self->{text};
1121 utf8::encode $text;
1122 $self->{cursor} = length substr $text, 0, $idx;
1123
1124 $self->_set_text ($self->{text});
1125 $self->update;
749} 1126}
750 1127
751sub mouse_motion { 1128sub mouse_motion {
752 my ($self, $ev, $x, $y) = @_; 1129 my ($self, $ev, $x, $y) = @_;
753 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1130# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
754} 1131}
755 1132
756sub _draw { 1133sub _draw {
757 my ($self) = @_; 1134 my ($self) = @_;
758 1135
1136 local $self->{fg} = $self->{fg};
1137
759 if ($FOCUS == $self) { 1138 if ($FOCUS == $self) {
760 glColor 1, 1, 1; 1139 glColor @{$self->{active_bg}};
1140 $self->{fg} = $self->{active_fg};
761 } else { 1141 } else {
762 glColor 0.7, 0.7, 0.7; 1142 glColor @{$self->{bg}};
763 } 1143 }
764 1144
1145 glEnable GL_BLEND;
1146 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
765 glBegin GL_QUADS; 1147 glBegin GL_QUADS;
766 glVertex 0 , 0; 1148 glVertex 0 , 0;
767 glVertex 0 , $self->{h} - 1; 1149 glVertex 0 , $self->{h};
768 glVertex $self->{w} - 1, $self->{h} - 1; 1150 glVertex $self->{w}, $self->{h};
769 glVertex $self->{w} - 1, 0; 1151 glVertex $self->{w}, 0;
770 glEnd; 1152 glEnd;
1153 glDisable GL_BLEND;
771 1154
772 $self->SUPER::_draw; 1155 $self->SUPER::_draw;
773}
774 1156
775############################################################################# 1157 #TODO: force update every cursor change :(
1158 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1159 glColor @{$self->{fg}};
1160 glBegin GL_LINES;
1161 glVertex $self->{cur_x}, $self->{cur_y};
1162 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1163 glEnd;
1164 }
1165}
776 1166
777package CFClient::Widget::MapWidget; 1167#############################################################################
778 1168
779use strict; 1169package CFClient::UI::Button;
780 1170
781use List::Util qw(min max); 1171our @ISA = CFClient::UI::Label::;
782 1172
783use SDL; 1173use SDL;
784use SDL::OpenGL; 1174use SDL::OpenGL;
785use SDL::OpenGL::Constants;
786 1175
1176sub new {
1177 my $class = shift;
1178
1179 $class->SUPER::new (
1180 padding => 4,
1181 fg => [1, 1, 1],
1182 bg => [1, 1, 1, 0.2],
1183 active_bg => [0, 0, 0, 0.5],
1184 active_fg => [1, 1, 0],
1185 border_fg => [1, 1, 0],
1186 @_
1187 )
1188}
1189
1190sub button_up {
1191 my ($self, $ev, $x, $y) = @_;
1192
1193 if ($x >= 0 && $x < $self->{w}
1194 && $y >= 0 && $y < $self->{h}) {
1195 $self->emit ("activate");
1196 }
1197}
1198
1199sub _draw {
1200 my ($self) = @_;
1201
1202 local $self->{fg} = $self->{fg};
1203
1204 glEnable GL_BLEND;
1205 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1206
1207 glTranslate 0.375, 0.375, 0; # make line and polyogon coordinates behave similarly
1208
1209 glBegin GL_LINE_LOOP;
1210 glColor @{$self->{border_fg}};
1211 glVertex 1 , 1;
1212 glVertex 1 , $self->{h} - 2;
1213 glVertex $self->{w} - 2, $self->{h} - 2;
1214 glVertex $self->{w} - 2, 1;
1215 glEnd;
1216
1217 if ($GRAB == $self) {
1218 glColor @{$self->{active_bg}};
1219 $self->{fg} = $self->{active_fg};
1220 } else {
1221 glColor @{$self->{bg}};
1222 }
1223
1224 glBegin GL_QUADS;
1225 glVertex 2 , 2;
1226 glVertex 2 , $self->{h} - 2;
1227 glVertex $self->{w} - 2, $self->{h} - 2;
1228 glVertex $self->{w} - 2, 2;
1229 glEnd;
1230 glDisable GL_BLEND;
1231
1232 $self->SUPER::_draw;
1233}
1234
1235#############################################################################
1236
1237package CFClient::UI::Slider;
1238
1239use strict;
1240
1241use SDL::OpenGL;
1242
1243our @ISA = CFClient::UI::DrawBG::;
1244
1245sub new {
1246 my $class = shift;
1247
1248 # range [value, low, high, page]
1249
1250 my $self = $class->SUPER::new (
1251 fg => [1, 1, 1],
1252 active_fg => [0, 0, 0],
1253 range => [0, 0, 100, 10],
1254 req_w => 40,
1255 req_h => 10,
1256 vertical => 0,
1257 @_
1258 );
1259
1260 $self
1261}
1262
1263sub size_request {
1264 my ($self) = @_;
1265
1266 my $w = $self->{req_w};
1267 my $h = $self->{req_h};
1268
1269 $self->{vertical} ? ($h, $w) : ($w, $h)
1270}
1271
1272sub button_down {
1273 my ($self, $ev, $x, $y) = @_;
1274
1275 $self->SUPER::button_down ($ev, $x, $y);
1276 $self->mouse_motion ($ev, $x, $y);
1277}
1278
1279sub mouse_motion {
1280 my ($self, $ev, $x, $y) = @_;
1281
1282 if ($GRAB == $self) {
1283 my ($value, $lo, $hi, $page) = @{$self->{range}};
1284
1285 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1286
1287 $x = $x * ($hi - $lo) / $w + $lo;
1288 $x = $lo if $x < $lo;
1289 $x = $hi - $page if $x > $hi - $page;
1290 $self->{range}[0] = $x;
1291
1292 $self->emit (changed => $x);
1293 $self->update;
1294 }
1295}
1296
1297sub _draw {
1298 my ($self) = @_;
1299
1300 $self->SUPER::_draw ();
1301
1302 my ($w, $h) = @$self{qw(w h)};
1303
1304 if ($self->{vertical}) {
1305 # draw a vertical slider like a rotated horizontal slider
1306
1307 glRotate 90, 0, 0, 1;
1308 glTranslate 0, -$self->{w}, 0;
1309
1310 ($w, $h) = ($h, $w);
1311 }
1312
1313 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1314 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1315
1316 my ($value, $lo, $hi, $page) = @{$self->{range}};
1317
1318 $page = int $page * $w / ($hi - $lo);
1319 $value = int +($value - $lo) * $w / ($hi - $lo);
1320
1321 $w -= $page;
1322 $page &= ~1;
1323 glTranslate $page * 0.5, 0, 0;
1324 $page ||= 2;
1325
1326 glColor @$fg;
1327 glBegin GL_LINES;
1328 glVertex 0, 0; glVertex 0, $h;
1329 glVertex $w - 1, 0; glVertex $w - 1, $h;
1330 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1331 glEnd;
1332
1333 my $knob_a = $value - $page * 0.5;
1334 my $knob_b = $value + $page * 0.5;
1335
1336 glBegin GL_QUADS;
1337 glColor @$fg;
1338 glVertex $knob_a, 0;
1339 glVertex $knob_a, $h;
1340 glVertex $knob_b, $h;
1341 glVertex $knob_b, 0;
1342
1343 if ($knob_a < $knob_b - 2) {
1344 glColor @$bg;
1345 glVertex $knob_a + 1, 1;
1346 glVertex $knob_a + 1, $h - 1;
1347 glVertex $knob_b - 1, $h - 1;
1348 glVertex $knob_b - 1, 1;
1349 }
1350 glEnd;
1351}
1352
1353#############################################################################
1354
1355package CFClient::UI::MapWidget;
1356
1357use strict;
1358
1359use List::Util qw(min max);
1360
1361use SDL;
1362use SDL::OpenGL;
1363
787our @ISA = CFClient::Widget::; 1364our @ISA = CFClient::UI::Base::;
1365
1366sub new {
1367 my $class = shift;
1368
1369 $class->SUPER::new (
1370 z => -1,
1371 list => (glGenLists 1),
1372 @_
1373 )
1374}
788 1375
789sub key_down { 1376sub key_down {
790 print "MAPKEYDOWN\n"; 1377 print "MAPKEYDOWN\n";
791} 1378}
792 1379
793sub key_up { 1380sub key_up {
794} 1381}
795 1382
796sub size_request { 1383sub size_request {
797 ( 1384 (
798 1 + int $::WIDTH / 32, 1385 1 + 32 * int $::WIDTH / 32,
799 1 + int $::HEIGHT / 32, 1386 1 + 32 * int $::HEIGHT / 32,
800 ) 1387 )
801} 1388}
802 1389
1390sub update {
1391 my ($self) = @_;
1392
1393 $self->{need_update} = 1;
1394 $self->SUPER::update;
1395}
1396
803sub _draw { 1397sub draw {
804 my ($self) = @_; 1398 my ($self) = @_;
805 1399
1400 if (delete $self->{need_update}) {
1401 glNewList $self->{list}, GL_COMPILE;
1402
806 my $mx = $::CONN->{mapx}; 1403 my $mx = $::CONN->{mapx};
807 my $my = $::CONN->{mapy}; 1404 my $my = $::CONN->{mapy};
808 1405
809 my $map = $::CONN->{map}; 1406 my $map = $::CONN->{map};
810 1407
811 my ($xofs, $yofs); 1408 my ($xofs, $yofs);
812 1409
813 my $sw = 1 + int $::WIDTH / 32; 1410 my $sw = 1 + int $::WIDTH / 32;
814 my $sh = 1 + int $::HEIGHT / 32; 1411 my $sh = 1 + int $::HEIGHT / 32;
815 1412
816 if ($::CONN->{mapw} > $sw) { 1413 if ($::CONN->{mapw} > $sw) {
817 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1414 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
818 } else { 1415 } else {
819 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1416 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
820 } 1417 }
821 1418
822 if ($::CONN->{maph} > $sh) { 1419 if ($::CONN->{maph} > $sh) {
823 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1420 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
824 } else { 1421 } else {
825 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1422 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
826 } 1423 }
827 1424
828 glEnable GL_TEXTURE_2D; 1425 glEnable GL_TEXTURE_2D;
829 glEnable GL_BLEND; 1426 glEnable GL_BLEND;
1427 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
830 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1428 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
831 1429
832 my $sw4 = ($sw + 3) & ~3; 1430 my $sw4 = ($sw + 3) & ~3;
833 my $darkness = "\x00" x ($sw4 * $sh); 1431 my $darkness = "\x00" x ($sw4 * $sh);
834 1432
835 for my $x (0 .. $sw - 1) { 1433 for my $x (0 .. $sw - 1) {
836 my $row = $map->[$x + $xofs]; 1434 my $row = $map->[$x + $xofs];
837 for my $y (0 .. $sh - 1) { 1435 for my $y (0 .. $sh - 1) {
838 1436
839 my $cell = $row->[$y + $yofs] 1437 my $cell = $row->[$y + $yofs]
840 or next; 1438 or next;
841 1439
842 my $dark = $cell->[0]; 1440 my $dark = $cell->[0];
843 if ($dark < 0) { 1441 if ($dark < 0) {
844 substr $darkness, $y * $sw4 + $x, 1, chr 224; 1442 substr $darkness, $y * $sw4 + $x, 1, chr 224;
845 } else { 1443 } else {
846 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark; 1444 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
847 } 1445 }
848 1446
849 for my $num (grep $_, @$cell[1,2,3]) { 1447 for my $num (grep $_, @$cell[1,2,3]) {
850 my $tex = $::CONN->{face}[$num]{texture} || next; 1448 my $tex = $::CONN->{face}[$num]{texture} || next;
851 1449
852 my $w = $tex->{width}; 1450 my ($w, $h) = @$tex{qw(w h)};
853 my $h = $tex->{height};
854 1451
855 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1452 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1453 }
856 } 1454 }
857 } 1455 }
858 }
859 1456
860# if (1) { # higher quality darkness 1457# if (1) { # higher quality darkness
861# $lighting =~ s/(.)/$1$1$1/gs; 1458# $lighting =~ s/(.)/$1$1$1/gs;
862# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 1459# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
863# 1460#
… …
865# 1462#
866# $lighting = $pb->get_pixels; 1463# $lighting = $pb->get_pixels;
867# $lighting =~ s/(.)../$1/gs; 1464# $lighting =~ s/(.)../$1/gs;
868# } 1465# }
869 1466
870 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
871 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
872 1468
873 $darkness = new CFClient::Texture 1469 $darkness = new CFClient::Texture
874 width => $sw4, 1470 w => $sw4,
875 height => $sh, 1471 h => $sh,
876 data => $darkness, 1472 data => $darkness,
877 internalformat => GL_ALPHA, 1473 internalformat => GL_ALPHA,
878 format => GL_ALPHA; 1474 format => GL_ALPHA;
879 1475
880 glColor 0.45, 0.45, 0.45, 1; 1476 glColor 0.45, 0.45, 0.45, 1;
881 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); 1477 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
882 1478
883 glDisable GL_TEXTURE_2D; 1479 glDisable GL_TEXTURE_2D;
884 glDisable GL_BLEND; 1480 glDisable GL_BLEND;
1481
1482 glEndList;
1483 }
1484
1485 glCallList $self->{list};
885} 1486}
886 1487
887my %DIR = ( 1488my %DIR = (
888 SDLK_KP8, [1, "north"], 1489 SDLK_KP8, [1, "north"],
889 SDLK_KP9, [2, "northeast"], 1490 SDLK_KP9, [2, "northeast"],
… …
935 } 1536 }
936} 1537}
937 1538
938############################################################################# 1539#############################################################################
939 1540
940package CFClient::Widget::Animator; 1541package CFClient::UI::Animator;
941 1542
942use SDL::OpenGL; 1543use SDL::OpenGL;
943 1544
944our @ISA = CFClient::Widget::Bin::; 1545our @ISA = CFClient::UI::Bin::;
945 1546
946sub moveto { 1547sub moveto {
947 my ($self, $x, $y) = @_; 1548 my ($self, $x, $y) = @_;
948 1549
949 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1550 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
977 glPopMatrix; 1578 glPopMatrix;
978} 1579}
979 1580
980############################################################################# 1581#############################################################################
981 1582
982package CFClient::Widget::Toplevel; 1583package CFClient::UI::Toplevel;
983 1584
984our @ISA = CFClient::Widget::Container::; 1585our @ISA = CFClient::UI::Container::;
985 1586
986sub size_request { 1587sub size_request {
987 ($::WIDTH, $::HEIGHT) 1588 ($::WIDTH, $::HEIGHT)
988} 1589}
989 1590
990sub size_allocate { 1591sub size_allocate {
991 my ($self, $w, $h) = @_; 1592 my ($self, $x, $y, $w, $h) = @_;
992 1593
993 $self->SUPER::size_allocate ($w, $h); 1594 $self->_size_allocate ($x, $y, $w, $h);
994 1595
995 $_->size_allocate ($_->size_request) 1596 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
996 for @{$self->{children}}; 1597 for @{$self->{children}};
997} 1598}
998 1599
999sub translate { 1600sub translate {
1000 my ($self, $x, $y) = @_; 1601 my ($self, $x, $y) = @_;
… …
1003} 1604}
1004 1605
1005sub update { 1606sub update {
1006 my ($self) = @_; 1607 my ($self) = @_;
1007 1608
1008 $self->size_allocate ($self->size_request); 1609 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1009 ::refresh (); 1610 ::refresh ();
1010} 1611}
1011 1612
1012sub add { 1613sub add {
1013 my ($self, $widget) = @_; 1614 my ($self, $widget) = @_;
1014 1615
1015 $self->SUPER::add ($widget); 1616 $self->SUPER::add ($widget);
1016 1617
1017 $widget->size_allocate ($widget->size_request); 1618 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1018} 1619}
1019 1620
1020sub draw { 1621sub draw {
1021 my ($self) = @_; 1622 my ($self) = @_;
1022 1623
1023 $self->_draw; 1624 $self->_draw;
1024} 1625}
1025 1626
1026############################################################################# 1627#############################################################################
1027 1628
1028package CFClient::Widget; 1629package CFClient::UI;
1029 1630
1030$TOPLEVEL = new CFClient::Widget::Toplevel; 1631$TOPLEVEL = new CFClient::UI::Toplevel;
1031 1632
10321 16331
1033 1634

Diff Legend

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