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.38 by root, Sun Apr 9 21:34:49 2006 UTC vs.
Revision 1.77 by root, Tue Apr 11 22:14:13 2006 UTC

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

Diff Legend

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