[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[MiNT] patch:XaAES:diverse
-------------------------------------------------------------
some cosmetical changes
-------------------------------------------------------------
diff -u -B -I '$Id' src.cvs/about.c src.km/about.c
--- src.cvs/about.c 2010-01-04 23:31:10.000000000 +0100
+++ src.km/about.c 2010-01-10 10:38:14.812500000 +0100
@@ -133,6 +133,7 @@
/*
* insert lines of a text-file into a list
* if first non-white char is '#' line is skipped
+ * line-endings must be unix-style
*
* currently used only in about-window
*/
@@ -160,7 +161,7 @@
if( err <= 0 )
break;
ebuf[err+offs] = 0;
- if( offs == 0 && ebuf[offs] == '#' )
+ if( offs == 0 && ebuf[0] == '#' )
state = 1;
for( p2 = 0, p1 = ebuf, p = ebuf+offs; *p; p++ )
{
diff -u -B -I '$Id' src.cvs/draw_obj.c src.km/draw_obj.c
--- src.cvs/draw_obj.c 2010-01-09 22:32:00.000000000 +0100
+++ src.km/draw_obj.c 2010-01-02 20:33:09.343750000 +0100
@@ -807,7 +807,7 @@
DIAG((D_objc, wt->owner, "dx = %d, dy = %d", x, y));
DIAG((D_objc, wt->owner, "draw_object_tree for %s to %d/%d,%d/%d; %lx + %d depth:%d",
t_owner(wt), x + tree->ob_x, y + tree->ob_y,
- tree->ob_width, tree->ob_height, tree, item, depth));
+ tree->ob_width, tree->ob_height, tree, item, depth));
DIAG((D_objc, wt->owner, " - (%d)%s%s",
wt->is_menu, obtree_is_menu(tree) ? "menu" : "object", wt->zen ? " with zen" : " no zen"));
diff -u -B -I '$Id' src.cvs/form.c src.km/form.c
--- src.cvs/form.c 2010-01-04 23:31:11.000000000 +0100
+++ src.km/form.c 2010-01-13 22:28:25.343750000 +0100
@@ -1583,7 +1583,6 @@
if (dy != wt->dy)
{
draw = true;
- //BLOG((0,"form_wind: VSLIDE %ld %ld %ld", oh, wh, dy));
XA_slider(wind, XAW_VSLIDE, oh, wh, dy);
}
@@ -1646,9 +1645,7 @@
(*v->api->save_clip)(v, &sc);
// display_window(0, 120, wind, NULL);
- //BLOG((0,"form:display_widget(0, wind, get_widget(wind, XAW_VSLIDE), wind->rect_list.start);" ));
display_widget(0, wind, get_widget(wind, XAW_VSLIDE), wind->rect_list.start);
- //BLOG((0,"dfwm_redraw(wind, widg, wt, clp_p/*NULL*/);"));
dfwm_redraw(wind, widg, wt, clp_p/*NULL*/);
(*v->api->restore_clip)(v, &sc);
showm();
diff -u -B -I '$Id' src.cvs/info.c src.km/info.c
--- src.cvs/info.c 2010-01-12 19:46:08.718750000 +0100
+++ src.km/info.c 2010-01-12 17:35:05.187500000 +0100
@@ -3,8 +3,6 @@
*
* In non-release-version build status-string
*
- * file is updated on every build
- *
*/
#include "xa_global.h"
diff -u -B -I '$Id' src.cvs/init.c src.km/init.c
--- src.cvs/init.c 2010-01-09 12:08:26.000000000 +0100
+++ src.km/init.c 2010-01-12 21:33:56.062500000 +0100
@@ -391,6 +391,7 @@
loader_pid = p_getpid();
loader_pgrp = p_getpgrp();
+ BLOG((0,"loader:pgrp=%ld, pid=%ld", loader_pgrp, loader_pid ));
/* do some sanity checks of the installation
* that are a common source of user problems
@@ -690,8 +691,12 @@
p->p_sigmask = 0xffffffffUL;
while (!(C.shutdown & QUIT_NOW))
+ {
+ BLOG((0,"init:sleep:%lx", &loader_pid));
sleep(WAIT_Q, (long)&loader_pid);
+ }
+ BLOG((1,"AESSYS kthread exited - C.shutdown = %x", C.shutdown));
// display("AESSYS kthread exited - C.shutdown = %x", C.shutdown);
#if GENERATE_DIAGS
diff -u -B -I '$Id' src.cvs/k_shutdown.c src.km/k_shutdown.c
--- src.cvs/k_shutdown.c 2010-01-14 11:49:09.484375000 +0100
+++ src.km/k_shutdown.c 2010-01-14 12:05:36.125000000 +0100
@@ -254,18 +254,17 @@
*/
// v_clsvwk(global_vdi_settings.handle);
- /*
- * Ozk: We switch off instruction, data and branch caches (where available)
- * while the VDI accesses the hardware. This fixes 'black-screen'
- * problems on Hades with Nova VDI.
- */
-#ifndef ST_ONLY
- //if( C.fvdi_version == 0 )
if( C.P_handle > 0 && C.P_handle != v->handle )
{
+#ifndef ST_ONLY
unsigned long sc = 0, cm = 0;
int odbl;
+ /*
+ * Ozk: We switch off instruction, data and branch caches (where available)
+ * while the VDI accesses the hardware. This fixes 'black-screen'
+ * problems on Hades with Nova VDI.
+ */
cm = s_system(S_CTRLCACHE, 0L, -1L);
sc = s_system(S_CTRLCACHE, -1L, 0L);
BLOG((false, "Get current cpu cache settings... cm = %lx, sc = %lx", cm, sc));
@@ -281,14 +280,11 @@
BLOG((false, "Restore CPU caches"));
s_system(S_CTRLCACHE, sc, cm);
BLOG((false, "Done shutting down VDI"));
- }
#else
- //if( C.fvdi_version == 0 )
- {
v_enter_cur(C.P_handle);
v_clswk(C.P_handle);
- }
#endif
+ }
display("\033e\033H"); /* Cursor enable, cursor home */
}
diff -u -B -I '$Id' src.cvs/render_obj.c src.km/render_obj.c
--- src.cvs/render_obj.c 2010-01-04 23:31:12.000000000 +0100
+++ src.km/render_obj.c 2010-01-13 22:28:26.906250000 +0100
@@ -6265,7 +6265,6 @@
{
xobj_rshdr = (*api->load_resource)(NULL, resource_name, NULL, DU_RSX_CONV, DU_RSY_CONV, false);
(*api->kfree)(resource_name);
- DIAGS(("xobj_rsc = %lx (%s)", xobj_rsc, xobj_name));
}
if (!xobj_rshdr)
{
diff -u -B -I '$Id' src.cvs/taskman.c src.km/taskman.c
--- src.cvs/taskman.c 2010-01-09 19:14:35.000000000 +0100
+++ src.km/taskman.c 2010-01-10 09:48:15.250000000 +0100
@@ -388,11 +388,9 @@
/* change title */
struct setcontent_text t = { 0 };
- title = wi->wname;
- if( title && *title )
+ if( wi->wname && wi->wname[0] )
{
- char *tx = wi->wname;
- t.text = tx;
+ t.text = wi->wname;
list->set(list, thiswi, SESET_TEXT, (long)&t, true);
}
}
diff -u -B -I '$Id' src.cvs/trnfm.c src.km/trnfm.c
--- src.cvs/trnfm.c 2010-01-04 23:31:12.000000000 +0100
+++ src.km/trnfm.c 2010-01-08 08:55:46.250000000 +0100
@@ -40,6 +40,7 @@
#include "xa_global.h"
/* define this 1 if vs_color works */
+/* vs_color needs phys-handle??? */
#define HAVE_VS_COLOR 0
#include "trnfm.h"
diff -u -B -I '$Id' src.cvs/xa_lbox.c src.km/xa_lbox.c
--- src.cvs/xa_lbox.c 2010-01-04 23:31:12.000000000 +0100
+++ src.km/xa_lbox.c 2010-01-13 22:28:28.078125000 +0100
@@ -724,7 +724,6 @@
{
short mb, sx, sy;
- //BLOG((0,"xa_lbox:drag_slide"));
check_mouse(lbox->wt->owner, &mb, &sx, &sy);
if (mb)
@@ -1224,7 +1223,6 @@
CONTROL(1,1,1)
DIAG((D_lbox, client, "XA_lbox_do, lbox_hand=%lx, obj=%d", pb->addrin[0], pb->intin[0]));
- //BLOG((0, "XA_lbox_do, lbox_hand=%lx, obj=%d", pb->addrin[0], pb->intin[0]));
pb->intout[0] = pb->intin[0] & ~0x8000;
diff -u -B -I '$Id' src.cvs/xa_shel.c src.km/xa_shel.c
--- src.cvs/xa_shel.c 2010-01-09 19:14:35.000000000 +0100
+++ src.km/xa_shel.c 2010-01-13 22:36:39.234375000 +0100
@@ -1123,6 +1123,7 @@
{
//DIAGS(("shell_find for %s '%s', PATH= '%s'", client->name, fn ? fn : "~", kp ? kp : "~"));
+ DIAGS(("shell_find for %s '%s'", client->name, fn ? fn : "~"));
/* check $HOME directory */
if (cfg.usehome )