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.41 by root, Sun Apr 9 21:50:21 2006 UTC vs.
Revision 1.67 by root, Tue Apr 11 14:36:59 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10use Crossfire::Client; 10use CFClient;
11 11
12our $FOCUS; # the widget with current focus 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
13 16
14# class methods for events 17# class methods for events
15sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
16sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
20}
21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
17sub feed_sdl_button_down_event { } 26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
18sub feed_sdl_button_up_event { } 42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
19 74
20sub new { 75sub new {
21 my $class = shift; 76 my $class = shift;
22 77
23 bless { @_ }, $class 78 bless {
79 x => 0,
80 y => 0,
81 z => 0,
82 @_
83 }, $class
24} 84}
25 85
26sub move { 86sub move {
27 my ($self, $x, $y, $z) = @_; 87 my ($self, $x, $y, $z) = @_;
28 $self->{x} = $x; 88 $self->{x} = $x;
… …
44 104
45 $self->{w} = $w; 105 $self->{w} = $w;
46 $self->{h} = $h; 106 $self->{h} = $h;
47} 107}
48 108
109# translate global koordinates to local coordinate system
110sub translate {
111 my ($self, $x, $y) = @_;
112
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
114}
115
49sub focus_in { 116sub focus_in {
50 my ($widget) = @_; 117 my ($self) = @_;
51 $FOCUS = $widget; 118
119 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus;
121 $FOCUS->update;
52} 122}
53 123
54sub focus_out { 124sub focus_out {
55 my ($widget) = @_; 125 my ($self) = @_;
56}
57 126
58sub key_down { 127 return unless $FOCUS == $self;
59 my ($widget, $sdlev) = @_;
60}
61 128
62sub key_up { 129 my $focus = $FOCUS; undef $FOCUS;
63 my ($widget, $sdlev) = @_; 130 $focus->update if $focus; #?
64} 131}
65 132
133sub mouse_motion { }
134sub button_up { }
66sub button_down { 135sub button_down { }
67 my ($widget, $sdlev) = @_; 136sub key_down { }
68} 137sub key_up { }
69 138
70sub button_up {
71 my ($widget, $sdlev) = @_;
72}
73
74sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
75sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
76sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
77sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
78sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
79 144
80sub draw { 145sub draw {
81 my ($self) = @_; 146 my ($self) = @_;
82 147
83 glPushMatrix; 148 glPushMatrix;
84 glTranslate $self->{x}, $self->{y}, 0; 149 glTranslate $self->{x}, $self->{y}, 0;
85 $self->_draw; 150 $self->_draw;
151 if ($self == $HOVER) {
152 glColor 1, 1, 1, 0.4;
153 glEnable GL_BLEND;
154 glBegin GL_QUADS;
155 glVertex 0 , 0;
156 glVertex $self->{w}, 0;
157 glVertex $self->{w}, $self->{h};
158 glVertex 0 , $self->{h};
159 glEnd;
160 glDisable GL_BLEND;
161 }
86 glPopMatrix; 162 glPopMatrix;
87} 163}
88 164
89sub _draw { 165sub _draw {
90 my ($self) = @_; 166 my ($self) = @_;
… …
139 #$self->deactivate; 215 #$self->deactivate;
140} 216}
141 217
142############################################################################# 218#############################################################################
143 219
220package CFClient::Widget::Empty;
221
222our @ISA = CFClient::Widget::;
223
224sub size_request {
225 (0, 0)
226}
227
228sub draw { }
229
230#############################################################################
231
144package Crossfire::Client::Widget::Container; 232package CFClient::Widget::Container;
145 233
146our @ISA = Crossfire::Client::Widget::; 234our @ISA = CFClient::Widget::;
147 235
148sub new { 236sub new {
149 my ($class, @widgets) = @_; 237 my ($class, %arg) = @_;
150 238
239 my $children = delete $arg{children} || [];
240
151 my $self = $class->SUPER::new (children => []); 241 my $self = $class->SUPER::new (children => [], %arg);
152 $self->add ($_) for @widgets; 242 $self->add ($_) for @$children;
153 243
154 $self 244 $self
155} 245}
156 246
157sub add { 247sub add {
158 my ($self, $chld, $expand) = @_; 248 my ($self, $chld, $expand) = @_;
159 249
160 $chld->{expand} = $expand; 250 $chld->{expand} = $expand;
161 $chld->set_parent ($self); 251 $chld->set_parent ($self);
162 252
163 @{$self->{children}} = 253 $self->{children} = [
164 sort { $a->{z} <=> $b->{z} } 254 sort { $a->{z} <=> $b->{z} }
165 @{$self->{children}}, $chld; 255 @{$self->{children}}, $chld
256 ];
166 257
167 $self->size_allocate ($self->{w}, $self->{h}); 258 $self->size_allocate ($self->{w}, $self->{h})
259 if $self->{w}; #TODO: check for "realised state"
168} 260}
169 261
170sub remove { 262sub remove {
171 my ($self, $widget) = @_; 263 my ($self, $widget) = @_;
172 264
… …
176} 268}
177 269
178sub find_widget { 270sub find_widget {
179 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
180 272
273 $x -= $self->{x};
274 $y -= $self->{y};
275
181 my $res; 276 my $res;
182 277
183 for (@{ $self->{children} }) { 278 for (reverse @{ $self->{children} }) {
184 $res = $_->find_widget ($x, $y) 279 $res = $_->find_widget ($x, $y)
185 and return $res; 280 and return $res;
186 } 281 }
187 282
188 () 283 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
189}
190
191sub size_request {
192 my ($self) = @_;
193
194 my ($hs, $ws) = (0, 0);
195 for (@{$self->{children} || []}) {
196 my ($w, $h) = $_->size_request;
197 $hs += $h;
198 if ($ws < $w) { $ws = $w }
199 }
200
201 return ($ws, $hs);
202} 284}
203 285
204sub _draw { 286sub _draw {
205 my ($self) = @_; 287 my ($self) = @_;
206 288
207 $_->draw for @{$self->{children}}; 289 $_->draw for @{$self->{children}};
208} 290}
209 291
210############################################################################# 292#############################################################################
211 293
212package Crossfire::Client::Widget::Bin; 294package CFClient::Widget::Bin;
213 295
214our @ISA = Crossfire::Client::Widget::Container::; 296our @ISA = CFClient::Widget::Container::;
297
298sub new {
299 my ($class, %arg) = @_;
300
301 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
302
303 $class->SUPER::new (children => [$child], %arg)
304}
305
306sub add {
307 my ($self, $widget) = @_;
308
309 $self->{children} = [];
310
311 $self->SUPER::add ($widget);
312}
313
314sub remove {
315 my ($self, $widget) = @_;
316
317 $self->SUPER::remove ($widget);
318
319 $self->{children} = [new CFClient::Widget::Empty]
320 unless @{$self->{children}};
321}
215 322
216sub child { $_[0]->{children}[0] } 323sub child { $_[0]->{children}[0] }
217 324
218sub size_request { 325sub size_request {
219 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 326 $_[0]{children}[0]->size_request if $_[0]{children}[0];
220} 327}
221 328
222sub size_allocate { 329sub size_allocate {
223 my ($self, $w, $h) = @_; 330 my ($self, $w, $h) = @_;
331
224 $self->SUPER::size_allocate ($w, $h); 332 $self->SUPER::size_allocate ($w, $h);
225 $self->{children}[0]->size_allocate ($w, $h) 333 $self->{children}[0]->size_allocate ($w, $h)
226 if $self->{children}[0] 334 if $self->{children}[0]
227} 335}
228 336
229############################################################################# 337#############################################################################
230 338
231package Crossfire::Client::Widget::Toplevel; 339package CFClient::Widget::Window;
232 340
233our @ISA = Crossfire::Client::Widget::Container::; 341our @ISA = CFClient::Widget::Bin::;
342
343use SDL::OpenGL;
344
345sub new {
346 my ($class, %arg) = @_;
347
348 my $self = $class->SUPER::new (%arg);
349}
234 350
235sub update { 351sub update {
236 my ($self) = @_; 352 my ($self) = @_;
237 353
238 ::refresh (); 354 # we want to do this delayed...
239}
240
241#############################################################################
242
243package Crossfire::Client::Widget::Window;
244
245our @ISA = Crossfire::Client::Widget::Bin::;
246
247use SDL::OpenGL;
248
249sub add {
250 my ($self, $chld) = @_;
251 warn "ADD $chld\n";
252 $self->SUPER::add ($chld);
253 $chld->set_parent ($self);
254}
255
256sub remove {
257 my ($self) = @_;
258 # TODO FIXME: removing a child from a window will crash, see render_chld
259 # $self->update;
260}
261
262sub update {
263 my ($self) = @_;
264 $self->render_chld; 355 $self->render_chld;
356 $self->SUPER::update;
265} 357}
266 358
267sub render_chld { 359sub render_chld {
268 my ($self) = @_; 360 my ($self) = @_;
269 my $chld = $self->get;
270 my ($w, $h) = $self->size_request;
271 361
272 require Carp;
273 Carp::cluck "RENDERCHI $w $h";
274 warn "RENDERCHI $w $h\n";
275 $self->{texture} = 362 $self->{texture} =
276 Crossfire::Client::Texture->new_from_opengl ( 363 CFClient::Texture->new_from_opengl (
277 $w, $h, sub { $chld->draw } 364 $self->{w}, $self->{h}, sub { $self->child->draw }
278 ); 365 );
279 $self->{texture}->upload;
280}
281
282sub size_request {
283 my ($self) = @_;
284 ($self->w, $self->h)
285} 366}
286 367
287sub size_allocate { 368sub size_allocate {
288 my ($self, $w, $h) = @_; 369 my ($self, $w, $h) = @_;
289 370
290 $self->w ($w); 371 $self->{w} = $w;
291 $self->h ($h); 372 $self->{h} = $h;
373
292 $self->get->size_allocate ($w, $h); 374 $self->child->size_allocate ($w, $h);
293 375
294 $self->update; #TODO: Move this to the size_request event propably? 376 $self->render_chld;
295} 377}
296 378
297sub _draw { 379sub _draw {
298 my ($self) = @_; 380 my ($self) = @_;
299 381
… …
303 or return; 385 or return;
304 386
305 glEnable GL_BLEND; 387 glEnable GL_BLEND;
306 glEnable GL_TEXTURE_2D; 388 glEnable GL_TEXTURE_2D;
307 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 389 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
308 glBindTexture GL_TEXTURE_2D, $tex->{name};
309 390
310 glBegin GL_QUADS; 391 $tex->draw_quad (0, 0, $w, $h);
311 glTexCoord 0, 0; glVertex 0, 0;
312 glTexCoord 0, 1; glVertex 0, $h;
313 glTexCoord 1, 1; glVertex $w, $h;
314 glTexCoord 1, 0; glVertex $w, 0;
315 glEnd;
316 392
317 glDisable GL_BLEND; 393 glDisable GL_BLEND;
318 glDisable GL_TEXTURE_2D; 394 glDisable GL_TEXTURE_2D;
319} 395}
320 396
321############################################################################# 397#############################################################################
322 398
323package Crossfire::Client::Widget::Frame; 399package CFClient::Widget::Frame;
324 400
325our @ISA = Crossfire::Client::Widget::Bin::; 401our @ISA = CFClient::Widget::Bin::;
326 402
327use SDL::OpenGL; 403use SDL::OpenGL;
328 404
329sub size_request { 405sub size_request {
330 my ($self) = @_; 406 my ($self) = @_;
… …
336 map { $_ + 4 } $chld->size_request; 412 map { $_ + 4 } $chld->size_request;
337} 413}
338 414
339sub size_allocate { 415sub size_allocate {
340 my ($self, $w, $h) = @_; 416 my ($self, $w, $h) = @_;
341 417
342 $self->SUPER::size_allocate ($w, $h); 418 $self->{w} = $w;
419 $self->{h} = $h;
343 420
344 $self->child->size_allocate ($w - 4, $h - 4); 421 $self->child->size_allocate ($w - 4, $h - 4);
345 $self->child->move (2, 2); 422 $self->child->move (2, 2);
346} 423}
347 424
… …
352 429
353 my ($w, $h) = $chld->size_request; 430 my ($w, $h) = $chld->size_request;
354 431
355 glBegin GL_QUADS; 432 glBegin GL_QUADS;
356 glColor 0, 0, 0; 433 glColor 0, 0, 0;
357 glTexCoord 0, 0; glVertex 0 , 0; 434 glVertex 0 , 0;
358 glTexCoord 0, 1; glVertex 0 , $h + 4; 435 glVertex 0 , $h + 4;
359 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 436 glVertex $w + 4 , $h + 4;
360 glTexCoord 1, 0; glVertex $w + 4 , 0; 437 glVertex $w + 4 , 0;
361 glEnd; 438 glEnd;
362 439
363 $chld->draw; 440 $chld->draw;
364} 441}
365 442
366############################################################################# 443#############################################################################
367 444
368package Crossfire::Client::Widget::FancyFrame; 445package CFClient::Widget::FancyFrame;
369 446
370our @ISA = Crossfire::Client::Widget::Bin::; 447our @ISA = CFClient::Widget::Bin::;
371 448
372use SDL::OpenGL; 449use SDL::OpenGL;
373 450
374my @tex = 451my @tex =
375 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 452 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
376 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 453 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
377 454
378sub size_request { 455sub size_request {
379 my ($self) = @_; 456 my ($self) = @_;
380 457
… …
398 $w -= $tex[2]->{width}; 475 $w -= $tex[2]->{width};
399 $w -= $tex[3]->{width}; 476 $w -= $tex[3]->{width};
400 477
401 $h = $h < 0 ? 0 : $h; 478 $h = $h < 0 ? 0 : $h;
402 $w = $w < 0 ? 0 : $w; 479 $w = $w < 0 ? 0 : $w;
403 warn "CHILD:$w $h\n"; 480
481 my $child = $self->child;
482
404 $self->child->size_allocate ($w, $h); 483 $child->size_allocate ($w, $h);
405 $self->child->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 484 $child->move ($tex[3]->{width}, $tex[1]->{height});
406} 485}
407 486
408sub _draw { 487sub _draw {
409 my ($self) = @_; 488 my ($self) = @_;
410 489
411 my ($w, $h) = ($self->w, $self->h); 490 my ($w, $h) = ($self->{w}, $self->{h});
412 my ($cw, $ch) = ($self->child->w, $self->child->h); 491 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
413 492
414 glEnable GL_BLEND; 493 glEnable GL_BLEND;
415 glEnable GL_TEXTURE_2D; 494 glEnable GL_TEXTURE_2D;
416 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 495 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
418 497
419 my $top = $tex[1]; 498 my $top = $tex[1];
420 glBindTexture GL_TEXTURE_2D, $top->{name}; 499 $top->draw_quad (0, 0, $w, $top->{height});
421
422 glBegin GL_QUADS;
423 glTexCoord 0, 0; glVertex 0 , 0;
424 glTexCoord 0, 1; glVertex 0 , $top->{height};
425 glTexCoord 1, 1; glVertex $w , $top->{height};
426 glTexCoord 1, 0; glVertex $w , 0;
427 glEnd;
428 500
429 my $left = $tex[3]; 501 my $left = $tex[3];
430 glBindTexture GL_TEXTURE_2D, $left->{name}; 502 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
431
432 glBegin GL_QUADS;
433 glTexCoord 0, 0; glVertex 0 , $top->{height};
434 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
435 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
436 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
437 glEnd;
438 503
439 my $right = $tex[2]; 504 my $right = $tex[2];
440 glBindTexture GL_TEXTURE_2D, $right->{name}; 505 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
441
442 glBegin GL_QUADS;
443 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
444 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
445 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
446 glTexCoord 1, 0; glVertex $w , $top->{height};
447 glEnd;
448 506
449 my $bottom = $tex[4]; 507 my $bottom = $tex[4];
450 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 508 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
451
452 glBegin GL_QUADS;
453 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
454 glTexCoord 0, 1; glVertex 0 , $h;
455 glTexCoord 1, 1; glVertex $w , $h;
456 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
457 glEnd;
458 509
459 my $bg = $tex[0]; 510 my $bg = $tex[0];
460 glBindTexture GL_TEXTURE_2D, $bg->{name}; 511 glBindTexture GL_TEXTURE_2D, $bg->{name};
461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
462 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 513 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
463 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 514 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
464 515
465 my $rep_x = $cw / $bg->{width}; 516 my $rep_x = $cw / $bg->{width};
466 my $rep_y = $ch / $bg->{height}; 517 my $rep_y = $ch / $bg->{height};
467 518
468 glBegin GL_QUADS; 519 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
469 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
470 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
471 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
472 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
473 glEnd;
474 520
475 glDisable GL_BLEND; 521 glDisable GL_BLEND;
476 glDisable GL_TEXTURE_2D; 522 glDisable GL_TEXTURE_2D;
477 523
478 $self->child->draw; 524 $self->child->draw;
479 525
480} 526}
481 527
482############################################################################# 528#############################################################################
483 529
484package Crossfire::Client::Widget::Table; 530package CFClient::Widget::Table;
485 531
486our @ISA = Crossfire::Client::Widget::Bin::; 532our @ISA = CFClient::Widget::Bin::;
487 533
488use SDL::OpenGL; 534use SDL::OpenGL;
489 535
490sub add { 536sub add {
491 my ($self, $x, $y, $chld) = @_; 537 my ($self, $x, $y, $chld) = @_;
… …
566 } 612 }
567} 613}
568 614
569############################################################################# 615#############################################################################
570 616
571package Crossfire::Client::Widget::VBox; 617package CFClient::Widget::VBox;
572 618
573our @ISA = Crossfire::Client::Widget::Container::; 619our @ISA = CFClient::Widget::Container::;
574 620
575use SDL::OpenGL; 621use SDL::OpenGL;
622
623sub size_request {
624 my ($self) = @_;
625
626 my @alloc = map [$_->size_request], @{$self->{children}};
627
628 (
629 (List::Util::max map $_->[0], @alloc),
630 (List::Util::sum map $_->[1], @alloc),
631 )
632}
576 633
577sub size_allocate { 634sub size_allocate {
578 my ($self, $w, $h) = @_; 635 my ($self, $w, $h) = @_;
579 636
580 $self->w ($w); 637 $self->w ($w);
… …
613 $y += $h; 670 $y += $h;
614 } 671 }
615 } 672 }
616} 673}
617 674
618sub _draw {
619 my ($self) = @_;
620
621 my ($x, $y);
622 for (@{$self->{children} || []}) {
623 $_->draw;
624 $y += $_->h;
625 }
626}
627
628############################################################################# 675#############################################################################
629 676
630package Crossfire::Client::Widget::Label; 677package CFClient::Widget::Label;
631 678
632our @ISA = Crossfire::Client::Widget::; 679our @ISA = CFClient::Widget::;
633 680
634use SDL::OpenGL; 681use SDL::OpenGL;
635 682
636sub new { 683sub new {
637 my ($class, $x, $y, $z, $height, $text) = @_; 684 my ($class, %arg) = @_;
638 685
639 # TODO: color, and make height, xyz etc. optional 686 # TODO: color, and make height, xyz etc. optional
640 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 687 my $self = $class->SUPER::new (
688 color => [1, 1, 1],
689 height => $::FONTSIZE,
690 text => "",
691 layout => new CFClient::Layout,
692 %arg
693 );
641 694
642 $self->set_text ($text); 695 $self->set_text ($self->{text});
643 696
644 $self 697 $self
645} 698}
646 699
647sub set_text { 700sub set_text {
648 my ($self, $text) = @_; 701 my ($self, $text) = @_;
649 702
650 $self->{text} = $text; 703 $self->{text} = $text;
651 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 704 $self->{layout}->set_markup ($text);
652 705
653 $self->update; 706 delete $self->{texture};
654} 707}
655 708
656sub get_text { 709sub get_text {
657 my ($self, $text) = @_; 710 my ($self, $text) = @_;
658 711
… …
660} 713}
661 714
662sub size_request { 715sub size_request {
663 my ($self) = @_; 716 my ($self) = @_;
664 717
665 ( 718 $self->{layout}->set_width;
719 $self->{layout}->set_height ($self->{height});
720 $self->{layout}->size
721# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
722# (
666 $self->{texture}{width}, 723# $self->{texture}{width},
667 $self->{texture}{height}, 724# $self->{texture}{height},
668 ) 725# )
726# } else {
727# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
728#
729# ($w, $h)
730# }
731}
732
733sub size_allocate {
734 my ($self, $w, $h) = @_;
735
736 $self->SUPER::size_allocate ($w, $h);
737 delete $self->{texture};
669} 738}
670 739
671sub _draw { 740sub _draw {
672 my ($self) = @_; 741 my ($self) = @_;
673 742
674 my $tex = $self->{texture}; 743 my $tex = $self->{texture} ||= do {
744 $self->{layout}->set_width ($self->{w});
745 new_from_layout CFClient::Texture $self->{layout};
746 };
675 747
676 glEnable GL_BLEND; 748 glEnable GL_BLEND;
677 glEnable GL_TEXTURE_2D; 749 glEnable GL_TEXTURE_2D;
678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 750 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
679 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
680 glBindTexture GL_TEXTURE_2D, $tex->{name};
681 752
682 glColor 1, 0, 0, 1; # TODO color 753 glColor @{$self->{color}};
683 754
684 glBegin GL_QUADS; 755 $tex->draw_quad (0, 0);
685 glTexCoord 0, 0; glVertex 0 , 0;
686 glTexCoord 0, 1; glVertex 0 , $tex->{height};
687 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
688 glTexCoord 1, 0; glVertex $tex->{width}, 0;
689 glEnd;
690 756
691 glDisable GL_BLEND; 757 glDisable GL_BLEND;
692 glDisable GL_TEXTURE_2D; 758 glDisable GL_TEXTURE_2D;
693} 759}
694 760
695############################################################################# 761#############################################################################
696 762
697package Crossfire::Client::Widget::TextEntry; 763package CFClient::Widget::Entry;
698 764
699our @ISA = Crossfire::Client::Widget::Label::; 765our @ISA = CFClient::Widget::Label::;
700 766
701use SDL; 767use SDL;
702use SDL::OpenGL; 768use SDL::OpenGL;
703 769
704sub key_down { 770sub key_down {
705 my ($self, $ev) = @_; 771 my ($self, $ev) = @_;
706 772
707 my $mod = $ev->key_mod; 773 my $mod = $ev->key_mod;
708 my $sym = $ev->key_sym; 774 my $sym = $ev->key_sym;
709 775
710 $ev->set_unicode (1);
711 my $uni = $ev->key_unicode; 776 my $uni = $ev->key_unicode;
712 777
713 my $text = $self->get_text; 778 my $text = $self->get_text;
714 779
715 if ($sym == SDLK_BACKSPACE) { 780 if ($sym == SDLK_BACKSPACE) {
716 substr $text, -1, 1, ''; 781 substr $text, -1, 1, '';
717
718 } elsif ($uni) { 782 } elsif ($uni) {
719 $text .= chr $uni; 783 $text .= chr $uni;
720 } 784 }
785
721 $self->set_text ($text); 786 $self->set_text ($text);
722} 787}
723 788
724############################################################################# 789sub button_down {
790 my ($self, $ev) = @_;
725 791
792 $self->focus_in;
793}
794
795sub mouse_motion {
796 my ($self, $ev, $x, $y) = @_;
797 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
798}
799
800sub _draw {
801 my ($self) = @_;
802
803 if ($FOCUS == $self) {
804 glColor 1, 1, 1;
805 } else {
806 glColor 0.7, 0.7, 0.7;
807 }
808
809 glBegin GL_QUADS;
810 glVertex 0 , 0;
811 glVertex 0 , $self->{h} - 1;
812 glVertex $self->{w} - 1, $self->{h} - 1;
813 glVertex $self->{w} - 1, 0;
814 glEnd;
815
816 $self->SUPER::_draw;
817}
818
819#############################################################################
820
726package Crossfire::Client::Widget::MapWidget; 821package CFClient::Widget::MapWidget;
727 822
728use strict; 823use strict;
729 824
730use List::Util qw(min max); 825use List::Util qw(min max);
731 826
732use SDL; 827use SDL;
733use SDL::OpenGL; 828use SDL::OpenGL;
734use SDL::OpenGL::Constants; 829use SDL::OpenGL::Constants;
735 830
736our @ISA = Crossfire::Client::Widget::; 831our @ISA = CFClient::Widget::;
832
833sub new {
834 my $class = shift;
835
836 $class->SUPER::new (
837 z => -1,
838 list => (glGenLists 1),
839 @_
840 )
841}
737 842
738sub key_down { 843sub key_down {
739 print "MAPKEYDOWN\n"; 844 print "MAPKEYDOWN\n";
740} 845}
741 846
742sub key_up { 847sub key_up {
743} 848}
744 849
745sub size_request { 850sub size_request {
746 851 (
852 1 + int $::WIDTH / 32,
853 1 + int $::HEIGHT / 32,
854 )
747} 855}
748 856
749sub size_allocate { 857sub update {
858 my ($self) = @_;
859
860 $self->{need_update} = 1;
750} 861}
751 862
752sub _draw { 863sub _draw {
753 my ($self) = @_; 864 my ($self) = @_;
754 865
866 if (delete $self->{need_update}) {
867 glNewList $self->{list}, GL_COMPILE;
868
755 my $mx = $::CONN->{mapx}; 869 my $mx = $::CONN->{mapx};
756 my $my = $::CONN->{mapy}; 870 my $my = $::CONN->{mapy};
757 871
758 my $map = $::CONN->{map}; 872 my $map = $::CONN->{map};
759 873
760 my ($xofs, $yofs); 874 my ($xofs, $yofs);
761 875
762 my $sw = 1 + int $::WIDTH / 32; 876 my $sw = 1 + int $::WIDTH / 32;
763 my $sh = 1 + int $::HEIGHT / 32; 877 my $sh = 1 + int $::HEIGHT / 32;
764 878
765 if ($::CONN->{mapw} > $sw) { 879 if ($::CONN->{mapw} > $sw) {
766 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 880 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
767 } else { 881 } else {
768 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 882 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
769 } 883 }
770 884
771 if ($::CONN->{maph} > $sh) { 885 if ($::CONN->{maph} > $sh) {
772 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 886 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
773 } else { 887 } else {
774 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 888 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
775 } 889 }
776 890
777 glEnable GL_TEXTURE_2D; 891 glEnable GL_TEXTURE_2D;
778 glEnable GL_BLEND; 892 glEnable GL_BLEND;
779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
780 894
781 my $sw4 = ($sw + 3) & ~3; 895 my $sw4 = ($sw + 3) & ~3;
782 my $lighting = "\x00" x ($sw4 * $sh); 896 my $darkness = "\x00" x ($sw4 * $sh);
783 897
784 for my $x (0 .. $sw - 1) { 898 for my $x (0 .. $sw - 1) {
899 my $row = $map->[$x + $xofs];
785 for my $y (0 .. $sh - 1) { 900 for my $y (0 .. $sh - 1) {
786 901
787 my $cell = $map->[$x + $xofs][$y + $yofs] 902 my $cell = $row->[$y + $yofs]
788 or next; 903 or next;
789 904
790 my $darkness = $cell->[0] * (1 / 255); 905 my $dark = $cell->[0];
791 if ($darkness < 0) { 906 if ($dark < 0) {
792 $darkness = 0.15; 907 substr $darkness, $y * $sw4 + $x, 1, chr 224;
908 } else {
909 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
793 } 910 }
794 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
795 911
796 for my $num (grep $_, @$cell[1,2,3]) { 912 for my $num (grep $_, @$cell[1,2,3]) {
797 my $tex = $::CONN->{face}[$num]{texture} || next; 913 my $tex = $::CONN->{face}[$num]{texture} || next;
798 914
799 glBindTexture GL_TEXTURE_2D, $tex->{name};
800
801 my $w = $tex->{width}; 915 my $w = $tex->{width};
802 my $h = $tex->{height}; 916 my $h = $tex->{height};
803 917
804 my $px = ($x + 1) * 32 - $w; 918 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
805 my $py = ($y + 1) * 32 - $h;
806
807 glBegin GL_QUADS;
808 glTexCoord 0, 0; glVertex $px , $py;
809 glTexCoord 0, 1; glVertex $px , $py + $h;
810 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
811 glTexCoord 1, 0; glVertex $px + $w, $py;
812 glEnd; 919 }
813 } 920 }
814 } 921 }
815 }
816 922
817# if (1) { # higher quality darkness 923# if (1) { # higher quality darkness
818# $lighting =~ s/(.)/$1$1$1/gs; 924# $lighting =~ s/(.)/$1$1$1/gs;
819# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 925# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
820# 926#
… …
822# 928#
823# $lighting = $pb->get_pixels; 929# $lighting = $pb->get_pixels;
824# $lighting =~ s/(.)../$1/gs; 930# $lighting =~ s/(.)../$1/gs;
825# } 931# }
826 932
827 $lighting = new Crossfire::Client::Texture
828 width => $sw4,
829 height => $sh,
830 data => $lighting,
831 internalformat => GL_ALPHA4,
832 format => GL_ALPHA;
833
834 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 933 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
835 glColor 0, 0, 0, 0.75;
836 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
837 glBindTexture GL_TEXTURE_2D, $lighting->{name};
838 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
839 glBegin GL_QUADS;
840 glTexCoord 0, 0; glVertex 0 , 0;
841 glTexCoord 0, 1; glVertex 0 , $sh * 32;
842 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
843 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
844 glEnd;
845 935
936 $darkness = new CFClient::Texture
937 width => $sw4,
938 height => $sh,
939 data => $darkness,
940 internalformat => GL_ALPHA,
941 format => GL_ALPHA;
942
943 glColor 0.45, 0.45, 0.45, 1;
944 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
945
846 glDisable GL_TEXTURE_2D; 946 glDisable GL_TEXTURE_2D;
847 glDisable GL_BLEND; 947 glDisable GL_BLEND;
948
949 glEndList;
950 }
951
952 glCallList $self->{list};
848} 953}
849 954
850my %DIR = ( 955my %DIR = (
851 SDLK_KP8, [1, "north"], 956 SDLK_KP8, [1, "north"],
852 SDLK_KP9, [2, "northeast"], 957 SDLK_KP9, [2, "northeast"],
… …
898 } 1003 }
899} 1004}
900 1005
901############################################################################# 1006#############################################################################
902 1007
903package Crossfire::Client::Widget::Animator; 1008package CFClient::Widget::Animator;
904 1009
905use SDL::OpenGL; 1010use SDL::OpenGL;
906 1011
907our @ISA = Crossfire::Client::Widget::Bin::; 1012our @ISA = CFClient::Widget::Bin::;
908 1013
909sub moveto { 1014sub moveto {
910 my ($self, $x, $y) = @_; 1015 my ($self, $x, $y) = @_;
911 1016
912 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1017 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
913 $self->{speed} = 0.2; 1018 $self->{speed} = 0.001;
914 $self->{time} = 1; 1019 $self->{time} = 1;
915 1020
916 ::animation_start $self; 1021 ::animation_start $self;
917} 1022}
918 1023
… …
933 1038
934sub _draw { 1039sub _draw {
935 my ($self) = @_; 1040 my ($self) = @_;
936 1041
937 glPushMatrix; 1042 glPushMatrix;
938 glRotate $self->{time} * 10000, 0, 1, 0; 1043 glRotate $self->{time} * 1000, 0, 1, 0;
939 $self->{children}[0]->draw; 1044 $self->{children}[0]->draw;
940 glPopMatrix; 1045 glPopMatrix;
941} 1046}
942 1047
9431; 1048#############################################################################
944 1049
1050package CFClient::Widget::Toplevel;
1051
1052our @ISA = CFClient::Widget::Container::;
1053
1054sub size_request {
1055 ($::WIDTH, $::HEIGHT)
1056}
1057
1058sub size_allocate {
1059 my ($self, $w, $h) = @_;
1060
1061 $self->SUPER::size_allocate ($w, $h);
1062
1063 $_->size_allocate ($_->size_request)
1064 for @{$self->{children}};
1065}
1066
1067sub translate {
1068 my ($self, $x, $y) = @_;
1069
1070 ($x, $y)
1071}
1072
1073sub update {
1074 my ($self) = @_;
1075
1076 $self->size_allocate ($self->size_request);
1077 ::refresh ();
1078}
1079
1080sub add {
1081 my ($self, $widget) = @_;
1082
1083 $self->SUPER::add ($widget);
1084
1085 $widget->size_allocate ($widget->size_request);
1086}
1087
1088sub draw {
1089 my ($self) = @_;
1090
1091 $self->_draw;
1092}
1093
1094#############################################################################
1095
1096package CFClient::Widget;
1097
1098$TOPLEVEL = new CFClient::Widget::Toplevel;
1099
11001
1101

Diff Legend

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