refactor: use lua_pushliteral instead of lua_pushstring (#4066)

cnjhb · web-flow · commit 9a4b355e14ce · 2026-03-13T10:42:24.000+01:00
diff --git a/event.c b/event.c
@@ -392,25 +392,25 @@ event_handle_configurerequest(xcb_configure_request_event_t *ev)
 
         /* Request the changes to be applied */
         luaA_object_push(L, c);
-        lua_pushstring(L, "ewmh");     /* context */
+        lua_pushliteral(L, "ewmh");     /* context */
         lua_newtable(L);               /* props */
 
         /* area, it needs to be directly in the `hints` table to comply with
            the "protocol"
          */
-        lua_pushstring(L, "x");
+        lua_pushliteral(L, "x");
         lua_pushinteger(L, geometry.x);
         lua_rawset(L, -3);
 
-        lua_pushstring(L, "y");
+        lua_pushliteral(L, "y");
         lua_pushinteger(L, geometry.y);
         lua_rawset(L, -3);
 
-        lua_pushstring(L, "width");
+        lua_pushliteral(L, "width");
         lua_pushinteger(L, geometry.width);
         lua_rawset(L, -3);
 
-        lua_pushstring(L, "height");
+        lua_pushliteral(L, "height");
         lua_pushinteger(L, geometry.height);
         lua_rawset(L, -3);
 
@@ -898,7 +898,6 @@ event_handle_randr_output_change_notify(xcb_randr_notify_event_t *ev)
     if(ev->subCode == XCB_RANDR_NOTIFY_OUTPUT_CHANGE) {
         xcb_randr_output_t output = ev->u.oc.output;
         uint8_t connection = ev->u.oc.connection;
-        const char *connection_str = NULL;
         xcb_randr_get_output_info_reply_t *info;
         lua_State *L = globalconf_get_lua_State();
 
@@ -914,20 +913,19 @@ event_handle_randr_output_change_notify(xcb_randr_notify_event_t *ev)
         if(!info)
             return;
 
-        switch(connection) {
-            case XCB_RANDR_CONNECTION_CONNECTED:
-                connection_str = "Connected";
-                break;
-            case XCB_RANDR_CONNECTION_DISCONNECTED:
-                connection_str = "Disconnected";
-                break;
-            default:
-                connection_str = "Unknown";
-                break;
+        lua_pushlstring(L, (char*)xcb_randr_get_output_info_name(info), xcb_randr_get_output_info_name_length(info));
+        switch (connection) {
+        case XCB_RANDR_CONNECTION_CONNECTED:
+            lua_pushliteral(L, "Connected");
+            break;
+        case XCB_RANDR_CONNECTION_DISCONNECTED:
+            lua_pushliteral(L, "Disconnected");
+            break;
+        default:
+            lua_pushliteral(L, "Unknown");
+            break;
         }
 
-        lua_pushlstring(L, (char *)xcb_randr_get_output_info_name(info), xcb_randr_get_output_info_name_length(info));
-        lua_pushstring(L, connection_str);
         signal_object_emit(L, &global_signals, "screen::change", 2);
 
         p_delete(&info);
diff --git a/ewmh.c b/ewmh.c
@@ -215,16 +215,16 @@ ewmh_update_maximize(bool h, bool status, bool toggle)
     lua_State *L = globalconf_get_lua_State();
 
     if (h)
-        lua_pushstring(L, "client_maximize_horizontal");
+        lua_pushliteral(L, "client_maximize_horizontal");
     else
-        lua_pushstring(L, "client_maximize_vertical");
+        lua_pushliteral(L, "client_maximize_vertical");
 
     /* Create table argument with raise=true. */
     lua_newtable(L);
-    lua_pushstring(L, "toggle");
+    lua_pushliteral(L, "toggle");
     lua_pushboolean(L, toggle);
     lua_settable(L, -3);
-    lua_pushstring(L, "status");
+    lua_pushliteral(L, "status");
     lua_pushboolean(L, status);
     lua_settable(L, -3);
 
@@ -467,7 +467,7 @@ ewmh_process_client_message(xcb_client_message_event_t *ev)
         {
             lua_State *L = globalconf_get_lua_State();
             luaA_object_push(L, globalconf.tags.tab[idx]);
-            lua_pushstring(L, "ewmh");
+            lua_pushliteral(L, "ewmh");
             luaA_object_emit_signal(L, -2, "request::select", 1);
             lua_pop(L, 1);
         }
@@ -499,11 +499,11 @@ ewmh_process_client_message(xcb_client_message_event_t *ev)
         if((c = client_getbywin(ev->window))) {
             lua_State *L = globalconf_get_lua_State();
             luaA_object_push(L, c);
-            lua_pushstring(L, "ewmh");
+            lua_pushliteral(L, "ewmh");
 
             /* Create table argument with raise=true. */
             lua_newtable(L);
-            lua_pushstring(L, "raise");
+            lua_pushliteral(L, "raise");
             lua_pushboolean(L, true);
             lua_settable(L, -3);
 
diff --git a/luaa.c b/luaa.c
@@ -591,14 +591,14 @@ static int luaA_get_modifiers(lua_State *L)
 
                 lua_newtable(L);
 
-                lua_pushstring(L, "keycode");
+                lua_pushliteral(L, "keycode");
                 lua_pushinteger(L, key_code);
                 lua_settable(L, -3);
 
                 /* Technically it is possible to get multiple keysyms here,
                  * but... we just use the first one.
                  */
-                lua_pushstring(L, "keysym");
+                lua_pushliteral(L, "keysym");
                 char *string = key_get_keysym_name(keysyms[0]);
                 lua_pushstring(L, string);
                 p_delete(&string);
@@ -900,7 +900,7 @@ luaA_tolstring(lua_State *L, int idx, size_t *len)
         lua_pushfstring(L, "%f", lua_tonumber(L, -1));
         break;
     case LUA_TNIL:
-        lua_pushstring(L, "nil");
+        lua_pushliteral(L, "nil");
         break;
     default:
         lua_pushfstring(L, "%s: %p",
@@ -941,7 +941,7 @@ static void
 setup_awesome_signals(lua_State *L)
 {
     lua_getglobal(L, "awesome");
-    lua_pushstring(L, "unix_signal");
+    lua_pushliteral(L, "unix_signal");
     lua_newtable(L);
 
 #define SETUP_SIGNAL(sig)                             \
@@ -951,7 +951,7 @@ setup_awesome_signals(lua_State *L)
         lua_setfield(L, -2, #sig);                    \
         /* Set awesome.unix_signal[42] = "SIGSTOP" */ \
         lua_pushinteger(L, sig);                      \
-        lua_pushstring(L, #sig);                      \
+        lua_pushliteral(L, #sig);                     \
         lua_settable(L, -3);                          \
     } while (0)
 
diff --git a/objects/client.c b/objects/client.c
@@ -2297,9 +2297,9 @@ client_manage(xcb_window_t w, xcb_get_geometry_reply_t *wgeom, xcb_get_window_at
 
     /* Add the context */
     if (globalconf.loop == NULL)
-        lua_pushstring(L, "startup");
+        lua_pushliteral(L, "startup");
     else
-        lua_pushstring(L, "new");
+        lua_pushliteral(L, "new");
 
     /* Hints */
     lua_newtable(L);
@@ -2741,7 +2741,7 @@ client_set_fullscreen(lua_State *L, int cidx, bool s)
             client_set_ontop(L, cidx, false);
         }
         int abs_cidx = luaA_absindex(L, cidx); \
-        lua_pushstring(L, "fullscreen");
+        lua_pushliteral(L, "fullscreen");
         c->fullscreen = s;
         luaA_object_emit_signal(L, abs_cidx, "request::geometry", 1);
         luaA_object_emit_signal(L, abs_cidx, "property::fullscreen", 0);
@@ -2983,15 +2983,15 @@ client_unmanage(client_t *c, client_unmanage_t reason)
     {
             break;
         case CLIENT_UNMANAGE_USER:
-            lua_pushstring(L, "user");
+            lua_pushliteral(L, "user");
             break;
         case CLIENT_UNMANAGE_REPARENT:
-            lua_pushstring(L, "reparented");
+            lua_pushliteral(L, "reparented");
             break;
         case CLIENT_UNMANAGE_UNMAP:
         case CLIENT_UNMANAGE_FAILED:
         case CLIENT_UNMANAGE_DESTROYED:
-            lua_pushstring(L, "destroyed");
+            lua_pushliteral(L, "destroyed");
             break;
     }
 
@@ -4480,7 +4480,7 @@ client_tostring(lua_State *L, client_t *c)
 
     lua_pushlstring(L, name, MIN(len, limit));
     if (len > limit)
-        lua_pushstring(L, "...");
+        lua_pushliteral(L, "...");
     return len > limit ? 2 : 1;
 }
 
diff --git a/objects/screen.c b/objects/screen.c
@@ -396,19 +396,19 @@ luaA_viewport_get_outputs(lua_State *L, viewport_t *a)
     foreach(output, a->outputs) {
         lua_createtable(L, 3, 0);
 
-        lua_pushstring(L, "mm_width");
+        lua_pushliteral(L, "mm_width");
         lua_pushinteger(L, output->mm_width);
         lua_settable(L, -3);
 
-        lua_pushstring(L, "mm_height");
+        lua_pushliteral(L, "mm_height");
         lua_pushinteger(L, output->mm_height);
         lua_settable(L, -3);
 
-        lua_pushstring(L, "name");
+        lua_pushliteral(L, "name");
         lua_pushstring(L, output->name);
         lua_settable(L, -3);
 
-        lua_pushstring(L, "viewport_id");
+        lua_pushliteral(L, "viewport_id");
         lua_pushinteger(L, a->id);
         lua_settable(L, -3);
 
@@ -434,33 +434,33 @@ luaA_viewports(lua_State *L)
         lua_newtable(L);
 
         /* The geometry */
-        lua_pushstring(L, "geometry");
+        lua_pushliteral(L, "geometry");
 
         lua_newtable(L);
 
-        lua_pushstring(L, "x");
+        lua_pushliteral(L, "x");
         lua_pushinteger(L, a->x);
         lua_settable(L, -3);
-        lua_pushstring(L, "y");
+        lua_pushliteral(L, "y");
         lua_pushinteger(L, a->y);
         lua_settable(L, -3);
-        lua_pushstring(L, "width");
+        lua_pushliteral(L, "width");
         lua_pushinteger(L, a->width);
         lua_settable(L, -3);
-        lua_pushstring(L, "height");
+        lua_pushliteral(L, "height");
         lua_pushinteger(L, a->height);
         lua_settable(L, -3);
 
         /* Add the geometry table to the arguments */
         lua_settable(L, -3);
 
         /* Add the outputs table to the arguments */
-        lua_pushstring(L, "outputs");
+        lua_pushliteral(L, "outputs");
         luaA_viewport_get_outputs(L, a);
         lua_settable(L, -3);
 
         /* Add an identifier to better detect when screens are removed */
-        lua_pushstring(L, "id");
+        lua_pushliteral(L, "id");
         lua_pushinteger(L, a->id);
         lua_settable(L, -3);
 
@@ -1609,11 +1609,11 @@ static int
 luaA_screen_get_managed(lua_State *L, screen_t *s)
 {
     if (s->lifecycle & SCREEN_LIFECYCLE_LUA)
-        lua_pushstring(L, "Lua");
+        lua_pushliteral(L, "Lua");
     else if (s->lifecycle & SCREEN_LIFECYCLE_C)
-        lua_pushstring(L, "C");
+        lua_pushliteral(L, "C");
     else
-        lua_pushstring(L, "none");
+        lua_pushliteral(L, "none");
 
     return 1;
 }
